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

zenml/models/v2/misc/statistics.py

@@ -20,8 +20,8 @@ from zenml.models.v2.base.base import (
 )
 
 
-class WorkspaceStatistics(BaseZenModel):
-    """Workspace statistics."""
+class ProjectStatistics(BaseZenModel):
+    """Project statistics."""
 
     pipelines: int = Field(
         title="The number of pipelines.",
@@ -40,6 +40,6 @@ class ServerStatistics(BaseZenModel):
     components: int = Field(
         title="The number of components.",
     )
-    workspaces: int = Field(
-        title="The number of workspaces.",
+    projects: int = Field(
+        title="The number of projects.",
     )

zenml/orchestrators/cache_utils.py

@@ -34,7 +34,7 @@ def generate_cache_key(
     step: "Step",
     input_artifact_ids: Dict[str, "UUID"],
     artifact_store: "BaseArtifactStore",
-    workspace_id: "UUID",
+    project_id: "UUID",
 ) -> str:
     """Generates a cache key for a step run.
 
@@ -42,7 +42,7 @@ def generate_cache_key(
     runs are identical and can be cached.
 
     The cache key is a MD5 hash of:
-    - the workspace ID,
+    - the project ID,
     - the artifact store ID and path,
     - the source code that defines the step,
     - the parameters of the step,
@@ -55,15 +55,15 @@ def generate_cache_key(
         step: The step to generate the cache key for.
         input_artifact_ids: The input artifact IDs for the step.
         artifact_store: The artifact store of the active stack.
-        workspace_id: The ID of the active workspace.
+        project_id: The ID of the active project.
 
     Returns:
         A cache key.
     """
     hash_ = hashlib.md5()  # nosec
 
-    # Workspace ID
-    hash_.update(workspace_id.bytes)
+    # Project ID
+    hash_.update(project_id.bytes)
 
     # Artifact store ID and path
     hash_.update(artifact_store.id.bytes)
@@ -106,7 +106,7 @@ def get_cached_step_run(cache_key: str) -> Optional["StepRunResponse"]:
     """If a given step can be cached, get the corresponding existing step run.
 
     A step run can be cached if there is an existing step run in the same
-    workspace which has the same cache key and was successfully executed.
+    project which has the same cache key and was successfully executed.
 
     Args:
         cache_key: The cache key of the step.
@@ -117,7 +117,7 @@ def get_cached_step_run(cache_key: str) -> Optional["StepRunResponse"]:
     client = Client()
 
     cache_candidates = client.list_run_steps(
-        workspace=client.active_workspace.id,
+        project=client.active_project.id,
         cache_key=cache_key,
         status=ExecutionStatus.COMPLETED,
         sort_by=f"{SorterOps.DESCENDING}:created",

zenml/orchestrators/input_utils.py

@@ -55,7 +55,7 @@ def resolve_step_inputs(
         for run_step in pagination_utils.depaginate(
             Client().list_run_steps,
             pipeline_run_id=pipeline_run.id,
-            workspace=pipeline_run.workspace.id,
+            project=pipeline_run.project.id,
         )
     }
 

zenml/orchestrators/step_launcher.py

@@ -319,7 +319,7 @@ class StepLauncher:
         pipeline_run = PipelineRunRequest(
             name=run_name,
             orchestrator_run_id=self._orchestrator_run_id,
-            workspace=client.active_workspace.id,
+            project=client.active_project.id,
             deployment=self._deployment.id,
             pipeline=(
                 self._deployment.pipeline.id

zenml/orchestrators/step_run_utils.py

@@ -75,7 +75,7 @@ class StepRunRequestFactory:
             pipeline_run_id=self.pipeline_run.id,
             status=ExecutionStatus.RUNNING,
             start_time=utc_now(),
-            workspace=Client().active_workspace.id,
+            project=Client().active_project.id,
         )
 
     def populate_request(self, request: StepRunRequest) -> None:
@@ -102,7 +102,7 @@ class StepRunRequestFactory:
             step=step,
             input_artifact_ids=input_artifact_ids,
             artifact_store=self.stack.artifact_store,
-            workspace_id=Client().active_workspace.id,
+            project_id=Client().active_project.id,
         )
         request.cache_key = cache_key
 

zenml/orchestrators/utils.py

@@ -23,8 +23,8 @@ from zenml.config.global_config import (
     GlobalConfiguration,
 )
 from zenml.constants import (
+    ENV_ZENML_ACTIVE_PROJECT_ID,
     ENV_ZENML_ACTIVE_STACK_ID,
-    ENV_ZENML_ACTIVE_WORKSPACE_ID,
     ENV_ZENML_DISABLE_CREDENTIALS_DISK_CACHING,
     ENV_ZENML_PIPELINE_RUN_API_TOKEN_EXPIRATION,
     ENV_ZENML_SERVER,
@@ -211,13 +211,13 @@ def get_config_environment_vars(
     # in the pipeline run environment
     environment_vars[ENV_ZENML_DISABLE_CREDENTIALS_DISK_CACHING] = "true"
 
-    # Make sure to use the correct active stack/workspace which might come
+    # Make sure to use the correct active stack/project which might come
     # from a .zen repository and not the global config
     environment_vars[ENV_ZENML_ACTIVE_STACK_ID] = str(
         Client().active_stack_model.id
     )
-    environment_vars[ENV_ZENML_ACTIVE_WORKSPACE_ID] = str(
-        Client().active_workspace.id
+    environment_vars[ENV_ZENML_ACTIVE_PROJECT_ID] = str(
+        Client().active_project.id
     )
 
     return environment_vars

zenml/pipelines/build_utils.py

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

zenml/pipelines/pipeline_definition.py

@@ -684,7 +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,
+                project=Client().active_project.id,
                 pipeline_id=pipeline_id,
                 orchestrator_id=orchestrator.id,
                 name=schedule_name,
@@ -770,7 +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(
-            workspace=Client().active_workspace.id,
+            project=Client().active_project.id,
             stack=stack.id,
             pipeline=pipeline_id,
             build=build_id,
@@ -1013,7 +1013,7 @@ To avoid this consider setting pipeline parameters only in one place (config or
             for component_type, component in stack.components.items()
         }
         return {
-            "workspace_id": deployment.workspace.id,
+            "project_id": deployment.project.id,
             "store_type": Client().zen_store.type.value,
             **stack_metadata,
             "total_steps": len(self.invocations),
@@ -1094,7 +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,
+                project=client.active_project.id,
                 name=self.name,
             )
 
@@ -1233,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,7 +81,7 @@ def create_placeholder_run(
         # running.
         start_time=start_time,
         orchestrator_run_id=None,
-        workspace=deployment.workspace.id,
+        project=deployment.project.id,
         deployment=deployment.id,
         pipeline=deployment.pipeline.id if deployment.pipeline else None,
         status=ExecutionStatus.INITIALIZING,

zenml/service_connectors/service_connector.py

@@ -705,7 +705,6 @@ class ServiceConnector(BaseModel, metaclass=ServiceConnectorMeta):
 
     def to_model(
         self,
-        workspace: UUID,
         name: Optional[str] = None,
         description: str = "",
         labels: Optional[Dict[str, str]] = None,
@@ -714,7 +713,6 @@ class ServiceConnector(BaseModel, metaclass=ServiceConnectorMeta):
 
         Args:
             name: The name of 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.
 
@@ -737,7 +735,6 @@ class ServiceConnector(BaseModel, metaclass=ServiceConnectorMeta):
             connector_type=spec.connector_type,
             name=name,
             description=description,
-            workspace=workspace,
             auth_method=self.auth_method,
             expires_at=self.expires_at,
             expires_skew_tolerance=self.expires_skew_tolerance,

zenml/service_connectors/service_connector_utils.py

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

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/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/zen_server/rbac/endpoint_utils.py

@@ -22,8 +22,8 @@ from zenml.models import (
     BaseRequest,
     BaseUpdate,
     Page,
+    ProjectScopedFilter,
     UserScopedRequest,
-    WorkspaceScopedFilter,
 )
 from zenml.zen_server.auth import get_auth_context
 from zenml.zen_server.feature_gate.endpoint_utils import (
@@ -42,7 +42,7 @@ from zenml.zen_server.rbac.utils import (
     verify_permission,
     verify_permission_for_model,
 )
-from zenml.zen_server.utils import server_config, set_filter_workspace_scope
+from zenml.zen_server.utils import server_config, set_filter_project_scope
 
 AnyRequest = TypeVar("AnyRequest", bound=BaseRequest)
 AnyResponse = TypeVar("AnyResponse", bound=BaseIdentifiedResponse)  # type: ignore[type-arg]
@@ -232,27 +232,27 @@ def verify_permissions_and_list_entities(
         A page of entity models.
 
     Raises:
-        ValueError: If the filter's workspace scope is not set or is not a UUID.
+        ValueError: If the filter's project scope is not set or is not a UUID.
     """
     auth_context = get_auth_context()
     assert auth_context
 
-    workspace_id: Optional[UUID] = None
-    if isinstance(filter_model, WorkspaceScopedFilter):
-        # A workspace scoped filter must always be scoped to a specific
-        # workspace. This is required for the RBAC check to work.
-        set_filter_workspace_scope(filter_model)
-        if not filter_model.workspace or not isinstance(
-            filter_model.workspace, UUID
+    project_id: Optional[UUID] = None
+    if isinstance(filter_model, ProjectScopedFilter):
+        # A project scoped filter must always be scoped to a specific
+        # project. This is required for the RBAC check to work.
+        set_filter_project_scope(filter_model)
+        if not filter_model.project or not isinstance(
+            filter_model.project, UUID
         ):
             raise ValueError(
-                "Workspace scope must be a UUID, got "
-                f"{type(filter_model.workspace)}."
+                "Project scope must be a UUID, got "
+                f"{type(filter_model.project)}."
             )
-        workspace_id = filter_model.workspace
+        project_id = filter_model.project
 
     allowed_ids = get_allowed_resource_ids(
-        resource_type=resource_type, workspace_id=workspace_id
+        resource_type=resource_type, project_id=project_id
     )
     filter_model.configure_rbac(
         authenticated_user_id=auth_context.user.id, id=allowed_ids
@@ -318,7 +318,7 @@ def verify_permissions_and_delete_entity(
 def verify_permissions_and_prune_entities(
     resource_type: ResourceType,
     prune_method: Callable[..., None],
-    workspace_id: Optional[UUID] = None,
+    project_id: Optional[UUID] = None,
     **kwargs: Any,
 ) -> None:
     """Verify permissions and prune entities of certain type.
@@ -326,12 +326,12 @@ def verify_permissions_and_prune_entities(
     Args:
         resource_type: The resource type of the entities to prune.
         prune_method: The method to prune the entities.
-        workspace_id: The workspace ID to prune the entities for.
+        project_id: The project ID to prune the entities for.
         kwargs: Keyword arguments to pass to the prune method.
     """
     verify_permission(
         resource_type=resource_type,
         action=Action.PRUNE,
-        workspace_id=workspace_id,
+        project_id=project_id,
     )
     prune_method(**kwargs)

zenml/zen_server/rbac/models.py

@@ -73,15 +73,15 @@ class ResourceType(StrEnum):
     TAG = "tag"
     TRIGGER = "trigger"
     TRIGGER_EXECUTION = "trigger_execution"
-    WORKSPACE = "workspace"
+    PROJECT = "project"
     # Deactivated for now
     # USER = "user"
 
-    def is_workspace_scoped(self) -> bool:
-        """Check if a resource type is workspace scoped.
+    def is_project_scoped(self) -> bool:
+        """Check if a resource type is project scoped.
 
         Returns:
-            Whether the resource type is workspace scoped.
+            Whether the resource type is project scoped.
         """
         return self not in [
             self.FLAVOR,
@@ -91,7 +91,7 @@ class ResourceType(StrEnum):
             self.STACK_COMPONENT,
             self.TAG,
             self.SERVICE_ACCOUNT,
-            self.WORKSPACE,
+            self.PROJECT,
             # Deactivated for now
             # self.USER,
         ]
@@ -102,7 +102,7 @@ class Resource(BaseModel):
 
     type: str
     id: Optional[UUID] = None
-    workspace_id: Optional[UUID] = None
+    project_id: Optional[UUID] = None
 
     def __str__(self) -> str:
         """Convert to a string.
@@ -110,15 +110,15 @@ class Resource(BaseModel):
         Returns:
             Resource string representation.
         """
-        workspace_id = self.workspace_id
-        if self.type == ResourceType.WORKSPACE and self.id:
-            # TODO: For now, we duplicate the workspace ID in the string
-            # representation when describing a workspace instance, because
+        project_id = self.project_id
+        if self.type == ResourceType.PROJECT and self.id:
+            # TODO: For now, we duplicate the project ID in the string
+            # representation when describing a project instance, because
             # this is what is expected by the RBAC implementation.
-            workspace_id = self.id
+            project_id = self.id
 
-        if workspace_id:
-            representation = f"{workspace_id}:"
+        if project_id:
+            representation = f"{project_id}:"
         else:
             representation = ""
         representation += self.type
@@ -128,11 +128,11 @@ class Resource(BaseModel):
         return representation
 
     @model_validator(mode="after")
-    def validate_workspace_id(self) -> "Resource":
-        """Validate that workspace_id is set in combination with workspace-scoped resource types.
+    def validate_project_id(self) -> "Resource":
+        """Validate that project_id is set in combination with project-scoped resource types.
 
         Raises:
-            ValueError: If workspace_id is not set for a workspace-scoped
+            ValueError: If project_id is not set for a project-scoped
                 resource or set for an unscoped resource.
 
         Returns:
@@ -140,15 +140,15 @@ class Resource(BaseModel):
         """
         resource_type = ResourceType(self.type)
 
-        if resource_type.is_workspace_scoped() and not self.workspace_id:
+        if resource_type.is_project_scoped() and not self.project_id:
             raise ValueError(
-                "workspace_id must be set for workspace-scoped resource type "
+                "project_id must be set for project-scoped resource type "
                 f"'{self.type}'"
             )
 
-        if not resource_type.is_workspace_scoped() and self.workspace_id:
+        if not resource_type.is_project_scoped() and self.project_id:
             raise ValueError(
-                "workspace_id must not be set for global resource type "
+                "project_id must not be set for global resource type "
                 f"'{self.type}'"
             )
 

zenml/zen_server/rbac/rbac_sql_zen_store.py

@@ -65,7 +65,7 @@ class RBACSqlZenStore(SqlZenStore):
             verify_permission(
                 resource_type=ResourceType.MODEL,
                 action=Action.CREATE,
-                workspace_id=model_request.workspace,
+                project_id=model_request.project,
             )
             check_entitlement(resource_type=ResourceType.MODEL)
         except Exception as e:
@@ -80,7 +80,7 @@ class RBACSqlZenStore(SqlZenStore):
             try:
                 model_response = self.get_model_by_name_or_id(
                     model_name_or_id=model_request.name,
-                    workspace=model_request.workspace,
+                    project=model_request.project,
                 )
                 created = False
             except KeyError:
@@ -152,7 +152,7 @@ class RBACSqlZenStore(SqlZenStore):
             verify_permission(
                 resource_type=ResourceType.MODEL_VERSION,
                 action=Action.CREATE,
-                workspace_id=model_version_request.workspace,
+                project_id=model_version_request.project,
             )
         except Exception as e:
             allow_creation = False

zenml/zen_server/rbac/utils.py

@@ -32,10 +32,10 @@ from zenml.exceptions import IllegalOperationError
 from zenml.models import (
     BaseIdentifiedResponse,
     Page,
+    ProjectScopedRequest,
+    ProjectScopedResponse,
     UserResponse,
     UserScopedResponse,
-    WorkspaceScopedRequest,
-    WorkspaceScopedResponse,
 )
 from zenml.zen_server.auth import get_auth_context
 from zenml.zen_server.rbac.models import Action, Resource, ResourceType
@@ -300,7 +300,7 @@ def verify_permission(
     resource_type: str,
     action: Action,
     resource_id: Optional[UUID] = None,
-    workspace_id: Optional[UUID] = None,
+    project_id: Optional[UUID] = None,
 ) -> None:
     """Verifies if a user has permission to perform an action on a resource.
 
@@ -309,11 +309,11 @@ def verify_permission(
             action on.
         action: The action the user wants to perform.
         resource_id: ID of the resource the user wants to perform the action on.
-        workspace_id: ID of the workspace the user wants to perform the action
-            on. Only used for workspace scoped resources.
+        project_id: ID of the project the user wants to perform the action
+            on. Only used for project scoped resources.
     """
     resource = Resource(
-        type=resource_type, id=resource_id, workspace_id=workspace_id
+        type=resource_type, id=resource_id, project_id=project_id
     )
     batch_verify_permissions(resources={resource}, action=action)
 
@@ -321,15 +321,15 @@ def verify_permission(
 def get_allowed_resource_ids(
     resource_type: str,
     action: Action = Action.READ,
-    workspace_id: Optional[UUID] = None,
+    project_id: Optional[UUID] = None,
 ) -> Optional[Set[UUID]]:
     """Get all resource IDs of a resource type that a user can access.
 
     Args:
         resource_type: The resource type.
         action: The action the user wants to perform on the resource.
-        workspace_id: Optional workspace ID to filter the resources by.
-            Required for workspace scoped resources.
+        project_id: Optional project ID to filter the resources by.
+            Required for project scoped resources.
 
     Returns:
         A list of resource IDs or `None` if the user has full access to the
@@ -346,7 +346,7 @@ def get_allowed_resource_ids(
         allowed_ids,
     ) = rbac().list_allowed_resource_ids(
         user=auth_context.user,
-        resource=Resource(type=resource_type, workspace_id=workspace_id),
+        resource=Resource(type=resource_type, project_id=project_id),
         action=action,
     )
 
@@ -371,21 +371,19 @@ def get_resource_for_model(model: AnyModel) -> Optional[Resource]:
         # This model is not tied to any RBAC resource type
         return None
 
-    workspace_id: Optional[UUID] = None
-    if isinstance(model, WorkspaceScopedResponse):
-        # A workspace scoped response is always scoped to a specific workspace
-        workspace_id = model.workspace.id
-    elif isinstance(model, WorkspaceScopedRequest):
-        # A workspace scoped request is always scoped to a specific workspace
-        workspace_id = model.workspace
+    project_id: Optional[UUID] = None
+    if isinstance(model, ProjectScopedResponse):
+        # A project scoped response is always scoped to a specific project
+        project_id = model.project.id
+    elif isinstance(model, ProjectScopedRequest):
+        # A project scoped request is always scoped to a specific project
+        project_id = model.project
 
     resource_id: Optional[UUID] = None
     if isinstance(model, BaseIdentifiedResponse):
         resource_id = model.id
 
-    return Resource(
-        type=resource_type, id=resource_id, workspace_id=workspace_id
-    )
+    return Resource(type=resource_type, id=resource_id, project_id=project_id)
 
 
 def get_surrogate_permission_model_for_model(
@@ -456,6 +454,8 @@ def get_resource_type_for_model(
         PipelineResponse,
         PipelineRunRequest,
         PipelineRunResponse,
+        ProjectRequest,
+        ProjectResponse,
         RunMetadataRequest,
         RunTemplateRequest,
         RunTemplateResponse,
@@ -475,8 +475,6 @@ def get_resource_type_for_model(
         TriggerExecutionResponse,
         TriggerRequest,
         TriggerResponse,
-        WorkspaceRequest,
-        WorkspaceResponse,
     )
 
     mapping: Dict[
@@ -528,8 +526,8 @@ def get_resource_type_for_model(
         TriggerResponse: ResourceType.TRIGGER,
         TriggerExecutionRequest: ResourceType.TRIGGER_EXECUTION,
         TriggerExecutionResponse: ResourceType.TRIGGER_EXECUTION,
-        WorkspaceResponse: ResourceType.WORKSPACE,
-        WorkspaceRequest: ResourceType.WORKSPACE,
+        ProjectResponse: ResourceType.PROJECT,
+        ProjectRequest: ResourceType.PROJECT,
         # UserResponse: ResourceType.USER,
     }
 
@@ -673,7 +671,7 @@ def get_schema_for_resource_type(
         ResourceType.SERVICE: ServiceSchema,
         ResourceType.TAG: TagSchema,
         ResourceType.SERVICE_ACCOUNT: UserSchema,
-        # ResourceType.WORKSPACE: WorkspaceSchema,
+        # ResourceType.PROJECT: ProjectSchema,
         ResourceType.PIPELINE_RUN: PipelineRunSchema,
         ResourceType.PIPELINE_DEPLOYMENT: PipelineDeploymentSchema,
         ResourceType.PIPELINE_BUILD: PipelineBuildSchema,