beamlit 0.0.20rc4__py3-none-any.whl → 0.0.20rc5__py3-none-any.whl

beamlit/authentication/__init__.py

@@ -1,5 +1,7 @@
 from .apikey import ApiKeyProvider
 from .authentication import (PublicProvider, RunClientWithCredentials,
+                             get_authentication_headers,
+                             new_client_from_settings,
                              new_client_with_credentials)
 from .credentials import (Config, ContextConfig, Credentials, WorkspaceConfig,
                           load_credentials, load_credentials_from_settings)
@@ -11,6 +13,8 @@ __all__ = (
     "PublicProvider",
     "RunClientWithCredentials",
     "new_client_with_credentials",
+    "new_client_from_settings",
+    "get_authentication_headers",
     "Config",
     "ContextConfig",
     "Credentials",

beamlit/authentication/apikey.py

@@ -8,6 +8,12 @@ class ApiKeyProvider(Auth):
         self.credentials = credentials
         self.workspace_name = workspace_name
 
+    def get_headers(self):
+        return {
+            'X-Beamlit-Api-Key': self.credentials.api_key,
+            'X-Beamlit-Workspace': self.workspace_name
+        }
+
     def auth_flow(self, request: Request) -> Generator[Request, Response, None]:
         request.headers['X-Beamlit-Api-Key'] = self.credentials.api_key
         request.headers['X-Beamlit-Workspace'] = self.workspace_name

beamlit/authentication/authentication.py

@@ -1,12 +1,13 @@
 from dataclasses import dataclass
-from typing import Generator
+from typing import Dict, Generator
 
+from beamlit.common.settings import Settings
 from httpx import Auth, Request, Response
 
 from ..client import AuthenticatedClient
 from .apikey import ApiKeyProvider
 from .clientcredentials import ClientCredentials
-from .credentials import Credentials
+from .credentials import Credentials, load_credentials_from_settings
 from .device_mode import BearerToken
 
 
@@ -24,6 +25,15 @@ class RunClientWithCredentials:
     run_url: str = "https://run.beamlit.dev/v0"
 
 
+def new_client_from_settings(settings: Settings):
+    credentials = load_credentials_from_settings(settings)
+
+    client_config = RunClientWithCredentials(
+        credentials=credentials,
+        workspace=settings.workspace,
+    )
+    return new_client_with_credentials(client_config)
+
 def new_client_with_credentials(config: RunClientWithCredentials):
     provider: Auth = None
     if config.credentials.api_key:
@@ -36,3 +46,22 @@ def new_client_with_credentials(config: RunClientWithCredentials):
         provider = PublicProvider()
 
     return AuthenticatedClient(base_url=config.api_url, provider=provider)
+
+def get_authentication_headers(settings: Settings) -> Dict[str, str]:
+    credentials = load_credentials_from_settings(settings)
+    config = RunClientWithCredentials(
+        credentials=credentials,
+        workspace=settings.workspace,
+    )
+    provider = None
+    if config.credentials.api_key:
+        provider = ApiKeyProvider(config.credentials, config.workspace)
+    elif config.credentials.access_token:
+        provider = BearerToken(config.credentials, config.workspace, config.api_url)
+    elif config.credentials.client_credentials:
+        provider = ClientCredentials(config.credentials, config.workspace, config.api_url)
+
+    if provider is None:
+        return None
+
+    return provider.get_headers()

beamlit/authentication/clientcredentials.py

@@ -23,7 +23,27 @@ class ClientCredentials(Auth):
         self.workspace_name = workspace_name
         self.base_url = base_url
 
+    def get_headers(self):
+        err = self.refresh_if_needed()
+        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]:
+        settings = get_settings()
+        if self.credentials.client_credentials and not self.credentials.refresh_token:
+            headers = { "Authorization": f"Basic {self.credentials.client_credentials}" }
+            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:
@@ -42,15 +62,6 @@ class ClientCredentials(Auth):
         return None
 
     def auth_flow(self, request: Request) -> Generator[Request, Response, None]:
-        settings = get_settings()
-        if self.credentials.client_credentials and not self.credentials.refresh_token:
-            headers = { "Authorization": f"Basic {self.credentials.client_credentials}" }
-            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']
         err = self.refresh_if_needed()
         if err:
             return err

beamlit/authentication/credentials.py

@@ -14,6 +14,7 @@ class Credentials:
     expires_in: int = 0
     device_code: str = ""
     client_credentials: str = ""
+
 @dataclass
 class WorkspaceConfig:
     name: str

beamlit/authentication/device_mode.py

@@ -2,7 +2,7 @@ import base64
 import json
 import time
 from dataclasses import dataclass
-from typing import Generator, Optional
+from typing import Dict, Generator, Optional
 
 from httpx import Auth, Request, Response, post
 
@@ -45,6 +45,15 @@ class BearerToken(Auth):
         self.workspace_name = workspace_name
         self.base_url = base_url
 
+    def get_headers(self) -> Dict[str, str]:
+        err = self.refresh_if_needed()
+        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]:
         # Need to refresh token if expires in less than 10 minutes
         parts = self.credentials.access_token.split('.')

beamlit/common/logger.py

@@ -19,6 +19,8 @@ class ColoredFormatter(logging.Formatter):
 def init(log_level: str):
     logging.getLogger("uvicorn.access").handlers.clear()
     logging.getLogger("uvicorn.access").propagate = False
