ducktools-classbuilder 0.10.0__py3-none-any.whl → 0.10.1__py3-none-any.whl

ducktools/classbuilder/__init__.py

@@ -217,15 +217,23 @@ class _SignatureMaker:
     # help(cls) will fail along with inspect.signature(cls)
     # This signature maker descriptor is placed to override __signature__ and force
     # the `__init__` signature to be generated first if the signature is requested.
-    def __get__(self, instance, cls):
-        import inspect  # Deferred inspect import
-        _ = cls.__init__  # force generation of `__init__` function
-        # Remove this attribute from the class
-        # This prevents recursion back into this __get__ method.
-        delattr(cls, "__signature__")
-        sig = inspect.signature(cls)
-        setattr(cls, "__signature__", sig)
-        return sig
+    def __get__(self, instance, cls=None):
+        if cls is None:
+            cls = type(instance)
+
+        # force generation of `__init__` function
+        _ = cls.__init__
+
+        if instance is None:
+            raise AttributeError(
+                f"type object {cls.__name__!r} "
+                "has no attribute '__signature__'"
+            )
+        else:
+            raise AttributeError(
+                f"{cls.__name__!r} object"
+                "has no attribute '__signature__'"
+            )
 
 
 signature_maker = _SignatureMaker()
@@ -393,7 +401,7 @@ def replace_generator(cls, funcname="__replace__"):
     # Generate the replace method for built classes
     # unlike the dataclasses implementation this is generated
     attribs = get_fields(cls)
