beamlit 0.0.56rc106__py3-none-any.whl → 0.0.57__py3-none-any.whl

beamlit/api/models/{release_model.py → list_model_revisions.py}

@@ -5,7 +5,7 @@ import httpx
 
 from ... import errors
 from ...client import AuthenticatedClient, Client
-from ...models.model_release import ModelRelease
+from ...models.revision_metadata import RevisionMetadata
 from ...types import Response
 
 
@@ -13,16 +13,18 @@ def _get_kwargs(
     model_name: str,
 ) -> dict[str, Any]:
     _kwargs: dict[str, Any] = {
-        "method": "post",
-        "url": f"/models/{model_name}/release",
+        "method": "get",
+        "url": f"/models/{model_name}/revisions",
     }
 
     return _kwargs
 
 
-def _parse_response(*, client: Union[AuthenticatedClient, Client], response: httpx.Response) -> Optional[ModelRelease]:
+def _parse_response(
+    *, client: Union[AuthenticatedClient, Client], response: httpx.Response
+) -> Optional[RevisionMetadata]:
     if response.status_code == 200:
-        response_200 = ModelRelease.from_dict(response.json())
+        response_200 = RevisionMetadata.from_dict(response.json())
 
         return response_200
     if client.raise_on_unexpected_status:
@@ -31,7 +33,9 @@ def _parse_response(*, client: Union[AuthenticatedClient, Client], response: htt
         return None
 
 
-def _build_response(*, client: Union[AuthenticatedClient, Client], response: httpx.Response) -> Response[ModelRelease]:
+def _build_response(
+    *, client: Union[AuthenticatedClient, Client], response: httpx.Response
+) -> Response[RevisionMetadata]:
     return Response(
         status_code=HTTPStatus(response.status_code),
         content=response.content,
@@ -44,10 +48,10 @@ def sync_detailed(
     model_name: str,
     *,
     client: AuthenticatedClient,
-) -> Response[ModelRelease]:
-    """Release model from an environment
+) -> Response[RevisionMetadata]:
+    """List model revisions
 
-     Make a release for a model from an environment to another.
+     Returns revisions for a model by name.
 
     Args:
         model_name (str):
@@ -57,7 +61,7 @@ def sync_detailed(
         httpx.TimeoutException: If the request takes longer than Client.timeout.
 
     Returns:
-        Response[ModelRelease]
+        Response[RevisionMetadata]
     """
 
     kwargs = _get_kwargs(
@@ -75,10 +79,10 @@ def sync(
     model_name: str,
     *,
     client: AuthenticatedClient,
-) -> Optional[ModelRelease]:
-    """Release model from an environment
+) -> Optional[RevisionMetadata]:
+    """List model revisions
 
-     Make a release for a model from an environment to another.
+     Returns revisions for a model by name.
 
     Args:
         model_name (str):
@@ -88,7 +92,7 @@ def sync(
         httpx.TimeoutException: If the request takes longer than Client.timeout.
 
     Returns:
-        ModelRelease
+        RevisionMetadata
     """
 
     return sync_detailed(
@@ -101,10 +105,10 @@ async def asyncio_detailed(
     model_name: str,
     *,
     client: AuthenticatedClient,
-) -> Response[ModelRelease]:
-    """Release model from an environment
+) -> Response[RevisionMetadata]:
+    """List model revisions
 
-     Make a release for a model from an environment to another.
+     Returns revisions for a model by name.
 
     Args:
         model_name (str):
@@ -114,7 +118,7 @@ async def asyncio_detailed(
         httpx.TimeoutException: If the request takes longer than Client.timeout.
 
     Returns:
-        Response[ModelRelease]
+        Response[RevisionMetadata]
     """
 
     kwargs = _get_kwargs(
@@ -130,10 +134,10 @@ async def asyncio(
     model_name: str,
     *,
     client: AuthenticatedClient,
-) -> Optional[ModelRelease]:
-    """Release model from an environment
+) -> Optional[RevisionMetadata]:
+    """List model revisions
 
-     Make a release for a model from an environment to another.
+     Returns revisions for a model by name.
 
     Args:
         model_name (str):
@@ -143,7 +147,7 @@ async def asyncio(
         httpx.TimeoutException: If the request takes longer than Client.timeout.
 
     Returns:
-        ModelRelease
+        RevisionMetadata
     """
 
     return (

beamlit/api/models/list_models.py

@@ -6,23 +6,13 @@ import httpx
 from ... import errors
 from ...client import AuthenticatedClient, Client
 from ...models.model import Model
-from ...types import UNSET, Response, Unset
+from ...types import Response
 
 
-def _get_kwargs(
-    *,
-    environment: Union[Unset, str] = UNSET,
-) -> dict[str, Any]:
-    params: dict[str, Any] = {}
-
-    params["environment"] = environment
-
-    params = {k: v for k, v in params.items() if v is not UNSET and v is not None}
-
+def _get_kwargs() -> dict[str, Any]:
     _kwargs: dict[str, Any] = {
         "method": "get",
         "url": "/models",
-        "params": params,
     }
 
     return _kwargs
@@ -56,15 +46,11 @@ def _build_response(*, client: Union[AuthenticatedClient, Client], response: htt
 def sync_detailed(
     *,
     client: AuthenticatedClient,
-    environment: Union[Unset, str] = UNSET,
 ) -> Response[list["Model"]]:
     """List models
 
      Returns a list of all models in the workspace.
 
-    Args:
-        environment (Union[Unset, 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.
@@ -73,9 +59,7 @@ def sync_detailed(
         Response[list['Model']]
     """
 
-    kwargs = _get_kwargs(
-        environment=environment,
-    )
+    kwargs = _get_kwargs()
 
     response = client.get_httpx_client().request(
         **kwargs,
@@ -87,15 +71,11 @@ def sync_detailed(
 def sync(
     *,
     client: AuthenticatedClient,
-    environment: Union[Unset, str] = UNSET,
 ) -> Optional[list["Model"]]:
     """List models
 
      Returns a list of all models in the workspace.
 
-    Args:
-        environment (Union[Unset, 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.
@@ -106,22 +86,17 @@ def sync(
 
     return sync_detailed(
         client=client,
-        environment=environment,
     ).parsed
 
 
 async def asyncio_detailed(
     *,
     client: AuthenticatedClient,
-    environment: Union[Unset, str] = UNSET,
 ) -> Response[list["Model"]]:
     """List models
 
      Returns a list of all models in the workspace.
 
-    Args:
-        environment (Union[Unset, 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.
@@ -130,9 +105,7 @@ async def asyncio_detailed(
         Response[list['Model']]
     """
 
-    kwargs = _get_kwargs(
-        environment=environment,
-    )
+    kwargs = _get_kwargs()
 
     response = await client.get_async_httpx_client().request(**kwargs)
 
@@ -142,15 +115,11 @@ async def asyncio_detailed(
 async def asyncio(
     *,
     client: AuthenticatedClient,
-    environment: Union[Unset, str] = UNSET,
 ) -> Optional[list["Model"]]:
     """List models
 
      Returns a list of all models in the workspace.
 
-    Args:
-        environment (Union[Unset, 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.
@@ -162,6 +131,5 @@ async def asyncio(
     return (
         await asyncio_detailed(
             client=client,
-            environment=environment,
         )
     ).parsed

beamlit/api/models/update_model.py

@@ -62,8 +62,7 @@ def sync_detailed(
 
     Args:
         model_name (str):
-        body (Model): Logical object representing a model, that can be instantiated in multiple
-            environments as model deployments
+        body (Model): Logical object representing a model
 
     Raises:
         errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
@@ -97,8 +96,7 @@ def sync(
 
     Args:
         model_name (str):
-        body (Model): Logical object representing a model, that can be instantiated in multiple
-            environments as model deployments
+        body (Model): Logical object representing a model
 
     Raises:
         errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
@@ -127,8 +125,7 @@ async def asyncio_detailed(
 
     Args:
         model_name (str):
-        body (Model): Logical object representing a model, that can be instantiated in multiple
-            environments as model deployments
+        body (Model): Logical object representing a model
 
     Raises:
         errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
@@ -160,8 +157,7 @@ async def asyncio(
 
     Args:
         model_name (str):
-        body (Model): Logical object representing a model, that can be instantiated in multiple
-            environments as model deployments
+        body (Model): Logical object representing a model
 
     Raises:
         errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.

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/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/authentication/credentials.py

@@ -57,10 +57,8 @@ class ContextConfig:
 
     Attributes:
         workspace (str): The name of the current workspace.
-        environment (str): The current environment (e.g., development, production).
     """
     workspace: str = ""
-    environment: str = ""
 
 
 @dataclass
@@ -108,7 +106,6 @@ class Config:
             ],
             "context": {
                 "workspace": self.context.workspace,
-                "environment": self.context.environment,
             },
         }
 
@@ -186,17 +183,15 @@ def current_context() -> ContextConfig:
     return config.context
 
 
-def set_current_workspace(workspace_name: str, environment: str):
+def set_current_workspace(workspace_name: str):
     """
-    Sets the current workspace and environment in the configuration.
+    Sets the current workspace in the configuration.
 
     Parameters:
         workspace_name (str): The name of the workspace to set as current.
-        environment (str): The environment to set for the workspace.
     """
     config = load_config()
     config.context.workspace = workspace_name
-    config.context.environment = environment
     save_config(config)
 
 

beamlit/common/settings.py

@@ -76,7 +76,6 @@ class Settings(BaseSettings):
     )
 
     workspace: str
-    environment: str = Field(default="production")
     remote: bool = Field(default=False)
     type: str = Field(default="agent")
     name: str = Field(default="beamlit-agent")
@@ -130,7 +129,7 @@ def init() -> Settings:
     """
     Initializes the settings by parsing the `beamlit.yaml` file and setting up logging.
 
-    This function reads workspace and environment configurations from the current context,
+    This function reads workspace configuration from the current context,
     initializes the global SETTINGS variable, and configures the logger based on the log level.
 
     Returns:
@@ -144,8 +143,6 @@ def init() -> Settings:
     kwargs = {}
     if context.workspace:
         kwargs["workspace"] = context.workspace
-    if context.environment:
-        kwargs["environment"] = context.environment
 
     SETTINGS = Settings(**kwargs)
     init_logger(SETTINGS.log_level)

beamlit/deploy/deploy.py

@@ -23,10 +23,10 @@ from beamlit.common.settings import Settings, get_settings, init
 from beamlit.models import (
     Agent,
     AgentSpec,
-    EnvironmentMetadata,
     Flavor,
     Function,
     FunctionSpec,
+    Metadata,
     MetadataLabels,
 )
 
@@ -49,13 +49,20 @@ def set_default_values(resource: Resource, deployment: Agent | Function):
     """
     settings = get_settings()
     deployment.metadata.workspace = settings.workspace
-    deployment.metadata.environment = settings.environment
     if not deployment.metadata.name:
         deployment.metadata.name = slugify(resource.name)
     if not deployment.metadata.display_name:
         deployment.metadata.display_name = deployment.metadata.name
     if not deployment.spec.description:
         deployment.spec.description = get_description(None, resource)
+    if isinstance(deployment, Agent):
+        deployment.spec.functions = []
+        for arg in resource.decorator.keywords:
+            if arg.arg == "remote_functions":
+                if isinstance(arg.value, ast.List):
+                    for value in arg.value.elts:
+                        if isinstance(value, ast.Constant):
+                            deployment.spec.functions.append(slugify(value.value))
     return deployment
 
 def get_beamlit_deployment_from_resource(
@@ -75,8 +82,7 @@ def get_beamlit_deployment_from_resource(
         if arg.arg == "agent":
             if isinstance(arg.value, ast.Dict):
                 value = arg_to_dict(arg.value)
-                metadata = EnvironmentMetadata(**value.get("metadata", {}))
-                metadata.environment = settings.environment
+                metadata = Metadata(**value.get("metadata", {}))
                 spec = AgentSpec(**value.get("spec", {}))
                 agent = Agent(metadata=metadata, spec=spec)
                 if not agent.spec.prompt:
@@ -85,18 +91,17 @@ def get_beamlit_deployment_from_resource(
         if arg.arg == "function":
             if isinstance(arg.value, ast.Dict):
                 value = arg_to_dict(arg.value)
-                metadata = EnvironmentMetadata(**value.get("metadata", {}))
-                metadata.environment = settings.environment
+                metadata = Metadata(**value.get("metadata", {}))
                 spec = FunctionSpec(**value.get("spec", {}))
                 func = Function(metadata=metadata, spec=spec)
                 if not func.spec.parameters:
                     func.spec.parameters = get_parameters(resource)
                 return set_default_values(resource, func)
     if resource.type == "agent":
-        agent = Agent(metadata=EnvironmentMetadata(), spec=AgentSpec())
+        agent = Agent(metadata=Metadata(), spec=AgentSpec())
         return set_default_values(resource, agent)
     if resource.type == "function":
-        func = Function(metadata=EnvironmentMetadata(), spec=FunctionSpec())
+        func = Function(metadata=Metadata(), spec=FunctionSpec())
         func.spec.parameters = get_parameters(resource)
         return set_default_values(resource, func)
     return None
@@ -134,7 +139,8 @@ def get_agent_yaml(
         agent.spec.repository = agent_response.spec.repository
     except Exception:
         pass
-    agent.spec.functions = [slugify(function.metadata.name) for (_, function) in functions]
+    agent.spec.functions = agent.spec.functions or []
+    agent.spec.functions = agent.spec.functions + [slugify(function.metadata.name) for (_, function) in functions]
     agent.metadata.labels = agent.metadata.labels and MetadataLabels.from_dict(agent.metadata.labels) or MetadataLabels()
     agent.metadata.labels["x-beamlit-auto-generated"] = "true"
     agent_yaml = yaml.dump(agent.to_dict())

beamlit/functions/common.py

@@ -34,7 +34,7 @@ from beamlit.models import AgentChain
 
 logger = getLogger(__name__)
 
-def get_functions(
+async def get_functions(
     remote_functions: Union[list[str], None] = None,
     local_functions: Union[list[dict], None] = None,
     client: Union[AuthenticatedClient, None] = None,
@@ -139,7 +139,7 @@ def get_functions(
                                             ):
                                                 is_kit = keyword.value.value
                                     if is_kit and not settings.remote:
-                                        kit_functions = get_functions(
+                                        kit_functions = await get_functions(
                                             client=client,
                                             dir=os.path.join(root),
                                             remote_functions_empty=remote_functions_empty,
@@ -153,8 +153,8 @@ def get_functions(
                                         func = getattr(module, func_name)
                                         if settings.remote:
                                             toolkit = RemoteToolkit(client, slugify(func.__name__))
-                                            toolkit.initialize()
-                                            functions.extend(toolkit.get_tools())
+                                            await toolkit.initialize()
+                                            functions.extend(await toolkit.get_tools())
                                         else:
                                             if asyncio.iscoroutinefunction(func):
                                                 functions.append(
@@ -183,20 +183,21 @@ def get_functions(
         for function in remote_functions:
             try:
                 toolkit = RemoteToolkit(client, function)
-                toolkit.initialize()
-                functions.extend(toolkit.get_tools())
+                await toolkit.initialize()
+                functions.extend(await toolkit.get_tools())
             except Exception as e:
-                logger.debug(
-                    f"Failed to initialize remote function {function}: {e!s}\n"
-                    f"Traceback:\n{traceback.format_exc()}"
-                )
-                logger.warn(f"Failed to initialize remote function {function}: {e!s}")
+                if not isinstance(e, RuntimeError):
+                    logger.debug(
+                        f"Failed to initialize remote function {function}: {e!s}\n"
+                        f"Traceback:\n{traceback.format_exc()}"
+                    )
+                    logger.warn(f"Failed to initialize remote function {function}: {e!s}")
     if local_functions:
         for function in local_functions:
             try:
                 toolkit = LocalToolKit(client, function)
-                toolkit.initialize()
-                functions.extend(toolkit.get_tools())
+                await toolkit.initialize()
+                functions.extend(await toolkit.get_tools())
             except Exception as e:
                 logger.debug(
                     f"Failed to initialize local function {function}: {e!s}\n"
@@ -206,8 +207,7 @@ def get_functions(
 
     if chain:
         toolkit = ChainToolkit(client, chain)
-        toolkit.initialize()
-        functions.extend(toolkit.get_tools())
-
+        await toolkit.initialize()
+        functions.extend(await toolkit.get_tools())
     return functions
 

beamlit/functions/local/local.py

@@ -23,7 +23,7 @@ class LocalToolKit:
     _function: Function | None = None
     model_config = pydantic.ConfigDict(arbitrary_types_allowed=True)
 
-    def initialize(self) -> None:
+    async def initialize(self) -> None:
         """Initialize the session and retrieve the local function details."""
         if self._function is None:
             try:
@@ -34,7 +34,6 @@ class LocalToolKit:
                     spec={
                         "configurations": {
                             "url": self.local_function['url'],
-                            "sse": self.local_function['sse'],
                         },
                         "description": self.local_function['description'] or "",
                     }
@@ -42,8 +41,8 @@ class LocalToolKit:
             except Exception as e:
                 raise RuntimeError(f"Failed to initialize local function: {e}")
 
-    def get_tools(self) -> list[BaseTool]:
+    async def get_tools(self) -> list[BaseTool]:
         mcp_client = MCPClient(self.client, self._function.spec["configurations"]["url"], sse=self._function.spec["configurations"]["sse"])
         mcp_toolkit = MCPToolkit(client=mcp_client)
-        mcp_toolkit.initialize()
-        return mcp_toolkit.get_tools()
+        await mcp_toolkit.initialize()
+        return await mcp_toolkit.get_tools()