frogml 1.2.24__py3-none-any.whl → 1.2.28__py3-none-any.whl

frogml/__init__.py

@@ -1,5 +1,5 @@
 __author__ = "jfrog"
-__version__ = "1.2.24"
+__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/_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/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/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/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/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/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.24.dist-info → frogml-1.2.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: frogml
-Version: 1.2.24
+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.24.dist-info → frogml-1.2.28.dist-info}/RECORD

@@ -1,4 +1,4 @@
-frogml/__init__.py,sha256=SYhABGZ4g5cE2oC884FNfK9iaaNnmOzfeua9kts4jlk,741
+frogml/__init__.py,sha256=82ta2BQl2e3AbEOMtmrDec89eOL9uy9NwlWqaiqf6q0,741
 frogml/_proto/jfml/hosting_gateway/v1/build_upload_url_pb2.py,sha256=pY7-QarLJWbL9uNmZ69RfE7IPVzwpVIhtd3A0wztSNY,1942
 frogml/_proto/jfml/hosting_gateway/v1/build_upload_url_pb2.pyi,sha256=505I4uUrCmv2hsUw2H5eT-nlkNOCQOWodpvEkH2fHIo,3073
 frogml/_proto/jfml/hosting_gateway/v1/build_upload_url_pb2_grpc.py,sha256=1oboBPFxaTEXt9Aw7EAj8gXHDCNMhZD2VXqocC9l_gk,159
@@ -12,7 +12,7 @@ frogml/_proto/jfml/model_version/v1/build_spec_pb2.py,sha256=S_pdnyFvTLnXNe_iRZ0
 frogml/_proto/jfml/model_version/v1/build_spec_pb2.pyi,sha256=P7We8OZGBi-_0g-s1p4hPwvqYE3ygaiZsqjYiBmJA2E,4821
 frogml/_proto/jfml/model_version/v1/build_spec_pb2_grpc.py,sha256=1oboBPFxaTEXt9Aw7EAj8gXHDCNMhZD2VXqocC9l_gk,159
 frogml/_proto/jfml/model_version/v1/model_repository_spec_pb2.py,sha256=C41E30HmYwfYtAwPUM9lJW_oWg6JH7u9NAQWN3DnMWI,1503
-frogml/_proto/jfml/model_version/v1/model_repository_spec_pb2.pyi,sha256=Wtd9aR04T4JrU6CJDlyn8WCo8N8MtiHv87RvpzA4gRk,1478
+frogml/_proto/jfml/model_version/v1/model_repository_spec_pb2.pyi,sha256=_Rr7sdDxsVjl0L4GReKMAaeUC_yZJ_OgvkNg81IrmWs,1660
 frogml/_proto/jfml/model_version/v1/model_repository_spec_pb2_grpc.py,sha256=1oboBPFxaTEXt9Aw7EAj8gXHDCNMhZD2VXqocC9l_gk,159
 frogml/_proto/jfml/model_version/v1/model_version_framework_pb2.py,sha256=ACFTNdlRZ1yHF1mV0ZxjE_rR-gWZxS8HB2maPUw59J0,2765
 frogml/_proto/jfml/model_version/v1/model_version_framework_pb2.pyi,sha256=Ov8O3lWPtc-KmGjpm3-It15IINzCVt2QXAC6JXNrupY,3725
@@ -702,7 +702,7 @@ frogml/core/clients/model_management/client.py,sha256=L3rUPfxRNA2s4KV5294QXkPCmi
 frogml/core/clients/model_version_manager/__init__.py,sha256=4Pnfzj4Egps48__dProdbSKQl5pNip0hGJd75w67BfY,46
 frogml/core/clients/model_version_manager/build_model_version_dto.py,sha256=N-W84WyKDiwr-lmcpLss0gOV3QK4EAcpv2lqv1TROos,1984
 frogml/core/clients/model_version_manager/build_model_version_request_mapper.py,sha256=BYK_nmfLF0o9QWTKfcOfsP5j1hmdu5RQkmsQ0ypO6rI,4760
-frogml/core/clients/model_version_manager/client.py,sha256=VMgOoZW8EoSwx3BZCtknbxlhwOob1Y3GH9XSj7bBg6Y,11314
+frogml/core/clients/model_version_manager/client.py,sha256=T3pJmjgkL8E0SPSGWZHXDVmEAs3Ow36p-nHAg-tjgxo,11108
 frogml/core/clients/model_version_manager/const.py,sha256=SBEi06KU-ntF6oxjTpSXbd9R72x_mm9cD9JhYQLXsMY,684
 frogml/core/clients/secret_service/__init__.py,sha256=TdQl1lgplXCKVHYSN4feRIAoonZ7XDz50zALjwVDcM4,40
 frogml/core/clients/secret_service/client.py,sha256=RDicLLGWIV1Ecm5A4F4TcQec5SHudTkdXG8eRilHJ8M,3657
@@ -1057,16 +1057,16 @@ frogml/sdk/model_version/transformers/initialize_model_transformer.py,sha256=7AT
 frogml/sdk/model_version/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 frogml/sdk/model_version/utils/dependencies_tools.py,sha256=Sdmbf3Nb_xlc8uY4fK8bvPOGwh7OtejdZd1m5POfsDU,6403
 frogml/sdk/model_version/utils/files_tools.py,sha256=9995FuZ5xMbN5Bm77BzDYU0cQ4nwCYYAl6goynJVvdI,11595
