mlrun 1.6.4rc2__py3-none-any.whl → 1.7.0rc20__py3-none-any.whl

mlrun/common/schemas/model_monitoring/constants.py

@@ -21,6 +21,12 @@ import mlrun.common.helpers
 from mlrun.common.types import StrEnum
 
 
+class MonitoringStrEnum(StrEnum):
+    @classmethod
+    def list(cls):
+        return list(map(lambda c: c.value, cls))
+
+
 class EventFieldType:
     FUNCTION_URI = "function_uri"
     FUNCTION = "function"
@@ -75,12 +81,8 @@ class EventFieldType:
     DRIFT_DETECTED_THRESHOLD = "drift_detected_threshold"
     POSSIBLE_DRIFT_THRESHOLD = "possible_drift_threshold"
     SAMPLE_PARQUET_PATH = "sample_parquet_path"
-
-
-class MonitoringStrEnum(StrEnum):
-    @classmethod
-    def list(cls):
-        return list(map(lambda c: c.value, cls))
+    TIME = "time"
+    TABLE_COLUMN = "table_column"
 
 
 class FeatureSetFeatures(MonitoringStrEnum):
@@ -99,14 +101,17 @@ class FeatureSetFeatures(MonitoringStrEnum):
 
 class ApplicationEvent:
     APPLICATION_NAME = "application_name"
-    CURRENT_STATS = "current_stats"
-    FEATURE_STATS = "feature_stats"
-    SAMPLE_PARQUET_PATH = "sample_parquet_path"
     START_INFER_TIME = "start_infer_time"
     END_INFER_TIME = "end_infer_time"
     LAST_REQUEST = "last_request"
     ENDPOINT_ID = "endpoint_id"
     OUTPUT_STREAM_URI = "output_stream_uri"
+    MLRUN_CONTEXT = "mlrun_context"
+
+    # Deprecated fields - TODO : delete in 1.9.0  (V1 app deprecation)
+    SAMPLE_PARQUET_PATH = "sample_parquet_path"
+    CURRENT_STATS = "current_stats"
+    FEATURE_STATS = "feature_stats"
 
 
 class WriterEvent(MonitoringStrEnum):
@@ -114,6 +119,21 @@ class WriterEvent(MonitoringStrEnum):
     ENDPOINT_ID = "endpoint_id"
     START_INFER_TIME = "start_infer_time"
     END_INFER_TIME = "end_infer_time"
+    EVENT_KIND = "event_kind"  # metric or result
+    DATA = "data"
+
+
+class WriterEventKind(MonitoringStrEnum):
+    METRIC = "metric"
+    RESULT = "result"
+
+
+class MetricData(MonitoringStrEnum):
+    METRIC_NAME = "metric_name"
+    METRIC_VALUE = "metric_value"
+
+
+class ResultData(MonitoringStrEnum):
     RESULT_NAME = "result_name"
     RESULT_VALUE = "result_value"
     RESULT_KIND = "result_kind"
@@ -138,10 +158,6 @@ class EventKeyMetrics:
     REAL_TIME = "real_time"
 
 
-class TimeSeriesTarget:
-    TSDB = "tsdb"
-
-
 class ModelEndpointTarget:
     V3IO_NOSQL = "v3io-nosql"
     SQL = "sql"
@@ -151,8 +167,9 @@ class ProjectSecretKeys:
     ENDPOINT_STORE_CONNECTION = "MODEL_MONITORING_ENDPOINT_STORE_CONNECTION"
     ACCESS_KEY = "MODEL_MONITORING_ACCESS_KEY"
     PIPELINES_ACCESS_KEY = "MODEL_MONITORING_PIPELINES_ACCESS_KEY"
-    KAFKA_BOOTSTRAP_SERVERS = "KAFKA_BOOTSTRAP_SERVERS"
+    KAFKA_BROKERS = "KAFKA_BROKERS"
     STREAM_PATH = "STREAM_PATH"
+    TSDB_CONNECTION = "TSDB_CONNECTION"
 
 
 class ModelMonitoringStoreKinds:
@@ -162,15 +179,23 @@ class ModelMonitoringStoreKinds:
 
 class SchedulingKeys:
     LAST_ANALYZED = "last_analyzed"
+    ENDPOINT_ID = "endpoint_id"
+    APPLICATION_NAME = "application_name"
+    UID = "uid"
 
 
 class FileTargetKind:
     ENDPOINTS = "endpoints"
     EVENTS = "events"
