beamlit 0.0.29rc29__py3-none-any.whl → 0.0.29rc31__py3-none-any.whl

beamlit/authentication/authentication.py

@@ -1,20 +1,15 @@
+import os
 from dataclasses import dataclass
 from typing import Dict, Generator
-import os
-
-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
 
 
@@ -27,13 +22,15 @@ class PublicProvider(Auth):
 class RunClientWithCredentials:
     credentials: Credentials
     workspace: str
-    api_url: str = "https://api.beamlit.com/v0"
-    run_url: str = "https://run.beamlit.com/v0"
+    api_url: str = ""
+    run_url: str = ""
 
     def __post_init__(self):
-        if os.getenv('BL_ENV') == 'dev':
-            self.api_url = "https://api.beamlit.dev/v0"
-            self.run_url = "https://run.beamlit.dev/v0"
+        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):

beamlit/client.py

@@ -1,4 +1,3 @@
-import os
 import ssl
 from typing import Any, Optional, Union
 
@@ -38,13 +37,8 @@ class Client:
 
     """
 
-    # Determine the base URL based on the environment
-    default_base_url = "https://api.beamlit.com/v0"
-    if os.getenv("BL_ENV") == "dev":
-        default_base_url = "https://api.beamlit.dev/v0"
-
     raise_on_unexpected_status: bool = field(default=True, kw_only=True)
-    _base_url: str = field(alias="base_url", default=default_base_url)
+    _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")
@@ -55,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:
@@ -175,13 +175,8 @@ class AuthenticatedClient:
         provider: AuthProvider to use for authentication
     """
 
-    # Determine the base URL based on the environment
-    default_base_url = "https://api.beamlit.com/v0"
-    if os.getenv("BL_ENV") == "dev":
-        default_base_url = "https://api.beamlit.dev/v0"
-
     raise_on_unexpected_status: bool = field(default=True, kw_only=True)
-    _base_url: str = field(alias="base_url", default=default_base_url)
+    _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")
@@ -192,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

@@ -69,10 +69,10 @@ class Settings(BaseSettings):
     def __init__(self, **data):
         super().__init__(**data)
         if os.getenv('BL_ENV') == 'dev':
-            self.base_url = "https://api.beamlit.dev/v0"
-            self.run_url = "https://run.beamlit.dev"
-            self.mcp_hub_url = "https://mcp-hub-server.beamlit.workers.dev"
-            self.registry_url = "https://eu.registry.beamlit.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(

