dataclass-extensions 0.2.7__py3-none-any.whl → 0.2.9__py3-none-any.whl

dataclass_extensions/encode.py

@@ -41,7 +41,9 @@ class Encoder:
         def iter_fields(d) -> Generator[tuple[str, Any], None, None]:
             for field in dataclasses.fields(d):
                 value = getattr(d, field.name)
-                if exclude_none and value is None:
+                if not field.init:
+                    continue
+                elif exclude_none and value is None:
                     continue
                 elif exclude_private_fields and field.name.startswith("_"):
                     continue

dataclass_extensions/registrable.py

@@ -17,6 +17,8 @@ if sys.version_info < (3, 11):
 class Registrable:
     _registry: ClassVar[dict[str, Type[Registrable]]]
     _default_type: ClassVar[str | None]
+    registered_name: ClassVar[str | None]
+    registered_base: ClassVar[Type[Registrable] | None]
 
     type: dataclasses.InitVar[str | None] = dataclasses.field(
         default=None, kw_only=True, repr=False
@@ -24,16 +26,14 @@ class Registrable:
 
     def __new__(cls, *args, type: str | None = None, **kwargs):
         del args, kwargs
-        if type is not None and (
-            not hasattr(cls, "registered_name") or type != cls.registered_name  # type: ignore
-        ):
+        if type is not None and type != cls.registered_name:
             if type not in cls._registry:
                 raise KeyError(
                     f"'{type}' is not registered name for {cls.__name__}. "
                     f"Available choices are: {list(cls._registry.keys())}"
                 )
             return super().__new__(cls._registry[type])
-        elif cls._default_type is not None and not hasattr(cls, "registered_name"):
+        elif cls._default_type is not None and cls.registered_name is None:
             return super().__new__(cls._registry[cls._default_type])
         else:
             return super().__new__(cls)
@@ -44,6 +44,10 @@ class Registrable:
             cls._registry = {}
         if not hasattr(cls, "_default_type"):
             cls._default_type = None
+        if not hasattr(cls, "registered_name"):
+            cls.registered_name = None
+        if not hasattr(cls, "registered_base"):
+            cls.registered_base = None
 
     @classmethod
     def register(cls, name: str, default: bool = False) -> Callable[[Type[R]], Type[R]]:
@@ -64,28 +68,18 @@ class Registrable:
                 else:
                     cls._default_type = name
 
-            fields = [
-                (f.name, f.type, f) for f in dataclasses.fields(subclass) if f.name != "type"  # type: ignore
-            ] + [
-                ("registered_name", ClassVar[str], name),  # type: ignore
-                ("registered_base", ClassVar[R], cls),  # type: ignore
-                ("type", dataclasses.InitVar[str | None], dataclasses.field(default=name, kw_only=True, repr=False)),  # type: ignore
-            ]
-            subclass = dataclasses.make_dataclass(
-                subclass.__name__,
-                fields,  # type: ignore
-                bases=(subclass,),
-            )
             cls._registry[name] = subclass
-            return subclass
+            subclass.registered_name = name
+            subclass.registered_base = cls
+            return subclass  # type: ignore
 
         return register_subclass
 
     @classmethod
     def get_registered_name(cls: Type[R], subclass: Type[R] | None = None) -> str:
         if subclass is None:
-            if hasattr(cls, "registered_name"):
-                return cls.registered_name  # type: ignore
+            if cls.registered_name is not None:
+                return cls.registered_name
             else:
                 raise ValueError(
                     f"class {cls.__name__} is not a registered subclass of any base registrable class"

dataclass_extensions/version.py

@@ -1 +1 @@
-VERSION = "0.2.7"
+VERSION = "0.2.9"

{dataclass_extensions-0.2.7.dist-info → dataclass_extensions-0.2.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dataclass-extensions
-Version: 0.2.7
+Version: 0.2.9
 Summary: Additional functionality for Python dataclasses
 Author-email: Pete Walsh <epwalsh10@gmail.com>
 License:                                  Apache License

dataclass_extensions-0.2.9.dist-info/RECORD

@@ -0,0 +1,13 @@
+dataclass_extensions/__init__.py,sha256=jpgRh5jjj9jM1tkhTVvB-aDThI2v4tAlq_WpR0-NOSI,255
+dataclass_extensions/decode.py,sha256=U23hy4qVcWR1wrXjrhVorsqp7OG1r1ZfEFhO4cANM7A,8159
+dataclass_extensions/encode.py,sha256=GJJKcO38pI20x20KvPz9EgUmxohnTpeJ08k8pwBHr0c,3390
+dataclass_extensions/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dataclass_extensions/registrable.py,sha256=-f9PinrHX0f_dX0EikhTh9lCJXb8foGNOlnsJBIYpo8,4261
+dataclass_extensions/types.py,sha256=UwSV0MKjFDaK4dlgm72vJHHr6-8QNe8jMhbTZGOMIJM,247
+dataclass_extensions/utils.py,sha256=8cigzY9JDEWexWXlcMxXyf27S50-1ZPMNmn4zUSrc6k,935
+dataclass_extensions/version.py,sha256=xcHqQCfqvl5HQQt-xKKyKY65g0JwSXvtJ6TusOLm7no,18
+dataclass_extensions-0.2.9.dist-info/licenses/LICENSE,sha256=YvuKOpYh3COIF0yqq-nCMXtpS7mh1GyYvPVlW2j1G-M,11359
+dataclass_extensions-0.2.9.dist-info/METADATA,sha256=XBOZv6Ff0lYFRGg8HefNuoNpvi3UPfmUI8E_rs5CNDY,15925
+dataclass_extensions-0.2.9.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+dataclass_extensions-0.2.9.dist-info/top_level.txt,sha256=njfdeqLtTThNGwqnoKu4JV8J1287xGAeEwyESpoU-k8,21
+dataclass_extensions-0.2.9.dist-info/RECORD,,

dataclass_extensions-0.2.7.dist-info/RECORD

@@ -1,13 +0,0 @@
-dataclass_extensions/__init__.py,sha256=jpgRh5jjj9jM1tkhTVvB-aDThI2v4tAlq_WpR0-NOSI,255
-dataclass_extensions/decode.py,sha256=U23hy4qVcWR1wrXjrhVorsqp7OG1r1ZfEFhO4cANM7A,8159
-dataclass_extensions/encode.py,sha256=7mLHmZrHThQMbC0wY5voHx3mOHgsRbq59kw_JdwgOOg,3324
-dataclass_extensions/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dataclass_extensions/registrable.py,sha256=TWdJ0vLkOTsw5Zm8uOk7Ueh6ZODn-q_2jht1uWRkpzE,4608
-dataclass_extensions/types.py,sha256=UwSV0MKjFDaK4dlgm72vJHHr6-8QNe8jMhbTZGOMIJM,247
-dataclass_extensions/utils.py,sha256=8cigzY9JDEWexWXlcMxXyf27S50-1ZPMNmn4zUSrc6k,935
-dataclass_extensions/version.py,sha256=ZQLNbaBb3Roa6Z5LEm--iZickCQhYJVSrDpqf4YBbzc,18
-dataclass_extensions-0.2.7.dist-info/licenses/LICENSE,sha256=YvuKOpYh3COIF0yqq-nCMXtpS7mh1GyYvPVlW2j1G-M,11359
-dataclass_extensions-0.2.7.dist-info/METADATA,sha256=p7mMDdiaL_eT0yZDbMKLS9dh47Gj4rspEnw8tvXvdu0,15925
-dataclass_extensions-0.2.7.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-dataclass_extensions-0.2.7.dist-info/top_level.txt,sha256=njfdeqLtTThNGwqnoKu4JV8J1287xGAeEwyESpoU-k8,21
-dataclass_extensions-0.2.7.dist-info/RECORD,,