+    PREDICTIONS = "predictions"
     STREAM = "stream"
     PARQUET = "parquet"
     APPS_PARQUET = "apps_parquet"
     LOG_STREAM = "log_stream"
+    APP_RESULTS = "app_results"
+    APP_METRICS = "app_metrics"
+    MONITORING_SCHEDULES = "monitoring_schedules"
+    MONITORING_APPLICATION = "monitoring_application"
 
 
 class ModelMonitoringMode(str, Enum):
@@ -193,20 +218,28 @@ class PrometheusMetric:
     DRIFT_STATUS = "drift_status"
 
 
-class MonitoringFunctionNames:
-    WRITER = "model-monitoring-writer"
-    BATCH = "model-monitoring-batch"
+class PrometheusEndpoints(MonitoringStrEnum):
+    MODEL_MONITORING_METRICS = "/model-monitoring-metrics"
+    MONITORING_BATCH_METRICS = "/monitoring-batch-metrics"
+    MONITORING_DRIFT_STATUS = "/monitoring-drift-status"
+
+
+class MonitoringFunctionNames(MonitoringStrEnum):
+    STREAM = "model-monitoring-stream"
     APPLICATION_CONTROLLER = "model-monitoring-controller"
-    STREAM = None
+    WRITER = "model-monitoring-writer"
+
+
+class V3IOTSDBTables(MonitoringStrEnum):
+    APP_RESULTS = "app-results"
+    METRICS = "metrics"
+    EVENTS = "events"
+
 
-    @staticmethod
-    def all():
-        return [
-            MonitoringFunctionNames.WRITER,
-            MonitoringFunctionNames.STREAM,
-            MonitoringFunctionNames.BATCH,
-            MonitoringFunctionNames.APPLICATION_CONTROLLER,
-        ]
+class TDEngineSuperTables(MonitoringStrEnum):
+    APP_RESULTS = "app_results"
+    METRICS = "metrics"
+    PREDICTIONS = "predictions"
 
 
 @dataclass
@@ -285,6 +318,7 @@ class ResultKindApp(Enum):
     concept_drift = 1
     model_performance = 2
     system_performance = 3
+    custom = 4
 
 
 class ResultStatusApp(IntEnum):
@@ -302,6 +336,29 @@ class ModelMonitoringAppLabel:
     KEY = "mlrun__type"
     VAL = "mlrun__model-monitoring-application"
 
+    def __str__(self) -> str:
+        return f"{self.KEY}={self.VAL}"
+
 
 class ControllerPolicy:
     BASE_PERIOD = "base_period"
+
+
+class TSDBTarget:
+    V3IO_TSDB = "v3io-tsdb"
+    TDEngine = "tdengine"
+    PROMETHEUS = "prometheus"
+
+
+class HistogramDataDriftApplicationConstants:
+    NAME = "histogram-data-drift"
+    GENERAL_RESULT_NAME = "general_drift"
+
+
+class PredictionsQueryConstants:
+    DEFAULT_AGGREGATION_GRANULARITY = "10m"
+    INVOCATIONS = "invocations"
+
+
+class SpecialApps:
+    MLRUN_INFRA = "mlrun-infra"

mlrun/common/schemas/model_monitoring/grafana.py

@@ -11,12 +11,18 @@
 # 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.
-#
 
-from typing import List, Optional, Tuple, Union
+from typing import Optional, Union
 
 from pydantic import BaseModel
 
+import mlrun.common.types
+
+
+class GrafanaColumnType(mlrun.common.types.StrEnum):
+    NUMBER = "number"
+    STRING = "string"
+
 
 class GrafanaColumn(BaseModel):
     text: str
@@ -24,18 +30,16 @@ class GrafanaColumn(BaseModel):
 
 
 class GrafanaNumberColumn(GrafanaColumn):
-    text: str
-    type: str = "number"
+    type: str = GrafanaColumnType.NUMBER
 
 
 class GrafanaStringColumn(GrafanaColumn):
-    text: str
-    type: str = "string"
+    type: str = GrafanaColumnType.STRING
 
 
 class GrafanaTable(BaseModel):
-    columns: List[GrafanaColumn]
-    rows: List[List[Optional[Union[float, int, str]]]] = []
+    columns: list[GrafanaColumn]
+    rows: list[list[Optional[Union[float, int, str]]]] = []
     type: str = "table"
 
     def add_row(self, *args):
@@ -49,7 +53,7 @@ class GrafanaDataPoint(BaseModel):
 
 class GrafanaTimeSeriesTarget(BaseModel):
     target: str
