Fixed broken imports due to 'murfey.server' refactor; moved FastAPI templates to 'murfey.server.api' instead.

Author: tieneupin

src/murfey/server/__init__.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from importlib.resources import files
 from typing import TYPE_CHECKING
 
 # Classes are only imported for type checking purposes
@@ -10,3 +11,4 @@
 
 _running_server: Server | None = None
 _transport_object: TransportManager | None = None
+template_files = files("murfey") / "templates"

src/murfey/server/api/__init__.py

@@ -0,0 +1,5 @@
+from fastapi.templating import Jinja2Templates
+
+from murfey.server import template_files
+
+templates = Jinja2Templates(template_files)

src/murfey/server/api/bootstrap.py

@@ -20,7 +20,6 @@
 import random
 import re
 import zipfile
-from importlib.resources import files
 from io import BytesIO
 from typing import Any
 from urllib.parse import quote
@@ -29,9 +28,9 @@
 import requests
 from fastapi import APIRouter, HTTPException, Query, Request, Response
 from fastapi.responses import FileResponse, HTMLResponse, StreamingResponse
-from fastapi.templating import Jinja2Templates
 
 import murfey
+from murfey.server.api import templates
 from murfey.util.config import get_hostname, get_machine_config, get_microscope
 
 tag = {
@@ -101,9 +100,6 @@ def get_version(client_version: str = ""):
 =======================================================================================
 """
 
-template_files = files("murfey") / "templates"
-templates = Jinja2Templates(directory=template_files)
-
 
 def respond_with_template(
     request: Request, filename: str, parameters: dict[str, Any] | None = None

src/murfey/server/api/session_info.py

@@ -12,7 +12,8 @@
 
 import murfey.server.ispyb
 import murfey.server.websocket as ws
-from murfey.server import _transport_object, get_hostname, get_microscope, templates
+from murfey.server import _transport_object
+from murfey.server.api import templates
 from murfey.server.api.auth import MurfeySessionID, validate_token
 from murfey.server.api.shared import get_foil_hole as _get_foil_hole
 from murfey.server.api.shared import (
@@ -29,7 +30,12 @@
 )
 from murfey.server.murfey_db import murfey_db
 from murfey.util import sanitise
-from murfey.util.config import MachineConfig, get_machine_config
+from murfey.util.config import (
+    MachineConfig,
+    get_hostname,
+    get_machine_config,
+    get_microscope,
+)
 from murfey.util.db import (
     ClientEnvironment,
     DataCollection,

src/murfey/server/api/workflow.py

@@ -25,17 +25,17 @@
     Image = None
 
 import murfey.server.prometheus as prom
-from murfey.server import (
+from murfey.server import _transport_object
+from murfey.server.api.auth import MurfeySessionID, validate_token
+from murfey.server.api.spa import _cryolo_model_path
+from murfey.server.feedback import (
     _murfey_id,
-    _transport_object,
     check_tilt_series_mc,
     get_all_tilts,
     get_angle,
     get_job_ids,
     get_tomo_proc_params,
 )
-from murfey.server.api.auth import MurfeySessionID, validate_token
-from murfey.server.api.spa import _cryolo_model_path
 from murfey.server.ispyb import DB, get_proposal_id
 from murfey.server.murfey_db import murfey_db
 from murfey.util import sanitise

src/murfey/server/main.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import logging
-import os
 
 from backports.entry_points_selectable import entry_points
 from fastapi import FastAPI
@@ -29,13 +28,6 @@
 from murfey.server import template_files
 from murfey.util.config import get_security_config
 
-# Import Murfey server or demo server based on settings
-if os.getenv("MURFEY_DEMO"):
-    from murfey.server.demo_api import router
-else:
-    from murfey.server.api import router
-
-
 log = logging.getLogger("murfey.server.main")
 
 tags_metadata = [murfey.server.api.bootstrap.tag]
@@ -66,7 +58,6 @@ class Settings(BaseSettings):
 app.mount("/images", StaticFiles(directory=template_files / "images"), name="images")
 
 # Add router endpoints to the API
-app.include_router(router)
 app.include_router(murfey.server.api.bootstrap.version)
 app.include_router(murfey.server.api.bootstrap.bootstrap)
 app.include_router(murfey.server.api.bootstrap.cygwin)

src/murfey/workflows/spa/flush_spa_preprocess.py

@@ -6,8 +6,9 @@
 from sqlalchemy.exc import NoResultFound
 from sqlmodel import Session, select
 
-from murfey.server import _murfey_id, _transport_object
+from murfey.server import _transport_object
 from murfey.server.api.auth import MurfeySessionID
+from murfey.server.feedback import _murfey_id
 from murfey.util import sanitise, secure_path
 from murfey.util.config import get_machine_config, get_microscope
 from murfey.util.db import (