Merge pull request #71 from DavidCEllis/simplify-make-prefab

Simplify _make_prefab by splitting it into pre/post process components

Author: DavidCEllis

perf/hyperfine_testmaker.py

@@ -149,6 +149,15 @@ class C{n}:
     e: int
 '''
 
+prefab_baseclass_template = '''
+class C{n}(Prefab):
+    a: int
+    b: int
+    c: int
+    d: int
+    e: int
+'''
+
 prefab_attribute_template = '''
 @prefab
 class C{n}:
@@ -183,6 +192,15 @@ class C{n}:
 C{n}.__init__, C{n}.__repr__, C{n}.__eq__
 '''
 
+msgspec_template = '''
+class C{n}(Struct):
+    a: int
+    b: int
+    c: int
+    d: int
+    e: int
+'''
+
 
 # Import Headings #
 
@@ -194,7 +212,8 @@ class C{n}:
 cluegen_header = "from cluegen import Datum"
 dataklass_header = "from dataklasses import dataklass"
 slotclass_header = "from ducktools.classbuilder import slotclass, SlotFields, Field"
-prefab_header = "from ducktools.classbuilder.prefab import prefab, attribute, SlotFields"
+prefab_header = "from ducktools.classbuilder.prefab import prefab, attribute, Prefab, SlotFields"
+msgspec_header = "from msgspec import Struct"
 
 
 def write_perf_file(outpath, count, template, setup):
@@ -235,6 +254,8 @@ def write_classdef_file(self, count=100):
     TestData('native_classes', '', standard_template),
     TestData('slotclasses', slotclass_header, slotclass_template),
     TestData('prefab', prefab_header, prefab_template),
+    TestData('prefab_baseclass', prefab_header, prefab_baseclass_template),
+    TestData('prefab_attributes', prefab_header, prefab_attribute_template),
     TestData('prefab_slots', prefab_header, prefab_slots_template),
     TestData('prefab_eval', prefab_header, prefab_eval_template),
     TestData('namedtuples', namedtuple_header, namedtuple_template),
@@ -243,8 +264,7 @@ def write_classdef_file(self, count=100):
     TestData('attrs_noslots', attr_header, attr_noslots_template),
     TestData('attrs_slots', attr_header, attr_slots_template),
     TestData('pydantic', pydantic_header, pydantic_template),
-    # TestData('cluegen', cluegen_header, cluegen_template),
-    # TestData('cluegen_eval', cluegen_header, cluegen_eval_template),
+    TestData('msgspec', msgspec_header, msgspec_template),
 ]
 
 
@@ -297,6 +317,7 @@ def write_tests(*, runs=100, warmup=20, includes_pass=True):
         '''"python -c \\"from dataclasses import dataclass\\"" '''
         '''"python -c \\"from attrs import define\\"" '''
         '''"python -c \\"from pydantic import BaseModel\\"" '''
+        '''"python -c \\"from msgspec import Struct\\"" '''
     )
 
     import_script = (

perf/perf_profile.py

@@ -63,8 +63,6 @@ class C{n}:
     c: int
     d: int
     e: int
-
-C{n}.__init__, C{n}.__repr__, C{n}.__eq__
 '''
 
 attr_template = '''
@@ -75,8 +73,6 @@ class C{n}:
     c: int
     d: int
     e: int
-
-C{n}.__init__, C{n}.__repr__, C{n}.__eq__
 '''
 
 pydantic_template = '''
@@ -86,8 +82,15 @@ class C{n}(BaseModel):
     c: int
     d: int
     e: int
+'''
 
-C{n}.__init__, C{n}.__repr__, C{n}.__eq__
+msgspec_template = '''
+class C{n}(Struct):
+    a: int
+    b: int
+    c: int
+    d: int
+    e: int
 '''
 
 cluegen_template = '''
@@ -262,6 +265,13 @@ def run_all_tests(reps, test_everything=False):
         except ImportError:
             print("pydantic not installed")
 
+        try:
+            import msgspec  # type: ignore
+            write_perftemp(100, msgspec_template, "from msgspec import Struct")
+            run_test(f"msgspec {msgspec.__version__}", reps)
+        except ImportError:
+            print("msgspec not installed")
+
         write_perftemp(100, cluegen_template, 'from cluegen import Datum\n')
         run_test('dabeaz/cluegen', reps)
 

pyproject.toml

@@ -43,6 +43,7 @@ dev = [
 performance = [
     "attrs>=25.0",
     "pydantic>=2.11",
+    "msgspec>=0.20",
 ]
 
 [tool.setuptools.packages.find]

src/ducktools/classbuilder/__init__.py

@@ -167,15 +167,6 @@ def build_completed(ns):
         return False
 
 
-def _get_inst_fields(inst):
-    # This is an internal helper for constructing new
-    # 'Field' instances from existing ones.
-    return {
-        k: getattr(inst, k)
-        for k in get_fields(type(inst))
-    }
-
-
 # As 'None' can be a meaningful value we need a sentinel value
 # to use to show no value has been provided.
 class _NothingType:
@@ -580,7 +571,7 @@ def frozen_delattr_generator(cls, funcname="__delattr__"):
 )
 
 
-def builder(cls=None, /, *, gatherer, methods, flags=None, fix_signature=True):
+def builder(cls=None, /, *, gatherer, methods, flags=None, fix_signature=True, field_getter=get_fields):
     """
     The main builder for class generation
 
@@ -598,6 +589,8 @@ def builder(cls=None, /, *, gatherer, methods, flags=None, fix_signature=True):
     :param fix_signature: Add a __signature__ attribute to work-around an issue with
                           inspect.signature incorrectly handling __init__ descriptors.
     :type fix_signature: bool
+    :param field_getter: function to use to retrieve fields from parent classes
+    :type field_getter: Callable[[type], dict[str, Field]]
     :return: The modified class (the class itself is modified, but this is expected).
     """
     # Handle `None` to make wrapping with a decorator easier.
@@ -642,7 +635,7 @@ def builder(cls=None, /, *, gatherer, methods, flags=None, fix_signature=True):
         fields = {}
         for c in reversed(mro):
             try:
-                fields |= get_fields(c, local=True)
+                fields |= field_getter(c, local=True)
             except (TypeError, KeyError):
                 pass
 
@@ -923,7 +916,11 @@ def from_field(cls, fld, /, **kwargs):
         :param kwargs: Additional keyword arguments for subclasses
         :return: new field subclass instance
         """
-        argument_dict = {**_get_inst_fields(fld), **kwargs}
+        inst_fields = {
+            k: getattr(fld, k)
+            for k in get_fields(type(fld))
+        }
+        argument_dict = {**inst_fields, **kwargs}
 
         return cls(**argument_dict)