omdev 0.0.56__tar.gz → 0.0.58__tar.gz

{omdev-0.0.56/omdev.egg-info → omdev-0.0.58}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.56
+Version: 0.0.58
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,11 +14,11 @@ Classifier: Programming Language :: Python :: 3.15
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omcore==0.0.56
+Requires-Dist: omcore==0.0.58
 Provides-Extra: ominfra
-Requires-Dist: ominfra==0.0.56; extra == "ominfra"
+Requires-Dist: ominfra==0.0.58; extra == "ominfra"
 Provides-Extra: omllm
-Requires-Dist: omllm==0.0.56; extra == "omllm"
+Requires-Dist: omllm==0.0.58; extra == "omllm"
 Provides-Extra: black
 Requires-Dist: black~=26.5; extra == "black"
 Provides-Extra: c
@@ -59,14 +59,14 @@ Requires-Dist: tree-sitter-toml~=0.7; extra == "tui-syntax"
 Requires-Dist: tree-sitter-xml~=0.7; extra == "tui-syntax"
 Requires-Dist: tree-sitter-yaml~=0.7; extra == "tui-syntax"
 Provides-Extra: cext
-Requires-Dist: omdev-cext==0.0.56; extra == "cext"
+Requires-Dist: omdev-cext==0.0.58; extra == "cext"
 Provides-Extra: rs
-Requires-Dist: omdev-rs==0.0.56; extra == "rs"
+Requires-Dist: omdev-rs==0.0.58; extra == "rs"
 Provides-Extra: cli
-Requires-Dist: omdev-cli==0.0.56; extra == "cli"
+Requires-Dist: omdev-cli==0.0.58; extra == "cli"
 Provides-Extra: all
-Requires-Dist: ominfra==0.0.56; extra == "all"
-Requires-Dist: omllm==0.0.56; extra == "all"
+Requires-Dist: ominfra==0.0.58; extra == "all"
+Requires-Dist: omllm==0.0.58; extra == "all"
 Requires-Dist: black~=26.5; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
@@ -95,9 +95,9 @@ Requires-Dist: tree-sitter-sql~=0.3; extra == "all"
 Requires-Dist: tree-sitter-toml~=0.7; extra == "all"
 Requires-Dist: tree-sitter-xml~=0.7; extra == "all"
 Requires-Dist: tree-sitter-yaml~=0.7; extra == "all"
-Requires-Dist: omdev-cext==0.0.56; extra == "all"
-Requires-Dist: omdev-rs==0.0.56; extra == "all"
-Requires-Dist: omdev-cli==0.0.56; extra == "all"
+Requires-Dist: omdev-cext==0.0.58; extra == "all"
+Requires-Dist: omdev-rs==0.0.58; extra == "all"
+Requires-Dist: omdev-cli==0.0.58; extra == "all"
 Dynamic: license-file
 
 # Overview

{omdev-0.0.56 → omdev-0.0.58}/omdev/cli/_pathhack.py

@@ -46,7 +46,7 @@ def _activate_path_hack() -> None:
         sys.meta_path.insert(0, _PathHackMetaFinder())
 
 
-_PTH_FILE_NAME = f'omcore-{"-".join(__package__.split(".")[1:])}-pathhack.pth'
+_PTH_FILE_NAME = f'omdev-{"-".join(__package__.split(".")[1:])}-pathhack.pth'
 
 
 def _install_pth_file() -> None:

{omdev-0.0.56 → omdev-0.0.58}/omdev/cli/main.py

@@ -2,7 +2,7 @@
 TODO:
  - cache ldr.discover() somehow if in uvx/pipx - very slow
   - <venv-root>/.omdev-cli-manifest-cache.json - {pkg_name: manifests_json}
