PyPI - frogml - Versions diffs - 1.2.35__py3-none-any.whl → 1.2.38__py3-none-any.whl - Mend

frogml 1.2.35py3-none-any.whl → 1.2.38py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

frogml/__init__.py +1 -1
frogml/_proto/qwak/logging/log_source_pb2.py +31 -25
frogml/_proto/qwak/logging/log_source_pb2.pyi +28 -14
frogml/core/clients/batch_job_management/client.py +14 -6
frogml/core/clients/logging_client/client.py +118 -33
{frogml-1.2.35.dist-info → frogml-1.2.38.dist-info}/METADATA +1 -1
{frogml-1.2.35.dist-info → frogml-1.2.38.dist-info}/RECORD +8 -8
{frogml-1.2.35.dist-info → frogml-1.2.38.dist-info}/WHEEL +0 -0

frogml/__init__.py CHANGED Viewed

@@ -1,5 +1,5 @@
 __author__ = "jfrog"
-__version__ = "1.2.35"
+__version__ = "1.2.38"
 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/qwak/logging/log_source_pb2.py CHANGED Viewed

@@ -14,7 +14,7 @@ _sym_db = _symbol_database.Default()
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1dqwak/logging/log_source.proto\x12\x14qwak.logging.service\"\xca\x04\n\tLogSource\x12\x41\n\rmodel_runtime\x18\x01 \x01(\x0b\x32(.qwak.logging.service.ModelRuntimeSourceH\x00\x12?\n\x0cremote_build\x18\x02 \x01(\x0b\x32\'.qwak.logging.service.RemoteBuildSourceH\x00\x12M\n\x13inference_execution\x18\x03 \x01(\x0b\x32..qwak.logging.service.InferenceExecutionSourceH\x00\x12P\n\x15streaming_feature_set\x18\x04 \x01(\x0b\x32/.qwak.logging.service.StreamingFeatureSetSourceH\x00\x12g\n!streaming_aggregation_feature_set\x18\x05 \x01(\x0b\x32:.qwak.logging.service.StreamingAggregationFeatureSetSourceH\x00\x12H\n\x11\x62\x61tch_feature_set\x18\x06 \x01(\x0b\x32+.qwak.logging.service.BatchFeatureSetSourceH\x00\x12[\n\x1breal_time_feature_extractor\x18\x07 \x01(\x0b\x32\x34.qwak.logging.service.RealTimeFeatureExtractorSourceH\x00\x42\x08\n\x06source\"f\n\x11RemoteBuildSource\x12\x18\n\x10model_group_name\x18\x03 \x01(\t\x12\x12\n\nmodel_name\x18\x04 \x01(\t\x12\x10\n\x08\x62uild_id\x18\x01 \x01(\t\x12\x11\n\tphase_ids\x18\x02 \x03(\t\"|\n\x12ModelRuntimeSource\x12\x18\n\x10model_group_name\x18\x03 \x01(\t\x12\x12\n\nmodel_name\x18\x04 \x01(\t\x12\x17\n\rdeployment_id\x18\x01 \x01(\tH\x00\x12\x12\n\x08\x62uild_id\x18\x02 \x01(\tH\x00\x42\x0b\n\tsearch_by\"\x8e\x01\n\x18InferenceExecutionSource\x12\x18\n\x10model_group_name\x18\x03 \x01(\t\x12\x12\n\nmodel_name\x18\x04 \x01(\t\x12\x1a\n\x10inference_job_id\x18\x01 \x01(\tH\x00\x12\x1b\n\x11inference_task_id\x18\x02 \x01(\tH\x00\x42\x0b\n\tsearch_by\"\xe4\x01\n\x19StreamingFeatureSetSource\x12\x16\n\x0e\x66\x65\x61ture_set_id\x18\x01 \x01(\t\x12\x18\n\x10\x66\x65\x61ture_set_name\x18\x02 \x01(\t\x12#\n\x1b\x66\x65\x61ture_set_repository_name\x18\x05 \x01(\t\x12\x34\n\x07offline\x18\x03 \x01(\x0b\x32!.qwak.logging.service.OfflineTypeH\x00\x12\x32\n\x06online\x18\x04 \x01(\x0b\x32 .qwak.logging.service.OnlineTypeH\x00\x42\x06\n\x04type\"\xa0\x01\n\x15\x42\x61tchFeatureSetSource\x12\x15\n\rfeatureset_id\x18\x01 \x01(\t\x12\x17\n\x0f\x66\x65\x61tureset_name\x18\x02 \x01(\t\x12#\n\x1b\x66\x65\x61ture_set_repository_name\x18\x04 \x01(\t\x12\"\n\x1a\x66ilter_by_feature_set_name\x18\x05 \x01(\x08\x12\x0e\n\x06run_id\x18\x03 \x01(\t\"\xdb\x01\n$StreamingAggregationFeatureSetSource\x12\x37\n\trow_level\x18\x01 \x01(\x0b\x32\".qwak.logging.service.RowLevelTypeH\x00\x12:\n\ncompaction\x18\x02 \x01(\x0b\x32$.qwak.logging.service.CompactionTypeH\x00\x12\x36\n\x08\x62\x61\x63kfill\x18\x03 \x01(\x0b\x32\".qwak.logging.service.BackfillTypeH\x00\x42\x06\n\x04type\"c\n\nOnlineType\x12\x16\n\x0e\x66\x65\x61ture_set_id\x18\x01 \x01(\t\x12\x18\n\x10\x66\x65\x61ture_set_name\x18\x02 \x01(\t\x12#\n\x1b\x66\x65\x61ture_set_repository_name\x18\x03 \x01(\t\"t\n\x0bOfflineType\x12\x16\n\x0e\x66\x65\x61ture_set_id\x18\x01 \x01(\t\x12\x18\n\x10\x66\x65\x61ture_set_name\x18\x02 \x01(\t\x12#\n\x1b\x66\x65\x61ture_set_repository_name\x18\x04 \x01(\t\x12\x0e\n\x06run_id\x18\x03 \x01(\t\"e\n\x0cRowLevelType\x12\x16\n\x0e\x66\x65\x61ture_set_id\x18\x01 \x01(\t\x12\x18\n\x10\x66\x65\x61ture_set_name\x18\x02 \x01(\t\x12#\n\x1b\x66\x65\x61ture_set_repository_name\x18\x03 \x01(\t\"w\n\x0e\x43ompactionType\x12\x16\n\x0e\x66\x65\x61ture_set_id\x18\x01 \x01(\t\x12\x18\n\x10\x66\x65\x61ture_set_name\x18\x02 \x01(\t\x12#\n\x1b\x66\x65\x61ture_set_repository_name\x18\x04 \x01(\t\x12\x0e\n\x06run_id\x18\x03 \x01(\t\"e\n\x0c\x42\x61\x63kfillType\x12\x16\n\x0e\x66\x65\x61ture_set_id\x18\x01 \x01(\t\x12\x18\n\x10\x66\x65\x61ture_set_name\x18\x02 \x01(\t\x12#\n\x1b\x66\x65\x61ture_set_repository_name\x18\x03 \x01(\t\"H\n\x1eRealTimeFeatureExtractorSource\x12&\n\x1ereal_time_feature_extractor_id\x18\x01 \x01(\tB\"\n\x1e\x63om.qwak.ai.logging.reader.apiP\x01\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1dqwak/logging/log_source.proto\x12\x14qwak.logging.service\"\xca\x04\n\tLogSource\x12\x41\n\rmodel_runtime\x18\x01 \x01(\x0b\x32(.qwak.logging.service.ModelRuntimeSourceH\x00\x12?\n\x0cremote_build\x18\x02 \x01(\x0b\x32\'.qwak.logging.service.RemoteBuildSourceH\x00\x12M\n\x13inference_execution\x18\x03 \x01(\x0b\x32..qwak.logging.service.InferenceExecutionSourceH\x00\x12P\n\x15streaming_feature_set\x18\x04 \x01(\x0b\x32/.qwak.logging.service.StreamingFeatureSetSourceH\x00\x12g\n!streaming_aggregation_feature_set\x18\x05 \x01(\x0b\x32:.qwak.logging.service.StreamingAggregationFeatureSetSourceH\x00\x12H\n\x11\x62\x61tch_feature_set\x18\x06 \x01(\x0b\x32+.qwak.logging.service.BatchFeatureSetSourceH\x00\x12[\n\x1breal_time_feature_extractor\x18\x07 \x01(\x0b\x32\x34.qwak.logging.service.RealTimeFeatureExtractorSourceH\x00\x42\x08\n\x06source\"\x92\x01\n\x11RemoteBuildSource\x12\x18\n\x10model_group_name\x18\x03 \x01(\t\x12\x16\n\nmodel_name\x18\x04 \x01(\tB\x02\x18\x01\x12\x12\n\x08model_id\x18\x05 \x01(\tH\x00\x12\x10\n\x08\x62uild_id\x18\x01 \x01(\t\x12\x11\n\tphase_ids\x18\x02 \x03(\tB\x12\n\x10model_identifier\"\xa8\x01\n\x12ModelRuntimeSource\x12\x18\n\x10model_group_name\x18\x03 \x01(\t\x12\x16\n\nmodel_name\x18\x04 \x01(\tB\x02\x18\x01\x12\x12\n\x08model_id\x18\x05 \x01(\tH\x00\x12\x17\n\rdeployment_id\x18\x01 \x01(\tH\x01\x12\x12\n\x08\x62uild_id\x18\x02 \x01(\tH\x01\x42\x12\n\x10model_identifierB\x0b\n\tsearch_by\"\xba\x01\n\x18InferenceExecutionSource\x12\x18\n\x10model_group_name\x18\x03 \x01(\t\x12\x16\n\nmodel_name\x18\x04 \x01(\tB\x02\x18\x01\x12\x12\n\x08model_id\x18\x05 \x01(\tH\x00\x12\x1a\n\x10inference_job_id\x18\x01 \x01(\tH\x01\x12\x1b\n\x11inference_task_id\x18\x02 \x01(\tH\x01\x42\x12\n\x10model_identifierB\x0b\n\tsearch_by\"\xe4\x01\n\x19StreamingFeatureSetSource\x12\x16\n\x0e\x66\x65\x61ture_set_id\x18\x01 \x01(\t\x12\x18\n\x10\x66\x65\x61ture_set_name\x18\x02 \x01(\t\x12#\n\x1b\x66\x65\x61ture_set_repository_name\x18\x05 \x01(\t\x12\x34\n\x07offline\x18\x03 \x01(\x0b\x32!.qwak.logging.service.OfflineTypeH\x00\x12\x32\n\x06online\x18\x04 \x01(\x0b\x32 .qwak.logging.service.OnlineTypeH\x00\x42\x06\n\x04type\"\xa0\x01\n\x15\x42\x61tchFeatureSetSource\x12\x15\n\rfeatureset_id\x18\x01 \x01(\t\x12\x17\n\x0f\x66\x65\x61tureset_name\x18\x02 \x01(\t\x12#\n\x1b\x66\x65\x61ture_set_repository_name\x18\x04 \x01(\t\x12\"\n\x1a\x66ilter_by_feature_set_name\x18\x05 \x01(\x08\x12\x0e\n\x06run_id\x18\x03 \x01(\t\"\xdb\x01\n$StreamingAggregationFeatureSetSource\x12\x37\n\trow_level\x18\x01 \x01(\x0b\x32\".qwak.logging.service.RowLevelTypeH\x00\x12:\n\ncompaction\x18\x02 \x01(\x0b\x32$.qwak.logging.service.CompactionTypeH\x00\x12\x36\n\x08\x62\x61\x63kfill\x18\x03 \x01(\x0b\x32\".qwak.logging.service.BackfillTypeH\x00\x42\x06\n\x04type\"c\n\nOnlineType\x12\x16\n\x0e\x66\x65\x61ture_set_id\x18\x01 \x01(\t\x12\x18\n\x10\x66\x65\x61ture_set_name\x18\x02 \x01(\t\x12#\n\x1b\x66\x65\x61ture_set_repository_name\x18\x03 \x01(\t\"t\n\x0bOfflineType\x12\x16\n\x0e\x66\x65\x61ture_set_id\x18\x01 \x01(\t\x12\x18\n\x10\x66\x65\x61ture_set_name\x18\x02 \x01(\t\x12#\n\x1b\x66\x65\x61ture_set_repository_name\x18\x04 \x01(\t\x12\x0e\n\x06run_id\x18\x03 \x01(\t\"e\n\x0cRowLevelType\x12\x16\n\x0e\x66\x65\x61ture_set_id\x18\x01 \x01(\t\x12\x18\n\x10\x66\x65\x61ture_set_name\x18\x02 \x01(\t\x12#\n\x1b\x66\x65\x61ture_set_repository_name\x18\x03 \x01(\t\"w\n\x0e\x43ompactionType\x12\x16\n\x0e\x66\x65\x61ture_set_id\x18\x01 \x01(\t\x12\x18\n\x10\x66\x65\x61ture_set_name\x18\x02 \x01(\t\x12#\n\x1b\x66\x65\x61ture_set_repository_name\x18\x04 \x01(\t\x12\x0e\n\x06run_id\x18\x03 \x01(\t\"e\n\x0c\x42\x61\x63kfillType\x12\x16\n\x0e\x66\x65\x61ture_set_id\x18\x01 \x01(\t\x12\x18\n\x10\x66\x65\x61ture_set_name\x18\x02 \x01(\t\x12#\n\x1b\x66\x65\x61ture_set_repository_name\x18\x03 \x01(\t\"H\n\x1eRealTimeFeatureExtractorSource\x12&\n\x1ereal_time_feature_extractor_id\x18\x01 \x01(\tB\"\n\x1e\x63om.qwak.ai.logging.reader.apiP\x01\x62\x06proto3')
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -22,30 +22,36 @@ _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'qwak.logging.log_source_pb2
 if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['DESCRIPTOR']._options = None
   _globals['DESCRIPTOR']._serialized_options = b'\n\036com.qwak.ai.logging.reader.apiP\001'
