refactor: update addressing in nginx and dash

NSLS-II-PDF · Apr 10, 2024 · 83bdb6b · 83bdb6b
1 parent c76b3b7
commit 83bdb6b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/containers/mmm5-tax-day-compose.yaml b/containers/mmm5-tax-day-compose.yaml
@@ -3,12 +3,12 @@ version: '3'
 
 
 services:
-  gsas:
+  gsas-agent:
     image: gsas:conda
     build:
       context: ../gsas
       dockerfile: Containerfile-conda
-    command: conda run -n GSASII --no-capture-output uvicorn bluesky_adaptive.server:app --host 0.0.0.0 --root-path /gsas
+    command: conda run -n GSASII --no-capture-output uvicorn bluesky_adaptive.server:app --host 0.0.0.0 --root-path /gsas-agent
     environment:
       - TILED_API_KEY=$TILED_API_KEY
       - BS_AGENT_STARTUP_SCRIPT_PATH=/src/pdf-agents/pdf_agents/startup_scripts/mmm5-tax-day/gsas.py
@@ -25,15 +25,17 @@ services:
   gsas-ui:
     image: ghcr.io/maffettone/bluesky-adaptive-ui:latest
     command: python3 /src/bluesky-adaptive-ui/bluesky_adaptive_ui/default_dash_app/app.py --agent-address gsas
+    environment:
+      - DASH_REQUEST_PATHNAME_PREFIX="/gsas/"
     volumes:
       - type: bind
         source: ../../bluesky-adaptive-ui
         target: /src/bluesky-adaptive-ui
         read_only: true
 
-  kmeans-gsas:
+  kmeans-gsas-agent:
     image: bluesky:latest
-    command: uvicorn bluesky_adaptive.server:app --host 0.0.0.0
+    command: uvicorn bluesky_adaptive.server:app --host 0.0.0.0 --root-path /kmeans-gsas-agent
     environment:
       - TILED_API_KEY=$TILED_API_KEY
       - BS_AGENT_STARTUP_SCRIPT_PATH=/src/pdf-agents/pdf_agents/startup_scripts/mmm5-tax-day/gsas.py

diff --git a/containers/nginx/html/index.html b/containers/nginx/html/index.html
@@ -64,19 +64,19 @@ <h1>Landing Page for Agent Services!</h1>
         <h2>Available Agents</h2>
         <ul>
             <!-- Link to the GSAS service -->
-            <li><a href="/gsas/docs">GSAS Service (FastAPI)</a></li>
+            <li><a href="/gsas-agent/docs">GSAS Service (FastAPI)</a></li>
             <!-- Link to the KMeans-GSAS service -->
-            <li><a href="/kmeans-gsas/docs">KMeans-GSAS (FastAPI)</a></li>
+            <li><a href="/kmeans-gsas-agent/docs">KMeans-GSAS (FastAPI)</a></li>
             <!-- Add more services here -->
             <!-- Example: <li><a href="/your-service/">Your Service Name</a></li> -->
         </ul>
 
-	<h2>Available Agent User Interfaces</h2>
+        <h2>Available Agent User Interfaces</h2>
         <ul>
             <!-- Link to the GSAS service -->
-            <li><a href="/gsas/ui/">GSAS UI</a></li>
+            <li><a href="/gsas/">GSAS UI</a></li>
             <!-- Link to the KMeans-GSAS service -->
-            <li><a href="/kmeans-gsas/ui/">KMeans-GSAS UI</a></li>
+            <li><a href="/kmeans-gsas/">KMeans-GSAS UI</a></li>
             <!-- Add more services here -->
             <!-- Example: <li><a href="/your-service/">Your Service Name</a></li> -->
         </ul>

diff --git a/containers/nginx/locs.d/gsas.conf b/containers/nginx/locs.d/gsas.conf
@@ -1,14 +1,14 @@
 
-location /gsas-ui/ {
+location /gsas/ {
     proxy_pass http://gsas-ui:8050/;
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_read_timeout 60s;
 }
 
-location /gsas/ {
-    proxy_pass http://gsas:8000/;
+location /gsas-agent/ {
+    proxy_pass http://gsas-agent:8000/;
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

diff --git a/containers/nginx/locs.d/kmeans-gsas.conf b/containers/nginx/locs.d/kmeans-gsas.conf
@@ -1,4 +1,4 @@
-location /kmeans-gsas/ {
+location /kmeans-gsas-agent/ {
     proxy_pass http://kmeans-gsas:8000/;
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;