ominfra 0.0.0.dev62__py3-none-any.whl → 0.0.0.dev64__py3-none-any.whl

ominfra/deploy/_executor.py

@@ -740,29 +740,30 @@ def register_opj_marshaler(ty: ta.Any, m: ObjMarshaler) -> None:
 
 
 def _make_obj_marshaler(ty: ta.Any) -> ObjMarshaler:
-    if isinstance(ty, type) and abc.ABC in ty.__bases__:
-        impls = [  # type: ignore
-            PolymorphicObjMarshaler.Impl(
-                ity,
-                ity.__qualname__,
-                get_obj_marshaler(ity),
+    if isinstance(ty, type):
+        if abc.ABC in ty.__bases__:
+            impls = [  # type: ignore
+                PolymorphicObjMarshaler.Impl(
+                    ity,
+                    ity.__qualname__,
+                    get_obj_marshaler(ity),
+                )
+                for ity in deep_subclasses(ty)
+                if abc.ABC not in ity.__bases__
+            ]
+            return PolymorphicObjMarshaler(
+                {i.ty: i for i in impls},
+                {i.tag: i for i in impls},
             )
-            for ity in deep_subclasses(ty)
-            if abc.ABC not in ity.__bases__
-        ]
-        return PolymorphicObjMarshaler(
-            {i.ty: i for i in impls},
-            {i.tag: i for i in impls},
-        )
 
-    if isinstance(ty, type) and issubclass(ty, enum.Enum):
-        return EnumObjMarshaler(ty)
+        if issubclass(ty, enum.Enum):
+            return EnumObjMarshaler(ty)
 
-    if dc.is_dataclass(ty):
-        return DataclassObjMarshaler(
-            ty,
-            {f.name: get_obj_marshaler(f.type) for f in dc.fields(ty)},
-        )
+        if dc.is_dataclass(ty):
+            return DataclassObjMarshaler(
+                ty,
+                {f.name: get_obj_marshaler(f.type) for f in dc.fields(ty)},
+            )
 
     if is_generic_alias(ty):
         try:

ominfra/pyremote/_runcommands.py

@@ -823,29 +823,30 @@ def register_opj_marshaler(ty: ta.Any, m: ObjMarshaler) -> None:
 
 
 def _make_obj_marshaler(ty: ta.Any) -> ObjMarshaler:
-    if isinstance(ty, type) and abc.ABC in ty.__bases__:
-        impls = [  # type: ignore
-            PolymorphicObjMarshaler.Impl(
-                ity,
-                ity.__qualname__,
-                get_obj_marshaler(ity),
+    if isinstance(ty, type):
+        if abc.ABC in ty.__bases__:
+            impls = [  # type: ignore
+                PolymorphicObjMarshaler.Impl(
+                    ity,
+                    ity.__qualname__,
+                    get_obj_marshaler(ity),
+                )
+                for ity in deep_subclasses(ty)
+                if abc.ABC not in ity.__bases__
+            ]
+            return PolymorphicObjMarshaler(
+                {i.ty: i for i in impls},
+                {i.tag: i for i in impls},
             )
-            for ity in deep_subclasses(ty)
-            if abc.ABC not in ity.__bases__
-        ]
-        return PolymorphicObjMarshaler(
-            {i.ty: i for i in impls},
-            {i.tag: i for i in impls},
-        )
 
-    if isinstance(ty, type) and issubclass(ty, enum.Enum):
-        return EnumObjMarshaler(ty)
+        if issubclass(ty, enum.Enum):
+            return EnumObjMarshaler(ty)
 
-    if dc.is_dataclass(ty):
-        return DataclassObjMarshaler(
-            ty,
-            {f.name: get_obj_marshaler(f.type) for f in dc.fields(ty)},
-        )
+        if dc.is_dataclass(ty):
+            return DataclassObjMarshaler(
+                ty,
+                {f.name: get_obj_marshaler(f.type) for f in dc.fields(ty)},
+            )
 
     if is_generic_alias(ty):
         try:

{ominfra-0.0.0.dev62.dist-info → ominfra-0.0.0.dev64.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev62
+Version: 0.0.0.dev64
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: ~=3.12
 License-File: LICENSE
-Requires-Dist: omdev ==0.0.0.dev62
-Requires-Dist: omlish ==0.0.0.dev62
+Requires-Dist: omdev ==0.0.0.dev64
+Requires-Dist: omlish ==0.0.0.dev64
 Provides-Extra: all
 Requires-Dist: paramiko ~=3.5 ; extra == 'all'
 Requires-Dist: asyncssh ~=2.17 ; (python_version < "3.13") and extra == 'all'

{ominfra-0.0.0.dev62.dist-info → ominfra-0.0.0.dev64.dist-info}/RECORD

@@ -10,7 +10,7 @@ ominfra/clouds/aws/auth.py,sha256=EW3lK1U0hnjXkTn1KWJeuv9GG0ibbKdvgLD0P6HJtwo,55
 ominfra/clouds/aws/cli.py,sha256=OJVVLIwSy1378drkgP1ke_JltbyzBmnrB_Lom6A83os,510
 ominfra/clouds/aws/metadata.py,sha256=XR1BuMdQheyeFjjA3MN8GCNWVAp5ahoPdbWXEmViutQ,2767
 ominfra/deploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/deploy/_executor.py,sha256=3mUpHetUu9POcV3nLu8NlVnK4-jzRYHVnnT8uyZPfSA,32506
+ominfra/deploy/_executor.py,sha256=Xoib_itZzHzAQJ-AuJ2VVmGW5TG20DxUDaeDRbfs5cQ,32569
 ominfra/deploy/configs.py,sha256=qi0kwT7G2NH7dXLOQic-u6R3yeadup_QtvrjwWIggbM,435
 ominfra/deploy/remote.py,sha256=6ACmpXU1uBdyGs3Xsp97ktKFq30cJlzN9LRWNUWlGY4,2144
 ominfra/deploy/executor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -39,16 +39,16 @@ ominfra/deploy/poly/venv.py,sha256=BoipDEa4NTeodjf3L57KJfq9eGKLagFNKwD8pS4yrzA,1
 ominfra/manage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/manage/manage.py,sha256=BttL8LFEknHZE_h2Pt5dAqbfUkv6qy43WI0raXBZ1a8,151
 ominfra/pyremote/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/pyremote/_runcommands.py,sha256=gxmbQYUwi51ekiVtwciY18_8Vx7pzgeIycAgaZeTxlQ,26342
+ominfra/pyremote/_runcommands.py,sha256=nPtvx_oFHIViYb7V0ius23TF_2_SmEfDzdxa1_5LISc,26405
 ominfra/pyremote/bootstrap.py,sha256=RvMO3YGaN1E4sgUi1JEtiPak8cjvqtc_vRCq1yqbeZg,3370
 ominfra/pyremote/runcommands.py,sha256=bviS0_TDIoZVAe4h-_iavbvJtVSFu8lnk7fQ5iasCWE,1571
 ominfra/tailscale/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tailscale/cli.py,sha256=Ltg6RVFsMLLPjLzoGwM6sxjmwjEVEYHAdrqmCc4N1HM,3174
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=L4t5rszm9ulcdWyr7n48_R9d5Etg4S2a4WQhlbHDtnQ,6106
-ominfra-0.0.0.dev62.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev62.dist-info/METADATA,sha256=uHYbpBeq3qcyv6ojGN_ub5jk8u7MML1043jBxeS5pMY,799
-ominfra-0.0.0.dev62.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-ominfra-0.0.0.dev62.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev62.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev62.dist-info/RECORD,,
+ominfra-0.0.0.dev64.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev64.dist-info/METADATA,sha256=EsQoc-53U3y019dx7smG7X1WvJwbL8TlzHY-M7dR8tE,799
+ominfra-0.0.0.dev64.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+ominfra-0.0.0.dev64.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev64.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev64.dist-info/RECORD,,