Skip to content

Commit cc7600b

Browse files
committed
Client should use session_control
1 parent 8c5718e commit cc7600b

File tree

3 files changed

+18
-1
lines changed

3 files changed

+18
-1
lines changed

src/murfey/client/contexts/spa.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ def _position_analysis(
302302
data_collection_group = (
303303
capture_get(
304304
base_url=str(environment.url.geturl()),
305-
router_name="session_info.router",
305+
router_name="session_control.router",
306306
function_name="get_dc_groups",
307307
token=self._token,
308308
session_id=environment.murfey_session,

src/murfey/server/api/session_control.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,16 @@ def remove_session(session_id: MurfeySessionID, db=murfey_db):
165165
remove_session_by_id(session_id, db)
166166

167167

168+
@router.get("/sessions/{session_id}/data_collection_groups")
169+
def get_dc_groups(
170+
session_id: MurfeySessionID, db=murfey_db
171+
) -> Dict[str, DataCollectionGroup]:
172+
data_collection_groups = db.exec(
173+
select(DataCollectionGroup).where(DataCollectionGroup.session_id == session_id)
174+
).all()
175+
return {dcg.tag: dcg for dcg in data_collection_groups}
176+
177+
168178
@router.post("/sessions/{session_id}/successful_processing")
169179
def register_processing_success_in_ispyb(
170180
session_id: MurfeySessionID, db=ispyb_db, murfey_db=murfey_db

src/murfey/util/route_manifest.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -826,6 +826,13 @@ murfey.server.api.session_control.router:
826826
type: int
827827
methods:
828828
- DELETE
829+
- path: /session_info/sessions/{session_id}/data_collection_groups
830+
function: get_dc_groups
831+
path_params:
832+
- name: session_id
833+
type: int
834+
methods:
835+
- GET
829836
- path: /session_control/sessions/{session_id}/successful_processing
830837
function: register_processing_success_in_ispyb
831838
path_params:

0 commit comments

Comments
 (0)