frogml-core 0.0.100__tar.gz → 0.0.102__tar.gz

{frogml_core-0.0.100 → frogml_core-0.0.102}/PKG-INFO

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

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

{frogml_core-0.0.100 → frogml_core-0.0.102}/frogml_core/clients/analytics/client.py

@@ -1,8 +1,11 @@
 from datetime import timedelta
 from time import sleep, time
+from typing import Optional
 
-from dependency_injector.wiring import Provide
-
+import grpc
+from frogml_core.clients.location_discovery import LocationDiscoveryClient
+from frogml_core.inner.di_configuration import FrogmlContainer
+from frogml_core.inner.tool.grpc.grpc_tools import create_grpc_channel
 from frogml_proto.qwak.analytics.analytics_pb2 import (
     QueryResultDownloadURLParams,
     QueryStatus,
@@ -16,7 +19,6 @@ from frogml_proto.qwak.analytics.analytics_service_pb2 import (
 from frogml_proto.qwak.analytics.analytics_service_pb2_grpc import (
     AnalyticsQueryServiceStub,
 )
-from frogml_core.inner.di_configuration import FrogmlContainer
 
 
 class AnalyticsEngineError(RuntimeError):
@@ -27,8 +29,10 @@ class AnalyticsEngineError(RuntimeError):
 
 
 class AnalyticsEngineClient:
-    def __init__(self, grpc_channel=Provide[FrogmlContainer.core_grpc_channel]):
-        self.grpc_client = AnalyticsQueryServiceStub(grpc_channel)
+    def __init__(
+        self, grpc_channel: Optional[FrogmlContainer.core_grpc_channel] = None
+    ):
+        self.grpc_client = self._create_grpc_client(grpc_channel)
 
     def get_analytics_data(self, query: str, timeout: timedelta = None) -> str:
         """
@@ -80,3 +84,25 @@ class AnalyticsEngineClient:
         request = GetQueryResultDownloadURLRequest(params=request_params)
         response = self.grpc_client.GetQueryResultDownloadURL(request)
         return response.download_url
+
+    def _create_grpc_client(
+        self, grpc_channel: Optional[grpc.Channel] = None
+    ) -> AnalyticsQueryServiceStub:
+        if grpc_channel:
+            return AnalyticsQueryServiceStub(grpc_channel)
+
+        channel = create_grpc_channel(
+            url=self._get_analytics_engine_url(),
+            status_for_retry=(
+                grpc.StatusCode.UNAVAILABLE,
+                grpc.StatusCode.CANCELLED,
+            ),
+        )
+        return AnalyticsQueryServiceStub(channel)
+
+    @staticmethod
+    def _get_analytics_engine_url() -> str:
+        """
+        Fetches the analytics engine service URL from the LocationDiscoveryService.
+        """
+        return LocationDiscoveryClient().get_analytics_engine().service_url

{frogml_core-0.0.100 → frogml_core-0.0.102}/frogml_proto/jfml/model_version/v1/model_version_manager_service_pb2.py

@@ -17,7 +17,7 @@ from frogml_proto.jfml.model_version.v1 import model_repository_spec_pb2 as jfml
 from frogml_proto.jfml.model_version.v1 import build_spec_pb2 as jfml_dot_model__version_dot_v1_dot_build__spec__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n9jfml/model_version/v1/model_version_manager_service.proto\x12\x15jfml.model_version.v1\x1a)jfml/model_version/v1/model_version.proto\x1a\x31jfml/model_version/v1/model_repository_spec.proto\x1a&jfml/model_version/v1/build_spec.proto\"\xa3\x01\n\x19\x43reateModelVersionRequest\x12\x0f\n\x07\x64ry_run\x18\x01 \x01(\x08\x12>\n\rmodel_version\x18\x02 \x01(\x0b\x32\'.jfml.model_version.v1.ModelVersionSpec\x12\x35\n\x0bml_bom_data\x18\x03 \x01(\x0b\x32 .jfml.model_version.v1.MlBomData\"X\n\x1a\x43reateModelVersionResponse\x12:\n\rmodel_version\x18\x01 \x01(\x0b\x32#.jfml.model_version.v1.ModelVersion\"6\n\x1aGetModelVersionByIdRequest\x12\x18\n\x10model_version_id\x18\x01 \x01(\t\"Y\n\x1bGetModelVersionByIdResponse\x12:\n\rmodel_version\x18\x01 \x01(\x0b\x32#.jfml.model_version.v1.ModelVersion\"L\n\x1cGetModelVersionByNameRequest\x12\x10\n\x08model_id\x18\x01 \x01(\t\x12\x1a\n\x12model_version_name\x18\x02 \x01(\t\"[\n\x1dGetModelVersionByNameResponse\x12:\n\rmodel_version\x18\x01 \x01(\x0b\x32#.jfml.model_version.v1.ModelVersion\")\n\x15InitPaginationRequest\x12\x10\n\x08model_id\x18\x01 \x01(\t\"E\n\x16InitPaginationResponse\x12\x14\n\x0crecord_count\x18\x01 \x01(\x03\x12\x15\n\rmax_record_id\x18\x02 \x01(\x03\"\x9e\x01\n\x18ListModelVersionsRequest\x12\x43\n\x0frepository_spec\x18\x01 \x01(\x0b\x32*.jfml.model_version.v1.ModelRepositorySpec\x12\x11\n\tpage_size\x18\x02 \x01(\x05\x12\x13\n\x0bpage_number\x18\x03 \x01(\x05\x12\x15\n\rmax_record_id\x18\x04 \x01(\x03\"X\n\x19ListModelVersionsResponse\x12;\n\x0emodel_versions\x18\x01 \x03(\x0b\x32#.jfml.model_version.v1.ModelVersion\"9\n\x1d\x44\x65leteModelVersionByIdRequest\x12\x18\n\x10model_version_id\x18\x01 \x01(\t\" \n\x1e\x44\x65leteModelVersionByIdResponse\"\xd8\x01\n!PromoteModelVersionToBuildRequest\x12\x45\n\x12model_version_spec\x18\x01 \x01(\x0b\x32\'.jfml.model_version.v1.ModelVersionSpecH\x00\x12\x1a\n\x10model_version_id\x18\x02 \x01(\tH\x00\x12\x34\n\nbuild_spec\x18\x03 \x01(\x0b\x32 .jfml.model_version.v1.BuildSpecB\x1a\n\x18model_version_identifier\"6\n\"PromoteModelVersionToBuildResponse\x12\x10\n\x08\x62uild_id\x18\x01 \x01(\t\";\n\x1fGetMlBomModelVersionByIdRequest\x12\x18\n\x10model_version_id\x18\x01 \x01(\t\"?\n GetMlBomModelVersionByIdResponse\x12\x1b\n\x13mlbom_model_version\x18\x01 \x01(\t2\xab\x08\n\x1aModelVersionManagerService\x12y\n\x12\x43reateModelVersion\x12\x30.jfml.model_version.v1.CreateModelVersionRequest\x1a\x31.jfml.model_version.v1.CreateModelVersionResponse\x12|\n\x13GetModelVersionById\x12\x31.jfml.model_version.v1.GetModelVersionByIdRequest\x1a\x32.jfml.model_version.v1.GetModelVersionByIdResponse\x12\x82\x01\n\x15GetModelVersionByName\x12\x33.jfml.model_version.v1.GetModelVersionByNameRequest\x1a\x34.jfml.model_version.v1.GetModelVersionByNameResponse\x12m\n\x0eInitPagination\x12,.jfml.model_version.v1.InitPaginationRequest\x1a-.jfml.model_version.v1.InitPaginationResponse\x12v\n\x11ListModelVersions\x12/.jfml.model_version.v1.ListModelVersionsRequest\x1a\x30.jfml.model_version.v1.ListModelVersionsResponse\x12\x85\x01\n\x16\x44\x65leteModelVersionById\x12\x34.jfml.model_version.v1.DeleteModelVersionByIdRequest\x1a\x35.jfml.model_version.v1.DeleteModelVersionByIdResponse\x12\x91\x01\n\x1aPromoteModelVersionToBuild\x12\x38.jfml.model_version.v1.PromoteModelVersionToBuildRequest\x1a\x39.jfml.model_version.v1.PromoteModelVersionToBuildResponse\x12\x8b\x01\n\x18GetMlBomModelVersionById\x12\x36.jfml.model_version.v1.GetMlBomModelVersionByIdRequest\x1a\x37.jfml.model_version.v1.GetMlBomModelVersionByIdResponseB%\n!com.jfrog.ml.model_version.api.v1P\x01\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n9jfml/model_version/v1/model_version_manager_service.proto\x12\x15jfml.model_version.v1\x1a)jfml/model_version/v1/model_version.proto\x1a\x31jfml/model_version/v1/model_repository_spec.proto\x1a&jfml/model_version/v1/build_spec.proto\"\xa3\x01\n\x19\x43reateModelVersionRequest\x12\x0f\n\x07\x64ry_run\x18\x01 \x01(\x08\x12>\n\rmodel_version\x18\x02 \x01(\x0b\x32\'.jfml.model_version.v1.ModelVersionSpec\x12\x35\n\x0bml_bom_data\x18\x03 \x01(\x0b\x32 .jfml.model_version.v1.MlBomData\"X\n\x1a\x43reateModelVersionResponse\x12:\n\rmodel_version\x18\x01 \x01(\x0b\x32#.jfml.model_version.v1.ModelVersion\"6\n\x1aGetModelVersionByIdRequest\x12\x18\n\x10model_version_id\x18\x01 \x01(\t\"Y\n\x1bGetModelVersionByIdResponse\x12:\n\rmodel_version\x18\x01 \x01(\x0b\x32#.jfml.model_version.v1.ModelVersion\"L\n\x1cGetModelVersionByNameRequest\x12\x10\n\x08model_id\x18\x01 \x01(\t\x12\x1a\n\x12model_version_name\x18\x02 \x01(\t\"[\n\x1dGetModelVersionByNameResponse\x12:\n\rmodel_version\x18\x01 \x01(\x0b\x32#.jfml.model_version.v1.ModelVersion\")\n\x15InitPaginationRequest\x12\x10\n\x08model_id\x18\x01 \x01(\t\"E\n\x16InitPaginationResponse\x12\x14\n\x0crecord_count\x18\x01 \x01(\x03\x12\x15\n\rmax_record_id\x18\x02 \x01(\x03\"\x9e\x01\n\x18ListModelVersionsRequest\x12\x43\n\x0frepository_spec\x18\x01 \x01(\x0b\x32*.jfml.model_version.v1.ModelRepositorySpec\x12\x11\n\tpage_size\x18\x02 \x01(\x05\x12\x13\n\x0bpage_number\x18\x03 \x01(\x05\x12\x15\n\rmax_record_id\x18\x04 \x01(\x03\"X\n\x19ListModelVersionsResponse\x12;\n\x0emodel_versions\x18\x01 \x03(\x0b\x32#.jfml.model_version.v1.ModelVersion\"n\n\x1a\x44\x65leteModelVersionsRequest\x12P\n\x19model_version_identifiers\x18\x01 \x03(\x0b\x32-.jfml.model_version.v1.ModelVersionIdentifier\"\x1d\n\x1b\x44\x65leteModelVersionsResponse\"\xd8\x01\n!PromoteModelVersionToBuildRequest\x12\x45\n\x12model_version_spec\x18\x01 \x01(\x0b\x32\'.jfml.model_version.v1.ModelVersionSpecH\x00\x12\x1a\n\x10model_version_id\x18\x02 \x01(\tH\x00\x12\x34\n\nbuild_spec\x18\x03 \x01(\x0b\x32 .jfml.model_version.v1.BuildSpecB\x1a\n\x18model_version_identifier\"6\n\"PromoteModelVersionToBuildResponse\x12\x10\n\x08\x62uild_id\x18\x01 \x01(\t\";\n\x1fGetMlBomModelVersionByIdRequest\x12\x18\n\x10model_version_id\x18\x01 \x01(\t\"?\n GetMlBomModelVersionByIdResponse\x12\x1b\n\x13mlbom_model_version\x18\x01 \x01(\t2\xa1\x08\n\x1aModelVersionManagerService\x12y\n\x12\x43reateModelVersion\x12\x30.jfml.model_version.v1.CreateModelVersionRequest\x1a\x31.jfml.model_version.v1.CreateModelVersionResponse\x12|\n\x13GetModelVersionById\x12\x31.jfml.model_version.v1.GetModelVersionByIdRequest\x1a\x32.jfml.model_version.v1.GetModelVersionByIdResponse\x12\x82\x01\n\x15GetModelVersionByName\x12\x33.jfml.model_version.v1.GetModelVersionByNameRequest\x1a\x34.jfml.model_version.v1.GetModelVersionByNameResponse\x12m\n\x0eInitPagination\x12,.jfml.model_version.v1.InitPaginationRequest\x1a-.jfml.model_version.v1.InitPaginationResponse\x12v\n\x11ListModelVersions\x12/.jfml.model_version.v1.ListModelVersionsRequest\x1a\x30.jfml.model_version.v1.ListModelVersionsResponse\x12|\n\x13\x44\x65leteModelVersions\x12\x31.jfml.model_version.v1.DeleteModelVersionsRequest\x1a\x32.jfml.model_version.v1.DeleteModelVersionsResponse\x12\x91\x01\n\x1aPromoteModelVersionToBuild\x12\x38.jfml.model_version.v1.PromoteModelVersionToBuildRequest\x1a\x39.jfml.model_version.v1.PromoteModelVersionToBuildResponse\x12\x8b\x01\n\x18GetMlBomModelVersionById\x12\x36.jfml.model_version.v1.GetMlBomModelVersionByIdRequest\x1a\x37.jfml.model_version.v1.GetMlBomModelVersionByIdResponseB%\n!com.jfrog.ml.model_version.api.v1P\x01\x62\x06proto3')
 
 
 
@@ -31,8 +31,8 @@ _INITPAGINATIONREQUEST = DESCRIPTOR.message_types_by_name['InitPaginationRequest
 _INITPAGINATIONRESPONSE = DESCRIPTOR.message_types_by_name['InitPaginationResponse']
 _LISTMODELVERSIONSREQUEST = DESCRIPTOR.message_types_by_name['ListModelVersionsRequest']
 _LISTMODELVERSIONSRESPONSE = DESCRIPTOR.message_types_by_name['ListModelVersionsResponse']
-_DELETEMODELVERSIONBYIDREQUEST = DESCRIPTOR.message_types_by_name['DeleteModelVersionByIdRequest']
-_DELETEMODELVERSIONBYIDRESPONSE = DESCRIPTOR.message_types_by_name['DeleteModelVersionByIdResponse']
+_DELETEMODELVERSIONSREQUEST = DESCRIPTOR.message_types_by_name['DeleteModelVersionsRequest']
+_DELETEMODELVERSIONSRESPONSE = DESCRIPTOR.message_types_by_name['DeleteModelVersionsResponse']
 _PROMOTEMODELVERSIONTOBUILDREQUEST = DESCRIPTOR.message_types_by_name['PromoteModelVersionToBuildRequest']
 _PROMOTEMODELVERSIONTOBUILDRESPONSE = DESCRIPTOR.message_types_by_name['PromoteModelVersionToBuildResponse']
 _GETMLBOMMODELVERSIONBYIDREQUEST = DESCRIPTOR.message_types_by_name['GetMlBomModelVersionByIdRequest']
@@ -107,19 +107,19 @@ ListModelVersionsResponse = _reflection.GeneratedProtocolMessageType('ListModelV
   })
 _sym_db.RegisterMessage(ListModelVersionsResponse)
 
-DeleteModelVersionByIdRequest = _reflection.GeneratedProtocolMessageType('DeleteModelVersionByIdRequest', (_message.Message,), {
-  'DESCRIPTOR' : _DELETEMODELVERSIONBYIDREQUEST,
+DeleteModelVersionsRequest = _reflection.GeneratedProtocolMessageType('DeleteModelVersionsRequest', (_message.Message,), {
+  'DESCRIPTOR' : _DELETEMODELVERSIONSREQUEST,
   '__module__' : 'jfml.model_version.v1.model_version_manager_service_pb2'
-  # @@protoc_insertion_point(class_scope:jfml.model_version.v1.DeleteModelVersionByIdRequest)
+  # @@protoc_insertion_point(class_scope:jfml.model_version.v1.DeleteModelVersionsRequest)
   })
-_sym_db.RegisterMessage(DeleteModelVersionByIdRequest)
+_sym_db.RegisterMessage(DeleteModelVersionsRequest)
 
-DeleteModelVersionByIdResponse = _reflection.GeneratedProtocolMessageType('DeleteModelVersionByIdResponse', (_message.Message,), {
-  'DESCRIPTOR' : _DELETEMODELVERSIONBYIDRESPONSE,
+DeleteModelVersionsResponse = _reflection.GeneratedProtocolMessageType('DeleteModelVersionsResponse', (_message.Message,), {
+  'DESCRIPTOR' : _DELETEMODELVERSIONSRESPONSE,
   '__module__' : 'jfml.model_version.v1.model_version_manager_service_pb2'
-  # @@protoc_insertion_point(class_scope:jfml.model_version.v1.DeleteModelVersionByIdResponse)
+  # @@protoc_insertion_point(class_scope:jfml.model_version.v1.DeleteModelVersionsResponse)
   })
-_sym_db.RegisterMessage(DeleteModelVersionByIdResponse)
+_sym_db.RegisterMessage(DeleteModelVersionsResponse)
 
 PromoteModelVersionToBuildRequest = _reflection.GeneratedProtocolMessageType('PromoteModelVersionToBuildRequest', (_message.Message,), {
   'DESCRIPTOR' : _PROMOTEMODELVERSIONTOBUILDREQUEST,
@@ -174,18 +174,18 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _LISTMODELVERSIONSREQUEST._serialized_end=1065
   _LISTMODELVERSIONSRESPONSE._serialized_start=1067
   _LISTMODELVERSIONSRESPONSE._serialized_end=1155
-  _DELETEMODELVERSIONBYIDREQUEST._serialized_start=1157
-  _DELETEMODELVERSIONBYIDREQUEST._serialized_end=1214
-  _DELETEMODELVERSIONBYIDRESPONSE._serialized_start=1216
-  _DELETEMODELVERSIONBYIDRESPONSE._serialized_end=1248
-  _PROMOTEMODELVERSIONTOBUILDREQUEST._serialized_start=1251
-  _PROMOTEMODELVERSIONTOBUILDREQUEST._serialized_end=1467
-  _PROMOTEMODELVERSIONTOBUILDRESPONSE._serialized_start=1469
-  _PROMOTEMODELVERSIONTOBUILDRESPONSE._serialized_end=1523
-  _GETMLBOMMODELVERSIONBYIDREQUEST._serialized_start=1525
-  _GETMLBOMMODELVERSIONBYIDREQUEST._serialized_end=1584
-  _GETMLBOMMODELVERSIONBYIDRESPONSE._serialized_start=1586
-  _GETMLBOMMODELVERSIONBYIDRESPONSE._serialized_end=1649
-  _MODELVERSIONMANAGERSERVICE._serialized_start=1652
-  _MODELVERSIONMANAGERSERVICE._serialized_end=2719
+  _DELETEMODELVERSIONSREQUEST._serialized_start=1157
+  _DELETEMODELVERSIONSREQUEST._serialized_end=1267
+  _DELETEMODELVERSIONSRESPONSE._serialized_start=1269
+  _DELETEMODELVERSIONSRESPONSE._serialized_end=1298
+  _PROMOTEMODELVERSIONTOBUILDREQUEST._serialized_start=1301
+  _PROMOTEMODELVERSIONTOBUILDREQUEST._serialized_end=1517
+  _PROMOTEMODELVERSIONTOBUILDRESPONSE._serialized_start=1519
+  _PROMOTEMODELVERSIONTOBUILDRESPONSE._serialized_end=1573
+  _GETMLBOMMODELVERSIONBYIDREQUEST._serialized_start=1575
+  _GETMLBOMMODELVERSIONBYIDREQUEST._serialized_end=1634
+  _GETMLBOMMODELVERSIONBYIDRESPONSE._serialized_start=1636
+  _GETMLBOMMODELVERSIONBYIDRESPONSE._serialized_end=1699
+  _MODELVERSIONMANAGERSERVICE._serialized_start=1702
+  _MODELVERSIONMANAGERSERVICE._serialized_end=2759
 # @@protoc_insertion_point(module_scope)

{frogml_core-0.0.100 → frogml_core-0.0.102}/frogml_proto/jfml/model_version/v1/model_version_manager_service_pb2.pyi

@@ -211,29 +211,29 @@ class ListModelVersionsResponse(google.protobuf.message.Message):
 
 global___ListModelVersionsResponse = ListModelVersionsResponse
 
-class DeleteModelVersionByIdRequest(google.protobuf.message.Message):
+class DeleteModelVersionsRequest(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
-    MODEL_VERSION_ID_FIELD_NUMBER: builtins.int
-    model_version_id: builtins.str
-    """ModelVersion id"""
+    MODEL_VERSION_IDENTIFIERS_FIELD_NUMBER: builtins.int
+    @property
+    def model_version_identifiers(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[jfml.model_version.v1.model_version_pb2.ModelVersionIdentifier]: ...
     def __init__(
         self,
         *,
-        model_version_id: builtins.str = ...,
+        model_version_identifiers: collections.abc.Iterable[jfml.model_version.v1.model_version_pb2.ModelVersionIdentifier] | None = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["model_version_id", b"model_version_id"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["model_version_identifiers", b"model_version_identifiers"]) -> None: ...
 
-global___DeleteModelVersionByIdRequest = DeleteModelVersionByIdRequest
+global___DeleteModelVersionsRequest = DeleteModelVersionsRequest
 
-class DeleteModelVersionByIdResponse(google.protobuf.message.Message):
+class DeleteModelVersionsResponse(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
     def __init__(
         self,
     ) -> None: ...
 
-global___DeleteModelVersionByIdResponse = DeleteModelVersionByIdResponse
+global___DeleteModelVersionsResponse = DeleteModelVersionsResponse
 
 class PromoteModelVersionToBuildRequest(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor

{frogml_core-0.0.100 → frogml_core-0.0.102}/frogml_proto/jfml/model_version/v1/model_version_manager_service_pb2_grpc.py

@@ -39,10 +39,10 @@ class ModelVersionManagerServiceStub(object):
                 request_serializer=jfml_dot_model__version_dot_v1_dot_model__version__manager__service__pb2.ListModelVersionsRequest.SerializeToString,
                 response_deserializer=jfml_dot_model__version_dot_v1_dot_model__version__manager__service__pb2.ListModelVersionsResponse.FromString,
                 )
-        self.DeleteModelVersionById = channel.unary_unary(
-                '/jfml.model_version.v1.ModelVersionManagerService/DeleteModelVersionById',
-                request_serializer=jfml_dot_model__version_dot_v1_dot_model__version__manager__service__pb2.DeleteModelVersionByIdRequest.SerializeToString,
-                response_deserializer=jfml_dot_model__version_dot_v1_dot_model__version__manager__service__pb2.DeleteModelVersionByIdResponse.FromString,
+        self.DeleteModelVersions = channel.unary_unary(
+                '/jfml.model_version.v1.ModelVersionManagerService/DeleteModelVersions',
+                request_serializer=jfml_dot_model__version_dot_v1_dot_model__version__manager__service__pb2.DeleteModelVersionsRequest.SerializeToString,
+                response_deserializer=jfml_dot_model__version_dot_v1_dot_model__version__manager__service__pb2.DeleteModelVersionsResponse.FromString,
                 )
         self.PromoteModelVersionToBuild = channel.unary_unary(
                 '/jfml.model_version.v1.ModelVersionManagerService/PromoteModelVersionToBuild',
@@ -94,7 +94,7 @@ class ModelVersionManagerServiceServicer(object):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
-    def DeleteModelVersionById(self, request, context):
+    def DeleteModelVersions(self, request, context):
         """Delete an model_version
         """
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
@@ -143,10 +143,10 @@ def add_ModelVersionManagerServiceServicer_to_server(servicer, server):
                     request_deserializer=jfml_dot_model__version_dot_v1_dot_model__version__manager__service__pb2.ListModelVersionsRequest.FromString,
                     response_serializer=jfml_dot_model__version_dot_v1_dot_model__version__manager__service__pb2.ListModelVersionsResponse.SerializeToString,
             ),
-            'DeleteModelVersionById': grpc.unary_unary_rpc_method_handler(
-                    servicer.DeleteModelVersionById,
-                    request_deserializer=jfml_dot_model__version_dot_v1_dot_model__version__manager__service__pb2.DeleteModelVersionByIdRequest.FromString,
-                    response_serializer=jfml_dot_model__version_dot_v1_dot_model__version__manager__service__pb2.DeleteModelVersionByIdResponse.SerializeToString,
+            'DeleteModelVersions': grpc.unary_unary_rpc_method_handler(
+                    servicer.DeleteModelVersions,
+                    request_deserializer=jfml_dot_model__version_dot_v1_dot_model__version__manager__service__pb2.DeleteModelVersionsRequest.FromString,
+                    response_serializer=jfml_dot_model__version_dot_v1_dot_model__version__manager__service__pb2.DeleteModelVersionsResponse.SerializeToString,
             ),
             'PromoteModelVersionToBuild': grpc.unary_unary_rpc_method_handler(
                     servicer.PromoteModelVersionToBuild,
@@ -254,7 +254,7 @@ class ModelVersionManagerService(object):
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
     @staticmethod
-    def DeleteModelVersionById(request,
+    def DeleteModelVersions(request,
             target,
             options=(),
             channel_credentials=None,
@@ -264,9 +264,9 @@ class ModelVersionManagerService(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/jfml.model_version.v1.ModelVersionManagerService/DeleteModelVersionById',
-            jfml_dot_model__version_dot_v1_dot_model__version__manager__service__pb2.DeleteModelVersionByIdRequest.SerializeToString,
-            jfml_dot_model__version_dot_v1_dot_model__version__manager__service__pb2.DeleteModelVersionByIdResponse.FromString,
+        return grpc.experimental.unary_unary(request, target, '/jfml.model_version.v1.ModelVersionManagerService/DeleteModelVersions',
+            jfml_dot_model__version_dot_v1_dot_model__version__manager__service__pb2.DeleteModelVersionsRequest.SerializeToString,
+            jfml_dot_model__version_dot_v1_dot_model__version__manager__service__pb2.DeleteModelVersionsResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 

{frogml_core-0.0.100 → frogml_core-0.0.102}/frogml_proto/jfml/model_version/v1/model_version_pb2.py

@@ -18,7 +18,7 @@ from frogml_proto.jfml.model_version.v1 import model_repository_spec_pb2 as jfml
 from frogml_proto.jfml.model_version.v1 import artifact_pb2 as jfml_dot_model__version_dot_v1_dot_artifact__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n)jfml/model_version/v1/model_version.proto\x12\x15jfml.model_version.v1\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x33jfml/model_version/v1/model_version_framework.proto\x1a\x31jfml/model_version/v1/model_repository_spec.proto\x1a$jfml/model_version/v1/artifact.proto\"\xc8\x04\n\x0cModelVersion\x12\x18\n\x10model_version_id\x18\x01 \x01(\t\x12\x35\n\x04spec\x18\x02 \x01(\x0b\x32\'.jfml.model_version.v1.ModelVersionSpec\x12\x39\n\x06status\x18\x03 \x01(\x0b\x32).jfml.model_version.v1.ModelVersionStatus\x12\x12\n\ncreated_by\x18\x04 \x01(\t\x12.\n\ncreated_at\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12.\n\nupdated_at\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12G\n\nparameters\x18\x07 \x03(\x0b\x32\x33.jfml.model_version.v1.ModelVersion.ParametersEntry\x12\x41\n\x07metrics\x18\x08 \x03(\x0b\x32\x30.jfml.model_version.v1.ModelVersion.MetricsEntry\x1aX\n\x0fParametersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x34\n\x05value\x18\x02 \x01(\x0b\x32%.jfml.model_version.v1.ParameterValue:\x02\x38\x01\x1aR\n\x0cMetricsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x31\n\x05value\x18\x02 \x01(\x0b\x32\".jfml.model_version.v1.MetricValue:\x02\x38\x01\"\xbe\x01\n\x10ModelVersionSpec\x12\x43\n\x0frepository_spec\x18\x01 \x01(\x0b\x32*.jfml.model_version.v1.ModelRepositorySpec\x12\x0c\n\x04name\x18\x02 \x01(\t\x12?\n\tframework\x18\x03 \x01(\x0b\x32,.jfml.model_version.v1.ModelVersionFramework\x12\x16\n\x0epython_version\x18\x04 \x01(\t\"\xf0\x03\n\tMlBomData\x12\x37\n\x0emodel_artifact\x18\x01 \x03(\x0b\x32\x1f.jfml.model_version.v1.Artifact\x12\x37\n\x0e\x63ode_artifacts\x18\x02 \x03(\x0b\x32\x1f.jfml.model_version.v1.Artifact\x12=\n\x14\x64\x65pendency_artifacts\x18\x03 \x03(\x0b\x32\x1f.jfml.model_version.v1.Artifact\x12\x44\n\nparameters\x18\x04 \x03(\x0b\x32\x30.jfml.model_version.v1.MlBomData.ParametersEntry\x12>\n\x07metrics\x18\x05 \x03(\x0b\x32-.jfml.model_version.v1.MlBomData.MetricsEntry\x1aX\n\x0fParametersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x34\n\x05value\x18\x02 \x01(\x0b\x32%.jfml.model_version.v1.ParameterValue:\x02\x38\x01\x1aR\n\x0cMetricsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x31\n\x05value\x18\x02 \x01(\x0b\x32\".jfml.model_version.v1.MetricValue:\x02\x38\x01\"\x1f\n\x0eParameterValue\x12\r\n\x05value\x18\x01 \x01(\t\"\x1c\n\x0bMetricValue\x12\r\n\x05value\x18\x01 \x01(\t\"\xf6\x01\n\x12ModelVersionStatus\x12J\n\x0bin_progress\x18\x01 \x01(\x0b\x32\x33.jfml.model_version.v1.ModelVersionInProgressStatusH\x00\x12G\n\tcompleted\x18\x02 \x01(\x0b\x32\x32.jfml.model_version.v1.ModelVersionCompletedStatusH\x00\x12\x41\n\x06\x66\x61iled\x18\x03 \x01(\x0b\x32/.jfml.model_version.v1.ModelVersionFailedStatusH\x00\x42\x08\n\x06status\"\x1e\n\x1cModelVersionInProgressStatus\"\x1d\n\x1bModelVersionCompletedStatus\"\x1a\n\x18ModelVersionFailedStatusB%\n!com.jfrog.ml.model_version.api.v1P\x01\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n)jfml/model_version/v1/model_version.proto\x12\x15jfml.model_version.v1\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x33jfml/model_version/v1/model_version_framework.proto\x1a\x31jfml/model_version/v1/model_repository_spec.proto\x1a$jfml/model_version/v1/artifact.proto\"\xc8\x04\n\x0cModelVersion\x12\x18\n\x10model_version_id\x18\x01 \x01(\t\x12\x35\n\x04spec\x18\x02 \x01(\x0b\x32\'.jfml.model_version.v1.ModelVersionSpec\x12\x39\n\x06status\x18\x03 \x01(\x0b\x32).jfml.model_version.v1.ModelVersionStatus\x12\x12\n\ncreated_by\x18\x04 \x01(\t\x12.\n\ncreated_at\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12.\n\nupdated_at\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12G\n\nparameters\x18\x07 \x03(\x0b\x32\x33.jfml.model_version.v1.ModelVersion.ParametersEntry\x12\x41\n\x07metrics\x18\x08 \x03(\x0b\x32\x30.jfml.model_version.v1.ModelVersion.MetricsEntry\x1aX\n\x0fParametersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x34\n\x05value\x18\x02 \x01(\x0b\x32%.jfml.model_version.v1.ParameterValue:\x02\x38\x01\x1aR\n\x0cMetricsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x31\n\x05value\x18\x02 \x01(\x0b\x32\".jfml.model_version.v1.MetricValue:\x02\x38\x01\"\xbe\x01\n\x10ModelVersionSpec\x12\x43\n\x0frepository_spec\x18\x01 \x01(\x0b\x32*.jfml.model_version.v1.ModelRepositorySpec\x12\x0c\n\x04name\x18\x02 \x01(\t\x12?\n\tframework\x18\x03 \x01(\x0b\x32,.jfml.model_version.v1.ModelVersionFramework\x12\x16\n\x0epython_version\x18\x04 \x01(\t\"\xf0\x03\n\tMlBomData\x12\x37\n\x0emodel_artifact\x18\x01 \x03(\x0b\x32\x1f.jfml.model_version.v1.Artifact\x12\x37\n\x0e\x63ode_artifacts\x18\x02 \x03(\x0b\x32\x1f.jfml.model_version.v1.Artifact\x12=\n\x14\x64\x65pendency_artifacts\x18\x03 \x03(\x0b\x32\x1f.jfml.model_version.v1.Artifact\x12\x44\n\nparameters\x18\x04 \x03(\x0b\x32\x30.jfml.model_version.v1.MlBomData.ParametersEntry\x12>\n\x07metrics\x18\x05 \x03(\x0b\x32-.jfml.model_version.v1.MlBomData.MetricsEntry\x1aX\n\x0fParametersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x34\n\x05value\x18\x02 \x01(\x0b\x32%.jfml.model_version.v1.ParameterValue:\x02\x38\x01\x1aR\n\x0cMetricsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x31\n\x05value\x18\x02 \x01(\x0b\x32\".jfml.model_version.v1.MetricValue:\x02\x38\x01\"\x1f\n\x0eParameterValue\x12\r\n\x05value\x18\x01 \x01(\t\"\x1c\n\x0bMetricValue\x12\r\n\x05value\x18\x01 \x01(\t\"\xf6\x01\n\x12ModelVersionStatus\x12J\n\x0bin_progress\x18\x01 \x01(\x0b\x32\x33.jfml.model_version.v1.ModelVersionInProgressStatusH\x00\x12G\n\tcompleted\x18\x02 \x01(\x0b\x32\x32.jfml.model_version.v1.ModelVersionCompletedStatusH\x00\x12\x41\n\x06\x66\x61iled\x18\x03 \x01(\x0b\x32/.jfml.model_version.v1.ModelVersionFailedStatusH\x00\x42\x08\n\x06status\"\x1e\n\x1cModelVersionInProgressStatus\"\x1d\n\x1bModelVersionCompletedStatus\"\x1a\n\x18ModelVersionFailedStatus\"`\n\x16ModelVersionIdentifier\x12\x1a\n\x10model_version_id\x18\x01 \x01(\tH\x00\x12\x1c\n\x12model_version_name\x18\x02 \x01(\tH\x00\x42\x0c\n\nidentifierB%\n!com.jfrog.ml.model_version.api.v1P\x01\x62\x06proto3')
 
 
 
@@ -35,6 +35,7 @@ _MODELVERSIONSTATUS = DESCRIPTOR.message_types_by_name['ModelVersionStatus']
 _MODELVERSIONINPROGRESSSTATUS = DESCRIPTOR.message_types_by_name['ModelVersionInProgressStatus']
 _MODELVERSIONCOMPLETEDSTATUS = DESCRIPTOR.message_types_by_name['ModelVersionCompletedStatus']
 _MODELVERSIONFAILEDSTATUS = DESCRIPTOR.message_types_by_name['ModelVersionFailedStatus']
+_MODELVERSIONIDENTIFIER = DESCRIPTOR.message_types_by_name['ModelVersionIdentifier']
 ModelVersion = _reflection.GeneratedProtocolMessageType('ModelVersion', (_message.Message,), {
 
   'ParametersEntry' : _reflection.GeneratedProtocolMessageType('ParametersEntry', (_message.Message,), {
@@ -130,6 +131,13 @@ ModelVersionFailedStatus = _reflection.GeneratedProtocolMessageType('ModelVersio
   })
 _sym_db.RegisterMessage(ModelVersionFailedStatus)
 
+ModelVersionIdentifier = _reflection.GeneratedProtocolMessageType('ModelVersionIdentifier', (_message.Message,), {
+  'DESCRIPTOR' : _MODELVERSIONIDENTIFIER,
+  '__module__' : 'jfml.model_version.v1.model_version_pb2'
+  # @@protoc_insertion_point(class_scope:jfml.model_version.v1.ModelVersionIdentifier)
+  })
+_sym_db.RegisterMessage(ModelVersionIdentifier)
+
 if _descriptor._USE_C_DESCRIPTORS == False:
 
   DESCRIPTOR._options = None
@@ -168,4 +176,6 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _MODELVERSIONCOMPLETEDSTATUS._serialized_end=1895
   _MODELVERSIONFAILEDSTATUS._serialized_start=1897
   _MODELVERSIONFAILEDSTATUS._serialized_end=1923
+  _MODELVERSIONIDENTIFIER._serialized_start=1925
+  _MODELVERSIONIDENTIFIER._serialized_end=2021
 # @@protoc_insertion_point(module_scope)

{frogml_core-0.0.100 → frogml_core-0.0.102}/frogml_proto/jfml/model_version/v1/model_version_pb2.pyi

@@ -274,3 +274,24 @@ class ModelVersionFailedStatus(google.protobuf.message.Message):
     ) -> None: ...
 
 global___ModelVersionFailedStatus = ModelVersionFailedStatus
+
+class ModelVersionIdentifier(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+
+    MODEL_VERSION_ID_FIELD_NUMBER: builtins.int
+    MODEL_VERSION_NAME_FIELD_NUMBER: builtins.int
+    model_version_id: builtins.str
+    """ModelVersion id"""
+    model_version_name: builtins.str
+    """ModelVersion name"""
+    def __init__(
+        self,
+        *,
+        model_version_id: builtins.str = ...,
+        model_version_name: builtins.str = ...,
+    ) -> None: ...
+    def HasField(self, field_name: typing_extensions.Literal["identifier", b"identifier", "model_version_id", b"model_version_id", "model_version_name", b"model_version_name"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing_extensions.Literal["identifier", b"identifier", "model_version_id", b"model_version_id", "model_version_name", b"model_version_name"]) -> None: ...
+    def WhichOneof(self, oneof_group: typing_extensions.Literal["identifier", b"identifier"]) -> typing_extensions.Literal["model_version_id", "model_version_name"] | None: ...
+
+global___ModelVersionIdentifier = ModelVersionIdentifier

{frogml_core-0.0.100 → frogml_core-0.0.102}/frogml_services_mock/mocks/model_version_manager_service.py

@@ -17,16 +17,6 @@ from frogml_proto.jfml.model_version.v1.model_version_manager_service_pb2 import
     GetModelVersionByIdRequest,
     GetModelVersionByNameRequest,
     GetModelVersionByNameResponse,
-    InitPaginationRequest,
-    InitPaginationResponse,
-    ListModelVersionsRequest,
-    ListModelVersionsResponse,
-    DeleteModelVersionByIdRequest,
-    DeleteModelVersionByIdResponse,
-    PromoteModelVersionToBuildRequest,
-    PromoteModelVersionToBuildResponse,
-    GetMlBomModelVersionByIdRequest,
-    GetMlBomModelVersionByIdResponse,
 )
 from frogml_proto.jfml.model_version.v1.model_version_manager_service_pb2_grpc import (
     ModelVersionManagerServiceServicer,
@@ -104,28 +94,3 @@ class ModelVersionManagerServiceMock(ModelVersionManagerServiceServicer):
                 updated_at=timestamp,
             )
         )
-
-    def InitPagination(
-        self, request: InitPaginationRequest, context
-    ) -> InitPaginationResponse:
-        return super().InitPagination(request, context)
-
-    def ListModelVersions(
-        self, request: ListModelVersionsRequest, context
-    ) -> ListModelVersionsResponse:
-        return super().ListModelVersions(request, context)
-
-    def DeleteModelVersionById(
-        self, request: DeleteModelVersionByIdRequest, context
-    ) -> DeleteModelVersionByIdResponse:
-        return super().DeleteModelVersionById(request, context)
-
-    def PromoteModelVersionToBuild(
-        self, request: PromoteModelVersionToBuildRequest, context
-    ) -> PromoteModelVersionToBuildResponse:
-        return super().PromoteModelVersionToBuild(request, context)
-
-    def GetMlBomModelVersionById(
-        self, request: GetMlBomModelVersionByIdRequest, context
-    ) -> GetMlBomModelVersionByIdResponse:
-        return super().GetMlBomModelVersionById(request, context)

frogml_core-0.0.102/frogml_storage/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.0.102"

{frogml_core-0.0.100 → frogml_core-0.0.102}/pyproject.toml

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

frogml_core-0.0.100/frogml_storage/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.0.100"