beamlit 0.0.34rc62__tar.gz → 0.0.34rc64__tar.gz

{beamlit-0.0.34rc62 → beamlit-0.0.34rc64}/PKG-INFO

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

{beamlit-0.0.34rc62 → beamlit-0.0.34rc64}/pyproject.toml

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

{beamlit-0.0.34rc62 → beamlit-0.0.34rc64}/src/beamlit/agents/chat.py

@@ -1,11 +1,12 @@
 from logging import getLogger
-from typing import Tuple
+from typing import Tuple, Union
 
 from langchain_core.language_models import BaseChatModel
 
 from beamlit.authentication import get_authentication_headers, new_client
 from beamlit.common.settings import get_settings
 from beamlit.models import Model
+from beamlit.api.models import get_model
 
 logger = getLogger(__name__)
 
@@ -42,11 +43,17 @@ def get_cohere_chat_model(**kwargs):
 
     return ChatCohere(**kwargs)
 
-def get_chat_model(name: str, agent_model: Model) -> Tuple[BaseChatModel, str, str]:
+def get_chat_model(name: str, agent_model: Union[Model, None] = None) -> Tuple[BaseChatModel, str, str]:
     settings = get_settings()
     client = new_client()
 
-    environment = (agent_model.metadata and agent_model.metadata.environment) or settings.environment
+    if agent_model is None:
+        try:
+            agent_model = get_model.sync(name, client=client, environment=settings.environment)
+        except Exception as e:
+            logger.warning(f"Model {name} not found, defaulting to gpt-4o-mini")
+
+    environment = (agent_model and agent_model.metadata and agent_model.metadata.environment) or settings.environment
     headers = get_authentication_headers(settings)
     headers["X-Beamlit-Environment"] = environment
 
@@ -87,7 +94,8 @@ def get_chat_model(name: str, agent_model: Model) -> Tuple[BaseChatModel, str, s
     }
 
     provider = (
-        agent_model.spec
+        agent_model
+        and agent_model.spec
         and agent_model.spec.runtime
         and agent_model.spec.runtime.type_
     )
@@ -96,7 +104,8 @@ def get_chat_model(name: str, agent_model: Model) -> Tuple[BaseChatModel, str, s
         provider = "openai"
 
     model = (
-        agent_model.spec
+        agent_model
+        and agent_model.spec
         and agent_model.spec.runtime
         and agent_model.spec.runtime.model
     )

{beamlit-0.0.34rc62 → beamlit-0.0.34rc64}/src/beamlit/agents/decorator.py

@@ -1,5 +1,6 @@
 # Import necessary modules
 import functools
+import inspect
 from logging import getLogger
 
 from langgraph.checkpoint.memory import MemorySaver
@@ -34,15 +35,27 @@ def agent(
         settings = init()
 
         def wrapper(func):
+            agent_kwargs = any(
+                param.name == "agent"
+                for param in inspect.signature(func).parameters.values()
+            )
+            model_kwargs = any(
+                param.name == "model"
+                for param in inspect.signature(func).parameters.values()
+            )
+            functions_kwargs = any(
+                param.name == "functions"
+                for param in inspect.signature(func).parameters.values()
+            )
             @functools.wraps(func)
             def wrapped(*args, **kwargs):
-                return func(
-                    settings.agent.agent,
-                    settings.agent.chat_model,
-                    settings.agent.functions,
-                    *args,
-                    **kwargs,
-                )
+                if agent_kwargs:
+                    kwargs["agent"] = settings.agent.agent
+                if model_kwargs:
+                    kwargs["model"] = settings.agent.chat_model
+                if functions_kwargs:
+                    kwargs["functions"] = settings.agent.functions
+                return func(*args, **kwargs)
 
             return wrapped
 
@@ -85,7 +98,7 @@ def agent(
             remote_functions_empty=not remote_functions,
         )
         settings.agent.functions = functions
-        
+
         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-0.0.34rc62 → beamlit-0.0.34rc64}/src/beamlit/functions/decorator.py

@@ -12,7 +12,6 @@ from fastapi import Request
 from langchain_core.tools import StructuredTool
 from langchain_core.tools.base import create_schema_from_function
 
-from beamlit.agents.chain import ChainToolkit
 from beamlit.authentication import new_client
 from beamlit.client import AuthenticatedClient
 from beamlit.common import slugify
@@ -32,6 +31,8 @@ def get_functions(
     remote_functions_empty:bool=True,
     from_decorator:str="function",
 ):
+    from beamlit.agents.chain import ChainToolkit
+
     settings = get_settings()
     if client is None:
         client = new_client()
@@ -116,7 +117,7 @@ def get_functions(
                                                 )
                                             )
                                         else:
-                                            
+
                                             functions.append(
                                                 StructuredTool(
                                                     name=func.__name__,