diff --git a/src/openflexure_microscope_server/server/__init__.py b/src/openflexure_microscope_server/server/__init__.py index 546f7118..afcf7e8b 100644 --- a/src/openflexure_microscope_server/server/__init__.py +++ b/src/openflexure_microscope_server/server/__init__.py @@ -93,8 +93,8 @@ def customise_server( lt.logs.configure_thing_logger(logging.DEBUG) # Add an endpoint to get the logs - (directly calling the FastAPI decorator) - server.app.get(str(server._api_prefix.rstrip("/")) + "/log/")(retrieve_log) - server.app.get(str(server._api_prefix.rstrip("/")) + "/logfile/")( + server.app.get(str(server.api_prefix.rstrip("/")) + "/log/")(retrieve_log) + server.app.get(str(server.api_prefix.rstrip("/")) + "/logfile/")( retrieve_log_from_file ) diff --git a/src/openflexure_microscope_server/server/serve_static_files.py b/src/openflexure_microscope_server/server/serve_static_files.py index 0d360a73..f34bc93e 100644 --- a/src/openflexure_microscope_server/server/serve_static_files.py +++ b/src/openflexure_microscope_server/server/serve_static_files.py @@ -74,7 +74,7 @@ def add_static_files(server: lt.ThingServer, data_folder: str) -> None: if not os.path.isdir(data_folder): os.makedirs(data_folder) app.mount( - server._api_prefix.rstrip("/") + "/data/", + server.api_prefix.rstrip("/") + "/data/", StaticFiles(directory=data_folder), name="data", ) diff --git a/tests/unit_tests/test_serve_static_files.py b/tests/unit_tests/test_serve_static_files.py index 62a741d0..c62331bf 100644 --- a/tests/unit_tests/test_serve_static_files.py +++ b/tests/unit_tests/test_serve_static_files.py @@ -126,7 +126,7 @@ def test_add_static_files(mock_static_dir, mocker): ) mock_server = mocker.Mock() mock_server.app = mock_app - mock_server._api_prefix = "/api/v3" + mock_server.api_prefix = "/api/v3" # Get the wrapper function from the mocked decorator wrapper = mock_app.get.return_value with tempfile.TemporaryDirectory() as datadir: diff --git a/tests/unit_tests/test_server_config.py b/tests/unit_tests/test_server_config.py index 25dea30f..5ce1cac9 100644 --- a/tests/unit_tests/test_server_config.py +++ b/tests/unit_tests/test_server_config.py @@ -63,7 +63,7 @@ def test_customise_server(mocker): mocked_retrieve_log = mocker.patch.object(ofm_server, "retrieve_log") mocked_retrieve_log_file = mocker.patch.object(ofm_server, "retrieve_log_from_file") - mock_server._api_prefix = "/api/v3/" + mock_server.api_prefix = "/api/v3/" mock_app = mock_server.app # The wrapper returned for app.get so we can see what functions are decorated. wrapper = mock_app.get.return_value