frogml-core 0.0.28__py3-none-any.whl → 0.0.30__py3-none-any.whl

frogml_core/__init__.py

@@ -1,7 +1,7 @@
 """Top-level package for frogml."""
 
 __author__ = "jfrog"
-__version__ = "0.0.28"
+__version__ = "0.0.30"
 
 from frogml_core.inner.di_configuration import wire_dependencies
 from frogml_core.model.model_version_tracking import (  # noqa: F401,E501

frogml_core/frogml_client/client.py

@@ -4,7 +4,10 @@ from pathlib import Path
 from tempfile import TemporaryDirectory
 from typing import TYPE_CHECKING, Dict, List, Optional, Union
 
-from frogml_proto.qwak.build.v1.build_pb2 import DESCRIPTOR
+import requests
+from requests import Response
+from requests.auth import AuthBase
+
 from frogml_core.clients.analytics.client import AnalyticsEngineClient
 from frogml_core.clients.automation_management.client import AutomationsManagementClient
 from frogml_core.clients.batch_job_management.client import BatchJobManagerClient
@@ -45,6 +48,7 @@ from frogml_core.frogml_client.projects.project import Project
 from frogml_core.inner.build_config.build_config_v1 import BuildConfigV1
 from frogml_core.inner.tool.auth import FrogMLAuthClient
 from frogml_core.model.base import BaseModel
+from frogml_proto.qwak.build.v1.build_pb2 import DESCRIPTOR
 
 if TYPE_CHECKING:
     try:
@@ -888,3 +892,9 @@ class FrogMLClient:
             Task.from_proto(task)
             for task in model_execution_tasks_proto.batch_job.task_executions
         ]
+
+    @staticmethod
+    def download_artifact(download_url: str, timeout: int = 60) -> Response:
+        auth: AuthBase = FrogMLClient._get_auth_client().get_auth()
+
+        return requests.get(download_url, auth=auth, timeout=timeout)

frogml_core/inner/tool/auth.py

@@ -1,10 +1,10 @@
-from typing import Dict, Optional, Union, cast
+from typing import Optional, Union, cast
 
 import requests
 from frogml_storage._utils import BearerAuth
 from frogml_storage.authentication._authentication_utils import get_credentials
 from frogml_storage.authentication.models._auth_config import AuthConfig
-from requests.auth import AuthBase, HTTPBasicAuth
+from requests.auth import AuthBase
 
 from frogml_core.exceptions import FrogmlLoginException
 
@@ -35,6 +35,9 @@ class FrogMLAuthClient:
 
         self.__get_tenant_id(artifactory_url, auth)
 
