beamlit 0.0.41rc86__py3-none-any.whl → 0.0.42rc87__py3-none-any.whl

beamlit/functions/mcp/mcp.py

@@ -6,39 +6,59 @@ import pydantic
 import pydantic_core
 import requests
 import typing_extensions as t
-from langchain_core.tools.base import BaseTool, BaseToolkit, ToolException
-from mcp import ListToolsResult
-
 from beamlit.authentication.authentication import AuthenticatedClient
 from beamlit.common.settings import get_settings
+from langchain_core.tools.base import BaseTool, BaseToolkit, ToolException
+from mcp.types import CallToolResult, ListToolsResult
+from pydantic.json_schema import JsonSchemaValue
+from pydantic_core import core_schema as cs
 
 settings = get_settings()
 
-def create_dynamic_schema(name: str, schema: dict[str, t.Any]) -> type[pydantic.BaseModel]:
-    field_definitions = {}
-    for k, v in schema["properties"].items():
-        field_type = str
-        if v["type"] == "number":
-            field_type = float
-        elif v["type"] == "integer":
-            field_type = int
-        elif v["type"] == "boolean":
-            field_type = bool
-        description = v.get("description") or ""
-        default_ = v.get("default")
-        fields = {}
-        if default_ is not None:
-            fields["default"] = default_
-        if description is not None:
-            fields["description"] = description
-        field_definitions[k] = (
-            field_type,
-            pydantic.Field(**fields)
-        )
-    return pydantic.create_model(
-        f"{name}Schema",
-        **field_definitions
-    )
+TYPE_MAP = {
+    "integer": int,
+    "number": float,
+    "array": list,
+    "boolean": bool,
+    "string": str,
+    "null": type(None),
+}
+
+FIELD_DEFAULTS = {
+    int: 0,
+    float: 0.0,
+    list: [],
+    bool: False,
+    str: "",
+    type(None): None,
+}
+
+def configure_field(name: str, type_: dict[str, t.Any], required: list[str]) -> tuple[type, t.Any]:
+    field_type = TYPE_MAP[type_["type"]]
+    default_ = FIELD_DEFAULTS.get(field_type) if name not in required else ...
+    return field_type, default_
+
+def create_schema_model(name: str, schema: dict[str, t.Any]) -> type[pydantic.BaseModel]:
+    # Create a new model class that returns our JSON schema.
+    # LangChain requires a BaseModel class.
+    class SchemaBase(pydantic.BaseModel):
+        model_config = pydantic.ConfigDict(extra="allow")
+
+        @t.override
+        @classmethod
+        def __get_pydantic_json_schema__(
+            cls, core_schema: cs.CoreSchema, handler: pydantic.GetJsonSchemaHandler
+        ) -> JsonSchemaValue:
+            return schema
+
+    # Since this langchain patch, we need to synthesize pydantic fields from the schema
+    # https://github.com/langchain-ai/langchain/commit/033ac417609297369eb0525794d8b48a425b8b33
+    required = schema.get("required", [])
+    fields: dict[str, t.Any] = {
+        name: configure_field(name, type_, required) for name, type_ in schema["properties"].items()
+    }
+
+    return pydantic.create_model(f"{name}Schema", __base__=SchemaBase, **fields)
 
 
 
@@ -83,9 +103,10 @@ class MCPTool(BaseTool):
     async def _arun(self, *args: t.Any, **kwargs: t.Any) -> t.Any:
         result = self.client.call_tool(self.name, arguments=kwargs)
         response = result.json()
-        content = pydantic_core.to_json(response["content"]).decode()
-        if response["isError"]:
-            raise ToolException(content)
+        result = CallToolResult(**response)
+        if result.isError:
+            raise ToolException(result.content)
+        content = pydantic_core.to_json(result.content).decode()
         return content
 
     @t.override
@@ -122,7 +143,7 @@ class MCPToolkit(BaseToolkit):
                 client=self.client,
                 name=tool.name,
                 description=tool.description or "",
-                args_schema=create_dynamic_schema(tool.name, tool.inputSchema),
+                args_schema=create_schema_model(tool.name, tool.inputSchema),
             )
             # list_tools returns a PaginatedResult, but I don't see a way to pass the cursor to retrieve more tools
             for tool in self._tools.tools

{beamlit-0.0.41rc86.dist-info → beamlit-0.0.42rc87.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beamlit
-Version: 0.0.41rc86
+Version: 0.0.42rc87
 Summary: Add your description here
 Author-email: cploujoux <ch.ploujoux@gmail.com>
 Requires-Python: >=3.12
@@ -17,7 +17,7 @@ Requires-Dist: langchain-mistralai>=0.2.5
 Requires-Dist: langchain-openai<0.4.0,>=0.3.0
 Requires-Dist: langchain-xai>=0.2.0
 Requires-Dist: langgraph<0.3.0,>=0.2.40
-Requires-Dist: mcp>=1.1.2
+Requires-Dist: mcp>=1.2.1
 Requires-Dist: opentelemetry-api>=1.28.2
 Requires-Dist: opentelemetry-exporter-otlp>=1.28.2
 Requires-Dist: opentelemetry-instrumentation-anthropic>=0.35.0

{beamlit-0.0.41rc86.dist-info → beamlit-0.0.42rc87.dist-info}/RECORD

@@ -145,7 +145,7 @@ beamlit/deploy/parser.py,sha256=Ga0poCZkoRnuTw082QnTcNGCBJncoRAnVsn8-1FsaJE,6907
 beamlit/functions/__init__.py,sha256=oejZ6GVd4-2kGKsOwRUq1u2AuSyrrn9kWIuH6WxMqhE,189
 beamlit/functions/common.py,sha256=HbP_F7IYywB2jqxobjkjFqDaIsJXym-HPeOfLzoHSBo,7014
 beamlit/functions/decorator.py,sha256=ZtSQsPLI70WKwi2jPhA7DaqREQUINpqt9BDVugeV_sg,1714
-beamlit/functions/mcp/mcp.py,sha256=JnkeIh9jDyiZstBA0OH57aGx2JjEJ_DPtnM17Xw6ykM,4060
+beamlit/functions/mcp/mcp.py,sha256=F241qhX66DC5ZTj4mPz87YAgij5NHdvEu51f-OT4rsE,4842
 beamlit/functions/remote/remote.py,sha256=pY7gsmonkH8iN1anscMIWX-tW__OaBw14bodSUy1lCE,4845
 beamlit/models/__init__.py,sha256=DB2EBTVX5lTO7CzXvZaqiPtgc9n8SMPu59zGD5_Vvno,9652
 beamlit/models/acl.py,sha256=tH67gsl_BMaviSbTaaIkO1g9cWZgJ6VgAnYVjQSzGZY,3952
@@ -278,6 +278,6 @@ beamlit/serve/app.py,sha256=ROS_tb9cO4GvOQKCwloyAzpYraTdIb3oG6sChXikeNw,3285
 beamlit/serve/middlewares/__init__.py,sha256=1dVmnOmhAQWvWktqHkKSIX-YoF6fmMU8xkUQuhg_rJU,148
 beamlit/serve/middlewares/accesslog.py,sha256=Mu4T4_9OvHybjA0ApzZFpgi2C8f3X1NbUk-76v634XM,631
 beamlit/serve/middlewares/processtime.py,sha256=lDAaIasZ4bwvN-HKHvZpaD9r-yrkVNZYx4abvbjbrCg,411
-beamlit-0.0.41rc86.dist-info/METADATA,sha256=pVWwJpoKf9vfO83lbZWKk_Dek4MCfbIeA_-hBpf0aTk,3715
-beamlit-0.0.41rc86.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-beamlit-0.0.41rc86.dist-info/RECORD,,
+beamlit-0.0.42rc87.dist-info/METADATA,sha256=1IrETuDXtWvAbwgHeJDmmxCGIXbIck3OgSBtf_9jq6s,3715
+beamlit-0.0.42rc87.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+beamlit-0.0.42rc87.dist-info/RECORD,,