language-model-common 2.0.80__tar.gz → 2.0.82__tar.gz

{language_model_common-2.0.80/language_model_common.egg-info → language_model_common-2.0.82}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: language-model-common
-Version: 2.0.80
+Version: 2.0.82
 Summary: Provides the underlying framework to enhance langchain and add loading configurations
 Author-email: Imran Qureshi <imran.qureshi@bwell.com>
 License: Apache-2.0

language_model_common-2.0.82/VERSION

@@ -0,0 +1 @@
+2.0.82

{language_model_common-2.0.80 → language_model_common-2.0.82/language_model_common.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: language-model-common
-Version: 2.0.80
+Version: 2.0.82
 Summary: Provides the underlying framework to enhance langchain and add loading configurations
 Author-email: Imran Qureshi <imran.qureshi@bwell.com>
 License: Apache-2.0

{language_model_common-2.0.80 → language_model_common-2.0.82}/languagemodelcommon/pipeline/pipeline.py

@@ -3,6 +3,8 @@ from __future__ import annotations
 import logging
 from typing import Any, AsyncGenerator, Protocol
 
+from starlette.responses import StreamingResponse
+
 from languagemodelcommon.pipeline.context import PipelineContext
 from languagemodelcommon.pipeline.step import PipelineStep
 
@@ -90,7 +92,12 @@ class Pipeline:
                 await step.run(context=context)
             await self._execution_step.run(context=context)
         except Exception as e:
-            yield self._output_step.format_error(context=context, error=e)
+            error_result = self._output_step.format_error(context=context, error=e)
+            if isinstance(error_result, StreamingResponse):
+                async for chunk in error_result.body_iterator:
+                    yield chunk
+            else:
+                yield error_result
             return
 
         async for chunk in self._output_step.stream_response(context=context):

{language_model_common-2.0.80 → language_model_common-2.0.82}/languagemodelcommon/structures/openai/request/chat_completion_api_request_wrapper.py

@@ -509,8 +509,10 @@ class ChatCompletionApiRequestWrapper(ChatRequestWrapper):
 
     @override
     @property
-    def tool_choice(self) -> Optional[Any]:
-        return self.request.tool_choice
+    def tool_choice(self) -> str | dict[str, Any] | None:
+        # OpenAI's ChatCompletionToolChoiceOptionParam resolves to a string literal
+        # or one of several TypedDicts; widen to the abstract contract's union.
+        return cast(str | dict[str, Any] | None, self.request.tool_choice)
 
     @override
     @property

{language_model_common-2.0.80 → language_model_common-2.0.82}/languagemodelcommon/structures/openai/request/chat_request_wrapper.py

@@ -219,14 +219,15 @@ class ChatRequestWrapper(abc.ABC):
 
     @property
     @abstractmethod
-    def tool_choice(self) -> Optional[Any]:
+    def tool_choice(self) -> str | dict[str, Any] | None:
         """Tool-selection control for this request.
 
         Mirrors the OpenAI ``tool_choice`` parameter. ``"none"`` instructs the
         agent layer to bind no tools to the LLM for this request; ``"auto"``
-        (or unset) leaves the default tool-binding behavior in place. Other
-        values (e.g. a specific function name or dict) are passed through and
-        interpreted by callers that need finer-grained control.
+        (or unset) leaves the default tool-binding behavior in place. A dict
+        (e.g. ``{"type": "function", "function": {"name": "lookup"}}``) pins a
+        specific tool. The union covers both the Chat Completions and Responses
+        API shapes without further widening.
         """
         ...
 

{language_model_common-2.0.80 → language_model_common-2.0.82}/languagemodelcommon/structures/openai/request/responses_api_request_wrapper.py

@@ -535,28 +535,49 @@ class ResponsesApiRequestWrapper(ChatRequestWrapper):
     ) -> list[AgentConfig]:
         """
         Extract AgentConfig objects for MCP tools from the tools_in_request list.
+
+        Supports two modes:
+        - Full specification: server_url + server_label + allowed_tools
+        - Label-only reference: server_label + allowed_tools (server_url resolved
+          from existing model config by the caller)
         """
-        return [
-            AgentConfig(
-                url=tool["server_url"],
-                name=tool["server_label"],
-                tools=",".join(
-                    [
+        configs: list[AgentConfig] = []
+        for tool in tools_in_request:
+            if tool.get("type") != "mcp" or "server_label" not in tool:
+                continue
+
+            allowed_tools = tool.get("allowed_tools")
+            tools_csv: str | None = None
+            if isinstance(allowed_tools, (list, tuple)):
+                tools_csv = (
+                    ",".join(
                         t["name"] if isinstance(t, dict) and "name" in t else str(t)
-                        for t in tool["allowed_tools"]
-                    ]
+                        for t in allowed_tools
+                    )
+                    or None
                 )
-                if isinstance(tool["allowed_tools"], (list, tuple))
-                else "",
-                headers=tool.get("headers"),
-                auth="headers",
-            )
-            for tool in tools_in_request
-            if tool["type"] == "mcp"
-            and "server_url" in tool
-            and "server_label" in tool
-            and "allowed_tools" in tool
-        ]
+
+            server_label = tool["server_label"]
+            server_url = tool.get("server_url")
+            if server_url:
+                configs.append(
+                    AgentConfig(
+                        url=server_url,
+                        name=server_label,
+                        tools=tools_csv,
+                        headers=tool.get("headers"),
+                        auth="headers",
+                    )
+                )
+            else:
+                configs.append(
+                    AgentConfig(
+                        name=server_label,
+                        mcp_server=server_label,
+                        tools=tools_csv,
+                    )
+                )
+        return configs
 
     @override
     def get_tools(self) -> list[AgentConfig]:
@@ -711,7 +732,7 @@ class ResponsesApiRequestWrapper(ChatRequestWrapper):
 
     @override
     @property
-    def tool_choice(self) -> Optional[Any]:
+    def tool_choice(self) -> str | dict[str, Any] | None:
         return self.request.tool_choice
 
     @override

language_model_common-2.0.80/VERSION

@@ -1 +0,0 @@
-2.0.80