+  _globals['_REMOTEBUILDSOURCE'].fields_by_name['model_name']._options = None
+  _globals['_REMOTEBUILDSOURCE'].fields_by_name['model_name']._serialized_options = b'\030\001'
+  _globals['_MODELRUNTIMESOURCE'].fields_by_name['model_name']._options = None
+  _globals['_MODELRUNTIMESOURCE'].fields_by_name['model_name']._serialized_options = b'\030\001'
+  _globals['_INFERENCEEXECUTIONSOURCE'].fields_by_name['model_name']._options = None
+  _globals['_INFERENCEEXECUTIONSOURCE'].fields_by_name['model_name']._serialized_options = b'\030\001'
   _globals['_LOGSOURCE']._serialized_start=56
   _globals['_LOGSOURCE']._serialized_end=642
-  _globals['_REMOTEBUILDSOURCE']._serialized_start=644
-  _globals['_REMOTEBUILDSOURCE']._serialized_end=746
-  _globals['_MODELRUNTIMESOURCE']._serialized_start=748
-  _globals['_MODELRUNTIMESOURCE']._serialized_end=872
-  _globals['_INFERENCEEXECUTIONSOURCE']._serialized_start=875
-  _globals['_INFERENCEEXECUTIONSOURCE']._serialized_end=1017
-  _globals['_STREAMINGFEATURESETSOURCE']._serialized_start=1020
-  _globals['_STREAMINGFEATURESETSOURCE']._serialized_end=1248
-  _globals['_BATCHFEATURESETSOURCE']._serialized_start=1251
-  _globals['_BATCHFEATURESETSOURCE']._serialized_end=1411
-  _globals['_STREAMINGAGGREGATIONFEATURESETSOURCE']._serialized_start=1414
-  _globals['_STREAMINGAGGREGATIONFEATURESETSOURCE']._serialized_end=1633
-  _globals['_ONLINETYPE']._serialized_start=1635
-  _globals['_ONLINETYPE']._serialized_end=1734
-  _globals['_OFFLINETYPE']._serialized_start=1736
-  _globals['_OFFLINETYPE']._serialized_end=1852
-  _globals['_ROWLEVELTYPE']._serialized_start=1854
-  _globals['_ROWLEVELTYPE']._serialized_end=1955
-  _globals['_COMPACTIONTYPE']._serialized_start=1957
-  _globals['_COMPACTIONTYPE']._serialized_end=2076
-  _globals['_BACKFILLTYPE']._serialized_start=2078
-  _globals['_BACKFILLTYPE']._serialized_end=2179
-  _globals['_REALTIMEFEATUREEXTRACTORSOURCE']._serialized_start=2181
-  _globals['_REALTIMEFEATUREEXTRACTORSOURCE']._serialized_end=2253
+  _globals['_REMOTEBUILDSOURCE']._serialized_start=645
+  _globals['_REMOTEBUILDSOURCE']._serialized_end=791
+  _globals['_MODELRUNTIMESOURCE']._serialized_start=794
+  _globals['_MODELRUNTIMESOURCE']._serialized_end=962
+  _globals['_INFERENCEEXECUTIONSOURCE']._serialized_start=965
+  _globals['_INFERENCEEXECUTIONSOURCE']._serialized_end=1151
+  _globals['_STREAMINGFEATURESETSOURCE']._serialized_start=1154
+  _globals['_STREAMINGFEATURESETSOURCE']._serialized_end=1382
+  _globals['_BATCHFEATURESETSOURCE']._serialized_start=1385
+  _globals['_BATCHFEATURESETSOURCE']._serialized_end=1545
+  _globals['_STREAMINGAGGREGATIONFEATURESETSOURCE']._serialized_start=1548
+  _globals['_STREAMINGAGGREGATIONFEATURESETSOURCE']._serialized_end=1767
+  _globals['_ONLINETYPE']._serialized_start=1769
+  _globals['_ONLINETYPE']._serialized_end=1868
+  _globals['_OFFLINETYPE']._serialized_start=1870
+  _globals['_OFFLINETYPE']._serialized_end=1986
+  _globals['_ROWLEVELTYPE']._serialized_start=1988
+  _globals['_ROWLEVELTYPE']._serialized_end=2089
+  _globals['_COMPACTIONTYPE']._serialized_start=2091
+  _globals['_COMPACTIONTYPE']._serialized_end=2210
+  _globals['_BACKFILLTYPE']._serialized_start=2212
+  _globals['_BACKFILLTYPE']._serialized_end=2313
+  _globals['_REALTIMEFEATUREEXTRACTORSOURCE']._serialized_start=2315
+  _globals['_REALTIMEFEATUREEXTRACTORSOURCE']._serialized_end=2387
 # @@protoc_insertion_point(module_scope)

