frogml-core 0.0.15__py3-none-any.whl → 0.0.17__py3-none-any.whl

frogml_core/__init__.py

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

frogml_core/clients/model_version_manager/client.py

@@ -1,11 +1,15 @@
 from platform import python_version
+from typing import List, Optional, Dict, Union, Tuple
 
 from dependency_injector.wiring import Provide
+from frogml_storage.entity_manifest import Artifact
 from grpc import RpcError
 
 from frogml_core.exceptions import FrogmlException
 from frogml_core.inner.di_configuration import FrogmlContainer
 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.model_repository_spec_pb2 import (
     ModelRepositorySpec,
 )
@@ -21,7 +25,12 @@ from frogml_proto.jfml.model_version.v1.model_version_manager_service_pb2 import
 from frogml_proto.jfml.model_version.v1.model_version_manager_service_pb2_grpc import (
     ModelVersionManagerServiceStub,
 )
-from frogml_proto.jfml.model_version.v1.model_version_pb2 import ModelVersionSpec
+from frogml_proto.jfml.model_version.v1.model_version_pb2 import (
+    ModelVersionSpec,
+    MlBomData,
+    ParameterValue,
+    MetricValue,
+)
 
 
 class ModelVersionManagerClient:
@@ -33,14 +42,54 @@ class ModelVersionManagerClient:
         self.__model_version_manager_stub = ModelVersionManagerServiceStub(grpc_channel)
 
     @staticmethod
+    def __build_mlbom_data_kwargs(
+        model_artifact: List[ArtifactProto],
+        code_artifacts: Optional[List[ArtifactProto]] = None,
+        dependency_artifacts: Optional[List[ArtifactProto]] = None,
+        metrics: Optional[Dict[str, str]] = None,
+        parameters: Optional[Dict[str, str]] = None,
+    ) -> Dict[
+        str, Union[List[ArtifactProto], Dict[str, Union[ParameterValue, MetricValue]]]
+    ]:
+        kwargs = {"model_artifact": model_artifact}
+
+        if dependency_artifacts:
+            kwargs["dependency_artifacts"] = dependency_artifacts
+
+        if code_artifacts:
+            kwargs["code_artifacts"] = code_artifacts
+
+        if parameters:
+            kwargs["parameters"] = {
+                key: ParameterValue(value=str(value))
+                for key, value in parameters.items()
+            }
+
+        if metrics:
+            kwargs["metrics"] = {
+                key: MetricValue(value=str(value)) for key, value in metrics.items()
+            }
+
+        return kwargs
+
     def __build_create_model_version_request(
+        self,
         project_key: str,
         repository_key: str,
         model_name: str,
         model_version_name: str,
         model_version_framework: ModelVersionFramework,
         dry_run: bool,
+        model_artifacts: List[ArtifactProto],
+        dependency_artifacts: Optional[List[ArtifactProto]] = None,
+        code_artifacts: Optional[List[ArtifactProto]] = None,
+        parameters: Optional[Dict[str, str]] = None,
+        metrics: Optional[Dict[str, str]] = None,
     ) -> CreateModelVersionRequest:
+        kwargs: dict = self.__build_mlbom_data_kwargs(
+            model_artifacts, code_artifacts, dependency_artifacts, metrics, parameters
+        )
+
         return CreateModelVersionRequest(
             dry_run=dry_run,
             model_version=ModelVersionSpec(
@@ -54,6 +103,7 @@ class ModelVersionManagerClient:
                 framework=model_version_framework,
                 python_version=python_version(),
             ),
+            ml_bom_data=MlBomData(**kwargs),
         )
 
     def validate_create_model_version(
@@ -63,8 +113,21 @@ class ModelVersionManagerClient:
         model_name: str,
         model_version_name: str,
         model_version_framework: ModelVersionFramework,
+        model_artifact: List[Artifact],
+        dependency_artifacts: Optional[List[Artifact]] = None,
+        code_artifacts: Optional[List[Artifact]] = None,
+        parameters: Optional[Dict[str, str]] = None,
+        metrics: Optional[Dict[str, str]] = None,
     ):
         try:
+            (
+                code_artifacts_proto,
+                dependency_artifacts_proto,
+                model_artifact_proto,
+            ) = self.convert_artifacts(
+                model_artifact, dependency_artifacts, code_artifacts
+            )
+
             create_model_request = self.__build_create_model_version_request(
                 project_key=project_key,
                 repository_key=repository_key,
@@ -72,6 +135,11 @@ class ModelVersionManagerClient:
                 model_version_name=model_version_name,
                 model_version_framework=model_version_framework,
                 dry_run=True,
+                model_artifacts=model_artifact_proto,
+                dependency_artifacts=dependency_artifacts_proto,
+                code_artifacts=code_artifacts_proto,
+                parameters=parameters,
+                metrics=metrics,
             )
             self.__model_version_manager_stub.CreateModelVersion(create_model_request)
         except RpcError as e:
@@ -89,8 +157,21 @@ class ModelVersionManagerClient:
         model_name: str,
         model_version_name: str,
         model_version_framework: ModelVersionFramework,
+        model_artifact: List[Artifact],
+        dependency_artifacts: Optional[List[Artifact]] = None,
+        code_artifacts: Optional[List[Artifact]] = None,
+        parameters: Optional[Dict[str, str]] = None,
+        metrics: Optional[Dict[str, str]] = None,
     ) -> CreateModelVersionResponse:
         try:
