zenml-nightly 0.71.0.dev20250107__py3-none-any.whl → 0.71.0.dev20250111__py3-none-any.whl

zenml/models/v2/core/model.py

@@ -13,12 +13,16 @@
 #  permissions and limitations under the License.
 """Models representing models."""
 
-from typing import TYPE_CHECKING, List, Optional
+from typing import TYPE_CHECKING, Any, ClassVar, List, Optional, Type, TypeVar
 from uuid import UUID
 
 from pydantic import BaseModel, Field
 
-from zenml.constants import STR_FIELD_MAX_LENGTH, TEXT_FIELD_MAX_LENGTH
+from zenml.constants import (
+    SORT_BY_LATEST_VERSION_KEY,
+    STR_FIELD_MAX_LENGTH,
+    TEXT_FIELD_MAX_LENGTH,
+)
 from zenml.models.v2.base.scoped import (
     WorkspaceScopedRequest,
     WorkspaceScopedResponse,
@@ -32,6 +36,11 @@ from zenml.utils.pagination_utils import depaginate
 if TYPE_CHECKING:
     from zenml.model.model import Model
     from zenml.models.v2.core.tag import TagResponse
+    from zenml.zen_stores.schemas import BaseSchema
+
+    AnySchema = TypeVar("AnySchema", bound=BaseSchema)
+
+AnyQuery = TypeVar("AnyQuery", bound=Any)
 
 # ------------------ Request Model ------------------
 
@@ -320,3 +329,73 @@ class ModelFilter(WorkspaceScopedTaggableFilter):
         default=None,
         description="Name of the Model",
     )
+
+    CUSTOM_SORTING_OPTIONS: ClassVar[List[str]] = [
+        *WorkspaceScopedTaggableFilter.CUSTOM_SORTING_OPTIONS,
+        SORT_BY_LATEST_VERSION_KEY,
+    ]
+
+    def apply_sorting(
+        self,
+        query: AnyQuery,
+        table: Type["AnySchema"],
+    ) -> AnyQuery:
+        """Apply sorting to the query for Models.
+
+        Args:
+            query: The query to which to apply the sorting.
+            table: The query table.
+
+        Returns:
+            The query with sorting applied.
+        """
+        from sqlmodel import asc, case, col, desc, func, select
+
+        from zenml.enums import SorterOps
+        from zenml.zen_stores.schemas import (
+            ModelSchema,
+            ModelVersionSchema,
+        )
+
+        sort_by, operand = self.sorting_params
+
+        if sort_by == SORT_BY_LATEST_VERSION_KEY:
+            # Subquery to find the latest version per model
+            latest_version_subquery = (
+                select(
+                    ModelSchema.id,
+                    case(
+                        (
+                            func.max(ModelVersionSchema.created).is_(None),
+                            ModelSchema.created,
+                        ),
+                        else_=func.max(ModelVersionSchema.created),
+                    ).label("latest_version_created"),
+                )
+                .outerjoin(
+                    ModelVersionSchema,
+                    ModelSchema.id == ModelVersionSchema.model_id,  # type: ignore[arg-type]
+                )
+                .group_by(col(ModelSchema.id))
+                .subquery()
+            )
+
+            query = query.add_columns(
+                latest_version_subquery.c.latest_version_created,
+            ).where(ModelSchema.id == latest_version_subquery.c.id)
+
+            # Apply sorting based on the operand
+            if operand == SorterOps.ASCENDING:
+                query = query.order_by(
+                    asc(latest_version_subquery.c.latest_version_created),
+                    asc(ModelSchema.id),
+                )
+            else:
+                query = query.order_by(
+                    desc(latest_version_subquery.c.latest_version_created),
+                    desc(ModelSchema.id),
+                )
+            return query
+
+        # For other sorting cases, delegate to the parent class
+        return super().apply_sorting(query=query, table=table)

zenml/models/v2/core/pipeline.py

