frogml 1.2.25__tar.gz → 1.2.28__tar.gz

{frogml-1.2.25 → frogml-1.2.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: frogml
-Version: 1.2.25
+Version: 1.2.28
 Summary: frogml contains the necessary objects and communication tools for using the JFrog ml Platform
 License: Apache-2.0
 Keywords: mlops,ml,deployment,serving,model

{frogml-1.2.25 → frogml-1.2.28}/frogml/__init__.py

@@ -1,5 +1,5 @@
 __author__ = "jfrog"
-__version__ = "1.2.25"
+__version__ = "1.2.28"
 
 from frogml.sdk.model.decorators.api import api_decorator as api
 from frogml.sdk.model_loggers.model_logger import load_model, log_model

{frogml-1.2.25 → frogml-1.2.28}/frogml/_proto/jfml/model_version/v1/model_repository_spec_pb2.pyi

@@ -19,7 +19,10 @@ class ModelRepositorySpec(google.protobuf.message.Message):
     MODEL_ID_FIELD_NUMBER: builtins.int
     MODEL_NAME_FIELD_NUMBER: builtins.int
     project_key: builtins.str
-    """JFrog project key"""
+    """JFrog project key
+    This is not used in the request of `CreateModelVersion`. The project key used there is
+    derived from the repository. The request value is being ignored in this endpoint.
+    """
     repository_key: builtins.str
     model_id: builtins.str
     model_name: builtins.str

{frogml-1.2.25 → frogml-1.2.28}/frogml/core/clients/model_version_manager/client.py

@@ -6,18 +6,8 @@ from dependency_injector.wiring import Provide
 from grpc import RpcError
 from typing_extensions import Self
 
-from frogml.core.clients.model_version_manager.build_model_version_dto import (
-    BuildConfigDTO,
-)
-from frogml.core.clients.model_version_manager.build_model_version_request_mapper import (
-    map_build_conf_to_build_spec,
-)
-from frogml.core.exceptions import FrogmlException
-from frogml.core.inner.di_configuration import FrogmlContainer
-from frogml.core.inner.tool.grpc.grpc_try_wrapping import grpc_try_catch_wrapper
-from frogml.core.utils.model_utils import get_model_id_from_model_name
-from frogml.core.utils.proto_utils import ProtoUtils
 from frogml._proto.jfml.model_version.v1.artifact_pb2 import Artifact as ArtifactProto
+from frogml._proto.jfml.model_version.v1.build_spec_pb2 import BuildSpec
 from frogml._proto.jfml.model_version.v1.model_repository_spec_pb2 import (
     ModelRepositorySpec,
 )
@@ -39,10 +29,19 @@ from frogml._proto.jfml.model_version.v1.model_version_pb2 import (
     ParameterValue,
     MetricValue,
 )
-from frogml._proto.jfml.model_version.v1.build_spec_pb2 import BuildSpec
+from frogml.core.clients.model_version_manager.build_model_version_dto import (
+    BuildConfigDTO,
+)
+from frogml.core.clients.model_version_manager.build_model_version_request_mapper import (
+    map_build_conf_to_build_spec,
+)
+from frogml.core.exceptions import FrogmlException
+from frogml.core.inner.di_configuration import FrogmlContainer
+from frogml.core.inner.tool.grpc.grpc_try_wrapping import grpc_try_catch_wrapper
+from frogml.core.utils.model_utils import get_model_id_from_model_name
+from frogml.core.utils.proto_utils import ProtoUtils
 from frogml.storage.models.entity_manifest import Artifact
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -87,7 +86,6 @@ class ModelVersionManagerClient:
 
     def __build_create_model_version_request(
         self,
-        project_key: str,
         repository_key: str,
         model_name: str,
         model_version_name: str,
@@ -107,7 +105,6 @@ class ModelVersionManagerClient:
             dry_run=dry_run,
             model_version=ModelVersionSpec(
                 repository_spec=ModelRepositorySpec(
-                    project_key=project_key,
                     repository_key=repository_key,
                     model_id=get_model_id_from_model_name(model_name),
                     model_name=model_name,
@@ -121,7 +118,6 @@ class ModelVersionManagerClient:
 
     def validate_create_model_version(
         self,
-        project_key: str,
         repository_key: str,
         model_name: str,
         model_version_name: str,
@@ -142,7 +138,6 @@ class ModelVersionManagerClient:
             )
 
             create_model_request = self.__build_create_model_version_request(
-                project_key=project_key,
                 repository_key=repository_key,
                 model_name=model_name,
                 model_version_name=model_version_name,
@@ -165,7 +160,6 @@ class ModelVersionManagerClient:
 
     def create_model_version(
         self,
-        project_key: str,
         repository_key: str,
         model_name: str,
         model_version_name: str,
@@ -186,7 +180,6 @@ class ModelVersionManagerClient:
             )
 
             create_model_request = self.__build_create_model_version_request(
-                project_key=project_key,
                 repository_key=repository_key,
                 model_name=model_name,
                 model_version_name=model_version_name,

{frogml-1.2.25 → frogml-1.2.28}/frogml/sdk/model_version/utils/jml/customer_client.py

@@ -3,23 +3,19 @@ import os
 import sys
 from typing import Optional, Dict, Any, TextIO, Union
 
-import requests
-from requests import Response
-
-from frogml.core.clients.administration.eco_system.client import EcosystemClient
-from frogml.storage.frog_ml import FrogMLStorage
-from frogml.storage.models.serialization_metadata import SerializationMetadata
-from frogml.storage.models.frogml_model_version import FrogMLModelVersion
-
 from typing_extensions import Self
 
 from frogml._proto.jfml.model_version.v1.model_version_framework_pb2 import (
     ModelVersionFramework,
 )
+from frogml.core.clients.administration.eco_system.client import EcosystemClient
 from frogml.core.clients.model_version_manager import ModelVersionManagerClient
 from frogml.core.exceptions import FrogmlException
 from frogml.sdk.model_version.constants import FROGML_LOG_LEVEL_ENVAR_NAME
+from frogml.storage.frog_ml import FrogMLStorage
+from frogml.storage.models.frogml_model_version import FrogMLModelVersion
 from frogml.storage.models.model_manifest import ModelManifest
+from frogml.storage.models.serialization_metadata import SerializationMetadata
 
 
 class JmlCustomerClient:
@@ -66,7 +62,6 @@ class JmlCustomerClient:
 
     def validate_model_version(
         self: Self,
-        project_key: str,
         repository: str,
         model_name: str,
         model_version: str,
@@ -74,7 +69,6 @@ class JmlCustomerClient:
     ):
         try:
             self.__model_version_manager_client.validate_create_model_version(
-                project_key=project_key,
                 repository_key=repository,
                 model_name=model_name,
                 model_version_name=model_version,
@@ -84,29 +78,6 @@ class JmlCustomerClient:
         except Exception as e:
             raise ValueError(str(e)) from e
 
-    def get_project_key(self: Self, repository_key: str) -> str:
-        self.__logger.info("Getting project key for repository %s", repository_key)
-        repo_configuration_response: Response = (
-            self.__ml_storage.get_repository_configuration(
-                repository_key=repository_key
-            )
-        )
-        try:
-            repo_configuration_response.raise_for_status()
-        except requests.exceptions.HTTPError as err:
-            # Attach the response body for better error logging
-            raise FrogmlException(f"{err}\nResponse body: {err.response.text}") from err
-
-        configuration_json: dict[str, object] = repo_configuration_response.json()
-        project_key: Optional[str] = configuration_json.get("projectKey")
-
-        if project_key is None:
-            raise ValueError(
-                f"Repository '{repository_key}' does not belong to any project"
-            )
-
-        return project_key
-
     def log_model_to_artifactory(
         self: Self,
         dependencies: Optional[list[str]],
@@ -131,7 +102,6 @@ class JmlCustomerClient:
 
     def register_model_version_in_jml(
         self: Self,
-        project_key: str,
         repository: str,
         model_name: str,
         model_version_name: str,
@@ -143,7 +113,6 @@ class JmlCustomerClient:
         """Register a model version in JFrog ML."""
         try:
             self.__model_version_manager_client.create_model_version(
-                project_key=project_key,
                 repository_key=repository,
                 model_name=model_name,
                 model_version_name=model_version_name,

{frogml-1.2.25 → frogml-1.2.28}/frogml/sdk/model_version/utils/storage.py

@@ -3,8 +3,23 @@ import os
 from platform import python_version
 from typing import Dict, Optional, Callable, cast, Any
 
+from frogml._proto.jfml.model_version.v1.model_version_framework_pb2 import (
+    ModelVersionFramework,
+    CatboostFramework,
+    HuggingFaceFramework,
+    OnnxFramework,
+    PythonPickleFramework,
+    PytorchFramework,
+    ScikitLearnFramework,
+)
 from frogml.core.exceptions import FrogmlException
 from frogml.sdk.model_version.constants import (
+    CATBOOST_SERIALIZED_TYPE,
+    HUGGINGFACE_FRAMEWORK_FORMAT,
+    ONNX_FRAMEWORK_FORMAT,
+    PYTHON_FRAMEWORK_FORMAT,
+    PYTORCH_FRAMEWORK_FORMAT,
+    SCIKIT_LEARN_FRAMEWORK_FORMAT,
     FROGML_LOG_LEVEL_ENVAR_NAME,
     ModelFramework,
     STORAGE_MODEL_ENTITY_TYPE,
@@ -28,23 +43,6 @@ from frogml.sdk.model_version.utils.validations import (
 from frogml.storage.frog_ml import SerializationMetadata, FrogMLStorage
 from frogml.storage.models.frogml_model_version import FrogMLModelVersion
 from frogml.storage.models.model_manifest import ModelManifest
-from frogml._proto.jfml.model_version.v1.model_version_framework_pb2 import (
-    ModelVersionFramework,
-    CatboostFramework,
-    HuggingFaceFramework,
-    OnnxFramework,
-    PythonPickleFramework,
-    PytorchFramework,
-    ScikitLearnFramework,
-)
-from frogml.sdk.model_version.constants import (
-    CATBOOST_SERIALIZED_TYPE,
-    HUGGINGFACE_FRAMEWORK_FORMAT,
-    ONNX_FRAMEWORK_FORMAT,
-    PYTHON_FRAMEWORK_FORMAT,
-    PYTORCH_FRAMEWORK_FORMAT,
-    SCIKIT_LEARN_FRAMEWORK_FORMAT,
-)
 
 _PYTHON_RUNTIME = "python"
 
@@ -128,9 +126,7 @@ def _log_model(config: ModelLogConfig) -> None:
     )
 
     if is_customer_exists_in_jml:
-        project_key: str = jml_customer_client.get_project_key(config.repository)
         jml_customer_client.validate_model_version(
-            project_key,
             config.repository,
             config.model_name,
             config.version,
@@ -170,7 +166,6 @@ def _log_model(config: ModelLogConfig) -> None:
 
     if is_customer_exists_in_jml:
         jml_customer_client.register_model_version_in_jml(
-            project_key,
             config.repository,
             config.model_name,
             config.version,

{frogml-1.2.25 → frogml-1.2.28}/frogml/storage/artifactory/_artifactory_api.py

@@ -280,12 +280,6 @@ class ArtifactoryApi:
             url=join_url(self.uri, "/api/security/encryptedPassword")
         )
 
-    def get_repository_configuration(self: Self, repository_key: str) -> Response:
-        url: str = modify_url(
-            self.uri, f"artifactory/api/v2/repositories/{repository_key}"
-        )
-        return self.http_client.get(url=url)
-
     def generate_access_token(self: Self) -> Response:
         """
         Generates an access token for authenticating with the JFrog Platform.

{frogml-1.2.25 → frogml-1.2.28}/frogml/storage/frog_ml.py

@@ -42,7 +42,6 @@ from frogml.storage.utils import (
     validate_not_folder_paths,
     validate_path_exists,
 )
-from typing_extensions import Self
 
 
 class FileType(Enum):
@@ -74,11 +73,6 @@ class FrogMLStorage(BaseStorage):
             max_workers=self.http_threads_count
         )
 
-    def get_repository_configuration(self: Self, repository_key: str):
-        return self.artifactory_api.get_repository_configuration(
-            repository_key=repository_key
-        )
-
     def upload_dataset_version(
         self,
         repository: str,

{frogml-1.2.25 → frogml-1.2.28}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "frogml"
-version = "1.2.25"
+version = "1.2.28"
 description = "frogml contains the necessary objects and communication tools for using the JFrog ml Platform"
 authors = ["JFrog"]
 readme = "README.md"