+            (
+                code_artifacts_proto,
+                dependency_artifacts_proto,
+                model_artifact_proto,
+            ) = self.convert_artifacts(
+                model_artifact, dependency_artifacts, code_artifacts
+            )
+
             create_model_request = self.__build_create_model_version_request(
                 project_key=project_key,
                 repository_key=repository_key,
@@ -98,6 +179,11 @@ class ModelVersionManagerClient:
                 model_version_name=model_version_name,
                 model_version_framework=model_version_framework,
                 dry_run=False,
+                model_artifacts=model_artifact_proto,
+                dependency_artifacts=dependency_artifacts_proto,
+                code_artifacts=code_artifacts_proto,
+                parameters=parameters,
+                metrics=metrics,
             )
             create_model_version_response: CreateModelVersionResponse = (
                 self.__model_version_manager_stub.CreateModelVersion(
@@ -114,6 +200,31 @@ class ModelVersionManagerClient:
             message = f"Failed to validate model version, details [{e}]"
             raise FrogmlException(message)
 
+    @staticmethod
+    def convert_artifacts(
+        model_artifact: List[Artifact],
+        dependency_artifacts: Optional[List[Artifact]] = None,
+        code_artifacts: Optional[List[Artifact]] = None,
+    ) -> Tuple[
+        Optional[List[ArtifactProto]],
+        Optional[List[ArtifactProto]],
+        List[ArtifactProto],
+    ]:
+        model_artifact_proto: List[
+            ArtifactProto
+        ] = ProtoUtils.convert_artifacts_to_artifacts_proto(model_artifact)
+        dependency_artifacts_proto = (
+            ProtoUtils.convert_artifacts_to_artifacts_proto(dependency_artifacts)
+            if dependency_artifacts
+            else None
+        )
+        code_artifacts_proto = (
+            ProtoUtils.convert_artifacts_to_artifacts_proto(code_artifacts)
+            if code_artifacts
+            else None
+        )
+        return code_artifacts_proto, dependency_artifacts_proto, model_artifact_proto
+
     def get_mlbom_by_model_version_id(
         self, model_version_id: str
     ) -> GetMlBomModelVersionByIdResponse:

frogml_core/utils/proto_utils.py

@@ -1,3 +1,11 @@
+from typing import List
+
+from frogml_storage.entity_manifest import Artifact
+
+from frogml_proto.jfml.model_version.v1.artifact_pb2 import (
+    Artifact as ArtifactProto,
+    Checksums as ChecksumsProto,
+)
 from frogml_proto.jfml.model_version.v1.model_version_framework_pb2 import (
     ModelVersionFramework,
     CatboostFramework,
@@ -40,3 +48,16 @@ class ProtoUtils:
             raise ValueError(f"Format {serialization_format} is not supported yet")
 
         return ModelVersionFramework(**framework_to_define)
+
+    @staticmethod
+    def convert_artifacts_to_artifacts_proto(
+        artifacts: List[Artifact],
+    ) -> List[ArtifactProto]:
+        return [
+            ArtifactProto(
+                artifact_path=artifact.artifact_path,
+                size=artifact.size,
+                checksums=ChecksumsProto(sha2=artifact.checksums.sha2),
+            )
+            for artifact in artifacts
+        ]

{frogml_core-0.0.15.dist-info → frogml_core-0.0.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: frogml-core
-Version: 0.0.15
+Version: 0.0.17
 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

{frogml_core-0.0.15.dist-info → frogml_core-0.0.17.dist-info}/RECORD

@@ -1,4 +1,4 @@
-frogml_core/__init__.py,sha256=ZqgsBMXf6U8w8MIcJMpgGVK6mD5QvOYQlrJAdEjokOk,777
+frogml_core/__init__.py,sha256=BKbXlzCDAHp1YE0_mvZtBo3GU34A8lkBwj9p0IIVHKI,777
 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
@@ -73,7 +73,7 @@ frogml_core/clients/logging_client/client.py,sha256=A7qQJWW54Ve7O0DuJX9gmSJlUQyR
 frogml_core/clients/model_management/__init__.py,sha256=vjWVP8MjmK4_A70WOgJqa6x24AeLK-ABjGJtogGzw9w,43
 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=MKw3ek_dwvm6AhjCaAWtm_s_N3LueN9-Rer4P-ItN9Y,5194
+frogml_core/clients/model_version_manager/client.py,sha256=WeU9XXLu5K0ViS-2YeENq121qV4ESXmI6pzc_K8QkvM,9457
 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
@@ -420,7 +420,7 @@ frogml_core/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 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=p0ry5k7iwNT6btEdSBedcfvAKRBmC5X5oKmUz27_E6k,1779
+frogml_core/utils/proto_utils.py,sha256=5kQAIxuzhk2_AB_enOD8kpLpIeruFjEGGSafnnt1fc8,2383
 frogml_core/vector_store/__init__.py,sha256=9gR2B5A1MXb2ks5VUzqrPASGpVTDuJs4uq7N7FNWOY4,120
 frogml_core/vector_store/client.py,sha256=mmchLHjR5aOZOLIz1eibmsoXSMHvcHjCtaWB24QZoAY,6067
 frogml_core/vector_store/collection.py,sha256=KKeEww8iogmHdfEeqgTHqIV9PizeiUl1coWwHJY8Glc,17150
@@ -1019,6 +1019,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.15.dist-info/METADATA,sha256=5ewZ02PpCVLqEtsJ2PDKj-jJXLRx99JRBnH8AvPkfA4,2099
-frogml_core-0.0.15.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-frogml_core-0.0.15.dist-info/RECORD,,
+frogml_core-0.0.17.dist-info/METADATA,sha256=1GPZDOPCEU2tNmyV0MP88shHnWvenLdbQJM9vEqWvlI,2099
+frogml_core-0.0.17.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+frogml_core-0.0.17.dist-info/RECORD,,