@@ -357,7 +357,7 @@ class PipelineFilter(WorkspaceScopedTaggableFilter):
             # Subquery to find the latest run per pipeline
             latest_run_subquery = (
                 select(
-                    PipelineRunSchema.pipeline_id,
+                    PipelineSchema.id,
                     case(
                         (
                             func.max(PipelineRunSchema.created).is_(None),
@@ -366,25 +366,28 @@ class PipelineFilter(WorkspaceScopedTaggableFilter):
                         else_=func.max(PipelineRunSchema.created),
                     ).label("latest_run"),
                 )
-                .group_by(col(PipelineRunSchema.pipeline_id))
+                .outerjoin(
+                    PipelineRunSchema,
+                    PipelineSchema.id == PipelineRunSchema.pipeline_id,  # type: ignore[arg-type]
+                )
+                .group_by(col(PipelineSchema.id))
                 .subquery()
             )
 
-            # Join the subquery with the pipelines
-            query = query.outerjoin(
-                latest_run_subquery,
-                PipelineSchema.id == latest_run_subquery.c.pipeline_id,
-            )
+            query = query.add_columns(
+                latest_run_subquery.c.latest_run,
+            ).where(PipelineSchema.id == latest_run_subquery.c.id)
 
             if operand == SorterOps.ASCENDING:
                 query = query.order_by(
-                    asc(latest_run_subquery.c.latest_run)
-                ).order_by(col(PipelineSchema.id))
+                    asc(latest_run_subquery.c.latest_run),
+                    asc(PipelineSchema.id),
+                )
             else:
                 query = query.order_by(
-                    desc(latest_run_subquery.c.latest_run)
-                ).order_by(col(PipelineSchema.id))
-
+                    desc(latest_run_subquery.c.latest_run),
+                    desc(PipelineSchema.id),
+                )
             return query
         else:
             return super().apply_sorting(query=query, table=table)

zenml/models/v2/core/pipeline_run.py

@@ -982,6 +982,8 @@ class PipelineRunFilter(WorkspaceScopedTaggableFilter):
         else:
             return super().apply_sorting(query=query, table=table)
 
+        query = query.add_columns(column)
+
         if operand == SorterOps.ASCENDING:
             query = query.order_by(asc(column))
         else:

zenml/services/container/container_service.py

@@ -415,7 +415,7 @@ class ContainerService(BaseService):
                 # to ensure that the local database can be shared
                 # with the container.
                 logger.debug(
-                    "Setting UID and GID to local user/group " "in container."
+                    "Setting UID and GID to local user/group in container."
                 )
                 uid_args = dict(
                     user=os.getuid(),

zenml/stack/stack_component.py

@@ -452,7 +452,7 @@ class StackComponent:
                     "reinstalling the integration either through our CLI: "
                     f"`zenml integration install {flavor_model.integration} "
                     "-y` or by manually installing its requirements: "
-                    f"`pip install {integration_requirements}`. If the error"
+                    f"`pip install {integration_requirements}`. If the error "
                     "persists, please contact the ZenML team."
                 ) from e
             else:

zenml/utils/deprecation_utils.py

