Merge branch 'feature/tool-retrieval' of https://github.com/qchapp/imaging-plaza-ai-agent into feature/tool-retrieval

Author: qchapp

src/ai_agent/agent/agent.py

@@ -250,23 +250,29 @@ def run_agent(
     base_url: str | None = None,
     top_k: int | None = None,
     num_choices: int | None = None,
+    image_metadata: str | None = None,
 ) -> AgentToolSelection:
     """
     Execute the agent for a user task and at least one image path.
 
     - derive canonical original_formats (tiff / dicom / nifti / ...)
-    - build a compact image metadata summary
+    - build a compact image metadata summary (or use pre-computed one)
     - pass both to the LLM as hidden context
     - store image_paths/original_formats in deps so retrieval tools can use them
     - optionally allow runtime model/base_url/top_k/num_choices overrides
+    
+    Args:
+        image_metadata: Optional pre-computed metadata string. If provided,
+                       avoids redundant metadata extraction.
     """
     if not image_paths:
         raise ValueError("run_agent requires at least one image path")
 
     tool_logs: List[ToolRunLog] = []
 
     # ---- 1) Derive image-based metadata and format hints --------------------
-    meta_str = summarize_image_metadata(image_paths) or ""
+    # Use pre-computed metadata if available, otherwise compute it
+    meta_str = image_metadata if image_metadata is not None else (summarize_image_metadata(image_paths) or "")
     fmt_str = detect_ext_token(image_paths) or ""
     original_formats = [t.lower() for t in fmt_str.split()] if fmt_str else []
 

src/ai_agent/ui/handlers.py

@@ -199,6 +199,10 @@ def respond(
         base_url_override = model_config.get("base_url")  # Can be None for OpenAI
         log.info(f"Model config: {model} -> name={model_name}, base_url={base_url_override}")
 
+    # Only pass pre-computed metadata if it corresponds to current file_paths
+    # (avoids using stale metadata from previous requests)
+    current_metadata = state.last_image_meta if file_paths else None
+    
     try:
         agent_result = run_agent(
             clean_message,
@@ -209,6 +213,7 @@ def respond(
             base_url=base_url_override if model else None,  # Only override if model selected
             top_k=top_k,
             num_choices=num_choices,
+            image_metadata=current_metadata,  # Pass pre-computed metadata to avoid redundant I/O
         )
     except ValueError as e:
         # Configuration error (missing API key, etc.)