Skip to content

Commit dc652ba

Browse files
committed
Allow analysis to be turned off via a query parameter
1 parent 17aca93 commit dc652ba

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

src/murfey/instrument_server/api.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,13 @@ def setup_multigrid_watcher(
186186

187187

188188
@router.post("/sessions/{session_id}/start_multigrid_watcher")
189-
def start_multigrid_watcher(session_id: MurfeySessionID):
189+
def start_multigrid_watcher(session_id: MurfeySessionID, process: bool = True):
190190
if watchers.get(session_id) is None:
191191
return {"success": False}
192+
if not process:
193+
watchers[session_id]._listeners = [
194+
partial(watchers[session_id]._listeners[0], analyse=False)
195+
]
192196
watchers[session_id].start()
193197
return {"success": True}
194198

src/murfey/server/api/instrument.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,9 @@ async def setup_multigrid_watcher(
140140

141141

142142
@router.post("/sessions/{session_id}/start_multigrid_watcher")
143-
async def start_multigrid_watcher(session_id: MurfeySessionID, db=murfey_db):
143+
async def start_multigrid_watcher(
144+
session_id: MurfeySessionID, process: bool = True, db=murfey_db
145+
):
144146
data = {}
145147
instrument_name = (
146148
db.exec(select(Session).where(Session.id == session_id)).one().instrument_name
@@ -151,7 +153,7 @@ async def start_multigrid_watcher(session_id: MurfeySessionID, db=murfey_db):
151153
if machine_config.instrument_server_url:
152154
async with aiohttp.ClientSession() as clientsession:
153155
async with clientsession.post(
154-
f"{machine_config.instrument_server_url}/sessions/{session_id}/start_multigrid_watcher",
156+
f"{machine_config.instrument_server_url}/sessions/{session_id}/start_multigrid_watcher?process={'true' if process else 'false'}",
155157
headers={
156158
"Authorization": f"Bearer {instrument_server_tokens[session_id]['access_token']}"
157159
},

0 commit comments

Comments
 (0)