Skip to content

Commit 9216313

Browse files
authored
Bunch of serialization fixes in Python SDK (#54)
* Fix serialization for Table type in Python SDK. * Fix serialization for `CheckSetupStatusOptions` in python SDK.
1 parent de98b35 commit 9216313

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

python/cocoindex/setup.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
from typing import NamedTuple
1+
from dataclasses import dataclass
22

33
from . import flow
44
from . import _engine
55

6-
class CheckSetupStatusOptions(NamedTuple):
6+
@dataclass
7+
class CheckSetupStatusOptions:
78
delete_legacy_flows: bool
89

910
def check_setup_status(options: CheckSetupStatusOptions) -> _engine.SetupStatusCheck:
1011
flow.ensure_all_flows_built()
11-
return _engine.check_setup_status(options)
12+
return _engine.check_setup_status(vars(options))
1213

1314
def apply_setup_changes(status_check: _engine.SetupStatusCheck):
1415
_engine.apply_setup_changes(status_check)

python/cocoindex/typing.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def _dump_fields_schema(cls: type) -> list[dict[str, Any]]:
3636
return [
3737
{
3838
'name': field.name,
39-
'value_type': _dump_enriched_type(field.type),
39+
**_dump_enriched_type(field.type)
4040
}
4141
for field in dataclasses.fields(cls)
4242
]
@@ -56,7 +56,7 @@ def _dump_type(t, metadata):
5656
elif dataclasses.is_dataclass(elem_type):
5757
encoded_type = {
5858
'kind': 'Table',
59-
'row': _dump_fields_schema(elem_type),
59+
'row': { 'fields': _dump_fields_schema(elem_type) },
6060
}
6161
else:
6262
raise ValueError(f"Unsupported type: {t}")
@@ -86,9 +86,7 @@ def _dump_type(t, metadata):
8686

8787
return encoded_type
8888

89-
def _dump_enriched_type(t) -> dict[str, Any] | None:
90-
if t is None:
91-
return None
89+
def _dump_enriched_type(t) -> dict[str, Any]:
9290
t, metadata = _get_origin_type_and_metadata(t)
9391
enriched_type_json = {'type': _dump_type(t, metadata)}
9492
attrs = None
@@ -106,4 +104,6 @@ def dump_type(t) -> dict[str, Any] | None:
106104
"""
107105
Convert a Python type to a CocoIndex's type in JSON.
108106
"""
107+
if t is None:
108+
return None
109109
return _dump_enriched_type(t)

0 commit comments

Comments
 (0)