Merged recent changes from 'main' branch

Author: tieneupin

pyproject.toml

@@ -80,8 +80,8 @@ Bug-Tracker = "https://github.com/DiamondLightSource/python-murfey/issues"
 Documentation = "https://github.com/DiamondLightSource/python-murfey"
 GitHub = "https://github.com/DiamondLightSource/python-murfey"
 [project.scripts]
-murfey = "murfey.client:run"
 "murfey.add_user" = "murfey.cli.add_user:run"
+"murfey.client" = "murfey.client:run"
 "murfey.create_db" = "murfey.cli.create_db:run"
 "murfey.db_sql" = "murfey.cli.murfey_db_sql:run"
 "murfey.decrypt_password" = "murfey.cli.decrypt_db_password:run"

src/murfey/instrument_server/__init__.py

@@ -1,10 +1,12 @@
 import argparse
 import logging
+from urllib.parse import urlparse
 
 import uvicorn
 from rich.logging import RichHandler
 
 import murfey
+import murfey.client.update
 from murfey.client.customlogging import CustomHandler
 from murfey.util import LogFilter
 from murfey.util.client import read_config
@@ -27,6 +29,12 @@ def run():
     )
     args = parser.parse_args()
 
+    murfey_url = urlparse(read_config()["Murfey"].get("server"), allow_fragments=False)
+    try:
+        murfey.client.update.check(murfey_url)
+    except Exception as e:
+        print(f"Murfey update check failed with {e}")
+
     LogFilter.install()
 
     rich_handler = RichHandler(enable_link_path=False)

src/murfey/server/api/auth.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import os
 import secrets
 import time
 from logging import getLogger
@@ -19,7 +18,7 @@
 
 from murfey.server import sanitise
 from murfey.server.murfey_db import murfey_db, url
-from murfey.util.config import get_machine_config, get_security_config
+from murfey.util.config import get_security_config
 from murfey.util.db import MurfeyUser as User
 from murfey.util.db import Session as MurfeySession
 
@@ -64,12 +63,7 @@ async def __call__(self, request: Request):
 
 # Set up variables used for authentication
 security_config = get_security_config()
-machine_config = get_machine_config()
-auth_url = (
-    machine_config[os.getenv("BEAMLINE", "")].auth_url
-    if machine_config.get(os.getenv("BEAMLINE", ""))
-    else ""
-)
+auth_url = security_config.auth_url
 ALGORITHM = security_config.auth_algorithm or "HS256"
 SECRET_KEY = security_config.auth_key or secrets.token_hex(32)
 if security_config.auth_type == "password":

src/murfey/util/config.py

@@ -68,7 +68,6 @@ class MachineConfig(BaseModel, extra=Extra.allow):  # type: ignore
     rsync_url: str = ""
 
     security_configuration_path: Optional[Path] = None
-    auth_url: str = ""
 
     notifications_queue: str = "pato_notification"
 
@@ -88,6 +87,7 @@ class Security(BaseModel):
     crypto_key: str
     auth_key: str = ""
     auth_algorithm: str = ""
+    auth_url: str = ""
     sqlalchemy_pooling: bool = True
     allow_origins: List[str] = ["*"]
     session_validation: str = ""