Skip to content
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

[JAC-CLOUD]: Improved Deserialization #1363

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
35 changes: 33 additions & 2 deletions jac-cloud/jac_cloud/core/architype.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
"""Core constructs for Jac Language."""

from dataclasses import asdict as _asdict, dataclass, field, fields, is_dataclass
from dataclasses import (
MISSING,
asdict as _asdict,
dataclass,
field,
fields,
is_dataclass,
)
from enum import Enum
from os import getenv
from pickle import dumps as pdumps
Expand Down Expand Up @@ -76,7 +83,31 @@ def architype_to_dataclass(cls: type[T], data: dict[str, Any], **kwargs: object)
"""Parse dict to architype."""
_to_dataclass(cls, data)
architype = object.__new__(cls)
architype.__init__(**data, **kwargs) # type: ignore[misc]
hintings = get_type_hints(cls)
if is_dataclass(cls):
for attr in fields(cls):
if (val := data.pop(attr.name, MISSING)) is MISSING:
if attr.default is not MISSING:
setattr(architype, attr.name, attr.default)
elif attr.default_factory is not MISSING and callable(
attr.default_factory
):
setattr(architype, attr.name, attr.default_factory())
else:
raise ValueError(
f"{cls.__name__} requires {attr.name} field with type {hintings[attr.name]}"
)
else:
hinter = hintings[attr.name]
if isinstance(val, hinter):
setattr(architype, attr.name, val)
else:
raise ValueError(
f"Data from datasource has type {val.__class__.__name__}"
f" but {cls.__name__}.{attr.name} requires {hinter}."
)
architype.__dict__.update(data)
architype.__dict__.update(kwargs)
return architype


Expand Down
Loading