beamlit 0.0.28rc24__py3-none-any.whl → 0.0.29__py3-none-any.whl

beamlit/api/default/get_trace_logs.py

@@ -0,0 +1,186 @@
+from http import HTTPStatus
+from typing import Any, Optional, Union
+
+import httpx
+
+from ... import errors
+from ...client import AuthenticatedClient, Client
+from ...models.get_trace_logs_response_200 import GetTraceLogsResponse200
+from ...types import UNSET, Response, Unset
+
+
+def _get_kwargs(
+    trace_id: str,
+    *,
+    span_id: Union[Unset, str] = UNSET,
+    limit: Union[Unset, str] = UNSET,
+) -> dict[str, Any]:
+    params: dict[str, Any] = {}
+
+    params["spanId"] = span_id
+
+    params["limit"] = limit
+
+    params = {k: v for k, v in params.items() if v is not UNSET and v is not None}
+
+    _kwargs: dict[str, Any] = {
+        "method": "get",
+        "url": f"/traces/{trace_id}/logs",
+        "params": params,
+    }
+
+    return _kwargs
+
+
+def _parse_response(
+    *, client: Union[AuthenticatedClient, Client], response: httpx.Response
+) -> Optional[GetTraceLogsResponse200]:
+    if response.status_code == 200:
+        response_200 = GetTraceLogsResponse200.from_dict(response.json())
+
+        return response_200
+    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[GetTraceLogsResponse200]:
+    return Response(
+        status_code=HTTPStatus(response.status_code),
+        content=response.content,
+        headers=response.headers,
+        parsed=_parse_response(client=client, response=response),
+    )
+
+
+def sync_detailed(
+    trace_id: str,
+    *,
+    client: AuthenticatedClient,
+    span_id: Union[Unset, str] = UNSET,
+    limit: Union[Unset, str] = UNSET,
+) -> Response[GetTraceLogsResponse200]:
+    """Get trace logs
+
+    Args:
+        trace_id (str):
+        span_id (Union[Unset, str]):
+        limit (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.
+
+    Returns:
+        Response[GetTraceLogsResponse200]
+    """
+
+    kwargs = _get_kwargs(
+        trace_id=trace_id,
+        span_id=span_id,
+        limit=limit,
+    )
+
+    response = client.get_httpx_client().request(
+        **kwargs,
+    )
+
+    return _build_response(client=client, response=response)
+
+
+def sync(
+    trace_id: str,
+    *,
+    client: AuthenticatedClient,
+    span_id: Union[Unset, str] = UNSET,
+    limit: Union[Unset, str] = UNSET,
+) -> Optional[GetTraceLogsResponse200]:
+    """Get trace logs
+
+    Args:
+        trace_id (str):
+        span_id (Union[Unset, str]):
+        limit (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.
+
+    Returns:
+        GetTraceLogsResponse200
+    """
+
+    return sync_detailed(
+        trace_id=trace_id,
+        client=client,
+        span_id=span_id,
+        limit=limit,
+    ).parsed
+
+
+async def asyncio_detailed(
+    trace_id: str,
+    *,
+    client: AuthenticatedClient,
+    span_id: Union[Unset, str] = UNSET,
+    limit: Union[Unset, str] = UNSET,
+) -> Response[GetTraceLogsResponse200]:
+    """Get trace logs
+
+    Args:
+        trace_id (str):
+        span_id (Union[Unset, str]):
+        limit (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.
+
+    Returns:
+        Response[GetTraceLogsResponse200]
+    """
+
+    kwargs = _get_kwargs(
+        trace_id=trace_id,
+        span_id=span_id,
+        limit=limit,
+    )
+
+    response = await client.get_async_httpx_client().request(**kwargs)
+
+    return _build_response(client=client, response=response)
+
+
+async def asyncio(
+    trace_id: str,
+    *,
+    client: AuthenticatedClient,
+    span_id: Union[Unset, str] = UNSET,
+    limit: Union[Unset, str] = UNSET,
+) -> Optional[GetTraceLogsResponse200]:
+    """Get trace logs
+
+    Args:
+        trace_id (str):
+        span_id (Union[Unset, str]):
+        limit (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.
+
+    Returns:
+        GetTraceLogsResponse200
+    """
+
+    return (
+        await asyncio_detailed(
+            trace_id=trace_id,
+            client=client,
+            span_id=span_id,
+            limit=limit,
+        )
+    ).parsed

