qwak-core 0.4.263__py3-none-any.whl → 0.4.265__py3-none-any.whl

qwak/__init__.py

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

qwak/inner/tool/auth.py

@@ -162,30 +162,43 @@ class FrogMLAuthClient(BaseAuthClient):
 
         # Remove '/artifactory/' from the URL
         if "/artifactory" in artifactory_url:
-            base_url = artifactory_url.replace("/artifactory", "/ui")
+            base_url = artifactory_url.replace("/artifactory", "")
         else:
-            # Remove trailing slash if it exists and append /ui
-            base_url = artifactory_url.rstrip("/") + "/ui"
+            # Remove trailing slash if exists
+            base_url = artifactory_url.rstrip("/")
         try:
             response = requests.get(
-                f"{base_url}/api/v1/system/auth/screen/footer",
+                f"{base_url}/ui/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"
+                response = requests.get(
+                    f"{base_url}/jfconnect/api/v1/system/jpd_id",
+                    headers={"Authorization": f"Bearer {self._token}"},
+                    timeout=60,
                 )
-            self._tenant_id = response_data["serverId"]
+                if response.status_code == 200:
+                    self._tenant_id = response.text
+                elif response.status_code == 401:
+                    raise QwakLoginException(
+                        "Failed to authenticate with JFrog. Please check your credentials"
+                    )
+                else:
+                    raise QwakLoginException(
+                        "Failed to authenticate with JFrog. Please check your artifactory configuration"
+                    )
+            else:
+                self._tenant_id = response_data["serverId"]
         except requests.exceptions.RequestException:
             raise QwakLoginException(
-                "Failed to authenticate with JFrog. Please check your credentials"
+                "Failed to authenticate with JFrog. Please check your artifactory configuration"
             )
         except ValueError:  # This catches JSON decode errors
             raise QwakLoginException(
-                "Failed to authenticate with JFrog. Please check your credentials"
+                "Failed to authenticate with JFrog. Please check your artifactory configuration"
             )
 
     def __validate_token(self: Self):

{qwak_core-0.4.263.dist-info → qwak_core-0.4.265.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: qwak-core
-Version: 0.4.263
+Version: 0.4.265
 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.263.dist-info → qwak_core-0.4.265.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=5lTj2jxOj9xZZo9GlFEFeA9yXjIwcejs_AWFmmxsSQg,587
+qwak/__init__.py,sha256=oEXIef8SYmHpEkzNYJlqLwZQhLP7dO5RDFRg63cz7NU,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=nCDtphlFkwgIrVewSrI9p1vh-63rB-cARXFtVl8XHcY,6878
+qwak/inner/tool/auth.py,sha256=yw4XgIviPQ83hslb5T3T0AoosuOOEdRmlZoFvg79oPA,7488
 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.263.dist-info/METADATA,sha256=oQm0FzIU-JoPixijawlSYeoF8Gqm-cMDv0mTk65LFX8,2549
-qwak_core-0.4.263.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-qwak_core-0.4.263.dist-info/RECORD,,
+qwak_core-0.4.265.dist-info/METADATA,sha256=blC1g0Tev51fN_pJJvqS6Kt_XMWx_k8hnP1pCLxbo0I,2549
+qwak_core-0.4.265.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+qwak_core-0.4.265.dist-info/RECORD,,