Merge remote-tracking branch 'origin/tax-day-experiment' into tax-day…

…-experiment
NSLS-II-PDF · Apr 11, 2024 · a4af529 · a4af529
2 parents e911b27 + 53a6d5a
commit a4af529
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/containers/mmm5-tax-day-compose.yaml b/containers/mmm5-tax-day-compose.yaml
@@ -11,6 +11,7 @@ services:
     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
+      - HTTPSERVER_API_KEY=$HTTPSERVER_API_KEY
       - BS_AGENT_STARTUP_SCRIPT_PATH=/src/pdf-agents/pdf_agents/startup_scripts/mmm5-tax-day/gsas.py
     volumes:
       - type: bind
@@ -48,6 +49,7 @@ services:
     command: conda run -n GSASII --no-capture-output uvicorn bluesky_adaptive.server:app --host 0.0.0.0 --root-path /kmeans-gsas-agent
     environment:
       - TILED_API_KEY=$TILED_API_KEY
+      - HTTPSERVER_API_KEY=$HTTPSERVER_API_KEY
       - BS_AGENT_STARTUP_SCRIPT_PATH=/src/pdf-agents/pdf_agents/startup_scripts/mmm5-tax-day/kmeans-gsas.py
     volumes:
       - type: bind

diff --git a/pdf_agents/agents.py b/pdf_agents/agents.py
@@ -1,4 +1,5 @@
 import ast
+import os
 import uuid
 from abc import ABC
 from logging import getLogger
@@ -274,7 +275,7 @@ def get_beamline_objects() -> dict:
             config_file_path="/etc/bluesky/kafka.yml"
         )
         qs = REManagerAPI(http_server_uri=f"https://qserver.nsls2.bnl.gov/{beamline_tla}")
-        qs.set_authorization_key(api_key="yyyyy")
+        qs.set_authorization_key(api_key=os.getenv("HTTPSERVER_API_KEY", "zzzzz"))
 
         kafka_consumer = AgentConsumer(
             topics=[