- - allow manually specifying manifest packages
+ - !!! allow manually specifying manifest packages
 """
 import argparse
 import dataclasses as dc

{omdev-0.0.56 → omdev-0.0.58}/omdev/dataclasses/_dumping.py

@@ -42,11 +42,11 @@ def __om_amalg__():  # noqa
             dict(path='../../omcore/lite/check.py', sha1='62b9ccea94c4f7bcef97e7adae8674b8cb11d4af'),
             dict(path='../../omcore/lite/io.py', sha1='a60d94f0bdbb2b1541d363c301314682d1686240'),
             dict(path='../../omcore/lite/objects.py', sha1='9566bbf3530fd71fcc56321485216b592fae21e9'),
-            dict(path='../../omcore/lite/reflect.py', sha1='fab4ef6f45f278ce7bffcd811cd170b40db107a8'),
+            dict(path='../../omcore/lite/reflect.py', sha1='64d51b5de91131349d56e4154ed235eb7fff4fd0'),
             dict(path='../../omcore/lite/strings.py', sha1='b31b8e4b0e4fec4562ea3fa602e4ef2475e5fe7c'),
             dict(path='../../omcore/lite/json.py', sha1='01124e62093ebd4078602f16df0ec04cb724a612'),
             dict(path='../../omcore/lite/marshal.py', sha1='9b3f4ff802344313147f412f8f028922afc52b2f'),
-            dict(path='dumping.py', sha1='f385a4502d279cf76e4a2bd69efac82881117e57'),
+            dict(path='dumping.py', sha1='ae2f3a87e05e31449ea9afb2e8b5998a854d78a1'),
         ],
     )
 
@@ -901,6 +901,7 @@ def dir_dict(o: ta.Any) -> ta.Dict[str, ta.Any]:
 _GENERIC_ALIAS_TYPES = (
     ta._GenericAlias,  # type: ignore  # noqa
     *([ta._SpecialGenericAlias] if hasattr(ta, '_SpecialGenericAlias') else []),  # noqa
+    *([types.GenericAlias] if hasattr(types, 'GenericAlias') else []),  # noqa
 )
 
 
@@ -981,6 +982,57 @@ def get_literal_type_args(spec: ta.Any) -> ta.Iterable[ta.Any]:
     return spec.__args__
 
 
+##
+
+
+def type_form_repr(ty: ta.Any) -> str:
+    if isinstance(ty, type):
+        return f'{ty.__module__}.{ty.__qualname__}'
+
+    elif ty is ta.Any:
+        return 'typing.Any'
+
+    elif is_optional_alias(ty):
+        ety = get_optional_alias_arg(ty)
+        return f'typing.Optional[{type_form_repr(ety)}]'
+
+    elif is_union_alias(ty):
+        args = ta.get_args(ty)
+        return f'typing.Union[{", ".join(sorted(type_form_repr(a) for a in args))}]'
+
+    elif is_callable_alias(ty):
+        ptys, rty = ta.get_args(ty)
+        return (
+            f'typing.Callable[['
+            f'{"..." if isinstance(ptys, types.EllipsisType) else ", ".join(type_form_repr(a) for a in ptys)}], '
+            f'{type_form_repr(rty)}]'
+        )
+
+    elif is_literal_type(ty):
+        args = ta.get_args(ty)
+        return f'typing.Literal[{", ".join(sorted(repr(a) for a in args))}]'
+
+    elif is_new_type(ty):
+        raise NotImplementedError
+
+    elif is_generic_alias(ty):
+        origin = ta.get_origin(ty)
+        args = ta.get_args(ty)
+        if origin is tuple and args and isinstance(args[-1], types.EllipsisType):
+            return (
+                f'{type_form_repr(origin)}['
+                f'{", ".join(type_form_repr(a) for a in args[:-1])}, ...]'
+            )
+        else:
+            return (
+                f'{type_form_repr(origin)}['
+                f'{", ".join(type_form_repr(a) for a in args)}]'
+            )
+
+    else:
+        raise TypeError(ty)
+
+
 ########################################
 # ../../../omcore/lite/strings.py
 
@@ -2000,7 +2052,7 @@ class DumpedDataclassCodegen:
     cls_module: str
     cls_qualname: str
 
-    plan_repr: str
+    spec_key: ta.Optional[str]
 
     fn_name: str
     fn_params: ta.Sequence[str]
@@ -2025,6 +2077,7 @@ class DataclassCodegenDumperOutput:
     import_errors: ta.Mapping[str, str]
 
     dumped: ta.Sequence[DumpedDataclassCodegen]
+    implementation_key: str
 
 
 ##
@@ -2043,6 +2096,7 @@ class _DataclassCodegenDumper:
         from omcore.dataclasses.impl.generation.compilation import OpCompiler  # noqa
         from omcore.dataclasses.impl.generation.globals import FnGlobal  # noqa
         from omcore.dataclasses.impl.generation.ops import OpRef  # noqa
+        from omcore.dataclasses.impl.generation.keys import implementation_key  # noqa
         from omcore.dataclasses.impl.generation.processor import Codegen  # noqa
         from omcore.dataclasses.impl.generation.processor import GeneratorProcessor  # noqa
         from omcore.dataclasses.impl.generation.processor import ProcessingOption  # noqa
@@ -2087,7 +2141,7 @@ class _DataclassCodegenDumper:
                 cls_module=ctx.cls.__module__,
                 cls_qualname=ctx.cls.__qualname__,
 
-                plan_repr=repr(prepared.plans),
+                spec_key=prepared.spec_key,
 
                 fn_name=comp.fn_name,
                 fn_params=comp.fn_params,
@@ -2194,6 +2248,7 @@ class _DataclassCodegenDumper:
             import_errors=import_errors,
 
             dumped=dumped,
+            implementation_key=implementation_key(),
         )
 
         with open(out_file_path, 'w') as f:

omdev-0.0.58/omdev/dataclasses/_template.py

@@ -0,0 +1,27 @@
+# type: ignore
+# ruff: noqa
+# flake8: noqa
+import dataclasses
+import reprlib
+import types
+
+
+##
+
+
+REGISTRY_BY_SPEC_KEY = {}
+REGISTRY_BY_CLS_NAME = {}
+
+
+def _register(**kwargs):
+    def inner(fn):
+        for key in kwargs['spec_keys']:
+            if key in REGISTRY_BY_SPEC_KEY:
+                raise RuntimeError('Conflicting dataclass cache key')
+            REGISTRY_BY_SPEC_KEY[key] = (kwargs, fn)
+        REGISTRY_BY_CLS_NAME.update({cn: (kwargs, fn) for cn in kwargs['cls_names']})
+        return fn
+    return inner
+
+
+##

{omdev-0.0.56 → omdev-0.0.58}/omdev/dataclasses/codegen.py

@@ -231,6 +231,20 @@ class DataclassCodeGen:
 
     PROCESS_FN_NAME: ta.ClassVar[str] = '_process_dataclass'
 
+    def _string_literal_lines(self, value: str, *, indent: int, suffix: str = '') -> list[str]:
+        prefix = ' ' * indent
+        literal = repr(value)
+        if indent + len(literal) + len(suffix) <= self._target_line_width:
+            return [f'{prefix}{literal}{suffix}']
+        return [
+            f'{prefix}(',
+            *[
+                f'{prefix}    {line}'
+                for line in textwrap_repr(value, self._target_line_width - indent - 4)
+            ],
+            f'{prefix}){suffix}',
+        ]
+
     async def process_dumper_output(
             self,
             cfg_pkg: ConfiguredPackage,
@@ -253,17 +267,26 @@ class DataclassCodeGen:
 
         from . import _template
         lines.extend(inspect.getsource(_template).strip().split('\n'))
+        lines.extend(['', '', f'IMPLEMENTATION_KEY = {output.implementation_key!r}'])
 
         #
 
         processed_modules = set(output.processed_modules)
 
-        dumped_by_plan_repr: dict[str, list[DumpedDataclassCodegen]] = {}
+        # The emitted source includes binding expressions, helper lookups, and installation behavior. Different
+        # conservative keys may share exactly the same installer without a separate normalized plan representation.
+        dumped_by_source: dict[
+            tuple[
+                tuple[str, ...],  # hdr_lines
+                tuple[str, ...],  # fn_lines
+            ],
+            list[DumpedDataclassCodegen],
+        ] = {}
 
         seen_cls_name_tups: set[tuple[str, str]] = set()
 
         for x in output.dumped:
-            if x.cls_module not in processed_modules:
+            if x.cls_module not in processed_modules or x.spec_key is None:
                 continue
 
             cls_name_tup = (x.cls_module, x.cls_qualname)
@@ -275,10 +298,14 @@ class DataclassCodeGen:
             )
             seen_cls_name_tups.add(cls_name_tup)
 
+            source_key = (
+                tuple(x.hdr_lines),
+                tuple(x.fn_lines),
+            )
             try:
-                lst = dumped_by_plan_repr[x.plan_repr]
+                lst = dumped_by_source[source_key]
             except KeyError:
-                dumped_by_plan_repr[x.plan_repr] = [x]
+                dumped_by_source[source_key] = [x]
                 continue
 
             y = lst[0]
@@ -291,14 +318,13 @@ class DataclassCodeGen:
 
         # Sorted by first cls name for more stable diffs than say sha1
         for grp in sorted(
-                dumped_by_plan_repr.values(),
+                dumped_by_source.values(),
                 key=lambda grp: min([(y.cls_module, y.cls_qualname) for y in grp]),
         ):
             x = grp[0]
-            pr = x.plan_repr
-            pr_sha1 = hashlib.sha1(pr.encode()).hexdigest()  # noqa
+            installer_sha1 = hashlib.sha1(repr((tuple(x.hdr_lines), tuple(x.fn_lines))).encode()).hexdigest()  # noqa
 
-            fn_name = f'{self.PROCESS_FN_NAME}__{pr_sha1}'
+            fn_name = f'{self.PROCESS_FN_NAME}__{installer_sha1}'
 
             lines.extend(['', ''])
 
@@ -307,26 +333,27 @@ class DataclassCodeGen:
             )
 
             lines.extend([
-                f'    plan_repr=(',
+                f'    installer_sha1={installer_sha1!r},',
+                f'    spec_keys=(',
                 *[
-                    f'        {prl}'
-                    for prl in textwrap_repr(x.plan_repr, self._target_line_width - 8)
+                    line
+                    for key in sorted({check.not_none(y.spec_key) for y in grp})
+                    for line in self._string_literal_lines(key, indent=8, suffix=',')
                 ],
                 f'    ),',
-                f'    plan_repr_sha1={pr_sha1!r},',
-            ])
-
-            lines.extend([
                 f'    cls_names=(',
-                *[
-                    f'        {cn!r},'
-                    for cn in sorted([
-                        (y.cls_module, y.cls_qualname)
-                        for y in grp
-                    ])
-                ],
-                f'    ),',
             ])
+            for cn in sorted((y.cls_module, y.cls_qualname) for y in grp):
+                if len(line := f'        {cn!r},') <= self._target_line_width:
+                    lines.append(line)
+                else:
+                    lines.extend([
+                        '        (',
+                        *self._string_literal_lines(cn[0], indent=12, suffix=','),
+                        *self._string_literal_lines(cn[1], indent=12, suffix=','),
+                        '        ),',
+                    ])
+            lines.append('    ),')
 
             lines.append(
                 ')',

{omdev-0.0.56 → omdev-0.0.58}/omdev/dataclasses/dumping.py

@@ -21,7 +21,7 @@ class DumpedDataclassCodegen:
     cls_module: str
     cls_qualname: str
 
-    plan_repr: str
+    spec_key: ta.Optional[str]
 
     fn_name: str
     fn_params: ta.Sequence[str]
@@ -46,6 +46,7 @@ class DataclassCodegenDumperOutput:
     import_errors: ta.Mapping[str, str]
 
     dumped: ta.Sequence[DumpedDataclassCodegen]
+    implementation_key: str
 
 
 ##
@@ -64,6 +65,7 @@ class _DataclassCodegenDumper:
         from omcore.dataclasses.impl.generation.compilation import OpCompiler  # noqa
         from omcore.dataclasses.impl.generation.globals import FnGlobal  # noqa
         from omcore.dataclasses.impl.generation.ops import OpRef  # noqa
+        from omcore.dataclasses.impl.generation.keys import implementation_key  # noqa
         from omcore.dataclasses.impl.generation.processor import Codegen  # noqa
         from omcore.dataclasses.impl.generation.processor import GeneratorProcessor  # noqa
         from omcore.dataclasses.impl.generation.processor import ProcessingOption  # noqa
@@ -108,7 +110,7 @@ class _DataclassCodegenDumper:
                 cls_module=ctx.cls.__module__,
                 cls_qualname=ctx.cls.__qualname__,
 
-                plan_repr=repr(prepared.plans),
+                spec_key=prepared.spec_key,
 
                 fn_name=comp.fn_name,
                 fn_params=comp.fn_params,
@@ -215,6 +217,7 @@ class _DataclassCodegenDumper:
             import_errors=import_errors,
 
             dumped=dumped,
+            implementation_key=implementation_key(),
         )
 
         with open(out_file_path, 'w') as f:

{omdev-0.0.56 → omdev-0.0.58}/omdev/dockerdev/cli.py

@@ -174,8 +174,20 @@ class Cli(ap.Cli):
         ap.arg('container-id'),
         ap.arg('secret', nargs='+'),
         ap.arg('-f', '--secrets-file'),
+
+        ap.arg('--shift-uid'),
+        ap.arg('-U', '--auto-shift-uid', action='store_true'),
+
     )
     def inject_secret(self) -> None:
+        shift_uid: tuple[int, int] | None = None
+        if (su := self.args.shift_uid) is not None:
+            check.arg(not self.args.auto_shift_uid)
+            shift_uid = tuple(map(int, su.split(':')))  # type: ignore[assignment]
+        elif self.args.auto_shift_uid:
+            if getattr(sys, 'platform') == 'linux':
+                shift_uid = (os.getuid(), os.getgid())
+
         secrets: list[str | tuple[str, str]] = []
         for s in self.args.secret:
             if '=' in s:
@@ -192,6 +204,7 @@ class Cli(ap.Cli):
             self.args.container_id,
             secrets,
             secrets_file=self.args.secrets_file,
+            shift_uid=shift_uid,
         )
 
 

{omdev-0.0.56 → omdev-0.0.58}/omdev/dockerdev/config.toml

@@ -12,6 +12,7 @@ jdks = [
     'zulu21-ca-jdk',
     'zulu25-ca-jdk',
     'zulu26-ca-jdk',
+    'zulu27-ca-jdk',
 ]
 
 nvm_versions = [

omdev-0.0.58/omdev/dockerdev/db.py

@@ -0,0 +1,68 @@
+import datetime
+import typing as ta
+
+from omcore import dataclasses as dc
+from omcore import orm
+from omcore import sql
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class Container:
+    id: str
+
+
+##
+
+
+@dc.dataclass(kw_only=True)
+@dc.extra_class_params(install_class_field_attrs='instance')
+class OrmContainer:
+    _id: orm.Key[int] = dc.field(default_factory=orm.auto_key[int])
+
+    id: orm.Key[str]
+
+    created_at: datetime.datetime = orm.auto_value[datetime.datetime]()
+    updated_at: datetime.datetime = orm.auto_value[datetime.datetime]()
+
+    #
+
+    json: Container
+
+
+def orm_mappers() -> ta.Sequence[orm.Mapper]:
+    return [
+
+        orm.dataclass_mapper(
+            OrmContainer,
+            store_name='container',
+            field_options=dict(
+                created_at=[orm.CreatedAt()],
+                updated_at=[orm.UpdatedAt()],
+                container=[
+                    orm.FieldCodec(orm.CompositeCodec(
+                        orm.MarshalCodec(),
+                        orm.JsonCodec(),
+                    )),
+                    orm.FieldSqlType(sql.td.String()),
+                ],
+            ),
+            indexes=[
+                orm.index(
+                    'id',
+                    options=[
+                        orm.UniqueIndexOption(),
+                    ],
+                ),
+                orm.index(
+                    'created_at',
+                    options=[
+                        orm.SortedIndexOption(),
+                    ],
+                ),
+            ],
+        ),
+
+    ]

{omdev-0.0.56 → omdev-0.0.58}/omdev/dockerdev/secrets.py

@@ -66,6 +66,8 @@ def _inject_update(
         container_id: str,
         secrets_file: str,
         update: ta.Mapping[str, ta.Any],
+        *,
+        shift_uid: tuple[int, int] | None = None,
 ) -> None:
     _check_container_id(container_id)
 
@@ -78,8 +80,6 @@ def _inject_update(
 
     args_bytes = json.dumps(args_dct).encode('utf-8')
 
-    #
-
     payload_src = '\n\n'.join([
         inspect.getsource(secretinject),
         check.not_none(pyremote.get_core_source()),
@@ -89,18 +89,29 @@ def _inject_update(
 
     #
 
+    exec_cmd: list[str] = [
+        'sh',
+        '-c',
+        get_best_python_sh(),
+        '--',
+        '-c',
+        pyremote.build_bootstrap_source('pyrthing'),
+    ]
+
+    exec_args: list[str] = []
+
+    if shift_uid is not None:
+        uid, gid = shift_uid
+        exec_args.append(f'--user={uid}')
+
     proc = subprocess.Popen(
         subprocess_maybe_shell_wrap_exec(
             'docker',
             'exec',
+            *exec_args,
             '-i',
             container_id,
-            'sh',
-            '-c',
-            get_best_python_sh(),
-            '--',
-            '-c',
-            pyremote.build_bootstrap_source('pyrthing'),
+            *exec_cmd,
         ),
         stdin=subprocess.PIPE,
         stdout=subprocess.PIPE,
@@ -118,7 +129,9 @@ def _inject_update(
     stdin.write(args_bytes)
     stdin.close()
 
-    proc.wait()
+    rc = proc.wait()
+    if rc:
+        raise SystemExit(rc)
 
 
 def inject_dockerdev_secrets(
@@ -126,6 +139,7 @@ def inject_dockerdev_secrets(
         secrets: lang.SequenceNotStr[str | tuple[str, ta.Any]],
         *,
         secrets_file: str | None = None,
+        shift_uid: tuple[int, int] | None = None,
 ) -> None:
     if secrets_file is None:
         secrets_file = os.path.join(
@@ -157,4 +171,5 @@ def inject_dockerdev_secrets(
         container_id,
         secrets_file,
         update,
+        shift_uid=shift_uid,
     )