beamlit 0.0.29rc26__py3-none-any.whl → 0.0.29rc28__py3-none-any.whl

beamlit/agents/decorator.py

@@ -17,16 +17,18 @@ from langchain_core.tools import Tool
 from langgraph.checkpoint.memory import MemorySaver
 from langgraph.prebuilt import create_react_agent
 
-from .chat import get_chat_model
 from .chain import ChainToolkit
+from .chat import get_chat_model
+
 
-def get_functions(dir="src/functions", from_decorator="function"):
+def get_functions(dir="src/functions", from_decorator="function", remote_functions_empty=True):
     functions = []
     logger = getLogger(__name__)
 
     # Walk through all Python files in functions directory and subdirectories
     if not os.path.exists(dir):
-        logger.warn(f"Functions directory {dir} not found")
+        if remote_functions_empty:
+            logger.warn(f"Functions directory {dir} not found")
         return []
     for root, _, files in os.walk(dir):
         for file in files:
@@ -74,6 +76,7 @@ def get_functions(dir="src/functions", from_decorator="function"):
                                     kit_functions = get_functions(
                                         dir=os.path.join(root),
                                         from_decorator="kit",
+                                        remote_functions_empty=remote_functions_empty,
                                     )
                                     functions.extend(kit_functions)
 
@@ -134,7 +137,10 @@ def agent(
             return wrapped
 
         # Initialize functions array to store decorated functions
-        functions = get_functions(dir=settings.agent.functions_directory)
+        functions = get_functions(
+            dir=settings.agent.functions_directory,
+            remote_functions_empty=not remote_functions,
+        )
         settings.agent.functions = functions
 
         if agent is not None:

beamlit/authentication/authentication.py

@@ -80,7 +80,7 @@ def new_client_with_credentials(config: RunClientWithCredentials):
 
 def get_authentication_headers(settings: Settings) -> Dict[str, str]:
     context = current_context()
-    if context.workspace:
+    if context.workspace and not settings.authentication.client.credentials:
         credentials = load_credentials(context.workspace)
     else:
         settings = get_settings()

beamlit/functions/mcp/mcp.py

@@ -11,26 +11,35 @@ from beamlit.authentication.authentication import AuthenticatedClient
 from beamlit.common.settings import get_settings
 from langchain_core.tools.base import BaseTool, BaseToolkit, ToolException
 from mcp import 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
+    )
 