beamlit/api/functions/get_function_trace_ids.py

@@ -0,0 +1,171 @@
+from http import HTTPStatus
+from typing import Any, Optional, Union
+
+import httpx
+
+from ... import errors
+from ...client import AuthenticatedClient, Client
+from ...models.trace_ids_response import TraceIdsResponse
+from ...types import UNSET, Response, Unset
+
+
+def _get_kwargs(
+    function_name: str,
+    *,
+    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}
+
+    _kwargs: dict[str, Any] = {
+        "method": "get",
+        "url": f"/functions/{function_name}/traces",
+        "params": params,
+    }
+
+    return _kwargs
+
+
+def _parse_response(
+    *, client: Union[AuthenticatedClient, Client], response: httpx.Response
+) -> Optional[TraceIdsResponse]:
+    if response.status_code == 200:
+        response_200 = TraceIdsResponse.from_dict(response.json())
+
+        return response_200
+    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[TraceIdsResponse]:
+    return Response(
+        status_code=HTTPStatus(response.status_code),
+        content=response.content,
+        headers=response.headers,
+        parsed=_parse_response(client=client, response=response),
+    )
+
+
+def sync_detailed(
+    function_name: str,
+    *,
+    client: AuthenticatedClient,
+    environment: Union[Unset, str] = UNSET,
+) -> Response[TraceIdsResponse]:
+    """Get function trace IDs
+
+    Args:
+        function_name (str):
+        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.
+
+    Returns:
+        Response[TraceIdsResponse]
+    """
+
+    kwargs = _get_kwargs(
+        function_name=function_name,
+        environment=environment,
+    )
+
+    response = client.get_httpx_client().request(
+        **kwargs,
+    )
+
+    return _build_response(client=client, response=response)
+
+
+def sync(
+    function_name: str,
+    *,
+    client: AuthenticatedClient,
+    environment: Union[Unset, str] = UNSET,
+) -> Optional[TraceIdsResponse]:
+    """Get function trace IDs
+
+    Args:
+        function_name (str):
+        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.
+
+    Returns:
+        TraceIdsResponse
+    """
+
+    return sync_detailed(
+        function_name=function_name,
+        client=client,
+        environment=environment,
+    ).parsed
+
+
+async def asyncio_detailed(
+    function_name: str,
+    *,
+    client: AuthenticatedClient,
+    environment: Union[Unset, str] = UNSET,
+) -> Response[TraceIdsResponse]:
+    """Get function trace IDs
+
+    Args:
+        function_name (str):
+        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.
+
+    Returns:
+        Response[TraceIdsResponse]
+    """
+
+    kwargs = _get_kwargs(
+        function_name=function_name,
+        environment=environment,
+    )
+
+    response = await client.get_async_httpx_client().request(**kwargs)
+
+    return _build_response(client=client, response=response)
+
+
+async def asyncio(
+    function_name: str,
+    *,
+    client: AuthenticatedClient,
+    environment: Union[Unset, str] = UNSET,
+) -> Optional[TraceIdsResponse]:
+    """Get function trace IDs
+
+    Args:
+        function_name (str):
+        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.
+
+    Returns:
+        TraceIdsResponse
+    """
+
+    return (
+        await asyncio_detailed(
+            function_name=function_name,
+            client=client,
+            environment=environment,
+        )
+    ).parsed

beamlit/api/models/get_model_trace_ids.py

