frogml-core 0.0.2__tar.gz → 0.0.3__tar.gz

{frogml_core-0.0.2 → frogml_core-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: frogml-core
-Version: 0.0.2
+Version: 0.0.3
 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
@@ -34,7 +34,7 @@ Requires-Dist: pyarrow (>=6.0.0) ; extra == "feature-store"
 Requires-Dist: pyathena (>=2.2.0,!=2.18.0) ; extra == "feature-store"
 Requires-Dist: pyspark (==3.4.2) ; extra == "feature-store"
 Requires-Dist: python-jose
-Requires-Dist: python-json-logger (>=2.0.2)
+Requires-Dist: python-json-logger (>=3.2.1,<4.0.0)
 Requires-Dist: requests
 Requires-Dist: retrying (==1.3.4)
 Requires-Dist: typeguard (>=2,<3)

{frogml_core-0.0.2 → frogml_core-0.0.3}/frogml_core/__init__.py

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

{frogml_core-0.0.2 → frogml_core-0.0.3}/frogml_core/tools/logger/logging.yml

@@ -11,11 +11,11 @@ formatters:
     format: '%(asctime)s %(levelname)-8s %(module)s - %(lineno)d - %(message)s'
     datefmt: '%Y-%m-%d %H:%M:%S'
   remote:
-    class: pythonjsonlogger.jsonlogger.JsonFormatter
+    class: pythonjsonlogger.json.JsonFormatter
     format: '%(asctime)s %(process)d %(levelname)s %(module)s %(lineno)d %(message)s'
     datefmt: '%Y-%m-%dT%H:%M:%S'
   json:
-    class: pythonjsonlogger.jsonlogger.JsonFormatter
+    class: pythonjsonlogger.json.JsonFormatter
     format: '%(asctime)s %(process)d %(levelname)s %(module)s %(lineno)d %(message)s'
     datefmt: '%Y-%m-%dT%H:%M:%S'
 

frogml_core-0.0.3/frogml_core/utils/proto_utils.py

@@ -0,0 +1,42 @@
+from frogml_proto.jfml.model_version.v1.model_version_framework_pb2 import (
+    ModelVersionFramework,
+    CatboostFramework,
+    HuggingFaceFramework,
+    OnnxFramework,
+    PythonPickleFramework,
+    PytorchFramework,
+    ScikitLearnFramework,
+)
+
+CATBOOST_SERIALIZED_TYPE = "cbm"
+HUGGINGFACE_FRAMEWORK_FORMAT = "pretrained_model"
+ONNX_FRAMEWORK_FORMAT = "onnx"
+PYTHON_FRAMEWORK_FORMAT = "pkl"
+PYTORCH_FRAMEWORK_FORMAT = "pth"
+SCIKIT_LEARN_FRAMEWORK_FORMAT = "joblib"
+
+
+class ProtoUtils:
+    @staticmethod
+    def model_framework_from_file_format(
+        serialization_format: str,
+    ) -> ModelVersionFramework:
+        framework_to_define: dict
+        stripped_and_lowered_format = serialization_format.strip().lower()
+
+        if stripped_and_lowered_format == CATBOOST_SERIALIZED_TYPE:
+            framework_to_define = {"catboost": CatboostFramework()}
+        elif stripped_and_lowered_format == HUGGINGFACE_FRAMEWORK_FORMAT:
+            framework_to_define = {"hugging_face": HuggingFaceFramework()}
+        elif stripped_and_lowered_format == ONNX_FRAMEWORK_FORMAT:
+            framework_to_define = {"onnx": OnnxFramework()}
+        elif stripped_and_lowered_format == PYTHON_FRAMEWORK_FORMAT:
+            framework_to_define = {"python_pickle": PythonPickleFramework()}
+        elif stripped_and_lowered_format == PYTORCH_FRAMEWORK_FORMAT:
+            framework_to_define = {"pytorch": PytorchFramework()}
+        elif stripped_and_lowered_format == SCIKIT_LEARN_FRAMEWORK_FORMAT:
+            framework_to_define = {"scikit_learn": ScikitLearnFramework()}
+        else:
+            raise ValueError(f"Format {serialization_format} is not supported yet")
+
+        return ModelVersionFramework(**framework_to_define)

frogml_core-0.0.3/frogml_proto/jfml/model_version/v1/model_version_framework_pb2.py

@@ -0,0 +1,95 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: frogml_proto.jfml.model_version/v1/model_version_framework.proto
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
+from google.protobuf import symbol_database as _symbol_database
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n3jfml/model_version/v1/model_version_framework.proto\x12\x15jfml.model_version.v1\"\xa0\x03\n\x15ModelVersionFramework\x12<\n\x08\x63\x61tboost\x18\x01 \x01(\x0b\x32(.jfml.model_version.v1.CatboostFrameworkH\x00\x12\x43\n\x0chugging_face\x18\x02 \x01(\x0b\x32+.jfml.model_version.v1.HuggingFaceFrameworkH\x00\x12\x34\n\x04onnx\x18\x03 \x01(\x0b\x32$.jfml.model_version.v1.OnnxFrameworkH\x00\x12\x45\n\rpython_pickle\x18\x04 \x01(\x0b\x32,.jfml.model_version.v1.PythonPickleFrameworkH\x00\x12:\n\x07pytorch\x18\x05 \x01(\x0b\x32\'.jfml.model_version.v1.PytorchFrameworkH\x00\x12\x43\n\x0cscikit_learn\x18\x06 \x01(\x0b\x32+.jfml.model_version.v1.ScikitLearnFrameworkH\x00\x42\x06\n\x04name\"\x13\n\x11\x43\x61tboostFramework\"\x16\n\x14HuggingFaceFramework\"\x0f\n\rOnnxFramework\"\x17\n\x15PythonPickleFramework\"\x12\n\x10PytorchFramework\"\x16\n\x14ScikitLearnFrameworkB%\n!com.jfrog.ml.model_version.api.v1P\x01\x62\x06proto3')
+
+
+
+_MODELVERSIONFRAMEWORK = DESCRIPTOR.message_types_by_name['ModelVersionFramework']
+_CATBOOSTFRAMEWORK = DESCRIPTOR.message_types_by_name['CatboostFramework']
+_HUGGINGFACEFRAMEWORK = DESCRIPTOR.message_types_by_name['HuggingFaceFramework']
+_ONNXFRAMEWORK = DESCRIPTOR.message_types_by_name['OnnxFramework']
+_PYTHONPICKLEFRAMEWORK = DESCRIPTOR.message_types_by_name['PythonPickleFramework']
+_PYTORCHFRAMEWORK = DESCRIPTOR.message_types_by_name['PytorchFramework']
+_SCIKITLEARNFRAMEWORK = DESCRIPTOR.message_types_by_name['ScikitLearnFramework']
+ModelVersionFramework = _reflection.GeneratedProtocolMessageType('ModelVersionFramework', (_message.Message,), {
+  'DESCRIPTOR' : _MODELVERSIONFRAMEWORK,
+  '__module__' : 'jfml.model_version.v1.model_version_framework_pb2'
+  # @@protoc_insertion_point(class_scope:jfml.model_version.v1.ModelVersionFramework)
+  })
+_sym_db.RegisterMessage(ModelVersionFramework)
+
+CatboostFramework = _reflection.GeneratedProtocolMessageType('CatboostFramework', (_message.Message,), {
+  'DESCRIPTOR' : _CATBOOSTFRAMEWORK,
+  '__module__' : 'jfml.model_version.v1.model_version_framework_pb2'
+  # @@protoc_insertion_point(class_scope:jfml.model_version.v1.CatboostFramework)
+  })
+_sym_db.RegisterMessage(CatboostFramework)
+
+HuggingFaceFramework = _reflection.GeneratedProtocolMessageType('HuggingFaceFramework', (_message.Message,), {
+  'DESCRIPTOR' : _HUGGINGFACEFRAMEWORK,
+  '__module__' : 'jfml.model_version.v1.model_version_framework_pb2'
+  # @@protoc_insertion_point(class_scope:jfml.model_version.v1.HuggingFaceFramework)
+  })
+_sym_db.RegisterMessage(HuggingFaceFramework)
+
+OnnxFramework = _reflection.GeneratedProtocolMessageType('OnnxFramework', (_message.Message,), {
+  'DESCRIPTOR' : _ONNXFRAMEWORK,
+  '__module__' : 'jfml.model_version.v1.model_version_framework_pb2'
+  # @@protoc_insertion_point(class_scope:jfml.model_version.v1.OnnxFramework)
+  })
+_sym_db.RegisterMessage(OnnxFramework)
+
+PythonPickleFramework = _reflection.GeneratedProtocolMessageType('PythonPickleFramework', (_message.Message,), {
+  'DESCRIPTOR' : _PYTHONPICKLEFRAMEWORK,
+  '__module__' : 'jfml.model_version.v1.model_version_framework_pb2'
+  # @@protoc_insertion_point(class_scope:jfml.model_version.v1.PythonPickleFramework)
+  })
+_sym_db.RegisterMessage(PythonPickleFramework)
+
+PytorchFramework = _reflection.GeneratedProtocolMessageType('PytorchFramework', (_message.Message,), {
+  'DESCRIPTOR' : _PYTORCHFRAMEWORK,
+  '__module__' : 'jfml.model_version.v1.model_version_framework_pb2'
+  # @@protoc_insertion_point(class_scope:jfml.model_version.v1.PytorchFramework)
+  })
+_sym_db.RegisterMessage(PytorchFramework)
+
+ScikitLearnFramework = _reflection.GeneratedProtocolMessageType('ScikitLearnFramework', (_message.Message,), {
+  'DESCRIPTOR' : _SCIKITLEARNFRAMEWORK,
+  '__module__' : 'jfml.model_version.v1.model_version_framework_pb2'
+  # @@protoc_insertion_point(class_scope:jfml.model_version.v1.ScikitLearnFramework)
+  })
+_sym_db.RegisterMessage(ScikitLearnFramework)
+
+if _descriptor._USE_C_DESCRIPTORS == False:
+
+  DESCRIPTOR._options = None
+  DESCRIPTOR._serialized_options = b'\n!com.jfrog.ml.model_version.api.v1P\001'
+  _MODELVERSIONFRAMEWORK._serialized_start=79
+  _MODELVERSIONFRAMEWORK._serialized_end=495
+  _CATBOOSTFRAMEWORK._serialized_start=497
+  _CATBOOSTFRAMEWORK._serialized_end=516
+  _HUGGINGFACEFRAMEWORK._serialized_start=518
+  _HUGGINGFACEFRAMEWORK._serialized_end=540
+  _ONNXFRAMEWORK._serialized_start=542
+  _ONNXFRAMEWORK._serialized_end=557
+  _PYTHONPICKLEFRAMEWORK._serialized_start=559
+  _PYTHONPICKLEFRAMEWORK._serialized_end=582
+  _PYTORCHFRAMEWORK._serialized_start=584
+  _PYTORCHFRAMEWORK._serialized_end=602
+  _SCIKITLEARNFRAMEWORK._serialized_start=604
+  _SCIKITLEARNFRAMEWORK._serialized_end=626
+# @@protoc_insertion_point(module_scope)

frogml_core-0.0.3/frogml_proto/jfml/model_version/v1/model_version_framework_pb2.pyi

@@ -0,0 +1,106 @@
+"""
+@generated by mypy-protobuf.  Do not edit manually!
+isort:skip_file
+"""
+import builtins
+import google.protobuf.descriptor
+import google.protobuf.message
+import sys
+
+if sys.version_info >= (3, 8):
+    import typing as typing_extensions
+else:
+    import typing_extensions
+
+DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
+
+class ModelVersionFramework(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+
+    CATBOOST_FIELD_NUMBER: builtins.int
+    HUGGING_FACE_FIELD_NUMBER: builtins.int
+    ONNX_FIELD_NUMBER: builtins.int
+    PYTHON_PICKLE_FIELD_NUMBER: builtins.int
+    PYTORCH_FIELD_NUMBER: builtins.int
+    SCIKIT_LEARN_FIELD_NUMBER: builtins.int
+    @property
+    def catboost(self) -> global___CatboostFramework: ...
+    @property
+    def hugging_face(self) -> global___HuggingFaceFramework: ...
+    @property
+    def onnx(self) -> global___OnnxFramework: ...
+    @property
+    def python_pickle(self) -> global___PythonPickleFramework: ...
+    @property
+    def pytorch(self) -> global___PytorchFramework: ...
+    @property
+    def scikit_learn(self) -> global___ScikitLearnFramework: ...
+    def __init__(
+        self,
+        *,
+        catboost: global___CatboostFramework | None = ...,
+        hugging_face: global___HuggingFaceFramework | None = ...,
+        onnx: global___OnnxFramework | None = ...,
+        python_pickle: global___PythonPickleFramework | None = ...,
+        pytorch: global___PytorchFramework | None = ...,
+        scikit_learn: global___ScikitLearnFramework | None = ...,
+    ) -> None: ...
+    def HasField(self, field_name: typing_extensions.Literal["catboost", b"catboost", "hugging_face", b"hugging_face", "name", b"name", "onnx", b"onnx", "python_pickle", b"python_pickle", "pytorch", b"pytorch", "scikit_learn", b"scikit_learn"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing_extensions.Literal["catboost", b"catboost", "hugging_face", b"hugging_face", "name", b"name", "onnx", b"onnx", "python_pickle", b"python_pickle", "pytorch", b"pytorch", "scikit_learn", b"scikit_learn"]) -> None: ...
+    def WhichOneof(self, oneof_group: typing_extensions.Literal["name", b"name"]) -> typing_extensions.Literal["catboost", "hugging_face", "onnx", "python_pickle", "pytorch", "scikit_learn"] | None: ...
+
+global___ModelVersionFramework = ModelVersionFramework
+
+class CatboostFramework(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+
+    def __init__(
+        self,
+    ) -> None: ...
+
+global___CatboostFramework = CatboostFramework
+
+class HuggingFaceFramework(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+
+    def __init__(
+        self,
+    ) -> None: ...
+
+global___HuggingFaceFramework = HuggingFaceFramework
+
+class OnnxFramework(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+
+    def __init__(
+        self,
+    ) -> None: ...
+
+global___OnnxFramework = OnnxFramework
+
+class PythonPickleFramework(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+
+    def __init__(
+        self,
+    ) -> None: ...
+
+global___PythonPickleFramework = PythonPickleFramework
+
+class PytorchFramework(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+
+    def __init__(
+        self,
+    ) -> None: ...
+
+global___PytorchFramework = PytorchFramework
+
+class ScikitLearnFramework(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+
+    def __init__(
+        self,
+    ) -> None: ...
+
+global___ScikitLearnFramework = ScikitLearnFramework

{frogml_core-0.0.2 → frogml_core-0.0.3}/frogml_proto/jfml/model_version/v1/model_version_manager_service_pb2.py

@@ -14,10 +14,9 @@ _sym_db = _symbol_database.Default()
 
 from frogml_proto.jfml.model_version.v1 import model_version_pb2 as jfml_dot_model__version_dot_v1_dot_model__version__pb2
 from frogml_proto.jfml.model_version.v1 import model_repository_spec_pb2 as jfml_dot_model__version_dot_v1_dot_model__repository__spec__pb2
-from frogml_proto.jfml.model_version.v1 import model_version_framework_pb2 as jfml_dot_model__version_dot_v1_dot_model__version__framework__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\x33jfml/model_version/v1/model_version_framework.proto\"l\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\"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\x65leteModelVersionByIdResponse2\x89\x06\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.DeleteModelVersionByIdResponseB%\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\"l\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\"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\x65leteModelVersionByIdResponse2\x89\x06\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.DeleteModelVersionByIdResponseB%\n!com.jfrog.ml.model_version.api.v1P\x01\x62\x06proto3')
 
 
 
@@ -122,30 +121,30 @@ if _descriptor._USE_C_DESCRIPTORS == False:
 
   DESCRIPTOR._options = None
   DESCRIPTOR._serialized_options = b'\n!com.jfrog.ml.model_version.api.v1P\001'
-  _CREATEMODELVERSIONREQUEST._serialized_start=231
-  _CREATEMODELVERSIONREQUEST._serialized_end=339
-  _CREATEMODELVERSIONRESPONSE._serialized_start=341
-  _CREATEMODELVERSIONRESPONSE._serialized_end=429
-  _GETMODELVERSIONBYIDREQUEST._serialized_start=431
-  _GETMODELVERSIONBYIDREQUEST._serialized_end=485
-  _GETMODELVERSIONBYIDRESPONSE._serialized_start=487
-  _GETMODELVERSIONBYIDRESPONSE._serialized_end=576
-  _GETMODELVERSIONBYNAMEREQUEST._serialized_start=578
-  _GETMODELVERSIONBYNAMEREQUEST._serialized_end=654
-  _GETMODELVERSIONBYNAMERESPONSE._serialized_start=656
-  _GETMODELVERSIONBYNAMERESPONSE._serialized_end=747
-  _INITPAGINATIONREQUEST._serialized_start=749
-  _INITPAGINATIONREQUEST._serialized_end=790
-  _INITPAGINATIONRESPONSE._serialized_start=792
-  _INITPAGINATIONRESPONSE._serialized_end=861
-  _LISTMODELVERSIONSREQUEST._serialized_start=864
-  _LISTMODELVERSIONSREQUEST._serialized_end=1022
-  _LISTMODELVERSIONSRESPONSE._serialized_start=1024
-  _LISTMODELVERSIONSRESPONSE._serialized_end=1112
-  _DELETEMODELVERSIONBYIDREQUEST._serialized_start=1114
-  _DELETEMODELVERSIONBYIDREQUEST._serialized_end=1171
-  _DELETEMODELVERSIONBYIDRESPONSE._serialized_start=1173
-  _DELETEMODELVERSIONBYIDRESPONSE._serialized_end=1205
-  _MODELVERSIONMANAGERSERVICE._serialized_start=1208
-  _MODELVERSIONMANAGERSERVICE._serialized_end=1985
+  _CREATEMODELVERSIONREQUEST._serialized_start=178
+  _CREATEMODELVERSIONREQUEST._serialized_end=286
+  _CREATEMODELVERSIONRESPONSE._serialized_start=288
+  _CREATEMODELVERSIONRESPONSE._serialized_end=376
+  _GETMODELVERSIONBYIDREQUEST._serialized_start=378
+  _GETMODELVERSIONBYIDREQUEST._serialized_end=432
+  _GETMODELVERSIONBYIDRESPONSE._serialized_start=434
+  _GETMODELVERSIONBYIDRESPONSE._serialized_end=523
+  _GETMODELVERSIONBYNAMEREQUEST._serialized_start=525
+  _GETMODELVERSIONBYNAMEREQUEST._serialized_end=601
+  _GETMODELVERSIONBYNAMERESPONSE._serialized_start=603
+  _GETMODELVERSIONBYNAMERESPONSE._serialized_end=694
+  _INITPAGINATIONREQUEST._serialized_start=696
+  _INITPAGINATIONREQUEST._serialized_end=737
+  _INITPAGINATIONRESPONSE._serialized_start=739
+  _INITPAGINATIONRESPONSE._serialized_end=808
+  _LISTMODELVERSIONSREQUEST._serialized_start=811
+  _LISTMODELVERSIONSREQUEST._serialized_end=969
+  _LISTMODELVERSIONSRESPONSE._serialized_start=971
+  _LISTMODELVERSIONSRESPONSE._serialized_end=1059
+  _DELETEMODELVERSIONBYIDREQUEST._serialized_start=1061
+  _DELETEMODELVERSIONBYIDREQUEST._serialized_end=1118
+  _DELETEMODELVERSIONBYIDRESPONSE._serialized_start=1120
+  _DELETEMODELVERSIONBYIDRESPONSE._serialized_end=1152
+  _MODELVERSIONMANAGERSERVICE._serialized_start=1155
+  _MODELVERSIONMANAGERSERVICE._serialized_end=1932
 # @@protoc_insertion_point(module_scope)

{frogml_core-0.0.2 → frogml_core-0.0.3}/frogml_services_mock/mocks/model_version_manager_service.py

@@ -24,7 +24,7 @@ from frogml_proto.jfml.model_version.v1.model_version_manager_service_pb2_grpc i
 from frogml_proto.jfml.model_version.v1.model_version_pb2 import (
     ModelVersion,
     ModelVersionCompletedStatus,
-    ModelVersionSpec,
+    ModelVersionSpec, ModelVersionStatus,
 )
 
 timestamp = Timestamp()
@@ -41,7 +41,7 @@ class ModelVersionManagerServiceMock(ModelVersionManagerServiceServicer):
             model_version=ModelVersion(
                 model_version_id=str(uuid.uuid4()),
                 spec=request.model_version,
-                status=ModelVersionCompletedStatus(),
+                status=ModelVersionStatus(completed=ModelVersionCompletedStatus()),
                 created_by="mock",
                 created_at=timestamp,
                 updated_at=timestamp,
@@ -62,7 +62,7 @@ class ModelVersionManagerServiceMock(ModelVersionManagerServiceServicer):
                     framework=CatboostFramework(),
                     python_version="3.9",
                 ),
-                status=ModelVersionCompletedStatus(),
+                status=ModelVersionStatus(completed=ModelVersionCompletedStatus()),
                 created_by="mock",
                 created_at=timestamp,
                 updated_at=timestamp,

{frogml_core-0.0.2 → frogml_core-0.0.3}/frogml_services_mock/mocks/repository_service_mock.py

@@ -36,4 +36,6 @@ class RepositoryServiceMock(RepositoryServiceServicer):
                 FrogmlNotFoundException(f"Repository {repository_key} not found"),
             )
 
-        return self.repositories[repository_key]
+        return GetRepositoryConfigurationResponse(
+            repository_spec=self.repositories[repository_key]
+        )

{frogml_core-0.0.2 → frogml_core-0.0.3}/pyproject.toml

@@ -1,16 +1,20 @@
 [tool.poetry]
 name = "frogml-core"
-version = "0.0.2"
+version = "0.0.3"
 description = "frogml Core contains the necessary objects and communication tools for using the Jfrog ml Platform"
 authors = ["Jfrog"]
 readme = "README.md"
 keywords = ["mlops", "ml", "deployment", "serving", "model"]
 packages = [
-    { include = "frogml_core" },
-    { include = "frogml_proto" },
-    { include = "frogml_services_mock" },
+    { include = "frogml_core", format = ["sdist", "wheel"] },
+    { include = "frogml_proto", format = ["sdist", "wheel"] },
+    { include = "frogml_services_mock", format = ["sdist", "wheel"] },
+]
+include = [
+    {path = "frogml_core/**/*", format = ["sdist", "wheel"]},
+    {path = "frogml_proto/**/*", format = ["sdist", "wheel"]},
+    {path = "frogml_services_mock/**/*", format = ["sdist", "wheel"]}
 ]
-include = ["./frogml_core/**/*", "./frogml_proto/**/*", "./frogml_services_mock/**/*"]
 classifiers = [
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3.7",
@@ -28,7 +32,7 @@ license = "Apache-2.0"
 
 [tool.poetry.dependencies]
 python = ">=3.9,<3.12"
-python-json-logger = ">=2.0.2"
+python-json-logger = "^3.2.1"
 grpcio = ">=1.57.0"
 protobuf = [
     { version = ">=3.10,<4", python = ">=3.7.1,<3.10" },

frogml_core-0.0.2/frogml_proto/jfml/model_version/v1/model_version_framework_pb2.py

@@ -1,45 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: frogml_proto.jfml.model_version/v1/model_version_framework.proto
-"""Generated protocol buffer code."""
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-
-
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n3jfml/model_version/v1/model_version_framework.proto\x12\x15jfml.model_version.v1\"]\n\x15ModelVersionFramework\x12<\n\x08\x63\x61tboost\x18\x01 \x01(\x0b\x32(.jfml.model_version.v1.CatboostFrameworkH\x00\x42\x06\n\x04name\"\x13\n\x11\x43\x61tboostFrameworkB%\n!com.jfrog.ml.model_version.api.v1P\x01\x62\x06proto3')
-
-
-
-_MODELVERSIONFRAMEWORK = DESCRIPTOR.message_types_by_name['ModelVersionFramework']
-_CATBOOSTFRAMEWORK = DESCRIPTOR.message_types_by_name['CatboostFramework']
-ModelVersionFramework = _reflection.GeneratedProtocolMessageType('ModelVersionFramework', (_message.Message,), {
-  'DESCRIPTOR' : _MODELVERSIONFRAMEWORK,
-  '__module__' : 'jfml.model_version.v1.model_version_framework_pb2'
-  # @@protoc_insertion_point(class_scope:jfml.model_version.v1.ModelVersionFramework)
-  })
-_sym_db.RegisterMessage(ModelVersionFramework)
-
-CatboostFramework = _reflection.GeneratedProtocolMessageType('CatboostFramework', (_message.Message,), {
-  'DESCRIPTOR' : _CATBOOSTFRAMEWORK,
-  '__module__' : 'jfml.model_version.v1.model_version_framework_pb2'
-  # @@protoc_insertion_point(class_scope:jfml.model_version.v1.CatboostFramework)
-  })
-_sym_db.RegisterMessage(CatboostFramework)
-
-if _descriptor._USE_C_DESCRIPTORS == False:
-
-  DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n!com.jfrog.ml.model_version.api.v1P\001'
-  _MODELVERSIONFRAMEWORK._serialized_start=78
-  _MODELVERSIONFRAMEWORK._serialized_end=171
-  _CATBOOSTFRAMEWORK._serialized_start=173
-  _CATBOOSTFRAMEWORK._serialized_end=192
-# @@protoc_insertion_point(module_scope)

frogml_core-0.0.2/frogml_proto/jfml/model_version/v1/model_version_framework_pb2.pyi

@@ -1,41 +0,0 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
-import builtins
-import google.protobuf.descriptor
-import google.protobuf.message
-import sys
-
-if sys.version_info >= (3, 8):
-    import typing as typing_extensions
-else:
-    import typing_extensions
-
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
-
-class ModelVersionFramework(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    CATBOOST_FIELD_NUMBER: builtins.int
-    @property
-    def catboost(self) -> global___CatboostFramework: ...
-    def __init__(
-        self,
-        *,
-        catboost: global___CatboostFramework | None = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["catboost", b"catboost", "name", b"name"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["catboost", b"catboost", "name", b"name"]) -> None: ...
-    def WhichOneof(self, oneof_group: typing_extensions.Literal["name", b"name"]) -> typing_extensions.Literal["catboost"] | None: ...
-
-global___ModelVersionFramework = ModelVersionFramework
-
-class CatboostFramework(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    def __init__(
-        self,
-    ) -> None: ...
-
-global___CatboostFramework = CatboostFramework