beamlit 0.0.33rc45__py3-none-any.whl → 0.0.33rc46__py3-none-any.whl

beamlit/agents/decorator.py

@@ -12,7 +12,8 @@ from langgraph.prebuilt import create_react_agent
 
 from beamlit.api.models import get_model
 from beamlit.authentication import new_client
-from beamlit.common.settings import init
+from beamlit.common.settings import init, get_settings
+from beamlit.common import slugify
 from beamlit.errors import UnexpectedStatus
 from beamlit.functions.mcp.mcp import MCPClient, MCPToolkit
 from beamlit.functions.remote.remote import RemoteToolkit
@@ -22,9 +23,10 @@ from .chain import ChainToolkit
 from .chat import get_chat_model
 
 
-def get_functions(dir="src/functions", from_decorator="function", remote_functions_empty=True):
+def get_functions(client, dir="src/functions", from_decorator="function", remote_functions_empty=True):
     functions = []
     logger = getLogger(__name__)
+    settings = get_settings()
 
     # Walk through all Python files in functions directory and subdirectories
     if not os.path.exists(dir):
@@ -73,8 +75,9 @@ def get_functions(dir="src/functions", from_decorator="function", remote_functio
                                             keyword.value, ast.Constant
                                         ):
                                             is_kit = keyword.value.value
