rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove the leading underscore from ThingServer._api_prefix.

Browse source
This commit is contained in:
Richard Bowman 2026-05-12 20:44:44 +01:00
parent eff66eb667
commit 7163823bf7
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/openflexure_microscope_server/server/__init__.py
View file

@ -93,8 +93,8 @@ def customise_server(
lt.logs.configure_thing_logger(logging.DEBUG) lt.logs.configure_thing_logger(logging.DEBUG)
# Add an endpoint to get the logs - (directly calling the FastAPI decorator) # 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("/")) + "/log/")(retrieve_log)
server.app.get(str(server._api_prefix.rstrip("/")) + "/logfile/")( server.app.get(str(server.api_prefix.rstrip("/")) + "/logfile/")(
retrieve_log_from_file retrieve_log_from_file
) )

2
src/openflexure_microscope_server/server/serve_static_files.py
View file

@ -74,7 +74,7 @@ def add_static_files(server: lt.ThingServer, data_folder: str) -> None:
if not os.path.isdir(data_folder): if not os.path.isdir(data_folder):
os.makedirs(data_folder) os.makedirs(data_folder)
app.mount( app.mount(
server._api_prefix.rstrip("/") + "/data/", server.api_prefix.rstrip("/") + "/data/",
StaticFiles(directory=data_folder), StaticFiles(directory=data_folder),
name="data", name="data",
) )

2
tests/unit_tests/test_serve_static_files.py
View file

@ -126,7 +126,7 @@ def test_add_static_files(mock_static_dir, mocker):
) )
mock_server = mocker.Mock() mock_server = mocker.Mock()
mock_server.app = mock_app 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 # Get the wrapper function from the mocked decorator
wrapper = mock_app.get.return_value wrapper = mock_app.get.return_value
with tempfile.TemporaryDirectory() as datadir: with tempfile.TemporaryDirectory() as datadir:

2
tests/unit_tests/test_server_config.py
View file

@ -63,7 +63,7 @@ def test_customise_server(mocker):
mocked_retrieve_log = mocker.patch.object(ofm_server, "retrieve_log") mocked_retrieve_log = mocker.patch.object(ofm_server, "retrieve_log")
mocked_retrieve_log_file = mocker.patch.object(ofm_server, "retrieve_log_from_file") 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 mock_app = mock_server.app
# The wrapper returned for app.get so we can see what functions are decorated. # The wrapper returned for app.get so we can see what functions are decorated.
wrapper = mock_app.get.return_value wrapper = mock_app.get.return_value