@@ -109,13 +109,13 @@ def deprecate_pydantic_attributes(
             else:
                 deprecated_attribute, replacement_attribute = attribute
 
-                assert (
-                    replacement_attribute in cls.model_fields
-                ), f"Unable to find attribute {replacement_attribute}."
+                assert replacement_attribute in cls.model_fields, (
+                    f"Unable to find attribute {replacement_attribute}."
+                )
 
-            assert (
-                deprecated_attribute in cls.model_fields
-            ), f"Unable to find attribute {deprecated_attribute}."
+            assert deprecated_attribute in cls.model_fields, (
+                f"Unable to find attribute {deprecated_attribute}."
+            )
 
             if cls.model_fields[deprecated_attribute].is_required():
                 raise TypeError(

zenml/utils/filesync_model.py

@@ -80,9 +80,9 @@ class FileSyncModel(BaseModel):
 
         if isinstance(data, dict):
             # Assert that the config file is defined
-            assert (
-                "config_file" in data
-            ), "You have to provide a path for the configuration file."
+            assert "config_file" in data, (
+                "You have to provide a path for the configuration file."
+            )
 
             config_file = data.pop("config_file")
 

zenml/utils/function_utils.py

@@ -196,7 +196,7 @@ def _cli_wrapped_function(func: F) -> F:
         return function
 
     func.__doc__ = (
-        f"{func.__doc__}\n\nThis is ZenML-generated " "CLI wrapper function."
+        f"{func.__doc__}\n\nThis is ZenML-generated CLI wrapper function."
     )
 
     return wrapper(func)

zenml/utils/pipeline_docker_image_builder.py

@@ -201,7 +201,7 @@ class PipelineDockerImageBuilder:
                         )
 
                 repository = repository or DEFAULT_ZENML_DOCKER_REPOSITORY
-                user_image_name = f"{repository}:" f"{tag}-intermediate-build"
+                user_image_name = f"{repository}:{tag}-intermediate-build"
                 if push and container_registry:
                     user_image_name = (
                         f"{container_registry.config.uri}/{user_image_name}"

zenml/zen_server/auth.py

@@ -130,9 +130,7 @@ def _fetch_and_verify_api_key(
     try:
         api_key = zen_store().get_internal_api_key(api_key_id)
     except KeyError:
-        error = (
-            f"Authentication error: error retrieving API key " f"{api_key_id}"
-        )
+        error = f"Authentication error: error retrieving API key {api_key_id}"
         logger.error(error)
         raise CredentialsNotValid(error)
 
@@ -673,8 +671,7 @@ def authenticate_external_user(
         )
     except Exception as e:
         logger.exception(
-            f"Error fetching user information from external authenticator: "
-            f"{e}"
+            f"Error fetching user information from external authenticator: {e}"
         )
         raise AuthorizationException(
             "Error fetching user information from external authenticator."

zenml/zen_server/dashboard/assets/{404-Cqu3EDCm.js → 404-Dfq64Boz.js}

@@ -1 +1 @@
-import{j as e}from"./@radix-DeK6qiuw.js";import{f as s,r as t}from"./index-FO-p0GU7.js";import{E as r}from"./EmptyState-BzdlCwp3.js";import{S as a}from"./help-Cc9bBIJH.js";import{L as o}from"./@react-router-B3Z5rLr2.js";import"./@tanstack-DT5WLu9C.js";import"./@reactflow-D2Y7BWwz.js";function d(){return e.jsx("div",{className:"flex min-h-screen w-full flex-col",children:e.jsx(r,{icon:e.jsx(a,{className:"h-[120px] w-[120px] fill-neutral-300"}),children:e.jsxs("div",{className:"text-center",children:[e.jsx("h1",{className:"mb-2 text-display-xs font-semibold",children:"We can't find the page you are looking for"}),e.jsx("p",{className:"text-lg text-theme-text-secondary",children:"You can try typing a different URL or we can bring you back to your Homepage."}),e.jsx("div",{className:"mt-5 flex justify-center",children:e.jsx(s,{size:"md",asChild:!0,children:e.jsx(o,{className:"w-min self-center whitespace-nowrap",to:t.home,children:e.jsx("span",{className:"px-0.5",children:"Go to Home"})})})})]})})})}export{d as default};
+import{j as e}from"./@radix-DeK6qiuw.js";import{f as s,r as t}from"./index-CE0aQlv8.js";import{E as r}from"./EmptyState-BzdlCwp3.js";import{S as a}from"./help-Cc9bBIJH.js";import{L as o}from"./@react-router-B3Z5rLr2.js";import"./@tanstack-DT5WLu9C.js";import"./@reactflow-BUNIMFeC.js";function d(){return e.jsx("div",{className:"flex min-h-screen w-full flex-col",children:e.jsx(r,{icon:e.jsx(a,{className:"h-[120px] w-[120px] fill-neutral-300"}),children:e.jsxs("div",{className:"text-center",children:[e.jsx("h1",{className:"mb-2 text-display-xs font-semibold",children:"We can't find the page you are looking for"}),e.jsx("p",{className:"text-lg text-theme-text-secondary",children:"You can try typing a different URL or we can bring you back to your Homepage."}),e.jsx("div",{className:"mt-5 flex justify-center",children:e.jsx(s,{size:"md",asChild:!0,children:e.jsx(o,{className:"w-min self-center whitespace-nowrap",to:t.home,children:e.jsx("span",{className:"px-0.5",children:"Go to Home"})})})})]})})})}export{d as default};