Skip to content

Commit 30aebe2

Browse files
committed
Remove ValueOnlySerializer
1 parent 9feeba6 commit 30aebe2

File tree

4 files changed

+5
-65
lines changed

4 files changed

+5
-65
lines changed

key-value/key-value-aio/src/key_value/aio/stores/simple/store.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
from key_value.shared.utils.compound import compound_key, get_collections_from_compound_keys, get_keys_from_compound_keys
77
from key_value.shared.utils.managed_entry import ManagedEntry, load_from_json
8-
from key_value.shared.utils.serialization import ValueOnlySerializationAdapter
8+
from key_value.shared.utils.serialization import BasicSerializationAdapter
99
from key_value.shared.utils.time_to_live import seconds_to
1010
from typing_extensions import override
1111

@@ -62,7 +62,7 @@ def __init__(self, max_entries: int | None = None, default_collection: str | Non
6262

6363
self._data = defaultdict[str, SimpleStoreEntry]()
6464

65-
self._serialization_adapter = ValueOnlySerializationAdapter()
65+
self._serialization_adapter = BasicSerializationAdapter(date_format=None)
6666

6767
super().__init__(default_collection=default_collection)
6868

key-value/key-value-shared/src/key_value/shared/utils/serialization.py

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -146,21 +146,3 @@ def prepare_load(self, data: dict[str, Any]) -> dict[str, Any]:
146146

147147
def prepare_dump(self, data: dict[str, Any]) -> dict[str, Any]:
148148
return data
149-
150-
151-
class ValueOnlySerializationAdapter(SerializationAdapter):
152-
"""Serialization adapter that only serializes the value."""
153-
154-
def __init__(self, *, value_format: Literal["string", "dict"] | None = "dict") -> None:
155-
super().__init__(date_format=None, value_format=value_format)
156-
157-
def prepare_load(self, data: dict[str, Any]) -> dict[str, Any]:
158-
return {
159-
"value": data,
160-
}
161-
162-
def prepare_dump(self, data: dict[str, Any]) -> dict[str, Any]:
163-
if "value" not in data:
164-
msg = "Value field not found"
165-
raise DeserializationError(message=msg)
166-
return verify_dict(obj=data["value"])

key-value/key-value-shared/tests/utils/test_serialization.py

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from inline_snapshot import snapshot
55

66
from key_value.shared.utils.managed_entry import ManagedEntry
7-
from key_value.shared.utils.serialization import BasicSerializationAdapter, ValueOnlySerializationAdapter
7+
from key_value.shared.utils.serialization import BasicSerializationAdapter
88

99
FIXED_DATETIME_ONE = datetime(2025, 1, 1, 0, 0, 0, tzinfo=timezone.utc)
1010
FIXED_DATETIME_ONE_ISOFORMAT = FIXED_DATETIME_ONE.isoformat()
@@ -78,45 +78,3 @@ def test_entry_two(self, adapter: BasicSerializationAdapter):
7878

7979
assert adapter.load_dict(data=adapter.dump_dict(entry=TEST_ENTRY_TWO)) == snapshot(TEST_ENTRY_TWO)
8080
assert adapter.load_json(json_str=adapter.dump_json(entry=TEST_ENTRY_TWO)) == snapshot(TEST_ENTRY_TWO)
81-
82-
83-
class TestValueOnlySerializationAdapter:
84-
@pytest.fixture
85-
def adapter(self) -> ValueOnlySerializationAdapter:
86-
return ValueOnlySerializationAdapter()
87-
88-
def test_entry_one(self, adapter: ValueOnlySerializationAdapter):
89-
assert adapter.dump_dict(entry=TEST_ENTRY_ONE) == snapshot(
90-
{"key_one": "value_one", "key_two": "value_two", "key_three": {"nested_key": "nested_value"}}
91-
)
92-
93-
assert adapter.dump_json(entry=TEST_ENTRY_ONE) == snapshot(
94-
'{"key_one": "value_one", "key_three": {"nested_key": "nested_value"}, "key_two": "value_two"}'
95-
)
96-
97-
assert adapter.load_json(json_str=adapter.dump_json(entry=TEST_ENTRY_ONE)) == snapshot(
98-
ManagedEntry(value={"key_one": "value_one", "key_three": {"nested_key": "nested_value"}, "key_two": "value_two"})
99-
)
100-
assert adapter.load_dict(data=adapter.dump_dict(entry=TEST_ENTRY_ONE)) == snapshot(
101-
ManagedEntry(value={"key_one": "value_one", "key_two": "value_two", "key_three": {"nested_key": "nested_value"}})
102-
)
103-
104-
def test_entry_two(self, adapter: ValueOnlySerializationAdapter):
105-
assert adapter.dump_dict(entry=TEST_ENTRY_TWO) == snapshot(
106-
{"key_one": ["value_one", "value_two", "value_three"], "key_two": 123, "key_three": {"nested_key": "nested_value"}}
107-
)
108-
109-
assert adapter.dump_json(entry=TEST_ENTRY_TWO) == snapshot(
110-
'{"key_one": ["value_one", "value_two", "value_three"], "key_three": {"nested_key": "nested_value"}, "key_two": 123}'
111-
)
112-
113-
assert adapter.load_json(json_str=adapter.dump_json(entry=TEST_ENTRY_TWO)) == snapshot(
114-
ManagedEntry(
115-
value={"key_one": ["value_one", "value_two", "value_three"], "key_three": {"nested_key": "nested_value"}, "key_two": 123}
116-
)
117-
)
118-
assert adapter.load_dict(data=adapter.dump_dict(entry=TEST_ENTRY_TWO)) == snapshot(
119-
ManagedEntry(
120-
value={"key_one": ["value_one", "value_two", "value_three"], "key_two": 123, "key_three": {"nested_key": "nested_value"}}
121-
)
122-
)

key-value/key-value-sync/src/key_value/sync/code_gen/stores/simple/store.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
from key_value.shared.utils.compound import compound_key, get_collections_from_compound_keys, get_keys_from_compound_keys
1010
from key_value.shared.utils.managed_entry import ManagedEntry, load_from_json
11-
from key_value.shared.utils.serialization import ValueOnlySerializationAdapter
11+
from key_value.shared.utils.serialization import BasicSerializationAdapter
1212
from key_value.shared.utils.time_to_live import seconds_to
1313
from typing_extensions import override
1414

@@ -58,7 +58,7 @@ def __init__(self, max_entries: int | None = None, default_collection: str | Non
5858

5959
self._data = defaultdict[str, SimpleStoreEntry]()
6060

61-
self._serialization_adapter = ValueOnlySerializationAdapter()
61+
self._serialization_adapter = BasicSerializationAdapter(date_format=None)
6262

6363
super().__init__(default_collection=default_collection)
6464

0 commit comments

Comments
 (0)