omdev 0.0.0.dev402__py3-none-any.whl → 0.0.0.dev403__py3-none-any.whl

omdev/cli/types.py

@@ -1,4 +1,5 @@
 # ruff: noqa: UP007 UP045
+# @omlish-lite
 import dataclasses as dc
 import typing as ta
 

omdev/manifests/_dumping.py

@@ -610,24 +610,40 @@ _GENERIC_ALIAS_TYPES = (
 )
 
 
-def is_generic_alias(obj, *, origin: ta.Any = None) -> bool:
+def is_generic_alias(obj: ta.Any, *, origin: ta.Any = None) -> bool:
     return (
         isinstance(obj, _GENERIC_ALIAS_TYPES) and
         (origin is None or ta.get_origin(obj) is origin)
     )
 
 
-is_union_alias = functools.partial(is_generic_alias, origin=ta.Union)
 is_callable_alias = functools.partial(is_generic_alias, origin=ta.Callable)
 
 
 ##
 
 
+_UNION_ALIAS_ORIGINS = frozenset([
+    ta.get_origin(ta.Optional[int]),
+    *(
+        [
+            ta.get_origin(int | None),
+            ta.get_origin(getattr(ta, 'TypeVar')('_T') | None),
+        ] if sys.version_info >= (3, 10) else ()
+    ),
+])
+
+
+def is_union_alias(obj: ta.Any) -> bool:
+    return ta.get_origin(obj) in _UNION_ALIAS_ORIGINS
+
+
+#
+
+
 def is_optional_alias(spec: ta.Any) -> bool:
     return (
-        isinstance(spec, _GENERIC_ALIAS_TYPES) and  # noqa
-        ta.get_origin(spec) is ta.Union and
+        is_union_alias(spec) and
         len(ta.get_args(spec)) == 2 and
         any(a in (None, type(None)) for a in ta.get_args(spec))
     )
@@ -1304,32 +1320,32 @@ class ObjMarshalerManager:
                 [e] = ta.get_args(ty)
                 return IterableObjMarshaler(st, rec(e))
 
-            if is_union_alias(ty):
-                uts = frozenset(ta.get_args(ty))
-                if None in uts or type(None) in uts:
-                    is_opt = True
-                    uts = frozenset(ut for ut in uts if ut not in (None, type(None)))
-                else:
-                    is_opt = False
+        if is_union_alias(ty):
+            uts = frozenset(ta.get_args(ty))
+            if None in uts or type(None) in uts:
+                is_opt = True
+                uts = frozenset(ut for ut in uts if ut not in (None, type(None)))
+            else:
+                is_opt = False
 
-                um: ObjMarshaler
-                if not uts:
-                    raise TypeError(ty)
-                elif len(uts) == 1:
-                    um = rec(check.single(uts))
+            um: ObjMarshaler
+            if not uts:
+                raise TypeError(ty)
+            elif len(uts) == 1:
+                um = rec(check.single(uts))
+            else:
+                pt = tuple({ut for ut in uts if ut in _OBJ_MARSHALER_PRIMITIVE_TYPES})
+                np_uts = {ut for ut in uts if ut not in _OBJ_MARSHALER_PRIMITIVE_TYPES}
+                if not np_uts:
+                    um = PrimitiveUnionObjMarshaler(pt)
+                elif len(np_uts) == 1:
+                    um = PrimitiveUnionObjMarshaler(pt, x=rec(check.single(np_uts)))
                 else:
-                    pt = tuple({ut for ut in uts if ut in _OBJ_MARSHALER_PRIMITIVE_TYPES})
-                    np_uts = {ut for ut in uts if ut not in _OBJ_MARSHALER_PRIMITIVE_TYPES}
-                    if not np_uts:
-                        um = PrimitiveUnionObjMarshaler(pt)
-                    elif len(np_uts) == 1:
-                        um = PrimitiveUnionObjMarshaler(pt, x=rec(check.single(np_uts)))
-                    else:
-                        raise TypeError(ty)
-
-                if is_opt:
-                    um = OptionalObjMarshaler(um)
-                return um
+                    raise TypeError(ty)
+
+            if is_opt:
+                um = OptionalObjMarshaler(um)
+            return um
 
         raise TypeError(ty)
 

