omdev 0.0.0.dev154__py3-none-any.whl → 0.0.0.dev155__py3-none-any.whl

omdev/.manifests.json

@@ -255,7 +255,7 @@
     "module": ".tools.docker",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/docker.py",
-    "line": 249,
+    "line": 258,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "docker",

omdev/manifests/__init__.py

@@ -0,0 +1 @@
+# @omlish-lite

omdev/manifests/build.py

@@ -1,5 +1,4 @@
 # ruff: noqa: UP006 UP007
-# @omlish-lite
 """
 TODO:
  - verify classes instantiate

omdev/manifests/main.py

@@ -1,3 +1,4 @@
+# ruff: noqa: UP006 UP007
 import argparse
 import asyncio
 import dataclasses as dc

omdev/scripts/interp.py

@@ -560,8 +560,6 @@ def async_cached_nullary(fn):  # ta.Callable[..., T]) -> ta.Callable[..., T]:
 """
 TODO:
  - def maybe(v: lang.Maybe[T])
- - patch / override lite.check ?
-  - checker interface?
 """
 
 
@@ -2408,6 +2406,13 @@ async def asyncio_subprocess_communicate(
     return await AsyncioProcessCommunicator(proc).communicate(input, timeout)  # noqa
 
 
+@dc.dataclass(frozen=True)
+class AsyncioSubprocessOutput:
+    proc: asyncio.subprocess.Process
+    stdout: ta.Optional[bytes]
+    stderr: ta.Optional[bytes]
+
+
 async def asyncio_subprocess_run(
         *args: str,
         input: ta.Any = None,  # noqa
@@ -2415,7 +2420,7 @@ async def asyncio_subprocess_run(
         check: bool = False,  # noqa
         capture_output: ta.Optional[bool] = None,
         **kwargs: ta.Any,
-) -> ta.Tuple[ta.Optional[bytes], ta.Optional[bytes]]:
+) -> AsyncioSubprocessOutput:
     if capture_output:
         kwargs.setdefault('stdout', subprocess.PIPE)
         kwargs.setdefault('stderr', subprocess.PIPE)
@@ -2434,7 +2439,11 @@ async def asyncio_subprocess_run(
             stderr=stderr,
         )
 
-    return stdout, stderr
+    return AsyncioSubprocessOutput(
+        proc,
+        stdout,
+        stderr,
+    )
 
 
 ##
@@ -2447,7 +2456,7 @@ async def asyncio_subprocess_check_call(
         timeout: ta.Optional[float] = None,
         **kwargs: ta.Any,
 ) -> None:
-    _, _ = await asyncio_subprocess_run(
+    await asyncio_subprocess_run(
         *args,
         stdout=stdout,
         input=input,
@@ -2463,7 +2472,7 @@ async def asyncio_subprocess_check_output(
         timeout: ta.Optional[float] = None,
         **kwargs: ta.Any,
 ) -> bytes:
-    stdout, stderr = await asyncio_subprocess_run(
+    out = await asyncio_subprocess_run(
         *args,
         stdout=asyncio.subprocess.PIPE,
         input=input,
@@ -2472,7 +2481,7 @@ async def asyncio_subprocess_check_output(
         **kwargs,
     )
 
-    return check.not_none(stdout)
+    return check.not_none(out.stdout)
 
 
 async def asyncio_subprocess_check_output_str(*args: str, **kwargs: ta.Any) -> str:

omdev/scripts/pyproject.py

@@ -1852,8 +1852,6 @@ def async_cached_nullary(fn):  # ta.Callable[..., T]) -> ta.Callable[..., T]:
 """
 TODO:
  - def maybe(v: lang.Maybe[T])
- - patch / override lite.check ?
-  - checker interface?
 """
 
 
@@ -3756,7 +3754,8 @@ def configure_standard_logging(
 """
 TODO:
  - pickle stdlib objs? have to pin to 3.8 pickle protocol, will be cross-version