frogml/_proto/qwak/logging/log_source_pb2.pyi CHANGED Viewed

@@ -64,6 +64,7 @@ class RemoteBuildSource(google.protobuf.message.Message):
     MODEL_GROUP_NAME_FIELD_NUMBER: builtins.int
     MODEL_NAME_FIELD_NUMBER: builtins.int
+    MODEL_ID_FIELD_NUMBER: builtins.int
     BUILD_ID_FIELD_NUMBER: builtins.int
     PHASE_IDS_FIELD_NUMBER: builtins.int
     model_group_name: builtins.str
@@ -71,9 +72,9 @@ class RemoteBuildSource(google.protobuf.message.Message):
     This field is mandatory
     """
     model_name: builtins.str
-    """Model name - for verifying user permissions
-    This field is mandatory
-    """
+    """This field is identical to model_id, use model_id instead"""
+    model_id: builtins.str
+    """Model id (human readable name)"""
     build_id: builtins.str
     """Filter by build id"""
     @property
@@ -85,10 +86,13 @@ class RemoteBuildSource(google.protobuf.message.Message):
         *,
         model_group_name: builtins.str = ...,
         model_name: builtins.str = ...,
+        model_id: builtins.str = ...,
         build_id: builtins.str = ...,
         phase_ids: collections.abc.Iterable[builtins.str] | None = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["build_id", b"build_id", "model_group_name", b"model_group_name", "model_name", b"model_name", "phase_ids", b"phase_ids"]) -> None: ...
+    def HasField(self, field_name: typing.Literal["model_id", b"model_id", "model_identifier", b"model_identifier"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing.Literal["build_id", b"build_id", "model_group_name", b"model_group_name", "model_id", b"model_id", "model_identifier", b"model_identifier", "model_name", b"model_name", "phase_ids", b"phase_ids"]) -> None: ...
+    def WhichOneof(self, oneof_group: typing.Literal["model_identifier", b"model_identifier"]) -> typing.Literal["model_id"] | None: ...
 global___RemoteBuildSource = RemoteBuildSource
@@ -100,6 +104,7 @@ class ModelRuntimeSource(google.protobuf.message.Message):
     MODEL_GROUP_NAME_FIELD_NUMBER: builtins.int
     MODEL_NAME_FIELD_NUMBER: builtins.int
+    MODEL_ID_FIELD_NUMBER: builtins.int
     DEPLOYMENT_ID_FIELD_NUMBER: builtins.int
     BUILD_ID_FIELD_NUMBER: builtins.int
     model_group_name: builtins.str
@@ -107,9 +112,9 @@ class ModelRuntimeSource(google.protobuf.message.Message):
     This field is mandatory
     """
     model_name: builtins.str