+    def get_auth(self) -> Union[AuthBase]:
+        return get_credentials(self.auth_config)[1]
+
     def __get_tenant_id(self, artifactory_url: str, auth: AuthBase):
         login_exception = FrogmlLoginException(
             "Failed to authenticate with JFrog. Please check your credentials"
@@ -48,17 +51,9 @@ class FrogMLAuthClient:
             base_url = artifactory_url.rstrip("/") + "/ui"
 
         url = f"{base_url}/api/v1/system/auth/screen/footer"
-        kwargs: Dict[str, Union[HTTPBasicAuth, str]] = {}
-
-        if isinstance(auth, HTTPBasicAuth):
-            kwargs["auth"] = auth
-        elif isinstance(auth, BearerAuth):
-            kwargs["headers"] = {"Authorization": f"Bearer {auth.token}"}
-        else:
-            raise login_exception
 
         try:
-            response = requests.get(url, timeout=60, **kwargs)
+            response = requests.get(url, timeout=15, auth=auth)
             response.raise_for_status()  # Raises an HTTPError for bad responses
             response_data = response.json()
 

{frogml_core-0.0.28.dist-info → frogml_core-0.0.30.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: frogml-core
-Version: 0.0.28
+Version: 0.0.30
 Summary: frogml Core contains the necessary objects and communication tools for using the Jfrog ml Platform
 License: Apache-2.0
 Keywords: mlops,ml,deployment,serving,model
@@ -22,7 +22,7 @@ Requires-Dist: cloudpickle (==2.2.1) ; extra == "feature-store"
 Requires-Dist: dacite (==1.8.1)
 Requires-Dist: dependency-injector (>=4.0)
 Requires-Dist: filelock
-Requires-Dist: frogml-storage (>=0.10.0,<0.11.0)
+Requires-Dist: frogml-storage (>=0.11.1)
 Requires-Dist: grpcio (>=1.57.0)
 Requires-Dist: joblib (>=1.3.2,<2.0.0)
 Requires-Dist: marshmallow-dataclass (>=8.5.8,<9.0.0)

{frogml_core-0.0.28.dist-info → frogml_core-0.0.30.dist-info}/RECORD

@@ -1,4 +1,4 @@
-frogml_core/__init__.py,sha256=4VdwW4byTN5jKXRkh9DKFWGEkUIWXWXJE2t7hcRYMNw,777
+frogml_core/__init__.py,sha256=N-z0O15f5Q7OMAzH1PwAGJeropiKiOLLZ0tf_J3vtTU,777
 frogml_core/automations/__init__.py,sha256=j2gD15MN-xVWhI5rAFsDwhL0CIyICLNT0scXsKvNBkU,1547
 frogml_core/automations/automation_executions.py,sha256=xpOb9Dq8gPPGNQDJTvBBZbNz4woZDRZY0HqnLSu7pwU,3230
 frogml_core/automations/automations.py,sha256=GKEQyQMi8sxX5oZn62PaxPi0zD8IaJRjBkhczRJxHNs,13070
@@ -207,7 +207,7 @@ frogml_core/frogml_client/builds/build.py,sha256=5LysOp1nAhjQaL1Jdg-rtb81jOaxZL-
 frogml_core/frogml_client/builds/filters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 frogml_core/frogml_client/builds/filters/metric_filter.py,sha256=hDhyKGavGmZXRbmhGjtZejY1veQR277F1FUgBg-ZjjM,1186
 frogml_core/frogml_client/builds/filters/parameter_filter.py,sha256=3qEL2KJdZNytx646XnBjDO7phxCDO98tAUqMurp5Kq0,1098
-frogml_core/frogml_client/client.py,sha256=xQb2A9y-pLRekBVEdsdELfZaL_sF_QiZIxwEa3uSHFs,29759
+frogml_core/frogml_client/client.py,sha256=yz56TW4C05O1JTG0JR4VdEsyGwnBH0tMhbzbSsDbr48,30076
 frogml_core/frogml_client/data_versioning/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 frogml_core/frogml_client/data_versioning/data_tag.py,sha256=WadGhSMgKIajVV9jWIIwXhi-xBR5bsQnu9dN-XPX_XU,807
 frogml_core/frogml_client/deployments/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -283,7 +283,7 @@ frogml_core/inner/runtime_di/__init__.py,sha256=HXqtejgH3J9TXjnEBT6cNwnTDPq6v3sT
 frogml_core/inner/runtime_di/containers.py,sha256=LbapepWFjBjkELEOTK7m7AJEfj4KENVDlpD7lv7zw6o,577
 frogml_core/inner/singleton_meta.py,sha256=1cU99I0f9tjuMQLMJyLsK1oK3fZJMsO5-TbRHAMXqds,627
 frogml_core/inner/tool/__init__.py,sha256=rmOSE-ejnzDG_H7kbikPQxEO4TFIkhBWjOXhTIrldiU,35
-frogml_core/inner/tool/auth.py,sha256=aED74VA5LLUyR6tY_owl47cntj7dLywJG_GSUVyZDEE,2444
+frogml_core/inner/tool/auth.py,sha256=XWBLkCz6xS5xCVH6ZFNC42RnWo1p27w3d2SMbNLMh30,2218
 frogml_core/inner/tool/grpc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 frogml_core/inner/tool/grpc/grpc_auth.py,sha256=WPFWn7CfGp-pSqlnUTplHB6lfuJdzpS6jeidmpyondo,1421
 frogml_core/inner/tool/grpc/grpc_tools.py,sha256=8sXDWBd_kVRuwmUSdpQNobylT6u8H_83Q8WlZJYOi0c,7247
@@ -1019,6 +1019,6 @@ frogml_services_mock/mocks/workspace_manager_service_mock.py,sha256=WbOiWgOyr-xT
 frogml_services_mock/services_mock.py,sha256=_34z6rFCHFwcSni-9eyJlrH264xsL_QDNmG-EBv0zMc,20281
 frogml_services_mock/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 frogml_services_mock/utils/service_utils.py,sha256=ZlB0CnB1J6oBn6_m7fQO2U8tKoboHdUa6ljjkRMYNXU,265
-frogml_core-0.0.28.dist-info/METADATA,sha256=aDBSPDuVZZbHxBNJKhuZ8CuVX26ABrUwBbo86eR4krI,2012
-frogml_core-0.0.28.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-frogml_core-0.0.28.dist-info/RECORD,,
+frogml_core-0.0.30.dist-info/METADATA,sha256=pxCcecPVkm0NVHhlzdPbX_alOBKbhwNxP3dyhlLpHUM,2004
+frogml_core-0.0.30.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+frogml_core-0.0.30.dist-info/RECORD,,