omdev 0.0.0.dev481__tar.gz → 0.0.0.dev483__tar.gz

{omdev-0.0.0.dev481/omdev.egg-info → omdev-0.0.0.dev483}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev481
+Version: 0.0.0.dev483
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev481
+Requires-Dist: omlish==0.0.0.dev483
 Provides-Extra: all
 Requires-Dist: black~=25.11; extra == "all"
 Requires-Dist: pycparser~=2.23; extra == "all"

{omdev-0.0.0.dev481 → omdev-0.0.0.dev483}/omdev/dataclasses/_dumping.py

@@ -44,7 +44,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../../omlish/lite/reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
             dict(path='../../omlish/lite/strings.py', sha1='89831ecbc34ad80e118a865eceb390ed399dc4d6'),
             dict(path='../../omlish/lite/marshal.py', sha1='96348f5f2a26dc27d842d33cc3927e9da163436b'),
-            dict(path='dumping.py', sha1='6f2525cb2d5dd2317eaf0c207fcb97909c3c37be'),
+            dict(path='dumping.py', sha1='982d4f7a46f40e48da4daadb082b7e66acb34ae9'),
         ],
     )
 
@@ -1775,7 +1775,10 @@ unmarshal_obj = OBJ_MARSHALER_MANAGER.unmarshal_obj
 
 @dc.dataclass(frozen=True)
 class DumpedDataclassCodegen:
-    module: str
+    mod_name: str
+
+    cls_module: str
+    cls_qualname: str
 
     plan_repr: str
 
