omdev 0.0.0.dev240__py3-none-any.whl → 0.0.0.dev242__py3-none-any.whl

omdev/scripts/interp.py

@@ -2920,14 +2920,6 @@ _INJECTION_INSPECTION_CACHE: ta.MutableMapping[ta.Any, _InjectionInspection] = w
 
 def _do_injection_inspect(obj: ta.Any) -> _InjectionInspection:
     tgt = obj
-    if isinstance(tgt, type) and tgt.__init__ is not object.__init__:  # type: ignore[misc]
-        # Python 3.8's inspect.signature can't handle subclasses overriding __new__, always generating *args/**kwargs.
-        #  - https://bugs.python.org/issue40897
-        #  - https://github.com/python/cpython/commit/df7c62980d15acd3125dfbd81546dad359f7add7
-        tgt = tgt.__init__  # type: ignore[misc]
-        has_generic_base = True
-    else:
-        has_generic_base = False
 
     # inspect.signature(eval_str=True) was added in 3.10 and we have to support 3.8, so we have to get_type_hints to
     # eval str annotations *in addition to* getting the signature for parameter information.
@@ -2935,23 +2927,40 @@ def _do_injection_inspect(obj: ta.Any) -> _InjectionInspection:
     has_partial = False
     while True:
         if isinstance(uw, functools.partial):
-            has_partial = True
             uw = uw.func
+            has_partial = True
         else:
             if (uw2 := inspect.unwrap(uw)) is uw:
                 break
             uw = uw2
 
-    if has_generic_base and has_partial:
+    has_args_offset = False
+
+    if isinstance(tgt, type) and tgt.__new__ is not object.__new__:
+        # Python 3.8's inspect.signature can't handle subclasses overriding __new__, always generating *args/**kwargs.
+        #  - https://bugs.python.org/issue40897
+        #  - https://github.com/python/cpython/commit/df7c62980d15acd3125dfbd81546dad359f7add7
+        tgt = tgt.__init__  # type: ignore[misc]
+        has_args_offset = True
+
+    if tgt in (object.__init__, object.__new__):
+        # inspect strips self for types but not the underlying methods.
+        def dummy(self):
+            pass
+        tgt = dummy
+        has_args_offset = True
+
+    if has_partial and has_args_offset:
+        # TODO: unwrap partials masking parameters like modern python
         raise InjectorError(
-            'Injector inspection does not currently support both a typing.Generic base and a functools.partial: '
+            'Injector inspection does not currently support both an args offset and a functools.partial: '
             f'{obj}',
         )
 
     return _InjectionInspection(
         inspect.signature(tgt),
         ta.get_type_hints(uw),
-        1 if has_generic_base else 0,
+        1 if has_args_offset else 0,
     )
 
 

omdev/scripts/pyproject.py

@@ -4584,14 +4584,6 @@ _INJECTION_INSPECTION_CACHE: ta.MutableMapping[ta.Any, _InjectionInspection] = w
 
 def _do_injection_inspect(obj: ta.Any) -> _InjectionInspection:
     tgt = obj
-    if isinstance(tgt, type) and tgt.__init__ is not object.__init__:  # type: ignore[misc]
-        # Python 3.8's inspect.signature can't handle subclasses overriding __new__, always generating *args/**kwargs.
-        #  - https://bugs.python.org/issue40897
-        #  - https://github.com/python/cpython/commit/df7c62980d15acd3125dfbd81546dad359f7add7
-        tgt = tgt.__init__  # type: ignore[misc]
-        has_generic_base = True
-    else:
-        has_generic_base = False
 
     # inspect.signature(eval_str=True) was added in 3.10 and we have to support 3.8, so we have to get_type_hints to
     # eval str annotations *in addition to* getting the signature for parameter information.
@@ -4599,23 +4591,40 @@ def _do_injection_inspect(obj: ta.Any) -> _InjectionInspection:
     has_partial = False
     while True:
         if isinstance(uw, functools.partial):
-            has_partial = True
             uw = uw.func
+            has_partial = True
         else:
             if (uw2 := inspect.unwrap(uw)) is uw:
                 break
             uw = uw2
 
