zenml-nightly 0.75.0.dev20250312__py3-none-any.whl → 0.75.0.dev20250314__py3-none-any.whl

zenml/pipelines/build_utils.py

@@ -215,8 +215,7 @@ def reuse_or_create_pipeline_build(
         build_model = Client().zen_store.get_build(build_id=build)
     else:
         build_request = PipelineBuildRequest(
-            user=Client().active_user.id,
-            workspace=Client().active_workspace.id,
+            project=Client().active_project.id,
             stack=Client().active_stack_model.id,
             pipeline=pipeline_id,
             **build.model_dump(),
@@ -419,8 +418,7 @@ def create_pipeline_build(
     )
     stack_checksum = compute_stack_checksum(stack=stack_model)
     build_request = PipelineBuildRequest(
-        user=client.active_user.id,
-        workspace=client.active_workspace.id,
+        project=client.active_project.id,
         stack=stack_model.id,
         pipeline=pipeline_id,
         is_local=is_local,

zenml/pipelines/pipeline_decorator.py

@@ -32,6 +32,7 @@ if TYPE_CHECKING:
     from zenml.model.model import Model
     from zenml.pipelines.pipeline_definition import Pipeline
     from zenml.types import HookSpecification
+    from zenml.utils.tag_utils import Tag
 
     F = TypeVar("F", bound=Callable[..., None])
 
@@ -50,7 +51,7 @@ def pipeline(
     enable_artifact_metadata: Optional[bool] = None,
     enable_step_logs: Optional[bool] = None,
     settings: Optional[Dict[str, "SettingsOrDict"]] = None,
-    tags: Optional[List[str]] = None,
+    tags: Optional[List[Union[str, "Tag"]]] = None,
     extra: Optional[Dict[str, Any]] = None,
     on_failure: Optional["HookSpecification"] = None,
     on_success: Optional["HookSpecification"] = None,
@@ -67,7 +68,7 @@ def pipeline(
     enable_artifact_metadata: Optional[bool] = None,
     enable_step_logs: Optional[bool] = None,
     settings: Optional[Dict[str, "SettingsOrDict"]] = None,
-    tags: Optional[List[str]] = None,
+    tags: Optional[List[Union[str, "Tag"]]] = None,
     extra: Optional[Dict[str, Any]] = None,
     on_failure: Optional["HookSpecification"] = None,
     on_success: Optional["HookSpecification"] = None,

zenml/pipelines/pipeline_definition.py

@@ -93,6 +93,7 @@ from zenml.utils import (
     yaml_utils,
 )
 from zenml.utils.string_utils import format_name_template
+from zenml.utils.tag_utils import Tag
 
 if TYPE_CHECKING:
     from zenml.artifacts.external_artifact import ExternalArtifact
@@ -130,7 +131,7 @@ class Pipeline:
         enable_artifact_visualization: Optional[bool] = None,
         enable_step_logs: Optional[bool] = None,
         settings: Optional[Mapping[str, "SettingsOrDict"]] = None,
-        tags: Optional[List[str]] = None,
+        tags: Optional[List[Union[str, "Tag"]]] = None,
         extra: Optional[Dict[str, Any]] = None,
         on_failure: Optional["HookSpecification"] = None,
         on_success: Optional["HookSpecification"] = None,
@@ -293,7 +294,7 @@ class Pipeline:
         enable_artifact_visualization: Optional[bool] = None,
         enable_step_logs: Optional[bool] = None,
         settings: Optional[Mapping[str, "SettingsOrDict"]] = None,
-        tags: Optional[List[str]] = None,
+        tags: Optional[List[Union[str, "Tag"]]] = None,
         extra: Optional[Dict[str, Any]] = None,
         on_failure: Optional["HookSpecification"] = None,
         on_success: Optional["HookSpecification"] = None,
@@ -683,8 +684,7 @@ To avoid this consider setting pipeline parameters only in one place (config or
             components = Client().active_stack_model.components
             orchestrator = components[StackComponentType.ORCHESTRATOR][0]
             schedule_model = ScheduleRequest(
-                workspace=Client().active_workspace.id,
-                user=Client().active_user.id,
+                project=Client().active_project.id,
                 pipeline_id=pipeline_id,
                 orchestrator_id=orchestrator.id,
                 name=schedule_name,
@@ -770,8 +770,7 @@ To avoid this consider setting pipeline parameters only in one place (config or
             code_path = code_utils.upload_code_if_necessary(code_archive)
 
         request = PipelineDeploymentRequest(
-            user=Client().active_user.id,
-            workspace=Client().active_workspace.id,
+            project=Client().active_project.id,
             stack=stack.id,
             pipeline=pipeline_id,
             build=build_id,
@@ -1014,6 +1013,7 @@ To avoid this consider setting pipeline parameters only in one place (config or
             for component_type, component in stack.components.items()
         }
         return {
+            "project_id": deployment.project.id,
             "store_type": Client().zen_store.type.value,
             **stack_metadata,
             "total_steps": len(self.invocations),
@@ -1094,8 +1094,7 @@ To avoid this consider setting pipeline parameters only in one place (config or
             return _get()
         except RuntimeError:
             request = PipelineRequest(
-                workspace=client.active_workspace.id,
-                user=client.active_user.id,
+                project=client.active_project.id,
                 name=self.name,
             )
 
@@ -1234,7 +1233,7 @@ To avoid this consider setting pipeline parameters only in one place (config or
             return id_
 
         if not allow_suffix:
-            raise RuntimeError("Duplicate step ID")
+            raise RuntimeError(f"Duplicate step ID `{id_}`")
 
         for index in range(2, 10000):
             id_ = f"{base_id}_{index}"

zenml/pipelines/run_utils.py

@@ -81,14 +81,14 @@ def create_placeholder_run(
         # running.
         start_time=start_time,
         orchestrator_run_id=None,
-        user=deployment.user.id,
-        workspace=deployment.workspace.id,
+        project=deployment.project.id,
         deployment=deployment.id,
         pipeline=deployment.pipeline.id if deployment.pipeline else None,
         status=ExecutionStatus.INITIALIZING,
         tags=deployment.pipeline_configuration.tags,
     )
-    return Client().zen_store.create_run(run_request)
+    run, _ = Client().zen_store.get_or_create_run(run_request)
+    return run
 
 
 def get_placeholder_run(
@@ -213,7 +213,7 @@ def validate_stack_is_runnable_from_server(
         assert len(flavors) == 1
         flavor_model = flavors[0]
 
-        if flavor_model.workspace is not None:
+        if flavor_model.is_custom:
             raise ValueError("No custom stack component flavors allowed.")
 
         flavor = Flavor.from_model(flavor_model)

zenml/service_connectors/service_connector.py

@@ -53,7 +53,6 @@ from zenml.models import (
     ServiceConnectorTypedResourcesModel,
     ServiceConnectorTypeModel,
     UserResponse,
-    WorkspaceResponse,
 )
 from zenml.utils.time_utils import utc_now
 
@@ -706,8 +705,6 @@ class ServiceConnector(BaseModel, metaclass=ServiceConnectorMeta):
 
     def to_model(
         self,
-        user: UUID,
-        workspace: UUID,
         name: Optional[str] = None,
         description: str = "",
         labels: Optional[Dict[str, str]] = None,
@@ -716,8 +713,6 @@ class ServiceConnector(BaseModel, metaclass=ServiceConnectorMeta):
 
         Args:
             name: The name of the connector.
-            user: The ID of the user that created the connector.
-            workspace: The ID of the workspace that the connector belongs to.
             description: The description of the connector.
             labels: The labels of the connector.
 
@@ -740,8 +735,6 @@ class ServiceConnector(BaseModel, metaclass=ServiceConnectorMeta):
             connector_type=spec.connector_type,
             name=name,
             description=description,
-            user=user,
-            workspace=workspace,
             auth_method=self.auth_method,
             expires_at=self.expires_at,
             expires_skew_tolerance=self.expires_skew_tolerance,
@@ -762,7 +755,6 @@ class ServiceConnector(BaseModel, metaclass=ServiceConnectorMeta):
 
     def to_response_model(
         self,
-        workspace: WorkspaceResponse,
         user: Optional[UserResponse] = None,
         name: Optional[str] = None,
         id: Optional[UUID] = None,
@@ -772,7 +764,6 @@ class ServiceConnector(BaseModel, metaclass=ServiceConnectorMeta):
         """Convert the connector instance to a service connector response model.
 
         Args:
-            workspace: The workspace that the connector belongs to.
             user: The user that created the connector.
             name: The name of the connector.
             id: The ID of the connector.
@@ -810,7 +801,6 @@ class ServiceConnector(BaseModel, metaclass=ServiceConnectorMeta):
                 expires_skew_tolerance=self.expires_skew_tolerance,
             ),
             metadata=ServiceConnectorResponseMetadata(
-                workspace=workspace,
                 expiration_seconds=self.expiration_seconds,
                 labels=labels or {},
             ),

zenml/service_connectors/service_connector_utils.py

@@ -184,8 +184,6 @@ def get_resources_options_from_resource_model_for_full_stack(
     else:
         resource_model = zen_store.verify_service_connector_config(
             service_connector=ServiceConnectorRequest(
-                user=client.active_user.id,
-                workspace=client.active_workspace.id,
                 name="fake",
                 connector_type=connector_details.type,
                 auth_method=connector_details.auth_method,

zenml/stack/authentication_mixin.py

@@ -71,7 +71,7 @@ class AuthenticationMixin(StackComponent):
 
         # Try to resolve the secret using the secret store
         try:
-            return Client().get_secret_by_name_and_scope(
+            return Client().get_secret_by_name_and_private_status(
                 name=self.config.authentication_secret,
             )
         except (KeyError, NotImplementedError):

zenml/stack/flavor.py

@@ -17,7 +17,6 @@ import os
 from abc import abstractmethod
 from typing import Any, Dict, Optional, Type, cast
 
-from zenml.client import Client
 from zenml.enums import StackComponentType
 from zenml.exceptions import CustomFlavorImportError
 from zenml.models import (
@@ -25,7 +24,6 @@ from zenml.models import (
     FlavorResponse,
     ServiceConnectorRequirements,
 )
-from zenml.models.v2.core.flavor import InternalFlavorRequest
 from zenml.stack.stack_component import StackComponent, StackComponentConfig
 from zenml.utils import source_utils
 from zenml.utils.package_utils import is_latest_zenml_version
@@ -167,8 +165,7 @@ class Flavor:
 
         Args:
             integration: The integration to use for the model.
-            is_custom: Whether the flavor is a custom flavor. Custom flavors
-                are then scoped by user and workspace
+            is_custom: Whether the flavor is a custom flavor.
 
         Returns:
             The model.
@@ -189,16 +186,8 @@ class Flavor:
             if connector_requirements
             else None
         )
-        user = None
-        workspace = None
-        if is_custom:
-            user = Client().active_user.id
-            workspace = Client().active_workspace.id
-
-        model_class = FlavorRequest if is_custom else InternalFlavorRequest
-        model = model_class(
-            user=user,
-            workspace=workspace,
+
+        model = FlavorRequest(
             name=self.name,
             type=self.type,
             source=source_utils.resolve(self.__class__).import_path,

zenml/stack/stack.py

@@ -756,7 +756,6 @@ class Stack:
                 type=flavor.type,
                 config=LocalImageBuilderConfig(),
                 user=Client().active_user.id,
-                workspace=Client().active_workspace.id,
                 created=now,
                 updated=now,
             )

zenml/stack/stack_component.py

@@ -215,7 +215,7 @@ class StackComponentConfig(BaseModel, ABC):
 
         # Try to resolve the secret using the secret store
         try:
-            secret = Client().get_secret_by_name_and_scope(
+            secret = Client().get_secret_by_name_and_private_status(
                 name=secret_ref.name,
             )
         except (KeyError, NotImplementedError):
@@ -333,7 +333,6 @@ class StackComponent:
         flavor: str,
         type: StackComponentType,
         user: Optional[UUID],
-        workspace: UUID,
         created: datetime,
         updated: datetime,
         labels: Optional[Dict[str, Any]] = None,
@@ -352,7 +351,6 @@ class StackComponent:
             flavor: The flavor of the component.
             type: The type of the component.
             user: The ID of the user who created the component.
-            workspace: The ID of the workspace the component belongs to.
             created: The creation time of the component.
             updated: The last update time of the component.
             labels: The labels of the component.
@@ -378,7 +376,6 @@ class StackComponent:
         self.flavor = flavor
         self.type = type
         self.user = user
-        self.workspace = workspace
         self.created = created
         self.updated = updated
         self.labels = labels
@@ -417,7 +414,6 @@ class StackComponent:
         try:
             return flavor.implementation_class(
                 user=user_id,
-                workspace=component_model.workspace.id,
                 name=component_model.name,
                 id=component_model.id,
                 config=configuration,

zenml/steps/base_step.py

@@ -432,7 +432,9 @@ class BaseStep:
         self,
         *args: Any,
         id: Optional[str] = None,
-        after: Union[str, Sequence[str], None] = None,
+        after: Union[
+            str, StepArtifact, Sequence[Union[str, StepArtifact]], None
+        ] = None,
         **kwargs: Any,
     ) -> Any:
         """Handle a call of the step.
@@ -497,8 +499,14 @@ class BaseStep:
         }
         if isinstance(after, str):
             upstream_steps.add(after)
+        elif isinstance(after, StepArtifact):
+            upstream_steps.add(after.invocation_id)
         elif isinstance(after, Sequence):
-            upstream_steps = upstream_steps.union(after)
+            for item in after:
+                if isinstance(item, str):
+                    upstream_steps.add(item)
+                elif isinstance(item, StepArtifact):
+                    upstream_steps.add(item.invocation_id)
 
         invocation_id = Pipeline.ACTIVE_PIPELINE.add_step_invocation(
             step=self,

zenml/steps/step_context.py

@@ -384,6 +384,25 @@ class StepContext(metaclass=SingletonMetaClass):
             output.tags = []
         output.tags += tags
 
+    def remove_output_tags(
+        self,
+        tags: List[str],
+        output_name: Optional[str] = None,
+    ) -> None:
+        """Removes tags for a given step output.
+
+        Args:
+            tags: The tags to remove.
+            output_name: Optional name of the output for which to remove the
+                tags. If no name is given and the step only has a single
+                output, the tags of this output will be removed. If the
+                step has multiple outputs, an exception will be raised.
+        """
+        output = self._get_output(output_name)
+        if not output.tags:
+            return
+        output.tags = [tag for tag in output.tags if tag not in tags]
+
 
 class StepContextOutput:
     """Represents a step output in the step context."""

zenml/utils/string_utils.py

@@ -101,7 +101,7 @@ def b64_decode(input_: str) -> str:
 
 
 def random_str(length: int) -> str:
-    """Generate a random human readable string of given length.
+    """Generate a random human-readable string of given length.
 
     Args:
         length: Length of string