Skip to content

Commit e18c442

Browse files
Ken LippoldKen Lippold
authored andcommitted
Fixed task and datastream workspace ID aliases
1 parent 113cb08 commit e18c442

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

etl/schemas/task.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from typing import Any, Literal
33
from datetime import datetime
44
from ninja import Schema, Field, Query
5-
from pydantic import AliasPath
5+
from pydantic import AliasPath, AliasChoices
66
from api.types import ISODatetime
77
from api.schemas import BaseGetResponse, BasePostBody, BasePatchBody, CollectionQueryParameters
88
from iam.schemas import WorkspaceSummaryResponse
@@ -157,7 +157,9 @@ class TaskFields(Schema):
157157

158158
class TaskSummaryResponse(BaseGetResponse, TaskFields):
159159
id: uuid.UUID
160-
workspace_id: uuid.UUID = Field(..., validation_alias=AliasPath("job", "workspace_id"))
160+
workspace_id: uuid.UUID = Field(
161+
..., validation_alias=AliasChoices("workspaceId", AliasPath("job", "workspace_id"))
162+
)
161163
job_id: uuid.UUID
162164
orchestration_system_id: uuid.UUID
163165
schedule: TaskScheduleResponse | None = None

sta/schemas/datastream.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import uuid
2-
from pydantic import AliasPath
2+
from pydantic import AliasPath, AliasChoices
33
from ninja import Schema, Field, Query
44
from typing import Optional, Literal, TYPE_CHECKING
55
from api.types import ISODatetime
@@ -166,7 +166,7 @@ class DatastreamSummaryResponse(
166166
):
167167
id: uuid.UUID
168168
workspace_id: uuid.UUID = Field(
169-
..., validation_alias=AliasPath("thing", "workspace_id")
169+
..., validation_alias=AliasChoices("workspaceId", AliasPath("thing", "workspace_id"))
170170
)
171171
datastream_tags: list[TagGetResponse] = Field(..., alias="tags")
172172
datastream_file_attachments: list[FileAttachmentGetResponse] = Field(

0 commit comments

Comments
 (0)