Fixed errors

Author: llalitkumarrr

src/google/adk/cli/fast_api.py

@@ -44,6 +44,7 @@
 from starlette.types import Lifespan
 from watchdog.observers import Observer
 
+
 from ..auth.credential_service.in_memory_credential_service import InMemoryCredentialService
 from ..runners import Runner
 from ..telemetry._agent_engine import get_propagated_context
@@ -61,30 +62,34 @@
 from .utils.service_factory import create_memory_service_from_options
 from .utils.service_factory import create_session_service_from_options
 from ..apps.app import App
-from collections.abc import Mapping
+
+
 _ALLOWED_AGENT_ENGINE_CLASS_METHODS = frozenset(
     method["name"] for method in _AGENT_ENGINE_CLASS_METHODS
 )
 
-class DynamicAppMap(Mapping):
-    def __init__(self, agent_loader):
-        self.agent_loader = agent_loader
-        
-    def __getitem__(self, app_name):
-        for folder_name in self.agent_loader.list_agents():
-            try:
-                loaded = self.agent_loader.load_agent(folder_name)
-                if isinstance(loaded, App) and loaded.name == app_name:
-                    return folder_name
-            except Exception:
-                pass
-        return app_name
-
-    def __iter__(self):
-        return iter([])
-    
-    def __len__(self):
-        return 1
+
+class AgentAppMapping(Mapping[str, str]):
+
+  def __init__(self, agent_loader):
+    self.agent_loader = agent_loader
+
+  def __getitem__(self, app_name):
+    for folder_name in self.agent_loader.list_agents():
+      try:
+        loaded = self.agent_loader.load_agent(folder_name)
+        if isinstance(loaded, App) and loaded.name == app_name:
+          return folder_name
+      except Exception:
+        pass
+    return app_name
+
+  def __iter__(self):
+    return iter([])
+
+  def __len__(self):
+    return 1
+
 
 class _QueryRequest(BaseModel):
   input: dict[str, Any] | None = None
@@ -254,15 +259,15 @@ def get_fast_api_app(
     )
   except ValueError as exc:
     raise click.ClickException(str(exc)) from exc
-  
-  app_name_to_dir = DynamicAppMap(agent_loader)
+
+  app_name_to_dir = AgentAppMapping(agent_loader)
   # Build the Session service
   session_service = create_session_service_from_options(
       base_dir=agents_dir,
       session_service_uri=session_service_uri,
       session_db_kwargs=session_db_kwargs,
       use_local_storage=use_local_storage,
-      app_name_to_dir=app_name_to_dir
+      app_name_to_dir=app_name_to_dir,
   )
 
   # Build the Artifact service

src/google/adk/cli/utils/service_factory.py

@@ -21,6 +21,7 @@
 from urllib.parse import parse_qsl
 from urllib.parse import urlsplit
 from urllib.parse import urlunsplit
+from typing import Mapping, Optional
 
 from ...artifacts.base_artifact_service import BaseArtifactService
 from ...memory.base_memory_service import BaseMemoryService
@@ -172,7 +173,7 @@ def create_session_service_from_options(
     base_dir: Path | str,
     session_service_uri: str | None = None,
     session_db_kwargs: dict[str, Any] | None = None,
-    app_name_to_dir: dict[str, str] | None = None,
+    app_name_to_dir: Optional[Mapping[str, str]] = None,
     use_local_storage: bool = True,
 ) -> BaseSessionService:
   """Creates a session service based on CLI/web options."""

tests/unittests/cli/test_fast_api.py

@@ -34,6 +34,8 @@
 from google.adk.artifacts.base_artifact_service import ArtifactVersion
 from google.adk.cli import fast_api as fast_api_module
 from google.adk.cli.fast_api import get_fast_api_app
+from google.adk.cli.fast_api import AgentAppMapping
+from google.adk.apps.app import App
 from google.adk.errors.input_validation_error import InputValidationError
 from google.adk.errors.session_not_found_error import SessionNotFoundError
 from google.adk.evaluation.eval_case import EvalCase
@@ -50,8 +52,6 @@
 from google.genai import types
 from pydantic import BaseModel
 import pytest
