Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions py/apps/py-app/src/server/events/widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
from typing import AsyncGenerator

from fastapi import APIRouter, Depends, Request
from fastapi.templating import Jinja2Templates
from redis.asyncio import Redis
from sse_starlette.sse import EventSourceResponse

Expand All @@ -40,9 +39,9 @@
require_admin_user,
require_logged_in_user,
)
from src.server.templates import templates

router = APIRouter()
templates = Jinja2Templates(directory="templates")


async def publish_widget_event(
Expand Down
3 changes: 1 addition & 2 deletions py/apps/py-app/src/server/handlers/component.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
from fastapi import Request
from fastapi.responses import HTMLResponse, JSONResponse
from fastapi.templating import Jinja2Templates
from pydantic import BaseModel
from typing import Any, Dict

templates = Jinja2Templates(directory="templates")
from src.server.templates import templates


class ComponentResponseHandler:
Expand Down
3 changes: 1 addition & 2 deletions py/apps/py-app/src/server/handlers/page.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
from fastapi import Request
from fastapi.templating import Jinja2Templates
from fastapi.responses import HTMLResponse
from typing import Dict, Any

templates = Jinja2Templates(directory="templates")
from src.server.templates import templates


class PageResponse:
Expand Down
3 changes: 1 addition & 2 deletions py/apps/py-app/src/server/pages/admin/chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

from fastapi import APIRouter, Depends, Request, Form, HTTPException
from fastapi.responses import HTMLResponse, RedirectResponse, JSONResponse
from fastapi.templating import Jinja2Templates
from sqlalchemy import select
from sqlalchemy.ext.asyncio import AsyncSession
from redis.asyncio import Redis
Expand Down Expand Up @@ -37,9 +36,9 @@

from src.server.deps import async_db, logger, redis, require_admin_user
from src.tasks.jobs.complete_thread import complete_thread_task
from src.server.templates import templates

router = APIRouter()
templates = Jinja2Templates(directory="templates")


async def dispatch_completion(user_id: str, completion_id: str) -> None:
Expand Down
3 changes: 1 addition & 2 deletions py/apps/py-app/src/server/pages/admin/cron_jobs.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,16 @@

from fastapi import APIRouter, Depends, Query, Request
from fastapi.responses import HTMLResponse
from fastapi.templating import Jinja2Templates
from sqlalchemy import func, select
from sqlalchemy.ext.asyncio import AsyncSession

from py_core.database.models import User
from py_core.database.models.cron_job_run import CronJobRun, CronJobRunStatus

from src.server.deps import async_db, require_admin_user
from src.server.templates import templates

router = APIRouter()
templates = Jinja2Templates(directory="templates")

ITEMS_PER_PAGE = 20

Expand Down
3 changes: 1 addition & 2 deletions py/apps/py-app/src/server/pages/admin/dashboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

from fastapi import APIRouter, Depends, Request
from fastapi.responses import HTMLResponse
from fastapi.templating import Jinja2Templates
from redis.asyncio import Redis
from sqlalchemy import func, select, text
from sqlalchemy.ext.asyncio import AsyncSession
Expand All @@ -14,9 +13,9 @@
from py_core.observability import Logger

from src.server.deps import async_db, logger, redis, require_admin_user
from src.server.templates import templates

router = APIRouter()
templates = Jinja2Templates(directory="templates")


@router.get("/", response_class=HTMLResponse)
Expand Down
3 changes: 1 addition & 2 deletions py/apps/py-app/src/server/pages/admin/users.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

from fastapi import APIRouter, Depends, HTTPException, Query, Request
from fastapi.responses import HTMLResponse
from fastapi.templating import Jinja2Templates
from sqlalchemy.ext.asyncio import AsyncSession

from py_core.database.models import User
Expand All @@ -11,9 +10,9 @@

from src.server.deps import async_db, logger, require_admin_user
from src.tasks.jobs.send_welcome_notification import send_welcome_notification
from src.server.templates import templates

router = APIRouter()
templates = Jinja2Templates(directory="templates")

USERS_PER_PAGE = 20

Expand Down
3 changes: 1 addition & 2 deletions py/apps/py-app/src/server/pages/admin/widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

from fastapi import APIRouter, Depends, HTTPException, Query, Request, Form
from fastapi.responses import HTMLResponse
from fastapi.templating import Jinja2Templates
from sqlalchemy.ext.asyncio import AsyncSession

from py_core.database.models import User, Widget, WidgetStatus
Expand All @@ -17,9 +16,9 @@
WidgetUpdatedEvent,
)
from redis.asyncio import Redis
from src.server.templates import templates

router = APIRouter()
templates = Jinja2Templates(directory="templates")

WIDGETS_PER_PAGE = 20

Expand Down
3 changes: 1 addition & 2 deletions py/apps/py-app/src/server/pages/app/widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

from fastapi import APIRouter, Depends, HTTPException, Query, Request, Form
from fastapi.responses import HTMLResponse
from fastapi.templating import Jinja2Templates
from sqlalchemy.ext.asyncio import AsyncSession
from redis.asyncio import Redis

Expand All @@ -21,9 +20,9 @@

from src.server.deps import async_db, logger, redis, require_logged_in_user
from src.tasks.jobs.process_widget import process_widget_task
from src.server.templates import templates

router = APIRouter()
templates = Jinja2Templates(directory="templates")

WIDGETS_PER_PAGE = 10
APP_LAYOUT = "layouts/app.html"
Expand Down
5 changes: 5 additions & 0 deletions py/apps/py-app/src/server/templates.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import os
from starlette.templating import Jinja2Templates

templates_dir = os.getenv("TEMPLATES_DIR", "templates")
templates = Jinja2Templates(directory=templates_dir)