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

Merge branch 'log-endpoints' into 'v3'

Browse source 
Update endpoints for logs

Closes #774

See merge request openflexure/openflexure-microscope-server!585
This commit is contained in:
Joe Knapper 2026-05-12 16:29:48 +00:00
commit d358d89334
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -93,8 +93,10 @@ 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("/log/")(retrieve_log) server.app.get(str(server._api_prefix.rstrip("/")) + "/log/")(retrieve_log)
server.app.get("/logfile/")(retrieve_log_from_file) server.app.get(str(server._api_prefix.rstrip("/")) + "/logfile/")(
retrieve_log_from_file
)
def serve_from_cli(argv: Optional[list[str]] = None) -> None: def serve_from_cli(argv: Optional[list[str]] = None) -> None:

5
tests/unit_tests/test_server_config.py
View file

@ -63,6 +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_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
@ -82,8 +83,8 @@ def test_customise_server(mocker):
# Check the routes and functions are as expected. # Check the routes and functions are as expected.
added_routes = [call.args[0] for call in mock_app.get.call_args_list] added_routes = [call.args[0] for call in mock_app.get.call_args_list]
assert "/log/" in added_routes assert "/api/v3/log/" in added_routes
assert "/logfile/" in added_routes assert "/api/v3/logfile/" in added_routes
wrapped_functions = [call.args[0] for call in wrapper.call_args_list] wrapped_functions = [call.args[0] for call in wrapper.call_args_list]
assert mocked_retrieve_log in wrapped_functions assert mocked_retrieve_log in wrapped_functions
assert mocked_retrieve_log_file assert mocked_retrieve_log_file