Merge branch 'develop' into feature/runtime-environment-variables

Author: schustmi

src/zenml/models/v2/base/scoped.py

@@ -318,6 +318,8 @@ 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.

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

@@ -710,6 +710,7 @@ 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

src/zenml/zen_server/rbac/utils.py

@@ -373,8 +373,7 @@ def get_resource_for_model(model: AnyModel) -> Optional[Resource]:
 
     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
+        project_id = model.project_id
     elif isinstance(model, ProjectScopedRequest):
         # A project scoped request is always scoped to a specific project
         project_id = model.project

src/zenml/zen_stores/schemas/action_schemas.py

@@ -192,6 +192,7 @@ def to_model(
             )
         return ActionResponse(
             id=self.id,
+            project_id=self.project_id,
             name=self.name,
             body=body,
             metadata=metadata,

src/zenml/zen_stores/schemas/artifact_schemas.py

@@ -203,6 +203,7 @@ def to_model(
 
         return ArtifactResponse(
             id=self.id,
+            project_id=self.project_id,
             name=self.name,
             body=body,
             metadata=metadata,
@@ -437,6 +438,7 @@ def to_model(
 
         return ArtifactVersionResponse(
             id=self.id,
+            project_id=self.project_id,
             body=body,
             metadata=metadata,
             resources=resources,

src/zenml/zen_stores/schemas/code_repository_schemas.py

@@ -133,6 +133,7 @@ def to_model(
             )
         return CodeRepositoryResponse(
             id=self.id,
+            project_id=self.project_id,
             name=self.name,
             metadata=metadata,
             body=body,

src/zenml/zen_stores/schemas/event_source_schemas.py

@@ -165,6 +165,7 @@ def to_model(
             )
         return EventSourceResponse(
             id=self.id,
+            project_id=self.project_id,
             name=self.name,
             body=body,
             metadata=metadata,

src/zenml/zen_stores/schemas/model_schemas.py

@@ -228,6 +228,7 @@ def to_model(
 
         return ModelResponse(
             id=self.id,
+            project_id=self.project_id,
             name=self.name,
             body=body,
             metadata=metadata,
@@ -502,6 +503,7 @@ def to_model(
 
         return ModelVersionResponse(
             id=self.id,
+            project_id=self.project_id,
             name=self.name,
             body=body,
             metadata=metadata,

src/zenml/zen_stores/schemas/pipeline_build_schemas.py

@@ -169,6 +169,7 @@ def to_model(
             )
         return PipelineBuildResponse(
             id=self.id,
+            project_id=self.project_id,
             body=body,
             metadata=metadata,
         )

src/zenml/zen_stores/schemas/pipeline_deployment_schemas.py

@@ -295,6 +295,7 @@ def to_model(
             )
         return PipelineDeploymentResponse(
             id=self.id,
+            project_id=self.project_id,
             body=body,
             metadata=metadata,
         )

src/zenml/zen_stores/schemas/pipeline_run_schemas.py

@@ -435,6 +435,7 @@ def to_model(
 
         return PipelineRunResponse(
             id=self.id,
+            project_id=self.project_id,
             name=self.name,
             body=body,
             metadata=metadata,

src/zenml/zen_stores/schemas/pipeline_schemas.py

@@ -196,6 +196,7 @@ def to_model(
 
         return PipelineResponse(
             id=self.id,
+            project_id=self.project_id,
             name=self.name,
             body=body,
             metadata=metadata,

src/zenml/zen_stores/schemas/run_template_schemas.py

@@ -299,6 +299,7 @@ def to_model(
 
         return RunTemplateResponse(
             id=self.id,
+            project_id=self.project_id,
             name=self.name,
             body=body,
             metadata=metadata,

src/zenml/zen_stores/schemas/schedule_schema.py

@@ -211,6 +211,7 @@ def to_model(
 
         return ScheduleResponse(
             id=self.id,
+            project_id=self.project_id,
             name=self.name,
             body=body,
             metadata=metadata,

src/zenml/zen_stores/schemas/service_schemas.py

@@ -171,6 +171,7 @@ def to_model(
             )
         return ServiceResponse(
             id=self.id,
+            project_id=self.project_id,
             name=self.name,
             body=body,
             metadata=metadata,

src/zenml/zen_stores/schemas/step_run_schemas.py

@@ -322,6 +322,7 @@ def to_model(
 
         return StepRunResponse(
             id=self.id,
+            project_id=self.project_id,
             name=self.name,
             body=body,
             metadata=metadata,

src/zenml/zen_stores/schemas/trigger_schemas.py

@@ -239,6 +239,7 @@ def to_model(
             )
         return TriggerResponse(
             id=self.id,
+            project_id=self.project_id,
             name=self.name,
             body=body,
             metadata=metadata,

tests/integration/functional/zen_server/template_execution/test_template_execution_utils.py

@@ -44,6 +44,7 @@ def test_creating_deployment_request_from_template(
 
     build = PipelineBuildResponse(
         id=uuid4(),
+        project_id=deployment.project_id,
         body=PipelineBuildResponseBody(
             created=datetime.utcnow(), updated=datetime.utcnow()
         ),
@@ -52,6 +53,7 @@ def test_creating_deployment_request_from_template(
 
     template_response = RunTemplateResponse(
         id=uuid4(),
+        project_id=deployment.project_id,
         name="template",
         body=RunTemplateResponseBody(
             created=datetime.utcnow(),

tests/unit/conftest.py

@@ -423,6 +423,7 @@ def sample_pipeline_run(
 
     return PipelineRunResponse(
         id=uuid4(),
+        project_id=sample_project_model.id,
         name="sample_run_name",
         body=PipelineRunResponseBody(
             created=datetime.now(),
@@ -475,6 +476,7 @@ def sample_artifact_model(sample_project_model) -> ArtifactResponse:
     """Return a sample artifact model for testing purposes."""
     return ArtifactResponse(
         id=uuid4(),
+        project_id=sample_project_model.id,
         name="sample_artifact",
         body=ArtifactResponseBody(
             created=datetime.now(),
@@ -495,6 +497,7 @@ def sample_artifact_version_model(
     """Return a sample artifact version model for testing purposes."""
     return ArtifactVersionResponse(
         id=uuid4(),
+        project_id=sample_project_model.id,
         body=ArtifactVersionResponseBody(
             artifact=sample_artifact_model,
             version="1",
@@ -563,6 +566,7 @@ def f(
         )
         return StepRunResponse(
             id=uuid4(),
+            project_id=sample_project_model.id,
             name=step_run_name,
             body=StepRunResponseBody(
                 status=ExecutionStatus.COMPLETED,
@@ -602,6 +606,7 @@ def f(
         metadata_kwargs.update(kwargs)
         return PipelineResponse(
             id=uuid4(),
+            project_id=sample_project_model.id,
             name="sample_pipeline",
             body=PipelineResponseBody(
                 created=datetime.now(),
@@ -624,6 +629,7 @@ def sample_deployment_response_model(
 ) -> PipelineDeploymentResponse:
     return PipelineDeploymentResponse(
         id=uuid4(),
+        project_id=sample_project_model.id,
         body=PipelineDeploymentResponseBody(
             created=datetime.now(),
             updated=datetime.now(),
@@ -646,6 +652,7 @@ def sample_build_response_model(
 ) -> PipelineBuildResponse:
     return PipelineBuildResponse(
         id=uuid4(),
+        project_id=sample_project_model.id,
         body=PipelineBuildResponseBody(
             created=datetime.now(),
             updated=datetime.now(),
@@ -667,6 +674,7 @@ def sample_code_repo_response_model(
 ) -> CodeRepositoryResponse:
     return CodeRepositoryResponse(
         id=uuid4(),
+        project_id=sample_project_model.id,
         name="name",
         body=CodeRepositoryResponseBody(
             created=datetime.now(),
@@ -738,6 +746,7 @@ def service_response(
     )
     return ServiceResponse(
         id=service_id,
+        project_id=sample_project_model.id,
         name=service_name,
         body=body,
         metadata=metadata,

tests/unit/models/test_model_models.py

@@ -37,6 +37,7 @@ def test_model_version_response_artifact_fetching(
 
     model = ModelResponse(
         id=uuid4(),
+        project_id=sample_project_model.id,
         name="model",
         body=ModelResponseBody(
             created=datetime.now(),
@@ -49,6 +50,7 @@ def test_model_version_response_artifact_fetching(
     )
     mv = ModelVersionResponse(
         id=uuid4(),
+        project_id=sample_project_model.id,
         name="foo",
         body=ModelVersionResponseBody(
             created=datetime.now(),

tests/unit/models/test_service_models.py

@@ -81,6 +81,7 @@ def service_response(
     )
     return ServiceResponse(
         id=service_id,
+        project_id=sample_project_model.id,
         name=service_name,
         body=body,
         metadata=metadata,

tests/unit/pipelines/test_build_utils.py

@@ -320,6 +320,7 @@ def test_custom_build_verification(
 
     missing_image_build = PipelineBuildResponse(
         id=uuid4(),
+        project_id=sample_deployment_response_model.project_id,
         body=PipelineBuildResponseBody(
             created=datetime.now(),
             updated=datetime.now(),
@@ -491,6 +492,7 @@ def test_local_repo_verification(
 
     repo_response = CodeRepositoryResponse(
         id=uuid4(),
+        project_id=sample_deployment_response_model.project_id,
         name="name",
         body=CodeRepositoryResponseBody(
             created=datetime.now(),