@@ -1848,7 +1851,10 @@ class _DataclassCodegenDumper:
                     raise TypeError(ref)
 
             dumped.append(DumpedDataclassCodegen(
-                module=check.not_none(cur_module),
+                mod_name=check.not_none(cur_module),
+
+                cls_module=ctx.cls.__module__,
+                cls_qualname=ctx.cls.__qualname__,
 
                 plan_repr=repr(prepared.plans),
 
@@ -1933,6 +1939,7 @@ class _DataclassCodegenDumper:
 
         with processing_options_context(Codegen(
                 style='aot',
+                force=True,
                 callback=callback,
         )):
             process_dir(os.path.dirname(init_file_path))

{omdev-0.0.0.dev481 → omdev-0.0.0.dev483}/omdev/dataclasses/_template.py

@@ -12,9 +12,9 @@ import types
 REGISTRY = {}
 
 
-def _register(plan_repr):
+def _register(**kwargs):
     def inner(fn):
-        REGISTRY[fn.__name__] = (plan_repr, fn)
+        REGISTRY[kwargs['plan_repr']] = (kwargs, fn)
         return fn
     return inner
 

{omdev-0.0.0.dev481 → omdev-0.0.0.dev483}/omdev/dataclasses/codegen.py

@@ -17,6 +17,7 @@ TODO:
 """
 import ast
 import asyncio
+import hashlib
 import inspect
 import json
 import os.path
@@ -39,6 +40,7 @@ from ..py.asts.toplevel import analyze_module_top_level
 from ..py.reprs import textwrap_repr
 from ..py.srcheaders import get_py_header_lines
 from .dumping import DataclassCodegenDumperOutput
+from .dumping import DumpedDataclassCodegen
 
 
 log = logs.get_module_logger(globals())
@@ -228,6 +230,8 @@ class DataclassCodeGen:
 
     #
 
+    PROCESS_FN_NAME: ta.ClassVar[str] = '_process_dataclass'
+
     async def process_dumper_output(
             self,
             cfg_pkg: ConfiguredPackage,
@@ -252,23 +256,108 @@ class DataclassCodeGen:
         from . import _template
         lines.extend(inspect.getsource(_template).strip().split('\n'))
 
-        seen_fn_names: set[str] = set()
+        #
+
+        dumped_by_plan_repr: dict[str, list[DumpedDataclassCodegen]] = {}
+
+        seen_cls_name_tups: set[tuple[str, str]] = set()
+
+        cp_name_parts = cfg_pkg.name.split('.')
 
         for x in output.dumped:
-            check.not_in(x.fn_name, seen_fn_names)
-            seen_fn_names.add(x.fn_name)
+            x_mod_name_parts = x.cls_module.split('.')
+            if x_mod_name_parts[:len(cp_name_parts)] != cp_name_parts:
+                continue
+
+            cls_name_tup = (x.cls_module, x.cls_qualname)
+            check.not_in(cls_name_tup, seen_cls_name_tups)
+            seen_cls_name_tups.add(cls_name_tup)
+
+            try:
+                lst = dumped_by_plan_repr[x.plan_repr]
+            except KeyError:
+                dumped_by_plan_repr[x.plan_repr] = [x]
+                continue
+
+            y = lst[0]
+            if set(x.refs) != set(y.refs):
+                raise RuntimeError(f'Mismatched refs: {x!r} != {y!r}')
+
+            lst.append(x)
+
+        #
+
+        prs_by_sha1 = col.make_map((
+            (hashlib.sha1(pr.encode()).hexdigest(), pr)  # noqa
+            for pr in dumped_by_plan_repr
+        ), strict=True)
+
+        for pr_sha1, pr in sorted(prs_by_sha1.items()):
+            grp = dumped_by_plan_repr[pr]
+            x = grp[0]
+
+            fn_name = f'{self.PROCESS_FN_NAME}__{pr_sha1}'
 
             lines.extend(['', ''])
 
-            lines.extend([
+            lines.append(
                 '@_register(',
+            )
+
+            lines.extend([
+                f'    plan_repr=(',
                 *[
-                    f'    {prl}'
-                    for prl in textwrap_repr(x.plan_repr, self._target_line_width - 4)
+                    f'        {prl}'
+                    for prl in textwrap_repr(x.plan_repr, self._target_line_width - 8)
                 ],
+                f'    ),',
+                f'    plan_repr_sha1={pr_sha1!r},',
+            ])
+
+            op_ref_idents = [r.ident for r in x.refs if r.kind == 'op']
+            if op_ref_idents:
+                lines.extend([
+                    f'    op_ref_idents=(',
+                    *[
+                        f'        {r!r},'
+                        for r in sorted(op_ref_idents)
+                    ],
+                    f'    ),',
+                ])
+            else:
+                lines.append(
+                    '    op_ref_idents=(),',
+                )
+
+            lines.extend([
+                f'    cls_names=(',
+                *[
+                    f'        {cn!r},'
+                    for cn in sorted([
+                        (y.mod_name, y.cls_qualname)
+                        for y in grp
+                    ])
+                ],
+                f'    ),',
+            ])
+
+            lines.append(
                 ')',
+            )
+
+            lines.extend([
+                f'def {fn_name}():',
+            ])
+
+            lines.extend([
+                f'    {l}' if l.strip() else ''
+                for l in x.fn_lines
+            ])
+
+            lines.extend([
+                '',
+                f'    return {x.fn_name}',
             ])
-            lines.extend([l if l.strip() else '' for l in x.fn_lines])
 
         lines.append('')
 

{omdev-0.0.0.dev481 → omdev-0.0.0.dev483}/omdev/dataclasses/dumping.py

@@ -15,7 +15,10 @@ from omlish.lite.marshal import marshal_obj
 
 @dc.dataclass(frozen=True)
 class DumpedDataclassCodegen:
-    module: str
+    mod_name: str
+
+    cls_module: str
+    cls_qualname: str
 
     plan_repr: str
 
@@ -88,7 +91,10 @@ class _DataclassCodegenDumper:
                     raise TypeError(ref)
 
             dumped.append(DumpedDataclassCodegen(
-                module=check.not_none(cur_module),
+                mod_name=check.not_none(cur_module),
+
+                cls_module=ctx.cls.__module__,
+                cls_qualname=ctx.cls.__qualname__,
 
                 plan_repr=repr(prepared.plans),
 
@@ -173,6 +179,7 @@ class _DataclassCodegenDumper:
 
         with processing_options_context(Codegen(
                 style='aot',
+                force=True,
                 callback=callback,
         )):
             process_dir(os.path.dirname(init_file_path))

{omdev-0.0.0.dev481 → omdev-0.0.0.dev483/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev481
+Version: 0.0.0.dev483
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev481
+Requires-Dist: omlish==0.0.0.dev483
 Provides-Extra: all
 Requires-Dist: black~=25.11; extra == "all"
 Requires-Dist: pycparser~=2.23; extra == "all"

{omdev-0.0.0.dev481 → omdev-0.0.0.dev483}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev481
+omlish==0.0.0.dev483
 
 [all]
 black~=25.11

{omdev-0.0.0.dev481 → omdev-0.0.0.dev483}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev481'
+version = '0.0.0.dev483'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,7 +24,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev481',
+    'omlish == 0.0.0.dev483',
 ]
 
 [project.optional-dependencies]