beamlit 0.0.28rc25__py3-none-any.whl → 0.0.29rc27__py3-none-any.whl

beamlit/agents/chain.py

@@ -0,0 +1,93 @@
+import asyncio
+from dataclasses import dataclass
+import warnings
+from typing import Any, Callable
+
+import pydantic
+import typing_extensions as t
+from beamlit.api.agents import list_agents
+from beamlit.authentication.authentication import AuthenticatedClient
+from beamlit.models import Agent, AgentChain
+from beamlit.run import RunClient
+from beamlit.common.settings import get_settings
+from langchain_core.tools.base import BaseTool, ToolException
+
+
+
+class ChainTool(BaseTool):
+    """
+    Chain tool
+    """
+
+    client: RunClient
+    handle_tool_error: bool | str | Callable[[ToolException], str] | None = True
+
+    @t.override
+    def _run(self, *args: t.Any, **kwargs: t.Any) -> t.Any:
+        warnings.warn(
+            "Invoke this tool asynchronousely using `ainvoke`. This method exists only to satisfy standard tests.",
+            stacklevel=1,
+        )
+        return asyncio.run(self._arun(*args, **kwargs))
+
+    @t.override
+    async def _arun(self, *args: t.Any, **kwargs: t.Any) -> t.Any:
+        settings = get_settings()
+        result = self.client.run(
+            "agent",
+            self.name,
+            settings.environment,
+            "POST",
+            json=kwargs,
+        )
+        return result.text
+
+    @t.override
+    @property
+    def tool_call_schema(self) -> type[pydantic.BaseModel]:
+        assert self.args_schema is not None  # noqa: S101
+        return self.args_schema
+
+class ChainInput(pydantic.BaseModel):
+    inputs: str
+
+@dataclass
+class ChainToolkit:
+    """
+    Remote toolkit
+    """
+    client: AuthenticatedClient
+    chain: list[AgentChain]
+    _chain: list[Agent] | None = None
+
+    model_config = pydantic.ConfigDict(arbitrary_types_allowed=True)
+
+    def initialize(self) -> None:
+        """Initialize the session and retrieve tools list"""
+        if self._chain is None:
+            agents = list_agents.sync_detailed(
+                client=self.client,
+            ).parsed
+            chain_enabled = [chain for chain in self.chain if chain.enabled]
+            agents_chain = []
+            for chain in chain_enabled:
+                agent = [agent for agent in agents if agent.metadata.name == chain.name]
+                if agent:
+                    agent[0].spec.description = chain.description or agent[0].spec.description
+                    agents_chain.append(agent[0])
+            self._chain = agents_chain
+
+    @t.override
+    def get_tools(self) -> list[BaseTool]:
+        if self._chain is None:
+            raise RuntimeError("Must initialize the toolkit first")
+
+        return [
+            ChainTool(
+                client=RunClient(self.client),
+                name=agent.metadata.name,
+                description=agent.spec.description or "",
+                args_schema=ChainInput,
+            )
+            for agent in self._chain
+        ]

beamlit/agents/decorator.py

@@ -18,7 +18,7 @@ from langgraph.checkpoint.memory import MemorySaver
 from langgraph.prebuilt import create_react_agent
 
 from .chat import get_chat_model
-
+from .chain import ChainToolkit
 
 def get_functions(dir="src/functions", from_decorator="function"):
     functions = []
