refactor: peakfit over peakfinding

NSLS-II-PDF · Apr 12, 2024 · 94d0740 · 94d0740
1 parent 3877c95
commit 94d0740
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 30 deletions.
diff --git a/containers/mmm5-tax-day-compose.yaml b/containers/mmm5-tax-day-compose.yaml
@@ -85,9 +85,9 @@ services:
       timeout: 10s
       retries: 5
 
-  peakfinding-agent:
+  peakfit-agent:
     image: gsas:conda
-    command: conda run -n GSASII --no-capture-output uvicorn bluesky_adaptive.server:app --host 0.0.0.0 --root-path /peakfinding-agent
+    command: conda run -n GSASII --no-capture-output uvicorn bluesky_adaptive.server:app --host 0.0.0.0 --root-path /peakfit-agent
     environment:
       - TILED_API_KEY=$TILED_API_KEY
       - HTTPSERVER_API_KEY=$HTTPSERVER_API_KEY
@@ -102,30 +102,30 @@ services:
         target: /etc/bluesky/kafka.yml
         read_only: true
 
-  peakfinding-ui:
+  peakfit-ui:
     image: ghcr.io/maffettone/bluesky-adaptive-ui:latest
     entrypoint: /modify_dns.sh
-    command: python3 /src/bluesky-adaptive-ui/bluesky_adaptive_ui/default_dash_app/app.py --agent-address peakfinding-agent --agent-port 8000
+    command: python3 /src/bluesky-adaptive-ui/bluesky_adaptive_ui/default_dash_app/app.py --agent-address peakfit-agent --agent-port 8000
     environment:
-      - DASH_REQUEST_PATHNAME_PREFIX=/peakfinding/
+      - DASH_REQUEST_PATHNAME_PREFIX=/peakfit/
     volumes:
       - ./modify_dns.sh:/modify_dns.sh
       - type: bind
         source: ../../bluesky-adaptive-ui
         target: /src/bluesky-adaptive-ui
         read_only: true
     depends_on:
-      peakfinding-agent:
+      peakfit-agent:
         condition: service_started
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8050"]
       interval: 20s
       timeout: 10s
       retries: 5
 
-  kmeans-peakfinding-agent:
+  kmeans-peakfit-agent:
     image: gsas:conda
-    command: conda run -n GSASII --no-capture-output uvicorn bluesky_adaptive.server:app --host 0.0.0.0 --root-path /kmeans-peakfinding-agent
+    command: conda run -n GSASII --no-capture-output uvicorn bluesky_adaptive.server:app --host 0.0.0.0 --root-path /kmeans-peakfit-agent
     environment:
       - TILED_API_KEY=$TILED_API_KEY
       - HTTPSERVER_API_KEY=$HTTPSERVER_API_KEY
@@ -140,20 +140,20 @@ services:
         target: /etc/bluesky/kafka.yml
         read_only: true
 
-  kmeans-peakfinding-ui:
+  kmeans-peakfit-ui:
     image: ghcr.io/maffettone/bluesky-adaptive-ui:latest
     entrypoint: /modify_dns.sh
-    command: python3 /src/bluesky-adaptive-ui/bluesky_adaptive_ui/default_dash_app/app.py --agent-address kmeans-peakfinding-agent --agent-port 8000
+    command: python3 /src/bluesky-adaptive-ui/bluesky_adaptive_ui/default_dash_app/app.py --agent-address kmeans-peakfit-agent --agent-port 8000
     environment:
-      - DASH_REQUEST_PATHNAME_PREFIX=/kmeans-peakfinding/
+      - DASH_REQUEST_PATHNAME_PREFIX=/kmeans-peakfit/
     volumes:
       - ./modify_dns.sh:/modify_dns.sh
       - type: bind
         source: ../../bluesky-adaptive-ui
         target: /src/bluesky-adaptive-ui
         read_only: true
     depends_on:
-      kmeans-peakfinding-agent:
+      kmeans-peakfit-agent:
         condition: service_started
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8050"]
@@ -188,13 +188,13 @@ services:
         condition: service_started
       kmeans-gsas-ui:
         condition: service_healthy
-      peakfinding-agent:
+      peakfit-agent:
         condition: service_started
-      peakfinding-ui:
+      peakfit-ui:
         condition: service_healthy
-      kmeans-peakfinding-agent:
+      kmeans-peakfit-agent:
         condition: service_started
-      kmeans-peakfinding-ui:
+      kmeans-peakfit-ui:
         condition: service_healthy
     restart: always
 

diff --git a/containers/nginx/html/index.html b/containers/nginx/html/index.html
@@ -67,9 +67,9 @@ <h2>Available Agents</h2>
             <li><a href="/gsas-agent/docs">GSAS Service (FastAPI)</a></li>
             <!-- Link to the KMeans-GSAS service -->
             <li><a href="/kmeans-gsas-agent/docs">KMeans-GSAS (FastAPI)</a></li>
-            <!-- Link to the Peakfinding service -->
-            <li><a href="/peakfinding-agent/docs">Peakfinding Service (FastAPI)</a></li>
-            <li><a href="/kmeans-peakfinding-agent/docs">Kmeans Peakfinding Service (FastAPI)</a></li>
+            <!-- Link to the Peak Fit service -->
+            <li><a href="/peakfit-agent/docs">Peak Fit Service (FastAPI)</a></li>
+            <li><a href="/kmeans-peakfit-agent/docs">Kmeans Peakfit Service (FastAPI)</a></li>
             <!-- Add more services here -->
             <!-- Example: <li><a href="/your-service/">Your Service Name</a></li> -->
         </ul>
@@ -80,9 +80,9 @@ <h2>Available Agent User Interfaces</h2>
             <li><a href="/gsas/">GSAS UI</a></li>
             <!-- Link to the KMeans-GSAS service -->
             <li><a href="/kmeans-gsas/">KMeans-GSAS UI</a></li>
-            <!-- Link to the Peakfinding service -->
-            <li><a href="/peakfinding/">Peakfinding UI</a></li>
-            <li><a href="/kmeans-peakfinding/">Kmeans Peakfinding UI</a></li>
+            <!-- Link to the Peakfit service -->
+            <li><a href="/peakfit/">Peakfit UI</a></li>
+            <li><a href="/kmeans-peakfit/">Kmeans Peakfit 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/kmeans-peakfinding.conf b/containers/nginx/locs.d/kmeans-peakfinding.conf
@@ -1,13 +1,13 @@
-location /kmeans-peakfinding/ {
-    proxy_pass http://kmeans-peakfinding-ui:8050/;
+location /kmeans-peakfit/ {
+    proxy_pass http://kmeans-peakfit-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 /kmeans-peakfinding-agent/ {
-    proxy_pass http://kmeans-peakfinding-agent:8000/;
+location /kmeans-peakfit-agent/ {
+    proxy_pass http://kmeans-peakfit-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/peakfinding.conf b/containers/nginx/locs.d/peakfinding.conf
@@ -1,13 +1,13 @@
-location /peakfinding/ {
-    proxy_pass http://peakfinding-ui:8050/;
+location /peakfit/ {
+    proxy_pass http://peakfit-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 /peakfinding-agent/ {
-    proxy_pass http://peakfinding-agent:8000/;
+location /peakfit-agent/ {
+    proxy_pass http://peakfit-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;