qwak-core 0.4.247__py3-none-any.whl → 0.4.249__py3-none-any.whl

qwak/__init__.py

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

qwak/inner/model_loggers_utils.py

@@ -4,7 +4,6 @@ from typing import Optional
 
 import requests
 
-from _qwak_proto.qwak.builds.builds_orchestrator_service_pb2 import AuthenticationDetail
 from qwak.clients.model_management.client import ModelsManagementClient
 from qwak.exceptions import QwakException
 
@@ -69,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]:

qwak/inner/tool/auth.py

@@ -1,20 +1,17 @@
-import warnings
-from filelock import FileLock
-from qwak.inner.di_configuration.session import Session
+import configparser  # noqa E402
+import json  # noqa E402
 from abc import ABC, abstractmethod
 from typing import Optional
+
+import jwt
+import requests  # noqa E402
+from filelock import FileLock
 from frogml_storage.authentication._authentication_utils import get_credentials
 from frogml_storage.authentication.models._auth_config import AuthConfig
 
-warnings.filterwarnings(action="ignore", module=".*jose.*")
-
-import configparser  # noqa E402
-import json  # noqa E402
-
-import requests  # noqa E402
-from jose import jwt  # noqa E402
 from qwak.exceptions import QwakLoginException  # noqa E402
 from qwak.inner.const import QwakConstants  # noqa E402
+from qwak.inner.di_configuration.session import Session
 
 
 class BaseAuthClient(ABC):

qwak/model_loggers/artifact_logger.py

@@ -2,6 +2,9 @@ import urllib.request
 from typing import Optional
 
 from _qwak_proto.qwak.builds.build_url_pb2 import BuildVersioningTagsType
+from _qwak_proto.qwak.builds.builds_orchestrator_service_pb2 import (
+    GetBuildVersioningUploadURLResponse,
+)
 from qwak.clients.build_orchestrator.client import BuildOrchestratorClient
 from qwak.clients.file_versioning.client import FileVersioningManagementClient
 from qwak.exceptions import QwakException
@@ -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,
         )
 
 

qwak/model_loggers/data_logger.py

@@ -12,6 +12,9 @@ from _qwak_proto.qwak.builds.build_pb2 import (
     DataTableDefinition,
 )
 from _qwak_proto.qwak.builds.build_url_pb2 import BuildVersioningTagsType
+from _qwak_proto.qwak.builds.builds_orchestrator_service_pb2 import (
+    GetBuildVersioningUploadURLResponse,
+)
 from qwak.clients.build_orchestrator.client import BuildOrchestratorClient
 from qwak.clients.data_versioning.client import DataVersioningManagementClient
 from qwak.exceptions import QwakException