-    if has_generic_base and has_partial:
+    has_args_offset = False
+
+    if isinstance(tgt, type) and tgt.__new__ is not object.__new__:
+        # Python 3.8's inspect.signature can't handle subclasses overriding __new__, always generating *args/**kwargs.
+        #  - https://bugs.python.org/issue40897
+        #  - https://github.com/python/cpython/commit/df7c62980d15acd3125dfbd81546dad359f7add7
+        tgt = tgt.__init__  # type: ignore[misc]
+        has_args_offset = True
+
+    if tgt in (object.__init__, object.__new__):
+        # inspect strips self for types but not the underlying methods.
+        def dummy(self):
+            pass
+        tgt = dummy
+        has_args_offset = True
+
+    if has_partial and has_args_offset:
+        # TODO: unwrap partials masking parameters like modern python
         raise InjectorError(
-            'Injector inspection does not currently support both a typing.Generic base and a functools.partial: '
+            'Injector inspection does not currently support both an args offset and a functools.partial: '
             f'{obj}',
         )
 
     return _InjectionInspection(
         inspect.signature(tgt),
         ta.get_type_hints(uw),
-        1 if has_generic_base else 0,
+        1 if has_args_offset else 0,
     )
 
 

omdev/tools/docker.py

@@ -19,6 +19,7 @@ from omlish import lang
 from omlish import marshal as msh
 from omlish.argparse import all as ap
 from omlish.docker import all as dck
+from omlish.docker.ns1 import build_docker_ns1_run_cmd
 from omlish.formats import json
 from omlish.formats import yaml
 from omlish.logs import all as logs
@@ -44,37 +45,20 @@ def get_local_platform() -> str:
 
 class Cli(ap.Cli):
     @ap.cmd(
-        ap.arg('args', nargs='*'),
+        ap.arg('cmd', nargs='*'),
     )
     def ns1(self) -> None:
