Refactored 'murfey.instrument_server.__init__' so that the Murfey update checker is run through to completion before the components needed to update the server are imported and initialised, thereby avoiding the files associated with the process from becoming locked

Author: tieneupin

src/murfey/instrument_server/__init__.py

@@ -1,21 +1,34 @@
-import argparse
 import logging
 from urllib.parse import urlparse
 
-import uvicorn
-from rich.logging import RichHandler
-
-import murfey
-import murfey.client.update
-import murfey.client.websocket
-from murfey.client.customlogging import CustomHandler
-from murfey.util import LogFilter
 from murfey.util.client import read_config
 
 logger = logging.getLogger("murfey.instrument_server")
 
 
-def run():
+def check_for_updates():
+    import murfey.client.update
+
+    murfey_url = urlparse(
+        read_config().get("Murfey", "server", fallback=""), allow_fragments=False
+    )
+    try:
+        murfey.client.update.check(murfey_url)
+    except Exception as e:
+        print(f"Murfey update check failed with {e}")
+
+
+def start_instrument_server():
+    import argparse
+
+    import uvicorn
+    from rich.logging import RichHandler
+
+    import murfey
+    import murfey.client.websocket
+    from murfey.client.customlogging import CustomHandler
+    from murfey.util import LogFilter
+
     parser = argparse.ArgumentParser(description="Start the Murfey server")
     parser.add_argument(
         "--host",
@@ -30,12 +43,6 @@ 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)
@@ -45,7 +52,7 @@ def run():
     logging.getLogger("uvicorn").addHandler(rich_handler)
 
     ws = murfey.client.websocket.WSApp(
-        server=read_config()["Murfey"].get("server"),
+        server=read_config().get("Murfey", "server", fallback=""),
         register_client=False,
     )
 
@@ -71,3 +78,8 @@ def run():
     _running_server = uvicorn.Server(config=config)
     _running_server.run()
     logger.info("Instrument server shutting down")
+
+
+def run():
+    check_for_updates()
+    start_instrument_server()