omdev/scripts/ci.py

@@ -1433,24 +1433,40 @@ _GENERIC_ALIAS_TYPES = (
 )
 
 
-def is_generic_alias(obj, *, origin: ta.Any = None) -> bool:
+def is_generic_alias(obj: ta.Any, *, origin: ta.Any = None) -> bool:
     return (
         isinstance(obj, _GENERIC_ALIAS_TYPES) and
         (origin is None or ta.get_origin(obj) is origin)
     )
 
 
-is_union_alias = functools.partial(is_generic_alias, origin=ta.Union)
 is_callable_alias = functools.partial(is_generic_alias, origin=ta.Callable)
 
 
 ##
 
 
+_UNION_ALIAS_ORIGINS = frozenset([
+    ta.get_origin(ta.Optional[int]),
+    *(
+        [
+            ta.get_origin(int | None),
+            ta.get_origin(getattr(ta, 'TypeVar')('_T') | None),
+        ] if sys.version_info >= (3, 10) else ()
+    ),
+])
+
+
+def is_union_alias(obj: ta.Any) -> bool:
+    return ta.get_origin(obj) in _UNION_ALIAS_ORIGINS
+
+
+#
+
+
 def is_optional_alias(spec: ta.Any) -> bool:
     return (
-        isinstance(spec, _GENERIC_ALIAS_TYPES) and  # noqa
-        ta.get_origin(spec) is ta.Union and
+        is_union_alias(spec) and
         len(ta.get_args(spec)) == 2 and
         any(a in (None, type(None)) for a in ta.get_args(spec))
     )
@@ -2830,6 +2846,7 @@ def _get_argparse_arg_ann_kwargs(ann: ta.Any) -> ta.Mapping[str, ta.Any]:
 class _ArgparseCliAnnotationBox:
     def __init__(self, annotations: ta.Mapping[str, ta.Any]) -> None:
         super().__init__()
+
         self.__annotations__ = annotations  # type: ignore
 
 
@@ -5269,32 +5286,32 @@ class ObjMarshalerManager:
                 [e] = ta.get_args(ty)
                 return IterableObjMarshaler(st, rec(e))
 
-            if is_union_alias(ty):
-                uts = frozenset(ta.get_args(ty))
-                if None in uts or type(None) in uts:
-                    is_opt = True
-                    uts = frozenset(ut for ut in uts if ut not in (None, type(None)))
-                else:
-                    is_opt = False
+        if is_union_alias(ty):
+            uts = frozenset(ta.get_args(ty))
+            if None in uts or type(None) in uts:
+                is_opt = True
+                uts = frozenset(ut for ut in uts if ut not in (None, type(None)))
+            else:
+                is_opt = False
 
-                um: ObjMarshaler
-                if not uts:
-                    raise TypeError(ty)
-                elif len(uts) == 1:
-                    um = rec(check.single(uts))
+            um: ObjMarshaler
+            if not uts:
+                raise TypeError(ty)
+            elif len(uts) == 1:
+                um = rec(check.single(uts))
+            else:
+                pt = tuple({ut for ut in uts if ut in _OBJ_MARSHALER_PRIMITIVE_TYPES})
+                np_uts = {ut for ut in uts if ut not in _OBJ_MARSHALER_PRIMITIVE_TYPES}
+                if not np_uts:
+                    um = PrimitiveUnionObjMarshaler(pt)
+                elif len(np_uts) == 1:
+                    um = PrimitiveUnionObjMarshaler(pt, x=rec(check.single(np_uts)))
                 else:
-                    pt = tuple({ut for ut in uts if ut in _OBJ_MARSHALER_PRIMITIVE_TYPES})
-                    np_uts = {ut for ut in uts if ut not in _OBJ_MARSHALER_PRIMITIVE_TYPES}
-                    if not np_uts:
-                        um = PrimitiveUnionObjMarshaler(pt)
-                    elif len(np_uts) == 1:
-                        um = PrimitiveUnionObjMarshaler(pt, x=rec(check.single(np_uts)))
-                    else:
-                        raise TypeError(ty)
+                    raise TypeError(ty)
 
-                if is_opt:
-                    um = OptionalObjMarshaler(um)
-                return um
+            if is_opt:
+                um = OptionalObjMarshaler(um)
+            return um
 
         raise TypeError(ty)
 

