ominfra 0.0.0.dev372__tar.gz → 0.0.0.dev373__tar.gz

{ominfra-0.0.0.dev372/ominfra.egg-info → ominfra-0.0.0.dev373}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ominfra
-Version: 0.0.0.dev372
+Version: 0.0.0.dev373
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.13
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev372
-Requires-Dist: omlish==0.0.0.dev372
+Requires-Dist: omdev==0.0.0.dev373
+Requires-Dist: omlish==0.0.0.dev373
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.21; extra == "all"

{ominfra-0.0.0.dev372 → ominfra-0.0.0.dev373}/ominfra/scripts/journald2aws.py

@@ -3423,7 +3423,6 @@ class aclosing(contextlib.AbstractAsyncContextManager):  # noqa
 """
 TODO:
  - pickle stdlib objs? have to pin to 3.8 pickle protocol, will be cross-version
- - literals
  - Options.sequence_cls = list, mapping_cls = dict, ... - def with_mutable_containers() -> Options
 """
 
@@ -3537,6 +3536,28 @@ class OptionalObjMarshaler(ObjMarshaler):
         return self.item.unmarshal(o, ctx)
 
 
+@dc.dataclass(frozen=True)
+class PrimitiveUnionObjMarshaler(ObjMarshaler):
+    pt: ta.Tuple[type, ...]
+    x: ta.Optional[ObjMarshaler] = None
+
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        if isinstance(o, self.pt):
+            return o
+        elif self.x is not None:
+            return self.x.marshal(o, ctx)
+        else:
+            raise TypeError(o)
+
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        if isinstance(o, self.pt):
+            return o
+        elif self.x is not None:
+            return self.x.unmarshal(o, ctx)
+        else:
+            raise TypeError(o)
+
+
 @dc.dataclass(frozen=True)
 class LiteralObjMarshaler(ObjMarshaler):
     item: ObjMarshaler
@@ -3735,6 +3756,13 @@ _OBJ_MARSHALER_GENERIC_ITERABLE_TYPES: ta.Dict[ta.Any, type] = {
     collections.abc.MutableSequence: list,
 }
 
+_OBJ_MARSHALER_PRIMITIVE_TYPES: ta.Set[type] = {
+    int,
+    float,
+    bool,
+    str,
+}
+
 
 ##
 
@@ -3883,8 +3911,16 @@ class ObjMarshalerManager:
 
         if is_literal_type(ty):
             lvs = frozenset(get_literal_type_args(ty))
+            if None in lvs:
+                is_opt = True
+                lvs -= frozenset([None])
+            else:
+                is_opt = False
             lty = check.single(set(map(type, lvs)))
-            return LiteralObjMarshaler(rec(lty), lvs)
+            lm: ObjMarshaler = LiteralObjMarshaler(rec(lty), lvs)
+            if is_opt:
+                lm = OptionalObjMarshaler(lm)
+            return lm
 
         if is_generic_alias(ty):
             try:
@@ -3904,7 +3940,31 @@ class ObjMarshalerManager:
                 return IterableObjMarshaler(st, rec(e))
 
             if is_union_alias(ty):
-                return OptionalObjMarshaler(rec(get_optional_alias_arg(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))
+                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)
 

{ominfra-0.0.0.dev372 → ominfra-0.0.0.dev373}/ominfra/scripts/manage.py

@@ -7211,7 +7211,6 @@ inj = InjectionApi()
 """
 TODO:
  - pickle stdlib objs? have to pin to 3.8 pickle protocol, will be cross-version
- - literals
  - Options.sequence_cls = list, mapping_cls = dict, ... - def with_mutable_containers() -> Options
 """
 
@@ -7325,6 +7324,28 @@ class OptionalObjMarshaler(ObjMarshaler):
         return self.item.unmarshal(o, ctx)
 
 
+@dc.dataclass(frozen=True)
+class PrimitiveUnionObjMarshaler(ObjMarshaler):
+    pt: ta.Tuple[type, ...]
+    x: ta.Optional[ObjMarshaler] = None
+
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        if isinstance(o, self.pt):
+            return o
+        elif self.x is not None:
+            return self.x.marshal(o, ctx)
+        else:
+            raise TypeError(o)
+
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        if isinstance(o, self.pt):
+            return o
+        elif self.x is not None:
+            return self.x.unmarshal(o, ctx)
+        else:
+            raise TypeError(o)
+
+
 @dc.dataclass(frozen=True)
 class LiteralObjMarshaler(ObjMarshaler):
     item: ObjMarshaler
@@ -7523,6 +7544,13 @@ _OBJ_MARSHALER_GENERIC_ITERABLE_TYPES: ta.Dict[ta.Any, type] = {
     collections.abc.MutableSequence: list,
 }
 
+_OBJ_MARSHALER_PRIMITIVE_TYPES: ta.Set[type] = {
+    int,
+    float,
+    bool,
+    str,
+}
+
 
 ##
 