-    datapoints: List[Tuple[float, int]] = []
+    datapoints: list[tuple[float, int]] = []
 
     def add_data_point(self, data_point: GrafanaDataPoint):
         self.datapoints.append((data_point.value, data_point.timestamp))

mlrun/common/schemas/model_monitoring/model_endpoints.py

@@ -11,17 +11,18 @@
 # 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.
-#
 
 import enum
 import json
-import typing
-from typing import Any, Dict, List, Optional
+import re
+from datetime import datetime
+from typing import Any, NamedTuple, Optional
 
 from pydantic import BaseModel, Field, validator
 from pydantic.main import Extra
 
 import mlrun.common.model_monitoring
+import mlrun.common.types
 
 from ..object import ObjectKind, ObjectSpec, ObjectStatus
 from .constants import (
@@ -30,6 +31,8 @@ from .constants import (
     EventKeyMetrics,
     EventLiveStats,
     ModelMonitoringMode,
+    ResultKindApp,
+    ResultStatusApp,
 )
 
 
@@ -48,7 +51,7 @@ class ModelEndpointMetadata(BaseModel):
         extra = Extra.allow
 
     @classmethod
-    def from_flat_dict(cls, endpoint_dict: dict, json_parse_values: typing.List = None):
+    def from_flat_dict(cls, endpoint_dict: dict, json_parse_values: list = None):
         """Create a `ModelEndpointMetadata` object from an endpoint dictionary
 
         :param endpoint_dict:     Model endpoint dictionary.
@@ -71,8 +74,8 @@ class ModelEndpointSpec(ObjectSpec):
     model: Optional[str] = ""  # <model_name>:<version>
     model_class: Optional[str] = ""
     model_uri: Optional[str] = ""
-    feature_names: Optional[List[str]] = []
-    label_names: Optional[List[str]] = []
+    feature_names: Optional[list[str]] = []
+    label_names: Optional[list[str]] = []
     stream_path: Optional[str] = ""
     algorithm: Optional[str] = ""
     monitor_configuration: Optional[dict] = {}
@@ -80,7 +83,7 @@ class ModelEndpointSpec(ObjectSpec):
     monitoring_mode: Optional[ModelMonitoringMode] = ModelMonitoringMode.disabled.value
 
     @classmethod
-    def from_flat_dict(cls, endpoint_dict: dict, json_parse_values: typing.List = None):
+    def from_flat_dict(cls, endpoint_dict: dict, json_parse_values: list = None):
         """Create a `ModelEndpointSpec` object from an endpoint dictionary
 
         :param endpoint_dict:     Model endpoint dictionary.
@@ -101,6 +104,7 @@ class ModelEndpointSpec(ObjectSpec):
         )
 
     @validator("monitor_configuration")