@@ -0,0 +1,171 @@
+from http import HTTPStatus
+from typing import Any, Optional, Union
+
+import httpx
+
+from ... import errors
+from ...client import AuthenticatedClient, Client
+from ...models.trace_ids_response import TraceIdsResponse
+from ...types import UNSET, Response, Unset
+
+
+def _get_kwargs(
+    model_name: str,
+    *,
+    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}
+
+    _kwargs: dict[str, Any] = {
+        "method": "get",
+        "url": f"/models/{model_name}/traces",
+        "params": params,
+    }
+
+    return _kwargs
+
+
+def _parse_response(
+    *, client: Union[AuthenticatedClient, Client], response: httpx.Response
+) -> Optional[TraceIdsResponse]:
+    if response.status_code == 200:
+        response_200 = TraceIdsResponse.from_dict(response.json())
+
+        return response_200
+    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[TraceIdsResponse]:
+    return Response(
+        status_code=HTTPStatus(response.status_code),
+        content=response.content,
+        headers=response.headers,
+        parsed=_parse_response(client=client, response=response),
+    )
+
+
+def sync_detailed(
+    model_name: str,
+    *,
+    client: AuthenticatedClient,
+    environment: Union[Unset, str] = UNSET,
+) -> Response[TraceIdsResponse]:
+    """Get model trace IDs
+
+    Args:
+        model_name (str):
+        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.
+
+    Returns:
+        Response[TraceIdsResponse]
+    """
+
+    kwargs = _get_kwargs(
+        model_name=model_name,
+        environment=environment,
+    )
+
+    response = client.get_httpx_client().request(
+        **kwargs,
+    )
+
+    return _build_response(client=client, response=response)
+
+
+def sync(
+    model_name: str,
+    *,
+    client: AuthenticatedClient,
+    environment: Union[Unset, str] = UNSET,
+) -> Optional[TraceIdsResponse]:
+    """Get model trace IDs
+
+    Args:
+        model_name (str):
+        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.
+
+    Returns:
+        TraceIdsResponse
+    """
+
+    return sync_detailed(
+        model_name=model_name,
+        client=client,
+        environment=environment,
+    ).parsed
+
+
+async def asyncio_detailed(
+    model_name: str,
+    *,
+    client: AuthenticatedClient,
+    environment: Union[Unset, str] = UNSET,
+) -> Response[TraceIdsResponse]:
+    """Get model trace IDs
+
+    Args:
+        model_name (str):
+        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.
+
+    Returns:
+        Response[TraceIdsResponse]
+    """
+
+    kwargs = _get_kwargs(
+        model_name=model_name,
+        environment=environment,
+    )
+
+    response = await client.get_async_httpx_client().request(**kwargs)
+
+    return _build_response(client=client, response=response)
+
+
+async def asyncio(
+    model_name: str,
+    *,
+    client: AuthenticatedClient,
+    environment: Union[Unset, str] = UNSET,
+) -> Optional[TraceIdsResponse]:
+    """Get model trace IDs
+
+    Args:
+        model_name (str):
+        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.
+
+    Returns:
+        TraceIdsResponse
+    """
+
+    return (
+        await asyncio_detailed(
+            model_name=model_name,
+            client=client,
+            environment=environment,
+        )
+    ).parsed

beamlit/authentication/authentication.py

@@ -1,19 +1,15 @@
+import os
 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
 
 
@@ -26,8 +22,15 @@ class PublicProvider(Auth):
 class RunClientWithCredentials:
     credentials: Credentials
     workspace: str
-    api_url: str = "https://api.beamlit.dev/v0"
-    run_url: str = "https://run.beamlit.dev/v0"
+    api_url: str = ""
+    run_url: str = ""
+
+    def __post_init__(self):
+        from ..common.settings import get_settings
+
+        settings = get_settings()
+        self.api_url = settings.base_url
+        self.run_url = settings.run_url
 
 
 def new_client_from_settings(settings: Settings):
@@ -41,15 +44,15 @@ def new_client_from_settings(settings: Settings):
 
 
 def new_client():
+    settings = get_settings()
     context = current_context()
-    if context.workspace:
+    if context.workspace and not settings.authentication.client.credentials:
         credentials = load_credentials(context.workspace)
         client_config = RunClientWithCredentials(
             credentials=credentials,
             workspace=context.workspace,
         )
     else:
-        settings = get_settings()
         credentials = load_credentials_from_settings(settings)
         client_config = RunClientWithCredentials(
             credentials=credentials,
@@ -74,7 +77,7 @@ def new_client_with_credentials(config: RunClientWithCredentials):
 
 def get_authentication_headers(settings: Settings) -> Dict[str, str]:
     context = current_context()
-    if context.workspace:
+    if context.workspace and not settings.authentication.client.credentials:
         credentials = load_credentials(context.workspace)
     else:
         settings = get_settings()

beamlit/authentication/clientcredentials.py

@@ -37,7 +37,7 @@ class ClientCredentials(Auth):
     def refresh_if_needed(self) -> Optional[Exception]:
         settings = get_settings()
         if self.credentials.client_credentials and not self.credentials.refresh_token:
-            headers = {"Authorization": f"Basic {self.credentials.client_credentials}"}
+            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()

beamlit/client.py

@@ -38,7 +38,7 @@ class Client:
     """
 
     raise_on_unexpected_status: bool = field(default=True, kw_only=True)
-    _base_url: str = field(alias="base_url", default="https://api.beamlit.dev/v0")
+    _base_url: str = field(alias="base_url", default="")
     _cookies: dict[str, str] = field(factory=dict, kw_only=True, alias="cookies")
     _headers: dict[str, str] = field(factory=dict, kw_only=True, alias="headers")
     _provider: httpx.Auth = field(default=None, alias="provider")
@@ -49,6 +49,12 @@ class Client:
     _client: Optional[httpx.Client] = field(default=None, init=False)
     _async_client: Optional[httpx.AsyncClient] = field(default=None, init=False)
 
+    def __post_init__(self):
+        from .common.settings import get_settings
+
+        settings = get_settings()
+        self._base_url = settings.base_url
+
     def with_headers(self, headers: dict[str, str]) -> "Client":
         """Get a new client matching this one with additional headers"""
         if self._client is not None:
@@ -170,7 +176,7 @@ class AuthenticatedClient:
     """
 
     raise_on_unexpected_status: bool = field(default=True, kw_only=True)
-    _base_url: str = field(alias="base_url", default="https://api.beamlit.dev/v0")
+    _base_url: str = field(alias="base_url", default="")
     _cookies: dict[str, str] = field(factory=dict, kw_only=True, alias="cookies")
     _headers: dict[str, str] = field(factory=dict, kw_only=True, alias="headers")
     _provider: httpx.Auth = field(default=None, alias="provider")
@@ -181,6 +187,12 @@ class AuthenticatedClient:
     _client: Optional[httpx.Client] = field(default=None, init=False)
     _async_client: Optional[httpx.AsyncClient] = field(default=None, init=False)
 
+    def __post_init__(self):
+        from .common.settings import get_settings
+
+        settings = get_settings()
+        self._base_url = settings.base_url
+
     def with_headers(self, headers: dict[str, str]) -> "AuthenticatedClient":
         """Get a new client matching this one with additional headers"""
         if self._client is not None:

beamlit/common/settings.py

@@ -18,11 +18,6 @@ from pydantic_settings import (BaseSettings, PydanticBaseSettingsSource,
 global SETTINGS
 SETTINGS = None
 
-
-def get_settings():
-    return SETTINGS
-
-
 class SettingsAgent(BaseSettings):
     agent: Union[None, CompiledGraph, BaseChatModel] = None
     chain: Union[Unset, list[Agent]] = UNSET
@@ -62,15 +57,23 @@ class Settings(BaseSettings):
     remote: bool = Field(default=False)
     type: str = Field(default="agent")
     name: str = Field(default="beamlit-agent")
-    base_url: str = Field(default="https://api.beamlit.dev/v0")
-    run_url: str = Field(default="https://run.beamlit.dev")
-    mcp_hub_url: str = Field(default="https://mcp-hub-server.beamlit.workers.dev")
-    registry_url: str = Field(default="https://serverless-registry-production.beamlit.workers.dev")
+    base_url: str = Field(default="https://api.beamlit.com/v0")
+    run_url: str = Field(default="https://run.beamlit.com")
+    mcp_hub_url: str = Field(default="https://mcp-hub-server.beamlit.workers.com")
+    registry_url: str = Field(default="https://us.registry.beamlit.com")
     log_level: str = Field(default="INFO")
     agent: SettingsAgent = SettingsAgent()
     server: SettingsServer = SettingsServer()
     authentication: SettingsAuthentication = SettingsAuthentication()
 
+    def __init__(self, **data):
+        super().__init__(**data)
+        if os.getenv('BL_ENV') == 'dev':
+            self.base_url = os.getenv('BL_BASE_URL') or "https://api.beamlit.dev/v0"
+            self.run_url = os.getenv('BL_RUN_URL') or "https://run.beamlit.dev"
+            self.mcp_hub_url = os.getenv('BL_MCP_HUB_URL') or "https://mcp-hub-server.beamlit.workers.dev"
+            self.registry_url = os.getenv('BL_REGISTRY_URL') or "https://eu.registry.beamlit.dev"
+
     @classmethod
     def settings_customise_sources(
         cls,
@@ -88,6 +91,9 @@ class Settings(BaseSettings):
             init_settings,
         )
 
+def get_settings() -> Settings:
+    return SETTINGS
+
 
 def init_agent(
     client: AuthenticatedClient,