Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions src/dremioai/api/dremio/catalog.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ class DatasetSubType(UStrEnum):
DIRECT = auto()


def subset_validator(elem: UStrEnum, values: List[UStrEnum]) -> UStrEnum:
def subset_validator(elem: UStrEnum, values: UStrEnum | List[UStrEnum]) -> UStrEnum:
if elem in values:
return elem
raise ValidationError(f"{elem} not in {values}")
raise ValueError(f"{elem} not in {values}")


class LineageBase(BaseModel):
Expand All @@ -64,7 +64,7 @@ class LineageBase(BaseModel):
class LineageSource(LineageBase):
type: Annotated[
CatalogItemType,
AfterValidator(partial(subset_validator, values=[CatalogItemType.CONTAINER])),
AfterValidator(partial(subset_validator, values=CatalogItemType)),
]
container_type: Annotated[
ContainerSubType,
Expand All @@ -80,23 +80,20 @@ class LineageSource(LineageBase):
class LineageParents(LineageBase):
type: Annotated[
CatalogItemType,
AfterValidator(partial(subset_validator, values=[CatalogItemType.DATASET])),
AfterValidator(partial(subset_validator, values=CatalogItemType)),
]
dataset_type: Annotated[
DatasetSubType,
AfterValidator(
partial(
subset_validator,
values=[DatasetSubType.PROMOTED, DatasetSubType.VIRTUAL],
)
partial(subset_validator, values=DatasetSubType),
),
] = Field(..., alias="datasetType")


class LineageChildren(LineageBase):
type: Annotated[
CatalogItemType,
AfterValidator(partial(subset_validator, values=[CatalogItemType.DATASET])),
AfterValidator(partial(subset_validator, values=CatalogItemType)),

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same question for all the changes to CatalogItemType, they looked correct to me before

]
dataset_type: Annotated[
DatasetSubType,
Expand Down