{beamlit-0.0.29rc29.dist-info → beamlit-0.0.29rc31.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beamlit
-Version: 0.0.29rc29
+Version: 0.0.29rc31
 Summary: Add your description here
 Author-email: cploujoux <ch.ploujoux@gmail.com>
 Requires-Python: >=3.12

{beamlit-0.0.29rc29.dist-info → beamlit-0.0.29rc31.dist-info}/RECORD

@@ -1,5 +1,5 @@
 beamlit/__init__.py,sha256=545gFC-wLLwUktWcOAjUWe_Glha40tBetRTOYSfHnbI,164
-beamlit/client.py,sha256=SmJ46egRqKwRrLXCHmwrik0D_dD6s46-87YeVhBgxSU,12817
+beamlit/client.py,sha256=PnR6ybZk5dLIJPnDKAf2epHOeQC_7yL0fG4muvphHjA,12695
 beamlit/errors.py,sha256=gO8GBmKqmSNgAg-E5oT-oOyxztvp7V_6XG7OUTT15q0,546
 beamlit/py.typed,sha256=8ZJUsxZiuOy1oJeVhsTWQhTG_6pTVHVXk5hJL79ebTk,25
 beamlit/run.py,sha256=RLwMv5f_S8lw7Wq7O6DvEcOl0nGYh769qjGl_SmR9Z0,1338
@@ -124,7 +124,7 @@ beamlit/api/workspaces/update_workspace.py,sha256=qa5DV2UJSUYuB_ibALb4E9ghKpT1Ha
 beamlit/api/workspaces/update_workspace_user_role.py,sha256=Yn9iuJ4tKtauzBiJyU4-wYUMS9g98X2Om8zs7UkzrY8,4917
 beamlit/authentication/__init__.py,sha256=wiXqRbc7E-ulrH_ueA9duOGFvXeo7-RvhSD1XbFogMo,1020
 beamlit/authentication/apikey.py,sha256=KNBTgdi0VBzBAAmSwU2X1QoB58vRbg8wkXb8-GTZCQo,657
-beamlit/authentication/authentication.py,sha256=ZH3zS7PVa9kw8szZTplwZvCbhBJ-oXHsxEtnAhKjxzM,3409
+beamlit/authentication/authentication.py,sha256=8R-3WdQSykNjCbebAW2p8Glvw5nlAmSEZr6Ylo-vPuc,3377
 beamlit/authentication/clientcredentials.py,sha256=cxZPPu--CgizwqX0pdfFQ91gJt1EFKwyy-aBB_dXX7I,3990
 beamlit/authentication/credentials.py,sha256=p_1xenabCbQuRz7BiFk7oTK4uCxAt_zoyku5o-jcKGE,5343
 beamlit/authentication/device_mode.py,sha256=tmr22gllKOZwBRub_QjF5pYa425x-nE8tQNpZ_EGR6g,3644
@@ -133,7 +133,7 @@ beamlit/common/generate.py,sha256=LtdCju_QayRS4lZrrb_0VHqWWvTcv4Mbf-iV1TB_Qko,75
 beamlit/common/instrumentation.py,sha256=MsBDfFcMYqGDiHHj4j5hLHE4EWxZExkhmCeFS3SKzJY,3181
 beamlit/common/logger.py,sha256=VFRbaZh93n8ZGugeeYKe88IP2nI3g2JNa7XN4j8wVJE,1116
 beamlit/common/secrets.py,sha256=sid81bOe3LflkMKDHwBsBs9nIju8bp5-v9qU9gkyNMc,212
-beamlit/common/settings.py,sha256=inAjEPF1OG9fsamuuSKe4z-sZ-cfZ-Qn1evnME44Fz4,5777
+beamlit/common/settings.py,sha256=bxgQxMV5ncNqDGcWS_Wj3nzOF8FgAmC6alMP2fOdEDU,5895
 beamlit/common/utils.py,sha256=jouz5igBvT37Xn_e94-foCHyQczVim-UzVcoIF6RWJ4,657
 beamlit/deploy/__init__.py,sha256=GS7l7Jtm2yKs7iNLKcfjYO-rAhUzggQ3xiYSf3oxLBY,91
 beamlit/deploy/deploy.py,sha256=on1i93SdECKrLVRMm3V2BRW5JeolPPq1dJHa4Evp0ns,9188
@@ -254,6 +254,6 @@ beamlit/serve/app.py,sha256=OpwPjRdyHZK6J-ziPwhiRDGGa2mvCrFVcBFE6alJVOM,3071
 beamlit/serve/middlewares/__init__.py,sha256=1dVmnOmhAQWvWktqHkKSIX-YoF6fmMU8xkUQuhg_rJU,148
 beamlit/serve/middlewares/accesslog.py,sha256=Mu4T4_9OvHybjA0ApzZFpgi2C8f3X1NbUk-76v634XM,631
 beamlit/serve/middlewares/processtime.py,sha256=lDAaIasZ4bwvN-HKHvZpaD9r-yrkVNZYx4abvbjbrCg,411
-beamlit-0.0.29rc29.dist-info/METADATA,sha256=WGBXo_WZ4XmwGXOJAZoqq82BAcpdOQWgbymobbVBSr8,2405
-beamlit-0.0.29rc29.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-beamlit-0.0.29rc29.dist-info/RECORD,,
+beamlit-0.0.29rc31.dist-info/METADATA,sha256=wtvS37H-4XfjTewjRWIlNgalDC5yy_C4nEsQEdE5Lfc,2405
+beamlit-0.0.29rc31.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+beamlit-0.0.29rc31.dist-info/RECORD,,