@@ -7671,8 +7699,16 @@ class ObjMarshalerManager:
 
         if is_literal_type(ty):
             lvs = frozenset(get_literal_type_args(ty))
+            if None in lvs:
+                is_opt = True
+                lvs -= frozenset([None])
+            else:
+                is_opt = False
             lty = check.single(set(map(type, lvs)))
-            return LiteralObjMarshaler(rec(lty), lvs)
+            lm: ObjMarshaler = LiteralObjMarshaler(rec(lty), lvs)
+            if is_opt:
+                lm = OptionalObjMarshaler(lm)
+            return lm
 
         if is_generic_alias(ty):
             try:
@@ -7692,7 +7728,31 @@ class ObjMarshalerManager:
                 return IterableObjMarshaler(st, rec(e))
 
             if is_union_alias(ty):
-                return OptionalObjMarshaler(rec(get_optional_alias_arg(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))
+                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)
 

{ominfra-0.0.0.dev372 → ominfra-0.0.0.dev373}/ominfra/scripts/supervisor.py

@@ -5902,7 +5902,6 @@ inj = InjectionApi()
 """
 TODO:
  - pickle stdlib objs? have to pin to 3.8 pickle protocol, will be cross-version
- - literals
  - Options.sequence_cls = list, mapping_cls = dict, ... - def with_mutable_containers() -> Options
 """
 
@@ -6016,6 +6015,28 @@ class OptionalObjMarshaler(ObjMarshaler):
         return self.item.unmarshal(o, ctx)
 
 
+@dc.dataclass(frozen=True)
+class PrimitiveUnionObjMarshaler(ObjMarshaler):
+    pt: ta.Tuple[type, ...]
+    x: ta.Optional[ObjMarshaler] = None
+
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        if isinstance(o, self.pt):
+            return o
+        elif self.x is not None:
+            return self.x.marshal(o, ctx)
+        else:
+            raise TypeError(o)
+
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        if isinstance(o, self.pt):
+            return o
+        elif self.x is not None:
+            return self.x.unmarshal(o, ctx)
+        else:
+            raise TypeError(o)
+
+
 @dc.dataclass(frozen=True)
 class LiteralObjMarshaler(ObjMarshaler):
     item: ObjMarshaler
@@ -6214,6 +6235,13 @@ _OBJ_MARSHALER_GENERIC_ITERABLE_TYPES: ta.Dict[ta.Any, type] = {
     collections.abc.MutableSequence: list,
 }
 
+_OBJ_MARSHALER_PRIMITIVE_TYPES: ta.Set[type] = {
+    int,
+    float,
+    bool,
+    str,
+}
+
 
 ##
 
@@ -6362,8 +6390,16 @@ class ObjMarshalerManager:
 
         if is_literal_type(ty):
             lvs = frozenset(get_literal_type_args(ty))
+            if None in lvs:
+                is_opt = True
+                lvs -= frozenset([None])
+            else:
+                is_opt = False
             lty = check.single(set(map(type, lvs)))
-            return LiteralObjMarshaler(rec(lty), lvs)
+            lm: ObjMarshaler = LiteralObjMarshaler(rec(lty), lvs)
+            if is_opt:
+                lm = OptionalObjMarshaler(lm)
+            return lm
 
         if is_generic_alias(ty):
             try:
@@ -6383,7 +6419,31 @@ class ObjMarshalerManager:
                 return IterableObjMarshaler(st, rec(e))
 
             if is_union_alias(ty):
-                return OptionalObjMarshaler(rec(get_optional_alias_arg(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))
+                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)
 

{ominfra-0.0.0.dev372 → ominfra-0.0.0.dev373/ominfra.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ominfra
-Version: 0.0.0.dev372
+Version: 0.0.0.dev373
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.13
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev372
-Requires-Dist: omlish==0.0.0.dev372
+Requires-Dist: omdev==0.0.0.dev373
+Requires-Dist: omlish==0.0.0.dev373
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.21; extra == "all"

{ominfra-0.0.0.dev372 → ominfra-0.0.0.dev373}/ominfra.egg-info/requires.txt

@@ -1,5 +1,5 @@
-omdev==0.0.0.dev372
-omlish==0.0.0.dev372
+omdev==0.0.0.dev373
+omlish==0.0.0.dev373
 
 [all]
 paramiko~=3.5

{ominfra-0.0.0.dev372 → ominfra-0.0.0.dev373}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.13'
-version = '0.0.0.dev372'
+version = '0.0.0.dev373'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,8 +22,8 @@ classifiers = [
 ]
 description = 'ominfra'
 dependencies = [
-    'omdev == 0.0.0.dev372',
-    'omlish == 0.0.0.dev372',
+    'omdev == 0.0.0.dev373',
+    'omlish == 0.0.0.dev373',
 ]
 
 [project.optional-dependencies]