beamlit 0.0.33rc49__tar.gz → 0.0.34__tar.gz

{beamlit-0.0.33rc49 → beamlit-0.0.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beamlit
-Version: 0.0.33rc49
+Version: 0.0.34
 Summary: Add your description here
 Author-email: cploujoux <ch.ploujoux@gmail.com>
 Requires-Python: >=3.12
@@ -15,16 +15,34 @@ Requires-Dist: langgraph<0.3.0,>=0.2.40
 Requires-Dist: mcp>=1.1.2
 Requires-Dist: opentelemetry-api>=1.28.2
 Requires-Dist: opentelemetry-exporter-otlp>=1.28.2
+Requires-Dist: opentelemetry-instrumentation-anthropic>=0.35.0
+Requires-Dist: opentelemetry-instrumentation-chromadb>=0.35.0
+Requires-Dist: opentelemetry-instrumentation-cohere>=0.35.0
 Requires-Dist: opentelemetry-instrumentation-fastapi>=0.49b2
+Requires-Dist: opentelemetry-instrumentation-groq>=0.35.0
 Requires-Dist: opentelemetry-instrumentation-httpx>=0.49b2
-Requires-Dist: opentelemetry-instrumentation-logging>=0.49b2
+Requires-Dist: opentelemetry-instrumentation-lancedb>=0.35.0
+Requires-Dist: opentelemetry-instrumentation-langchain>=0.35.0
+Requires-Dist: opentelemetry-instrumentation-llamaindex>=0.35.0
+Requires-Dist: opentelemetry-instrumentation-marqo>=0.35.0
+Requires-Dist: opentelemetry-instrumentation-milvus>=0.35.0
+Requires-Dist: opentelemetry-instrumentation-mistralai>=0.35.0
+Requires-Dist: opentelemetry-instrumentation-ollama>=0.35.0
+Requires-Dist: opentelemetry-instrumentation-openai>=0.35.0
+Requires-Dist: opentelemetry-instrumentation-pinecone>=0.35.0
+Requires-Dist: opentelemetry-instrumentation-qdrant>=0.35.0
+Requires-Dist: opentelemetry-instrumentation-replicate>=0.35.0
+Requires-Dist: opentelemetry-instrumentation-system-metrics>=0.50b0
+Requires-Dist: opentelemetry-instrumentation-together>=0.35.0
+Requires-Dist: opentelemetry-instrumentation-watsonx>=0.35.0
+Requires-Dist: opentelemetry-instrumentation-weaviate>=0.35.0
 Requires-Dist: opentelemetry-sdk>=1.28.2
 Requires-Dist: pydantic-settings<2.7.0,>=2.6.1
 Requires-Dist: pydantic<2.11.0,>=2.10.3
+Requires-Dist: pyjwt>=2.10.1
 Requires-Dist: python-dateutil>=2.8.0
 Requires-Dist: pyyaml<6.1.0,>=6.0.2
 Requires-Dist: requests<2.33.0,>=2.32.3
-Requires-Dist: traceloop-sdk>=0.33.12
 Description-Content-Type: text/markdown
 
 # beamlit

{beamlit-0.0.33rc49 → beamlit-0.0.34}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "beamlit"
-version = "0.0.33.pre-49"
+version = "0.0.34"
 description = "Add your description here"
 readme = "README.md"
 authors = [
@@ -26,13 +26,31 @@ dependencies = [
     "fastapi[standard]>=0.115.4,<0.116.0",
     "asgi-correlation-id>=4.3.4,<5.0.0",
     "mcp>=1.1.2",
-    "traceloop-sdk>=0.33.12",
     "opentelemetry-sdk>=1.28.2",
     "opentelemetry-exporter-otlp>=1.28.2",
     "opentelemetry-api>=1.28.2",
     "opentelemetry-instrumentation-fastapi>=0.49b2",
     "opentelemetry-instrumentation-httpx>=0.49b2",
-    "opentelemetry-instrumentation-logging>=0.49b2"
+    "opentelemetry-instrumentation-system-metrics>=0.50b0",
+    "pyjwt>=2.10.1",
+    "opentelemetry-instrumentation-anthropic>=0.35.0",
+    "opentelemetry-instrumentation-chromadb>=0.35.0",
+    "opentelemetry-instrumentation-cohere>=0.35.0",
+    "opentelemetry-instrumentation-groq>=0.35.0",
+    "opentelemetry-instrumentation-lancedb>=0.35.0",
+    "opentelemetry-instrumentation-langchain>=0.35.0",
+    "opentelemetry-instrumentation-llamaindex>=0.35.0",
+    "opentelemetry-instrumentation-marqo>=0.35.0",
+    "opentelemetry-instrumentation-milvus>=0.35.0",
+    "opentelemetry-instrumentation-mistralai>=0.35.0",
+    "opentelemetry-instrumentation-ollama>=0.35.0",
+    "opentelemetry-instrumentation-openai>=0.35.0",
+    "opentelemetry-instrumentation-pinecone>=0.35.0",
+    "opentelemetry-instrumentation-qdrant>=0.35.0",
+    "opentelemetry-instrumentation-replicate>=0.35.0",
+    "opentelemetry-instrumentation-together>=0.35.0",
+    "opentelemetry-instrumentation-watsonx>=0.35.0",
+    "opentelemetry-instrumentation-weaviate>=0.35.0",
 ]
 [dependency-groups]
 dev = [

beamlit-0.0.34/src/beamlit/agents/__init__.py

@@ -0,0 +1,5 @@
+from .chat import get_chat_model
+from .decorator import agent
+from .thread import get_default_thread
+
+__all__ = ["agent", "get_chat_model", "get_default_thread"]

{beamlit-0.0.33rc49 → beamlit-0.0.34}/src/beamlit/agents/chat.py

@@ -1,5 +1,9 @@
 from logging import getLogger
+from typing import Tuple, Union
 
+from langchain_core.language_models import BaseChatModel
+
+from beamlit.api.models import get_model
 from beamlit.authentication import get_authentication_headers, new_client
 from beamlit.common.settings import get_settings
 from beamlit.models import Model
@@ -39,11 +43,17 @@ def get_cohere_chat_model(**kwargs):
 
     return ChatCohere(**kwargs)
 
-def get_chat_model(name: str, agent_model: Model):
+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:
+            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
 
@@ -84,7 +94,8 @@ def get_chat_model(name: str, agent_model: Model):
     }
 
     provider = (
-        agent_model.spec
+        agent_model
+        and agent_model.spec
         and agent_model.spec.runtime
         and agent_model.spec.runtime.type_
     )
@@ -93,7 +104,8 @@ def get_chat_model(name: str, agent_model: Model):
         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.34/src/beamlit/agents/decorator.py

@@ -0,0 +1,143 @@
+# Import necessary modules
+import functools
+import inspect
+from logging import getLogger
+
+from langgraph.checkpoint.memory import MemorySaver
+from langgraph.prebuilt import create_react_agent
+
+from beamlit.api.models import get_model, list_models
+from beamlit.authentication import new_client
+from beamlit.common.settings import init
+from beamlit.errors import UnexpectedStatus
+from beamlit.functions import get_functions
+from beamlit.models import Agent, AgentMetadata, AgentSpec
+
+from .chat import get_chat_model
+
+
+def agent(
+    agent: Agent | dict = None,
+    override_model=None,
+    override_agent=None,
+    mcp_hub=None,
+    remote_functions=None,
+):
+    logger = getLogger(__name__)
+    try:
+        if agent is not None and not isinstance(agent, dict):
+            raise Exception(
+                'agent must be a dictionary, example: @agent(agent={"metadata": {"name": "my_agent"}})'
+            )
+
+        client = new_client()
+        chat_model = override_model or None
+        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):
+                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
+
+        if agent is not None:
+            metadata = AgentMetadata(**agent.get("metadata", {}))
+            spec = AgentSpec(**agent.get("spec", {}))
+            agent = Agent(metadata=metadata, spec=spec)
+            if agent.spec.model and chat_model is None:
+                try:
+                    response = get_model.sync_detailed(
+                        agent.spec.model, environment=settings.environment, client=client
+                    )
+                    settings.agent.model = response.parsed
+                except UnexpectedStatus as e:
+                    if e.status_code == 404 and settings.environment != "production":
+                        try:
+                            response = get_model.sync_detailed(
+                                agent.spec.model, environment="production", client=client
+                            )
+                            settings.agent.model = response.parsed
+                        except UnexpectedStatus as e:
+                            if e.status_code == 404:
+                                raise ValueError(f"Model {agent.spec.model} not found")
+                    else:
+                        raise e
+                except Exception as e:
+                    raise e
+
+                if settings.agent.model:
+                    chat_model, provider, model = get_chat_model(agent.spec.model, settings.agent.model)
+                    settings.agent.chat_model = chat_model
+                    logger.info(f"Chat model configured, using: {provider}:{model}")
+
+        functions = get_functions(
+            client=client,
+            dir=settings.agent.functions_directory,
+            mcp_hub=mcp_hub,
+            remote_functions=remote_functions,
+            chain=agent.spec.agent_chain,
+            remote_functions_empty=not remote_functions,
+            warning=chat_model is not None,
+        )
+        settings.agent.functions = functions
+
+        if override_agent is None:
+            if chat_model is None:
+                models_select = ""
+                try:
+                    models = list_models.sync_detailed(
+                        environment=settings.environment, client=client
+                    )
+                    models = ", ".join([model.metadata.name for model in models.parsed])
+                    models_select = f"You can select one from the your models: {models}"
+                except Exception:
+                    pass
+                    
+                raise ValueError(f"You must provide a model.\n"
+                    f"{models_select}\n"
+                    f"You can create one at {settings.app_url}/{settings.workspace}/global-inference-network/models/create\n"
+                    "Add it to your agent spec\n"
+                    "agent={\n"
+                    "    \"metadata\": {\n"
+                    f"        \"name\": \"{agent.metadata.name}\",\n"
+                    "    },\n"
+                    "    \"spec\": {\n"
+                    "        \"model\": \"MODEL_NAME\",\n"
+                    f"        \"description\": \"{agent.spec.description}\",\n"
+                    "    },\n"
+                    "}")
+            memory = MemorySaver()
+            if len(functions) == 0:
+                raise ValueError("You can define this function in directory "
+                    f'"{settings.agent.functions_directory}". Here is a sample function you can use:\n\n'
+                    "from beamlit.functions import function\n\n"
+                    "@function()\n"
+                    "def hello_world(query: str):\n"
+                    "    return 'Hello, world!'\n")
+            _agent = create_react_agent(chat_model, functions, checkpointer=memory)
+            settings.agent.agent = _agent
+        else:
+            settings.agent.agent = override_agent
+        return wrapper
+    except Exception as e:
+        logger.error(f"Error in agent decorator: {e!s} at line {e.__traceback__.tb_lineno}")
+        raise e

beamlit-0.0.34/src/beamlit/agents/thread.py

@@ -0,0 +1,14 @@
+
+import jwt
+from fastapi import Request
+
+
+def get_default_thread(request: Request) -> str:
+    if request.headers.get("X-Beamlit-Sub"):
+        return request.headers.get("X-Beamlit-Sub")
+    authorization = request.headers.get("Authorization", request.headers.get("X-Beamlit-Authorization"))
+    if authorization and len(authorization.split("Bearer ")) > 1:
+        token = authorization.split(" ")[1]
+        decoded = jwt.decode(token, options={"verify_signature": False})
+        return decoded["sub"]
+    return ""

beamlit-0.0.34/src/beamlit/api/workspaces/workspace_quotas_request.py

@@ -0,0 +1,97 @@
+from http import HTTPStatus
+from typing import Any, Optional, Union
+
+import httpx
+
+from ... import errors
+from ...client import AuthenticatedClient, Client
+from ...types import Response
+
+
+def _get_kwargs(
+    workspace_name: str,
+) -> dict[str, Any]:
+    _kwargs: dict[str, Any] = {
+        "method": "put",
+        "url": f"/workspaces/{workspace_name}/quotas",
+    }
+
+    return _kwargs
+
+
+def _parse_response(*, client: Union[AuthenticatedClient, Client], response: httpx.Response) -> Optional[Any]:
+    if response.status_code == 200:
+        return None
+    if client.raise_on_unexpected_status:
+        raise errors.UnexpectedStatus(response.status_code, response.content)
+    else:
+        return None
+
+
+def _build_response(*, client: Union[AuthenticatedClient, Client], response: httpx.Response) -> Response[Any]:
+    return Response(
+        status_code=HTTPStatus(response.status_code),
+        content=response.content,
+        headers=response.headers,
+        parsed=_parse_response(client=client, response=response),
+    )
+
+
+def sync_detailed(
+    workspace_name: str,
+    *,
+    client: AuthenticatedClient,
+) -> Response[Any]:
+    """Request workspace quotas
+
+     Send a request to update quotas for a workspace.
+
+    Args:
+        workspace_name (str):
+
+    Raises:
+        errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
+        httpx.TimeoutException: If the request takes longer than Client.timeout.
+
+    Returns:
+        Response[Any]
+    """
+
+    kwargs = _get_kwargs(
+        workspace_name=workspace_name,
+    )
+
+    response = client.get_httpx_client().request(
+        **kwargs,
+    )
+
+    return _build_response(client=client, response=response)
+
+
+async def asyncio_detailed(
+    workspace_name: str,
+    *,
+    client: AuthenticatedClient,
+) -> Response[Any]:
+    """Request workspace quotas
+
+     Send a request to update quotas for a workspace.
+
+    Args:
+        workspace_name (str):
+
+    Raises:
+        errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
+        httpx.TimeoutException: If the request takes longer than Client.timeout.
+
+    Returns:
+        Response[Any]
+    """
+
+    kwargs = _get_kwargs(
+        workspace_name=workspace_name,
+    )
+
+    response = await client.get_async_httpx_client().request(**kwargs)
+
+    return _build_response(client=client, response=response)

{beamlit-0.0.33rc49 → beamlit-0.0.34}/src/beamlit/authentication/clientcredentials.py

@@ -1,7 +1,7 @@
 import base64
 import json
-import time
 from dataclasses import dataclass
+from datetime import datetime, timedelta
 from typing import Generator, Optional
 
 import requests
@@ -55,11 +55,13 @@ class ClientCredentials(Auth):
         except Exception as e:
             return Exception(f"Failed to decode/parse JWT claims: {str(e)}")
 
-        exp_time = time.gmtime(claims["exp"])
+        exp_time = datetime.fromtimestamp(claims["exp"])
+        current_time = datetime.now()
         # Refresh if token expires in less than 10 minutes
-        if time.time() + (10 * 60) > time.mktime(exp_time):
+        if current_time + timedelta(minutes=10) > exp_time:
             return self.do_refresh()
 
+
         return None
 
     def auth_flow(self, request: Request) -> Generator[Request, Response, None]:

{beamlit-0.0.33rc49 → beamlit-0.0.34}/src/beamlit/authentication/device_mode.py

@@ -1,7 +1,7 @@
 import base64
 import json
-import time
 from dataclasses import dataclass
+from datetime import datetime, timedelta
 from typing import Dict, Generator, Optional
 
 from httpx import Auth, Request, Response, post
@@ -65,10 +65,10 @@ class BearerToken(Auth):
             claims = json.loads(claims_bytes)
         except Exception as e:
             return Exception(f"Failed to decode/parse JWT claims: {str(e)}")
-
-        exp_time = time.gmtime(claims["exp"])
+        exp_time = datetime.fromtimestamp(claims["exp"])
+        current_time = datetime.now()
         # Refresh if token expires in less than 10 minutes
-        if time.time() + (10 * 60) > time.mktime(exp_time):
+        if current_time + timedelta(minutes=10) > exp_time:
             return self.do_refresh()
 
         return None

{beamlit-0.0.33rc49 → beamlit-0.0.34}/src/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",