Merged recent changes from 'main' branch

Author: tieneupin

pyproject.toml

@@ -54,8 +54,7 @@ developer = [
 ]
 instrument-server = [
     "fastapi[standard]",
-    "python-jose[cryptography]",
-    "uvicorn[standard]",
+    "python-jose",
 ]
 server = [
     "aiohttp",
@@ -73,7 +72,6 @@ server = [
     "sqlalchemy[postgresql]", # Add as explicit dependency
     "sqlmodel",
     "stomp-py<=8.1.0", # 8.1.1 (released 2024-04-06) doesn't work with our project
-    "uvicorn[standard]",
     "zocalo",
 ]
 [project.urls]

src/murfey/client/customlogging.py

@@ -23,7 +23,7 @@ def prepare(self, record):
         try:
             return json.dumps(record_dict)
         except TypeError:
-            return json.dumps({str(k): str(v) for k, v in record_dict.items})
+            return json.dumps({str(k): str(v) for k, v in record_dict.items()})
 
     def emit(self, record):
         try:

src/murfey/server/__init__.py

@@ -2271,7 +2271,7 @@ def feedback_callback(header: dict, message: dict) -> None:
             ):
                 try:
                     for hook in dcg_hooks:
-                        hook(dcgid, session_id=message["session_id"])
+                        hook.load()(dcgid, session_id=message["session_id"])
                 except Exception:
                     logger.error(
                         "Call to data collection group hook failed", exc_info=True

src/murfey/server/api/__init__.py

@@ -1725,7 +1725,7 @@ async def write_eer_fractionation_file(
     ).all()
     if session_parameters:
         session_parameters[0].eer_fractionation_file = str(file_path)
-        db.add(session_parameters)
+        db.add(session_parameters[0])
         db.commit()
 
     if file_path.is_file():