qwak-core 0.4.254__py3-none-any.whl → 0.4.255__py3-none-any.whl

qwak/__init__.py

@@ -1,7 +1,7 @@
 """Top-level package for qwak-core."""
 
 __author__ = "Qwak.ai"
-__version__ = "0.4.254"
+__version__ = "0.4.255"
 
 from qwak.inner.di_configuration import wire_dependencies
 from qwak.model.experiment_tracking import log_metric, log_param

qwak/inner/tool/auth.py

@@ -1,5 +1,7 @@
 import warnings
 from filelock import FileLock
+from typing_extensions import Self
+
 from qwak.inner.di_configuration.session import Session
 from abc import ABC, abstractmethod
 from typing import Optional
@@ -131,6 +133,8 @@ class Auth0ClientBase(BaseAuthClient):
 
 
 class FrogMLAuthClient(BaseAuthClient):
+    __MIN_TOKEN_LENGTH: int = 64
+
     def __init__(self, auth_config: Optional[AuthConfig] = None):
         self.auth_config = auth_config
         self._token = None
@@ -148,32 +152,45 @@ class FrogMLAuthClient(BaseAuthClient):
 
     def login(self) -> None:
         artifactory_url, auth = get_credentials(self.auth_config)
-        if hasattr(auth, "token"):  # For BearerAuth
-            self._token = auth.token
-            # Remove '/artifactory/' from the URL
-            if "/artifactory" in artifactory_url:
-                base_url = artifactory_url.replace("/artifactory", "/ui")
-            else:
-                # Remove trailing slash if it exists and append /ui
-                base_url = artifactory_url.rstrip("/") + "/ui"
-            try:
-                response = requests.get(
-                    f"{base_url}/api/v1/system/auth/screen/footer",
-                    headers={"Authorization": f"Bearer {self._token}"},
-                    timeout=60,
-                )
-                response.raise_for_status()  # Raises an HTTPError for bad responses
-                response_data = response.json()
-                if "serverId" not in response_data:
-                    raise QwakLoginException(
-                        "Failed to authenticate with JFrog. Please check your credentials"
-                    )
-                self._tenant_id = response_data["serverId"]
-            except requests.exceptions.RequestException:
-                raise QwakLoginException(
-                    "Failed to authenticate with JFrog. Please check your credentials"
-                )
-            except ValueError:  # This catches JSON decode errors
+        # For now, we only support Bearer token authentication
+        if not hasattr(auth, "token"):
+            return
+
+        # noinspection PyUnresolvedReferences
+        self._token = auth.token
+        self.__validate_token()
+
+        # Remove '/artifactory/' from the URL
+        if "/artifactory" in artifactory_url:
+            base_url = artifactory_url.replace("/artifactory", "/ui")
+        else:
+            # Remove trailing slash if it exists and append /ui
+            base_url = artifactory_url.rstrip("/") + "/ui"
+        try:
+            response = requests.get(
+                f"{base_url}/api/v1/system/auth/screen/footer",
+                headers={"Authorization": f"Bearer {self._token}"},
+                timeout=60,
+            )
+            response.raise_for_status()  # Raises an HTTPError for bad responses
+            response_data = response.json()
+            if "serverId" not in response_data:
                 raise QwakLoginException(
                     "Failed to authenticate with JFrog. Please check your credentials"
                 )
+            self._tenant_id = response_data["serverId"]
+        except requests.exceptions.RequestException:
+            raise QwakLoginException(
+                "Failed to authenticate with JFrog. Please check your credentials"
+            )
+        except ValueError:  # This catches JSON decode errors
+            raise QwakLoginException(
+                "Failed to authenticate with JFrog. Please check your credentials"
+            )
+
+    def __validate_token(self: Self):
+        if self._token is None or len(self._token) <= self.__MIN_TOKEN_LENGTH:
+            raise QwakLoginException(
+                "Authentication with JFrog failed: Only JWT Access Tokens are supported. "
+                "Please ensure you are using a valid JWT Access Token."
+            )

