beamlit 0.0.57rc120__tar.gz → 0.0.57rc121__tar.gz

{beamlit-0.0.57rc120 → beamlit-0.0.57rc121}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beamlit
-Version: 0.0.57rc120
+Version: 0.0.57rc121
 Summary: Add your description here
 Author-email: cploujoux <ch.ploujoux@gmail.com>
 License-File: LICENSE

{beamlit-0.0.57rc120 → beamlit-0.0.57rc121}/pyproject.toml

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

{beamlit-0.0.57rc120 → beamlit-0.0.57rc121}/src/beamlit/agents/chat.py

@@ -1,11 +1,12 @@
 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
-from langchain_core.language_models import BaseChatModel
 
 from .voice.openai import OpenAIVoiceReactAgent
 

{beamlit-0.0.57rc120 → beamlit-0.0.57rc121}/src/beamlit/agents/decorator.py

@@ -10,14 +10,15 @@ import inspect
 from logging import getLogger
 from typing import Callable
 
+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 Settings, init
 from beamlit.errors import UnexpectedStatus
 from beamlit.functions import get_functions
 from beamlit.models import Agent, AgentSpec, Metadata
-from langgraph.checkpoint.memory import MemorySaver
-from langgraph.prebuilt import create_react_agent
 
 from .chat import get_chat_model_full
 from .voice.openai import OpenAIVoiceReactAgent

{beamlit-0.0.57rc120 → beamlit-0.0.57rc121}/src/beamlit/agents/thread.py

@@ -2,7 +2,6 @@
 
 Defines threading capabilities for agents.
 """
-import jwt
 from fastapi import Request
 
 

{beamlit-0.0.57rc120 → beamlit-0.0.57rc121}/src/beamlit/authentication/authentication.py

@@ -7,21 +7,18 @@ It also includes utilities for creating authenticated clients and managing authe
 from dataclasses import dataclass
 from typing import Dict, Generator
 
-from httpx import Auth, Request, Response
-
 from beamlit.common.settings import Settings, get_settings
+from httpx import Auth, Request, Response
 
 from ..client import AuthenticatedClient
 from .apikey import ApiKeyProvider
 from .clientcredentials import ClientCredentials
-from .credentials import (
-    Credentials,
-    current_context,
-    load_credentials,
-    load_credentials_from_settings,
-)
+from .credentials import (Credentials, current_context, load_credentials,
+                          load_credentials_from_settings)
 from .device_mode import BearerToken
 
+global provider_singleton
+provider_singleton = None
 
 class PublicProvider(Auth):
     """
@@ -144,6 +141,11 @@ def get_authentication_headers(settings: Settings) -> Dict[str, str]:
     Returns:
         Dict[str, str]: A dictionary of authentication headers.
     """
+    global provider_singleton
+
+    if provider_singleton:
+        return provider_singleton.get_headers()
+
     context = current_context()
     if context.workspace and not settings.authentication.client.credentials:
         credentials = load_credentials(context.workspace)
@@ -165,4 +167,5 @@ def get_authentication_headers(settings: Settings) -> Dict[str, str]:
 
     if provider is None:
         return None
+    provider_singleton = provider
     return provider.get_headers()

{beamlit-0.0.57rc120 → beamlit-0.0.57rc121}/src/beamlit/authentication/clientcredentials.py

@@ -4,16 +4,13 @@ authentication for Beamlit. It manages token refreshing and authentication flows
 client credentials and refresh tokens.
 """
 
-import base64
-import json
 from dataclasses import dataclass
 from datetime import datetime, timedelta
 from typing import Generator, Optional
 
 import requests
-from httpx import Auth, Request, Response, post
-
 from beamlit.common.settings import get_settings
+from httpx import Auth, Request, Response, post
 
 
 @dataclass
@@ -39,6 +36,7 @@ class ClientCredentials(Auth):
             base_url (str): The base URL for authentication.
         """
         self.credentials = credentials
+        self.expires_at = None
         self.workspace_name = workspace_name
         self.base_url = base_url
 
@@ -52,16 +50,15 @@ class ClientCredentials(Auth):
         Raises:
             Exception: If token refresh fails.
         """
-        err = self.refresh_if_needed()
+        err = self.get_token()
         if err:
             raise err
-
         return {
             "X-Beamlit-Authorization": f"Bearer {self.credentials.access_token}",
             "X-Beamlit-Workspace": self.workspace_name,
         }
 
-    def refresh_if_needed(self) -> Optional[Exception]:
+    def get_token(self) -> Optional[Exception]:
         """
         Checks if the access token needs to be refreshed and performs the refresh if necessary.
 
@@ -69,33 +66,23 @@ class ClientCredentials(Auth):
             Optional[Exception]: An exception if refreshing fails, otherwise None.
         """
         settings = get_settings()
-        if self.credentials.client_credentials and not self.credentials.refresh_token:
+        if self.need_token():
             headers = {"Authorization": f"Basic {self.credentials.client_credentials}", "Content-Type": "application/json"}
             body = {"grant_type": "client_credentials"}
             response = requests.post(f"{settings.base_url}/oauth/token", headers=headers, json=body)
             response.raise_for_status()
-            self.credentials.access_token = response.json()["access_token"]
-            self.credentials.refresh_token = response.json()["refresh_token"]
-            self.credentials.expires_in = response.json()["expires_in"]
-
-        # Need to refresh token if expires in less than 10 minutes
-        parts = self.credentials.access_token.split(".")
-        if len(parts) != 3:
-            return Exception("Invalid JWT token format")
-        try:
-            claims_bytes = base64.urlsafe_b64decode(parts[1] + "=" * (-len(parts[1]) % 4))
-            claims = json.loads(claims_bytes)
-        except Exception as e:
-            return Exception(f"Failed to decode/parse JWT claims: {str(e)}")
-
-        exp_time = datetime.fromtimestamp(claims["exp"])
-        current_time = datetime.now()
-        # Refresh if token expires in less than 10 minutes
-        if current_time + timedelta(minutes=10) > exp_time:
-            return self.do_refresh()
-
+            creds = response.json()
+            self.credentials.access_token = creds["access_token"]
+            self.credentials.refresh_token = creds["refresh_token"]
+            self.credentials.expires_in = creds["expires_in"]
+            self.expires_at = datetime.now() + timedelta(seconds=self.credentials.expires_in)
         return None
 
+    def need_token(self):
+        if not self.expires_at:
+            return True
+        return datetime.now() > self.expires_at - timedelta(minutes=10)
+
     def auth_flow(self, request: Request) -> Generator[Request, Response, None]:
         """
         Processes the authentication flow by ensuring tokens are valid and adding necessary headers.

{beamlit-0.0.57rc120 → beamlit-0.0.57rc121}/src/beamlit/deploy/deploy.py

@@ -14,13 +14,21 @@ from pathlib import Path
 from typing import Literal
 
 import yaml
+
 from beamlit.api.agents import get_agent
 from beamlit.authentication import new_client
 from beamlit.client import AuthenticatedClient
 from beamlit.common import slugify
 from beamlit.common.settings import Settings, get_settings, init
-from beamlit.models import (Agent, AgentSpec, Flavor, Function, FunctionSpec,
-                            Metadata, MetadataLabels)
+from beamlit.models import (
+    Agent,
+    AgentSpec,
+    Flavor,
+    Function,
+    FunctionSpec,
+    Metadata,
+    MetadataLabels,
+)
 
 from .format import arg_to_dict
 from .parser import Resource, get_description, get_parameters, get_resources

{beamlit-0.0.57rc120 → beamlit-0.0.57rc121}/src/beamlit/functions/mcp/mcp.py

@@ -12,13 +12,14 @@ import pydantic
 import pydantic_core
 import requests
 import typing_extensions as t
+from langchain_core.tools.base import BaseTool, BaseToolkit, ToolException
+from mcp import ClientSession
+from mcp.types import CallToolResult, ListToolsResult
+
 from beamlit.authentication import get_authentication_headers
 from beamlit.authentication.authentication import AuthenticatedClient
 from beamlit.common.settings import get_settings
 from beamlit.functions.mcp.client import websocket_client
-from langchain_core.tools.base import BaseTool, BaseToolkit, ToolException
-from mcp import ClientSession
-from mcp.types import CallToolResult, ListToolsResult
 
 from .utils import create_schema_model
 

{beamlit-0.0.57rc120 → beamlit-0.0.57rc121}/src/integrationtest/agent.py

@@ -16,7 +16,7 @@ settings = init()
             "model": "gpt-4o-mini",
         },
     },
-    remote_functions=["brave-search-2"],
+    remote_functions=[],
     # local_functions=[
     #     {
     #         "name": "github-search",

{beamlit-0.0.57rc120 → beamlit-0.0.57rc121}/src/integrationtest/chat.py

@@ -1,9 +1,10 @@
 import asyncio
 
+from langgraph.graph.graph import CompiledGraph
+
 from beamlit.agents import agent, get_chat_model
 from beamlit.common import init
 from beamlit.functions import function
-from langgraph.graph.graph import CompiledGraph
 
 settings = init()
 chat = get_chat_model("gpt-4o-mini") # all good