@@ -178,7 +178,6 @@ def agent(
                     logger.warn(f"Failed to initialize MCP server {server}: {e!s}")
 
         if remote_functions:
-
             for function in remote_functions:
                 try:
                     toolkit = RemoteToolkit(client, function)
@@ -187,6 +186,11 @@ def agent(
                 except Exception as e:
                     logger.warn(f"Failed to initialize remote function {function}: {e!s}")
 
+        if agent.spec.agent_chain:
+            toolkit = ChainToolkit(client, agent.spec.agent_chain)
+            toolkit.initialize()
+            functions.extend(toolkit.get_tools())
+
         if override_agent is None and len(functions) == 0:
             raise ValueError(
                 "You must define at least one function, you can define this function in directory "

beamlit/authentication/authentication.py

@@ -47,15 +47,15 @@ def new_client_from_settings(settings: Settings):
 
 
 def new_client():
+    settings = get_settings()
     context = current_context()
-    if context.workspace:
+    if context.workspace and not settings.authentication.client.credentials:
         credentials = load_credentials(context.workspace)
         client_config = RunClientWithCredentials(
             credentials=credentials,
             workspace=context.workspace,
         )
     else:
-        settings = get_settings()
         credentials = load_credentials_from_settings(settings)
         client_config = RunClientWithCredentials(
             credentials=credentials,
@@ -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/authentication/clientcredentials.py

@@ -37,7 +37,7 @@ class ClientCredentials(Auth):
     def refresh_if_needed(self) -> Optional[Exception]:
         settings = get_settings()
         if self.credentials.client_credentials and not self.credentials.refresh_token:
-            headers = {"Authorization": f"Basic {self.credentials.client_credentials}"}
+            headers = {"Authorization": f"Basic {self.credentials.client_credentials}", "Content-Type": "application/json"}
             body = {"grant_type": "client_credentials"}
             response = requests.post(f"{settings.base_url}/oauth/token", headers=headers, json=body)
             response.raise_for_status()

beamlit/common/settings.py

@@ -18,11 +18,6 @@ from pydantic_settings import (BaseSettings, PydanticBaseSettingsSource,
 global SETTINGS
 SETTINGS = None
 
-
-def get_settings():
-    return SETTINGS
-
-
 class SettingsAgent(BaseSettings):
     agent: Union[None, CompiledGraph, BaseChatModel] = None
     chain: Union[Unset, list[Agent]] = UNSET
@@ -96,6 +91,9 @@ class Settings(BaseSettings):
             init_settings,
         )
 
+def get_settings() -> Settings:
+    return SETTINGS
+
 
 def init_agent(
     client: AuthenticatedClient,

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,33 +1,37 @@
 import asyncio
-import urllib.parse
 import warnings
-from typing import Any, Callable
+from dataclasses import dataclass
+from typing import Callable, Literal
 
 import pydantic
-import pydantic_core
 import typing_extensions as t
 from beamlit.api.functions import get_function
 from beamlit.authentication.authentication import AuthenticatedClient
-from beamlit.models.function import Function
-from langchain_core.tools.base import BaseTool, BaseToolkit, ToolException
-from pydantic.json_schema import JsonSchemaValue
-from pydantic_core import core_schema as cs
-
-
-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
+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
+
+
+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):
@@ -35,7 +39,9 @@ class RemoteTool(BaseTool):
     Remote tool
     """
 
-    client: AuthenticatedClient
+    client: RunClient
+    resource_name: str
+    kit: bool = False
     handle_tool_error: bool | str | Callable[[ToolException], str] | None = True
 
     @t.override
@@ -48,12 +54,18 @@ class RemoteTool(BaseTool):
 
     @t.override
     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)
-        return content
+        settings = get_settings()
+        body = {**kwargs}
+        if self.kit:
+            body["name"] = self.name
+        result = self.client.run(
+            "function",
+            self.resource_name,
+            settings.environment,
+            "POST",
+            json=body
+        )
+        return result.text
 
     @t.override
     @property
@@ -61,7 +73,8 @@ class RemoteTool(BaseTool):
         assert self.args_schema is not None  # noqa: S101
         return self.args_schema
 
-class RemoteToolkit(BaseToolkit):
+@dataclass
+class RemoteToolkit:
     """
     Remote toolkit
     """
@@ -75,29 +88,35 @@ class RemoteToolkit(BaseToolkit):
     def initialize(self) -> None:
         """Initialize the session and retrieve tools list"""
         if self._function is None:
-            self._function = get_function(self.function, client=self.client)
+            self._function = get_function.sync_detailed(self.function, client=self.client).parsed
 
     @t.override
     def get_tools(self) -> list[BaseTool]:
-        if self._tools is None:
+        if self._function is None:
             raise RuntimeError("Must initialize the toolkit first")
 
         if self._function.spec.kit:
             return [
                 RemoteTool(
-                client=self.client,
-                name=func.name,
-                description=func.description or "",
-                args_schema=create_schema_model(func.parameters),
+                    client=RunClient(self.client),
+                    name=func.name,
+                    resource_name=self._function.metadata.name,
+                    kit=True,
+                    description=func.description or "",
+                    args_schema=create_dynamic_schema(func.name, func.parameters),
                 )
                 for func in self._function.spec.kit
             ]
 
         return [
             RemoteTool(
-                client=self.client,
+                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.28rc25.dist-info → beamlit-0.0.29rc27.dist-info}/METADATA

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

{beamlit-0.0.28rc25.dist-info → beamlit-0.0.29rc27.dist-info}/RECORD

@@ -5,8 +5,9 @@ beamlit/py.typed,sha256=8ZJUsxZiuOy1oJeVhsTWQhTG_6pTVHVXk5hJL79ebTk,25
 beamlit/run.py,sha256=RLwMv5f_S8lw7Wq7O6DvEcOl0nGYh769qjGl_SmR9Z0,1338
 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=WiE6zfRv4Ywf1wH-rUaGjBNGjIDRdgoEH_8Yl26IM6U,9263
+beamlit/agents/decorator.py,sha256=4JFITRjRLuNpaaSTFkj1ZL5B2PQRXY-a5VBoZ_2NSPw,9479
 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
@@ -123,8 +124,8 @@ 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=a29-iD92T8_q8Kpx25VXEyyASlCaFsSg0s8y-SWPtns,3311
-beamlit/authentication/clientcredentials.py,sha256=6kbfTjwUkXUArJX8XZLe9ZzbEicQc19tSXBvsTpiXMk,3954
+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
 beamlit/common/__init__.py,sha256=yDoMJDKj-xjTGl7U1YI59KpWxiOV65HSiUulgO8xdTA,277
@@ -132,7 +133,7 @@ beamlit/common/generate.py,sha256=LtdCju_QayRS4lZrrb_0VHqWWvTcv4Mbf-iV1TB_Qko,75
 beamlit/common/instrumentation.py,sha256=MsBDfFcMYqGDiHHj4j5hLHE4EWxZExkhmCeFS3SKzJY,3181
 beamlit/common/logger.py,sha256=VFRbaZh93n8ZGugeeYKe88IP2nI3g2JNa7XN4j8wVJE,1116
 beamlit/common/secrets.py,sha256=sid81bOe3LflkMKDHwBsBs9nIju8bp5-v9qU9gkyNMc,212
-beamlit/common/settings.py,sha256=Z-UBDQKp_pAusWgwmoIwK5nl_z9xfOYYEeCCuYafr0M,5821
+beamlit/common/settings.py,sha256=uge6-VTioSILA9lgPpKc5V7MaSEMuHYHfCQhwdqHteE,5831
 beamlit/common/utils.py,sha256=jouz5igBvT37Xn_e94-foCHyQczVim-UzVcoIF6RWJ4,657
 beamlit/deploy/__init__.py,sha256=GS7l7Jtm2yKs7iNLKcfjYO-rAhUzggQ3xiYSf3oxLBY,91
 beamlit/deploy/deploy.py,sha256=rXpiAqlO36Ul1eadBEiwiil-6R2DkbaYHzw-qcqZ0g4,9183
@@ -146,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=W60VNSNfBcVed8HVifOjcWN20StmhDjSV06AT35STaY,3276
+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
@@ -253,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.28rc25.dist-info/METADATA,sha256=JLFUlrvUKeIJWwQT1lX7St9EBkt7-xRZwQu_UGKUotg,2405
-beamlit-0.0.28rc25.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-beamlit-0.0.28rc25.dist-info/RECORD,,
+beamlit-0.0.29rc27.dist-info/METADATA,sha256=cG70rj7h-Axm61rRZWHeKjHwb18SayvRGmbOjxnczAs,2405
+beamlit-0.0.29rc27.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+beamlit-0.0.29rc27.dist-info/RECORD,,