{qwak_core-0.4.254.dist-info → qwak_core-0.4.255.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: qwak-core
-Version: 0.4.254
+Version: 0.4.255
 Summary: Qwak Core contains the necessary objects and communication tools for using the Qwak Platform
 License: Apache-2.0
 Keywords: mlops,ml,deployment,serving,model

{qwak_core-0.4.254.dist-info → qwak_core-0.4.255.dist-info}/RECORD

@@ -591,7 +591,7 @@ _qwak_proto/qwak/workspace/workspace_pb2_grpc.py,sha256=1oboBPFxaTEXt9Aw7EAj8gXH
 _qwak_proto/qwak/workspace/workspace_service_pb2.py,sha256=AB3C9S_AbOD7Nx1Ni4j1rW6PNtYTV1zjiqFQk-goQ74,21429
 _qwak_proto/qwak/workspace/workspace_service_pb2.pyi,sha256=nKKCHwnovZhsy8TSVmdz-Vtl0nviOOoX56HD-41Xo08,13726
 _qwak_proto/qwak/workspace/workspace_service_pb2_grpc.py,sha256=yKGuexxTBza99Ihe0DSTniV2ZSd_AG47inHenqfi890,27193
-qwak/__init__.py,sha256=HiiVw4d7Hawddft8J68Jq1jh1WMaOD0rChI2Yxp2uwY,587
+qwak/__init__.py,sha256=3dkAB_9JMGnCQG2Ps-aQm0YkAXM28MfsFCPfREM5epM,587
 qwak/automations/__init__.py,sha256=qFZRvCxUUn8gcxkJR0v19ulHW2oJ0x6-Rif7HiheDP4,1522
 qwak/automations/automation_executions.py,sha256=5MeH_epYYWb8NKXgAozwT_jPyyUDednBHG7izloi7RY,3228
 qwak/automations/automations.py,sha256=3yx8e2v0uSKDnXbqyknasyEoQ5vxGni6K40Hbi1_zkk,12599
@@ -846,7 +846,7 @@ qwak/inner/runtime_di/__init__.py,sha256=ylaHwo2Hlq3pmeziA0Ip87DMnkcuBffKKi0tTH7
 qwak/inner/runtime_di/containers.py,sha256=-AREM-IUAd9JhrhQablqixxpj4L9Tk1iQkK1fA5YbrA,545
 qwak/inner/singleton_meta.py,sha256=1cU99I0f9tjuMQLMJyLsK1oK3fZJMsO5-TbRHAMXqds,627
 qwak/inner/tool/__init__.py,sha256=DDoMZk7LIZNfu63Ft0mLE5wflwlQoghAJ1ZmMAcAeVE,74
-qwak/inner/tool/auth.py,sha256=hplzXD9R-AvSDbFHdcAvKIQjy-S2btwUCoe_N7im8DA,6439
+qwak/inner/tool/auth.py,sha256=nCDtphlFkwgIrVewSrI9p1vh-63rB-cARXFtVl8XHcY,6878
 qwak/inner/tool/grpc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qwak/inner/tool/grpc/grpc_auth.py,sha256=nHfIk2R5ljCvU8hsgk_X6grfNhVrbTvQe6uJffe5W5o,2291
 qwak/inner/tool/grpc/grpc_tools.py,sha256=ArtsEZz5V-YxOVE6vH_UHJwOn6gAJVIolda8hF6qwMs,7256
@@ -1065,6 +1065,6 @@ qwak_services_mock/mocks/workspace_manager_service_mock.py,sha256=O9ZSwln4T4kHVk
 qwak_services_mock/services_mock.py,sha256=zXtHcX8a_acz7ynxuCBxxVpHpde7aAGjIn6Uw52LY1s,19593
 qwak_services_mock/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qwak_services_mock/utils/service_utils.py,sha256=ZlB0CnB1J6oBn6_m7fQO2U8tKoboHdUa6ljjkRMYNXU,265
-qwak_core-0.4.254.dist-info/METADATA,sha256=tiz-kqINS0DFiZg3zno0xsSUylUq1gDK-M65JbvxpPo,2549
-qwak_core-0.4.254.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-qwak_core-0.4.254.dist-info/RECORD,,
+qwak_core-0.4.255.dist-info/METADATA,sha256=ZB0CZRLVAF5CZt9UvEbedeb9P3UOeUanH1_rptHovkU,2549
+qwak_core-0.4.255.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+qwak_core-0.4.255.dist-info/RECORD,,