Merge pull request #1060 from jupyter-naas/refactor-chatbar

refactor: comprehensive chatbar and agent model resolution overhaul

Author: FlorentRvl

libs/naas-abi-cli/uv.lock

@@ -43,6 +43,9 @@ get(canonical_id, provider=None) -> Model
 get_chat_model(canonical_id, provider=None) -> ChatModel              # raises if wrong type
 get_embedding_model(canonical_id, provider=None) -> EmbeddingModel    # raises if wrong type
 
+default_chat_model_id -> str | None       # configured default canonical id (property, never raises)
+default_embedding_model_id -> str | None   # configured default canonical id (property, never raises)
+
 get_default_chat_model() -> ChatModel
 get_default_embedding_model() -> EmbeddingModel
 validate_defaults()         # called at engine startup

libs/naas-abi-core/naas_abi_core/services/model_registry/AGENTS.md

@@ -131,6 +131,22 @@ def get_embedding_model(
 
     # ------------------------------------------------------------------ defaults
 
+    @property
+    def default_chat_model_id(self) -> Optional[str]:
+        """Return the canonical id configured as the engine default chat model.
+
+        Unlike ``get_default_chat_model`` this never builds the live model and
+        never raises: it exposes the raw configured canonical id (or ``None``
+        when no default is configured), which callers can use for display or to
+        cross-reference the model catalog."""
+        raise NotImplementedError
+
+    @property
+    def default_embedding_model_id(self) -> Optional[str]:
+        """Return the canonical id configured as the engine default embedding
+        model, or ``None`` when no default is configured. Never raises."""
+        raise NotImplementedError
+
     def get_default_chat_model(self) -> ChatModel:
         """Return the chat model configured as the engine default.
 

libs/naas-abi-core/naas_abi_core/services/model_registry/ModelRegistryPort.py

@@ -231,6 +231,14 @@ def _build_off_catalog_embedding(
 
     # ------------------------------------------------------------------ defaults
 
+    @property
+    def default_chat_model_id(self) -> Optional[str]:
+        return self._default_chat_model
+
+    @property
+    def default_embedding_model_id(self) -> Optional[str]:
+        return self._default_embedding_model
+
     def get_default_chat_model(self) -> ChatModel:
         if self._default_chat_model is None:
             raise DefaultModelNotResolvedError(

libs/naas-abi-core/naas_abi_core/services/model_registry/ModelRegistryService.py

@@ -14,6 +14,9 @@
 class OpenRouterAgent(IntentAgent):
     name: str = "OpenRouter"
     description: str = "Helps you interact with OpenRouter for accessing multiple AI models."
+    # Canonical model id this agent runs on (single source of truth): ``New``
+    # builds its chat_model from it and the API/UI reads it via get_chat_model_id.
+    MODEL_ID: str = "openrouter/free"
     logo_url: str = "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcSMyMkLa1_OdyK9b4LZTiDiR7W5SkPRtydKKw&s"
     suggestions: list = []
     system_prompt: str = """<role>
@@ -51,6 +54,10 @@ class OpenRouterAgent(IntentAgent):
 </constraints>
 """
 
+    @classmethod
+    def get_chat_model_id(cls) -> Optional[str]:
+        return cls.MODEL_ID
+
     @classmethod
     def New(
         cls,
@@ -71,7 +78,7 @@ def New(
         api_key = module.configuration.openrouter_api_key
         object_storage = module.engine.services.object_storage
 
-        chat_model = OpenRouterModel(api_key=api_key).get_model("openrouter/free")
+        chat_model = OpenRouterModel(api_key=api_key).get_model(cls.MODEL_ID)
 
         registry = get_default_model_registry()
         assert registry is not None, "ModelRegistryService not initialized"

libs/naas-abi-marketplace/naas_abi_marketplace/applications/openrouter/agents/OpenRouterAgent.py

@@ -18,6 +18,15 @@
 ASSETS_DIR = Path(__file__).parent.parent / "assets" / "public"
 
 
+def _declared_model_id(cls) -> Optional[str]:
+    """Canonical model id a dynamically-built OpenRouter agent runs on.
+
+    Bound as the ``get_chat_model_id`` classmethod on every generated agent so
+    the API/UI can surface the model without instantiating the agent. Mirrors
+    the ``MODEL_ID`` attribute, which ``New`` uses to build the chat model."""
+    return cls.MODEL_ID
+
+
 class OpenRouterAgents:
     def __init__(
         self,
@@ -61,8 +70,9 @@ def create_agent(
                 agent_shared_state: Optional[AgentSharedState] = None,
                 agent_configuration: Optional[AgentConfiguration] = None,
             ) -> Agent:
-                # Create ChatOpenRouter model instance
-                chat_model = self.openrouter_model.get_model(m_id)
+                # Build the chat model from the class-declared MODEL_ID so the
+                # model stays the single source of truth (matches get_chat_model_id).
+                chat_model = self.openrouter_model.get_model(cls.MODEL_ID)
 
                 # Use provided configuration or create default one
                 if agent_configuration is None:
@@ -145,6 +155,11 @@ def create_agent(
                 "name": model_name,
                 "description": model_description,
                 "logo_url": model_logo_url,
+                # Canonical model id this agent runs on (single source of truth):
+                # ``New`` builds its chat_model from it and the API/UI reads it
+                # via ``get_chat_model_id``.
+                "MODEL_ID": model_id,
+                "get_chat_model_id": classmethod(_declared_model_id),
                 "New": classmethod(create_agent_func),
                 "__module__": OPENROUTER_AGENT_MODULE + "." + class_name,
             },

libs/naas-abi-marketplace/naas_abi_marketplace/applications/openrouter/agents/OpenRouterAgents.py

@@ -7,7 +7,7 @@ def __init__(self, api_key: str):
         self.api_key = api_key
         self.base_url = "https://openrouter.ai/api/v1"
 
-    def get_model(self, model_id: str):
+    def get_model(self, model_id: str) -> ChatOpenAI:
         return ChatOpenAI(
             model=model_id,
             api_key=SecretStr(self.api_key),