frogml-core 0.0.73__tar.gz → 0.0.75__tar.gz

{frogml_core-0.0.73 → frogml_core-0.0.75}/PKG-INFO

@@ -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 → frogml_core-0.0.75}/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-0.0.73 → frogml_core-0.0.75}/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-0.0.73 → frogml_core-0.0.75}/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-0.0.73 → frogml_core-0.0.75}/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 → frogml_core-0.0.75}/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",

{frogml_core-0.0.73 → frogml_core-0.0.75}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "frogml-core"
-version = "0.0.73"
+version = "0.0.75"
 description = "frogml Core contains the necessary objects and communication tools for using the Jfrog ml Platform"
 authors = ["Jfrog"]
 readme = "README.md"
@@ -24,6 +24,7 @@ classifiers = [
     "Topic :: Scientific/Engineering :: Artificial Intelligence",
 ]
 license = "Apache-2.0"
+requires-poetry = "^2.1.1"
 
 [tool.poetry.urls]
 "Home page" = "https://www.jfrog.com/"
@@ -38,7 +39,6 @@ protobuf = [
 ]
 dependency-injector = ">=4.0"
 requests = "*"
-python-jose = "*"
 PyYAML = "*"
 filelock = "*"
 marshmallow-dataclass = "^8.5.8"
@@ -53,6 +53,7 @@ chevron = "0.14.0"
 dacite = "1.8.1"
 cachetools = "*"
 frogml-storage = ">=0.11.2"
+pyjwt = "*"
 
 
 [tool.poetry.group.dev.dependencies]