Remove the need for an ispyb environment variable

Author: stephen-riggs

src/murfey/server/ispyb.py

@@ -2,7 +2,6 @@
 
 import datetime
 import logging
-import os
 from typing import Callable, List, Optional
 
 import ispyb
@@ -31,9 +30,11 @@
     url,
 )
 
+from murfey.util.config import get_security_config
 from murfey.util.models import FoilHoleParameters, GridSquareParameters, Sample, Visit
 
 log = logging.getLogger("murfey.server.ispyb")
+security_config = get_security_config()
 
 try:
     Session = sqlalchemy.orm.sessionmaker(
@@ -60,7 +61,11 @@ def __init__(self, transport_type):
         self.transport = workflows.transport.lookup(transport_type)()
         self.transport.connect()
         self.feedback_queue = ""
-        self.ispyb = ispyb.open() if os.getenv("ISPYB_CREDENTIALS") else None
+        self.ispyb = (
+            ispyb.open(credentials=security_config.ispyb_credentials)
+            if security_config.ispyb_credentials
+            else None
+        )
         self._connection_callback: Callable | None = None
 
     def reconnect(self):

src/murfey/util/config.py

@@ -94,6 +94,7 @@ class Security(BaseModel):
     auth_type: Literal["password", "cookie"] = "password"
     cookie_key: str = ""
     feedback_queue: str = "murfey_feedback"
+    ispyb_credentials: Optional[str] = None
 
 
 def security_from_file(config_file_path: Path) -> Security: