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

beamlit/agents/chat.py

@@ -1,11 +1,12 @@
 from logging import getLogger
 from typing import Tuple, Union
 
+from langchain_core.language_models import BaseChatModel
+
 from beamlit.api.models import get_model
 from beamlit.authentication import get_authentication_headers, new_client
 from beamlit.common.settings import get_settings
 from beamlit.models import Model
-from langchain_core.language_models import BaseChatModel
 
 logger = getLogger(__name__)
 

beamlit/common/settings.py

@@ -4,8 +4,12 @@ from typing import Tuple, Type, Union
 from langchain_core.language_models.chat_models import BaseChatModel
 from langgraph.graph.graph import CompiledGraph
 from pydantic import Field
-from pydantic_settings import (BaseSettings, PydanticBaseSettingsSource,
-                               SettingsConfigDict, YamlConfigSettingsSource)
+from pydantic_settings import (
+    BaseSettings,
+    PydanticBaseSettingsSource,
+    SettingsConfigDict,
+    YamlConfigSettingsSource,
+)
 
 from beamlit.common.logger import init as init_logger
 from beamlit.models import Agent, Function, Model

beamlit/functions/__init__.py

@@ -1,5 +1,6 @@
 """Functions package providing function decorators and utilities."""
 
-from .decorator import function, get_functions, kit
+from .common import get_functions
+from .decorator import function, kit
 
 __all__ = ["function", "kit", "get_functions"]

beamlit/functions/common.py

@@ -0,0 +1,143 @@
+"""Decorators for creating function tools with Beamlit and LangChain integration."""
+import ast
+import asyncio
+import importlib.util
+import os
+from logging import getLogger
+from typing import Union
+
+from langchain_core.tools import StructuredTool
+from langchain_core.tools.base import create_schema_from_function
+
+from beamlit.authentication import new_client
+from beamlit.client import AuthenticatedClient
+from beamlit.common import slugify
+from beamlit.common.settings import get_settings
+from beamlit.functions.remote.remote import RemoteToolkit
+from beamlit.models import AgentChain
+
+logger = getLogger(__name__)
+
+def get_functions(
+    remote_functions:Union[list[str], None]=None,
+    client:Union[AuthenticatedClient, None]=None,
+    dir:Union[str, None]=None,
+    chain:Union[list[AgentChain], None]=None,
+    remote_functions_empty:bool=True,
+    from_decorator:str="function",
+    warning:bool=True,
+):
+    from beamlit.agents.chain import ChainToolkit
+
+    settings = get_settings()
+    if client is None:
+        client = new_client()
+    if dir is None:
+        dir = settings.agent.functions_directory
+
+    functions = []
+    logger = getLogger(__name__)
+    settings = get_settings()
+
+    # Walk through all Python files in functions directory and subdirectories
+    if not os.path.exists(dir):
+        if remote_functions_empty and warning:
+            logger.warn(f"Functions directory {dir} not found")
+    if os.path.exists(dir):
+        for root, _, files in os.walk(dir):
+            for file in files:
+                if file.endswith(".py"):
+                    file_path = os.path.join(root, file)
+                    # Read and compile the file content
+                    with open(file_path) as f:
+                        try:
+                            file_content = f.read()
+                            # Parse the file content to find decorated functions
+                            tree = ast.parse(file_content)
+
+                            # Look for function definitions with decorators
+                            for node in ast.walk(tree):
+                                if (
+                                    not isinstance(node, ast.FunctionDef)
+                                    and not isinstance(node, ast.AsyncFunctionDef)
+                                ) or len(node.decorator_list) == 0:
+                                    continue
+                                decorator = node.decorator_list[0]
+
+                                decorator_name = ""
+                                if isinstance(decorator, ast.Call):
+                                    decorator_name = decorator.func.id
+                                if isinstance(decorator, ast.Name):
+                                    decorator_name = decorator.id
+                                if decorator_name == from_decorator:
+                                    # Get the function name and decorator name
+                                    func_name = node.name
+
+                                    # Import the module to get the actual function
+                                    spec = importlib.util.spec_from_file_location(func_name, file_path)
+                                    module = importlib.util.module_from_spec(spec)
+                                    spec.loader.exec_module(module)
+                                    # Check if kit=True in the decorator arguments
+                                    is_kit = False
+                                    if isinstance(decorator, ast.Call):
+                                        for keyword in decorator.keywords:
+                                            if keyword.arg == "kit" and isinstance(
+                                                keyword.value, ast.Constant
+                                            ):
+                                                is_kit = keyword.value.value
+                                    if is_kit and not settings.remote:
+                                        kit_functions = get_functions(
+                                            client=client,
+                                            dir=os.path.join(root),
+                                            remote_functions_empty=remote_functions_empty,
+                                            from_decorator="kit",
+                                        )
+                                        functions.extend(kit_functions)
+
+                                    # Get the decorated function
+                                    if not is_kit and hasattr(module, func_name):
+                                        func = getattr(module, func_name)
+                                        if settings.remote:
+                                            toolkit = RemoteToolkit(client, slugify(func.__name__))
+                                            toolkit.initialize()
+                                            functions.extend(toolkit.get_tools())
+                                        else:
+                                            if asyncio.iscoroutinefunction(func):
+                                                functions.append(
+                                                    StructuredTool(
+                                                        name=func.__name__,
+                                                        description=func.__doc__,
+                                                        func=func,
+                                                        coroutine=func,
+                                                        args_schema=create_schema_from_function(func.__name__, func)
+                                                    )
+                                                )
+                                            else:
+
+                                                functions.append(
+                                                    StructuredTool(
+                                                        name=func.__name__,
+                                                        description=func.__doc__,
+                                                        func=func,
+                                                        args_schema=create_schema_from_function(func.__name__, func)
+                                                    )
+                                                )
+                        except Exception as e:
+                            logger.warning(f"Error processing {file_path}: {e!s}")
+
+    if remote_functions:
+        for function in remote_functions:
+            try:
+                toolkit = RemoteToolkit(client, function)
+                toolkit.initialize()
+                functions.extend(toolkit.get_tools())
+            except Exception as e:
+                logger.warn(f"Failed to initialize remote function {function}: {e!s}")
+
+    if chain:
+        toolkit = ChainToolkit(client, chain)
+        toolkit.initialize()
+        functions.extend(toolkit.get_tools())
+
+    return functions
+

beamlit/functions/decorator.py

@@ -1,151 +1,15 @@
 """Decorators for creating function tools with Beamlit and LangChain integration."""
-import ast
 import asyncio
 import functools
-import importlib.util
-import os
 from collections.abc import Callable
 from logging import getLogger
-from typing import Union
 
 from fastapi import Request
-from langchain_core.tools import StructuredTool
-from langchain_core.tools.base import create_schema_from_function
 
-from beamlit.authentication import new_client
-from beamlit.client import AuthenticatedClient
-from beamlit.common import slugify
-from beamlit.common.settings import get_settings
-from beamlit.functions.remote.remote import RemoteToolkit
-from beamlit.models import AgentChain, Function, FunctionKit
+from beamlit.models import Function, FunctionKit
 
 logger = getLogger(__name__)
 
-def get_functions(
-    remote_functions:Union[list[str], None]=None,
-    client:Union[AuthenticatedClient, None]=None,
-    dir:Union[str, None]=None,
-    chain:Union[list[AgentChain], None]=None,
-    remote_functions_empty:bool=True,
-    from_decorator:str="function",
-    warning:bool=True,
-):
-    from beamlit.agents.chain import ChainToolkit
-
-    settings = get_settings()
-    if client is None:
-        client = new_client()
-    if dir is None:
-        dir = settings.agent.functions_directory
-
-    functions = []
-    logger = getLogger(__name__)
-    settings = get_settings()
-
-    # Walk through all Python files in functions directory and subdirectories
-    if not os.path.exists(dir):
-        if remote_functions_empty and warning:
-            logger.warn(f"Functions directory {dir} not found")
-    if os.path.exists(dir):
-        for root, _, files in os.walk(dir):
-            for file in files:
-                if file.endswith(".py"):
-                    file_path = os.path.join(root, file)
-                    # Read and compile the file content
-                    with open(file_path) as f:
-                        try:
-                            file_content = f.read()
-                            # Parse the file content to find decorated functions
-                            tree = ast.parse(file_content)
-
-                            # Look for function definitions with decorators
-                            for node in ast.walk(tree):
-                                if (
-                                    not isinstance(node, ast.FunctionDef)
-                                    and not isinstance(node, ast.AsyncFunctionDef)
-                                ) or len(node.decorator_list) == 0:
-                                    continue
-                                decorator = node.decorator_list[0]
-
-                                decorator_name = ""
-                                if isinstance(decorator, ast.Call):
-                                    decorator_name = decorator.func.id
-                                if isinstance(decorator, ast.Name):
-                                    decorator_name = decorator.id
-                                if decorator_name == from_decorator:
-                                    # Get the function name and decorator name
-                                    func_name = node.name
-
-                                    # Import the module to get the actual function
-                                    spec = importlib.util.spec_from_file_location(func_name, file_path)
-                                    module = importlib.util.module_from_spec(spec)
-                                    spec.loader.exec_module(module)
-                                    # Check if kit=True in the decorator arguments
-                                    is_kit = False
-                                    if isinstance(decorator, ast.Call):
-                                        for keyword in decorator.keywords:
-                                            if keyword.arg == "kit" and isinstance(
-                                                keyword.value, ast.Constant
-                                            ):
-                                                is_kit = keyword.value.value
-                                    if is_kit and not settings.remote:
-                                        kit_functions = get_functions(
-                                            client=client,
-                                            dir=os.path.join(root),
-                                            remote_functions_empty=remote_functions_empty,
-                                            from_decorator="kit",
-                                        )
-                                        functions.extend(kit_functions)
-
-                                    # Get the decorated function
-                                    if not is_kit and hasattr(module, func_name):
-                                        func = getattr(module, func_name)
-                                        if settings.remote:
-                                            toolkit = RemoteToolkit(client, slugify(func.__name__))
-                                            toolkit.initialize()
-                                            functions.extend(toolkit.get_tools())
-                                        else:
-                                            if asyncio.iscoroutinefunction(func):
-                                                functions.append(
-                                                    StructuredTool(
-                                                        name=func.__name__,
-                                                        description=func.__doc__,
-                                                        func=func,
-                                                        coroutine=func,
-                                                        args_schema=create_schema_from_function(func.__name__, func)
-                                                    )
-                                                )
-                                            else:
-
-                                                functions.append(
-                                                    StructuredTool(
-                                                        name=func.__name__,
-                                                        description=func.__doc__,
-                                                        func=func,
-                                                        args_schema=create_schema_from_function(func.__name__, func)
-                                                    )
-                                                )
-                        except Exception as e:
-                            logger.warning(f"Error processing {file_path}: {e!s}")
-
-    if remote_functions:
-        for function in remote_functions:
-            try:
-                toolkit = RemoteToolkit(client, function)
-                toolkit.initialize()
-                functions.extend(toolkit.get_tools())
-            except Exception as e:
-                logger.warn(f"Failed to initialize remote function {function}: {e!s}")
-
-    if chain:
-        toolkit = ChainToolkit(client, chain)
-        toolkit.initialize()
-        functions.extend(toolkit.get_tools())
-
-    return functions
-
-
-
 def kit(bl_kit: FunctionKit = None, **kwargs: dict) -> Callable:
     """Create function tools with Beamlit and LangChain integration."""
 

beamlit/functions/mcp/mcp.py

@@ -1,5 +1,4 @@
 import asyncio
-import urllib.parse
 import warnings
 from typing import Any, Callable
 
@@ -7,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)
 
 
 
@@ -84,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
@@ -123,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/functions/remote/remote.py

@@ -5,6 +5,8 @@ from typing import Callable
 
 import pydantic
 import typing_extensions as t
+from langchain_core.tools.base import BaseTool, ToolException
+
 from beamlit.api.functions import get_function, list_functions
 from beamlit.authentication.authentication import AuthenticatedClient
 from beamlit.common.settings import get_settings
@@ -12,7 +14,6 @@ from beamlit.errors import UnexpectedStatus
 from beamlit.functions.mcp.mcp import MCPClient, MCPToolkit
 from beamlit.models import Function, StoreFunctionParameter
 from beamlit.run import RunClient
-from langchain_core.tools.base import BaseTool, ToolException
 
 
 def create_dynamic_schema(name: str, parameters: list[StoreFunctionParameter]) -> type[pydantic.BaseModel]:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beamlit
-Version: 0.0.41rc85
+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.41rc85.dist-info → beamlit-0.0.42rc87.dist-info}/RECORD

@@ -6,7 +6,7 @@ beamlit/run.py,sha256=HtDYDjD7oVfQ8r3T5_t4qN5UDJOJfsQILi45Z21ArAg,1446
 beamlit/types.py,sha256=E1hhDh_zXfsSQ0NCt9-uw90_Mr5iIlsdfnfvxv5HarU,1005
 beamlit/agents/__init__.py,sha256=bWsFaXUbAps3IsL3Prti89m1s714vICXodbQi77h3vY,206
 beamlit/agents/chain.py,sha256=vfCjiFHuu02uTTGicxMlFzjyICQkIjpXrBGs-7uJEsg,2826
