zenml-nightly 0.82.1.dev20250527__py3-none-any.whl → 0.83.0.dev20250529__py3-none-any.whl

zenml/models/v2/core/model_version.py

@@ -29,6 +29,7 @@ from pydantic import ConfigDict, Field, field_validator
 
 from zenml.constants import STR_FIELD_MAX_LENGTH, TEXT_FIELD_MAX_LENGTH
 from zenml.enums import ArtifactType, ModelStages
+from zenml.logger import get_logger
 from zenml.metadata.metadata_types import MetadataType
 from zenml.models.v2.base.base import BaseUpdate
 from zenml.models.v2.base.page import Page
@@ -44,6 +45,7 @@ from zenml.models.v2.base.scoped import (
 )
 from zenml.models.v2.core.service import ServiceResponse
 from zenml.models.v2.core.tag import TagResponse
+from zenml.utils import pagination_utils
 
 if TYPE_CHECKING:
     from sqlalchemy.sql.elements import ColumnElement
@@ -59,6 +61,8 @@ if TYPE_CHECKING:
     AnySchema = TypeVar("AnySchema", bound=BaseSchema)
 
 
+logger = get_logger(__name__)
+
 # ------------------ Request Model ------------------
 
 
@@ -151,25 +155,6 @@ class ModelVersionResponseBody(ProjectScopedResponseBody):
     model: "ModelResponse" = Field(
         description="The model containing version",
     )
-    model_artifact_ids: Dict[str, Dict[str, UUID]] = Field(
-        description="Model artifacts linked to the model version",
-        default={},
-    )
-    data_artifact_ids: Dict[str, Dict[str, UUID]] = Field(
-        description="Data artifacts linked to the model version",
-        default={},
-    )
-    deployment_artifact_ids: Dict[str, Dict[str, UUID]] = Field(
-        description="Deployment artifacts linked to the model version",
-        default={},
-    )
-    pipeline_run_ids: Dict[str, UUID] = Field(
-        description="Pipeline runs linked to the model version",
-        default={},
-    )
-    tags: List[TagResponse] = Field(
-        title="Tags associated with the model version", default=[]
-    )
 
     # TODO: In Pydantic v2, the `model_` is a protected namespaces for all
     #  fields defined under base models. If not handled, this raises a warning.
@@ -200,6 +185,9 @@ class ModelVersionResponseResources(ProjectScopedResponseResources):
     services: Page[ServiceResponse] = Field(
         description="Services linked to the model version",
     )
