ominfra 0.0.0.dev402__tar.gz → 0.0.0.dev404__tar.gz

{ominfra-0.0.0.dev402/ominfra.egg-info → ominfra-0.0.0.dev404}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ominfra
-Version: 0.0.0.dev402
+Version: 0.0.0.dev404
 Summary: ominfra
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,8 +14,8 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev402
-Requires-Dist: omlish==0.0.0.dev402
+Requires-Dist: omdev==0.0.0.dev404
+Requires-Dist: omlish==0.0.0.dev404
 Provides-Extra: all
 Requires-Dist: paramiko~=4.0; extra == "all"
 Requires-Dist: asyncssh~=2.21; extra == "all"

{ominfra-0.0.0.dev402 → ominfra-0.0.0.dev404}/ominfra/scripts/journald2aws.py

@@ -1781,24 +1781,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))
     )
@@ -3943,32 +3959,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)
 

{ominfra-0.0.0.dev402 → ominfra-0.0.0.dev404}/ominfra/scripts/manage.py

@@ -3216,24 +3216,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))
     )
@@ -3650,6 +3666,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
 
@@ -5669,6 +5695,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
 
 
@@ -7883,32 +7910,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)
 

{ominfra-0.0.0.dev402 → ominfra-0.0.0.dev404}/ominfra/scripts/supervisor.py

@@ -2760,24 +2760,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))
     )
@@ -2981,6 +2997,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
 
@@ -6422,32 +6448,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)
 

{ominfra-0.0.0.dev402 → ominfra-0.0.0.dev404/ominfra.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ominfra
-Version: 0.0.0.dev402
+Version: 0.0.0.dev404
 Summary: ominfra
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,8 +14,8 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev402
-Requires-Dist: omlish==0.0.0.dev402
+Requires-Dist: omdev==0.0.0.dev404
+Requires-Dist: omlish==0.0.0.dev404
 Provides-Extra: all
 Requires-Dist: paramiko~=4.0; extra == "all"
 Requires-Dist: asyncssh~=2.21; extra == "all"

{ominfra-0.0.0.dev402 → ominfra-0.0.0.dev404}/ominfra.egg-info/requires.txt

@@ -1,5 +1,5 @@
-omdev==0.0.0.dev402
-omlish==0.0.0.dev402
+omdev==0.0.0.dev404
+omlish==0.0.0.dev404
 
 [all]
 paramiko~=4.0

{ominfra-0.0.0.dev402 → ominfra-0.0.0.dev404}/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.dev402'
+version = '0.0.0.dev404'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,8 +24,8 @@ classifiers = [
 ]
 description = 'ominfra'
 dependencies = [
-    'omdev == 0.0.0.dev402',
-    'omlish == 0.0.0.dev402',
+    'omdev == 0.0.0.dev404',
+    'omlish == 0.0.0.dev404',
 ]
 
 [project.optional-dependencies]