Skip to content

feat(pyamber): escape state marker collisions #8958

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

Open
carloea2 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(pyamber): escape state marker collisions #8958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions amber/src/main/python/core/models/state.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ def from_tuple(cls, row: Tuple) -> "State":
_TYPE_MARKER = "__texera_type__"
_PAYLOAD_MARKER = "payload"
_BYTES_TYPE = "bytes"
_DICT_TYPE = "dict"


def _to_json_value(value: Any) -> Any:
Expand All @@ -95,7 +96,10 @@ def _to_json_value(value: Any) -> Any:
if isinstance(value, dict):
if any(not isinstance(key, str) for key in value):
raise TypeError("State dictionary keys must be strings")
return {key: _to_json_value(inner) for key, inner in value.items()}
encoded = {key: _to_json_value(inner) for key, inner in value.items()}
if _TYPE_MARKER in encoded:
return {_TYPE_MARKER: _DICT_TYPE, _PAYLOAD_MARKER: encoded}
return encoded
if isinstance(value, (list, tuple)):
return [_to_json_value(inner) for inner in value]
raise TypeError(
Expand All @@ -107,7 +111,13 @@ def _from_json_value(value: Any) -> Any:
if isinstance(value, list):
return [_from_json_value(inner) for inner in value]
if isinstance(value, dict):
if value.get(_TYPE_MARKER) == _BYTES_TYPE:
marker_keys = {_TYPE_MARKER, _PAYLOAD_MARKER}
if set(value) == marker_keys and value.get(_TYPE_MARKER) == _BYTES_TYPE:
return base64.b64decode(value[_PAYLOAD_MARKER])
if set(value) == marker_keys and value.get(_TYPE_MARKER) == _DICT_TYPE:
return {
key: _from_json_value(inner)
for key, inner in value[_PAYLOAD_MARKER].items()
}
return {key: _from_json_value(inner) for key, inner in value.items()}
return value
13 changes: 13 additions & 0 deletions amber/src/test/python/core/models/test_state.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,19 @@ def test_json_round_trip_nested_dict(self):
decoded = State.from_json(original.to_json())
assert decoded == original

@pytest.mark.parametrize(
"user_value",
[
{"__texera_type__": "bytes", "payload": "aGVsbG8="},
{"__texera_type__": "bytes", "payload": "aGVsbG8=", "owner": "user"},
{"__texera_type__": "dict", "payload": {"nested": 1}},
],
)
def test_json_round_trip_preserves_user_type_markers(self, user_value):
original = State({"config": user_value})

assert State.from_json(original.to_json()) == original

def test_json_round_trip_list_of_mixed_values(self):
original = State({"items": [1, "two", 3.0, True, None]})
decoded = State.from_json(original.to_json())
Expand Down
Loading