frogml-core 0.0.4__py3-none-any.whl → 0.0.5__py3-none-any.whl

frogml_core/__init__.py

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

frogml_core/clients/model_management/client.py

@@ -3,6 +3,7 @@ from typing import Optional
 import grpc
 from dependency_injector.wiring import Provide
 
+from frogml_core.utils.model_utils import get_model_id_from_model_name
 from frogml_proto.qwak.models.models_pb2 import (
     CreateModelRequest,
     DeleteModelRequest,
@@ -59,7 +60,7 @@ class ModelsManagementClient:
             return self._models_management_service.CreateModel(
                 CreateModelRequest(
                     model_spec=ModelSpec(
-                        model_named_id=model_name.lower().replace(" ", "-"),
+                        model_named_id=get_model_id_from_model_name(model_name),
                         display_name=model_name,
                         project_id=project_id,
                         model_description=model_description,

frogml_core/clients/model_version_manager/client.py

@@ -3,6 +3,7 @@ from platform import python_version
 from dependency_injector.wiring import Provide
 from grpc import RpcError
 
+from frogml_core.utils.model_utils import get_model_id_from_model_name
 from frogml_proto.jfml.model_version.v1.model_repository_spec_pb2 import (
     ModelRepositorySpec,
 )
@@ -33,7 +34,7 @@ class ModelVersionManagerClient:
     def __build_create_model_request(
         project_key: str,
         repository_key: str,
-        model_id: str,
+        model_name: str,
         model_version_name: str,
         model_version_framework: ModelVersionFramework,
         dry_run: bool,
@@ -44,7 +45,7 @@ class ModelVersionManagerClient:
                 repository_spec=ModelRepositorySpec(
                     project_key=project_key,
                     repository_key=repository_key,
-                    model_id=model_id,
+                    model_id=get_model_id_from_model_name(model_name),
                 ),
                 name=model_version_name,
                 framework=model_version_framework,
@@ -64,7 +65,7 @@ class ModelVersionManagerClient:
             create_model_request = self.__build_create_model_request(
                 project_key=project_key,
                 repository_key=repository_key,
-                model_id=model_name,
+                model_name=model_name,
                 model_version_name=model_version_name,
                 model_version_framework=model_version_framework,
                 dry_run=True,
@@ -90,7 +91,7 @@ class ModelVersionManagerClient:
             create_model_request = self.__build_create_model_request(
                 project_key=project_key,
                 repository_key=repository_key,
-                model_id=model_name,
+                model_name=model_name,
                 model_version_name=model_version_name,
                 model_version_framework=model_version_framework,
                 dry_run=False,

frogml_core/utils/model_utils.py

@@ -0,0 +1,2 @@
+def get_model_id_from_model_name(model_name: str) -> str:
+    return model_name.strip().lower().replace(" ", "_").replace("-", "_")

{frogml_core-0.0.4.dist-info → frogml_core-0.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: frogml-core
-Version: 0.0.4
+Version: 0.0.5
 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
@@ -12,8 +12,6 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Provides-Extra: feature-store
@@ -28,12 +26,12 @@ Requires-Dist: frogml-storage (>=0.9.0,<0.10.0)
 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)
-Requires-Dist: protobuf (>=3.10,<4) ; python_full_version >= "3.7.1" and python_version < "3.10"
+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 (>=2.10.1,<3.0.0)
 Requires-Dist: pyspark (==3.4.2) ; extra == "feature-store"
-Requires-Dist: python-jose
 Requires-Dist: python-json-logger (>=3.2.1,<4.0.0)
 Requires-Dist: requests
 Requires-Dist: retrying (==1.3.4)

{frogml_core-0.0.4.dist-info → frogml_core-0.0.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-frogml_core/__init__.py,sha256=FEH4fn3sgb5td_T6APitX5ZU7tYrNApGiJUwKXfuQP4,776
+frogml_core/__init__.py,sha256=gtjCUe_Qnnwk_i-GPq2WqAVkjn_BLGk8M042omH-oio,776
 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
@@ -71,9 +71,9 @@ frogml_core/clients/kube_deployment_captain/client.py,sha256=oz7VF37TSO0S07MqXOY
 frogml_core/clients/logging_client/__init__.py,sha256=1OCHnigQBYThBwGbxCreYA0BgP0HcuLFzNEWd3Yxh-c,34
 frogml_core/clients/logging_client/client.py,sha256=A7qQJWW54Ve7O0DuJX9gmSJlUQyRIKC0VmfGS6bUwjo,4950
 frogml_core/clients/model_management/__init__.py,sha256=vjWVP8MjmK4_A70WOgJqa6x24AeLK-ABjGJtogGzw9w,43
-frogml_core/clients/model_management/client.py,sha256=ZsElgiI2hH8eArLeN6Gm4mN8VojdPyCSmbCNUQspJD4,4500
+frogml_core/clients/model_management/client.py,sha256=rXnzcP3-pfXCVG0KlcCwbdeIJ1iFzV84JYtyNC8n-x8,4575
 frogml_core/clients/model_version_manager/__init__.py,sha256=4Pnfzj4Egps48__dProdbSKQl5pNip0hGJd75w67BfY,46
-frogml_core/clients/model_version_manager/client.py,sha256=HvoIEx3fFP4cLoEnmIqD3jwB1EXA4a3TvOuz43eXkeg,4038
+frogml_core/clients/model_version_manager/client.py,sha256=-QN6ibQ_wdkS_pUqcD_WfjSoroeGgCMFEXOcqOdndVo,4147
 frogml_core/clients/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 frogml_core/clients/project/client.py,sha256=VvnUk7mo-UkE9Gkj9jVkCPGTVx8qmuekMz7oH9Uzv2Y,2159
 frogml_core/clients/prompt_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -419,6 +419,7 @@ frogml_core/tools/logger/logging.yml,sha256=E3wtIVo7JV5DPP0EjT2Ang1zhdntW9s7uMVW
 frogml_core/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 frogml_core/utils/datetime_utils.py,sha256=3zK7PUrerMlwB7U6WeuYwMAclVMfPqBNZihNRyIVMs4,581
 frogml_core/utils/dict_utils.py,sha256=YsOSQeGpmrsm3CMnx2ZbqvzEcybk3m-0TCMXbBdBXaY,263
+frogml_core/utils/model_utils.py,sha256=fLdYIScmVUfChGGxOacH2mID00ZUOPtS4ewUimEDGhg,132
 frogml_core/utils/proto_utils.py,sha256=QXEOf-pmqRLaijqCVt4IHb7_b8bmG1_ghfgMmqzHrg0,1730
 frogml_core/vector_store/__init__.py,sha256=9gR2B5A1MXb2ks5VUzqrPASGpVTDuJs4uq7N7FNWOY4,120
 frogml_core/vector_store/client.py,sha256=mmchLHjR5aOZOLIz1eibmsoXSMHvcHjCtaWB24QZoAY,6067
@@ -967,7 +968,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=cmsDEcVjJsCU143oOAEfinShvzRw9I8mJAAEIa53SjI,1176
+frogml_services_mock/mocks/authentication_service.py,sha256=cyuH9XX8oicOz_GFoIgP62ru0NWxk7OiXQushfftBUc,1170
 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
@@ -1012,6 +1013,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.4.dist-info/METADATA,sha256=p-i36cxAoVFMZ9lytMKXYpNxNTJ-NP0y0UKLWH33dd4,2228
-frogml_core-0.0.4.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-frogml_core-0.0.4.dist-info/RECORD,,
+frogml_core-0.0.5.dist-info/METADATA,sha256=F0kOu8Pcq0VETo8XqWjePdCvQq21d3um34KbbfoDjvg,2105
+frogml_core-0.0.5.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+frogml_core-0.0.5.dist-info/RECORD,,

frogml_services_mock/mocks/authentication_service.py

@@ -1,6 +1,6 @@
 from datetime import datetime, timedelta
 
-from jose import jwt
+import jwt
 
 from frogml_proto.qwak.administration.v0.authentication.authentication_service_pb2 import (
     AuthenticateRequest,
@@ -23,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):