-def create_schema_model(schema: dict[str, t.Any]) -> type[pydantic.BaseModel]:
-    # Create a new model class that returns our JSON schema.
-    # LangChain requires a BaseModel class.
-    class Schema(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
-
-    return Schema
 
 
 class MCPClient:
@@ -42,7 +51,6 @@ class MCPClient:
     def list_tools(self) -> requests.Response:
         client = self.client.get_httpx_client()
         url = urllib.parse.urljoin(settings.mcp_hub_url, f"{self.server_name}/tools/list")
-
         response = client.request("GET", url, headers=self.headers)
         response.raise_for_status()
         return response
@@ -118,7 +126,7 @@ class MCPToolkit(BaseToolkit):
                 client=self.client,
                 name=tool.name,
                 description=tool.description or "",
-                args_schema=create_schema_model(tool.inputSchema),
+                args_schema=create_dynamic_schema(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

@@ -1,46 +1,37 @@
 import asyncio
 import warnings
-from typing import Any, Callable
+from dataclasses import dataclass
+from typing import Callable, Literal
 
 import pydantic
 import typing_extensions as t
-from dataclasses import dataclass
 from beamlit.api.functions import get_function
 from beamlit.authentication.authentication import AuthenticatedClient
-from beamlit.run import RunClient
 from beamlit.common.settings import get_settings
 from beamlit.models import Function, StoreFunctionParameter
+from beamlit.run import RunClient
 from langchain_core.tools.base import BaseTool, ToolException
-from pydantic.json_schema import JsonSchemaValue
-from pydantic_core import core_schema as cs
-
-
-def create_schema_model(parameters: list[StoreFunctionParameter]) -> type[pydantic.BaseModel]:
-    # Create a new model class that returns our JSON schema.
-    # LangChain requires a BaseModel class.
-    class Schema(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:
-            schema = {
-                "type": "object",
-                "properties": {},
-                "required": [],
-            }
-            for parameter in parameters:
-                schema["properties"][parameter.name] = {
-                    "type": parameter.type_,
-                    "description": parameter.description,
-                }
-                if parameter.required:
-                    schema["required"].append(parameter.name)
-            return schema
-
-    return Schema
+
+
+def create_dynamic_schema(name: str, parameters: list[StoreFunctionParameter]) -> type[pydantic.BaseModel]:
+    field_definitions = {}
+    for param in parameters:
+        field_type = str
+        if param.type_ == "number":
+            field_type = float
+        elif param.type_ == "integer":
+            field_type = int
+        elif param.type_ == "boolean":
+            field_type = bool
+
+        field_definitions[param.name] = (
+            field_type,
+            pydantic.Field(description=param.description or "")
+        )
+    return pydantic.create_model(
+        f"{name}Schema",
+        **field_definitions
+    )
 
 
 class RemoteTool(BaseTool):
@@ -49,6 +40,8 @@ class RemoteTool(BaseTool):
     """
 
     client: RunClient
+    resource_name: str
+    kit: bool = False
     handle_tool_error: bool | str | Callable[[ToolException], str] | None = True
 
     @t.override
@@ -62,12 +55,15 @@ class RemoteTool(BaseTool):
     @t.override
     async def _arun(self, *args: t.Any, **kwargs: t.Any) -> t.Any:
         settings = get_settings()
+        body = {**kwargs}
+        if self.kit:
+            body["name"] = self.name
         result = self.client.run(
             "function",
-            self.name,
+            self.resource_name,
             settings.environment,
             "POST",
-            kwargs,
+            json=body
         )
         return result.text
 
@@ -104,8 +100,10 @@ class RemoteToolkit:
                 RemoteTool(
                     client=RunClient(self.client),
                     name=func.name,
+                    resource_name=self._function.metadata.name,
+                    kit=True,
                     description=func.description or "",
-                    args_schema=create_schema_model(func.parameters),
+                    args_schema=create_dynamic_schema(func.name, func.parameters),
                 )
                 for func in self._function.spec.kit
             ]
@@ -114,7 +112,11 @@ class RemoteToolkit:
             RemoteTool(
                 client=RunClient(self.client),
                 name=self._function.metadata.name,
+                resource_name=self._function.metadata.name,
                 description=self._function.spec.description or "",
-                args_schema=create_schema_model(self._function.spec.parameters),
+                args_schema=create_dynamic_schema(
+                    self._function.metadata.name,
+                    self._function.spec.parameters
+                ),
             )
         ]

{beamlit-0.0.29rc26.dist-info → beamlit-0.0.29rc28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beamlit
-Version: 0.0.29rc26
+Version: 0.0.29rc28
 Summary: Add your description here
 Author-email: cploujoux <ch.ploujoux@gmail.com>
 Requires-Python: >=3.12

{beamlit-0.0.29rc26.dist-info → beamlit-0.0.29rc28.dist-info}/RECORD

@@ -7,7 +7,7 @@ beamlit/types.py,sha256=E1hhDh_zXfsSQ0NCt9-uw90_Mr5iIlsdfnfvxv5HarU,1005
 beamlit/agents/__init__.py,sha256=nf1iwQwGtCG6nDqyVhxfWoqR6dv6X3bvSpCeqkTCFaM,101
 beamlit/agents/chain.py,sha256=HzBs3nI4xaH86I_r-M-HGGp6roXsJxMx-qXl_GrJaY0,2831
 beamlit/agents/chat.py,sha256=gVyv4FGBdQTDhdutX8l64OUNa6Fdqaw4eCfEDRH0IPQ,3558
-beamlit/agents/decorator.py,sha256=4JFITRjRLuNpaaSTFkj1ZL5B2PQRXY-a5VBoZ_2NSPw,9479
+beamlit/agents/decorator.py,sha256=4KxPcu6hPoB__1OdzpEJVD5N3QVa_syKd_Y6n6lVEjQ,9715
 beamlit/api/__init__.py,sha256=zTSiG_ujSjAqWPyc435YXaX9XTlpMjiJWBbV-f-YtdA,45
 beamlit/api/agents/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 beamlit/api/agents/create_agent.py,sha256=t5Pr62My2EhQlcIY71MrI73-0_q5Djr3a_Ybt9MIiQQ,3587
@@ -124,7 +124,7 @@ beamlit/api/workspaces/update_workspace.py,sha256=qa5DV2UJSUYuB_ibALb4E9ghKpT1Ha
 beamlit/api/workspaces/update_workspace_user_role.py,sha256=Yn9iuJ4tKtauzBiJyU4-wYUMS9g98X2Om8zs7UkzrY8,4917
 beamlit/authentication/__init__.py,sha256=wiXqRbc7E-ulrH_ueA9duOGFvXeo7-RvhSD1XbFogMo,1020
 beamlit/authentication/apikey.py,sha256=KNBTgdi0VBzBAAmSwU2X1QoB58vRbg8wkXb8-GTZCQo,657
-beamlit/authentication/authentication.py,sha256=ItVo1olbqHtHmIMz5ILT-T5m4j3AqN7XbQKeUE9-8o8,3358
+beamlit/authentication/authentication.py,sha256=ZH3zS7PVa9kw8szZTplwZvCbhBJ-oXHsxEtnAhKjxzM,3409
 beamlit/authentication/clientcredentials.py,sha256=cxZPPu--CgizwqX0pdfFQ91gJt1EFKwyy-aBB_dXX7I,3990
 beamlit/authentication/credentials.py,sha256=p_1xenabCbQuRz7BiFk7oTK4uCxAt_zoyku5o-jcKGE,5343
 beamlit/authentication/device_mode.py,sha256=tmr22gllKOZwBRub_QjF5pYa425x-nE8tQNpZ_EGR6g,3644
@@ -147,8 +147,8 @@ beamlit/functions/github/kit/__init__.py,sha256=jBwPqZv6C23_utukohxqXZwrlicNlI7P
 beamlit/functions/github/kit/pull_request.py,sha256=wQVeRBakiqu-2ouflO8p1z7D5u07KNsitwyNRrp0KjM,1357
 beamlit/functions/math/__init__.py,sha256=wie4WME8jT-WpFRrtu-lDlHW31Mg6K2cwstjkUdLF3o,43
 beamlit/functions/math/math.py,sha256=CpoLJGwuvwCPGnVC8k9GYuIyvfUYPDQHKlZg3cx-z-A,1049
-beamlit/functions/mcp/mcp.py,sha256=uGqNOwEgIKdvtVPmCf9Nf_YI_k7zioLvc6jVOpszrg4,4104
-beamlit/functions/remote/remote.py,sha256=Cfmml8yO3tlszLN2rtwp4FpipLabNSjdRN4Q29sDweQ,3836
+beamlit/functions/mcp/mcp.py,sha256=gXzvUPAKmvGQPHUKTVzMiINukxpw1BV6H8M2iOWvIGU,4348
+beamlit/functions/remote/remote.py,sha256=x2eHh4oYkWwHuZWwg5XeylY-E9Opa6SzfN_0396ePZw,3775
 beamlit/functions/search/__init__.py,sha256=5NAthQ9PBwrkNg1FpLRx4flauvv0HyWuwaVS589c1Pw,49
 beamlit/functions/search/search.py,sha256=8s9ECltq7YE17j6rTxb12uY2EQY4_eTLHmwlIMThI0w,515
 beamlit/models/__init__.py,sha256=O16oX1-oBJqB5LZEHAfu_hZZZh6_PX2LqZpVl4fNQRs,7730
@@ -254,6 +254,6 @@ beamlit/serve/app.py,sha256=OpwPjRdyHZK6J-ziPwhiRDGGa2mvCrFVcBFE6alJVOM,3071
 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.29rc26.dist-info/METADATA,sha256=q6aJeKGzSLnVJtuVjAEFGM7wXesSc4-Vre2neU3FPts,2405
-beamlit-0.0.29rc26.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-beamlit-0.0.29rc26.dist-info/RECORD,,
+beamlit-0.0.29rc28.dist-info/METADATA,sha256=UVbjc-yv-ZhbPjwVM9Ngq4A0igVBwugwKpP-EoZVodQ,2405
+beamlit-0.0.29rc28.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+beamlit-0.0.29rc28.dist-info/RECORD,,