-    """Model name - for verifying user permissions
-    This field is mandatory
-    """
+    """This field is identical to model_id, use model_id instead"""
+    model_id: builtins.str
+    """Model id (human readable name)"""
     deployment_id: builtins.str
     """Filter by deployment id"""
     build_id: builtins.str
@@ -119,11 +124,15 @@ class ModelRuntimeSource(google.protobuf.message.Message):
         *,
         model_group_name: builtins.str = ...,
         model_name: builtins.str = ...,
+        model_id: builtins.str = ...,
         deployment_id: builtins.str = ...,
         build_id: builtins.str = ...,
     ) -> None: ...
-    def HasField(self, field_name: typing.Literal["build_id", b"build_id", "deployment_id", b"deployment_id", "search_by", b"search_by"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["build_id", b"build_id", "deployment_id", b"deployment_id", "model_group_name", b"model_group_name", "model_name", b"model_name", "search_by", b"search_by"]) -> None: ...
+    def HasField(self, field_name: typing.Literal["build_id", b"build_id", "deployment_id", b"deployment_id", "model_id", b"model_id", "model_identifier", b"model_identifier", "search_by", b"search_by"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing.Literal["build_id", b"build_id", "deployment_id", b"deployment_id", "model_group_name", b"model_group_name", "model_id", b"model_id", "model_identifier", b"model_identifier", "model_name", b"model_name", "search_by", b"search_by"]) -> None: ...
+    @typing.overload
+    def WhichOneof(self, oneof_group: typing.Literal["model_identifier", b"model_identifier"]) -> typing.Literal["model_id"] | None: ...
+    @typing.overload
     def WhichOneof(self, oneof_group: typing.Literal["search_by", b"search_by"]) -> typing.Literal["deployment_id", "build_id"] | None: ...
 global___ModelRuntimeSource = ModelRuntimeSource
@@ -134,6 +143,7 @@ class InferenceExecutionSource(google.protobuf.message.Message):
     MODEL_GROUP_NAME_FIELD_NUMBER: builtins.int
     MODEL_NAME_FIELD_NUMBER: builtins.int
+    MODEL_ID_FIELD_NUMBER: builtins.int
     INFERENCE_JOB_ID_FIELD_NUMBER: builtins.int
     INFERENCE_TASK_ID_FIELD_NUMBER: builtins.int
     model_group_name: builtins.str
@@ -141,9 +151,9 @@ class InferenceExecutionSource(google.protobuf.message.Message):
     This field is mandatory
     """
     model_name: builtins.str
-    """Model name - for verifying user permissions
-    This field is mandatory
-    """
+    """This field is identical to model_id, use model_id instead"""
+    model_id: builtins.str
+    """Model id (human readable name)"""
     inference_job_id: builtins.str
     """Filter by deployment id"""
     inference_task_id: builtins.str
@@ -153,11 +163,15 @@ class InferenceExecutionSource(google.protobuf.message.Message):
         *,
         model_group_name: builtins.str = ...,
         model_name: builtins.str = ...,
+        model_id: builtins.str = ...,
         inference_job_id: builtins.str = ...,
         inference_task_id: builtins.str = ...,
     ) -> None: ...
-    def HasField(self, field_name: typing.Literal["inference_job_id", b"inference_job_id", "inference_task_id", b"inference_task_id", "search_by", b"search_by"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["inference_job_id", b"inference_job_id", "inference_task_id", b"inference_task_id", "model_group_name", b"model_group_name", "model_name", b"model_name", "search_by", b"search_by"]) -> None: ...
+    def HasField(self, field_name: typing.Literal["inference_job_id", b"inference_job_id", "inference_task_id", b"inference_task_id", "model_id", b"model_id", "model_identifier", b"model_identifier", "search_by", b"search_by"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing.Literal["inference_job_id", b"inference_job_id", "inference_task_id", b"inference_task_id", "model_group_name", b"model_group_name", "model_id", b"model_id", "model_identifier", b"model_identifier", "model_name", b"model_name", "search_by", b"search_by"]) -> None: ...
+    @typing.overload
+    def WhichOneof(self, oneof_group: typing.Literal["model_identifier", b"model_identifier"]) -> typing.Literal["model_id"] | None: ...
+    @typing.overload
     def WhichOneof(self, oneof_group: typing.Literal["search_by", b"search_by"]) -> typing.Literal["inference_job_id", "inference_task_id"] | None: ...
 global___InferenceExecutionSource = InferenceExecutionSource

frogml/core/clients/batch_job_management/client.py CHANGED Viewed

@@ -71,7 +71,7 @@ from .results import (
     GetExecutionReportResult,
     StartExecutionResult,
 )
-from typing import List
+from typing import List, Optional
 CLIENT_TIMEOUT = 180  # Seconds
@@ -359,15 +359,21 @@ class BatchJobManagerClient:
         except grpc.RpcError as e:
             raise FrogmlException(f"Failed to cancel execution, error is {e}")
-    def get_execution_report(self, execution_id: str) -> GetExecutionReportResult:
+    def get_execution_report(
+        self,
+        execution_id: str,
+        model_id: Optional[str] = None,
+        model_group_name: Optional[str] = None,
+    ) -> GetExecutionReportResult:
         """
         Args:
-            execution_id: the batch execution id to get the current status of
+            execution_id: The batch execution id to get the report for.
+            model_id: The model ID. This is the display name(identifier), not the UUID.
+            model_group_name: The model group name.
         Returns:
-            A full report of all the events that occurred as part of the execution job
+            A full report of all the events that occurred as part of the execution job.
         """
         try:
             self.logging_client = (
@@ -383,7 +389,9 @@ class BatchJobManagerClient:
             try:
                 execution_log_response: ReadLogsResponse = (
                     self.logging_client.read_execution_models_logs(
-                        execution_id=execution_id
+                        execution_id=execution_id,
+                        model_id=model_id,
+                        model_group_name=model_group_name,
                     )
                 )
                 execution_logs = execution_log_response.log_line

frogml/core/clients/logging_client/client.py CHANGED Viewed

@@ -49,15 +49,41 @@ class LoggingClient:
     def read_build_logs(
         self,
-        build_id=None,
-        before_offset=None,
-        after_offset=None,
-        max_number_of_results=None,
-        log_text_filter=None,
-    ):
+        build_id: Optional[str] = None,
+        before_offset: Optional[str] = None,
+        after_offset: Optional[str] = None,
+        max_number_of_results: Optional[int] = None,
+        log_text_filter: Optional[str] = None,
+        model_id: Optional[str] = None,
+        model_group_name: Optional[str] = None,
+    ) -> ReadLogsResponse:
+        """
+        Read logs for a remote build.
+        Args:
+            build_id: The build ID to fetch logs for
+            before_offset: Optional offset to read logs before this point
+            after_offset: Optional offset to read logs after this point
+            max_number_of_results: Optional maximum number of log lines to return
+            log_text_filter: Optional text filter to search for in logs
+            model_id: The model ID. This is the display name(identifier), not the UUID.
+            model_group_name: The model group name.
+        Returns:
+            ReadLogsResponse containing the log lines
+        Raises:
+            FrogmlException: If reading logs fails
+        """
         try:
+            remote_build_source = RemoteBuildSource(
+                build_id=build_id,
+                model_id=model_id,
+                model_group_name=model_group_name,
+            )
             response = self.read_logs(
-                source=LogSource(remote_build=RemoteBuildSource(build_id=build_id)),
+                source=LogSource(remote_build=remote_build_source),
                 before_offset=before_offset,
                 after_offset=after_offset,
                 log_text_filter=log_text_filter,
@@ -70,20 +96,44 @@ class LoggingClient:
     def read_model_runtime_logs(
         self,
-        build_id=None,
-        deployment_id=None,
-        before_offset=None,
-        after_offset=None,
-        max_number_of_results=None,
-        log_text_filter=None,
+        build_id: Optional[str] = None,
+        deployment_id: Optional[str] = None,
+        before_offset: Optional[str] = None,
+        after_offset: Optional[str] = None,
+        max_number_of_results: Optional[int] = None,
+        log_text_filter: Optional[str] = None,
+        model_id: Optional[str] = None,
+        model_group_name: Optional[str] = None,
     ) -> ReadLogsResponse:
+        """
+        Read logs for a model runtime (deployment).
+        Args:
+            build_id: The build ID to fetch logs for
+            deployment_id: The deployment ID to fetch logs for
+            before_offset: Optional offset to read logs before this point
+            after_offset: Optional offset to read logs after this point
+            max_number_of_results: Optional maximum number of log lines to return
+            log_text_filter: Optional text filter to search for in logs
+            model_id: The model ID. This is the display name(identifier), not the UUID.
+            model_group_name: The model group name.
+        Returns:
+            ReadLogsResponse containing the log lines
+        Raises:
+            FrogmlException: If reading logs fails
+        """
         try:
+            model_runtime_source = ModelRuntimeSource(
+                build_id=build_id,
+                deployment_id=deployment_id,
+                model_id=model_id,
+                model_group_name=model_group_name,
+            )
             response = self.read_logs(
-                source=LogSource(
-                    model_runtime=ModelRuntimeSource(
-                        build_id=build_id, deployment_id=deployment_id
-                    )
-                ),
+                source=LogSource(model_runtime=model_runtime_source),
                 before_offset=before_offset,
                 after_offset=after_offset,
                 log_text_filter=log_text_filter,
@@ -96,19 +146,41 @@ class LoggingClient:
     def read_execution_models_logs(
         self,
-        execution_id,
-        before_offset=None,
-        after_offset=None,
-        max_number_of_results=None,
-        log_text_filter=None,
+        execution_id: str,
+        before_offset: Optional[str] = None,
+        after_offset: Optional[str] = None,
+        max_number_of_results: Optional[int] = None,
+        log_text_filter: Optional[str] = None,
+        model_id: Optional[str] = None,
+        model_group_name: Optional[str] = None,
     ) -> ReadLogsResponse:
+        """
+        Read logs for a model inference execution (batch job).
+        Args:
+            execution_id: The execution/inference job ID to fetch logs for
+            before_offset: Optional offset to read logs before this point
+            after_offset: Optional offset to read logs after this point
+            max_number_of_results: Optional maximum number of log lines to return
+            log_text_filter: Optional text filter to search for in logs
+            model_id: The model ID. This is the display name(identifier), not the UUID.
+            model_group_name: The model group name.
+        Returns:
+            ReadLogsResponse containing the log lines
+        Raises:
+            FrogmlException: If reading logs fails
+        """
         try:
+            inference_execution_source = InferenceExecutionSource(
+                inference_job_id=execution_id,
+                model_id=model_id,
+                model_group_name=model_group_name,
+            )
             response = self.read_logs(
-                source=LogSource(
-                    inference_execution=InferenceExecutionSource(
-                        inference_job_id=execution_id
-                    )
-                ),
+                source=LogSource(inference_execution=inference_execution_source),
                 before_offset=before_offset,
                 after_offset=after_offset,
                 log_text_filter=log_text_filter,
@@ -122,12 +194,25 @@ class LoggingClient:
     @grpc_try_catch_wrapper("Failed to read logs request")
     def read_logs(
         self,
-        source,
-        before_offset,
-        after_offset,
-        max_number_of_results,
-        log_text_filter,
+        source: LogSource,
+        before_offset: Optional[str],
+        after_offset: Optional[str],
+        max_number_of_results: Optional[int],
+        log_text_filter: Optional[str],
     ) -> ReadLogsResponse:
+        """
+        Low-level method to read logs from any source.
+        Args:
+            source: The log source to read from
+            before_offset: Optional offset to read logs before this point
+            after_offset: Optional offset to read logs after this point
+            max_number_of_results: Optional maximum number of log lines to return
+            log_text_filter: Optional text filter to search for in logs
+        Returns:
+            ReadLogsResponse containing the log lines
+        """
         response: ReadLogsResponse = self._logging_service.ReadLogs(
             ReadLogsRequest(
                 source=source,

{frogml-1.2.35.dist-info → frogml-1.2.38.dist-info}/METADATA RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: frogml
-Version: 1.2.35
+Version: 1.2.38
 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.35.dist-info → frogml-1.2.38.dist-info}/RECORD RENAMED Viewed

@@ -1,4 +1,4 @@
-frogml/__init__.py,sha256=qCiP-lN6Bb32rwIiGrzBPQVv6qPplDfH17uU5IH8bIU,741
+frogml/__init__.py,sha256=I4yJ_02i6XF65Grp6rwHpt87lTM97-QfQ_XPNBP1DMk,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
@@ -530,8 +530,8 @@ frogml/_proto/qwak/logging/log_line_pb2_grpc.py,sha256=1oboBPFxaTEXt9Aw7EAj8gXHD
 frogml/_proto/qwak/logging/log_reader_service_pb2.py,sha256=mGzDgASTP_oJlVcPkId5JxjhpUbh7O_CQ9xbcQRUOXI,2561
 frogml/_proto/qwak/logging/log_reader_service_pb2.pyi,sha256=KdIIgfFCw0I-51d2dEMZy3zVgkGw4tZNF26WcR5yNz4,3451
 frogml/_proto/qwak/logging/log_reader_service_pb2_grpc.py,sha256=5iwiKKEWLCgNl6KyUanuUFpsg-159HgiF6ugMvGgW9k,2833
-frogml/_proto/qwak/logging/log_source_pb2.py,sha256=KfVCEihMIVtJ2vVMR0jdiFCUsdY9RDJ7YDBVyzps-fk,6170
-frogml/_proto/qwak/logging/log_source_pb2.pyi,sha256=YJ3xGWEgG4dF9CvsF_X1dBITgHMxs7IdkGsWQ4G0uNg,18672
+frogml/_proto/qwak/logging/log_source_pb2.py,sha256=7wzXkpjxW6tEYJ-hZJ1s_7eB1G5m2K2_WEjL8NtyfqY,6971
+frogml/_proto/qwak/logging/log_source_pb2.pyi,sha256=9ekSIfto3LP-e2pyVwHjx_ewbDxaHpQf_siyT4zdP_4,20017
 frogml/_proto/qwak/logging/log_source_pb2_grpc.py,sha256=1oboBPFxaTEXt9Aw7EAj8gXHDCNMhZD2VXqocC9l_gk,159
 frogml/_proto/qwak/model_descriptor/open_ai_descriptor_pb2.py,sha256=-4tcS6KSdpUK3knQ9YUyQTsMcHFaPTQ3A8kHPOLVPSQ,4203
 frogml/_proto/qwak/model_descriptor/open_ai_descriptor_pb2.pyi,sha256=7ZaPgYKgRhZvq9LMaj7jWlQxKhQ9fRUDK86SaJvMuu0,11801
@@ -656,7 +656,7 @@ frogml/core/clients/automation_management/client.py,sha256=Dk6SsZGMLaVDLLzvFBysL
 frogml/core/clients/autoscaling/__init__.py,sha256=A-zuZOWaZf16NjnpX38204m730c5Lde491KaXneGirE,38
 frogml/core/clients/autoscaling/client.py,sha256=d1BoUH4hBiqoSR6ZM2_Ds6H7gV9HZPM2IIYNDbjPGgY,1299
 frogml/core/clients/batch_job_management/__init__.py,sha256=zywxYf2JupkIWnGVB2C6ugZs5CrOdxTPrksD5P6uQu4,211
-frogml/core/clients/batch_job_management/client.py,sha256=yym_GRJlB2qWnFf58EK2i7iD4llSj3FwmjdmIEdBSRc,22621
+frogml/core/clients/batch_job_management/client.py,sha256=TBN_9MkHXW342PLRepUckuQmA_gLPPrq5VavkkDtnCQ,22979
 frogml/core/clients/batch_job_management/executions_config.py,sha256=tyQbNiIAo3U4t_vyQp8nY17U0oQIyuE5GLW5WqhDxjA,7045
 frogml/core/clients/batch_job_management/results.py,sha256=nrFGZ3y538FBhej94CYV4cwqQssK1aUQOLGubYdQVrc,1846
 frogml/core/clients/build_orchestrator/__init__.py,sha256=ReW7Lbjws06MbVlCTRdsymDZiS2CKuczXIZ1xnPKSdg,105
@@ -691,7 +691,7 @@ frogml/core/clients/kube_deployment_captain/client.py,sha256=la4V7WsVL1z4zuLQtPZ
 frogml/core/clients/location_discovery/__init__.py,sha256=sqGQ75YHFE6nvOcir38fykUUmAa6cFEIze8PJYgYWRc,44
 frogml/core/clients/location_discovery/client.py,sha256=ZcBbbLqzZ9E7oLyamBTLTpp611LldhfFOSkzWroyIQg,2895
 frogml/core/clients/logging_client/__init__.py,sha256=1OCHnigQBYThBwGbxCreYA0BgP0HcuLFzNEWd3Yxh-c,34
-frogml/core/clients/logging_client/client.py,sha256=vq2Fv7UAEnrG910Npp1COxxWQ2_NWofbAStPkLhiz1w,4836
+frogml/core/clients/logging_client/client.py,sha256=ZTRRPrcM2cqrZX9T3DvIr0YICrhDK91P4CDP-ei_ZjQ,8599
 frogml/core/clients/model_group_management/__init__.py,sha256=f-nExP4vGWoWMUrRstY8QdtPqXnbsl2Ux0KfFkvGBkg,47
 frogml/core/clients/model_group_management/client.py,sha256=F8YCbfyphcljb8WxpeY7H7wnPpksyaKQ2ZOKi03RU6M,2016
 frogml/core/clients/model_management/__init__.py,sha256=vjWVP8MjmK4_A70WOgJqa6x24AeLK-ABjGJtogGzw9w,43
@@ -1147,6 +1147,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.35.dist-info/METADATA,sha256=VJC2cI-AIqs8Ut2FSG7oQQBYQsWpEWl39_C57crPn80,5599
-frogml-1.2.35.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-frogml-1.2.35.dist-info/RECORD,,
+frogml-1.2.38.dist-info/METADATA,sha256=dAmb_6Ua2nc4DBFf9lUgTIAM9Qo3LQ5I7MTFhDVF7HI,5599
+frogml-1.2.38.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+frogml-1.2.38.dist-info/RECORD,,

{frogml-1.2.35.dist-info → frogml-1.2.38.dist-info}/WHEEL RENAMED Viewed

File without changes

frogml 1.2.35__py3-none-any.whl → 1.2.38__py3-none-any.whl

frogml 1.2.35py3-none-any.whl → 1.2.38py3-none-any.whl