+    logging.getLogger("uvicorn.error").handlers.clear()
+    logging.getLogger("uvicorn.error").propagate = False
     logging.getLogger("httpx").handlers.clear()
     logging.getLogger("httpx").propagate = False
 

{beamlit-0.0.20rc4.dist-info → beamlit-0.0.20rc5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: beamlit
-Version: 0.0.20rc4
+Version: 0.0.20rc5
 Summary: Add your description here
 Author-email: cploujoux <ch.ploujoux@gmail.com>
 Requires-Python: >=3.12

{beamlit-0.0.20rc4.dist-info → beamlit-0.0.20rc5.dist-info}/RECORD

@@ -125,14 +125,14 @@ beamlit/api/workspaces/list_workspaces.py,sha256=FnmUumyrJeA-akmKDoz0K_DRiv-iiF_
 beamlit/api/workspaces/remove_workspace_user.py,sha256=AxEG15Vwe-dFspQD21pYqEjsY-RO0_K-eoLpdkY-VEc,2667
 beamlit/api/workspaces/update_workspace.py,sha256=qa5DV2UJSUYuB_ibALb4E9ghKpT1HaEIzIb9MOcDKv4,4241
 beamlit/api/workspaces/update_workspace_user_role.py,sha256=Yn9iuJ4tKtauzBiJyU4-wYUMS9g98X2Om8zs7UkzrY8,4917
-beamlit/authentication/__init__.py,sha256=4XS2flLWtu6deM9lE_dAVOMsNF-YzRofu2K0jvW6igw,872
-beamlit/authentication/apikey.py,sha256=HvqWEd2IqcUuISvftqpi_lhd2fTQDHTf8M4O_k7HerU,489
-beamlit/authentication/authentication.py,sha256=Al_ioKYVfGdS9urfENFqE12drzChD6l3sGWM68jHfXA,1219
-beamlit/authentication/clientcredentials.py,sha256=OUzV_Kc5A2BIteM5u8r26NwQMs8oTHPqz9qAkSxwxH0,3744
-beamlit/authentication/credentials.py,sha256=Ro7Pb_GRNuLF9MuDdOhRolnksnIFIWn5KPRNnT7c7_w,4830
-beamlit/authentication/device_mode.py,sha256=Y4WVDH6guhdQKn8zIV5s93VWvtAIn4BsTikq_UnZw4c,3409
+beamlit/authentication/__init__.py,sha256=H3_0gARm3kJxKp-rZRGOCSlJcoeWYI_aw7T6u1LPxcc,1050
+beamlit/authentication/apikey.py,sha256=qU4NRCgXT9GFJIBGyOcouuNwswMIkk_CQi1gOXrtXgw,658
+beamlit/authentication/authentication.py,sha256=PyxPN8RgteT8MBtPgN2mD0Bc5IpRMljEL_E8mroNdH0,2310
+beamlit/authentication/clientcredentials.py,sha256=i7ko_-vAkPvRoFKxIWX4N7bbjXfXinbZFdJPP2weA4M,4015
+beamlit/authentication/credentials.py,sha256=IsmRbQth95my9kkWCpoPKZLLWDpIUwn5OaGIkK8keeA,4831
+beamlit/authentication/device_mode.py,sha256=cN_bBer0YwNZD1L0_RvW2TL1YveOhJ4L_bIAF5m__iA,3702
 beamlit/common/generate.py,sha256=C6Z0ifDwrSMrtrHwgC8YQm0JklsDaPCkagzpK9v9SrQ,7172
-beamlit/common/logger.py,sha256=zuUVHsSSwH0REij0rDhBgZ0U7YvToDQu-SVS6ZBIDUg,948
+beamlit/common/logger.py,sha256=6VnjHuFHfHQEbWZyDEoPCdArVzhVL7rDGF65ZjXj7aM,1061
 beamlit/common/settings.py,sha256=FoOymkCcrwzya55ZOxOnNdMePYWBAgMTHxmPxHWGXAE,4186
 beamlit/common/utils.py,sha256=0KaC8vMa0AyIm4jTNgAJSsOYA1b191Q8AUF1up1RxFs,634
 beamlit/models/__init__.py,sha256=Jv0iTOtTs9G2zQRjbCmDjmNz8T9fX-MHoSt3b3zlRcI,8929
@@ -277,6 +277,6 @@ beamlit/models/websocket_channel.py,sha256=tyNtsVR0cOwd6BK--ehBCH8bIjxtyPhiAkrxY
 beamlit/models/workspace.py,sha256=5l6-YSgpEgZEyVoBX3PvE5HVO07j7pe3ZA1jdOBR-Fs,3998
 beamlit/models/workspace_labels.py,sha256=crX235uLVWlu_R3Y4t5AiELY0OJukNAUF9_RO3mZaj8,1252
 beamlit/models/workspace_user.py,sha256=yCGwPQsVkbGMDkxbATMoEYRxkdx9yIJSsAunVbf8-14,3429
-beamlit-0.0.20rc4.dist-info/METADATA,sha256=gNKtjfqwFOBhTLehc4mKL63lTzmlS8dEmqq3_DkeIVE,1746
-beamlit-0.0.20rc4.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-beamlit-0.0.20rc4.dist-info/RECORD,,
+beamlit-0.0.20rc5.dist-info/METADATA,sha256=NBnYBiQDiZepBdzW_VLxiLL7XeXhFIc90G2O8ulpC_0,1746
+beamlit-0.0.20rc5.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+beamlit-0.0.20rc5.dist-info/RECORD,,