beamlit 0.0.33rc44__tar.gz → 0.0.33rc46__tar.gz

{beamlit-0.0.33rc44 → beamlit-0.0.33rc46}/PKG-INFO

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

{beamlit-0.0.33rc44 → beamlit-0.0.33rc46}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "beamlit"
-version = "0.0.33.pre-44"
+version = "0.0.33.pre-46"
 description = "Add your description here"
 readme = "README.md"
 authors = [

{beamlit-0.0.33rc44 → beamlit-0.0.33rc46}/src/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-0.0.33rc44 → beamlit-0.0.33rc46}/src/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-0.0.33rc46/src/beamlit/common/slugify.py

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

{beamlit-0.0.33rc44 → beamlit-0.0.33rc46}/src/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-0.0.33rc46/src/beamlit/functions/decorator.py

@@ -0,0 +1,48 @@
+"""Decorators for creating function tools with Beamlit and LangChain integration."""
+
+import functools
+import json
+from collections.abc import Callable
+from logging import getLogger
+
+from fastapi import Request
+
+from beamlit.common.settings import get_settings
+from beamlit.models import Function, FunctionKit
+
+logger = getLogger(__name__)
+
+def kit(bl_kit: FunctionKit = None, **kwargs: dict) -> Callable:
+    """Create function tools with Beamlit and LangChain integration."""
+
+    def wrapper(func: Callable) -> Callable:
+        if bl_kit and not func.__doc__ and bl_kit.description:
+            func.__doc__ = bl_kit.description
+        return func
+
+    return wrapper
+
+
+def function(*args, function: Function | dict = None, kit=False, **kwargs: dict) -> Callable:
+    """Create function tools with Beamlit and LangChain integration."""
+    settings = get_settings()
+    if function is not None and not isinstance(function, dict):
+        raise Exception(
+            'function must be a dictionary, example: @function(function={"metadata": {"name": "my_function"}})'
+        )
+    if isinstance(function, dict):
+        function = Function(**function)
+
+    def wrapper(func: Callable) -> Callable:
+        if function and not func.__doc__ and function.spec and function.spec.description:
+            func.__doc__ = function.spec.description
+
+        @functools.wraps(func)
+        async def wrapped(*args, **kwargs):
+            if isinstance(args[0], Request):
+                body = await args[0].json()
+                args = [body.get(param) for param in func.__code__.co_varnames[:func.__code__.co_argcount]]
+            return func(*args, **kwargs)
+        return wrapped
+
+    return wrapper

beamlit-0.0.33rc44/src/beamlit/functions/decorator.py

@@ -1,104 +0,0 @@
-"""Decorators for creating function tools with Beamlit and LangChain integration."""
-
-import json
-from collections.abc import Callable
-from logging import getLogger
-import functools
-
-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."""
-
-    def wrapper(func: Callable) -> Callable:
-        if bl_kit and not func.__doc__ and bl_kit.description:
-            func.__doc__ = bl_kit.description
-        return func
-
-    return wrapper
-
-
-def function(*args, function: Function | dict = None, kit=False, **kwargs: dict) -> Callable:
-    """Create function tools with Beamlit and LangChain integration."""
-    settings = get_settings()
-    if function is not None and not isinstance(function, dict):
-        raise Exception(
-            'function must be a dictionary, example: @function(function={"metadata": {"name": "my_function"}})'
-        )
-    if isinstance(function, dict):
-        function = Function(**function)
-
-    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):
-                body = await args[0].json()
-                args = [body.get(param) for param in func.__code__.co_varnames[:func.__code__.co_argcount]]
-            return func(*args, **kwargs)
-        return wrapped
-
-    return wrapper