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

zenml/zen_stores/schemas/__init__.py

@@ -38,7 +38,7 @@ from zenml.zen_stores.schemas.pipeline_deployment_schemas import (
 )
 from zenml.zen_stores.schemas.pipeline_run_schemas import PipelineRunSchema
 from zenml.zen_stores.schemas.pipeline_schemas import PipelineSchema
-from zenml.zen_stores.schemas.workspace_schemas import WorkspaceSchema
+from zenml.zen_stores.schemas.project_schemas import ProjectSchema
 from zenml.zen_stores.schemas.run_metadata_schemas import (
     RunMetadataResourceSchema,
     RunMetadataSchema,
@@ -118,5 +118,5 @@ __all__ = [
     "ModelVersionSchema",
     "ModelVersionArtifactSchema",
     "ModelVersionPipelineRunSchema",
-    "WorkspaceSchema",
+    "ProjectSchema",
 ]

zenml/zen_stores/schemas/action_schemas.py

@@ -19,7 +19,7 @@ from typing import TYPE_CHECKING, Any, List, Optional
 from uuid import UUID
 
 from pydantic.json import pydantic_encoder
-from sqlalchemy import TEXT, Column
+from sqlalchemy import TEXT, Column, UniqueConstraint
 from sqlmodel import Field, Relationship
 
 from zenml.models import (
@@ -32,9 +32,9 @@ from zenml.models import (
 )
 from zenml.utils.time_utils import utc_now
 from zenml.zen_stores.schemas.base_schemas import NamedSchema
+from zenml.zen_stores.schemas.project_schemas import ProjectSchema
 from zenml.zen_stores.schemas.schema_utils import build_foreign_key_field
 from zenml.zen_stores.schemas.user_schemas import UserSchema
-from zenml.zen_stores.schemas.workspace_schemas import WorkspaceSchema
 
 if TYPE_CHECKING:
     from zenml.zen_stores.schemas import TriggerSchema
@@ -44,16 +44,23 @@ class ActionSchema(NamedSchema, table=True):
     """SQL Model for actions."""
 
     __tablename__ = "action"
+    __table_args__ = (
+        UniqueConstraint(
+            "name",
+            "project_id",
+            name="unique_action_name_in_project",
+        ),
+    )
 
-    workspace_id: UUID = build_foreign_key_field(
+    project_id: UUID = build_foreign_key_field(
         source=__tablename__,
-        target=WorkspaceSchema.__tablename__,
-        source_column="workspace_id",
+        target=ProjectSchema.__tablename__,
+        source_column="project_id",
         target_column="id",
         ondelete="CASCADE",
         nullable=False,
     )
-    workspace: "WorkspaceSchema" = Relationship(back_populates="actions")
+    project: "ProjectSchema" = Relationship(back_populates="actions")
 
     user_id: Optional[UUID] = build_foreign_key_field(
         source=__tablename__,
@@ -104,7 +111,7 @@ class ActionSchema(NamedSchema, table=True):
         """
         return cls(
             name=request.name,
-            workspace_id=request.workspace,
+            project_id=request.project,
             user_id=request.user,
             configuration=base64.b64encode(
                 json.dumps(
@@ -171,7 +178,7 @@ class ActionSchema(NamedSchema, table=True):
         metadata = None
         if include_metadata:
             metadata = ActionResponseMetadata(
-                workspace=self.workspace.to_model(),
+                project=self.project.to_model(),
                 configuration=json.loads(
                     base64.b64decode(self.configuration).decode()
                 ),

zenml/zen_stores/schemas/api_key_schemas.py

@@ -19,7 +19,7 @@ from typing import Any, Optional, Tuple
 from uuid import UUID
 
 from passlib.context import CryptContext
-from sqlalchemy import TEXT, Column
+from sqlalchemy import TEXT, Column, UniqueConstraint
 from sqlmodel import Field, Relationship
 
 from zenml.models import (
@@ -42,6 +42,13 @@ class APIKeySchema(NamedSchema, table=True):
     """SQL Model for API keys."""
 
     __tablename__ = "api_key"
+    __table_args__ = (
+        UniqueConstraint(
+            "name",
+            "service_account_id",
+            name="unique_api_key_name_in_service_account",
+        ),
+    )
 
     description: str = Field(sa_column=Column(TEXT))
     key: str

zenml/zen_stores/schemas/artifact_schemas.py

@@ -44,6 +44,7 @@ from zenml.models.v2.core.artifact import ArtifactRequest
 from zenml.utils.time_utils import utc_now
 from zenml.zen_stores.schemas.base_schemas import BaseSchema, NamedSchema
 from zenml.zen_stores.schemas.component_schemas import StackComponentSchema
+from zenml.zen_stores.schemas.project_schemas import ProjectSchema
 from zenml.zen_stores.schemas.schema_utils import build_foreign_key_field
 from zenml.zen_stores.schemas.step_run_schemas import (
     StepRunInputArtifactSchema,
@@ -51,7 +52,6 @@ from zenml.zen_stores.schemas.step_run_schemas import (
 )
 from zenml.zen_stores.schemas.user_schemas import UserSchema
 from zenml.zen_stores.schemas.utils import RunMetadataInterface
-from zenml.zen_stores.schemas.workspace_schemas import WorkspaceSchema
 
 if TYPE_CHECKING:
     from zenml.zen_stores.schemas.artifact_visualization_schemas import (
@@ -71,7 +71,8 @@ class ArtifactSchema(NamedSchema, table=True):
     __table_args__ = (
         UniqueConstraint(
             "name",
-            name="unique_artifact_name",
+            "project_id",
+            name="unique_artifact_name_in_project",
         ),
     )
 
@@ -91,6 +92,28 @@ class ArtifactSchema(NamedSchema, table=True):
         ),
     )
 
+    project_id: UUID = build_foreign_key_field(
+        source=__tablename__,
+        target=ProjectSchema.__tablename__,
+        source_column="project_id",
+        target_column="id",
+        ondelete="CASCADE",
+        nullable=False,
+    )
+    project: "ProjectSchema" = Relationship()
+
+    user_id: Optional[UUID] = build_foreign_key_field(
+        source=__tablename__,
+        target=UserSchema.__tablename__,
+        source_column="user_id",
+        target_column="id",
+        ondelete="SET NULL",
+        nullable=True,
+    )
+    user: Optional["UserSchema"] = Relationship(
+        back_populates="artifacts",
+    )
+
     @property
     def latest_version(self) -> Optional["ArtifactVersionSchema"]:
         """Fetch the latest version for this artifact.
@@ -133,6 +156,8 @@ class ArtifactSchema(NamedSchema, table=True):
         return cls(
             name=artifact_request.name,
             has_custom_name=artifact_request.has_custom_name,
+            project_id=artifact_request.project,
+            user_id=artifact_request.user,
         )
 
     def to_model(
@@ -165,6 +190,7 @@ class ArtifactSchema(NamedSchema, table=True):
             tags=[tag.to_model() for tag in self.tags],
             latest_version_name=latest_name,
             latest_version_id=latest_id,
+            user=self.user.to_model() if self.user else None,
         )
 
         # Create the metadata of the model
@@ -172,6 +198,7 @@ class ArtifactSchema(NamedSchema, table=True):
         if include_metadata:
             metadata = ArtifactResponseMetadata(
                 has_custom_name=self.has_custom_name,
+                project=self.project.to_model(),
             )
 
         return ArtifactResponse(
@@ -254,10 +281,10 @@ class ArtifactVersionSchema(BaseSchema, RunMetadataInterface, table=True):
         ondelete="SET NULL",
         nullable=True,
     )
-    workspace_id: UUID = build_foreign_key_field(
+    project_id: UUID = build_foreign_key_field(
         source=__tablename__,
-        target=WorkspaceSchema.__tablename__,
-        source_column="workspace_id",
+        target=ProjectSchema.__tablename__,
+        source_column="project_id",
         target_column="id",
         ondelete="CASCADE",
         nullable=False,
@@ -268,9 +295,7 @@ class ArtifactVersionSchema(BaseSchema, RunMetadataInterface, table=True):
     user: Optional["UserSchema"] = Relationship(
         back_populates="artifact_versions"
     )
-    workspace: "WorkspaceSchema" = Relationship(
-        back_populates="artifact_versions"
-    )
+    project: "ProjectSchema" = Relationship(back_populates="artifact_versions")
     run_metadata: List["RunMetadataSchema"] = Relationship(
         sa_relationship_kwargs=dict(
             secondary="run_metadata_resource",
@@ -326,7 +351,7 @@ class ArtifactVersionSchema(BaseSchema, RunMetadataInterface, table=True):
             version=str(artifact_version_request.version),
             version_number=version_number,
             artifact_store_id=artifact_version_request.artifact_store_id,
-            workspace_id=artifact_version_request.workspace,
+            project_id=artifact_version_request.project,
             user_id=artifact_version_request.user,
             type=artifact_version_request.type.value,
             uri=artifact_version_request.uri,
@@ -402,7 +427,7 @@ class ArtifactVersionSchema(BaseSchema, RunMetadataInterface, table=True):
         metadata = None
         if include_metadata:
             metadata = ArtifactVersionResponseMetadata(
-                workspace=self.workspace.to_model(),
+                project=self.project.to_model(),
                 producer_step_run_id=producer_step_run_id,
                 visualizations=[v.to_model() for v in self.visualizations],
                 run_metadata=self.fetch_metadata(),

zenml/zen_stores/schemas/code_repository_schemas.py

@@ -17,7 +17,7 @@ import json
 from typing import Any, Optional
 from uuid import UUID
 
-from sqlalchemy import TEXT, Column
+from sqlalchemy import TEXT, Column, UniqueConstraint
 from sqlmodel import Field, Relationship
 
 from zenml.models import (
@@ -33,27 +33,32 @@ from zenml.models import (
 )
 from zenml.utils.time_utils import utc_now
 from zenml.zen_stores.schemas.base_schemas import BaseSchema, NamedSchema
+from zenml.zen_stores.schemas.project_schemas import ProjectSchema
 from zenml.zen_stores.schemas.schema_utils import build_foreign_key_field
 from zenml.zen_stores.schemas.user_schemas import UserSchema
-from zenml.zen_stores.schemas.workspace_schemas import WorkspaceSchema
 
 
 class CodeRepositorySchema(NamedSchema, table=True):
     """SQL Model for code repositories."""
 
     __tablename__ = "code_repository"
+    __table_args__ = (
+        UniqueConstraint(
+            "name",
+            "project_id",
+            name="unique_code_repository_name_in_project",
+        ),
+    )
 
-    workspace_id: UUID = build_foreign_key_field(
+    project_id: UUID = build_foreign_key_field(
         source=__tablename__,
-        target=WorkspaceSchema.__tablename__,
-        source_column="workspace_id",
+        target=ProjectSchema.__tablename__,
+        source_column="project_id",
         target_column="id",
         ondelete="CASCADE",
         nullable=False,
     )
-    workspace: "WorkspaceSchema" = Relationship(
-        back_populates="code_repositories"
-    )
+    project: "ProjectSchema" = Relationship(back_populates="code_repositories")
 
     user_id: Optional[UUID] = build_foreign_key_field(
         source=__tablename__,
@@ -87,7 +92,7 @@ class CodeRepositorySchema(NamedSchema, table=True):
         """
         return cls(
             name=request.name,
-            workspace_id=request.workspace,
+            project_id=request.project,
             user_id=request.user,
             config=json.dumps(request.config),
             source=request.source.model_dump_json(),
@@ -122,7 +127,7 @@ class CodeRepositorySchema(NamedSchema, table=True):
         metadata = None
         if include_metadata:
             metadata = CodeRepositoryResponseMetadata(
-                workspace=self.workspace.to_model(),
+                project=self.project.to_model(),
                 config=json.loads(self.config),
                 description=self.description,
             )
@@ -163,15 +168,15 @@ class CodeReferenceSchema(BaseSchema, table=True):
 
     __tablename__ = "code_reference"
 
-    workspace_id: UUID = build_foreign_key_field(
+    project_id: UUID = build_foreign_key_field(
         source=__tablename__,
-        target=WorkspaceSchema.__tablename__,
-        source_column="workspace_id",
+        target=ProjectSchema.__tablename__,
+        source_column="project_id",
         target_column="id",
         ondelete="CASCADE",
         nullable=False,
     )
-    workspace: "WorkspaceSchema" = Relationship()
+    project: "ProjectSchema" = Relationship()
 
     code_repository_id: UUID = build_foreign_key_field(
         source=__tablename__,
@@ -188,19 +193,19 @@ class CodeReferenceSchema(BaseSchema, table=True):
 
     @classmethod
     def from_request(
-        cls, request: "CodeReferenceRequest", workspace_id: UUID
+        cls, request: "CodeReferenceRequest", project_id: UUID
     ) -> "CodeReferenceSchema":
         """Convert a `CodeReferenceRequest` to a `CodeReferenceSchema`.
 
         Args:
             request: The request model to convert.
-            workspace_id: The workspace ID.
+            project_id: The project ID.
 
         Returns:
             The converted schema.
         """
         return cls(
-            workspace_id=workspace_id,
+            project_id=project_id,
             commit=request.commit,
             subdirectory=request.subdirectory,
             code_repository_id=request.code_repository,

zenml/zen_stores/schemas/component_schemas.py

@@ -18,6 +18,7 @@ import json
 from typing import TYPE_CHECKING, Any, List, Optional
 from uuid import UUID
 
+from sqlalchemy import UniqueConstraint
 from sqlmodel import Relationship
 
 from zenml.enums import StackComponentType
@@ -37,7 +38,6 @@ from zenml.zen_stores.schemas.service_connector_schemas import (
 )
 from zenml.zen_stores.schemas.stack_schemas import StackCompositionSchema
 from zenml.zen_stores.schemas.user_schemas import UserSchema
-from zenml.zen_stores.schemas.workspace_schemas import WorkspaceSchema
 
 if TYPE_CHECKING:
     from zenml.zen_stores.schemas.flavor_schemas import FlavorSchema
@@ -51,22 +51,19 @@ class StackComponentSchema(NamedSchema, table=True):
     """SQL Model for stack components."""
 
     __tablename__ = "stack_component"
+    __table_args__ = (
+        UniqueConstraint(
+            "name",
+            "type",
+            name="unique_component_name_and_type",
+        ),
+    )
 
     type: str
     flavor: str
     configuration: bytes
     labels: Optional[bytes]
 
-    workspace_id: UUID = build_foreign_key_field(
-        source=__tablename__,
-        target=WorkspaceSchema.__tablename__,
-        source_column="workspace_id",
-        target_column="id",
-        ondelete="CASCADE",
-        nullable=False,
-    )
-    workspace: "WorkspaceSchema" = Relationship(back_populates="components")
-
     user_id: Optional[UUID] = build_foreign_key_field(
         source=__tablename__,
         target=UserSchema.__tablename__,
@@ -132,7 +129,6 @@ class StackComponentSchema(NamedSchema, table=True):
         """
         return cls(
             name=request.name,
-            workspace_id=request.workspace,
             user_id=request.user,
             type=request.type,
             flavor=request.flavor,
@@ -158,7 +154,7 @@ class StackComponentSchema(NamedSchema, table=True):
             The updated `StackComponentSchema`.
         """
         for field, value in component_update.model_dump(
-            exclude_unset=True, exclude={"workspace", "user", "connector"}
+            exclude_unset=True, exclude={"user", "connector"}
         ).items():
             if field == "configuration":
                 self.configuration = base64.b64encode(
@@ -209,7 +205,6 @@ class StackComponentSchema(NamedSchema, table=True):
         metadata = None
         if include_metadata:
             metadata = ComponentResponseMetadata(
-                workspace=self.workspace.to_model(),
                 configuration=json.loads(
                     base64.b64decode(self.configuration).decode()
                 ),

zenml/zen_stores/schemas/event_source_schemas.py

@@ -18,7 +18,7 @@ import json
 from typing import TYPE_CHECKING, Any, List, Optional, cast
 from uuid import UUID
 
-from sqlalchemy import TEXT, Column
+from sqlalchemy import TEXT, Column, UniqueConstraint
 from sqlmodel import Field, Relationship
 
 from zenml import EventSourceResponseMetadata
@@ -33,10 +33,10 @@ from zenml.models import (
 from zenml.utils.json_utils import pydantic_encoder
 from zenml.utils.time_utils import utc_now
 from zenml.zen_stores.schemas.base_schemas import NamedSchema
+from zenml.zen_stores.schemas.project_schemas import ProjectSchema
 from zenml.zen_stores.schemas.schema_utils import build_foreign_key_field
 from zenml.zen_stores.schemas.user_schemas import UserSchema
 from zenml.zen_stores.schemas.utils import get_page_from_list
-from zenml.zen_stores.schemas.workspace_schemas import WorkspaceSchema
 
 if TYPE_CHECKING:
     from zenml.zen_stores.schemas import TriggerSchema
@@ -46,16 +46,23 @@ class EventSourceSchema(NamedSchema, table=True):
     """SQL Model for tag."""
 
     __tablename__ = "event_source"
+    __table_args__ = (
+        UniqueConstraint(
+            "name",
+            "project_id",
+            name="unique_event_source_name_in_project",
+        ),
+    )
 
-    workspace_id: UUID = build_foreign_key_field(
+    project_id: UUID = build_foreign_key_field(
         source=__tablename__,
-        target=WorkspaceSchema.__tablename__,
-        source_column="workspace_id",
+        target=ProjectSchema.__tablename__,
+        source_column="project_id",
         target_column="id",
         ondelete="CASCADE",
         nullable=False,
     )
-    workspace: "WorkspaceSchema" = Relationship(back_populates="event_sources")
+    project: "ProjectSchema" = Relationship(back_populates="event_sources")
 
     user_id: Optional[UUID] = build_foreign_key_field(
         source=__tablename__,
@@ -89,7 +96,7 @@ class EventSourceSchema(NamedSchema, table=True):
             The converted schema.
         """
         return cls(
-            workspace_id=request.workspace,
+            project_id=request.project,
             user_id=request.user,
             flavor=request.flavor,
             plugin_subtype=request.plugin_subtype,
@@ -150,7 +157,7 @@ class EventSourceSchema(NamedSchema, table=True):
         metadata = None
         if include_metadata:
             metadata = EventSourceResponseMetadata(
-                workspace=self.workspace.to_model(),
+                project=self.project.to_model(),
                 description=self.description,
                 configuration=json.loads(
                     base64.b64decode(self.configuration).decode()

zenml/zen_stores/schemas/flavor_schemas.py

@@ -17,7 +17,7 @@ import json
 from typing import Any, Optional
 from uuid import UUID
 
-from sqlalchemy import TEXT, Column
+from sqlalchemy import TEXT, Column, UniqueConstraint
 from sqlmodel import Field, Relationship
 
 from zenml.enums import StackComponentType
@@ -31,7 +31,6 @@ from zenml.utils.time_utils import utc_now
 from zenml.zen_stores.schemas.base_schemas import NamedSchema
 from zenml.zen_stores.schemas.schema_utils import build_foreign_key_field
 from zenml.zen_stores.schemas.user_schemas import UserSchema
-from zenml.zen_stores.schemas.workspace_schemas import WorkspaceSchema
 
 
 class FlavorSchema(NamedSchema, table=True):
@@ -45,6 +44,13 @@ class FlavorSchema(NamedSchema, table=True):
     """
 
     __tablename__ = "flavor"
+    __table_args__ = (
+        UniqueConstraint(
+            "name",
+            "type",
+            name="unique_flavor_name_and_type",
+        ),
+    )
 
     type: str
     source: str
@@ -54,18 +60,6 @@ class FlavorSchema(NamedSchema, table=True):
     connector_resource_type: Optional[str]
     connector_resource_id_attr: Optional[str]
 
-    workspace_id: Optional[UUID] = build_foreign_key_field(
-        source=__tablename__,
-        target=WorkspaceSchema.__tablename__,
-        source_column="workspace_id",
-        target_column="id",
-        ondelete="CASCADE",
-        nullable=True,
-    )
-    workspace: Optional["WorkspaceSchema"] = Relationship(
-        back_populates="flavors"
-    )
-
     user_id: Optional[UUID] = build_foreign_key_field(
         source=__tablename__,
         target=UserSchema.__tablename__,
@@ -84,7 +78,10 @@ class FlavorSchema(NamedSchema, table=True):
 
     is_custom: bool = Field(default=True)
 
-    def update(self, flavor_update: "FlavorUpdate") -> "FlavorSchema":
+    def update(
+        self,
+        flavor_update: "FlavorUpdate",
+    ) -> "FlavorSchema":
         """Update a `FlavorSchema` from a `FlavorUpdate`.
 
         Args:
@@ -94,7 +91,7 @@ class FlavorSchema(NamedSchema, table=True):
             The updated `FlavorSchema`.
         """
         for field, value in flavor_update.model_dump(
-            exclude_unset=True, exclude={"workspace", "user"}
+            exclude_unset=True, exclude={"user"}
         ).items():
             if field == "config_schema":
                 setattr(self, field, json.dumps(value))
@@ -129,22 +126,19 @@ class FlavorSchema(NamedSchema, table=True):
             integration=self.integration,
             source=self.source,
             logo_url=self.logo_url,
+            is_custom=self.is_custom,
             created=self.created,
             updated=self.updated,
         )
         metadata = None
         if include_metadata:
             metadata = FlavorResponseMetadata(
-                workspace=self.workspace.to_model()
-                if self.workspace
-                else None,
                 config_schema=json.loads(self.config_schema),
                 connector_type=self.connector_type,
                 connector_resource_type=self.connector_resource_type,
                 connector_resource_id_attr=self.connector_resource_id_attr,
                 docs_url=self.docs_url,
                 sdk_docs_url=self.sdk_docs_url,
-                is_custom=self.is_custom,
             )
         return FlavorResponse(
             id=self.id,

zenml/zen_stores/schemas/model_schemas.py

@@ -57,6 +57,7 @@ from zenml.zen_stores.schemas.artifact_schemas import ArtifactVersionSchema
 from zenml.zen_stores.schemas.base_schemas import BaseSchema, NamedSchema
 from zenml.zen_stores.schemas.constants import MODEL_VERSION_TABLENAME
 from zenml.zen_stores.schemas.pipeline_run_schemas import PipelineRunSchema
+from zenml.zen_stores.schemas.project_schemas import ProjectSchema
 from zenml.zen_stores.schemas.run_metadata_schemas import RunMetadataSchema
 from zenml.zen_stores.schemas.schema_utils import build_foreign_key_field
 from zenml.zen_stores.schemas.tag_schemas import TagSchema
@@ -65,7 +66,6 @@ from zenml.zen_stores.schemas.utils import (
     RunMetadataInterface,
     get_page_from_list,
 )
-from zenml.zen_stores.schemas.workspace_schemas import WorkspaceSchema
 
 if TYPE_CHECKING:
     from zenml.zen_stores.schemas import ServiceSchema, StepRunSchema
@@ -78,20 +78,20 @@ class ModelSchema(NamedSchema, table=True):
     __table_args__ = (
         UniqueConstraint(
             "name",
-            "workspace_id",
-            name="unique_model_name_in_workspace",
+            "project_id",
+            name="unique_model_name_in_project",
         ),
     )
 
-    workspace_id: UUID = build_foreign_key_field(
+    project_id: UUID = build_foreign_key_field(
         source=__tablename__,
-        target=WorkspaceSchema.__tablename__,
-        source_column="workspace_id",
+        target=ProjectSchema.__tablename__,
+        source_column="project_id",
         target_column="id",
         ondelete="CASCADE",
         nullable=False,
     )
-    workspace: "WorkspaceSchema" = Relationship(back_populates="models")
+    project: "ProjectSchema" = Relationship(back_populates="models")
 
     user_id: Optional[UUID] = build_foreign_key_field(
         source=__tablename__,
@@ -165,7 +165,7 @@ class ModelSchema(NamedSchema, table=True):
         """
         return cls(
             name=model_request.name,
-            workspace_id=model_request.workspace,
+            project_id=model_request.project,
             user_id=model_request.user,
             license=model_request.license,
             description=model_request.description,
@@ -206,7 +206,7 @@ class ModelSchema(NamedSchema, table=True):
         metadata = None
         if include_metadata:
             metadata = ModelResponseMetadata(
-                workspace=self.workspace.to_model(),
+                project=self.project.to_model(),
                 license=self.license,
                 description=self.description,
                 audience=self.audience,
@@ -248,6 +248,9 @@ class ModelSchema(NamedSchema, table=True):
         for field, value in model_update.model_dump(
             exclude_unset=True, exclude_none=True
         ).items():
+            if field in ["add_tags", "remove_tags"]:
+                # Tags are handled separately
+                continue
             setattr(self, field, value)
         self.updated = utc_now()
         return self
@@ -282,17 +285,15 @@ class ModelVersionSchema(NamedSchema, RunMetadataInterface, table=True):
         ),
     )
 
-    workspace_id: UUID = build_foreign_key_field(
+    project_id: UUID = build_foreign_key_field(
         source=__tablename__,
-        target=WorkspaceSchema.__tablename__,
-        source_column="workspace_id",
+        target=ProjectSchema.__tablename__,
+        source_column="project_id",
         target_column="id",
         ondelete="CASCADE",
         nullable=False,
     )
-    workspace: "WorkspaceSchema" = Relationship(
-        back_populates="model_versions"
-    )
+    project: "ProjectSchema" = Relationship(back_populates="model_versions")
 
     user_id: Optional[UUID] = build_foreign_key_field(
         source=__tablename__,
@@ -397,7 +398,7 @@ class ModelVersionSchema(NamedSchema, RunMetadataInterface, table=True):
 
         return cls(
             id=id_,
-            workspace_id=model_version_request.workspace,
+            project_id=model_version_request.project,
             user_id=model_version_request.user,
             model_id=model_version_request.model,
             name=model_version_request.name,
@@ -465,7 +466,7 @@ class ModelVersionSchema(NamedSchema, RunMetadataInterface, table=True):
         metadata = None
         if include_metadata:
             metadata = ModelVersionResponseMetadata(
-                workspace=self.workspace.to_model(),
+                project=self.project.to_model(),
                 description=self.description,
                 run_metadata=self.fetch_metadata(),
             )