Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "dataglasses"
version = "0.6.0"
version = "0.7.0"
dependencies = []
requires-python = ">=3.10"
authors = [{ name = "Uri Granta", email = "uri.granta+python@gmail.com" }]
Expand Down
12 changes: 10 additions & 2 deletions src/dataglasses/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,11 @@ def _from_dict(
datacls,
)

origin = get_origin(cls)
origin = cast(type, get_origin(cls))

if origin in transform and not transformed:
input_type, fn = transform[origin]
return fn(_from_dict(input_type, value, datacls, transformed=True))

if origin in (collections.abc.Sequence, list):
if not isinstance(value, Sequence):
Expand Down Expand Up @@ -274,7 +278,11 @@ def _json_schema(
evaluated_type = cast(type, ref._evaluate(_globals, _locals, frozenset()))
return _json_schema(evaluated_type, datacls)

origin = get_origin(cls)
origin = cast(type, get_origin(cls))

if origin in transform and not transformed:
input_type, _ = transform[origin]
return _json_schema(input_type, datacls, transformed=True)

if origin in (collections.abc.Sequence, list):
sequence_type = get_args(cls)[0]
Expand Down
19 changes: 19 additions & 0 deletions tests/test_dataklasses.py
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,25 @@ def test_transform(transform: TransformRules, output: DataclassTransform) -> Non
validate(value, schema)


@dataclass
class DataclassTransformGeneric:
a: set[str]
b: set[int]
c: set[float]


def test_transform_generic() -> None:
value = {"a": ["a", "b"], "b": [1, 2], "c": [0.5, 0.7]}
transform: TransformRules = {
set: (list[str | int], set),
set[float]: (list[float], lambda lst: set(lst) | {0.0}),
}
data = from_dict(DataclassTransformGeneric, value, transform=transform)
assert data == DataclassTransformGeneric({"a", "b"}, {1, 2}, {0.0, 0.5, 0.7})
schema = to_json_schema(DataclassTransformGeneric, transform=transform)
validate(value, schema)


# =================
# UNSUPPORTED TYPES
# =================
Expand Down