-frogml/sdk/model_version/utils/jml/customer_client.py,sha256=YNSPpAGH3VIv-Ese-ru31dksbLvbLbGV_6IrM4z7mOE,6167
+frogml/sdk/model_version/utils/jml/customer_client.py,sha256=a5S2CaRFiFSXmFsuFCmd7OO_bpweha-KcAHzcyjz1fA,5034
 frogml/sdk/model_version/utils/log_model_helper.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 frogml/sdk/model_version/utils/model_log_config.py,sha256=6Geo68s02zJc9pqqmEoOe8za5DU2ttvWBdKf8eXhvVY,12267
-frogml/sdk/model_version/utils/storage.py,sha256=BTAv5BrTLwWSIsEZTotA6TlS-opUgVICNma01kkfkJA,10438
+frogml/sdk/model_version/utils/storage.py,sha256=aVyixU-BygUTVFrxV4nMfA5AiSPCyuia8GL38YoJmiM,10255
 frogml/sdk/model_version/utils/storage_helper.py,sha256=fZLIjEAHVxhFXVk08z0pfFWFzOeJDZjLSVVnp3ZY9kw,374
 frogml/sdk/model_version/utils/validations.py,sha256=pGrhd5f5WeL5qit9CCG0Jlx21WY5M3V_psTD9tlcs7U,1203
 frogml/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 frogml/storage/_environment.py,sha256=zuzOJBtBwFaguwn_JkKjfhXStZoustgP30KzOP3mYv8,707
 frogml/storage/artifactory/__init__.py,sha256=C02rcm7kqsZBVA6c6Gztxamj96hn8Aj6BuzYWFRmWbQ,71
-frogml/storage/artifactory/_artifactory_api.py,sha256=26ktPpiMoVFPvVF_jzc3Y_3Q7X6jdcEQzjD63Mbu38E,12766
+frogml/storage/artifactory/_artifactory_api.py,sha256=MkK6ZZ5tJcj7xTk6OqMcfY2MEnFv7zO40Vdndo4ocUQ,12522
 frogml/storage/authentication/login/__init__.py,sha256=ch8UhQwh3o5ddyoJykQ0Bnog5-8qKHmeDpwqny8xMzM,46
 frogml/storage/authentication/login/_login_cli.py,sha256=ZSTIGdoiH2vsOJCqaN0DVwgMgKnV--7SnMkySIWMiks,7798
 frogml/storage/authentication/login/_login_command.py,sha256=4ib9UVMC-CmsMuJATd_l3luvUhRvzbIs35fZw2bA0Ms,2845
@@ -1081,7 +1081,7 @@ frogml/storage/base_storage.py,sha256=k9CAj9wlnlydxuVZKcC-IcW9GP0KdVoDNKUevemeaY
 frogml/storage/constants.py,sha256=9MxTEogYeHYn-6jE5AGBxVcHVX8N8a5eOwfRDGHEvGY,2268
 frogml/storage/exceptions/checksum_verification_error.py,sha256=t1muLRYvqza7Q4jo1mYHck9ZoDwlGE7WxcheAFAnIQs,159
 frogml/storage/exceptions/validation_error.py,sha256=_twu_xcL-O7D26qkskuuR-_NcnPPTADIUO9HGY4g0x0,156
-frogml/storage/frog_ml.py,sha256=hU5v9XrlDNNq_A203Pe6QLaiEP1srlSP_udQbWgXoE4,23750
+frogml/storage/frog_ml.py,sha256=s9rfedc3e2RYTflU2Vt59MnEIZvaPW4FwmD5R2PTHxs,23525
 frogml/storage/http/__init__.py,sha256=BOXGzjq1gJXlihldaZvMQNGJIdCy-UHWsk3u-bXEZnQ,36
 frogml/storage/http/http_client.py,sha256=tXegbonhMiyN0FzjTSqOeg5OBsFYBozkbMtRfZibTUM,2435
 frogml/storage/logging/__init__.py,sha256=JaBPWQQt3pjoLhUcZtgqPydGlKAWYpSvfPkt2z1Wi90,32
@@ -1150,6 +1150,6 @@ frogml_services_mock/mocks/utils/exception_handlers.py,sha256=k_8mez3cwjNjKE9yGQ
 frogml_services_mock/services_mock.py,sha256=y1_h189Ldu5MdVUW4nj-WMBtvUfkM_aKse7UfAb6Rxk,19419
 frogml_services_mock/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 frogml_services_mock/utils/service_utils.py,sha256=ZlB0CnB1J6oBn6_m7fQO2U8tKoboHdUa6ljjkRMYNXU,265
-frogml-1.2.24.dist-info/METADATA,sha256=lor0gL06kcVaM0GVKtB0FIf2CQz1sRCiwu9s95pgyrI,5599
-frogml-1.2.24.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-frogml-1.2.24.dist-info/RECORD,,
+frogml-1.2.28.dist-info/METADATA,sha256=WWtBNiKfWF8wRe_m94_O3KZhbM99DzKZiThZ5vQpt7w,5599
+frogml-1.2.28.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+frogml-1.2.28.dist-info/RECORD,,