save

lilac/server.py

@@ -96,6 +96,7 @@ def __init__(self, app: ASGIApp) -> None:
   async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
     """Redirect trailing slashes to non-trailing slashes."""
     url = URL(scope=scope).path
+    print('url=', url)
     root_path = scope.get('root_path')
     ends_with_slash = (
       url.endswith('/')
@@ -104,8 +105,10 @@ async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
       and url != root_path + '/'
       and not url.startswith('/api')
     )
+    # ends_with_slash = url.endswith('/') and url != '/' and not url.startswith('/api')
 
     if scope['type'] == 'http' and ends_with_slash:
+      print('redirectiong to', url.rstrip('/'))
       new_url = url.rstrip('/')
       response = RedirectResponse(url=new_url, status_code=307)
       await response(scope, receive, send)
@@ -169,15 +172,17 @@ class ServerStatus(BaseModel):
   version: str
   google_analytics_enabled: bool
   disable_error_notifications: bool
+  root_path: Optional[str]
 
 
 @app.get('/status')
-def status() -> ServerStatus:
+def status(request: Request) -> ServerStatus:
   """Returns server status information."""
   return ServerStatus(
     version=metadata.version('lilac'),
     google_analytics_enabled=env('GOOGLE_ANALYTICS_ENABLED', False),
     disable_error_notifications=env('LILAC_DISABLE_ERROR_NOTIFICATIONS', False),
+    root_path=request.scope.get('root_path'),
   )
 
 

run_server_dev.sh

@@ -16,7 +16,9 @@ if [ "$1" ]; then
 else
   export LILAC_PROJECT_DIR="./data"
 fi
-poetry run uvicorn lilac.server:app --reload --port 5432 --host 0.0.0.0 \
+# poetry run uvicorn lilac.server:app --reload --port 5432 --host 0.0.0.0 \
+#   --reload-dir lilac &
+poetry run uvicorn integration_tests.fastapi_integration:app --reload --port 5432 --host 0.0.0.0 \
   --reload-dir lilac &
 pid[1]=$!
 

web/blueprint/src/routes/+layout.svelte

@@ -27,6 +27,7 @@
 
   // Set the base URL for the OpenAPI requests when the app is served from a subdir.
   OpenAPI.BASE = base;
+  console.log('base=', base);
 
   const routeToPage: Record<string, AppPage> = {
     '': 'home',

web/lib/fastapi_client/models/ServerStatus.ts

@@ -10,5 +10,6 @@ export type ServerStatus = {
     version: string;
     google_analytics_enabled: boolean;
     disable_error_notifications: boolean;
+    root_path: (string | null);
 };