-                                if is_kit:
+                                if is_kit and not settings.remote:
                                     kit_functions = get_functions(
+                                        client,
                                         dir=os.path.join(root),
                                         from_decorator="kit",
                                         remote_functions_empty=remote_functions_empty,
@@ -84,23 +87,28 @@ def get_functions(dir="src/functions", from_decorator="function", remote_functio
                                 # Get the decorated function
                                 if not is_kit and hasattr(module, func_name):
                                     func = getattr(module, func_name)
-                                    if asyncio.iscoroutinefunction(func):
-                                        functions.append(
-                                            Tool(
-                                                name=func.__name__,
-                                                description=func.__doc__,
-                                                func=func,
-                                                coroutine=func,
-                                            )
-                                        )
+                                    if settings.remote:
+                                        toolkit = RemoteToolkit(client, slugify(func.__name__))
+                                        toolkit.initialize()
+                                        functions.extend(toolkit.get_tools())
                                     else:
-                                        functions.append(
-                                            Tool(
-                                                name=func.__name__,
-                                                description=func.__doc__,
-                                                func=func,
+                                        if asyncio.iscoroutinefunction(func):
+                                            functions.append(
+                                                Tool(
+                                                    name=func.__name__,
+                                                    description=func.__doc__,
+                                                    func=func,
+                                                    coroutine=func,
+                                                )
+                                            )
+                                        else:
+                                            functions.append(
+                                                Tool(
+                                                    name=func.__name__,
+                                                    description=func.__doc__,
+                                                    func=func,
+                                                )
                                             )
-                                        )
                     except Exception as e:
                         logger.warning(f"Error processing {file_path}: {e!s}")
     return functions
@@ -139,9 +147,11 @@ def agent(
 
         # Initialize functions array to store decorated functions
         functions = get_functions(
+            client,
             dir=settings.agent.functions_directory,
             remote_functions_empty=not remote_functions,
         )
+
         settings.agent.functions = functions
 
         if agent is not None:

beamlit/common/__init__.py

@@ -3,6 +3,7 @@ from .logger import init as init_logger
 from .secrets import Secret
 from .settings import Settings, get_settings, init, init_agent
 from .utils import copy_folder
+from .slugify import slugify
 
 __all__ = [
     "Secret",
@@ -13,4 +14,5 @@ __all__ = [
     "copy_folder",
     "init_logger",
     "HTTPError",
+    "slugify"
 ]

beamlit/common/slugify.py

@@ -0,0 +1,2 @@
+def slugify(name: str) -> str:
+    return name.lower().replace(" ", "-").replace("_", "-")

beamlit/deploy/deploy.py

@@ -16,7 +16,7 @@ from beamlit.models import (
     FunctionSpec,
     Runtime,
 )
-
+from beamlit.common import slugify
 from .format import arg_to_dict, format_agent_chain, format_parameters
 from .parser import Resource, get_description, get_parameters, get_resources
 
@@ -24,8 +24,6 @@ sys.path.insert(0, os.getcwd())
 sys.path.insert(0, os.path.join(os.getcwd(), "src"))
 
 random_id = str(uuid.uuid4())[:8]
-def slugify(name: str) -> str:
-    return name.lower().replace(" ", "-").replace("_", "-")
 
 def get_runtime_image(type: str, name: str) -> str:
     settings = get_settings()

beamlit/functions/decorator.py

@@ -6,59 +6,12 @@ from collections.abc import Callable
 from logging import getLogger
 
 from fastapi import Request
-from langchain_core.tools import create_schema_from_function
 
-from beamlit.authentication import new_client
 from beamlit.common.settings import get_settings
 from beamlit.models import Function, FunctionKit
-from beamlit.run import RunClient
 
 logger = getLogger(__name__)
 
-
-def get_remote_function(func: Callable, function: Function):
-    settings = get_settings()
-    name = (function and function.metadata and function.metadata.name) or func.__name__
-
-    def _partial(*args, **kwargs):
-        # Get function signature parameters
-        try:
-            client = new_client()
-            run_client = RunClient(client)
-            logger.debug(
-                f"Calling remote function: NAME={name}"
-                f" PARAMS={kwargs} ENVIRONMENT={settings.environment}"
-            )
-            response = run_client.run(
-                resource_type="function",
-                resource_name=name,
-                environment=settings.environment,
-                method="POST",
-                headers={"Content-Type": "application/json"},
-                data=json.dumps(kwargs),
-            )
-            content = response.text
-            if response.status_code >= 400:
-                content = f"{response.status_code}:{response.text}"
-                logger.error(f"Error calling remote function: {content}")
-                return f"Error calling remote function: {content}"
-            logger.debug(
-                f"Response from remote function: NAME={name}"
-                f" RESPONSE={content} ENVIRONMENT={settings.environment}"
-            )
-            if response.headers.get("content-type") == "application/json":
-                return response.json()
-            return content
-        except Exception as e:
-            logger.error(f"Error calling function {name}: {e}")
-            raise e
-
-    remote_func = _partial
-    remote_func.__name__ = func.__name__
-    remote_func.__doc__ = func.__doc__
-    return remote_func
-
-
 def kit(bl_kit: FunctionKit = None, **kwargs: dict) -> Callable:
     """Create function tools with Beamlit and LangChain integration."""
 
@@ -83,16 +36,7 @@ def function(*args, function: Function | dict = None, kit=False, **kwargs: dict)
     def wrapper(func: Callable) -> Callable:
         if function and not func.__doc__ and function.spec and function.spec.description:
             func.__doc__ = function.spec.description
-        if settings.remote:
-            remote_func = get_remote_function(func, function)
-            if not kwargs.get("args_schema"):
-                kwargs["args_schema"] = create_schema_from_function(
-                    func.__name__,
-                    func,
-                    parse_docstring=func.__doc__,
-                )
-            return remote_func
-        
+
         @functools.wraps(func)
         async def wrapped(*args, **kwargs):
             if isinstance(args[0], Request):

{beamlit-0.0.33rc45.dist-info → beamlit-0.0.33rc46.dist-info}/METADATA

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

{beamlit-0.0.33rc45.dist-info → beamlit-0.0.33rc46.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=vfCjiFHuu02uTTGicxMlFzjyICQkIjpXrBGs-7uJEsg,2826
 beamlit/agents/chat.py,sha256=gVyv4FGBdQTDhdutX8l64OUNa6Fdqaw4eCfEDRH0IPQ,3558
-beamlit/agents/decorator.py,sha256=RAhe7wHKJnjMpmU7KWKcM6EZjdm3pgUBhQQUP2T6GZY,9716
+beamlit/agents/decorator.py,sha256=5PnVu7G5a4kyK7P3h6QgHQXudOBhxl6EwK8FpxBRcjE,10297
 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
@@ -128,20 +128,21 @@ beamlit/authentication/authentication.py,sha256=ODQCc00RvCOZNaiGG5ctylNnE-JVCuge
 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=vj4_boIBVitMsaQR8BqBqE2eupOIh6MWBAYlYyCCH98,341
+beamlit/common/__init__.py,sha256=4zSon2Pf7mSvTT8931UIb5Qb6xhlETa9lU9u92bkiL4,384
 beamlit/common/error.py,sha256=f9oJDFxhoHK-vpjxBgEp0NwWIk0N_THPemUI7uQxVzU,270
 beamlit/common/generate.py,sha256=LtdCju_QayRS4lZrrb_0VHqWWvTcv4Mbf-iV1TB_Qko,7522
 beamlit/common/instrumentation.py,sha256=GVYeat7qCcqzDoKSYig3s8ZCC172R9JiQIr3Evv3kik,4293
 beamlit/common/logger.py,sha256=nN_dSOl4bs13QU3Rod-w3e3jYOnlSrHx3_bs-ACY6Aw,1115
 beamlit/common/secrets.py,sha256=sid81bOe3LflkMKDHwBsBs9nIju8bp5-v9qU9gkyNMc,212
 beamlit/common/settings.py,sha256=_4oCVrJZOMaTZoK2Zzo2DWqtUyBsspuOH3iAJ_nU0tw,5923
+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=MlFRyKtKNB7Tm9Oo0RJbBtOgch4djm6DTon_z2iPo_k,9945
+beamlit/deploy/deploy.py,sha256=junQAo5zf9vC81cS6_6-0AOy4xRvvXlX710-kUK6hRE,9888
 beamlit/deploy/format.py,sha256=PJ8kU7Y1pwiS3tqqyvFaag9LO3jju-4ua574163VPk4,1820
 beamlit/deploy/parser.py,sha256=Ga0poCZkoRnuTw082QnTcNGCBJncoRAnVsn8-1FsaJE,6907
 beamlit/functions/__init__.py,sha256=_RPG1Bfg54JGdIPnViAU6n9zD7E1cDNsdXi8oYGskzE,138
-beamlit/functions/decorator.py,sha256=N8AiR7XGkKzpZnZHrOd9p9udJ0fnfIrqJfpV9vdfgWA,3903
+beamlit/functions/decorator.py,sha256=5FnupXre0W-QN3ej5o7MZBRmTkxtwtPKIwmL031Szq4,1703
 beamlit/functions/github/__init__.py,sha256=gYnUkeegukOfbymdabuuJkScvH-_ZJygX05BoqkPn0o,49
 beamlit/functions/github/github.py,sha256=FajzLCNkpXcwfgnC0l9rOGT2eSPLCz8-qrMzK9N_ZNc,598
 beamlit/functions/github/kit/__init__.py,sha256=jBwPqZv6C23_utukohxqXZwrlicNlI7PYPUj0Den7Cw,136
@@ -256,6 +257,6 @@ beamlit/serve/app.py,sha256=DXWxQoMeuA5FYvBMyLrP94OEWQbwLf4GZk3I9fkwSPA,3523
 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.33rc45.dist-info/METADATA,sha256=ZHk3HMzhN_0knJTaG1X6cOsktBQqPL_lU0918iGBOZ8,2405
-beamlit-0.0.33rc45.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-beamlit-0.0.33rc45.dist-info/RECORD,,
+beamlit-0.0.33rc46.dist-info/METADATA,sha256=lu9c9pPcGyUhuyS-y1rgrF7hzdae0LmL5NpOr3BrHSo,2405
+beamlit-0.0.33rc46.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+beamlit-0.0.33rc46.dist-info/RECORD,,