omdev/scripts/interp.py

@@ -1301,24 +1301,40 @@ _GENERIC_ALIAS_TYPES = (
 )
 
 
-def is_generic_alias(obj, *, origin: ta.Any = None) -> bool:
+def is_generic_alias(obj: ta.Any, *, origin: ta.Any = None) -> bool:
     return (
         isinstance(obj, _GENERIC_ALIAS_TYPES) and
         (origin is None or ta.get_origin(obj) is origin)
     )
 
 
-is_union_alias = functools.partial(is_generic_alias, origin=ta.Union)
 is_callable_alias = functools.partial(is_generic_alias, origin=ta.Callable)
 
 
 ##
 
 
+_UNION_ALIAS_ORIGINS = frozenset([
+    ta.get_origin(ta.Optional[int]),
+    *(
+        [
+            ta.get_origin(int | None),
+            ta.get_origin(getattr(ta, 'TypeVar')('_T') | None),
+        ] if sys.version_info >= (3, 10) else ()
+    ),
+])
+
+
+def is_union_alias(obj: ta.Any) -> bool:
+    return ta.get_origin(obj) in _UNION_ALIAS_ORIGINS
+
+
+#
+
+
 def is_optional_alias(spec: ta.Any) -> bool:
     return (
-        isinstance(spec, _GENERIC_ALIAS_TYPES) and  # noqa
-        ta.get_origin(spec) is ta.Union and
+        is_union_alias(spec) and
         len(ta.get_args(spec)) == 2 and
         any(a in (None, type(None)) for a in ta.get_args(spec))
     )
@@ -2441,6 +2457,7 @@ def _get_argparse_arg_ann_kwargs(ann: ta.Any) -> ta.Mapping[str, ta.Any]:
 class _ArgparseCliAnnotationBox:
     def __init__(self, annotations: ta.Mapping[str, ta.Any]) -> None:
         super().__init__()
+
         self.__annotations__ = annotations  # type: ignore
 
 

omdev/scripts/pyproject.py

@@ -2731,24 +2731,40 @@ _GENERIC_ALIAS_TYPES = (
 )
 
 
-def is_generic_alias(obj, *, origin: ta.Any = None) -> bool:
+def is_generic_alias(obj: ta.Any, *, origin: ta.Any = None) -> bool:
     return (
         isinstance(obj, _GENERIC_ALIAS_TYPES) and
         (origin is None or ta.get_origin(obj) is origin)
     )
 
 
-is_union_alias = functools.partial(is_generic_alias, origin=ta.Union)
 is_callable_alias = functools.partial(is_generic_alias, origin=ta.Callable)
 
 
 ##
 
 
+_UNION_ALIAS_ORIGINS = frozenset([
+    ta.get_origin(ta.Optional[int]),
+    *(
+        [
+            ta.get_origin(int | None),
+            ta.get_origin(getattr(ta, 'TypeVar')('_T') | None),
+        ] if sys.version_info >= (3, 10) else ()
+    ),
+])
+
+
+def is_union_alias(obj: ta.Any) -> bool:
+    return ta.get_origin(obj) in _UNION_ALIAS_ORIGINS
+
+
+#
+
+
 def is_optional_alias(spec: ta.Any) -> bool:
     return (
-        isinstance(spec, _GENERIC_ALIAS_TYPES) and  # noqa
-        ta.get_origin(spec) is ta.Union and
+        is_union_alias(spec) and
         len(ta.get_args(spec)) == 2 and
         any(a in (None, type(None)) for a in ta.get_args(spec))
     )
@@ -3151,6 +3167,16 @@ class Func3(ta.Generic[A0, A1, A2, T]):
         return self.fn(a0, a1, a2)
 
 
+##
+
+
+_TYPING_ANNOTATIONS_ATTR = '__annotate__' if sys.version_info >= (3, 14) else '__annotations__'
+
+
+def typing_annotations_attr() -> str:
+    return _TYPING_ANNOTATIONS_ATTR
+
+
 ########################################
 # ../../../omlish/logs/filters.py
 
