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

zenml/models/v2/base/scoped.py

@@ -106,9 +106,7 @@ class ProjectScopedRequest(UserScopedRequest):
 class UserScopedResponseBody(BaseDatedResponseBody):
     """Base user-owned body."""
 
-    user: Optional["UserResponse"] = Field(
-        title="The user who created this resource.", default=None
-    )
+    user_id: Optional[UUID] = Field(title="The user id.", default=None)
 
 
 class UserScopedResponseMetadata(BaseResponseMetadata):
@@ -118,6 +116,10 @@ class UserScopedResponseMetadata(BaseResponseMetadata):
 class UserScopedResponseResources(BaseResponseResources):
     """Base class for all resource models associated with the user."""
 
+    user: Optional["UserResponse"] = Field(
+        title="The user who created this resource.", default=None
+    )
+
 
 UserBody = TypeVar("UserBody", bound=UserScopedResponseBody)
 UserMetadata = TypeVar("UserMetadata", bound=UserScopedResponseMetadata)
@@ -141,19 +143,28 @@ class UserScopedResponse(
             The analytics metadata.
         """
         metadata = super().get_analytics_metadata()
-        if self.user is not None:
-            metadata["user_id"] = self.user.id
+        if user_id := self.user_id:
+            metadata["user_id"] = user_id
         return metadata
 
     # Body and metadata properties
+    @property
+    def user_id(self) -> Optional[UUID]:
+        """The user ID property.
+
+        Returns:
+            the value of the property.
+        """
+        return self.get_body().user_id
+
     @property
     def user(self) -> Optional["UserResponse"]:
-        """The `user` property.
+        """The user property.
 
         Returns:
             the value of the property.
         """
-        return self.get_body().user
+        return self.get_resources().user
 
 
 class UserScopedFilter(BaseFilter):
@@ -289,12 +300,12 @@ class UserScopedFilter(BaseFilter):
 class ProjectScopedResponseBody(UserScopedResponseBody):
     """Base project-scoped body."""
 
+    project_id: UUID = Field(title="The project id.")
+
 
 class ProjectScopedResponseMetadata(UserScopedResponseMetadata):
     """Base project-scoped metadata."""
 
-    project: "ProjectResponse" = Field(title="The project of this resource.")
-
 
 class ProjectScopedResponseResources(UserScopedResponseResources):
     """Base project-scoped resources."""
@@ -318,8 +329,6 @@ class ProjectScopedResponse(
     Used as a base class for all domain models that are project-scoped.
     """
 
-    project_id: UUID = Field(title="The project id.")
-
     # Analytics
     def get_analytics_metadata(self) -> Dict[str, Any]:
         """Fetches the analytics metadata for project scoped models.
@@ -328,11 +337,19 @@ class ProjectScopedResponse(
             The analytics metadata.
         """
         metadata = super().get_analytics_metadata()
-        if self.project is not None:
-            metadata["project_id"] = self.project.id
+        metadata["project_id"] = self.project_id
         return metadata
 
-    # Body and metadata properties
+    @property
+    def project_id(self) -> UUID:
+        """The project ID property.
+
+        Returns:
+            the value of the property.
+        """
+        return self.get_body().project_id
+
+    # Helper
     @property
     def project(self) -> "ProjectResponse":
         """The project property.
@@ -340,7 +357,9 @@ class ProjectScopedResponse(
         Returns:
             the value of the property.
         """
-        return self.get_metadata().project
+        from zenml.client import Client
+
+        return Client().get_project(self.project_id)
 
 
 # ---------------------- Filter Models ----------------------

zenml/models/v2/core/artifact.py

@@ -87,12 +87,6 @@ class ArtifactUpdate(BaseUpdate):
 class ArtifactResponseBody(ProjectScopedResponseBody):
     """Response body for artifacts."""
 
-    tags: List[TagResponse] = Field(
-        title="Tags associated with the model",
-    )
-    latest_version_name: Optional[str] = None
-    latest_version_id: Optional[UUID] = None
-
 
 class ArtifactResponseMetadata(ProjectScopedResponseMetadata):
     """Response metadata for artifacts."""
@@ -106,6 +100,13 @@ class ArtifactResponseMetadata(ProjectScopedResponseMetadata):
 class ArtifactResponseResources(ProjectScopedResponseResources):
     """Class for all resource models associated with the Artifact Entity."""
 
+    tags: List[TagResponse] = Field(
+        title="Tags associated with the artifact.",
+    )
+    # TODO: maybe move these back to body or figure out a better solution
+    latest_version_name: Optional[str] = None
+    latest_version_id: Optional[UUID] = None
+
 
 class ArtifactResponse(
     ProjectScopedResponse[
@@ -139,7 +140,7 @@ class ArtifactResponse(
         Returns:
             the value of the property.
         """
-        return self.get_body().tags
+        return self.get_resources().tags
 
     @property
     def latest_version_name(self) -> Optional[str]:
@@ -148,7 +149,7 @@ class ArtifactResponse(
         Returns:
             the value of the property.
         """
-        return self.get_body().latest_version_name
+        return self.get_resources().latest_version_name
 
     @property
     def latest_version_id(self) -> Optional[UUID]:
@@ -157,7 +158,7 @@ class ArtifactResponse(
         Returns:
             the value of the property.
         """
-        return self.get_body().latest_version_id
+        return self.get_resources().latest_version_id
 
     @property
     def has_custom_name(self) -> bool:

zenml/models/v2/core/artifact_version.py

@@ -194,13 +194,6 @@ class ArtifactVersionResponseBody(ProjectScopedResponseBody):
     data_type: SourceWithValidator = Field(
         title="Data type of the artifact.",
     )
-    tags: List[TagResponse] = Field(
-        title="Tags associated with the model",
-    )
-    producer_pipeline_run_id: Optional[UUID] = Field(
-        title="The ID of the pipeline run that generated this artifact version.",
-        default=None,
-    )
     save_type: ArtifactSaveType = Field(
         title="The save type of the artifact version.",
     )
@@ -234,10 +227,6 @@ class ArtifactVersionResponseBody(ProjectScopedResponseBody):
 class ArtifactVersionResponseMetadata(ProjectScopedResponseMetadata):
     """Response metadata for artifact versions."""
 
-    producer_step_run_id: Optional[UUID] = Field(
-        title="ID of the step run that produced this artifact.",
-        default=None,
-    )
     visualizations: Optional[List["ArtifactVisualizationResponse"]] = Field(
         default=None, title="Visualizations of the artifact."
     )
@@ -249,6 +238,18 @@ class ArtifactVersionResponseMetadata(ProjectScopedResponseMetadata):
 class ArtifactVersionResponseResources(ProjectScopedResponseResources):
     """Class for all resource models associated with the artifact version entity."""
 
+    tags: List[TagResponse] = Field(
+        title="Tags associated with the artifact version.",
+    )
+    producer_step_run_id: Optional[UUID] = Field(
+        title="ID of the step run that produced this artifact.",
+        default=None,
+    )
+    producer_pipeline_run_id: Optional[UUID] = Field(
+        title="The ID of the pipeline run that generated this artifact version.",
+        default=None,
+    )
+
 
 class ArtifactVersionResponse(
     ProjectScopedResponse[
@@ -280,7 +281,7 @@ class ArtifactVersionResponse(
         return self.get_body().artifact
 
     @property
-    def version(self) -> Union[str, int]:
+    def version(self) -> str:
         """The `version` property.
 
         Returns:
@@ -313,7 +314,7 @@ class ArtifactVersionResponse(
         Returns:
             the value of the property.
         """
-        return self.get_body().tags
+        return self.get_resources().tags
 
     @property
     def producer_pipeline_run_id(self) -> Optional[UUID]:
@@ -322,7 +323,7 @@ class ArtifactVersionResponse(
         Returns:
             the value of the property.
         """
-        return self.get_body().producer_pipeline_run_id
+        return self.get_resources().producer_pipeline_run_id
 
     @property
     def save_type(self) -> ArtifactSaveType:
@@ -349,7 +350,7 @@ class ArtifactVersionResponse(
         Returns:
             the value of the property.
         """
-        return self.get_metadata().producer_step_run_id
+        return self.get_resources().producer_step_run_id
 
     @property
     def visualizations(
@@ -710,7 +711,6 @@ class LazyArtifactVersionResponse(ArtifactVersionResponse):
     """
 
     id: Optional[UUID] = None  # type: ignore[assignment]
-    project_id: Optional[UUID] = None  # type: ignore[assignment]
     lazy_load_name: Optional[str] = None
     lazy_load_version: Optional[str] = None
     lazy_load_model_name: str

zenml/models/v2/core/logs.py

@@ -13,12 +13,12 @@
 #  permissions and limitations under the License.
 """Models representing logs."""
 
-from typing import Any, Optional, Union
+from typing import Any, Optional
 from uuid import UUID
 
 from pydantic import Field, field_validator
 
-from zenml.constants import STR_FIELD_MAX_LENGTH, TEXT_FIELD_MAX_LENGTH
+from zenml.constants import TEXT_FIELD_MAX_LENGTH
 from zenml.models.v2.base.base import (
     BaseDatedResponseBody,
     BaseIdentifiedResponse,
@@ -60,27 +60,6 @@ class LogsRequest(BaseRequest):
         )
         return value
 
-    @field_validator("artifact_store_id")
-    @classmethod
-    def str_field_max_length_check(cls, value: Any) -> Any:
-        """Checks if the length of the value exceeds the maximum text length.
-
-        Args:
-            value: the value set in the field
-
-        Returns:
-            the value itself.
-
-        Raises:
-            AssertionError: if the length of the field is longer than the
-                maximum threshold.
-        """
-        assert len(str(value)) < STR_FIELD_MAX_LENGTH, (
-            "The length of the value for this field can not "
-            f"exceed {STR_FIELD_MAX_LENGTH}"
-        )
-        return value
-
 
 # ------------------ Update Model ------------------
 
@@ -101,41 +80,20 @@ class LogsResponseBody(BaseDatedResponseBody):
 class LogsResponseMetadata(BaseResponseMetadata):
     """Response metadata for logs."""
 
-    step_run_id: Optional[Union[str, UUID]] = Field(
+    step_run_id: Optional[UUID] = Field(
         title="Step ID to associate the logs with.",
         default=None,
         description="When this is set, pipeline_run_id should be set to None.",
-        union_mode="left_to_right",
     )
-    pipeline_run_id: Optional[Union[str, UUID]] = Field(
+    pipeline_run_id: Optional[UUID] = Field(
         title="Pipeline run ID to associate the logs with.",
         default=None,
         description="When this is set, step_run_id should be set to None.",
-        union_mode="left_to_right",
     )
-    artifact_store_id: Union[str, UUID] = Field(
+    artifact_store_id: UUID = Field(
         title="The artifact store ID to associate the logs with.",
-        union_mode="left_to_right",
     )
 
-    @field_validator("artifact_store_id")
-    @classmethod
-    def str_field_max_length_check(cls, value: Any) -> Any:
-        """Checks if the length of the value exceeds the maximum text length.
-
-        Args:
-            value: the value set in the field
-
-        Returns:
-            the value itself.
-
-        Raises:
-            AssertionError: if the length of the field is longer than the
-                maximum threshold.
-        """
-        assert len(str(value)) < STR_FIELD_MAX_LENGTH
-        return value
-
 
 class LogsResponseResources(BaseResponseResources):
     """Class for all resource models associated with the Logs entity."""
@@ -169,7 +127,7 @@ class LogsResponse(
         return self.get_body().uri
 
     @property
-    def step_run_id(self) -> Optional[Union[str, UUID]]:
+    def step_run_id(self) -> Optional[UUID]:
         """The `step_run_id` property.
 
         Returns:
@@ -178,7 +136,7 @@ class LogsResponse(
         return self.get_metadata().step_run_id
 
     @property
-    def pipeline_run_id(self) -> Optional[Union[str, UUID]]:
+    def pipeline_run_id(self) -> Optional[UUID]:
         """The `pipeline_run_id` property.
 
         Returns:
@@ -187,7 +145,7 @@ class LogsResponse(
         return self.get_metadata().pipeline_run_id
 
     @property
-    def artifact_store_id(self) -> Union[str, UUID]:
+    def artifact_store_id(self) -> UUID:
         """The `artifact_store_id` property.
 
         Returns:

zenml/models/v2/core/model.py

@@ -132,12 +132,6 @@ class ModelUpdate(BaseUpdate):
 class ModelResponseBody(ProjectScopedResponseBody):
     """Response body for models."""
 
-    tags: List["TagResponse"] = Field(
-        title="Tags associated with the model",
-    )
-    latest_version_name: Optional[str] = None
-    latest_version_id: Optional[UUID] = None
-
 
 class ModelResponseMetadata(ProjectScopedResponseMetadata):
     """Response metadata for models."""
@@ -186,6 +180,12 @@ class ModelResponseMetadata(ProjectScopedResponseMetadata):
 class ModelResponseResources(ProjectScopedResponseResources):
     """Class for all resource models associated with the model entity."""
 
+    tags: List["TagResponse"] = Field(
+        title="Tags associated with the model",
+    )
+    latest_version_name: Optional[str] = None
+    latest_version_id: Optional[UUID] = None
+
 
 class ModelResponse(
     ProjectScopedResponse[
@@ -217,7 +217,7 @@ class ModelResponse(
         Returns:
             the value of the property.
         """
-        return self.get_body().tags
+        return self.get_resources().tags
 
     @property
     def latest_version_name(self) -> Optional[str]:
@@ -226,7 +226,7 @@ class ModelResponse(
         Returns:
             the value of the property.
         """
-        return self.get_body().latest_version_name
+        return self.get_resources().latest_version_name
 
     @property
     def latest_version_id(self) -> Optional[UUID]:
@@ -235,7 +235,7 @@ class ModelResponse(
         Returns:
             the value of the property.
         """
-        return self.get_body().latest_version_id
+        return self.get_resources().latest_version_id
 
     @property
     def license(self) -> Optional[str]:
@@ -323,7 +323,7 @@ class ModelResponse(
         model_versions = depaginate(
             client.list_model_versions,
             model_name_or_id=self.id,
-            project=self.project.id,
+            project=self.project_id,
         )
         return [
             mv.to_model_class(suppress_class_validation_warnings=True)