frogml-core 0.0.73__py3-none-any.whl → 0.0.75__py3-none-any.whl

frogml_core/__init__.py

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

frogml_core/inner/model_loggers_utils.py

@@ -4,9 +4,6 @@ from typing import Optional
 
 import requests
 
-from frogml_proto.qwak.builds.builds_orchestrator_service_pb2 import (
-    AuthenticationDetail,
-)
 from frogml_core.clients.model_management.client import ModelsManagementClient
 from frogml_core.exceptions import FrogmlException
 
@@ -71,33 +68,22 @@ def fetch_build_id() -> Optional[str]:
 def upload_data(
     upload_url: str,
     data: bytes,
-    authentication_details: Optional[AuthenticationDetail],
+    headers: dict,
     content_type: str = "text/plain",
-) -> None:
+):
     """
     Upload data
-    Args:
-        upload_url: the url to upload to.
-        data: the data to upload
-        authentication_details: authentication details for upload data
-        content_type: Uploaded content-type
+    :param upload_url: the url to upload to.
+    :param data: the data to upload
+    :param headers: authentication details for upload data
+    :param content_type: Uploaded content-type
     """
     try:
-        auth = None
-        if (
-            authentication_details.WhichOneof("integration_type")
-            == "jfrog_authentication_detail"
-        ):
-            auth = (
-                authentication_details.jfrog_authentication_detail.username,
-                authentication_details.jfrog_authentication_detail.token,
-            )
-
+        headers["Content-Type"] = content_type
         http_response = requests.put(  # nosec B113
             upload_url,
             data=data,
-            headers={"content-type": content_type},
-            auth=auth,
+            headers=headers,
         )
 
         if http_response.status_code not in [200, 201]:

frogml_core/model_loggers/artifact_logger.py

@@ -11,6 +11,9 @@ from frogml_core.inner.model_loggers_utils import (
     validate_model,
     validate_tag,
 )
+from frogml_proto.qwak.builds.builds_orchestrator_service_pb2 import (
+    GetBuildVersioningUploadURLResponse,
+)
 
 
 def log_file(
@@ -38,7 +41,9 @@ def log_file(
         # Checking if called inside a model - then build id saved as environment variable or stays
         build_id = fetch_build_id()
 
-    upload_url_response = BuildOrchestratorClient().get_build_versioning_upload_url(
+    upload_url_response: (
+        GetBuildVersioningUploadURLResponse
+    ) = BuildOrchestratorClient().get_build_versioning_upload_url(
         build_id=build_id,
         model_id=model_id,
         tag=tag,
@@ -53,7 +58,7 @@ def log_file(
         upload_data(
             upload_url_response.upload_url,
             f.read(),
-            upload_url_response.authentication_detail,
+            upload_url_response.headers,
         )
 
 

frogml_core/model_loggers/data_logger.py

@@ -12,6 +12,9 @@ from frogml_proto.qwak.builds.build_pb2 import (
     DataTableDefinition,
 )
 from frogml_proto.qwak.builds.build_url_pb2 import BuildVersioningTagsType
+from frogml_proto.qwak.builds.builds_orchestrator_service_pb2 import (
+    GetBuildVersioningUploadURLResponse,
+)
 from frogml_core.clients.build_orchestrator.client import BuildOrchestratorClient
 from frogml_core.clients.data_versioning.client import DataVersioningManagementClient
 from frogml_core.exceptions import FrogmlException
@@ -63,11 +66,13 @@ def log_data(
         build_id = fetch_build_id()
 
     client = BuildOrchestratorClient()
-    upload_url_response = client.get_build_versioning_upload_url(
-        build_id=build_id,
-        model_id=model_id,
-        tag=str(data_tag),
-        tag_type=BuildVersioningTagsType.DATA_TAG_TYPE,
+    upload_url_response: GetBuildVersioningUploadURLResponse = (
+        client.get_build_versioning_upload_url(
+            build_id=build_id,
+            model_id=model_id,
+            tag=str(data_tag),
+            tag_type=BuildVersioningTagsType.DATA_TAG_TYPE,
+        )
     )
 
     string_buffer = StringIO()
@@ -76,7 +81,7 @@ def log_data(
         upload_url=upload_url_response.upload_url,
         data=gzip.compress(bytes(string_buffer.getvalue(), "utf-8")),
         content_type="text/plain",
-        authentication_details=upload_url_response.authentication_detail,
+        headers=upload_url_response.headers,
     )
 
     dataframe_definition = DataTableDefinition(

{frogml_core-0.0.73.dist-info → frogml_core-0.0.75.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: frogml-core
-Version: 0.0.73
+Version: 0.0.75
 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
@@ -30,8 +30,8 @@ Requires-Dist: protobuf (>=3.10,<4) ; python_version < "3.10"
 Requires-Dist: protobuf (>=4.21.6) ; python_version >= "3.10"
 Requires-Dist: pyarrow (>=6.0.0) ; extra == "feature-store"
 Requires-Dist: pyathena (>=2.2.0,!=2.18.0) ; extra == "feature-store"
+Requires-Dist: pyjwt
 Requires-Dist: pyspark (==3.4.2) ; extra == "feature-store"
-Requires-Dist: python-jose
 Requires-Dist: python-json-logger (>=2.0.2)
 Requires-Dist: requests
 Requires-Dist: retrying (==1.3.4)

{frogml_core-0.0.73.dist-info → frogml_core-0.0.75.dist-info}/RECORD

@@ -1,4 +1,4 @@
-frogml_core/__init__.py,sha256=H1v3NaV6G8_CLt1gzMDEGJYry0urU7ROISKUYX1mw5Q,777
+frogml_core/__init__.py,sha256=YA-VXr_BCBVozb9QhI4ooAWWlaRYsojikorr_XdKa_U,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
@@ -275,7 +275,7 @@ frogml_core/inner/di_configuration/config.yml,sha256=GUvaZMWIDIR_d7hFcPVG_kHdCwp
 frogml_core/inner/di_configuration/containers.py,sha256=epzNvWcHcfO07EV6aQxEaGIehqgKBUK2CGzKgk1HeEA,1148
 frogml_core/inner/instance_template/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 frogml_core/inner/instance_template/verify_template_id.py,sha256=3rmVpZyqDs7wUyXSmfJ8YjUK15Q4_H95J8Ba5E6KuA8,1951
-frogml_core/inner/model_loggers_utils.py,sha256=pGZ8Eh6PsoQTmDMKnI3ZVckl9n6ZVBslbuZdUnZFGbA,2967
+frogml_core/inner/model_loggers_utils.py,sha256=NOSLcdKEoLIcK9Hx19KP1iGgzJu2NjWOGUh4yAuycTI,2465
 frogml_core/inner/provider.py,sha256=3evQnyp0v0enpvGGDyaZziusO4BGi-U9j1sno8DAHo4,70
 frogml_core/inner/runtime_di/__init__.py,sha256=HXqtejgH3J9TXjnEBT6cNwnTDPq6v3sTifcmfWiwyFA,312
 frogml_core/inner/runtime_di/containers.py,sha256=LbapepWFjBjkELEOTK7m7AJEfj4KENVDlpD7lv7zw6o,577
@@ -405,8 +405,8 @@ frogml_core/model/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 frogml_core/model/utils/extract_wrapped_function.py,sha256=uIle1zL8vbmeS3PGAuaNFLIUQAsvpuzk3LlH-Teba94,320
 frogml_core/model/utils/feature_utils.py,sha256=ObIU4jLKOMEa3DWEyrXm1m3wC2wseAVwr-zxlSiojYk,2525
 frogml_core/model_loggers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-frogml_core/model_loggers/artifact_logger.py,sha256=xD3XVN8_qHP40q1ZbZS28vgEQUMljwAQINTonzXN-VU,2975
-frogml_core/model_loggers/data_logger.py,sha256=DhFA43cbJJJc7J4xGx1lUF0MhC8do7TN8RxcOdzTFgk,5520
+frogml_core/model_loggers/artifact_logger.py,sha256=7T06QL1keo6BTpIh76JtXRcNlZuIbqECz343kEw0Hfc,3128
+frogml_core/model_loggers/data_logger.py,sha256=I3o2TkAGAnKuVWccPMlGL5-rg1e2UDHRc9cRSS8kqmc,5678
 frogml_core/model_loggers/model_logger.py,sha256=xDUIwRzeFAorzzR47ovyag5ohwuYZWp9fRWpLpMzcg4,863
 frogml_core/testing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 frogml_core/testing/fixtures.py,sha256=tjWIvdZ2nIfNPs6VtUeGx5coJepQVMUWemKGtqUYPzM,318
@@ -1041,7 +1041,7 @@ frogml_services_mock/mocks/alert_manager_service_api.py,sha256=wEBgwtCRAxUSAni-r
 frogml_services_mock/mocks/alert_registry_service_api.py,sha256=k_MbEytyIvUcMffqd1E6Wf0qBEOyZMVpBu-jaS6Tvjw,2277
 frogml_services_mock/mocks/analytics_api.py,sha256=9zA90He4hYOd8Wr1k_wZho6bWsbkd8mVUt4MUCrTEKc,2132
 frogml_services_mock/mocks/audience_service_api.py,sha256=x96adhF05NYqEtI8lJaf5llrZX29udPLHuVXKy_FbR0,2661
-frogml_services_mock/mocks/authentication_service.py,sha256=M3cVfnQ2XcxQAWZCm9uR9cAVu_0BahEP4BdymYQfihI,1180
+frogml_services_mock/mocks/authentication_service.py,sha256=QevoMagWaRpP84jCrVyIiB57R8gyY1VMPl4BBSkh68o,1196
 frogml_services_mock/mocks/automation_management_service.py,sha256=-7kncqM3R-_pLmppzFpuv_TniXCVGVuESculVuQ3EbY,8238
 frogml_services_mock/mocks/autoscaling_service_api.py,sha256=u3RkwHxACPFSk9DwhLFQSI7_ULoHN9uWFL-zyyo-sNw,1032
 frogml_services_mock/mocks/batch_job_manager_service.py,sha256=QY3HA0MlA8eg2jkQEzjyGx8UsSnlGbOUopDLOYLacL4,13146
@@ -1087,6 +1087,6 @@ frogml_services_mock/mocks/workspace_manager_service_mock.py,sha256=WbOiWgOyr-xT
 frogml_services_mock/services_mock.py,sha256=xfbYvl05gFUq2oT82cT-6K2CEJ6d9kFX_tk77QZHTFI,20787
 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.73.dist-info/METADATA,sha256=Wj9TaS1GR3LEc-TVI0YUKGKbjTAjLE6wz-6cnvlYriA,2004
-frogml_core-0.0.73.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-frogml_core-0.0.73.dist-info/RECORD,,
+frogml_core-0.0.75.dist-info/METADATA,sha256=Xuq12Oay9OO-Y9xizvv-JUQMocbZZem2lb-Wen_vUT0,1998
+frogml_core-0.0.75.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+frogml_core-0.0.75.dist-info/RECORD,,

{frogml_core-0.0.73.dist-info → frogml_core-0.0.75.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.0.1
+Generator: poetry-core 2.1.1
 Root-Is-Purelib: true
 Tag: py3-none-any

frogml_services_mock/mocks/authentication_service.py

@@ -1,6 +1,6 @@
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 
-from jose import jwt
+import jwt
 
 from frogml_proto.qwak.administration.v0.authentication.authentication_service_pb2 import (
     AuthenticateRequest,
@@ -10,7 +10,7 @@ from frogml_proto.qwak.administration.v0.authentication.authentication_service_p
     AuthenticationServiceServicer,
 )
 
-epoch = datetime.timestamp(datetime.utcnow() + timedelta(days=1))
+epoch: float = datetime.timestamp(datetime.now(timezone.utc) + timedelta(days=1))
 
 _payload = {
     "https://auth-token.qwak.ai/qwak-partner-id": "9",