+    tags: List[TagResponse] = Field(
+        title="Tags associated with the model version", default=[]
+    )
 
 
 class ModelVersionResponse(
@@ -244,42 +232,6 @@ class ModelVersionResponse(
         """
         return self.get_body().model
 
-    @property
-    def model_artifact_ids(self) -> Dict[str, Dict[str, UUID]]:
-        """The `model_artifact_ids` property.
-
-        Returns:
-            the value of the property.
-        """
-        return self.get_body().model_artifact_ids
-
-    @property
-    def data_artifact_ids(self) -> Dict[str, Dict[str, UUID]]:
-        """The `data_artifact_ids` property.
-
-        Returns:
-            the value of the property.
-        """
-        return self.get_body().data_artifact_ids
-
-    @property
-    def deployment_artifact_ids(self) -> Dict[str, Dict[str, UUID]]:
-        """The `deployment_artifact_ids` property.
-
-        Returns:
-            the value of the property.
-        """
-        return self.get_body().deployment_artifact_ids
-
-    @property
-    def pipeline_run_ids(self) -> Dict[str, UUID]:
-        """The `pipeline_run_ids` property.
-
-        Returns:
-            the value of the property.
-        """
-        return self.get_body().pipeline_run_ids
-
     @property
     def tags(self) -> List[TagResponse]:
         """The `tags` property.
@@ -287,7 +239,7 @@ class ModelVersionResponse(
         Returns:
             the value of the property.
         """
-        return self.get_body().tags
+        return self.get_resources().tags
 
     @property
     def description(self) -> Optional[str]:
@@ -360,14 +312,86 @@ class ModelVersionResponse(
             Dictionary of model artifacts with versions as
             Dict[str, Dict[str, ArtifactResponse]]
         """
+        logger.warning(
+            "ModelVersionResponse.model_artifacts is deprecated and will be "
+            "removed in a future release."
+        )
         from zenml.client import Client
 
+        artifact_versions = pagination_utils.depaginate(
+            Client().list_artifact_versions,
+            model_version_id=self.id,
+            type=ArtifactType.MODEL,
+            project=self.project_id,
+        )
+
+        result: Dict[str, Dict[str, "ArtifactVersionResponse"]] = {}
+        for artifact_version in artifact_versions:
+            result.setdefault(artifact_version.name, {})
+            result[artifact_version.name][artifact_version.version] = (
+                artifact_version
+            )
+
+        return result
+
+    @property
+    def data_artifact_ids(self) -> Dict[str, Dict[str, UUID]]:
+        """Data artifacts linked to this model version.
+
+        Returns:
+            Data artifacts linked to this model version.
+        """
+        logger.warning(
+            "ModelVersionResponse.data_artifact_ids is deprecated and will "
+            "be removed in a future release."
+        )
+
         return {
-            name: {
-                version: Client().get_artifact_version(a)
-                for version, a in self.model_artifact_ids[name].items()
+            artifact_name: {
+                version_name: version_response.id
+                for version_name, version_response in artifact_versions.items()
             }
-            for name in self.model_artifact_ids
+            for artifact_name, artifact_versions in self.data_artifacts.items()
+        }
+
+    @property
+    def model_artifact_ids(self) -> Dict[str, Dict[str, UUID]]:
+        """Model artifacts linked to this model version.
+
+        Returns:
+            Model artifacts linked to this model version.
+        """
+        logger.warning(
+            "ModelVersionResponse.model_artifact_ids is deprecated and will "
+            "be removed in a future release."
+        )
+
+        return {
+            artifact_name: {
+                version_name: version_response.id
+                for version_name, version_response in artifact_versions.items()
+            }
+            for artifact_name, artifact_versions in self.model_artifacts.items()
+        }
+
+    @property
+    def deployment_artifact_ids(self) -> Dict[str, Dict[str, UUID]]:
+        """Deployment artifacts linked to this model version.
+
+        Returns:
+            Deployment artifacts linked to this model version.
+        """
+        logger.warning(
+            "ModelVersionResponse.deployment_artifact_ids is deprecated and "
+            "will be removed in a future release."
+        )
+
+        return {
+            artifact_name: {
+                version_name: version_response.id
+                for version_name, version_response in artifact_versions.items()
+            }
+            for artifact_name, artifact_versions in self.deployment_artifacts.items()
         }
 
     @property
@@ -380,15 +404,28 @@ class ModelVersionResponse(
             Dictionary of data artifacts with versions as
             Dict[str, Dict[str, ArtifactResponse]]
         """
+        logger.warning(
+            "ModelVersionResponse.data_artifacts is deprecated and will be "
+            "removed in a future release."
+        )
+
         from zenml.client import Client
 
-        return {
-            name: {
-                version: Client().get_artifact_version(a)
-                for version, a in self.data_artifact_ids[name].items()
-            }
-            for name in self.data_artifact_ids
-        }
+        artifact_versions = pagination_utils.depaginate(
+            Client().list_artifact_versions,
+            model_version_id=self.id,
+            type=ArtifactType.DATA,
+            project=self.project_id,
+        )
+
+        result: Dict[str, Dict[str, "ArtifactVersionResponse"]] = {}
+        for artifact_version in artifact_versions:
+            result.setdefault(artifact_version.name, {})
+            result[artifact_version.name][artifact_version.version] = (
+                artifact_version
+            )
+
+        return result
 
     @property
     def deployment_artifacts(
@@ -400,14 +437,49 @@ class ModelVersionResponse(
             Dictionary of deployment artifacts with versions as
             Dict[str, Dict[str, ArtifactResponse]]
         """
+        logger.warning(
+            "ModelVersionResponse.deployment_artifacts is deprecated and will "
+            "be removed in a future release."
+        )
+
+        from zenml.client import Client
+
+        artifact_versions = pagination_utils.depaginate(
+            Client().list_artifact_versions,
+            model_version_id=self.id,
+            type=ArtifactType.SERVICE,
+            project=self.project_id,
+        )
+
+        result: Dict[str, Dict[str, "ArtifactVersionResponse"]] = {}
+        for artifact_version in artifact_versions:
+            result.setdefault(artifact_version.name, {})
+            result[artifact_version.name][artifact_version.version] = (
+                artifact_version
+            )
+
+        return result
+
+    @property
+    def pipeline_run_ids(self) -> Dict[str, UUID]:
+        """Pipeline runs linked to this model version.
+
+        Returns:
+            Pipeline runs linked to this model version.
+        """
+        logger.warning(
+            "ModelVersionResponse.pipeline_run_ids is deprecated and will be "
+            "removed in a future release."
+        )
+
         from zenml.client import Client
 
         return {
-            name: {
-                version: Client().get_artifact_version(a)
-                for version, a in self.deployment_artifact_ids[name].items()
-            }
-            for name in self.deployment_artifact_ids
+            link.pipeline_run.name: link.pipeline_run.id
+            for link in pagination_utils.depaginate(
+                Client().list_model_version_pipeline_run_links,
+                model_version_id=self.id,
+            )
         }
 
     @property
@@ -417,11 +489,19 @@ class ModelVersionResponse(
         Returns:
             Dictionary of Pipeline Runs as PipelineRunResponseModel
         """
+        logger.warning(
+            "ModelVersionResponse.pipeline_runs is deprecated and will be "
+            "removed in a future release."
+        )
+
         from zenml.client import Client
 
         return {
-            name: Client().get_pipeline_run(pr)
-            for name, pr in self.pipeline_run_ids.items()
+            link.pipeline_run.name: link.pipeline_run
+            for link in pagination_utils.depaginate(
+                Client().list_model_version_pipeline_run_links,
+                model_version_id=self.id,
+            )
         }
 
     def _get_linked_object(
@@ -450,6 +530,7 @@ class ModelVersionResponse(
             version=version,
             model_version_id=self.id,
             type=type,
+            project=self.project_id,
             hydrate=True,
         )
 
@@ -525,19 +606,6 @@ class ModelVersionResponse(
         """
         return self._get_linked_object(name, version, ArtifactType.SERVICE)
 
-    def get_pipeline_run(self, name: str) -> "PipelineRunResponse":
-        """Get pipeline run linked to this version.
-
-        Args:
-            name: The name of the pipeline run to retrieve.
-
-        Returns:
-            PipelineRun as PipelineRunResponseModel
-        """
-        from zenml.client import Client
-
-        return Client().get_pipeline_run(self.pipeline_run_ids[name])
-
     def set_stage(
         self, stage: Union[str, ModelStages], force: bool = False
     ) -> None:
@@ -638,7 +706,6 @@ class ModelVersionFilter(
         custom_filters = super().get_custom_filters(table)
 
         if self.model:
-            value, operator = self._resolve_operator(self.model)
             model_filter = and_(
                 ModelVersionSchema.model_id == ModelSchema.id,  # type: ignore[arg-type]
                 self.generate_name_or_id_query_conditions(

zenml/models/v2/core/pipeline.py

@@ -98,15 +98,6 @@ class PipelineUpdate(BaseUpdate):
 class PipelineResponseBody(ProjectScopedResponseBody):
     """Response body for pipelines."""
 
-    latest_run_id: Optional[UUID] = Field(
-        default=None,
-        title="The ID of the latest run of the pipeline.",
-    )
-    latest_run_status: Optional[ExecutionStatus] = Field(
-        default=None,
-        title="The status of the latest run of the pipeline.",
-    )
-
 
 class PipelineResponseMetadata(ProjectScopedResponseMetadata):
     """Response metadata for pipelines."""
@@ -124,6 +115,14 @@ class PipelineResponseResources(ProjectScopedResponseResources):
         default=None,
         title="The user that created the latest run of this pipeline.",
     )
+    latest_run_id: Optional[UUID] = Field(
+        default=None,
+        title="The ID of the latest run of the pipeline.",
+    )
+    latest_run_status: Optional[ExecutionStatus] = Field(
+        default=None,
+        title="The status of the latest run of the pipeline.",
+    )
     tags: List[TagResponse] = Field(
         title="Tags associated with the pipeline.",
     )
@@ -233,7 +232,7 @@ class PipelineResponse(
         Returns:
             the value of the property.
         """
-        return self.get_body().latest_run_id
+        return self.get_resources().latest_run_id
 
     @property
     def latest_run_status(self) -> Optional[ExecutionStatus]:
@@ -242,7 +241,7 @@ class PipelineResponse(
         Returns:
             the value of the property.
         """
-        return self.get_body().latest_run_status
+        return self.get_resources().latest_run_status
 
     @property
     def tags(self) -> List[TagResponse]:

zenml/models/v2/core/pipeline_deployment.py

@@ -13,7 +13,7 @@
 #  permissions and limitations under the License.
 """Models representing pipeline deployments."""
 
-from typing import Any, Dict, Optional, TypeVar, Union
+from typing import Any, Dict, Optional, Union
 from uuid import UUID
 
 from pydantic import Field
@@ -22,7 +22,6 @@ from zenml.config.pipeline_configurations import PipelineConfiguration
 from zenml.config.pipeline_spec import PipelineSpec
 from zenml.config.step_configurations import Step
 from zenml.models.v2.base.base import BaseZenModel
-from zenml.models.v2.base.page import Page
 from zenml.models.v2.base.scoped import (
     ProjectScopedFilter,
     ProjectScopedRequest,
@@ -41,9 +40,6 @@ from zenml.models.v2.core.pipeline_build import (
 )
 from zenml.models.v2.core.schedule import ScheduleResponse
 from zenml.models.v2.core.stack import StackResponse
-from zenml.models.v2.core.trigger import TriggerResponse
-
-TriggerPage = TypeVar("TriggerPage", bound=Page[TriggerResponse])
 
 # ------------------ Request Model ------------------
 
@@ -189,10 +185,6 @@ class PipelineDeploymentResponseMetadata(ProjectScopedResponseMetadata):
 class PipelineDeploymentResponseResources(ProjectScopedResponseResources):
     """Class for all resource models associated with the pipeline deployment entity."""
 
-    triggers: TriggerPage = Field(  # type: ignore[valid-type]
-        title="The triggers configured with this event source.",
-    )
-
 
 class PipelineDeploymentResponse(
     ProjectScopedResponse[

zenml/models/v2/core/pipeline_run.py

@@ -48,6 +48,7 @@ from zenml.models.v2.base.scoped import (
 from zenml.models.v2.core.logs import LogsRequest
 from zenml.models.v2.core.model_version import ModelVersionResponse
 from zenml.models.v2.core.tag import TagResponse
+from zenml.utils import pagination_utils
 from zenml.utils.tag_utils import Tag
 
 if TYPE_CHECKING:
@@ -193,9 +194,6 @@ class PipelineRunResponseMetadata(ProjectScopedResponseMetadata):
         default={},
         title="Metadata associated with this pipeline run.",
     )
-    steps: Dict[str, "StepRunResponse"] = Field(
-        default={}, title="The steps of this run."
-    )
     config: PipelineConfiguration = Field(
         title="The pipeline configuration used for this pipeline run.",
     )
@@ -238,10 +236,6 @@ class PipelineRunResponseMetadata(ProjectScopedResponseMetadata):
         default=False,
         description="Whether a template can be created from this run.",
     )
-    step_substitutions: Dict[str, Dict[str, str]] = Field(
-        title="Substitutions used in the step runs of this pipeline run.",
-        default_factory=dict,
-    )
 
 
 class PipelineRunResponseResources(ProjectScopedResponseResources):
@@ -472,7 +466,15 @@ class PipelineRunResponse(
         Returns:
             the value of the property.
         """
-        return self.get_metadata().steps
+        from zenml.client import Client
+
+        return {
+            step.name: step
+            for step in pagination_utils.depaginate(
+                Client().list_run_steps,
+                pipeline_run_id=self.id,
+            )
+        }
 
     @property
     def config(self) -> PipelineConfiguration:
@@ -555,15 +557,6 @@ class PipelineRunResponse(
         """
         return self.get_metadata().is_templatable
 
-    @property
-    def step_substitutions(self) -> Dict[str, Dict[str, str]]:
-        """The `step_substitutions` property.
-
-        Returns:
-            the value of the property.
-        """
-        return self.get_metadata().step_substitutions
-
     @property
     def model_version(self) -> Optional[ModelVersionResponse]:
         """The `model_version` property.

zenml/models/v2/core/run_template.py

@@ -130,14 +130,6 @@ class RunTemplateResponseBody(ProjectScopedResponseBody):
         default=False,
         title="Whether the run template is hidden.",
     )
-    latest_run_id: Optional[UUID] = Field(
-        default=None,
-        title="The ID of the latest run of the run template.",
-    )
-    latest_run_status: Optional[ExecutionStatus] = Field(
-        default=None,
-        title="The status of the latest run of the run template.",
-    )
 
 
 class RunTemplateResponseMetadata(ProjectScopedResponseMetadata):
@@ -179,6 +171,14 @@ class RunTemplateResponseResources(ProjectScopedResponseResources):
     tags: List[TagResponse] = Field(
         title="Tags associated with the run template.",
     )
+    latest_run_id: Optional[UUID] = Field(
+        default=None,
+        title="The ID of the latest run of the run template.",
+    )
+    latest_run_status: Optional[ExecutionStatus] = Field(
+        default=None,
+        title="The status of the latest run of the run template.",
+    )
 
 
 class RunTemplateResponse(
@@ -233,7 +233,7 @@ class RunTemplateResponse(
         Returns:
             the value of the property.
         """
-        return self.get_body().latest_run_id
+        return self.get_resources().latest_run_id
 
     @property
     def latest_run_status(self) -> Optional[ExecutionStatus]:
@@ -242,7 +242,7 @@ class RunTemplateResponse(
         Returns:
             the value of the property.
         """
-        return self.get_body().latest_run_status
+        return self.get_resources().latest_run_status
 
     @property
     def description(self) -> Optional[str]: