Moved 'count_number_of_omves()' from 'session_info' router to 'session_control'; updated route manifest and module where it's called

Author: tieneupin

src/murfey/client/contexts/spa.py

@@ -567,7 +567,7 @@ def post_transfer(
                         )
                         if not environment.movie_counters.get(str(source)):
                             movie_counts_get = capture_get(
-                                f"{environment.url.geturl()}{url_path_for('session_info.router', 'count_number_of_movies')}",
+                                f"{environment.url.geturl()}{url_path_for('session_control.router', 'count_number_of_movies')}",
                             )
                             if movie_counts_get is not None:
                                 environment.movie_counters[str(source)] = count(

src/murfey/server/api/session_control.py

@@ -7,6 +7,7 @@
 from fastapi.responses import FileResponse
 from ispyb.sqlalchemy import AutoProcProgram as ISPyBAutoProcProgram
 from pydantic import BaseModel
+from sqlalchemy import func
 from sqlmodel import select
 from werkzeug.utils import secure_filename
 
@@ -39,6 +40,7 @@
     DataCollectionGroup,
     FoilHole,
     GridSquare,
+    Movie,
     ProcessingJob,
     RsyncInstance,
     Session,
@@ -178,6 +180,14 @@ def register_processing_success_in_ispyb(
                 _transport_object.do_update_processing_status(updated)
 
 
+@router.get("/num_movies")
+def count_number_of_movies(db=murfey_db) -> Dict[str, int]:
+    res = db.exec(
+        select(Movie.tag, func.count(Movie.murfey_id)).group_by(Movie.tag)
+    ).all()
+    return {r[0]: r[1] for r in res}
+
+
 class PostInfo(BaseModel):
     url: str
     data: dict

src/murfey/server/api/session_info.py

@@ -6,7 +6,6 @@
 from fastapi import APIRouter, Depends, Request
 from fastapi.responses import FileResponse, HTMLResponse
 from pydantic import BaseModel
-from sqlalchemy import func
 from sqlmodel import select
 from werkzeug.utils import secure_filename
 
@@ -262,14 +261,6 @@ async def get_clients(db=murfey_db):
     return clients
 
 
-@router.get("/num_movies")
-def count_number_of_movies(db=murfey_db) -> Dict[str, int]:
-    res = db.exec(
-        select(Movie.tag, func.count(Movie.murfey_id)).group_by(Movie.tag)
-    ).all()
-    return {r[0]: r[1] for r in res}
-
-
 class CurrentGainRef(BaseModel):
     path: str
 

src/murfey/util/route_manifest.yaml

@@ -706,6 +706,11 @@ murfey.server.api.session_control.router:
     path_params: []
     methods:
       - POST
+  - path: /session_control/num_movies
+    function: count_number_of_movies
+    path_params: []
+    methods:
+      - GET
   - path: /session_control/instruments/{instrument_name}/failed_client_post
     function: failed_client_post
     path_params:
@@ -921,11 +926,6 @@ murfey.server.api.session_info.router:
     path_params: []
     methods:
       - GET
-  - path: /session_info/num_movies
-    function: count_number_of_movies
-    path_params: []
-    methods:
-      - GET
   - path: /session_info/sessions/{session_id}/current_gain_ref
     function: update_current_gain_ref
     path_params: []