frogml-core 0.0.4__tar.gz → 0.0.6__tar.gz

{frogml_core-0.0.4 → frogml_core-0.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: frogml-core
-Version: 0.0.4
+Version: 0.0.6
 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 → frogml_core-0.0.6}/frogml_core/__init__.py

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

{frogml_core-0.0.4 → frogml_core-0.0.6}/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-0.0.4 → frogml_core-0.0.6}/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-0.0.6/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 → frogml_core-0.0.6}/frogml_proto/qwak/automation/v1/automation_pb2.py

@@ -18,7 +18,7 @@ from frogml_proto.qwak.automation.v1 import trigger_pb2 as qwak_dot_automation_d
 from frogml_proto.qwak.automation.v1 import notification_pb2 as qwak_dot_automation_dot_v1_dot_notification__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n#qwak/automation/v1/automation.proto\x12\x12qwak.automation.v1\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1fqwak/automation/v1/action.proto\x1a qwak/automation/v1/trigger.proto\x1a%qwak/automation/v1/notification.proto\"\xcc\x01\n\nAutomation\x12\x15\n\rautomation_id\x18\x01 \x01(\t\x12;\n\x0f\x61utomation_spec\x18\x02 \x01(\x0b\x32\".qwak.automation.v1.AutomationSpec\x12\x1b\n\x13qwak_environment_id\x18\x03 \x01(\t\x12\x39\n\x0c\x63reate_audit\x18\x04 \x01(\x0b\x32#.qwak.automation.v1.AutomationAudit\x12\x12\n\nis_deleted\x18\x05 \x01(\x08\"\xe3\x02\n\x0e\x41utomationSpec\x12\x10\n\x08model_id\x18\x02 \x01(\t\x12\x17\n\x0f\x61utomation_name\x18\x03 \x01(\t\x12,\n\x07trigger\x18\x04 \x01(\x0b\x32\x1b.qwak.automation.v1.Trigger\x12*\n\x06\x61\x63tion\x18\x05 \x01(\x0b\x32\x1a.qwak.automation.v1.Action\x12\x1e\n\x16\x61utomation_description\x18\x06 \x01(\t\x12\x12\n\nis_enabled\x18\x07 \x01(\x08\x12\x32\n\x08on_error\x18\x08 \x01(\x0b\x32 .qwak.automation.v1.Notification\x12\x34\n\non_success\x18\t \x01(\x0b\x32 .qwak.automation.v1.Notification\x12\x1b\n\x13\x65xecute_immediately\x18\n \x01(\x08\x12\x11\n\tis_sdk_v1\x18\x0b \x01(\x08\"L\n\x0f\x41utomationAudit\x12(\n\x04\x64\x61te\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x0f\n\x07user_id\x18\x02 \x01(\tB!\n\x1d\x63om.qwak.ai.automation.api.v1P\x01\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n#qwak/automation/v1/automation.proto\x12\x12qwak.automation.v1\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1fqwak/automation/v1/action.proto\x1a qwak/automation/v1/trigger.proto\x1a%qwak/automation/v1/notification.proto\"\xe4\x01\n\nAutomation\x12\x15\n\rautomation_id\x18\x01 \x01(\t\x12;\n\x0f\x61utomation_spec\x18\x02 \x01(\x0b\x32\".qwak.automation.v1.AutomationSpec\x12\x1b\n\x13qwak_environment_id\x18\x03 \x01(\t\x12\x39\n\x0c\x63reate_audit\x18\x04 \x01(\x0b\x32#.qwak.automation.v1.AutomationAudit\x12\x12\n\nis_deleted\x18\x05 \x01(\x08\x12\x16\n\x0ejfrog_token_id\x18\x06 \x01(\t\"\xe3\x02\n\x0e\x41utomationSpec\x12\x10\n\x08model_id\x18\x02 \x01(\t\x12\x17\n\x0f\x61utomation_name\x18\x03 \x01(\t\x12,\n\x07trigger\x18\x04 \x01(\x0b\x32\x1b.qwak.automation.v1.Trigger\x12*\n\x06\x61\x63tion\x18\x05 \x01(\x0b\x32\x1a.qwak.automation.v1.Action\x12\x1e\n\x16\x61utomation_description\x18\x06 \x01(\t\x12\x12\n\nis_enabled\x18\x07 \x01(\x08\x12\x32\n\x08on_error\x18\x08 \x01(\x0b\x32 .qwak.automation.v1.Notification\x12\x34\n\non_success\x18\t \x01(\x0b\x32 .qwak.automation.v1.Notification\x12\x1b\n\x13\x65xecute_immediately\x18\n \x01(\x08\x12\x11\n\tis_sdk_v1\x18\x0b \x01(\x08\"L\n\x0f\x41utomationAudit\x12(\n\x04\x64\x61te\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x0f\n\x07user_id\x18\x02 \x01(\tB!\n\x1d\x63om.qwak.ai.automation.api.v1P\x01\x62\x06proto3')
 
 
 
@@ -51,9 +51,9 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
   DESCRIPTOR._serialized_options = b'\n\035com.qwak.ai.automation.api.v1P\001'
   _AUTOMATION._serialized_start=199
-  _AUTOMATION._serialized_end=403
-  _AUTOMATIONSPEC._serialized_start=406
-  _AUTOMATIONSPEC._serialized_end=761
-  _AUTOMATIONAUDIT._serialized_start=763
-  _AUTOMATIONAUDIT._serialized_end=839
+  _AUTOMATION._serialized_end=427
+  _AUTOMATIONSPEC._serialized_start=430
+  _AUTOMATIONSPEC._serialized_end=785
+  _AUTOMATIONAUDIT._serialized_start=787
+  _AUTOMATIONAUDIT._serialized_end=863
 # @@protoc_insertion_point(module_scope)

{frogml_core-0.0.4 → frogml_core-0.0.6}/frogml_proto/qwak/automation/v1/automation_pb2.pyi

@@ -26,6 +26,7 @@ class Automation(google.protobuf.message.Message):
     QWAK_ENVIRONMENT_ID_FIELD_NUMBER: builtins.int
     CREATE_AUDIT_FIELD_NUMBER: builtins.int
     IS_DELETED_FIELD_NUMBER: builtins.int
+    JFROG_TOKEN_ID_FIELD_NUMBER: builtins.int
     automation_id: builtins.str
     """The automation ID"""
     @property
@@ -35,6 +36,7 @@ class Automation(google.protobuf.message.Message):
     @property
     def create_audit(self) -> global___AutomationAudit: ...
     is_deleted: builtins.bool
+    jfrog_token_id: builtins.str
     def __init__(
         self,
         *,
@@ -43,9 +45,10 @@ class Automation(google.protobuf.message.Message):
         qwak_environment_id: builtins.str = ...,
         create_audit: global___AutomationAudit | None = ...,
         is_deleted: builtins.bool = ...,
+        jfrog_token_id: builtins.str = ...,
     ) -> None: ...
     def HasField(self, field_name: typing_extensions.Literal["automation_spec", b"automation_spec", "create_audit", b"create_audit"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["automation_id", b"automation_id", "automation_spec", b"automation_spec", "create_audit", b"create_audit", "is_deleted", b"is_deleted", "qwak_environment_id", b"qwak_environment_id"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["automation_id", b"automation_id", "automation_spec", b"automation_spec", "create_audit", b"create_audit", "is_deleted", b"is_deleted", "jfrog_token_id", b"jfrog_token_id", "qwak_environment_id", b"qwak_environment_id"]) -> None: ...
 
 global___Automation = Automation
 

{frogml_core-0.0.4 → frogml_core-0.0.6}/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):

{frogml_core-0.0.4 → frogml_core-0.0.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "frogml-core"
-version = "0.0.4"
+version = "0.0.6"
 description = "frogml Core contains the necessary objects and communication tools for using the Jfrog ml Platform"
 authors = ["Jfrog"]
 readme = "README.md"
@@ -17,8 +17,6 @@ include = [
 ]
 classifiers = [
     "Operating System :: OS Independent",
-    "Programming Language :: Python :: 3.7",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
@@ -35,12 +33,11 @@ python = ">=3.9,<3.12"
 python-json-logger = "^3.2.1"
 grpcio = ">=1.57.0"
 protobuf = [
-    { version = ">=3.10,<4", python = ">=3.7.1,<3.10" },
+    { version = ">=3.10,<4", python = "<3.10" },
     { version = ">=4.21.6", python = ">=3.10" }
 ]
 dependency-injector = ">=4.0"
 requests = "*"
-python-jose = "*"
 PyYAML = "*"
 filelock = "*"
 marshmallow-dataclass = "^8.5.8"
@@ -56,6 +53,7 @@ dacite = "==1.8.1"
 typing-extensions = "^4.12.2"
 cachetools = "^5.5.1"
 frogml-storage = "^0.9.0"
+pyjwt = "^2.10.1"
 
 [tool.poetry.group.dev.dependencies]
 pyarrow = { version = ">=6.0.0" }
@@ -68,7 +66,7 @@ bandit = { version = "^1.7.5", extras = ["toml"] }
 coverage = "7.2.1"
 bump2version = "1.0.1"
 grpcio-tools = [
-    { version = ">=1.47.0", python = ">=3.7.1,<3.10" },
+    { version = ">=1.47.0", python = "<3.10" },
     { version = ">=1.56.2", python = ">=3.10" }
 ]
 mypy-protobuf = "^3.0.0"
@@ -78,14 +76,11 @@ testcontainers = "^3.6.1"
 sqlalchemy = "==1.4.22"
 sqlalchemy-utils = "<=0.36.5,>=0.36.2"
 trino = "^0.319.0"
-pandas = [
-    { version = "<1.4", python = ">=3.7.1,<3.8" },
-    { version = ">=1.4.0", python = ">=3.8,<3.12" }
-]
+pandas = "^2.0.1"
 numpy = "<2.0.0"
 tensorflow = "^2.18.0"
 imageio = "^2.16.0"
-QwakBentoML = { version = "0.13.1+26.g506a197", source = "qwak", python = ">=3.7.1,<3.10" }
+QwakBentoML = { version = "0.13.1+26.g506a197", source = "qwak", python = "<3.10" }
 croniter = "==1.4.1"
 
 # We just need it to force tensorflow to use a version greater than 0.32 which causes errors