fix: Adapt to breaking change in msaf: Change model_id to model

Author: g3force

msaf/agenticlayer/msaf/agent_to_a2a.py

@@ -26,7 +26,7 @@
     TextPart,
 )
 from a2a.utils.constants import AGENT_CARD_WELL_KNOWN_PATH
-from agent_framework import AgentSession, SupportsAgentRun
+from agent_framework import Agent, AgentSession
 from agent_framework._mcp import MCPStreamableHTTPTool
 from agent_framework._tools import FunctionTool
 from agenticlayer.shared.config import McpTool, SubAgent
@@ -53,7 +53,7 @@ class MsafAgentExecutor(AgentExecutor):
 
     def __init__(
         self,
-        agent: SupportsAgentRun,
+        agent: Agent,
         sub_agent_tools: list[FunctionTool] | None = None,
         mcp_tool_configs: list[McpTool] | None = None,
         agent_factory: MsafAgentFactory | None = None,
@@ -173,7 +173,7 @@ async def cancel(self, context: RequestContext, event_queue: EventQueue) -> None
 
 
 async def create_a2a_app(
-    agent: SupportsAgentRun,
+    agent: Agent,
     name: str,
     description: str | None,
     rpc_url: str,
@@ -224,7 +224,7 @@ async def create_a2a_app(
 
 
 def to_a2a(
-    agent: SupportsAgentRun,
+    agent: Agent,
     name: str,
     rpc_url: str,
     description: str | None = None,
@@ -262,7 +262,7 @@ def to_a2a(
 
 
 async def _build_app(
-    agent: SupportsAgentRun,
+    agent: Agent,
     name: str,
     description: str | None,
     rpc_url: str,

msaf/agenticlayer/msaf/client.py

@@ -6,7 +6,7 @@
 
 
 def create_openai_client(
-    model_id: str | None = None,
+    model: str | None = None,
 ) -> OpenAIChatClient:
     """Create an OpenAIChatClient configured from environment variables.
 
@@ -20,10 +20,10 @@ def create_openai_client(
       parameter. Falls back to the ``OPENAI_API_KEY`` env var when not set.
     - ``OPENAI_CHAT_MODEL_ID``: Model name to use (e.g. ``gpt-4o``). Handled
       natively by :class:`~agent_framework.openai.OpenAIChatClient`; takes effect
-      even when ``model_id`` is not passed to this function.
+      even when ``model`` is not passed to this function.
 
     Args:
-        model_id: Optional model identifier override. When ``None``, the
+        model: Optional model identifier override. When ``None``, the
             ``OPENAI_CHAT_MODEL_ID`` environment variable is used automatically
             by :class:`~agent_framework.openai.OpenAIChatClient`.
 
@@ -52,7 +52,7 @@ def create_openai_client(
     api_key = os.environ.get("LITELLM_PROXY_API_KEY")
 
     return OpenAIChatClient(
-        model_id=model_id,
+        model=model,
         base_url=base_url,
         api_key=api_key,
     )

msaf/agenticlayer/msaf/metrics_middleware.py

@@ -71,7 +71,7 @@ async def process(
         call_next: Callable[[], Awaitable[None]],
     ) -> None:
         options = context.options or {}
-        model: str = options.get("model_id") or getattr(context.client, "model_id", None) or "unknown"
+        model: str = options.get("model") or getattr(context.client, "model", None) or "unknown"
         attrs: dict[str, Any] = {"model": model}
         _llm_calls.add(1, attrs)
         try:

msaf/tests/fixtures/mock_client.py

@@ -10,6 +10,7 @@ class MockChatClient(BaseChatClient[Any]):
     """A mock chat client for testing that returns predefined responses."""
 
     def __init__(self, response_text: str = "Hello from mock agent!") -> None:
+        super().__init__()
         self._response_text = response_text
         self.received_messages: list[Sequence[Message]] = []
 
@@ -31,7 +32,7 @@ async def _respond() -> ChatResponse[Any]:
             return ChatResponse(
                 messages=[Message("assistant", [self._response_text])],
                 finish_reason="stop",
-                model_id="mock-model",
+                model="mock-model",
             )
 
         return _respond()