-        """
-        - https://gist.github.com/BretFisher/5e1a0c7bcca4c735e716abf62afad389
-        - https://github.com/justincormack/nsenter1/blob/8d3ba504b2c14d73c70cf34f1ec6943c093f1b02/nsenter1.c
-
-        alt:
-         - nc -U ~/Library/Containers/com.docker.docker/Data/debug-shell.sock
-        """
-
+        exe = docker_exe()
         os.execl(
-            exe := docker_exe(),
             exe,
-            'run',
-            '--rm',
-            '--platform', get_local_platform(),
-            '--privileged',
-            '--pid=host',
-            '-it', 'debian',
-            'nsenter',
-            '-t', '1',
-            '-m',  # mount
-            '-u',  # uts
-            '-i',  # ipc
-            '-n',  # net
-            '-p',  # pid
-            '-C',  # cgroup
-            # '-U',  # user
-            '-T',  # time
-            *self.args.args,
+            *build_docker_ns1_run_cmd(
+                *self.args.cmd,
+                exe=exe,
+                run_args=[
+                    '--platform', get_local_platform(),
+                    '-t',
+                ],
+            ),
         )
 
     @ap.cmd(

omdev/tools/git/cli.py

@@ -2,6 +2,7 @@
 """
 TODO:
  - https://github.com/vegardit/bash-funk/blob/main/docs/git.md
+ - git submodule foreach 'git remote show origin | grep "HEAD branch" | cut -f5 -d" " | xargs git checkout && git pull'
 """
 import dataclasses as dc
 import os

{omdev-0.0.0.dev240.dist-info → omdev-0.0.0.dev242.dist-info}/METADATA

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

{omdev-0.0.0.dev240.dist-info → omdev-0.0.0.dev242.dist-info}/RECORD

@@ -1,4 +1,4 @@
-omdev/.manifests.json,sha256=NP2sLr8MwlA0AKzDiFihSzLlqzYFENtN4MsjwQLPit4,9798
+omdev/.manifests.json,sha256=OicEZKfOPtIFxcCoF1boOCh1cLRoOFPwnyJEEieFEzQ,9798
 omdev/__about__.py,sha256=Iect_SBD2EXgx7QcFGiOqTHkOWD-bWOyvzgReDOY4Es,1214
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/bracepy.py,sha256=I8EdqtDvxzAi3I8TuMEW-RBfwXfqKbwp06CfOdj3L1o,2743
@@ -68,34 +68,36 @@ omdev/cexts/_distutils/compilers/options.py,sha256=H7r5IcLvga5Fs3jjXWIT-6ap3JBdu
 omdev/cexts/_distutils/compilers/unixccompiler.py,sha256=o1h8QuyupLntv4F21_XjzAZmCiwwxJuTmOirvBSL-Qw,15419
 omdev/ci/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/ci/__main__.py,sha256=Jsrv3P7LX2Cg08W7ByZfZ1JQT4lgLDPW1qNAmShFuMk,75
-omdev/ci/cache.py,sha256=K3SirapVPEGcdq2_G1DeLc0hxweTPeer9DH3LlZZK8w,8350
-omdev/ci/ci.py,sha256=JNFDs3sYCs93NOrnQxKiZNVnOotOwOL1CIEB4TL--Fg,6342
-omdev/ci/cli.py,sha256=CgFxNllLCn-hgVsq3w_RCBb3j3jjacZVtkFNQXxgBmE,6828
+omdev/ci/cache.py,sha256=MMPx3BMKVGnF2yASEjikvao8H2lRrUdik4eYU8xcFnQ,8352
+omdev/ci/ci.py,sha256=N5l6imhqrjQw5h5mujWhXMOtZ6V5Qh8dmi16qzCMw5o,7919
+omdev/ci/cli.py,sha256=jpgdmZS8qLrY9YGC29sizyo6ue3uR5yXf0lSzNFuRiw,7183
 omdev/ci/compose.py,sha256=vHLuXO5e2paafBC0Kf-OUGoamtIJmQ19r2U3_oikk_g,4541
-omdev/ci/consts.py,sha256=1puYfksvGOaVWEnbARM_sdMqs8oTn_VvsevsOtLsFno,21
-omdev/ci/inject.py,sha256=xo3AkobJKLLE7ZTa084NeGZm8pCABh4Wmh-RLRHFjTs,1460
+omdev/ci/consts.py,sha256=HkSYz-_hHilcHPBvRs-SwcUxW7vMNlHXZ8OyIKnVQbQ,21
+omdev/ci/inject.py,sha256=-rEXOxGNZQLz-CUEen3w8p21xMVkbrcKi8FRNOP_p9k,1924
 omdev/ci/requirements.py,sha256=UKN6avU5V96YmmJL8XYvMPxzzOagrKpGTYadaxI2z9U,2105
 omdev/ci/shell.py,sha256=cBPLMKiAJuNpPGj3ou6hpl88Xw7r99xpL91KJBQ0rqw,835
 omdev/ci/utils.py,sha256=YxOT4S-YLDOAv27K0Q0SKzxncZrWFA_wNXlFOaJmQuI,304
 omdev/ci/docker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omdev/ci/docker/buildcaching.py,sha256=h22WabBqTojCyvPMmHlCrquDss9K3gTR8pGj7_8Wxpc,1775
-omdev/ci/docker/cache.py,sha256=ku9S3UWsfbJ582GXsRYRYfWUPAB3Tp6Q3ZVUzHQcvlM,1534
-omdev/ci/docker/cacheserved.py,sha256=4Sqq5vMMp6IIi2deHE5uMGb_oLuk0A8HVcoDNcL97lY,8382
-omdev/ci/docker/cmds.py,sha256=ZRRfQS9FcsDM2CWtNH9WpcpjS1IMGdR2Yg-zSYx8vps,2719
-omdev/ci/docker/dataserver.py,sha256=CiS2l0Ze9rOCKXc0qgdmHH0FRZJqunJbTxowVSqxtJw,5525
-omdev/ci/docker/imagepulling.py,sha256=fePZOkEKsAoOU7AlHKKK8fhMVhtYhczIFC9QDFjWwmc,1769
-omdev/ci/docker/inject.py,sha256=LzzmbOidzVHoZbFUGZep1udElkmgHm0AU0LdmPFUK5M,1174
+omdev/ci/docker/buildcaching.py,sha256=8bPNaY9u35RqLQLCo4F3Mn3fbctQQnxmXSPZ9rE5DEg,1833
+omdev/ci/docker/cache.py,sha256=wTRsuc8ZAOfMMchwTWhXydp0vciaJygSLuPPmT4uGjE,2114
+omdev/ci/docker/cmds.py,sha256=d2kf1bTIptg6M-j8d3h0CQz3ADCY4WQ0OwM6V7A-2_w,3061
+omdev/ci/docker/dataserver.py,sha256=2TRe3pLA_7gDHO3RnF5T0vxjqv35NSdj4CAEMhdA1gg,5861
+omdev/ci/docker/imagepulling.py,sha256=V-AiIhFde7E4WbA_Ctj0Uzeuezp4e0Jdfy41VSuwzf4,1826
+omdev/ci/docker/inject.py,sha256=XNSnC1WYLKJARbv0YoX2nEieYdGChKyTcqibwwgOiSQ,2000
 omdev/ci/docker/packing.py,sha256=Bl0aBkkdwES5ePGE3nmyg1CAQzmMDCVP2KTdZUITpQE,2016
 omdev/ci/docker/repositories.py,sha256=ZWfObYdZXPn4BBeg8TsYeNVmH1EVEBadfRuxehAhxMM,1223
 omdev/ci/docker/utils.py,sha256=URioGRzqyqdJBZyOfzsrUwv5hSJ3WM23_sLHES9vamc,1129
+omdev/ci/docker/cacheserved/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+omdev/ci/docker/cacheserved/cache.py,sha256=hQdeRMRO0N3l-B0-2Ykua7CGDJiQ40HzZYnzPmFje9Q,7191
+omdev/ci/docker/cacheserved/manifests.py,sha256=C8VPMJoXEEOoTdzWTZLRBtb-bNxJrT5gcaq_ucsvc0I,3584
 omdev/ci/github/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/ci/github/api.py,sha256=Vqza7Hm1OCSfZYgdXF4exkjneqNjFcdO1pl8qmODskU,5198
 omdev/ci/github/bootstrap.py,sha256=9OuftAz7CUd7uf2Or3sJFVozQQiwu0RGAlTOQNpLQIY,430
 omdev/ci/github/cache.py,sha256=n0nuEaGidvXBfB1ZU1G2Khp5Wuztoh_uNjPkny8KDdQ,2553
 omdev/ci/github/cli.py,sha256=6mG0CllwrOoC7MDzKfKDqBHAjfF0gEI6aT5UAGMmuss,1114
-omdev/ci/github/client.py,sha256=fT8rQ5RO5MXyjpIt6UEFR7escofkBau73m8KYMzcZFo,14614
+omdev/ci/github/client.py,sha256=hjVW20yNCWYt-2p__3nc6NcABRv_pI9kutK97uDWjsw,14622
 omdev/ci/github/env.py,sha256=FQFjP_m7JWM7es9I51U-6UgJTwAt_UCVHFIYKTd9NKM,394
-omdev/ci/github/inject.py,sha256=Dwm2-qujyIqKYpBhiuebV3Lg5Gzf_cqk13NFVbf-8PQ,479
+omdev/ci/github/inject.py,sha256=Bfu6L6omd80ei1BbmhkCzmgK1GDWPFG1sCSDzwNNrQw,558
 omdev/cli/__init__.py,sha256=V_l6VP1SZMlJbO-8CJwSuO9TThOy2S_oaPepNYgIrbE,37
 omdev/cli/__main__.py,sha256=mOJpgc07o0r5luQ1DlX4tk2PqZkgmbwPbdzJ3KmtjgQ,138
 omdev/cli/_pathhack.py,sha256=kxqb2kHap68Lkh8b211rDbcgj06hidBiAKA3f9posyc,2119
@@ -110,7 +112,7 @@ omdev/clipboard/darwin_cf.py,sha256=SDUMfQtT_IJeDEwmsnxe6YyrZS5tPh_7ujkk1dg65Hg,
 omdev/clipboard/linux_x11.py,sha256=oa-mxMRNaZJOdBAZ8Nki-CAGIb63X8OFUTXKjmiwfSo,6718
 omdev/dataserver/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/dataserver/handlers.py,sha256=rCptrmV2RnutmGE5MAgjLDYW1QncqsSHhyRBL4H5bsg,5440
-omdev/dataserver/http.py,sha256=Vfdiri-AX7wNV1ASabU_JNmcKRpwLprWc9FyMUw4FDI,1707
+omdev/dataserver/http.py,sha256=SozI4233RP40m2EX45HtBvdIj-CBFlhHH7ekIbMir-Q,1724
 omdev/dataserver/routes.py,sha256=7Jai21x5z1t1zbS4mC-Sv2g0uogMJnCAX47WR81QVfI,996
 omdev/dataserver/server.py,sha256=ySEITCOxOmCXutsfYaFP46gENsg5w9jMeCySUSNUKmE,2333
 omdev/dataserver/targets.py,sha256=oKINlau7-Dk0XFP81ujU43YxvM_VTT5OnEZYIhHv4Os,3299
@@ -186,7 +188,7 @@ omdev/precheck/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/precheck/__main__.py,sha256=UEuS4z5-heIrwTtB-ONe1KeXJdqj8tYXMqWMpuO10so,165
 omdev/precheck/base.py,sha256=a_lGoFM-QhL8u8XDUYFhb-feEyfPbP4j8lcmNO51sHY,732
 omdev/precheck/git.py,sha256=APC5Ln7x0zDrQiGPRWPsBcVJK3vWhbU-brqR5M63JQA,849
-omdev/precheck/lite.py,sha256=i8fMTAw2_MI7Hvkw1bjYmn4DDkqJlQa3ZdVjAmvP6-A,4634
+omdev/precheck/lite.py,sha256=WFi7Ox2XD_L-jx8rdjXucoGMi5AiEFkDGYWhCW8ZH6g,4692
 omdev/precheck/main.py,sha256=XkwQnC_4YH-0P9YYkVxKUHAAj0o6iXiCu6S-oU_WaQk,2948
 omdev/precheck/manifests.py,sha256=ulwuYeZ0vnRsj8uTUbQGifoBNwI82MAsJuffs3rVIak,760
 omdev/precheck/scripts.py,sha256=Xw9kkQzlDd_2V9av9qlaNpNZG9jZdy3TTo7x60MeR2I,1273
@@ -209,13 +211,13 @@ 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/bumpversion.py,sha256=Kn7fo73Hs8uJh3Hi3EIyLOlzLPWAC6dwuD_lZ3cIzuY,1064
-omdev/scripts/ci.py,sha256=BdITcdZfxdqPGOcITwDkhNnjeORKgzW5UaTj5aSauc4,162480
+omdev/scripts/bumpversion.py,sha256=2NnfRsJiZNTg-LubIwXCm2vklG7-kIR8_xFUEZNxtiY,1119
+omdev/scripts/ci.py,sha256=qn0oXxQyXG6TpG8yBeTBkmiKCTkhhoHAN6XboExIR4c,328230
 omdev/scripts/execrss.py,sha256=mR0G0wERBYtQmVIn63lCIIFb5zkCM6X_XOENDFYDBKc,651
 omdev/scripts/exectime.py,sha256=S2O4MgtzTsFOY2IUJxsrnOIame9tEFc6aOlKP-F1JSg,1541
 omdev/scripts/importtrace.py,sha256=oa7CtcWJVMNDbyIEiRHej6ICfABfErMeo4_haIqe18Q,14041
-omdev/scripts/interp.py,sha256=H_WWqQ6ULe5cc976Q_9h2rhNTiKB0vg5PYJGBXWnfFY,150537
-omdev/scripts/pyproject.py,sha256=EzOFUuETYkbcv5_p8jaLL-WkiMvAElIveycZFswisqw,258410
+omdev/scripts/interp.py,sha256=OevpqhxklOGFp9X5HTMYLsRUdu0E8MA0x31hOexrHCQ,150775
+omdev/scripts/pyproject.py,sha256=Ns2_cKtOqU9Sx0T8i5DsO1oYwEV-EzJ67k7xLbaTdeo,258648
 omdev/scripts/slowcat.py,sha256=lssv4yrgJHiWfOiHkUut2p8E8Tq32zB-ujXESQxFFHY,2728
 omdev/scripts/tmpexec.py,sha256=WTYcf56Tj2qjYV14AWmV8SfT0u6Y8eIU6cKgQRvEK3c,1442
 omdev/tokens/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -225,7 +227,7 @@ omdev/tokens/utils.py,sha256=DJA2jsDzrtQxnO0bdkUk1-GmenX4ECugdhl1xOBe7QI,1448
 omdev/tools/__init__.py,sha256=iVJAOQ0viGTQOm0DLX4uZLro-9jOioYJGLg9s0kDx1A,78
 omdev/tools/cloc.py,sha256=jYlMHBae9oGKN4VKeBGuqjiQNcM2be7KIoTF0oNwx_I,5205
 omdev/tools/doc.py,sha256=wvgGhv6aFaV-Zl-Qivejx37i-lKQ207rZ-4K2fPf-Ss,2547
-omdev/tools/docker.py,sha256=hh0Me26XJfGfsKwuq4ydAa13Sm9DUHKNXpXoiUltnbE,7655
+omdev/tools/docker.py,sha256=Ekn8q0vo5KZPnz5Fz2P_NDeZkN3c2bdnMvh0SOLWNps,7184
 omdev/tools/importscan.py,sha256=nhJIhtjDY6eFVlReP7fegvv6L5ZjN-Z2VeyhsBonev4,4639
 omdev/tools/linehisto.py,sha256=0ZNm34EuiZBE9Q2YC6KNLNNydNT8QPSOwvYzXiU9S2Q,8881
 omdev/tools/mkenv.py,sha256=G2tu5bmiyKFyZuqtUoM7Z-6AI6CI86F2LwoIozoWOvo,2300
@@ -238,7 +240,7 @@ omdev/tools/shadow.py,sha256=e0-R3Ss9CaZbGSUzSSr29OVj9mUQ-Oelh-66Dfkx5nk,1600
 omdev/tools/sqlrepl.py,sha256=wAjrfXNrRV63-NJCC2HlGQnFh7lUH0bHMnOjYotQqFs,5753
 omdev/tools/git/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/git/__main__.py,sha256=gI87SBUgTkKUcUM-RtZWnei-UUDDqzbr5aPztb-gvbE,168
-omdev/tools/git/cli.py,sha256=POLpcnlvPgJuW14goo3feAHlEW33s9A-DfKKfUUmego,11771
+omdev/tools/git/cli.py,sha256=c2kHbSrvw0Yb95httkTT9VeeOg8HeZD1Nrc-qkCi4nA,11891
 omdev/tools/git/consts.py,sha256=JuXivUNDkNhM4pe97icjRVAKM8cNRbrODquHINNKqOE,40
 omdev/tools/git/messages.py,sha256=NWztIK0nAKJIOVzuVQcR_5LHZUgqyVkrOlpl7dFLMdU,2424
 omdev/tools/json/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -252,9 +254,9 @@ omdev/tools/json/rendering.py,sha256=tMcjOW5edfozcMSTxxvF7WVTsbYLoe9bCKFh50qyaGw
 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=zsEkfQX0jF5bn712uqPAyBSdJt2dno1LH2oeSMNfXQI,11424
-omdev-0.0.0.dev240.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev240.dist-info/METADATA,sha256=b4hOG6mM8LZOSfYNZe3iUvjNEkXM8PgOU0-Ps4SMWxw,1636
-omdev-0.0.0.dev240.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-omdev-0.0.0.dev240.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev240.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev240.dist-info/RECORD,,
+omdev-0.0.0.dev242.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev242.dist-info/METADATA,sha256=-Au1sV0H8LhgFIXx279Cq3wL3EOg6QkIh6MgeNBZR3I,1636
+omdev-0.0.0.dev242.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+omdev-0.0.0.dev242.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev242.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev242.dist-info/RECORD,,

omdev/ci/docker/cacheserved.py

@@ -1,262 +0,0 @@
-# ruff: noqa: UP006 UP007
-import abc
-import asyncio
-import contextlib
-import dataclasses as dc
-import json
-import os.path
-import typing as ta
-
-from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
-from omlish.lite.check import check
-from omlish.lite.json import json_dumps_compact
-from omlish.lite.logs import log
-from omlish.lite.marshal import marshal_obj
-from omlish.lite.marshal import unmarshal_obj
-
-from ...dataserver.routes import DataServerRoute
-from ...dataserver.server import DataServer
-from ...dataserver.targets import BytesDataServerTarget
-from ...dataserver.targets import DataServerTarget
-from ...dataserver.targets import FileDataServerTarget
-from ...oci.building import build_oci_index_repository
-from ...oci.data import get_single_leaf_oci_image_index
-from ...oci.dataserver import build_oci_repository_data_server_routes
-from ...oci.loading import read_oci_repository_root_index
-from ...oci.pack.repositories import OciPackedRepositoryBuilder
-from ...oci.repositories import OciRepository
-from ..cache import DataCache
-from ..cache import read_data_cache_data
-from .cache import DockerCache
-from .dataserver import DockerDataServer
-from .repositories import DockerImageRepositoryOpener
-
-
-##
-
-
-@dc.dataclass(frozen=True)
-class CacheServedDockerImageManifest:
-    @dc.dataclass(frozen=True)
-    class Route:
-        paths: ta.Sequence[str]
-
-        content_type: str
-        content_length: int
-
-        @dc.dataclass(frozen=True)
-        class Target(abc.ABC):  # noqa
-            pass
-
-        @dc.dataclass(frozen=True)
-        class BytesTarget(Target):
-            data: bytes
-
-        @dc.dataclass(frozen=True)
-        class CacheKeyTarget(Target):
-            key: str
-
-        target: Target
-
-        def __post_init__(self) -> None:
-            check.not_isinstance(self.paths, str)
-
-    routes: ta.Sequence[Route]
-
-
-#
-
-
-async def build_cache_served_docker_image_manifest(
-        data_server_routes: ta.Iterable[DataServerRoute],
-        make_file_cache_key: ta.Callable[[str], ta.Awaitable[str]],
-) -> CacheServedDockerImageManifest:
-    routes: ta.List[CacheServedDockerImageManifest.Route] = []
-
-    for data_server_route in data_server_routes:
-        content_length: int
-
-        data_server_target = data_server_route.target
-        target: CacheServedDockerImageManifest.Route.Target
-        if isinstance(data_server_target, BytesDataServerTarget):
-            bytes_data = check.isinstance(data_server_target.data, bytes)
-            content_length = len(bytes_data)
-            target = CacheServedDockerImageManifest.Route.BytesTarget(bytes_data)
-
-        elif isinstance(data_server_target, FileDataServerTarget):
-            file_path = check.non_empty_str(data_server_target.file_path)
-            content_length = os.path.getsize(file_path)
-            cache_key = await make_file_cache_key(file_path)
-            target = CacheServedDockerImageManifest.Route.CacheKeyTarget(cache_key)
-
-        else:
-            raise TypeError(data_server_target)
-
-        routes.append(CacheServedDockerImageManifest.Route(
-            paths=data_server_route.paths,
-
-            content_type=check.non_empty_str(data_server_target.content_type),
-            content_length=content_length,
-
-            target=target,
-        ))
-
-    return CacheServedDockerImageManifest(
-        routes=routes,
-    )
-
-
-#
-
-
-async def build_cache_served_docker_image_data_server_routes(
-        manifest: CacheServedDockerImageManifest,
-        make_cache_key_target: ta.Callable[..., ta.Awaitable[DataServerTarget]],
-) -> ta.List[DataServerRoute]:
-    routes: ta.List[DataServerRoute] = []
-
-    for manifest_route in manifest.routes:
-        manifest_target = manifest_route.target
-
-        target_kwargs: dict = dict(
-            content_type=manifest_route.content_type,
-            content_length=manifest_route.content_length,
-        )
-
-        target: DataServerTarget
-
-        if isinstance(manifest_target, CacheServedDockerImageManifest.Route.BytesTarget):
-            target = DataServerTarget.of(manifest_target.data, **target_kwargs)
-
-        elif isinstance(manifest_target, CacheServedDockerImageManifest.Route.CacheKeyTarget):
-            target = await make_cache_key_target(manifest_target.key, **target_kwargs)
-
-        else:
-            raise TypeError(manifest_target)
-
-        routes.append(DataServerRoute(
-            paths=manifest_route.paths,
-            target=target,
-        ))
-
-    return routes
-
-
-##
-
-
-class CacheServedDockerCache(DockerCache):
-    @dc.dataclass(frozen=True)
-    class Config:
-        port: int = 5021
-
-        repack: bool = True
-
-    def __init__(
-            self,
-            *,
-            config: Config = Config(),
-
-            image_repo_opener: DockerImageRepositoryOpener,
-            data_cache: DataCache,
-    ) -> None:
-        super().__init__()
-
-        self._config = config
-
-        self._image_repo_opener = image_repo_opener
-        self._data_cache = data_cache
-
-    async def load_cache_docker_image(self, key: str) -> ta.Optional[str]:
-        if (manifest_data := await self._data_cache.get_data(key)) is None:
-            return None
-
-        manifest_bytes = await read_data_cache_data(manifest_data)
-
-        manifest: CacheServedDockerImageManifest = unmarshal_obj(
-            json.loads(manifest_bytes.decode('utf-8')),
-            CacheServedDockerImageManifest,
-        )
-
-        async def make_cache_key_target(target_cache_key: str, **target_kwargs: ta.Any) -> DataServerTarget:  # noqa
-            # FIXME: url
-            cache_data = check.not_none(await self._data_cache.get_data(target_cache_key))
-            file_path = check.isinstance(cache_data, DataCache.FileData).file_path
-            return DataServerTarget.of(
-                file_path=file_path,
-                **target_kwargs,
-            )
-
-        data_server_routes = await build_cache_served_docker_image_data_server_routes(
-            manifest,
-            make_cache_key_target,
-        )
-
-        data_server = DataServer(DataServer.HandlerRoute.of_(*data_server_routes))
-
-        image_url = f'localhost:{self._config.port}/{key}'
-
-        async with DockerDataServer(
-                self._config.port,
-                data_server,
-                handler_log=log,
-        ) as dds:
-            dds_run_task = asyncio.create_task(dds.run())
-            try:
-                # FIXME: lol
-                await asyncio.sleep(3.)
-
-                await asyncio_subprocesses.check_call(
-                    'docker',
-                    'pull',
-                    image_url,
-                )
-
-            finally:
-                dds.stop_event.set()
-                await dds_run_task
-
-        return image_url
-
-    async def save_cache_docker_image(self, key: str, image: str) -> None:
-        async with contextlib.AsyncExitStack() as es:
-            image_repo: OciRepository = await es.enter_async_context(
-                self._image_repo_opener.open_docker_image_repository(image),
-            )
-
-            root_image_index = read_oci_repository_root_index(image_repo)
-            image_index = get_single_leaf_oci_image_index(root_image_index)
-
-            if self._config.repack:
-                prb: OciPackedRepositoryBuilder = es.enter_context(OciPackedRepositoryBuilder(
-                    image_repo,
-                ))
-                built_repo = await asyncio.get_running_loop().run_in_executor(None, prb.build)
-
-            else:
-                built_repo = build_oci_index_repository(image_index)
-
-            data_server_routes = build_oci_repository_data_server_routes(
-                key,
-                built_repo,
-            )
-
-            async def make_file_cache_key(file_path: str) -> str:
-                target_cache_key = f'{key}--{os.path.basename(file_path).split(".")[0]}'
-                await self._data_cache.put_data(
-                    target_cache_key,
-                    DataCache.FileData(file_path),
-                )
-                return target_cache_key
-
-            cache_served_manifest = await build_cache_served_docker_image_manifest(
-                data_server_routes,
-                make_file_cache_key,
-            )
-
-        manifest_data = json_dumps_compact(marshal_obj(cache_served_manifest)).encode('utf-8')
-
-        await self._data_cache.put_data(
-            key,
-            DataCache.BytesData(manifest_data),
-        )