-    
+
     # This is essentially the as_dict generator for prefabs
     # except based on attrib.init instead of .serialize
     vals = ", ".join(
@@ -407,7 +415,7 @@ def replace_generator(cls, funcname="__replace__"):
         f"def {funcname}(self, /, **changes):\n"
         f"    new_kwargs = {init_dict}\n"
         f"    for name, value in changes.items():\n"
-        f"        if name not in new_kwargs:\n"    
+        f"        if name not in new_kwargs:\n"
         f"            raise TypeError(\n"
         f"                f\"{{name!r}} is not a valid replacable \"\n"
         f"                f\"field on {{self.__class__.__name__!r}}\"\n"
@@ -578,7 +586,7 @@ class SlotMakerMeta(type):
     def __new__(cls, name, bases, ns, slots=True, gatherer=None, **kwargs):
         # This should only run if slots=True is declared
         # and __slots__ have not already been defined
-        if slots and "__slots__" not in ns:            
+        if slots and "__slots__" not in ns:
             # Check if a different gatherer has been set in any base classes
             # Default to unified gatherer
             if gatherer is None:
@@ -617,7 +625,7 @@ class SlotMakerMeta(type):
             # Place pre-gathered field data - modifications are already applied
             modifications = {}
             ns[GATHERED_DATA] = fields, modifications
-        
+
         else:
             if gatherer is not None:
                 ns[META_GATHERER_NAME] = gatherer
@@ -642,7 +650,7 @@ class GatheredFields:
     def __eq__(self, other):
         if type(self) is type(other):
             return self.fields == other.fields and self.modifications == other.modifications
-        
+
     def __repr__(self):
         return f"{type(self).__name__}(fields={self.fields!r}, modifications={self.modifications!r})"
 
@@ -761,11 +769,11 @@ def _build_field():
     # Complete the construction of the Field class
     field_docs = {
         "default": "Standard default value to be used for attributes with this field.",
-        "default_factory": 
+        "default_factory":
             "A zero-argument function to be called to generate a default value, "
             "useful for mutable obects like lists.",
         "type": "The type of the attribute to be assigned by this field.",
-        "doc": 
+        "doc":
             "The documentation for the attribute that appears when calling "
             "help(...) on the class. (Only in slotted classes).",
         "init": "Include this attribute in the class __init__ parameters.",
@@ -813,7 +821,7 @@ def pre_gathered_gatherer(cls_or_ns):
         cls_dict = cls_or_ns
     else:
         cls_dict = cls_or_ns.__dict__
-    
+
     return cls_dict[GATHERED_DATA]
 
 
@@ -1043,7 +1051,7 @@ def make_unified_gatherer(
                 return anno_g(cls_dict)
 
             return attrib_g(cls_dict)
-        
+
     return field_unified_gatherer
 
 

ducktools/classbuilder/__init__.pyi

@@ -1,5 +1,6 @@
 import types
 import typing
+import typing_extensions
 
 import inspect
 
@@ -57,7 +58,7 @@ class MethodMaker:
     def __get__(self, instance, cls) -> Callable: ...
 
 class _SignatureMaker:
-    def __get__(self, instance, cls) -> inspect.Signature: ...
+    def __get__(self, instance, cls=None) -> typing_extensions.Never: ...
 
 signature_maker: _SignatureMaker
 
@@ -141,7 +142,7 @@ class Field(metaclass=SlotMakerMeta):
 
     __slots__: dict[str, str]
     __classbuilder_internals__: dict
-    __signature__: inspect.Signature
+    __signature__: _SignatureMaker
 
     def __init__(
         self,

ducktools/classbuilder/_version.py

@@ -1,2 +1,2 @@
-__version__ = "0.10.0"
-__version_tuple__ = (0, 10, 0)
+__version__ = "0.10.1"
+__version_tuple__ = (0, 10, 1)

ducktools/classbuilder/annotations.py

@@ -33,6 +33,29 @@ class _LazyAnnotationLib:
 _lazy_annotationlib = _LazyAnnotationLib()
 
 
+def get_func_annotations(func):
+    """
+    Given a function, return the annotations dictionary
+
+    :param func: function object
+    :return: dictionary of annotations
+    """
+    # This method exists for use by prefab in getting annotations from
+    # the __prefab_post_init__ function
+    try:
+        annotations = func.__annotations__
+    except Exception:
+        if sys.version_info >= (3, 14):
+            annotations = _lazy_annotationlib.get_annotations(
+                func,
+                format=_lazy_annotationlib.Format.FORWARDREF,
+            )
+        else:
+            raise
+
+    return annotations
+
+
 def get_ns_annotations(ns):
     """
     Given a class namespace, attempt to retrieve the

ducktools/classbuilder/annotations.pyi

@@ -3,6 +3,10 @@ import types
 
 _CopiableMappings = dict[str, typing.Any] | types.MappingProxyType[str, typing.Any]
 
+def get_func_annotations(
+    func: types.FunctionType,
+) -> dict[str, typing.Any]: ...
+
 def get_ns_annotations(
     ns: _CopiableMappings,
 ) -> dict[str, typing.Any]: ...

ducktools/classbuilder/prefab.py

@@ -34,6 +34,8 @@ from . import (
     get_repr_generator,
 )
 
+from .annotations import get_func_annotations
+
 # These aren't used but are re-exported for ease of use
 # noinspection PyUnresolvedReferences
 from . import SlotFields, KW_ONLY  # noqa: F401
@@ -98,7 +100,7 @@ def init_generator(cls, funcname="__init__"):
             func_arglist.extend(arglist)
 
             if extra_funcname == POST_INIT_FUNC:
-                post_init_annotations.update(func.__annotations__)
+                post_init_annotations.update(get_func_annotations(func))
 
     pos_arglist = []
     kw_only_arglist = []
@@ -204,11 +206,11 @@ def init_generator(cls, funcname="__init__"):
         post_init_call = ""
 
     code = (
-        f"def {funcname}(self, {args}):\n"
+        f"def {funcname}(self, {args}) -> None:\n"
         f"{pre_init_call}\n"
         f"{body}\n"
         f"{post_init_call}\n"
-        )
+    )
 
     return GeneratedCode(code, globs)
 

ducktools/classbuilder/prefab.pyi

@@ -13,6 +13,7 @@ from . import (
     GeneratedCode,
     MethodMaker,
     SlotMakerMeta,
+    _SignatureMaker
 )
 
 from . import SlotFields as SlotFields, KW_ONLY as KW_ONLY
@@ -47,7 +48,7 @@ hash_maker: MethodMaker
 
 class Attribute(Field):
     __slots__: dict
-    __signature__: inspect.Signature
+    __signature__: _SignatureMaker
     __classbuilder_gathered_fields__: tuple[dict[str, Field], dict[str, typing.Any]]
 
     iter: bool

{ducktools_classbuilder-0.10.0.dist-info → ducktools_classbuilder-0.10.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ducktools-classbuilder
-Version: 0.10.0
+Version: 0.10.1
 Summary: Toolkit for creating class boilerplate generators
 Author: David C Ellis
 Project-URL: Homepage, https://github.com/davidcellis/ducktools-classbuilder

ducktools_classbuilder-0.10.1.dist-info/RECORD

@@ -0,0 +1,13 @@
+ducktools/classbuilder/__init__.py,sha256=zJuGJ8_1EPEYJqO0XXDuknwGD1MxPJSZXS5_wFAW6B0,37299
+ducktools/classbuilder/__init__.pyi,sha256=NazFRfLcMpU533jGixaWHV_kARtc9J4-xXX-gkD8rFY,8177
+ducktools/classbuilder/_version.py,sha256=kdUPXlUQWcTv2wnqFkwrCx7Ue7WU2JVPnG1UU0gmLck,54
+ducktools/classbuilder/annotations.py,sha256=ImEEuzEFUrGNRMlAl7YN-H8PZT1FOK8D_yL1LygNdmo,3626
+ducktools/classbuilder/annotations.pyi,sha256=zAKJbEN1klvZu71ShuvKbf6OE7ddKb5USC6MbOjRPfY,336
+ducktools/classbuilder/prefab.py,sha256=RJfOv9yzJsySaBz6w4e5ZP8Q7K3LWX6_Buuh2zD9YDQ,24689
+ducktools/classbuilder/prefab.pyi,sha256=eZLjFhM-oHeRBONpCWSb1wLJKGs5Xiq0w_Jeor8Go-w,6525
+ducktools/classbuilder/py.typed,sha256=la67KBlbjXN-_-DfGNcdOcjYumVpKG_Tkw-8n5dnGB4,8
+ducktools_classbuilder-0.10.1.dist-info/licenses/LICENSE,sha256=6Thz9Dbw8R4fWInl6sGl8Rj3UnKnRbDwrc6jZerpugQ,1070
+ducktools_classbuilder-0.10.1.dist-info/METADATA,sha256=LkjNjXyb49v3vYBEvbldkThl9xAgCHhVc8dPNgiMsxw,9231
+ducktools_classbuilder-0.10.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ducktools_classbuilder-0.10.1.dist-info/top_level.txt,sha256=uSDLtio3ZFqdwcsMJ2O5yhjB4Q3ytbBWbA8rJREganc,10
+ducktools_classbuilder-0.10.1.dist-info/RECORD,,

ducktools_classbuilder-0.10.0.dist-info/RECORD

@@ -1,13 +0,0 @@
-ducktools/classbuilder/__init__.py,sha256=nZz_pQM6CN7yCT71oOclih4uls73a6SlW-HY2gxzYIs,37244
-ducktools/classbuilder/__init__.pyi,sha256=v9QDO8A0AdPlAPNOXZGYXu1FaAq3yelwWNucdfWudrs,8143
-ducktools/classbuilder/_version.py,sha256=MdjuHfU3W8hJQpD3kGrPvowqtRDz5JMifDCCjNbrskE,54
-ducktools/classbuilder/annotations.py,sha256=GgBvNthDSRvKKZ9R_qxEVtCV3_vGuEBfuqQJFcDAe1s,3005
-ducktools/classbuilder/annotations.pyi,sha256=c5vYtULdDgMYWtkzeYMsHIbmnEuT2Ru-nNZieWvYuQ4,247
-ducktools/classbuilder/prefab.py,sha256=2GldQTRvOcFzB68qXbymeHKiXoyHx7eOjGxeilFIcn0,24632
-ducktools/classbuilder/prefab.pyi,sha256=q5Zca5wAN80GE4uICY6v3EIB6LvIcjOEhzD1pVDK44U,6507
-ducktools/classbuilder/py.typed,sha256=la67KBlbjXN-_-DfGNcdOcjYumVpKG_Tkw-8n5dnGB4,8
-ducktools_classbuilder-0.10.0.dist-info/licenses/LICENSE,sha256=6Thz9Dbw8R4fWInl6sGl8Rj3UnKnRbDwrc6jZerpugQ,1070
-ducktools_classbuilder-0.10.0.dist-info/METADATA,sha256=zrp9Q-klxkuTdsGSGz87rEZ7nxM8FCEppJfiGwqRh-0,9231
-ducktools_classbuilder-0.10.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ducktools_classbuilder-0.10.0.dist-info/top_level.txt,sha256=uSDLtio3ZFqdwcsMJ2O5yhjB4Q3ytbBWbA8rJREganc,10
-ducktools_classbuilder-0.10.0.dist-info/RECORD,,