beamlit 0.0.38rc83__py3-none-any.whl → 0.0.40rc84__py3-none-any.whl

beamlit/agents/decorator.py

@@ -3,14 +3,15 @@ import functools
 import inspect
 from logging import getLogger
 
+from langgraph.checkpoint.memory import MemorySaver
+from langgraph.prebuilt import create_react_agent
+
 from beamlit.api.models import get_model, list_models
 from beamlit.authentication import new_client
 from beamlit.common.settings import init
 from beamlit.errors import UnexpectedStatus
 from beamlit.functions import get_functions
 from beamlit.models import Agent, AgentMetadata, AgentSpec
-from langgraph.checkpoint.memory import MemorySaver
-from langgraph.prebuilt import create_react_agent
 
 from .chat import get_chat_model_full
 
@@ -20,7 +21,6 @@ def agent(
     override_model=None,
     override_agent=None,
     override_functions=None,
-    mcp_hub=None,
     remote_functions=None,
 ):
     logger = getLogger(__name__)
@@ -95,7 +95,6 @@ def agent(
             functions = get_functions(
                 client=client,
                 dir=settings.agent.functions_directory,
-                mcp_hub=mcp_hub,
                 remote_functions=remote_functions,
                 chain=agent.spec.agent_chain,
             remote_functions_empty=not remote_functions,

beamlit/common/settings.py

@@ -4,12 +4,8 @@ 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
@@ -59,7 +55,6 @@ class Settings(BaseSettings):
     base_url: str = Field(default="https://api.beamlit.com/v0")
     app_url: str = Field(default="https://app.beamlit.com")
     run_url: str = Field(default="https://run.beamlit.com")
-    mcp_hub_url: str = Field(default="https://mcp-hub-server.beamlit.workers.com")
     registry_url: str = Field(default="https://us.registry.beamlit.com")
     log_level: str = Field(default="INFO")
     enable_opentelemetry: bool = Field(default=False)
@@ -72,10 +67,9 @@ class Settings(BaseSettings):
         if os.getenv('BL_ENV') == 'dev':
             self.base_url = os.getenv('BL_BASE_URL') or "https://api.beamlit.dev/v0"
             self.run_url = os.getenv('BL_RUN_URL') or "https://run.beamlit.dev"
-            self.mcp_hub_url = os.getenv('BL_MCP_HUB_URL') or "https://mcp-hub-server.beamlit.workers.dev"
             self.registry_url = os.getenv('BL_REGISTRY_URL') or "https://eu.registry.beamlit.dev"
             self.app_url = os.getenv('BL_APP_URL') or "https://app.beamlit.dev"
-            
+
     @classmethod
     def settings_customise_sources(
         cls,

beamlit/functions/decorator.py

@@ -16,14 +16,12 @@ 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.mcp.mcp import MCPClient, MCPToolkit
 from beamlit.functions.remote.remote import RemoteToolkit
 from beamlit.models import AgentChain, Function, FunctionKit
 
 logger = getLogger(__name__)
 
 def get_functions(
-    mcp_hub:Union[list[str], None]=None,
     remote_functions:Union[list[str], None]=None,
     client:Union[AuthenticatedClient, None]=None,
     dir:Union[str, None]=None,
@@ -130,16 +128,6 @@ def get_functions(
                         except Exception as e:
                             logger.warning(f"Error processing {file_path}: {e!s}")
 
-    if mcp_hub:
-        for server in mcp_hub:
-            try:
-                mcp_client = MCPClient(client, server)
-                toolkit = MCPToolkit(client=mcp_client)
-                toolkit.initialize()
-                functions.extend(toolkit.get_tools())
-            except Exception as e:
-                logger.warn(f"Failed to initialize MCP server {server}: {e!s}")
-
     if remote_functions:
         for function in remote_functions:
             try:

beamlit/functions/mcp/mcp.py

@@ -44,26 +44,22 @@ def create_dynamic_schema(name: str, schema: dict[str, t.Any]) -> type[pydantic.
 
 
 class MCPClient:
-    def __init__(self, client: AuthenticatedClient, server_name: str):
+    def __init__(self, client: AuthenticatedClient, url: str):
         self.client = client
-        self.server_name = server_name
-        self.headers = {"Api-Key": "1234567890"}
+        self.url = url
 
     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 = client.request("GET", f"{self.url}/tools/list")
         response.raise_for_status()
         return response
 
     def call_tool(self, tool_name: str, arguments: dict[str, Any] = None) -> requests.Response:
         client = self.client.get_httpx_client()
-        url = urllib.parse.urljoin(settings.mcp_hub_url, f"{self.server_name}/tools/call")
         response = client.request(
             "POST",
-            url,
+            f"{self.url}/tools/call",
             json={"name": tool_name, "arguments": arguments},
-            headers=self.headers,
         )
         response.raise_for_status()
         return response

beamlit/functions/remote/remote.py

@@ -10,6 +10,7 @@ from langchain_core.tools.base import BaseTool, ToolException
 from beamlit.api.functions import get_function
 from beamlit.authentication.authentication import AuthenticatedClient
 from beamlit.common.settings import get_settings
+from beamlit.functions.mcp.mcp import MCPClient, MCPToolkit
 from beamlit.models import Function, StoreFunctionParameter
 from beamlit.run import RunClient
 
@@ -79,11 +80,9 @@ class RemoteToolkit:
     """
     Remote toolkit
     """
-
     client: AuthenticatedClient
     function: str
     _function: Function | None = None
-
     model_config = pydantic.ConfigDict(arbitrary_types_allowed=True)
 
     def initialize(self) -> None:
@@ -93,9 +92,17 @@ class RemoteToolkit:
 
     @t.override
     def get_tools(self) -> list[BaseTool]:
+        settings = get_settings()
         if self._function is None:
             raise RuntimeError("Must initialize the toolkit first")
 
+        if self._function.spec.integration_connections:
+            url = f"{settings.run_url}/{settings.workspace}/functions/{self._function.metadata.name}"
+            mcp_client = MCPClient(self.client, url)
+            mcp_toolkit = MCPToolkit(client=mcp_client)
+            mcp_toolkit.initialize()
+            return mcp_toolkit.get_tools()
+
         if self._function.spec.kit:
             return [
                 RemoteTool(

{beamlit-0.0.38rc83.dist-info → beamlit-0.0.40rc84.dist-info}/METADATA

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

{beamlit-0.0.38rc83.dist-info → beamlit-0.0.40rc84.dist-info}/RECORD

@@ -7,7 +7,7 @@ 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/decorator.py,sha256=e9ajjak6fYrDBkQvfQhzHncYuxuDuEmpWdBbloG5ueE,6064
+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
 beamlit/api/agents/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -135,7 +135,7 @@ 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=OL1pZLB3BgN7QPCz9VR7gjYb-LoYpelilS7rU7FubCE,3962
+beamlit/common/settings.py,sha256=TOHmf9haMq_VUEcbeaWeuS8zRVjLtVdcA0aGhNg32iA,3772
 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
@@ -143,15 +143,15 @@ beamlit/deploy/deploy.py,sha256=J5VvXWeyIyz6CWy2ctld28T7sVfas-kiJZ1nx6Zw7t0,1037
 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=HFy-b9cj9kkF2qcP5eTCf94LGeoHgAwZ4xXXh3S9N24,9024
+beamlit/functions/decorator.py,sha256=99oHbss0RZ6Km7Gf62otun1az9waZM0GPaOJvvwbmOI,8541
 beamlit/functions/github/__init__.py,sha256=gYnUkeegukOfbymdabuuJkScvH-_ZJygX05BoqkPn0o,49
 beamlit/functions/github/github.py,sha256=RfzWMT9nwPjsCOJr_-emN7eJHCIt2WsvkT9tq8-HfeA,568
 beamlit/functions/github/kit/__init__.py,sha256=jBwPqZv6C23_utukohxqXZwrlicNlI7PYPUj0Den7Cw,136
 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=-LL7O35vTlcYfF1MSlEY83rBKKShJTaHB-y9MRPAEiU,4349
-beamlit/functions/remote/remote.py,sha256=AL8WhD7yXZ18h3iU4vE9E4JtJt0n_i-ZwlbBDoolnEs,3767
+beamlit/functions/mcp/mcp.py,sha256=c7OpmC_zIx1fc2lwoPiyJk_yMyRxWiwCpy9hvRV_C0Y,4080
+beamlit/functions/remote/remote.py,sha256=NldBFEostIX7yLw8ZE12MgVqhVpvKB4Z6FiQUBhPFsc,4207
 beamlit/functions/search/__init__.py,sha256=5NAthQ9PBwrkNg1FpLRx4flauvv0HyWuwaVS589c1Pw,49
 beamlit/functions/search/search.py,sha256=8s9ECltq7YE17j6rTxb12uY2EQY4_eTLHmwlIMThI0w,515
 beamlit/models/__init__.py,sha256=DB2EBTVX5lTO7CzXvZaqiPtgc9n8SMPu59zGD5_Vvno,9652
@@ -285,6 +285,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.38rc83.dist-info/METADATA,sha256=kgHJEm39_PgvwOJnyTsdEvEXXiDCrG447WA5cMXfRo0,3715
-beamlit-0.0.38rc83.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-beamlit-0.0.38rc83.dist-info/RECORD,,
+beamlit-0.0.40rc84.dist-info/METADATA,sha256=IIgQeS831MisY-EbiNZqA54a05M-Cb3h_2LT3dxqT7o,3715
+beamlit-0.0.40rc84.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+beamlit-0.0.40rc84.dist-info/RECORD,,