fix: Cleanup db schema + identifier types + remove action key

frontend/src/client/schemas.gen.ts

@@ -105,16 +105,12 @@ export const $ActionRead = {
             type: 'object',
             title: 'Inputs'
         },
-        key: {
-            type: 'string',
-            title: 'Key'
-        },
         control_flow: {
             '$ref': '#/components/schemas/ActionControlFlow'
         }
     },
     type: 'object',
-    required: ['id', 'type', 'title', 'description', 'status', 'inputs', 'key'],
+    required: ['id', 'type', 'title', 'description', 'status', 'inputs'],
     title: 'ActionRead'
 } as const;
 
@@ -143,14 +139,10 @@ export const $ActionReadMinimal = {
         status: {
             type: 'string',
             title: 'Status'
-        },
-        key: {
-            type: 'string',
-            title: 'Key'
         }
     },
     type: 'object',
-    required: ['id', 'workflow_id', 'type', 'title', 'description', 'status', 'key'],
+    required: ['id', 'workflow_id', 'type', 'title', 'description', 'status'],
     title: 'ActionReadMinimal'
 } as const;
 

frontend/src/client/types.gen.ts

@@ -31,7 +31,6 @@ export type ActionRead = {
     inputs: {
         [key: string]: unknown;
     };
-    key: string;
     control_flow?: ActionControlFlow;
 };
 
@@ -42,7 +41,6 @@ export type ActionReadMinimal = {
     title: string;
     description: string;
     status: string;
-    key: string;
 };
 
 export type ActionRetryPolicy = {

tracecat/db/schemas.py

@@ -41,14 +41,14 @@ class Resource(SQLModel):
     surrogate_id: int | None = Field(default=None, primary_key=True, exclude=True)
     owner_id: OwnerID
     created_at: datetime = Field(
-        sa_type=TIMESTAMP(timezone=True),  # UTC Timestamp
+        sa_type=TIMESTAMP,
         sa_column_kwargs={
             "server_default": text("(now() AT TIME ZONE 'utc'::text)"),
             "nullable": False,
         },
     )
     updated_at: datetime = Field(
-        sa_type=TIMESTAMP(timezone=True),  # UTC Timestamp
+        sa_type=TIMESTAMP,
         sa_column_kwargs={
             "server_default": text("(now() AT TIME ZONE 'utc'::text)"),
             "onupdate": text("(now() AT TIME ZONE 'utc'::text)"),
@@ -399,12 +399,6 @@ class Action(Resource, table=True):
         back_populates="actions", sa_relationship_kwargs=DEFAULT_SA_RELATIONSHIP_KWARGS
     )
 
-    @computed_field
-    @property
-    def key(self) -> str:
-        """Workflow-relative key for an Action."""
-        return action.key(self.workflow_id, self.id)
-
     @property
     def ref(self) -> str:
         """Slugified title of the action. Used for references."""

tracecat/identifiers/action.py

@@ -5,8 +5,6 @@
 from pydantic import StringConstraints
 from slugify import slugify
 
-from tracecat.identifiers.resource import ResourcePrefix
-
 ActionID = Annotated[str, StringConstraints(pattern=r"act-[0-9a-f]{32}")]
 """A unique ID for an action. e.g. 'act-77932a0b140a4465a1a25a5c95edcfb8'"""
 
@@ -20,8 +18,3 @@
 def ref(text: str) -> ActionRef:
     """Return a slugified version of the text."""
     return slugify(text, separator="_")
-
-
-def key(workflow_id: str, action_ref: str) -> ActionKey:
-    """Identifier key for an action, using the workflow ID and action ref."""
-    return f"{ResourcePrefix.ACTION}:{workflow_id}:{action_ref}"

tracecat/identifiers/resource.py

@@ -13,15 +13,13 @@
 """Resource identifier pattern. e.g. 'wf-77932a0b140a4465a1a25a5c95edcfb8'"""
 
 
-def generate_resource_id(prefix: ResourcePrefix, *, sep: str = "-") -> ResourceID:
+def generate_resource_id(prefix: str, *, sep: str = "-") -> ResourceID:
     """Generate a short unique identifier with a prefix."""
 
     return prefix + sep + uuid4().hex
 
 
-def id_factory(
-    prefix: ResourcePrefix, *, sep: str = "-"
-) -> Callable[[str], ResourceID]:
+def id_factory(prefix: str, *, sep: str = "-") -> Callable[[], ResourceID]:
     """Factory function to generate a short unique identifier with a prefix."""
 
     # Assert that the prefix is a valid resource class identifier.

tracecat/workflow/actions/models.py

@@ -23,7 +23,6 @@ class ActionRead(BaseModel):
     description: str
     status: str
     inputs: dict[str, Any]
-    key: str  # Computed field
     control_flow: ActionControlFlow = Field(default_factory=ActionControlFlow)
 
 
@@ -34,7 +33,6 @@ class ActionReadMinimal(BaseModel):
     title: str
     description: str
     status: str
-    key: str
 
 
 class ActionCreate(BaseModel):

tracecat/workflow/actions/router.py

@@ -37,7 +37,6 @@ async def list_actions(
             title=action.title,
             description=action.description,
             status=action.status,
-            key=action.key,
         )
         for action in actions
     ]
@@ -51,13 +50,18 @@ async def create_action(
     session: AsyncDBSession,
 ) -> ActionReadMinimal:
     """Create a new action for a workflow."""
+    if role.workspace_id is None:
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail="Workspace ID is required",
+        )
     action = Action(
         owner_id=role.workspace_id,
         workflow_id=params.workflow_id,
         type=params.type,
         title=params.title,
         description="",  # Default to empty string
-    )
+    )  # type: ignore
     # Check if a clashing action ref exists
     statement = select(Action).where(
         Action.owner_id == role.workspace_id,
@@ -82,7 +86,6 @@ async def create_action(
         title=action.title,
         description=action.description,
         status=action.status,
-        key=action.key,
     )
     return action_metadata
 
@@ -115,7 +118,6 @@ async def get_action(
         description=action.description,
         status=action.status,
         inputs=action.inputs,
-        key=action.key,
         control_flow=ActionControlFlow(**action.control_flow),
     )
 
@@ -163,7 +165,6 @@ async def update_action(
         description=action.description,
         status=action.status,
         inputs=action.inputs,
-        key=action.key,
     )