beamlit 0.0.33rc49__py3-none-any.whl → 0.0.34rc51__py3-none-any.whl

beamlit/agents/decorator.py

@@ -6,9 +6,10 @@ import importlib
 import os
 from logging import getLogger
 
-from langchain_core.tools import Tool
+from langchain_core.tools import StructuredTool
 from langgraph.checkpoint.memory import MemorySaver
 from langgraph.prebuilt import create_react_agent
+from langchain_core.tools.base import create_schema_from_function
 
 from beamlit.api.models import get_model
 from beamlit.authentication import new_client
@@ -94,19 +95,21 @@ def get_functions(client, dir="src/functions", from_decorator="function", remote
                                     else:
                                         if asyncio.iscoroutinefunction(func):
                                             functions.append(
-                                                Tool(
+                                                StructuredTool(
                                                     name=func.__name__,
                                                     description=func.__doc__,
                                                     func=func,
                                                     coroutine=func,
+                                                    args_schema=create_schema_from_function(func.__name__, func)
                                                 )
                                             )
                                         else:
                                             functions.append(
-                                                Tool(
+                                                StructuredTool(
                                                     name=func.__name__,
                                                     description=func.__doc__,
                                                     func=func,
+                                                    args_schema=create_schema_from_function(func.__name__, func)
                                                 )
                                             )
                     except Exception as e:

beamlit/common/__init__.py

@@ -1,7 +1,7 @@
 from .error import HTTPError
 from .logger import init as init_logger
 from .secrets import Secret
-from .settings import Settings, get_settings, init, init_agent
+from .settings import Settings, get_settings, init
 from .slugify import slugify
 from .utils import copy_folder
 
@@ -9,7 +9,6 @@ __all__ = [
     "Secret",
     "Settings",
     "get_settings",
-    "init_agent",
     "init",
     "copy_folder",
     "init_logger",

beamlit/common/settings.py

@@ -1,5 +1,4 @@
 import os
-from logging import getLogger
 from typing import Tuple, Type, Union
 
 from langchain_core.language_models.chat_models import BaseChatModel
@@ -12,22 +11,17 @@ from pydantic_settings import (
     YamlConfigSettingsSource,
 )
 
-from beamlit.api.agents import get_agent
-from beamlit.api.functions import get_function
-from beamlit.api.models import get_model
-from beamlit.client import AuthenticatedClient
 from beamlit.common.logger import init as init_logger
 from beamlit.models import Agent, Function, Model
-from beamlit.types import UNSET, Unset
 
 global SETTINGS
 SETTINGS = None
 
 class SettingsAgent(BaseSettings):
-    agent: Union[None, CompiledGraph, BaseChatModel] = None
-    chain: Union[Unset, list[Agent]] = UNSET
-    model: Union[Unset, Model] = UNSET
-    functions: Union[Unset, list[Function]] = UNSET
+    agent: Union[None, CompiledGraph] = None
+    chain: Union[None, list[Agent]] = None
+    model: Union[None, Model] = None
+    functions: Union[None, list[Function]] = None
     functions_directory: str = Field(default="src/functions")
     chat_model: Union[None, BaseChatModel] = None
     module: str = Field(default="main.main")
@@ -100,59 +94,6 @@ class Settings(BaseSettings):
 def get_settings() -> Settings:
     return SETTINGS
 
-
-def init_agent(
-    client: AuthenticatedClient,
-    destination: str = f"{os.getcwd()}/src/beamlit_generated.py",
-):
-    from beamlit.common.generate import generate
-
-    logger = getLogger(__name__)
-    settings = get_settings()
-    # Init configuration from environment variables
-    if settings.agent.functions or settings.agent.chain:
-        return
-
-    # Init configuration from beamlit control plane
-    name = settings.name
-    env = settings.environment
-
-    agent = get_agent.sync(name, environment=env, client=client)
-    if not agent:
-        raise ValueError(f"Agent {name} not found")
-    functions: list[Function] = []
-    agents_chain: list[Agent] = []
-    if agent.spec.functions:
-        for function in agent.spec.functions:
-            function = get_function.sync(function, environment=env, client=client)
-            if function:
-                functions.append(function)
-        settings.agent.functions = functions
-
-    if agent.spec.agentChain:
-        for chain in agent.spec.agentChain:
-            if chain.enabled:
-                agentChain = get_agent.sync(chain.name, environment=env, client=client)
-                if chain.description:
-                    agentChain.spec.description = chain.description
-                agents_chain.append(agentChain)
-        settings.agent.chain = agents_chain
-    if agent.spec.model:
-        model = get_model.sync(agent.spec.model, environment=env, client=client)
-        settings.agent.model = model
-
-    content_generate = generate(destination, dry_run=True)
-    compared_content = None
-    if os.path.exists(destination):
-        compared_content = open(destination).read()
-
-    if not os.path.exists(destination) or (
-        compared_content and content_generate != compared_content
-    ):
-        logger.info("Generating agent code")
-        generate(destination)
-
-
 def init() -> Settings:
     """Parse the beamlit.yaml file to get configurations."""
     from beamlit.authentication.credentials import current_context

{beamlit-0.0.33rc49.dist-info → beamlit-0.0.34rc51.dist-info}/METADATA

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

{beamlit-0.0.33rc49.dist-info → beamlit-0.0.34rc51.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=PUw5xfG4KmmVeSbgI-Ac7KAm5n0addPhg5MysfxLpWk,10297
+beamlit/agents/decorator.py,sha256=n3sETKu8V2g3GDJ0f17kUowyqaRJvpg3n_BGRRVuNGY,10619
 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,13 +128,12 @@ 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=UjOMfg6BeoXqalI3p98qMpgdh__AstwvdUz_9lx8lUY,384
+beamlit/common/__init__.py,sha256=saX5X3hRCJ9erSlXuSkZ2VGgquvpgdcofAU_9sM4bCE,354
 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/settings.py,sha256=b2rvby-ufG3M0AB1ReoWFM-1EzF1LaE-gbokO9HvQDI,3810
 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
@@ -257,6 +256,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.33rc49.dist-info/METADATA,sha256=5_QMzORLYGZDg98cqBd7UP0O94nUxM1VXacm933d1PA,2405
-beamlit-0.0.33rc49.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-beamlit-0.0.33rc49.dist-info/RECORD,,
+beamlit-0.0.34rc51.dist-info/METADATA,sha256=912n-eb3Gn8qEASD4KQYpO_lConoEVI06AixnfojXuA,2405
+beamlit-0.0.34rc51.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+beamlit-0.0.34rc51.dist-info/RECORD,,

beamlit/common/generate.py

@@ -1,196 +0,0 @@
-from typing import Tuple
-
-from beamlit.common.settings import Settings, get_settings
-from beamlit.models import Agent, Function, FunctionMetadata, FunctionSpec
-from beamlit.models.function_kit import FunctionKit
-
-
-def get_titles_name(name: str) -> str:
-    return name.title().replace("-", "").replace("_", "")
-
-
-def generate_kit_function_code(
-    settings: Settings, function: Function, kit: FunctionKit
-) -> Tuple[str, str]:
-    export_code = ""
-    code = ""
-    for kit in kit:
-        fn = Function(
-            metadata=FunctionMetadata(
-                name=kit.name,
-                workspace=settings.workspace,
-                environment=settings.environment,
-            ),
-            spec=FunctionSpec(
-                parameters=kit.parameters,
-                description=kit.description,
-            ),
-        )
-        new_code, export = generate_function_code(
-            settings, fn, force_name_in_endpoint=function.metadata.name, kit=True
-        )
-        code += new_code
-        export_code += export
-    return code, export_code
-
-
-def generate_function_code(
-    settings: Settings,
-    function: Function,
-    force_name_in_endpoint: str = "",
-    kit: bool = False,
-) -> Tuple[str, str]:
-    name = get_titles_name(function.metadata.name)
-    if function.spec.parameters and len(function.spec.parameters) > 0:
-        args_list = ", ".join(f"{param.name}: str" for param in function.spec.parameters)
-        args_list += ", "
-    else:
-        args_list = ""
-    args_schema = ""
-    if function.spec.parameters:
-        for param in function.spec.parameters:
-            args_schema += f'{param.name}: str = Field(description="""{param.description}""")\n    '
-    if len(args_schema) == 0:
-        args_schema = "pass"
-
-    # TODO: add return direct in function configuration
-    return_direct = False
-    endpoint_name = force_name_in_endpoint or function.metadata.name
-    body = "{}"
-    if function.spec.parameters:
-        body = f'{", ".join(f'"{param.name}": {param.name}' for param in function.spec.parameters)}'
-    if kit is True:
-        has_name = False
-        if function.spec.parameters:
-            for param in function.spec.parameters:
-                if param.name == "name":
-                    has_name = True
-                    break
-        if not has_name:
-            if len(body) > 0:
-                body += ", "
-            body += f'"name": "{function.metadata.name}"'
-    return (
-        f'''
-
-class Beamlit{name}Input(BaseModel):
-    {args_schema}
-
-class Beamlit{name}(BaseTool):
-    name: str = "beamlit_{function.metadata.name.replace("-", "_")}"
-    description: str = """{function.spec.description}"""
-    args_schema: Type[BaseModel] = Beamlit{name}Input
-
-    response_format: Literal["content_and_artifact"] = "content_and_artifact"
-    return_direct: bool = {return_direct}
-
-    def _run(self, {args_list} run_manager: Optional[CallbackManagerForToolRun] = None) -> Tuple[Union[List[Dict[str, str]], str], Dict]:
-        try:
-            params = self.metadata.get("params", {{}})
-            response = run_client.run("function", "{endpoint_name}", settings.environment, "POST", json={{{body}}})
-            if response.status_code >= 400:
-                logger.error(f"Failed to run function {name}, {{response.status_code}}::{{response.text}}")
-                raise Exception(f"Failed to run function {name}, {{response.status_code}}::{{response.text}}")
-            return response.json(), {{}}
-        except Exception as e:
-            return repr(e), {{}}
-''',
-        f"Beamlit{get_titles_name(function.metadata.name)},",
-    )
-
-
-def generate_chain_code(settings: Settings, agent: Agent) -> Tuple[str, str]:
-    name = get_titles_name(agent.metadata.name)
-    # TODO: add return direct in agent configuration
-    return_direct = False
-    return (
-        f'''
-class BeamlitChain{name}Input(BaseModel):
-    input: str = Field(description='{agent.spec.description}')
-
-class BeamlitChain{name}(BaseTool):
-    name: str = "beamlit_chain_{agent.metadata.name.replace("-", "_")}"
-    description: str = """{agent.spec.description}"""
-    args_schema: Type[BaseModel] = BeamlitChain{name}Input
-
-    response_format: Literal["content_and_artifact"] = "content_and_artifact"
-    return_direct: bool = {return_direct}
-
-    def _run(
-        self,
-        input: str,
-        run_manager: Optional[CallbackManagerForToolRun] = None,
-    ) -> Tuple[Union[List[Dict[str, str]], str], Dict]:
-        try:
-            params = self.metadata.get("params", {{}})
-            response = run_client.run("agent", "{agent.metadata.name}", settings.environment, "POST", json={{"input": input}})
-            if response.status_code >= 400:
-                logger.error(f"Failed to run tool {agent.metadata.name}, {{response.status_code}}::{{response.text}}")
-                raise Exception(f"Failed to run tool {agent.metadata.name}, {{response.status_code}}::{{response.text}}")
-            if response.headers.get("Content-Type") == "application/json":
-                return response.json(), {{}}
-            else:
-                return response.text, {{}}
-        except Exception as e:
-            return repr(e), {{}}
-''',
-        f"BeamlitChain{name},",
-    )
-
-
-def generate(destination: str, dry_run: bool = False):
-    imports = """from logging import getLogger
-from typing import Dict, List, Literal, Optional, Tuple, Type, Union
-
-from langchain_core.callbacks import CallbackManagerForToolRun
-from langchain_core.tools import BaseTool
-from pydantic import BaseModel, Field
-from beamlit.authentication import (RunClientWithCredentials,
-                                    load_credentials_from_settings,
-                                    new_client_with_credentials)
-from beamlit.common.settings import get_settings
-from beamlit.run import RunClient
-
-logger = getLogger(__name__)
-settings = get_settings()
-credentials = load_credentials_from_settings(settings)
-
-client_config = RunClientWithCredentials(
-    credentials=credentials,
-    workspace=settings.workspace,
-)
-client = new_client_with_credentials(client_config)
-run_client = RunClient(client=client)
-"""
-    settings = get_settings()
-    export_code = "\n\nfunctions = ["
-    export_chain = "\n\nchains = ["
-    code = imports
-    if settings.agent.functions and len(settings.agent.functions) > 0:
-        for function_config in settings.agent.functions:
-            if function_config.spec.kit and len(function_config.spec.kit) > 0:
-                new_code, export = generate_kit_function_code(
-                    settings, function_config, function_config.spec.kit
-                )
-                code += new_code
-                export_code += export
-            else:
-                new_code, export = generate_function_code(settings, function_config)
-                code += new_code
-                export_code += export
-    if settings.agent.chain and len(settings.agent.chain) > 0:
-        for agent in settings.agent.chain:
-            new_code, export = generate_chain_code(settings, agent)
-            code += new_code
-            export_chain += export
-    if settings.agent.functions and len(settings.agent.functions) > 0:
-        export_code = export_code[:-1]
-    export_code += "]"
-    if settings.agent.chain and len(settings.agent.chain) > 0:
-        export_chain = export_chain[:-1]
-    export_chain += "]"
-    content = code + export_code + export_chain
-    if not dry_run:
-        with open(destination, "w") as f:
-            f.write(content)
-    return content