-
Notifications
You must be signed in to change notification settings - Fork 153
feat(conversion): add LTable and KTable decoders for list and dict bindings #767
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.
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
Open
vumichien
wants to merge
1
commit into
cocoindex-io:main
Choose a base branch
from
vumichien:features/binding_dict_table
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -92,10 +92,14 @@ def make_engine_value_decoder( | |
if src_type_kind == "Struct": | ||
return _make_engine_struct_to_dict_decoder(field_path, src_type["fields"]) | ||
if src_type_kind in TABLE_TYPES: | ||
raise ValueError( | ||
f"Missing type annotation for `{''.join(field_path)}`." | ||
f"It's required for {src_type_kind} type." | ||
) | ||
if src_type_kind == "LTable": | ||
return _make_engine_ltable_to_list_dict_decoder( | ||
field_path, src_type["row"]["fields"] | ||
) | ||
elif src_type_kind == "KTable": | ||
return _make_engine_ktable_to_dict_dict_decoder( | ||
field_path, src_type["row"]["fields"] | ||
) | ||
return lambda value: value | ||
|
||
# Handle struct -> dict binding for explicit dict annotations | ||
|
@@ -340,6 +344,72 @@ def decode_to_dict(values: list[Any] | None) -> dict[str, Any] | None: | |
return decode_to_dict | ||
|
||
|
||
def _make_engine_ltable_to_list_dict_decoder( | ||
field_path: list[str], | ||
src_fields: list[dict[str, Any]], | ||
) -> Callable[[list[Any] | None], list[dict[str, Any]] | None]: | ||
"""Make a decoder from engine LTable values to a list of dicts.""" | ||
|
||
# Create a decoder for each row (struct) to dict | ||
row_decoder = _make_engine_struct_to_dict_decoder(field_path, src_fields) | ||
|
||
def decode_to_list_dict(values: list[Any] | None) -> list[dict[str, Any]] | None: | ||
if values is None: | ||
return None | ||
result = [] | ||
for row_values in values: | ||
decoded_row = row_decoder(row_values) | ||
if decoded_row is not None: | ||
result.append(decoded_row) | ||
return result | ||
|
||
return decode_to_list_dict | ||
|
||
|
||
def _make_engine_ktable_to_dict_dict_decoder( | ||
field_path: list[str], | ||
src_fields: list[dict[str, Any]], | ||
) -> Callable[[list[Any] | None], dict[Any, dict[str, Any]] | None]: | ||
"""Make a decoder from engine KTable values to a dict of dicts.""" | ||
|
||
if not src_fields: | ||
raise ValueError("KTable must have at least one field for the key") | ||
|
||
# First field is the key, remaining fields are the value | ||
key_field_schema = src_fields[0] | ||
value_fields_schema = src_fields[1:] | ||
|
||
# Create decoders | ||
field_path.append(f".{key_field_schema.get('name', KEY_FIELD_NAME)}") | ||
key_decoder = make_engine_value_decoder(field_path, key_field_schema["type"], Any) | ||
field_path.pop() | ||
|
||
value_decoder = _make_engine_struct_to_dict_decoder(field_path, value_fields_schema) | ||
|
||
def decode_to_dict_dict( | ||
values: list[Any] | None, | ||
) -> dict[Any, dict[str, Any]] | None: | ||
if values is None: | ||
return None | ||
result = {} | ||
for row_values in values: | ||
if len(row_values) < 2: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. actually a key-only KTable is valid. In this case the value can be an empty dict. |
||
raise ValueError( | ||
f"KTable row must have at least 2 values (key + value), got {len(row_values)}" | ||
) | ||
key = key_decoder(row_values[0]) | ||
value = value_decoder(row_values[1:]) | ||
# Handle case where key is a dict (from struct key) - convert to tuple | ||
if isinstance(key, dict): | ||
key = tuple(key.values()) | ||
# Skip None values to maintain type consistency | ||
if value is not None: | ||
result[key] = value | ||
return result | ||
|
||
return decode_to_dict_dict | ||
|
||
|
||
def dump_engine_object(v: Any) -> Any: | ||
"""Recursively dump an object for engine. Engine side uses `Pythonized` to catch.""" | ||
if v is None: | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we may raise an exception if a row is
None