mlrun 1.6.4rc7__py3-none-any.whl → 1.7.0__py3-none-any.whl

mlrun/common/schemas/feature_store.py

@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from typing import List, Optional
+from typing import Optional
 
-from pydantic import BaseModel, Extra, Field
+import pydantic
 
 from .auth import AuthorizationResourceTypes, Credentials
 from .object import (
@@ -27,32 +27,42 @@ from .object import (
 )
 
 
-class Feature(BaseModel):
+class FeatureStoreBaseModel(pydantic.BaseModel):
+    """
+    Intermediate base class, in order to override pydantic's configuration, as per
+    https://docs.pydantic.dev/1.10/usage/model_config/#change-behaviour-globally
+    """
+
+    class Config:
+        copy_on_model_validation = "none"
+
+
+class Feature(FeatureStoreBaseModel):
     name: str
     value_type: str
     labels: Optional[dict] = {}
 
     class Config:
-        extra = Extra.allow
+        extra = pydantic.Extra.allow
 
 
-class Entity(BaseModel):
+class Entity(FeatureStoreBaseModel):
     name: str
     value_type: str
     labels: Optional[dict] = {}
 
     class Config:
-        extra = Extra.allow
+        extra = pydantic.Extra.allow
 
 
 class FeatureSetSpec(ObjectSpec):
-    entities: List[Entity] = []
-    features: List[Feature] = []
-    engine: Optional[str] = Field(default="storey")
+    entities: list[Entity] = []
+    features: list[Feature] = []
+    engine: Optional[str] = pydantic.Field(default="storey")
 
 
-class FeatureSet(BaseModel):
-    kind: ObjectKind = Field(ObjectKind.feature_set, const=True)
+class FeatureSet(FeatureStoreBaseModel):
+    kind: ObjectKind = pydantic.Field(ObjectKind.feature_set, const=True)
     metadata: ObjectMetadata
     spec: FeatureSetSpec
     status: ObjectStatus
@@ -62,70 +72,90 @@ class FeatureSet(BaseModel):
         return AuthorizationResourceTypes.feature_set
 
 
-class EntityRecord(BaseModel):
+class EntityRecord(FeatureStoreBaseModel):
     name: str
     value_type: str
-    labels: List[LabelRecord]
+    labels: list[LabelRecord]
 
     class Config:
         orm_mode = True
 
 
-class FeatureRecord(BaseModel):
+class FeatureRecord(FeatureStoreBaseModel):
     name: str
     value_type: str
-    labels: List[LabelRecord]
+    labels: list[LabelRecord]
 
     class Config:
         orm_mode = True
 
 
 class FeatureSetRecord(ObjectRecord):
-    entities: List[EntityRecord]
-    features: List[FeatureRecord]
+    entities: list[EntityRecord]
+    features: list[FeatureRecord]
 
     class Config:
         orm_mode = True
 
 
-class FeatureSetsOutput(BaseModel):
-    feature_sets: List[FeatureSet]
+class FeatureSetsOutput(FeatureStoreBaseModel):
+    feature_sets: list[FeatureSet]
 
 
-class FeatureSetsTagsOutput(BaseModel):
-    tags: List[str] = []
+class FeatureSetsTagsOutput(FeatureStoreBaseModel):
+    tags: list[str] = []
 
 
-class FeatureSetDigestSpec(BaseModel):
-    entities: List[Entity]
-    features: List[Feature]
+class FeatureSetDigestSpec(FeatureStoreBaseModel):
+    entities: list[Entity]
+    features: list[Feature]
 
 
-class FeatureSetDigestOutput(BaseModel):
+class FeatureSetDigestOutput(FeatureStoreBaseModel):
     metadata: ObjectMetadata
     spec: FeatureSetDigestSpec
 
 
-class FeatureListOutput(BaseModel):
+class FeatureSetDigestSpecV2(FeatureStoreBaseModel):
+    entities: list[Entity]
+
+
+class FeatureSetDigestOutputV2(FeatureStoreBaseModel):
+    feature_set_index: int
+    metadata: ObjectMetadata
+    spec: FeatureSetDigestSpecV2
+
+
+class FeatureListOutput(FeatureStoreBaseModel):
     feature: Feature
     feature_set_digest: FeatureSetDigestOutput
 
 
-class FeaturesOutput(BaseModel):
-    features: List[FeatureListOutput]
+class FeaturesOutput(FeatureStoreBaseModel):
+    features: list[FeatureListOutput]
+
 
+class FeaturesOutputV2(FeatureStoreBaseModel):
+    features: list[Feature]
+    feature_set_digests: list[FeatureSetDigestOutputV2]
 
-class EntityListOutput(BaseModel):
+
+class EntityListOutput(FeatureStoreBaseModel):
     entity: Entity
     feature_set_digest: FeatureSetDigestOutput
 
 
-class EntitiesOutput(BaseModel):
-    entities: List[EntityListOutput]
+class EntitiesOutputV2(FeatureStoreBaseModel):
+    entities: list[Entity]
+    feature_set_digests: list[FeatureSetDigestOutputV2]
+
+
+class EntitiesOutput(FeatureStoreBaseModel):
+    entities: list[EntityListOutput]
 
 
-class FeatureVector(BaseModel):
-    kind: ObjectKind = Field(ObjectKind.feature_vector, const=True)
+class FeatureVector(FeatureStoreBaseModel):
+    kind: ObjectKind = pydantic.Field(ObjectKind.feature_vector, const=True)
     metadata: ObjectMetadata
     spec: ObjectSpec
     status: ObjectStatus
@@ -139,39 +169,39 @@ class FeatureVectorRecord(ObjectRecord):
     pass
 
 
-class FeatureVectorsOutput(BaseModel):
-    feature_vectors: List[FeatureVector]
+class FeatureVectorsOutput(FeatureStoreBaseModel):
+    feature_vectors: list[FeatureVector]
 
 
-class FeatureVectorsTagsOutput(BaseModel):
-    tags: List[str] = []
+class FeatureVectorsTagsOutput(FeatureStoreBaseModel):
+    tags: list[str] = []
 
 
-class DataSource(BaseModel):
+class DataSource(FeatureStoreBaseModel):
     kind: str
     name: str
     path: str
 
     class Config:
-        extra = Extra.allow
+        extra = pydantic.Extra.allow
 
 
-class DataTarget(BaseModel):
+class DataTarget(FeatureStoreBaseModel):
     kind: str
     name: str
     path: Optional[str]
 
     class Config:
-        extra = Extra.allow
+        extra = pydantic.Extra.allow
 
 
-class FeatureSetIngestInput(BaseModel):
+class FeatureSetIngestInput(FeatureStoreBaseModel):
     source: Optional[DataSource]
-    targets: Optional[List[DataTarget]]
+    targets: Optional[list[DataTarget]]
     infer_options: Optional[int]
     credentials: Credentials = Credentials()
 
 
-class FeatureSetIngestOutput(BaseModel):
+class FeatureSetIngestOutput(FeatureStoreBaseModel):
     feature_set: FeatureSet
     run_object: dict

mlrun/common/schemas/frontend_spec.py

@@ -50,23 +50,31 @@ class FeatureFlags(pydantic.BaseModel):
     preemption_nodes: PreemptionNodesFeatureFlag
 
 
+class ArtifactLimits(pydantic.BaseModel):
+    max_chunk_size: int
+    max_preview_size: int
+    max_download_size: int
+
+
 class FrontendSpec(pydantic.BaseModel):
     jobs_dashboard_url: typing.Optional[str]
     model_monitoring_dashboard_url: typing.Optional[str]
-    abortable_function_kinds: typing.List[str] = []
+    abortable_function_kinds: list[str] = []
     feature_flags: FeatureFlags
     default_function_priority_class_name: typing.Optional[str]
-    valid_function_priority_class_names: typing.List[str] = []
-    default_function_image_by_kind: typing.Dict[str, str] = {}
+    valid_function_priority_class_names: list[str] = []
+    default_function_image_by_kind: dict[str, str] = {}
     function_deployment_target_image_template: typing.Optional[str]
     function_deployment_target_image_name_prefix_template: str
-    function_deployment_target_image_registries_to_enforce_prefix: typing.List[str] = []
+    function_deployment_target_image_registries_to_enforce_prefix: list[str] = []
     function_deployment_mlrun_requirement: typing.Optional[str]
     auto_mount_type: typing.Optional[str]
-    auto_mount_params: typing.Dict[str, str] = {}
+    auto_mount_params: dict[str, str] = {}
     default_artifact_path: str
     default_function_pod_resources: Resources = Resources()
     default_function_preemption_mode: str
-    feature_store_data_prefixes: typing.Optional[typing.Dict[str, str]]
-    allowed_artifact_path_prefixes_list: typing.List[str]
+    feature_store_data_prefixes: typing.Optional[dict[str, str]]
+    allowed_artifact_path_prefixes_list: list[str]
     ce: typing.Optional[dict]
+    internal_labels: list[str] = []
+    artifact_limits: ArtifactLimits

mlrun/common/schemas/function.py

@@ -45,6 +45,9 @@ class FunctionState:
     # same goes for the build which is not coming from the pod, but is used and we can't just omit it for BC reasons
     build = "build"
 
+    # for pipeline steps
+    skipped = "skipped"
+
     @classmethod
     def get_function_state_from_pod_state(cls, pod_state: str):
         if pod_state == "succeeded":
@@ -60,6 +63,7 @@ class FunctionState:
         return [
             cls.ready,
             cls.error,
+            cls.skipped,
         ]
 
 
@@ -106,7 +110,7 @@ class ServiceAccount(pydantic.BaseModel):
 
 
 class StateThresholds(pydantic.BaseModel):
-    default: typing.Optional[typing.Dict[str, str]]
+    default: typing.Optional[dict[str, str]]
 
 
 class FunctionSpec(pydantic.BaseModel):
@@ -115,6 +119,13 @@ class FunctionSpec(pydantic.BaseModel):
     service_account: typing.Optional[ServiceAccount]
     state_thresholds: typing.Optional[StateThresholds]
 
+    class Config:
+        extra = pydantic.Extra.allow
+
 
 class Function(pydantic.BaseModel):
     spec: typing.Optional[FunctionSpec]
+    application: typing.Optional[dict[str, typing.Any]]
+
+    class Config:
+        extra = pydantic.Extra.allow

mlrun/common/schemas/hub.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 from datetime import datetime, timezone
-from typing import Dict, List, Optional
+from typing import Optional
 
 from pydantic import BaseModel, Extra, Field
 
@@ -56,36 +56,29 @@ class HubSource(BaseModel):
     status: Optional[ObjectStatus] = ObjectStatus(state="created")
 
     def get_full_uri(self, relative_path):
-        return "{base}/{object_type}/{channel}/{relative_path}".format(
-            base=self.spec.path,
-            object_type=self.spec.object_type,
-            channel=self.spec.channel,
-            relative_path=relative_path,
-        )
+        return f"{self.spec.path}/{self.spec.object_type}/{self.spec.channel}/{relative_path}"
 
     def get_catalog_uri(self):
-        return self.get_full_uri(mlrun.config.config.hub.catalog_filename)
+        return self.get_full_uri(mlrun.mlconf.hub.catalog_filename)
 
     @classmethod
     def generate_default_source(cls):
-        if not mlrun.config.config.hub.default_source.create:
+        if not mlrun.mlconf.hub.default_source.create:
             return None
 
         now = datetime.now(timezone.utc)
         hub_metadata = HubObjectMetadata(
-            name=mlrun.config.config.hub.default_source.name,
-            description=mlrun.config.config.hub.default_source.description,
+            name=mlrun.mlconf.hub.default_source.name,
+            description=mlrun.mlconf.hub.default_source.description,
             created=now,
             updated=now,
         )
         return cls(
             metadata=hub_metadata,
             spec=HubSourceSpec(
-                path=mlrun.config.config.hub.default_source.url,
-                channel=mlrun.config.config.hub.default_source.channel,
-                object_type=HubSourceType(
-                    mlrun.config.config.hub.default_source.object_type
-                ),
+                path=mlrun.mlconf.hub.default_source.url,
+                channel=mlrun.mlconf.hub.default_source.channel,
+                object_type=HubSourceType(mlrun.mlconf.hub.default_source.object_type),
             ),
             status=ObjectStatus(state="created"),
         )
@@ -120,7 +113,7 @@ class HubItemMetadata(HubObjectMetadata):
 
 class HubItemSpec(ObjectSpec):
     item_uri: str
-    assets: Dict[str, str] = {}
+    assets: dict[str, str] = {}
 
 
 class HubItem(BaseModel):
@@ -133,4 +126,4 @@ class HubItem(BaseModel):
 class HubCatalog(BaseModel):
     kind: ObjectKind = Field(ObjectKind.hub_catalog, const=True)
     channel: str
-    catalog: List[HubItem]
+    catalog: list[HubItem]

mlrun/common/schemas/memory_reports.py

@@ -19,7 +19,7 @@ import pydantic
 
 
 class MostCommonObjectTypesReport(pydantic.BaseModel):
-    object_types: typing.List[typing.Tuple[str, int]]
+    object_types: list[tuple[str, int]]
 
 
 class ObjectTypeReport(pydantic.BaseModel):
@@ -27,4 +27,4 @@ class ObjectTypeReport(pydantic.BaseModel):
     sample_size: int
     start_index: typing.Optional[int]
     max_depth: int
-    object_report: typing.List[typing.Dict[str, typing.Any]]
+    object_report: list[dict[str, typing.Any]]

mlrun/common/schemas/model_monitoring/__init__.py

@@ -11,10 +11,9 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
-# flake8: noqa  - this is until we take care of the F401 violations with respect to __all__ & sphinx
 
 from .constants import (
+    V3IO_MODEL_MONITORING_DB,
     ControllerPolicy,
     DriftStatus,
     EndpointType,
@@ -25,17 +24,30 @@ from .constants import (
     FeatureSetFeatures,
     FileTargetKind,
     FunctionURI,
+    MetricData,
+    ModelEndpointMonitoringMetricType,
     ModelEndpointTarget,
+    ModelEndpointTargetSchemas,
     ModelMonitoringMode,
     ModelMonitoringStoreKinds,
     MonitoringFunctionNames,
+    PredictionsQueryConstants,
     ProjectSecretKeys,
-    PrometheusMetric,
-    TimeSeriesTarget,
+    ResultData,
+    ResultKindApp,
+    ResultStatusApp,
+    SchedulingKeys,
+    SpecialApps,
+    TDEngineSuperTables,
+    TSDBTarget,
+    V3IOTSDBTables,
     VersionedModel,
+    WriterEvent,
+    WriterEventKind,
 )
 from .grafana import (
     GrafanaColumn,
+    GrafanaColumnType,
     GrafanaDataPoint,
     GrafanaNumberColumn,
     GrafanaStringColumn,
@@ -48,6 +60,10 @@ from .model_endpoints import (
     ModelEndpoint,
     ModelEndpointList,
     ModelEndpointMetadata,
+    ModelEndpointMonitoringMetric,
+    ModelEndpointMonitoringMetricNoData,
+    ModelEndpointMonitoringMetricValues,
+    ModelEndpointMonitoringResultValues,
     ModelEndpointSpec,
     ModelEndpointStatus,
 )