- - nonstrict toggle
+ - namedtuple
+ - literals
 """
 
 
@@ -4046,14 +4045,18 @@ class ObjMarshalerManager:
     ) -> ObjMarshaler:
         if isinstance(ty, type):
             if abc.ABC in ty.__bases__:
-                return PolymorphicObjMarshaler.of([  # type: ignore
+                impls = [ity for ity in deep_subclasses(ty) if abc.ABC not in ity.__bases__]  # type: ignore
+                if all(ity.__qualname__.endswith(ty.__name__) for ity in impls):
+                    ins = {ity: snake_case(ity.__qualname__[:-len(ty.__name__)]) for ity in impls}
+                else:
+                    ins = {ity: ity.__qualname__ for ity in impls}
+                return PolymorphicObjMarshaler.of([
                     PolymorphicObjMarshaler.Impl(
                         ity,
-                        ity.__qualname__,
+                        itn,
                         rec(ity),
                     )
-                    for ity in deep_subclasses(ty)
-                    if abc.ABC not in ity.__bases__
+                    for ity, itn in ins.items()
                 ])
 
             if issubclass(ty, enum.Enum):
@@ -5222,6 +5225,13 @@ async def asyncio_subprocess_communicate(
     return await AsyncioProcessCommunicator(proc).communicate(input, timeout)  # noqa
 
 
+@dc.dataclass(frozen=True)
+class AsyncioSubprocessOutput:
+    proc: asyncio.subprocess.Process
+    stdout: ta.Optional[bytes]
+    stderr: ta.Optional[bytes]
+
+
 async def asyncio_subprocess_run(
         *args: str,
         input: ta.Any = None,  # noqa
@@ -5229,7 +5239,7 @@ async def asyncio_subprocess_run(
         check: bool = False,  # noqa
         capture_output: ta.Optional[bool] = None,
         **kwargs: ta.Any,
-) -> ta.Tuple[ta.Optional[bytes], ta.Optional[bytes]]:
+) -> AsyncioSubprocessOutput:
     if capture_output:
         kwargs.setdefault('stdout', subprocess.PIPE)
         kwargs.setdefault('stderr', subprocess.PIPE)
@@ -5248,7 +5258,11 @@ async def asyncio_subprocess_run(
             stderr=stderr,
         )
 
-    return stdout, stderr
+    return AsyncioSubprocessOutput(
+        proc,
+        stdout,
+        stderr,
+    )
 
 
 ##
@@ -5261,7 +5275,7 @@ async def asyncio_subprocess_check_call(
         timeout: ta.Optional[float] = None,
         **kwargs: ta.Any,
 ) -> None:
-    _, _ = await asyncio_subprocess_run(
+    await asyncio_subprocess_run(
         *args,
         stdout=stdout,
         input=input,
@@ -5277,7 +5291,7 @@ async def asyncio_subprocess_check_output(
         timeout: ta.Optional[float] = None,
         **kwargs: ta.Any,
 ) -> bytes:
-    stdout, stderr = await asyncio_subprocess_run(
+    out = await asyncio_subprocess_run(
         *args,
         stdout=asyncio.subprocess.PIPE,
         input=input,
@@ -5286,7 +5300,7 @@ async def asyncio_subprocess_check_output(
         **kwargs,
     )
 
-    return check.not_none(stdout)
+    return check.not_none(out.stdout)
 
 
 async def asyncio_subprocess_check_output_str(*args: str, **kwargs: ta.Any) -> str:

omdev/tools/docker.py

@@ -232,19 +232,28 @@ class Cli(ap.Cli):
 
             print(f'{svc_name}: {lt}')
 
+    #
+
     @ap.command()
     def dockly(self) -> None:
         os.execl(
             exe := docker_exe(),
             exe,
-            'run',
-            '-it',
-            '--rm',
-            '-v',
-            '/var/run/docker.sock:/var/run/docker.sock',
+            'run', '-it', '--rm',
+            '-v', '/var/run/docker.sock:/var/run/docker.sock',
             'lirantal/dockly',
         )
 
+    @ap.command()
+    def lazy(self) -> None:
+        os.execl(
+            exe := docker_exe(),
+            exe,
+            'run', '-it', '--rm',
+            '-v', '/var/run/docker.sock:/var/run/docker.sock',
+            'lazyteam/lazydocker',
+        )
+
 
 # @omlish-manifest
 _CLI_MODULE = CliModule('docker', __name__)

{omdev-0.0.0.dev154.dist-info → omdev-0.0.0.dev155.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev154
+Version: 0.0.0.dev155
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev154
+Requires-Dist: omlish==0.0.0.dev155
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev154.dist-info → omdev-0.0.0.dev155.dist-info}/RECORD

@@ -1,4 +1,4 @@
-omdev/.manifests.json,sha256=4jOCkBEa4xkYZ8b9N41yqzWfXNvYGetJ8oIOJqkRTIk,8306
+omdev/.manifests.json,sha256=Dm-Nd3V7Ry9d3-tO5OnUM7IYT2_ldruPEjxcSr4BA1U,8306
 omdev/__about__.py,sha256=n5x-SO70OgbDQFzQ1d7sZDVMsnkQc4PxQZPFaIQFa0E,1281
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/bracepy.py,sha256=I8EdqtDvxzAi3I8TuMEW-RBfwXfqKbwp06CfOdj3L1o,2743
@@ -84,10 +84,10 @@ omdev/magic/find.py,sha256=tTmpWXAleaXG3_kNOsRF7s8D0CpYMXbdz6-HbCNBW90,7070
 omdev/magic/magic.py,sha256=h1nxoW6CV1MRCiHjDt3sO4kmG0qTtTRbkDNiPLGo2BE,224
 omdev/magic/prepare.py,sha256=V5jYT2AeFmazzPwk9sNismSouLwFXEoik6FwKcWCNUY,589
 omdev/magic/styles.py,sha256=YQ-HgwfvFWPj-o_705E7A-yehEn1G1hRNLPWpeWCK0U,605
-omdev/manifests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+omdev/manifests/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/manifests/__main__.py,sha256=JqyVDyV7_jo-NZ3wSs5clDU_xCMlxzJv-XFohoZWQ7E,174
-omdev/manifests/build.py,sha256=vGMcQnoZvgnuha-fwq1K1uUojWO0J17b6p9-cRPdmMw,8796
-omdev/manifests/main.py,sha256=hWwaZFWwtCUvaVu-c7DOmGqyS-cUyebYGK006DgTvu0,2096
+omdev/manifests/build.py,sha256=jQoNRSt9_4uh25xtkxzxx7WQ14TOJlHOjz5MGJCAlk4,8781
+omdev/manifests/main.py,sha256=XJ7s97S2GhOpXwrlXRJJkQypkVY_YAXwNdXZIxEl3oA,2122
 omdev/mypy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/mypy/debug.py,sha256=WcZw-3Z1njg_KFGqi3DB6RuqbBa3dLArJnjVCuY1Mn0,3003
 omdev/packaging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -123,8 +123,8 @@ omdev/scripts/bumpversion.py,sha256=Kn7fo73Hs8uJh3Hi3EIyLOlzLPWAC6dwuD_lZ3cIzuY,
 omdev/scripts/execrss.py,sha256=mR0G0wERBYtQmVIn63lCIIFb5zkCM6X_XOENDFYDBKc,651
 omdev/scripts/exectime.py,sha256=sFb376GflU6s9gNX-2-we8hgH6w5MuQNS9g6i4SqJIo,610
 omdev/scripts/importtrace.py,sha256=oa7CtcWJVMNDbyIEiRHej6ICfABfErMeo4_haIqe18Q,14041
-omdev/scripts/interp.py,sha256=ux5BECj6yHWWeJp7DJyOI9343qTUua2KJcakm_HjO6M,96486
-omdev/scripts/pyproject.py,sha256=HUPHXgADQS1tvo3ZB-2jbz6QvWKb6bpVf0TWpn9UFwI,210068
+omdev/scripts/interp.py,sha256=VmzTBpR7WkX41z3dlwiodyUidLEC2GjghFcbRTW1mqc,96612
+omdev/scripts/pyproject.py,sha256=v5R_A_y_in7JZbygAWQL4aUYoger0Yqqny5511nlcQk,210494
 omdev/scripts/slowcat.py,sha256=lssv4yrgJHiWfOiHkUut2p8E8Tq32zB-ujXESQxFFHY,2728
 omdev/scripts/tmpexec.py,sha256=WTYcf56Tj2qjYV14AWmV8SfT0u6Y8eIU6cKgQRvEK3c,1442
 omdev/toml/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -133,7 +133,7 @@ omdev/toml/writer.py,sha256=lk3on3YXVbWuLJa-xsOzOhs1bBAT1vXqw4mBbluZl_w,3040
 omdev/tools/__init__.py,sha256=iVJAOQ0viGTQOm0DLX4uZLro-9jOioYJGLg9s0kDx1A,78
 omdev/tools/cloc.py,sha256=13lUsYLyn1LoelhsCeKrRkIwwPE0x54JmdhXJ_lvWh0,3811
 omdev/tools/doc.py,sha256=iblgUq9_7JZN2i8qmvewrz4OX0paObscBaCj8u77WqI,2555
-omdev/tools/docker.py,sha256=eotslH8Mu-Z9yaT_8ikgkVx3PBXF7ZK2DDPrMtO6gnc,7144
+omdev/tools/docker.py,sha256=o9Chdia-xpJ5pisVLh4V7A3Flbb9_MuVRrs8VYZgEyY,7372
 omdev/tools/git.py,sha256=1PGHAVPNTb-ezCrPaQWCxwpUyEy_1QVSWDAa5Wbm9iA,6988
 omdev/tools/importscan.py,sha256=nhJIhtjDY6eFVlReP7fegvv6L5ZjN-Z2VeyhsBonev4,4639
 omdev/tools/mkrelimp.py,sha256=wsJAjTIf3nqcSfnT9TkDpS1VUOoM9W2Az5tZdWuzyLM,4054
@@ -153,9 +153,9 @@ omdev/tools/json/rendering.py,sha256=jNShMfCpFR9-Kcn6cUFuOChXHjg71diuTC4x7Ofmz-o
 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=Eckymn22GfychCQcQi96BFqRo_LmiJ-EPhC8TTUJdB4,11446
-omdev-0.0.0.dev154.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev154.dist-info/METADATA,sha256=SRsM3R6XFAWPkaAbynTocfqVhSFMRAiukbhE_7emv_Q,1760
-omdev-0.0.0.dev154.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-omdev-0.0.0.dev154.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev154.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev154.dist-info/RECORD,,
+omdev-0.0.0.dev155.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev155.dist-info/METADATA,sha256=Dgg7ozCLzJTs8nXBXiEWuG46gcThxtnDSChkeGrgT8o,1760
+omdev-0.0.0.dev155.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+omdev-0.0.0.dev155.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev155.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev155.dist-info/RECORD,,