-from google.adk.cli.fast_api import DynamicAppMap
-from google.adk.apps.app import App
 
 # Configure logging to help diagnose server startup issues
 logging.basicConfig(
@@ -4430,63 +4430,67 @@ def test_create_eval_set_legacy_route_creates_eval_set(
 if __name__ == "__main__":
   pytest.main(["-xvs", __file__])
 
+
 def test_dynamic_app_map_finds_matching_app():
-    mock_agent_loader = MagicMock()
-    mock_agent_loader.list_agents.return_value = ["folder_a", "folder_b"]
-    
-    def mock_load_agent(folder):
-        mock_app = MagicMock(spec=App)
-        if folder == "folder_b":
-            mock_app.name = "target_app"
-        else:
-            mock_app.name = "other_app"
-        return mock_app
-        
-    mock_agent_loader.load_agent.side_effect = mock_load_agent
-    
-    app_map = DynamicAppMap(mock_agent_loader)
-    
-    # Should correctly map the internal app name to its physical folder
-    assert app_map["target_app"] == "folder_b"
+  mock_agent_loader = MagicMock()
+  mock_agent_loader.list_agents.return_value = ["folder_a", "folder_b"]
+
+  def mock_load_agent(folder):
+    mock_app = MagicMock(spec=App)
+    if folder == "folder_b":
+      mock_app.name = "target_app"
+    else:
+      mock_app.name = "other_app"
+    return mock_app
+
+  mock_agent_loader.load_agent.side_effect = mock_load_agent
+
+  app_map = AgentAppMapping(mock_agent_loader)
+
+  # Should correctly map the internal app name to its physical folder
+  assert app_map["target_app"] == "folder_b"
+
 
 def test_dynamic_app_map_fallback_when_not_found():
-    mock_agent_loader = MagicMock()
-    mock_agent_loader.list_agents.return_value = ["folder_a"]
-    
-    def mock_load_agent(folder):
-        mock_app = MagicMock(spec=App)
-        mock_app.name = "other_app"
-        return mock_app
-        
-    mock_agent_loader.load_agent.side_effect = mock_load_agent
-    
-    app_map = DynamicAppMap(mock_agent_loader)
-    
-    # If the app isn't found, it should return the exact string it was given
-    assert app_map["missing_app"] == "missing_app"
+  mock_agent_loader = MagicMock()
+  mock_agent_loader.list_agents.return_value = ["folder_a"]
+
+  def mock_load_agent(folder):
+    mock_app = MagicMock(spec=App)
+    mock_app.name = "other_app"
+    return mock_app
+
+  mock_agent_loader.load_agent.side_effect = mock_load_agent
+
+  app_map = AgentAppMapping(mock_agent_loader)
+
+  # If the app isn't found, it should return the exact string it was given
+  assert app_map["missing_app"] == "missing_app"
+
 
 def test_dynamic_app_map_ignores_load_errors():
-    mock_agent_loader = MagicMock()
-    mock_agent_loader.list_agents.return_value = ["broken_folder", "good_folder"]
-    
-    def mock_load_agent(folder):
-        if folder == "broken_folder":
-            raise ValueError("Agent is completely broken")
-        mock_app = MagicMock(spec=App)
-        mock_app.name = "good_app"
-        return mock_app
-        
-    mock_agent_loader.load_agent.side_effect = mock_load_agent
-    
-    app_map = DynamicAppMap(mock_agent_loader)
-    
-    # Should ignore the ValueError from broken_folder and still find good_app
-    assert app_map["good_app"] == "good_folder"
+  mock_agent_loader = MagicMock()
+  mock_agent_loader.list_agents.return_value = ["broken_folder", "good_folder"]
+
+  def mock_load_agent(folder):
+    if folder == "broken_folder":
+      raise ValueError("Agent is completely broken")
+    mock_app = MagicMock(spec=App)
+    mock_app.name = "good_app"
+    return mock_app
+
+  mock_agent_loader.load_agent.side_effect = mock_load_agent
+
+  app_map = AgentAppMapping(mock_agent_loader)
+
+  # Should ignore the ValueError from broken_folder and still find good_app
+  assert app_map["good_app"] == "good_folder"
+
 
 def test_dynamic_app_map_is_truthy():
-    mock_agent_loader = MagicMock()
-    app_map = DynamicAppMap(mock_agent_loader)
-    
-    # Must evaluate to True so that `app_map or {}` evaluates to app_map
-    assert bool(app_map) is True
-    assert (app_map or {}) is app_map
+  mock_agent_loader = MagicMock()
+  app_map = AgentAppMapping(mock_agent_loader)
+
+  # Must evaluate to True so that `app_map or {}` evaluates to app_map
+  assert bool(app_map) is True
+  assert (app_map or {}) is app_map