-beamlit/agents/chat.py,sha256=5iv6dM7Xlg2oP2cGgAlpFreJl4P8GZAiN8MM3v0YVYs,4714
+beamlit/agents/chat.py,sha256=6iZuaP25hUvrKdth-6sbtqxkZ1wM0Fv13eRttxNZlIU,4715
 beamlit/agents/decorator.py,sha256=R5evLoproCgYjKXmH-Vq31r6G2lzZvUitXD1NoTflcA,6014
 beamlit/agents/thread.py,sha256=LN5Ss-uOf5_hdB0WV1dqpn-N-pDJB3C2hUvlCzdqtdk,519
 beamlit/api/__init__.py,sha256=zTSiG_ujSjAqWPyc435YXaX9XTlpMjiJWBbV-f-YtdA,45
@@ -135,17 +135,18 @@ beamlit/common/error.py,sha256=f9oJDFxhoHK-vpjxBgEp0NwWIk0N_THPemUI7uQxVzU,270
 beamlit/common/instrumentation.py,sha256=L4Y6Xu7rQwIHngfp-d0LtWxReaPte6rIzykvkDaIyzE,9288
 beamlit/common/logger.py,sha256=nN_dSOl4bs13QU3Rod-w3e3jYOnlSrHx3_bs-ACY6Aw,1115
 beamlit/common/secrets.py,sha256=sid81bOe3LflkMKDHwBsBs9nIju8bp5-v9qU9gkyNMc,212
-beamlit/common/settings.py,sha256=TOHmf9haMq_VUEcbeaWeuS8zRVjLtVdcA0aGhNg32iA,3772
+beamlit/common/settings.py,sha256=C7iZrLLvl6ap5VCVCYOoK20WdSFqacmd6HtaeZ7SF6s,3760
 beamlit/common/slugify.py,sha256=nR29r37IdWS2i44ZC6ZsXRgqKPYmvMGtFQ7BuIQUTlc,90
 beamlit/common/utils.py,sha256=jouz5igBvT37Xn_e94-foCHyQczVim-UzVcoIF6RWJ4,657
 beamlit/deploy/__init__.py,sha256=GS7l7Jtm2yKs7iNLKcfjYO-rAhUzggQ3xiYSf3oxLBY,91
 beamlit/deploy/deploy.py,sha256=J5VvXWeyIyz6CWy2ctld28T7sVfas-kiJZ1nx6Zw7t0,10374
 beamlit/deploy/format.py,sha256=U6UZEFAYLnGJJ7O2YmSdlUUFhnWNGAv6NZ-DW4KTgvI,2049
 beamlit/deploy/parser.py,sha256=Ga0poCZkoRnuTw082QnTcNGCBJncoRAnVsn8-1FsaJE,6907
-beamlit/functions/__init__.py,sha256=NcQPZZNfWhAJ1T1F6Xn21LFPMbZ7aMR2Sve3uZOkBCQ,170
-beamlit/functions/decorator.py,sha256=99oHbss0RZ6Km7Gf62otun1az9waZM0GPaOJvvwbmOI,8541
-beamlit/functions/mcp/mcp.py,sha256=c7OpmC_zIx1fc2lwoPiyJk_yMyRxWiwCpy9hvRV_C0Y,4080
-beamlit/functions/remote/remote.py,sha256=8dob5SbKaBTvPLZw-6yx955vfnbrjg048QIbW8xQDvA,4844
+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=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
 beamlit/models/agent.py,sha256=w2f_d_nLGVHW7blklH34Nmm2TI3MCoEiQN3HMVga5XI,4002
@@ -277,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.41rc85.dist-info/METADATA,sha256=uF6h-oK1OD8K0CafX1yGoM3gcQ1jCn1e5QyY_k88nxA,3715
-beamlit-0.0.41rc85.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-beamlit-0.0.41rc85.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,,