@@ -4233,6 +4259,7 @@ def _get_argparse_arg_ann_kwargs(ann: ta.Any) -> ta.Mapping[str, ta.Any]:
 class _ArgparseCliAnnotationBox:
     def __init__(self, annotations: ta.Mapping[str, ta.Any]) -> None:
         super().__init__()
+
         self.__annotations__ = annotations  # type: ignore
 
 
@@ -6024,32 +6051,32 @@ class ObjMarshalerManager:
                 [e] = ta.get_args(ty)
                 return IterableObjMarshaler(st, rec(e))
 
-            if is_union_alias(ty):
-                uts = frozenset(ta.get_args(ty))
-                if None in uts or type(None) in uts:
-                    is_opt = True
-                    uts = frozenset(ut for ut in uts if ut not in (None, type(None)))
-                else:
-                    is_opt = False
+        if is_union_alias(ty):
+            uts = frozenset(ta.get_args(ty))
+            if None in uts or type(None) in uts:
+                is_opt = True
+                uts = frozenset(ut for ut in uts if ut not in (None, type(None)))
+            else:
+                is_opt = False
 
-                um: ObjMarshaler
-                if not uts:
-                    raise TypeError(ty)
-                elif len(uts) == 1:
-                    um = rec(check.single(uts))
+            um: ObjMarshaler
+            if not uts:
+                raise TypeError(ty)
+            elif len(uts) == 1:
+                um = rec(check.single(uts))
+            else:
+                pt = tuple({ut for ut in uts if ut in _OBJ_MARSHALER_PRIMITIVE_TYPES})
+                np_uts = {ut for ut in uts if ut not in _OBJ_MARSHALER_PRIMITIVE_TYPES}
+                if not np_uts:
+                    um = PrimitiveUnionObjMarshaler(pt)
+                elif len(np_uts) == 1:
+                    um = PrimitiveUnionObjMarshaler(pt, x=rec(check.single(np_uts)))
                 else:
-                    pt = tuple({ut for ut in uts if ut in _OBJ_MARSHALER_PRIMITIVE_TYPES})
-                    np_uts = {ut for ut in uts if ut not in _OBJ_MARSHALER_PRIMITIVE_TYPES}
-                    if not np_uts:
-                        um = PrimitiveUnionObjMarshaler(pt)
-                    elif len(np_uts) == 1:
-                        um = PrimitiveUnionObjMarshaler(pt, x=rec(check.single(np_uts)))
-                    else:
-                        raise TypeError(ty)
+                    raise TypeError(ty)
 
-                if is_opt:
-                    um = OptionalObjMarshaler(um)
-                return um
+            if is_opt:
+                um = OptionalObjMarshaler(um)
+            return um
 
         raise TypeError(ty)
 

{omdev-0.0.0.dev402.dist-info → omdev-0.0.0.dev403.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev402
+Version: 0.0.0.dev403
 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.dev402
+Requires-Dist: omlish==0.0.0.dev403
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev402.dist-info → omdev-0.0.0.dev403.dist-info}/RECORD

@@ -115,7 +115,7 @@ omdev/cli/clicli.py,sha256=TZnQYHyyh97B6N_pVYYduYgt03s8Yp5mrJ7wblXWSWY,6308
 omdev/cli/install.py,sha256=oB34AOwu07sqEztW_z5mgorAFoP_Tw556XiTPj2WSM0,4904
 omdev/cli/main.py,sha256=eUvc64Wi6ROcSG7V_yzrmhpY2CgR12cyz9eJGXE0xlI,6885
 omdev/cli/managers.py,sha256=BV98_n30Jj63OJrFgRoVZRfICxMLXEZKoEn4rMj9LV4,1160
-omdev/cli/types.py,sha256=SH88B81otsSYNM-PM3Ry1wgLLvyg2M6fBJkWOajWIWM,485
+omdev/cli/types.py,sha256=zRSq-SVr43zhXs8dTgkpD9kot9iOFJB8KzfEUnNE7_0,500
 omdev/clipboard/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/clipboard/clipboard.py,sha256=9HFpcijpn0XDTI89ZRm2WA1G7O4HsTdVXZHqMULu3N0,1630
 omdev/clipboard/darwin_cf.py,sha256=LhJ9aB_tpXBltOTo2e8687g6D8bQIV9Q7eAIP_NHb64,4821
