Skip to content

[GSK-1888] Avoid to send nullable values in callable from ML worker to Backend #1503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 31, 2023
Merged

[GSK-1888] Avoid to send nullable values in callable from ML worker to Backend #1503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd03cb5
Mark `name`, `version`, `code` and `cellLevel` as non-null
Inokinoki Oct 25, 2023
c6d7953
Update optional callable fields in `test_dto_serialization.py`
Inokinoki Oct 25, 2023
024fc9c
Merge branch 'main' into feature/gsk-1888-code-for-callable-functions…
Inokinoki Oct 31, 2023
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
22 changes: 14 additions & 8 deletions giskard/ml_worker/websocket/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,35 +32,41 @@ class TestFunctionArgument(BaseModel):
argOrder: int


# CallableMeta shows that all fields can be none
# CallableMeta shows that all fields can be none,
# but we have a pre-check here for Database constraints:
# referring to `ai.giskard.domain.Callable` and `ai.giskard.domain.TestFunction`.
class FunctionMeta(BaseModel):
uuid: str
name: Optional[str] = None
name: str
displayName: Optional[str] = None
version: Optional[int] = None
version: int
module: Optional[str] = None
doc: Optional[str] = None
moduleDoc: Optional[str] = None
args: Optional[List[TestFunctionArgument]] = None
tags: Optional[List[str]] = None
code: Optional[str] = None
code: str
type: Optional[str] = None
debugDescription: Optional[str] = None


# CallableMeta shows that all fields can be none,
# but we have a pre-check here for Database constraints:
# referring to `ai.giskard.domain.Callable`, `ai.giskard.domain.SlicingFunction`,
# `ai.giskard.domain.TransformationFunction` and `ai.giskard.domain.DatasetProcessFunction`.
class DatasetProcessFunctionMeta(BaseModel):
uuid: str
name: Optional[str] = None
name: str
displayName: Optional[str] = None
version: Optional[int] = None # For backward compatibility
version: int
module: Optional[str] = None
doc: Optional[str] = None
moduleDoc: Optional[str] = None
args: Optional[List[TestFunctionArgument]] = None
tags: Optional[List[str]] = None
code: Optional[str] = None
code: str
type: Optional[str] = None
cellLevel: Optional[bool] = None
cellLevel: bool
columnType: Optional[str] = None
processType: Optional[str] = None

Expand Down
11 changes: 2 additions & 9 deletions tests/communications/test_dto_serialization.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"DataFrame": ["rows"],
"DataRow": ["columns"],
"DatasetMeta": [],
"DatasetProcessFunctionMeta": ["uuid"],
"DatasetProcessFunctionMeta": ["uuid", "name", "code", "version", "cellLevel"],
"DatasetProcessing": ["datasetId", "totalRows"],
"DatasetProcessingFunction": [],
"DatasetProcessingParam": ["dataset"],
Expand All @@ -39,7 +39,7 @@
"ExplainTextParam": ["model", "feature_name", "columns", "column_types"],
"Explanation": ["per_feature"],
"FuncArgument": ["name", "none"],
"FunctionMeta": ["uuid"],
"FunctionMeta": ["uuid", "name", "code", "version"],
"GenerateTestSuite": [],
"GenerateTestSuiteParam": ["project_key"],
"GeneratedTestInput": ["name", "value", "is_alias"],
Expand Down Expand Up @@ -89,17 +89,13 @@
"DataRow": [],
"DatasetMeta": ["target"],
"DatasetProcessFunctionMeta": [
"name",
"displayName",
"version",
"module",
"doc",
"moduleDoc",
"args",
"tags",
"code",
"type",
"cellLevel",
"columnType",
"processType",
],
Expand Down Expand Up @@ -128,15 +124,12 @@
"args",
],
"FunctionMeta": [
"name",
"displayName",
"version",
"module",
"doc",
"moduleDoc",
"args",
"tags",
"code",
"type",
"debugDescription",
],
Expand Down