+    @classmethod
     def set_name(cls, monitor_configuration):
         return monitor_configuration or {
             EventFieldType.DRIFT_DETECTED_THRESHOLD: (
@@ -112,6 +116,7 @@ class ModelEndpointSpec(ObjectSpec):
         }
 
     @validator("model_uri")
+    @classmethod
     def validate_model_uri(cls, model_uri):
         """Validate that the model uri includes the required prefix"""
         prefix, uri = mlrun.datastore.parse_store_uri(model_uri)
@@ -123,8 +128,8 @@ class ModelEndpointSpec(ObjectSpec):
 
 
 class Histogram(BaseModel):
-    buckets: List[float]
-    counts: List[int]
+    buckets: list[float]
+    counts: list[int]
 
 
 class FeatureValues(BaseModel):
@@ -175,15 +180,15 @@ class ModelEndpointStatus(ObjectStatus):
     error_count: Optional[int] = 0
     drift_status: Optional[str] = ""
     drift_measures: Optional[dict] = {}
-    metrics: Optional[Dict[str, Dict[str, Any]]] = {
+    metrics: Optional[dict[str, dict[str, Any]]] = {
         EventKeyMetrics.GENERIC: {
             EventLiveStats.LATENCY_AVG_1H: 0,
             EventLiveStats.PREDICTIONS_PER_SECOND: 0,
         }
     }
-    features: Optional[List[Features]] = []
-    children: Optional[List[str]] = []
-    children_uids: Optional[List[str]] = []
+    features: Optional[list[Features]] = []
+    children: Optional[list[str]] = []
+    children_uids: Optional[list[str]] = []
     endpoint_type: Optional[EndpointType] = EndpointType.NODE_EP
     monitoring_feature_set_uri: Optional[str] = ""
     state: Optional[str] = ""
@@ -192,7 +197,7 @@ class ModelEndpointStatus(ObjectStatus):
         extra = Extra.allow
 
     @classmethod
-    def from_flat_dict(cls, endpoint_dict: dict, json_parse_values: typing.List = None):
+    def from_flat_dict(cls, endpoint_dict: dict, json_parse_values: list = None):
         """Create a `ModelEndpointStatus` object from an endpoint dictionary
 
         :param endpoint_dict:     Model endpoint dictionary.
@@ -290,13 +295,91 @@ class ModelEndpoint(BaseModel):
 
 
 class ModelEndpointList(BaseModel):
-    endpoints: List[ModelEndpoint] = []
+    endpoints: list[ModelEndpoint] = []
+
+
+class ModelEndpointMonitoringMetricType(mlrun.common.types.StrEnum):
+    RESULT = "result"
+    METRIC = "metric"
+
+
+class ModelEndpointMonitoringMetric(BaseModel):
+    project: str
+    app: str
+    type: ModelEndpointMonitoringMetricType
+    name: str
+    full_name: str
+
+
+def _compose_full_name(
+    *,
+    project: str,
+    app: str,
+    name: str,
+    type: ModelEndpointMonitoringMetricType = ModelEndpointMonitoringMetricType.RESULT,
+) -> str:
+    return ".".join([project, app, type, name])
+
+
+_FQN_PART_PATTERN = r"[a-zA-Z0-9_-]+"
+_FQN_PATTERN = (
+    rf"^(?P<project>{_FQN_PART_PATTERN})\."
+    rf"(?P<app>{_FQN_PART_PATTERN})\."
+    rf"(?P<type>{ModelEndpointMonitoringMetricType.RESULT}|{ModelEndpointMonitoringMetricType.METRIC})\."
+    rf"(?P<name>{_FQN_PART_PATTERN})$"
+)
+_FQN_REGEX = re.compile(_FQN_PATTERN)
+
+
+def _parse_metric_fqn_to_monitoring_metric(fqn: str) -> ModelEndpointMonitoringMetric:
+    match = _FQN_REGEX.fullmatch(fqn)
+    if match is None:
+        raise ValueError("The fully qualified name is not in the expected format")
+    return ModelEndpointMonitoringMetric.parse_obj(
+        match.groupdict() | {"full_name": fqn}
+    )
+
+
+class _MetricPoint(NamedTuple):
+    timestamp: datetime
+    value: float
+
+
+class _ResultPoint(NamedTuple):
+    timestamp: datetime
+    value: float
+    status: ResultStatusApp
+
+
+class _ModelEndpointMonitoringMetricValuesBase(BaseModel):
+    full_name: str
+    type: ModelEndpointMonitoringMetricType
+    data: bool
+
+
+class ModelEndpointMonitoringMetricValues(_ModelEndpointMonitoringMetricValuesBase):
+    type: ModelEndpointMonitoringMetricType = ModelEndpointMonitoringMetricType.METRIC
+    values: list[_MetricPoint]
+    data: bool = True
+
+
+class ModelEndpointMonitoringResultValues(_ModelEndpointMonitoringMetricValuesBase):
+    type: ModelEndpointMonitoringMetricType = ModelEndpointMonitoringMetricType.RESULT
+    result_kind: ResultKindApp
+    values: list[_ResultPoint]
+    data: bool = True
+
+
+class ModelEndpointMonitoringMetricNoData(_ModelEndpointMonitoringMetricValuesBase):
+    full_name: str
+    type: ModelEndpointMonitoringMetricType
+    data: bool = False
 
 
 def _mapping_attributes(
     base_model: BaseModel,
     flattened_dictionary: dict,
-    json_parse_values: typing.List = None,
+    json_parse_values: list = None,
 ):
     """Generate a `BaseModel` object with the provided dictionary attributes.
 

mlrun/common/schemas/notification.py

@@ -54,14 +54,14 @@ class Notification(pydantic.BaseModel):
     name: str
     message: str
     severity: NotificationSeverity
-    when: typing.List[str]
+    when: list[str]
     condition: str
-    params: typing.Dict[str, typing.Any] = None
+    params: dict[str, typing.Any] = None
     status: NotificationStatus = None
     sent_time: typing.Union[str, datetime.datetime] = None
-    secret_params: typing.Optional[typing.Dict[str, typing.Any]] = None
+    secret_params: typing.Optional[dict[str, typing.Any]] = None
     reason: typing.Optional[str] = None
 
 
 class SetNotificationRequest(pydantic.BaseModel):
-    notifications: typing.List[Notification] = None
+    notifications: list[Notification] = None

mlrun/common/schemas/object.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 from datetime import datetime
-from typing import List, Optional
+from typing import Optional
 
 from pydantic import BaseModel, Extra
 
@@ -60,7 +60,7 @@ class ObjectRecord(BaseModel):
     project: str
     uid: str
     updated: Optional[datetime] = None
-    labels: List[LabelRecord]
+    labels: list[LabelRecord]
     # state is extracted from the full status dict to enable queries
     state: Optional[str] = None
     full_object: Optional[dict] = None

mlrun/{runtimes/mpijob/v1alpha1.py → common/schemas/pagination.py}

@@ -11,19 +11,16 @@
 # 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.
-from deprecated import deprecated
 
-from mlrun.runtimes.constants import MPIJobCRDVersions
-from mlrun.runtimes.mpijob.abstract import AbstractMPIJobRuntime
+import typing
 
+import pydantic
 
-# TODO: Remove in 1.7.0
-@deprecated(
-    version="1.5.0",
-    reason="v1alpha1 mpi will be removed in 1.7.0, use v1 instead",
-    category=FutureWarning,
-)
-class MpiRuntimeV1Alpha1(AbstractMPIJobRuntime):
-    crd_group = "kubeflow.org"
-    crd_version = MPIJobCRDVersions.v1alpha1
-    crd_plural = "mpijobs"
+
+class PaginationInfo(pydantic.BaseModel):
+    class Config:
+        allow_population_by_field_name = True
+
+    page: typing.Optional[int]
+    page_size: typing.Optional[int] = pydantic.Field(alias="page-size")
+    page_token: typing.Optional[str] = pydantic.Field(alias="page-token")

mlrun/common/schemas/pipeline.py

@@ -16,15 +16,6 @@ import typing
 
 import pydantic
 
-import mlrun.common.types
-
-
-class PipelinesFormat(mlrun.common.types.StrEnum):
-    full = "full"
-    metadata_only = "metadata_only"
-    summary = "summary"
-    name_only = "name_only"
-
 
 class PipelinesPagination(str):
     default_page_size = 20
@@ -34,6 +25,6 @@ class PipelinesPagination(str):
 
 class PipelinesOutput(pydantic.BaseModel):
     # use the format query param to control what is returned
-    runs: typing.List[typing.Union[dict, str]]
+    runs: list[typing.Union[dict, str]]
     total_size: int
     next_page_token: typing.Optional[str]

mlrun/common/schemas/project.py

@@ -23,16 +23,6 @@ from .common import ImageBuilder
 from .object import ObjectKind, ObjectStatus
 
 
-class ProjectsFormat(mlrun.common.types.StrEnum):
-    full = "full"
-    name_only = "name_only"
-    # minimal format removes large fields from the response (e.g. functions, workflows, artifacts)
-    # and is used for faster response times (in the UI)
-    minimal = "minimal"
-    # internal - allowed only in follower mode, only for the leader for upgrade purposes
-    leader = "leader"
-
-
 class ProjectMetadata(pydantic.BaseModel):
     name: str
     created: typing.Optional[datetime.datetime] = None
@@ -84,9 +74,10 @@ class ProjectSpec(pydantic.BaseModel):
     subpath: typing.Optional[str] = None
     origin_url: typing.Optional[str] = None
     desired_state: typing.Optional[ProjectDesiredState] = ProjectDesiredState.online
-    custom_packagers: typing.Optional[typing.List[typing.Tuple[str, bool]]] = None
+    custom_packagers: typing.Optional[list[tuple[str, bool]]] = None
     default_image: typing.Optional[str] = None
     build: typing.Optional[ImageBuilder] = None
+    default_function_node_selector: typing.Optional[dict] = {}
 
     class Config:
         extra = pydantic.Extra.allow
@@ -109,9 +100,14 @@ class ProjectSummary(pydantic.BaseModel):
     files_count: int
     feature_sets_count: int
     models_count: int
+    runs_completed_recent_count: int
     runs_failed_recent_count: int
     runs_running_count: int
-    schedules_count: int
+    distinct_schedules_count: int
+    distinct_scheduled_jobs_pending_count: int
+    distinct_scheduled_pipelines_pending_count: int
+    pipelines_completed_recent_count: typing.Optional[int] = None
+    pipelines_failed_recent_count: typing.Optional[int] = None
     pipelines_running_count: typing.Optional[int] = None
 
 
@@ -119,18 +115,23 @@ class IguazioProject(pydantic.BaseModel):
     data: dict
 
 
+# The format query param controls the project type used:
+# full - Project
+# name_only - str
+# summary - ProjectSummary
+# leader - currently only IguazioProject supported
+# The way pydantic handles typing.Union is that it takes the object and tries to coerce it to be the types of the
+# union by the definition order. Therefore we can't currently add generic dict for all leader formats, but we need
+# to add a specific classes for them. it's frustrating but couldn't find other workaround, see:
+# https://github.com/samuelcolvin/pydantic/issues/1423, https://github.com/samuelcolvin/pydantic/issues/619
+ProjectOutput = typing.TypeVar(
+    "ProjectOutput", Project, str, ProjectSummary, IguazioProject
+)
+
+
 class ProjectsOutput(pydantic.BaseModel):
-    # The format query param controls the project type used:
-    # full - Project
-    # name_only - str
-    # summary - ProjectSummary
-    # leader - currently only IguazioProject supported
-    # The way pydantic handles typing.Union is that it takes the object and tries to coerce it to be the types of the
-    # union by the definition order. Therefore we can't currently add generic dict for all leader formats, but we need
-    # to add a specific classes for them. it's frustrating but couldn't find other workaround, see:
-    # https://github.com/samuelcolvin/pydantic/issues/1423, https://github.com/samuelcolvin/pydantic/issues/619
-    projects: typing.List[typing.Union[Project, str, ProjectSummary, IguazioProject]]
+    projects: list[ProjectOutput]
 
 
 class ProjectSummariesOutput(pydantic.BaseModel):
-    project_summaries: typing.List[ProjectSummary]
+    project_summaries: list[ProjectSummary]

mlrun/common/schemas/runtime_resource.py

@@ -26,15 +26,15 @@ class ListRuntimeResourcesGroupByField(mlrun.common.types.StrEnum):
 
 class RuntimeResource(pydantic.BaseModel):
     name: str
-    labels: typing.Dict[str, str] = {}
-    status: typing.Optional[typing.Dict]
+    labels: dict[str, str] = {}
+    status: typing.Optional[dict]
 
 
 class RuntimeResources(pydantic.BaseModel):
-    crd_resources: typing.List[RuntimeResource] = []
-    pod_resources: typing.List[RuntimeResource] = []
+    crd_resources: list[RuntimeResource] = []
+    pod_resources: list[RuntimeResource] = []
     # only for dask runtime
-    service_resources: typing.Optional[typing.List[RuntimeResource]] = None
+    service_resources: typing.Optional[list[RuntimeResource]] = None
 
     class Config:
         extra = pydantic.Extra.allow
@@ -45,14 +45,10 @@ class KindRuntimeResources(pydantic.BaseModel):
     resources: RuntimeResources
 
 
-RuntimeResourcesOutput = typing.List[KindRuntimeResources]
+RuntimeResourcesOutput = list[KindRuntimeResources]
 
 
 # project name -> job uid -> runtime resources
-GroupedByJobRuntimeResourcesOutput = typing.Dict[
-    str, typing.Dict[str, RuntimeResources]
-]
+GroupedByJobRuntimeResourcesOutput = dict[str, dict[str, RuntimeResources]]
 # project name -> kind -> runtime resources
-GroupedByProjectRuntimeResourcesOutput = typing.Dict[
-    str, typing.Dict[str, RuntimeResources]
-]
+GroupedByProjectRuntimeResourcesOutput = dict[str, dict[str, RuntimeResources]]

mlrun/common/schemas/schedule.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 from datetime import datetime
-from typing import Any, List, Literal, Optional, Union
+from typing import Any, Literal, Optional, Union
 
 from pydantic import BaseModel
 
@@ -119,7 +119,7 @@ class ScheduleRecord(ScheduleInput):
     project: str
     last_run_uri: Optional[str]
     state: Optional[str]
-    labels: Optional[List[LabelRecord]]
+    labels: Optional[list[LabelRecord]]
     next_run_time: Optional[datetime]
 
     class Config:
@@ -135,7 +135,7 @@ class ScheduleOutput(ScheduleRecord):
 
 
 class SchedulesOutput(BaseModel):
-    schedules: List[ScheduleOutput]
+    schedules: list[ScheduleOutput]
 
 
 class ScheduleIdentifier(BaseModel):