@@ -181,7 +181,7 @@ omdev/magic/prepare.py,sha256=SEOK-bl4zDxq0aphYXsEI-hCjbkV908VNnJt-dk0kL4,594
 omdev/magic/styles.py,sha256=6LAL7XR3fkkH2rh-8nwUvdCYVHBkQxCfP0oEuPuw1Bg,670
 omdev/manifests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/manifests/__main__.py,sha256=JqyVDyV7_jo-NZ3wSs5clDU_xCMlxzJv-XFohoZWQ7E,174
-omdev/manifests/_dumping.py,sha256=RyphKkXhTnb8zWqcWjAR-GN8vNbBM9-PrZ3fJEvF1RE,44230
+omdev/manifests/_dumping.py,sha256=9wNzlpEn5O9aI7Y9Y1klEmRmJzGJ3EauC5Q85YlrcK4,44356
 omdev/manifests/building.py,sha256=O-SBzMfqXAfLVunQJ29fzV6zCaMrrM3lVpf7iFHCxuM,13568
 omdev/manifests/dumping.py,sha256=WF911eYL3LT6powrQT3w83XIM_RdExDgTSsGiNomSIo,4506
 omdev/manifests/main.py,sha256=mYb8iM5bdwaO8jSd9_hIBSoYLf2h7e0iLb9aCCbgJ6c,2175
@@ -270,9 +270,9 @@ omdev/pyproject/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 omdev/pyproject/resources/docker-dev.sh,sha256=DHkz5D18jok_oDolfg2mqrvGRWFoCe9GQo04dR1czcc,838
 omdev/pyproject/resources/python.sh,sha256=rFaN4SiJ9hdLDXXsDTwugI6zsw6EPkgYMmtacZeTbvw,749
 omdev/scripts/__init__.py,sha256=MKCvUAEQwsIvwLixwtPlpBqmkMXLCnjjXyAXvVpDwVk,91
-omdev/scripts/ci.py,sha256=0a_DmI9q44dl9wvE64IvJwbMICVFC0O5cj3LCZC5EJs,362536
-omdev/scripts/interp.py,sha256=2xNG-ObiPC-F5eV_nTHq2u-V3Hyuo_6KblPFCBhm2mA,158487
-omdev/scripts/pyproject.py,sha256=DL5q2gsnGChTTuzSHn1PprW2kl3ti_K60JXnKLZdA40,269992
+omdev/scripts/ci.py,sha256=9amwcmO6M05Ek8x8hZp8SQa2Wmn7p1PTRAkkcFzeLmI,362663
+omdev/scripts/interp.py,sha256=8FR5-a95K1bL7YHNBiX1XVDPYhqw_jTWz8mVNDts6pI,158710
+omdev/scripts/pyproject.py,sha256=qgAW607OVKaeGma7XuxzyhuFyJLoKIcT9nZ52cl3KKU,270298
 omdev/scripts/slowcat.py,sha256=lssv4yrgJHiWfOiHkUut2p8E8Tq32zB-ujXESQxFFHY,2728
 omdev/scripts/tmpexec.py,sha256=WTYcf56Tj2qjYV14AWmV8SfT0u6Y8eIU6cKgQRvEK3c,1442
 omdev/tokens/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -321,9 +321,9 @@ omdev/tools/jsonview/resources/jsonview.js,sha256=faDvXDOXKvEvjOuIlz4D3F2ReQXb_b
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=ao5mdrpiSU4AZ8mBozoEaV3UVlmVTnRG9wD9XP70MZE,11429
-omdev-0.0.0.dev402.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev402.dist-info/METADATA,sha256=NSrfHyOvXGiauuH9ltyPzqWQ1veikE4EzE7YjCxXymg,5094
-omdev-0.0.0.dev402.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omdev-0.0.0.dev402.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev402.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev402.dist-info/RECORD,,
+omdev-0.0.0.dev403.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev403.dist-info/METADATA,sha256=ilWFWwezMzIvBE3z16V9e_7s9VSH7Q3LaJaX4YuRyrk,5094
+omdev-0.0.0.dev403.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omdev-0.0.0.dev403.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev403.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev403.dist-info/RECORD,,