@@ -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(

{qwak_core-0.4.247.dist-info → qwak_core-0.4.249.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: qwak-core
-Version: 0.4.247
+Version: 0.4.249
 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
@@ -33,8 +33,8 @@ Requires-Dist: protobuf (>=3.10,<4) ; python_full_version >= "3.7.1" and python_
 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)

{qwak_core-0.4.247.dist-info → qwak_core-0.4.249.dist-info}/RECORD

@@ -582,7 +582,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=J_KtOzJioSVXYmoJWJVbRcqfxi3x8qL7akMQxB_RlhQ,587
+qwak/__init__.py,sha256=3a-SBWVj7mewpO7vIuqjIomXkbNiBf2CbHM4o6av-_8,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
@@ -831,13 +831,13 @@ qwak/inner/di_configuration/containers.py,sha256=1Vvs_p5laNcduDWH47dZpJJa2xu3v5P
 qwak/inner/di_configuration/session.py,sha256=Pwqapcu-0dsbb5dDn7ZGewVk4bYRN9sWk6ity72IDqY,452
 qwak/inner/instance_template/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qwak/inner/instance_template/verify_template_id.py,sha256=-c0Fh89XAfphKCpkurYaD-YyX3M3NkkpSLH4QsNPyko,1916
-qwak/inner/model_loggers_utils.py,sha256=egsXQMfBTqsHZxNJq8cTGrFCS_Gxobni6xEfNTeupBE,2933
+qwak/inner/model_loggers_utils.py,sha256=irVEuNYlMefINR8N5UiD9IcO8fzdcuc8jBbBzNzKC7M,2441
 qwak/inner/provider.py,sha256=3evQnyp0v0enpvGGDyaZziusO4BGi-U9j1sno8DAHo4,70
 qwak/inner/runtime_di/__init__.py,sha256=ylaHwo2Hlq3pmeziA0Ip87DMnkcuBffKKi0tTH7gYVI,281
 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=qlVakViyHDW3yzB90GTwLMSq5fc4ez0hryZuQM1JOV8,6339
 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
@@ -961,8 +961,8 @@ qwak/model/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 qwak/model/utils/extract_wrapped_function.py,sha256=uIle1zL8vbmeS3PGAuaNFLIUQAsvpuzk3LlH-Teba94,320
 qwak/model/utils/feature_utils.py,sha256=jB4pfmhqN2_B4THR7YADlCWbymU3cm_8u2RzTegrv_w,2389
 qwak/model_loggers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-qwak/model_loggers/artifact_logger.py,sha256=CZHTe-WO6Ov4WRYR6yVw5BuNSI0NFi-TUS117c4JQ1Y,2938
-qwak/model_loggers/data_logger.py,sha256=4eSfcsfnG_EvIRRX6Zj1tI-SfSOYUWCnR9naW7AzVT4,5472
+qwak/model_loggers/artifact_logger.py,sha256=E5A9MaGD4bDAWlj7cuc5f9Pzet9_p5jgkGuoZiVn1B0,3090
+qwak/model_loggers/data_logger.py,sha256=aTRnRwKmKUFZq9SRg4sY-b1yGDY2XB-pExlQ0WlcH0k,5629
 qwak/model_loggers/model_logger.py,sha256=WxKLEpfzDaRn3kanrI0kj4zqqKQrwT2sin1IS1WNEA8,852
 qwak/qwak_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qwak/qwak_client/batch_jobs/execution.py,sha256=L0CjS6BuEsPGJbQ4_yV75FsIx-jvdUg8DirYdH6ddFQ,1757
@@ -1012,7 +1012,7 @@ qwak_services_mock/mocks/alert_manager_service_api.py,sha256=X9VF5-zroUqo9SpeaG_
 qwak_services_mock/mocks/alert_registry_service_api.py,sha256=SZIOzQ-L9p7TIhziXUhpio8b4xtqTvAhR7c2JlMQXvc,2263
 qwak_services_mock/mocks/analytics_api.py,sha256=uzfObcytu9y_CYDT7ogilXJUOGLExQquJVL2kkATYE0,2129
 qwak_services_mock/mocks/audience_service_api.py,sha256=2PvXpzKBR-Dnu9Fmb70UJn-hNAlTCYQggpdiiBMM8Ik,2647
-qwak_services_mock/mocks/authentication_service.py,sha256=79A8hmYUsg4i7EwyGG54CidbANlp-ub4f716BbLCaJQ,1166
+qwak_services_mock/mocks/authentication_service.py,sha256=LLCO45fMHqsKBWdgat384n_P5dgNdCywjxNkQUJ1m98,1161
 qwak_services_mock/mocks/automation_management_service.py,sha256=C9rYKMy0hzOTaKTCrTkE5jTnPSenVkLV8DCptBKr02U,8211
 qwak_services_mock/mocks/autoscaling_service_api.py,sha256=YgucRD3ZjhxqttNVSF_HL7u3aDo55LdRSEE7q0fxp3M,1019
 qwak_services_mock/mocks/batch_job_manager_service.py,sha256=HeUZulDtfIlSm2h4cLdByR0voJjOy97m4_YWldg7pqQ,13129
@@ -1056,6 +1056,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.247.dist-info/METADATA,sha256=R1THTra1pOBCXCvAxwZkPPIov3RUG4-KODuL00yyLTk,2150
-qwak_core-0.4.247.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-qwak_core-0.4.247.dist-info/RECORD,,
+qwak_core-0.4.249.dist-info/METADATA,sha256=c-sR09h4sXZ90eCBRwY2NRnO1xyxJEbDaa5gXPt3axs,2144
+qwak_core-0.4.249.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+qwak_core-0.4.249.dist-info/RECORD,,

{qwak_core-0.4.247.dist-info → qwak_core-0.4.249.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

qwak_services_mock/mocks/authentication_service.py

@@ -1,5 +1,7 @@
 from datetime import datetime, timedelta
 
+import jwt
+
 from _qwak_proto.qwak.administration.v0.authentication.authentication_service_pb2 import (
     AuthenticateRequest,
     AuthenticateResponse,
@@ -7,7 +9,6 @@ from _qwak_proto.qwak.administration.v0.authentication.authentication_service_pb
 from _qwak_proto.qwak.administration.v0.authentication.authentication_service_pb2_grpc import (
     AuthenticationServiceServicer,
 )
-from jose import jwt
 
 epoch = datetime.timestamp(datetime.utcnow() + timedelta(days=1))
 
@@ -22,7 +23,7 @@ _payload = {
     "exp": epoch,
 }
 
-mock_jwt_token = jwt.encode(_payload, "secret", algorithm="HS256")
+mock_jwt_token = jwt.encode(_payload, key="secret", algorithm="HS256")
 
 
 class AuthenticationServiceMock(AuthenticationServiceServicer):