Fix qodana issues

backend/openmlr/db/operations.py

@@ -385,7 +385,7 @@ async def upsert_paper_resource(
 async def upsert_resource(
     db: AsyncSession, conv_id: int,
     resource_id: str, title: str, resource_type: str,
-    content: str = None, url: str = None,
+    content: str | None = None, url: str | None = None,
 ) -> ConversationResource:
     """Create or update a resource by resource_id."""
     existing = await get_resource_by_id(db, resource_id)
@@ -478,7 +478,7 @@ async def update_job_status(
 
 # ---- User Settings ----
 
-async def get_user_settings(db: AsyncSession, user_id: int, category: str = None) -> dict:
+async def get_user_settings(db: AsyncSession, user_id: int, category: str | None = None) -> dict:
     """Get user settings as a dict. Optionally filter by category."""
     query = select(UserSetting).where(UserSetting.user_id == user_id)
     if category:

backend/openmlr/services/session_manager.py

@@ -86,11 +86,13 @@
 
         session = Session(config=config, conversation_id=conversation_id)
 
+        # Import here (not at module level) to avoid circular imports
+        from ..db import operations as ops
+
         # Determine effective compute node
         effective_node = None
         if user_id and db:
             try:
-                from ..db import operations as ops
                 # Check conversation override
                 conv = await ops.get_conversation_by_id(db, conversation_id)
                 if conv and conv.extra:
@@ -130,7 +132,6 @@
         # Load MCP servers from user settings if available
         if user_id and db:
             try:
-                from ..db import operations as ops
                 user_settings = await ops.get_all_settings(db, user_id, category="mcp")
                 mcp_settings = user_settings.get("mcp", {})
                 mcp_servers = mcp_settings.get("servers", {})
@@ -176,7 +177,7 @@
             if user_id and db:
                 try:
                     all_nodes = await ops.get_compute_nodes(db, user_id)
                 except Exception:
                     pass
             if len(all_nodes) > 1:
                 lines.append("\n### Other Available Nodes")
@@ -226,16 +227,16 @@
                 try:
                     if not active.session.pending_answers.done():
                         active.session.pending_answers.cancel()
                 except Exception:
                     pass
             try:
                 await active.sandbox_manager.destroy()
             except Exception:
                 pass
             # Disconnect MCP servers
             try:
                 await active.mcp_manager.disconnect_all()
             except Exception:
                 pass
         if self.current_conversation_id == conversation_id:
             self.current_conversation_id = None
@@ -287,7 +288,7 @@
             return None
         try:
             return await LLMProvider.generate_title(messages, active.session.config)
         except Exception:
             return None
 
     @property

backend/openmlr/tools/compute_tools.py

@@ -20,7 +20,7 @@
     return target, None
 
 
 async def _handle_list(user_id: int = None, db=None, **kwargs):
     """List all compute nodes with capabilities."""
     if not db:
         return "Database connection required for compute_list", False
@@ -53,7 +53,7 @@
     return "\n".join(lines), True
 
 
 async def _handle_probe(node_name: str, user_id: int = None, db=None, **kwargs):
     """Probe a compute node for capabilities."""
     if not db:
         return "Database connection required for compute_probe", False
@@ -67,6 +67,7 @@
     from ..compute import WorkspaceManager
     from ..sandbox.manager import SandboxManager
 
+    sm = None
     try:
         wm = WorkspaceManager()
         sm = SandboxManager(workspace_manager=wm)
@@ -88,7 +89,7 @@
         await sm.destroy()
 
         # Format response
         lines = [f"## {node.name} Capabilities\n"]
         lines.append(f"Platform: {caps.platform}")
         lines.append(f"CPU: {caps.cpu_cores} cores ({caps.cpu_arch})")
         lines.append(f"RAM: {caps.available_ram_gb:.1f} GB available / {caps.total_ram_gb:.1f} GB total")
@@ -115,8 +116,9 @@
 
     except Exception as e:
         try:
-            await sm.destroy()
+            if sm is not None:
+                await sm.destroy()
         except Exception:
             pass
         await ops.update_compute_node(
             db, node.id, user_id,
@@ -125,7 +127,7 @@
         return f"Probe failed for {node_name}: {str(e)}", False
 
 
 async def _handle_select(node_name: str, user_id: int = None, db=None, session=None, **kwargs):
     """Select a compute node as active for this conversation."""
     if not db:
         return "Database connection required for compute_select", False
@@ -149,7 +151,7 @@
     return f"Active compute switched to: {node.name} ({node.type})", True
 
 
 async def _handle_plan(task: str, requirements: dict = None, user_id: int = None, db=None, **kwargs):
     """Recommend the best compute node for a task."""
     if not db:
         return "Database connection required for compute_plan", False
@@ -224,7 +226,7 @@
     scores.sort(key=lambda x: x["score"], reverse=True)
     best = scores[0]
 
     lines = [f"## Recommended Compute for: {task}\n"]
     lines.append(f"**Best choice: {best['node'].name}** ({best['node'].type})")
     lines.append(f"Score: {best['score']:.1f}")
     lines.append(f"Reasons: {', '.join(best['reasons'])}")
@@ -237,7 +239,7 @@
     return "\n".join(lines), True
 
 
 async def _get_sync_context(user_id, db, session):
     """Helper: resolve conversation UUID and workspace path for sync ops."""
     from ..db import operations as ops
     conv_uuid = None
@@ -253,7 +255,7 @@
     return conv_uuid, local_ws, None
 
 
 async def _handle_sync_up(paths: list, node_name: str, user_id: int = None, db=None, session=None, **kwargs):
     """Sync files from local workspace to remote compute node."""
     if not db:
         return "Database connection required", False
@@ -301,7 +303,7 @@
                             await ssh_sandbox.execute(f"mkdir -p '{dst_dir}'", timeout=5)
                             content = src.read_bytes()
                             await asyncio.to_thread(
                                 lambda d=dst, c=content: ssh_sandbox._sftp.putfo(io.BytesIO(c), d)
                             )
                             transferred += 1
                 else:
@@ -311,7 +313,7 @@
                     await ssh_sandbox.execute(f"mkdir -p '{dst_dir}'", timeout=5)
                     content = local_path.read_bytes()
                     await asyncio.to_thread(
                         lambda d=dst, c=content: ssh_sandbox._sftp.putfo(io.BytesIO(c), d)
                     )
                     transferred += 1
 
@@ -327,7 +329,7 @@
     return "Unsupported node type", False
 
 
 async def _handle_sync_down(paths: list, node_name: str, user_id: int = None, db=None, session=None, **kwargs):
     """Sync files from remote compute node to local workspace."""
     if not db:
         return "Database connection required", False
@@ -377,7 +379,7 @@
 
                     def _do_get(rpath=rp):
                         buf = io.BytesIO()
                         ssh_sandbox._sftp.getfo(rpath, buf)
                         buf.seek(0)
                         return buf.read()
 
@@ -400,7 +402,7 @@
                         # Bind rf in default arg to avoid closure-in-loop bug
                         def _do_get_file(rpath=rf):
                             buf = io.BytesIO()
                             ssh_sandbox._sftp.getfo(rpath, buf)
                             buf.seek(0)
                             return buf.read()
 

backend/tests/test_agent_loop.py

@@ -6,14 +6,14 @@
 
 from openmlr.agent.context import ContextManager
 from openmlr.agent.loop import (
     _compact,
     _compact_llm_call,
     _execute_tool,
     _handle_approval,
     _non_stream_llm_call,
     _run_agent,
     _stream_llm_call,
     _undo,
     run_agent_turn,
     submission_loop,
 )
@@ -326,7 +326,7 @@
         mock_session.is_cancelled.return_value = False
         mock_session.config = AgentConfig(model_name="test", stream=True)
 
         async def mock_stream(messages, config, tools):
             yield "Hello"
             yield " world"
 
@@ -341,10 +341,8 @@
     async def test_cancelled_returns_none(self, mock_session):
         mock_session.is_cancelled.return_value = True
 
         async def mock_stream(messages, config, tools):
             yield "Hello"
-            if False:
-                yield
 
         with patch("openmlr.agent.loop.LLMProvider.generate_stream") as mock_str:
             mock_str.return_value = mock_stream(None, None, None)
@@ -357,7 +355,7 @@
         mock_session.config = AgentConfig(model_name="test", stream=True)
         tc = ToolCall(id="call_1", name="search", arguments={"query": "test"})
 
         async def mock_stream(messages, config, tools):
             yield "Finding..."
             yield tc
 

qodana.yaml

@@ -4,7 +4,11 @@
 
 version: "1.0"
 linter: jetbrains/qodana-python-community:2025.3
+projectJDK: "python3.12"
 profile:
   name: qodana.recommended
+bootstrap: |
+  # Ensure Qodana uses Python 3.12+ for correct type hint inspection (PEP 604, PEP 585)
+  python3.12 --version 2>/dev/null || python3 --version
 include:
   - name: CheckDependencyLicenses