Web-API

- Fixed E-NAUTILUS endpoints to work with the new SessionContextGuard.

Author: gialmisi

desdeo/api/routers/enautilus.py

@@ -36,10 +36,7 @@
 @router.post("/step")
 def step(
     request: ENautilusStepRequest,
-    context: Annotated[
-        SessionContext,
-        Depends(SessionContextGuard(require=[ContextField.PROBLEM]))
-    ],
+    context: Annotated[SessionContext, Depends(SessionContextGuard(require=[ContextField.PROBLEM]))],
 ) -> ENautilusStepResponse:
     """Steps the E-NAUTILUS method."""
     db_session = context.db_session
@@ -244,7 +241,10 @@ def get_representative(
 @router.post("/finalize")
 def finalize_enautilus(
     request: ENautilusFinalizeRequest,
-    context: Annotated[SessionContext, Depends(get_session_context)],
+    context: Annotated[
+        SessionContext,
+        Depends(SessionContextGuard(require=[ContextField.PROBLEM, ContextField.PARENT_STATE])),
+    ],
 ) -> ENautilusFinalizeResponse:
     """Finalize E-NAUTILUS by selecting the final solution.
 
@@ -362,8 +362,7 @@ def finalize_enautilus(
 
 @router.get("/session_tree/{session_id}")
 def get_session_tree(
-    session_id: int,
-    db_session: Annotated[Session, Depends(get_session)],
+    session_id: int, context: Annotated[SessionContext, Depends(SessionContextGuard())]
 ) -> ENautilusSessionTreeResponse:
     """Extract the full E-NAUTILUS decision tree for a session.
 
@@ -372,11 +371,13 @@ def get_session_tree(
 
     Args:
         session_id: The interactive session ID.
-        db_session: The database session.
+        context: The context of the query.
 
     Returns:
         ENautilusSessionTreeResponse with nodes, edges, root_ids, and decision_events.
     """
+    db_session = context.db_session
+
     # Query step states
     step_stmt = (
         select(StateDB)

desdeo/api/routers/problem.py

@@ -109,6 +109,7 @@ def get_problem(
     """
     return context.problem_db
 
+
 @router.post("/add")
 def add_problem(
     request: Annotated[Problem, Depends(parse_problem_json)],
@@ -445,7 +446,7 @@ def delete_representative_solution_set(
 @router.delete("/{problem_id}", status_code=status.HTTP_204_NO_CONTENT)
 def delete_problem(
     problem_id: int,
-    context: Annotated[SessionContext, Depends(get_session_context_without_request)],
+    context: Annotated[SessionContext, Depends(SessionContextGuard())],
 ):
     """Delete a problem by its ID."""
     db_session: Session = context.db_session
@@ -465,7 +466,7 @@ def delete_problem(
 @router.get("/{problem_id}/json")
 def get_problem_json(
     problem_id: int,
-    context: Annotated[SessionContext, Depends(get_session_context_without_request)],
+    context: Annotated[SessionContext, Depends(SessionContextGuard())],
 ) -> JSONResponse:
     """Return a Problem as a serialized JSON object suitable for download/re-upload."""
     db_session: Session = context.db_session