From 8d6b5be307359b501025dfee370fee2a49b29072 Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Sat, 3 Feb 2024 17:30:58 +0100 Subject: [PATCH] take request out of bottle --- sf_daq_broker/rest_api.py | 22 +++++++++++----------- sf_daq_broker/rest_api_slow.py | 12 ++++++------ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/sf_daq_broker/rest_api.py b/sf_daq_broker/rest_api.py index 4120bd3..9803cdb 100644 --- a/sf_daq_broker/rest_api.py +++ b/sf_daq_broker/rest_api.py @@ -1,4 +1,4 @@ -import bottle +from bottle import request from .rest_api_error import register_error_handler @@ -9,43 +9,43 @@ def register_rest_interface(app, manager): @app.post("/retrieve_from_buffers") def retrieve_from_buffers(): - return manager.retrieve_from_buffers(bottle.request.json, bottle.request.remote_addr) + return manager.retrieve_from_buffers(request.json, request.remote_addr) @app.post("/take_pedestal") def take_pedestal(): - return manager.take_pedestal(bottle.request.json, bottle.request.remote_addr) + return manager.take_pedestal(request.json, request.remote_addr) @app.get("/get_allowed_detectors_list") def get_allowed_detectors_list(): - return manager.get_allowed_detectors_list(bottle.request.json, bottle.request.remote_addr) + return manager.get_allowed_detectors_list(request.json, request.remote_addr) @app.get("/get_running_detectors_list") def get_running_detectors_list(): - return manager.get_running_detectors_list(bottle.request.json, bottle.request.remote_addr) + return manager.get_running_detectors_list(request.json, request.remote_addr) @app.post("/power_on_detector") def power_on_detector(): - return manager.power_on_detector(bottle.request.json, bottle.request.remote_addr) + return manager.power_on_detector(request.json, request.remote_addr) @app.get("/get_next_run_number") def get_next_run_number(): - return manager.get_next_run_number(bottle.request.json, bottle.request.remote_addr) + return manager.get_next_run_number(request.json, request.remote_addr) @app.get("/get_last_run_number") def get_last_run_number(): - return manager.get_last_run_number(bottle.request.json, bottle.request.remote_addr) + return manager.get_last_run_number(request.json, request.remote_addr) @app.get("/get_pvlist") def get_pvlist(): - return manager.get_pvlist(bottle.request.json, bottle.request.remote_addr) + return manager.get_pvlist(request.json, request.remote_addr) @app.post("/set_pvlist") def set_pvlist(): - return manager.set_pvlist(bottle.request.json, bottle.request.remote_addr) + return manager.set_pvlist(request.json, request.remote_addr) @app.post("/close_pgroup_writing") def close_pgroup_writing(): - return manager.close_pgroup_writing(bottle.request.json, bottle.request.remote_addr) + return manager.close_pgroup_writing(request.json, request.remote_addr) diff --git a/sf_daq_broker/rest_api_slow.py b/sf_daq_broker/rest_api_slow.py index 4bed757..dee5bfd 100644 --- a/sf_daq_broker/rest_api_slow.py +++ b/sf_daq_broker/rest_api_slow.py @@ -1,4 +1,4 @@ -import bottle +from bottle import request from .rest_api_error import register_error_handler @@ -9,23 +9,23 @@ def register_rest_interface(app, manager): @app.post("/get_detector_settings") def get_detector_settings(): - return manager.get_detector_settings(bottle.request.json, bottle.request.remote_addr) + return manager.get_detector_settings(request.json, request.remote_addr) @app.post("/set_detector_settings") def set_detector_settings(): - return manager.set_detector_settings(bottle.request.json, bottle.request.remote_addr) + return manager.set_detector_settings(request.json, request.remote_addr) @app.post("/copy_user_files") def copy_user_files(): - return manager.copy_user_files(bottle.request.json, bottle.request.remote_addr) + return manager.copy_user_files(request.json, request.remote_addr) @app.post("/get_dap_settings") def get_dap_settings(): - return manager.get_dap_settings(bottle.request.json, bottle.request.remote_addr) + return manager.get_dap_settings(request.json, request.remote_addr) @app.post("/set_dap_settings") def set_dap_settings(): - return manager.set_dap_settings(bottle.request.json, bottle.request.remote_addr) + return manager.set_dap_settings(request.json, request.remote_addr)