Random cleanup and bugfixes (#3709)

* Remove unused check

* Ensure valid stack during creation

* Ensure valid stack during update

* Linting

* Fix invalid stack request in tests

* Formatting

Author: schustmi

src/zenml/client.py

@@ -1480,9 +1480,6 @@ def active_stack_model(self) -> StackResponse:
 
         Returns:
             The model of the active stack for this client.
-
-        Raises:
-            RuntimeError: If the active stack is not set.
         """
         if env_stack_id := os.environ.get(ENV_ZENML_ACTIVE_STACK_ID):
             if not self._active_stack or self._active_stack.id != UUID(
@@ -1509,12 +1506,6 @@ def active_stack_model(self) -> StackResponse:
 
             stack_id = GlobalConfiguration().get_active_stack_id()
 
-        if not stack_id:
-            raise RuntimeError(
-                "No active stack is configured. Run "
-                "`zenml stack set STACK_NAME` to set the active stack."
-            )
-
         return self.get_stack(stack_id)
 
     def activate_stack(
@@ -1550,9 +1541,6 @@ def _validate_stack_configuration(self, stack: StackRequest) -> None:
 
         Args:
             stack: The stack to validate.
-
-        Raises:
-            ValidationError: If the stack configuration is invalid.
         """
         local_components: List[str] = []
         remote_components: List[str] = []
@@ -1617,13 +1605,6 @@ def _validate_stack_configuration(self, stack: StackRequest) -> None:
                 f"local resources."
             )
 
-        if not stack.is_valid:
-            raise ValidationError(
-                "Stack configuration is invalid. A valid"
-                "stack must contain an Artifact Store and "
-                "an Orchestrator."
-            )
-
     # ----------------------------- Services -----------------------------------
 
     def create_service(

src/zenml/models/v2/core/stack.py

@@ -27,7 +27,7 @@
 )
 from uuid import UUID
 
-from pydantic import Field, model_validator
+from pydantic import Field, field_validator, model_validator
 from sqlmodel import and_
 
 from zenml.constants import STR_FIELD_MAX_LENGTH
@@ -94,18 +94,31 @@ class StackRequest(UserScopedRequest):
         "scratch.",
     )
 
-    @property
-    def is_valid(self) -> bool:
-        """Check if the stack is valid.
+    @field_validator("components")
+    def _validate_components(
+        cls, value: Dict[StackComponentType, List[Union[UUID, ComponentInfo]]]
+    ) -> Dict[StackComponentType, List[Union[UUID, ComponentInfo]]]:
+        """Validate the components of the stack.
+
+        Args:
+            value: The components of the stack.
+
+        Raises:
+            ValueError: If the stack does not contain an orchestrator and
+                artifact store.
 
         Returns:
-            True if the stack is valid, False otherwise.
+            The components of the stack.
         """
-        if not self.components:
-            return False
-        return (
-            StackComponentType.ARTIFACT_STORE in self.components
-            and StackComponentType.ORCHESTRATOR in self.components
+        if value:
+            artifact_stores = value.get(StackComponentType.ARTIFACT_STORE, [])
+            orchestrators = value.get(StackComponentType.ORCHESTRATOR, [])
+
+            if orchestrators and artifact_stores:
+                return value
+
+        raise ValueError(
+            "Stack must contain at least an orchestrator and artifact store."
         )
 
     @model_validator(mode="after")
@@ -163,6 +176,39 @@ class StackUpdate(BaseUpdate):
         title="The stack labels.",
     )
 
+    @field_validator("components")
+    def _validate_components(
+        cls,
+        value: Optional[
+            Dict[StackComponentType, List[Union[UUID, ComponentInfo]]]
+        ],
+    ) -> Optional[Dict[StackComponentType, List[Union[UUID, ComponentInfo]]]]:
+        """Validate the components of the stack.
+
+        Args:
+            value: The components of the stack.
+
+        Raises:
+            ValueError: If the stack does not contain an orchestrator and
+                artifact store.
+
+        Returns:
+            The components of the stack.
+        """
+        if value is None:
+            return None
+
+        if value:
+            artifact_stores = value.get(StackComponentType.ARTIFACT_STORE, [])
+            orchestrators = value.get(StackComponentType.ORCHESTRATOR, [])
+
+            if orchestrators and artifact_stores:
+                return value
+
+        raise ValueError(
+            "Stack must contain at least an orchestrator and artifact store."
+        )
+
 
 # ------------------ Response Model ------------------
 

tests/integration/functional/zen_stores/utils.py

@@ -1167,7 +1167,11 @@ def cleanup(self) -> None:
 remote_stack_crud_test_config = CrudTestConfig(
     create_model=StackRequest(
         name=sample_name("remote_stack"),
-        components={},
+        # These will be replaced later by the conditional entities
+        components={
+            "orchestrator": [uuid.uuid4()],
+            "artifact_store": [uuid.uuid4()],
+        },
     ),
     filter_model=StackFilter,
     entity_name="stack",