beamlit 0.0.20rc10__tar.gz → 0.0.22__tar.gz

{beamlit-0.0.20rc10 → beamlit-0.0.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: beamlit
-Version: 0.0.20rc10
+Version: 0.0.22
 Summary: Add your description here
 Author-email: cploujoux <ch.ploujoux@gmail.com>
 Requires-Python: >=3.12

{beamlit-0.0.20rc10 → beamlit-0.0.22}/pyproject.toml

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

{beamlit-0.0.20rc10 → beamlit-0.0.22}/src/beamlit/agents/chat.py

@@ -37,12 +37,13 @@ def get_chat_model(agent_model: AgentDeployment):
     headers = get_authentication_headers(settings)
     headers["X-Beamlit-Environment"] = agent_model.environment
 
-    jwt = headers.pop("X-Beamlit-Authorization").replace("Bearer ", "")
+    jwt = headers.get("X-Beamlit-Authorization", "").replace("Bearer ", "")
     params = {"environment": agent_model.environment}
     chat_classes = {
         "openai": {
             "func": get_openai_chat_model,
             "kwargs": {
+                "http_async_client": client.get_async_httpx_client(),
                 "http_client": client.get_httpx_client(),
             },
         },

{beamlit-0.0.20rc10 → beamlit-0.0.22}/src/beamlit/agents/decorator.py

@@ -1,9 +1,11 @@
 # Import necessary modules
 import ast
+import asyncio
 import importlib
 import os
 from logging import getLogger
 
+from langchain_core.tools import Tool
 from langgraph.checkpoint.memory import MemorySaver
 from langgraph.prebuilt import create_react_agent
 
@@ -35,7 +37,7 @@ def get_functions(dir="src/functions", from_decorator="function"):
                         # Look for function definitions with decorators
                         for node in ast.walk(tree):
                             if (
-                                not isinstance(node, ast.FunctionDef)
+                                (not isinstance(node, ast.FunctionDef) and not isinstance(node, ast.AsyncFunctionDef))
                                 or len(node.decorator_list) == 0
                             ):
                                 continue
@@ -73,7 +75,10 @@ def get_functions(dir="src/functions", from_decorator="function"):
                                 # Get the decorated function
                                 if not is_kit and hasattr(module, func_name):
                                     func = getattr(module, func_name)
-                                    functions.append(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

{beamlit-0.0.20rc10 → beamlit-0.0.22}/src/beamlit/authentication/authentication.py

@@ -51,7 +51,6 @@ def new_client():
     else:
         settings = get_settings()
         credentials = load_credentials_from_settings(settings)
-
         client_config = RunClientWithCredentials(
             credentials=credentials,
             workspace=settings.workspace,

{beamlit-0.0.20rc10 → beamlit-0.0.22}/src/beamlit/authentication/credentials.py

@@ -43,6 +43,28 @@ class Config:
         if self.context is None:
             self.context = ContextConfig()
 
+    def to_json(self) -> dict:
+        return {
+            "workspaces": [
+                {
+                    "name": ws.name,
+                    "credentials": {
+                        "api_key": ws.credentials.api_key,
+                        "access_token": ws.credentials.access_token,
+                        "refresh_token": ws.credentials.refresh_token,
+                        "expires_in": ws.credentials.expires_in,
+                        "device_code": ws.credentials.device_code,
+                        "client_credentials": ws.credentials.client_credentials,
+                    },
+                }
+                for ws in self.workspaces
+            ],
+            "context": {
+                "workspace": self.context.workspace,
+                "environment": self.context.environment,
+            },
+        }
+
 
 def load_config() -> Config:
     config = Config()
@@ -68,23 +90,6 @@ def load_config() -> Config:
 
 
 def save_config(config: Config):
-    data = {
-        "workspaces": [
-            {
-                "name": ws.name,
-                "credentials": {
-                    "access_token": ws.credentials.access_token,
-                    "api_key": ws.credentials.api_key,
-                },
-            }
-            for ws in config.workspaces
-        ],
-        "context": {
-            "workspace": config.context.workspace,
-            "environment": config.context.environment,
-        },
-    }
-
     home_dir = Path.home()
     if not home_dir:
         raise RuntimeError("Could not determine home directory")
@@ -93,9 +98,8 @@ def save_config(config: Config):
     config_file = config_dir / "config.yaml"
 
     config_dir.mkdir(mode=0o700, parents=True, exist_ok=True)
-
     with open(config_file, "w", encoding="utf-8") as f:
-        yaml.dump(data, f)
+        yaml.dump(config.to_json(), f)
 
 
 def list_workspaces() -> List[str]:
@@ -126,7 +130,7 @@ def load_credentials(workspace_name: str) -> Credentials:
 def load_credentials_from_settings(settings: Settings) -> Credentials:
     return Credentials(
         api_key=settings.authentication.api_key,
-        client_credentials=settings.authentication.client_credentials,
+        client_credentials=settings.authentication.client.credentials,
     )
 
 

{beamlit-0.0.20rc10 → beamlit-0.0.22}/src/beamlit/client.py

@@ -248,7 +248,6 @@ class AuthenticatedClient:
     def get_async_httpx_client(self) -> httpx.AsyncClient:
         """Get the underlying httpx.AsyncClient, constructing a new one if not previously set"""
         if self._async_client is None:
-            self._headers[self.auth_header_name] = f"{self.prefix} {self.token}" if self.prefix else self.token
             self._async_client = httpx.AsyncClient(
                 base_url=self._base_url,
                 cookies=self._cookies,

{beamlit-0.0.20rc10 → beamlit-0.0.22}/src/beamlit/common/settings.py

@@ -39,10 +39,14 @@ class SettingsAgent(BaseSettings):
     module: str = Field(default="main.main")
 
 
+class SettingsAuthenticationClient(BaseSettings):
+    credentials: Union[None, str] = None
+
+
 class SettingsAuthentication(BaseSettings):
     api_key: Union[None, str] = None
     jwt: Union[None, str] = None
-    client_credentials: Union[None, str] = None
+    client: SettingsAuthenticationClient = SettingsAuthenticationClient()
 
 
 class SettingsServer(BaseSettings):
@@ -56,10 +60,11 @@ class Settings(BaseSettings):
         yaml_file="beamlit.yaml",
         env_prefix="bl_",
         env_nested_delimiter="_",
+        extra="ignore",
     )
 
     workspace: str
-    environment: str
+    environment: str = Field(default="production")
     type: str = Field(default="agent")
     name: str = Field(default="beamlit-agent")
     base_url: str = Field(default="https://api.beamlit.dev/v0")

{beamlit-0.0.20rc10 → beamlit-0.0.22}/src/beamlit/functions/decorator.py

@@ -3,7 +3,7 @@
 from collections.abc import Callable
 from logging import getLogger
 
-from langchain_core.tools import create_schema_from_function, tool
+from langchain_core.tools import create_schema_from_function
 
 from beamlit.authentication import new_client
 from beamlit.common.settings import get_settings
@@ -58,7 +58,7 @@ def kit(bl_kit: FunctionKit = None, **kwargs: dict) -> Callable:
     def wrapper(func: Callable) -> Callable:
         if bl_kit and not func.__doc__ and bl_kit.description:
             func.__doc__ = bl_kit.description
-        return tool(func, **kwargs)
+        return func
 
     return wrapper
 
@@ -83,8 +83,7 @@ def function(
                     func,
                     parse_docstring=func.__doc__,
                 )
-            return tool(remote_func, **kwargs)
-        return tool(func, **kwargs)
+            return remote_func
+        return func
 
     return wrapper
-    return wrapper

{beamlit-0.0.20rc10 → beamlit-0.0.22}/src/beamlit/serve/app.py

@@ -16,7 +16,6 @@ from .middlewares import AccessLogMiddleware, AddProcessTimeHeader
 sys.path.insert(0, os.getcwd())
 sys.path.insert(0, os.path.join(os.getcwd(), "src"))
 
-
 def import_module():
     settings = get_settings()
     main_module = importlib.import_module(".".join(settings.server.module.split(".")[0:-1]))