omdev 0.0.0.dev145__py3-none-any.whl → 0.0.0.dev146__py3-none-any.whl

omdev/.manifests.json

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

omdev/amalg/amalg.py

@@ -25,8 +25,10 @@ Targets:
 """
 import argparse
 import ast
+import base64
 import dataclasses as dc
 import io
+import itertools
 import logging
 import os.path
 import re
@@ -286,6 +288,37 @@ def is_root_level_if_type_checking_block(lts: Tokens) -> bool:
 ##
 
 
+class RootLevelResourcesRead(ta.NamedTuple):
+    variable: str
+    kind: ta.Literal['binary', 'text']
+    resource: str
+
+
+def is_root_level_resources_read(lts: Tokens) -> RootLevelResourcesRead | None:
+    wts = list(tks.ignore_ws(lts, keep=['INDENT']))
+
+    if not tks.match_toks(wts, [
+        ('NAME', None),
+        ('OP', '='),
+        ('NAME', ('read_package_resource_binary', 'read_package_resource_text')),
+        ('OP', '('),
+        ('NAME', '__package__'),
+        ('OP', ','),
+        ('STRING', None),
+        ('OP', ')'),
+    ]):
+        return None
+
+    return RootLevelResourcesRead(
+        wts[0].src,
+        'binary' if wts[2].src == 'read_package_resource_binary' else 'text',
+        ast.literal_eval(wts[6].src),
+    )
+
+
+##
+
+
 @dc.dataclass(frozen=True, kw_only=True)
 class SrcFile:
     path: str
@@ -301,6 +334,8 @@ class SrcFile:
 
     ruff_noqa: ta.AbstractSet[str] = dc.field(repr=False)
 
+    has_binary_resources: bool = False
+
 
 def make_src_file(
         path: str,
@@ -322,6 +357,8 @@ def make_src_file(
     tys: list[Typing] = []
     ctls: list[Tokens] = []
 
+    has_binary_resources = False
+
     i = 0
     while i < len(cls):
         line = cls[i]
@@ -383,6 +420,57 @@ def make_src_file(
                 i += 1
                 skip_block()
 
+        elif (rsrc := is_root_level_resources_read(line)) is not None:
+            rf = os.path.join(os.path.dirname(path), rsrc.resource)
+
+            if rsrc.kind == 'binary':
+                with open(rf, 'rb') as bf:
+                    rb = bf.read()  # noqa
+
+                ctls.append([
+                    trt.Token(name='NAME', src=rsrc.variable),
+                    trt.Token(name='UNIMPORTANT_WS', src=' '),
+                    trt.Token(name='OP', src='='),
+                    trt.Token(name='UNIMPORTANT_WS', src=' '),
+                    trt.Token(name='NAME', src='base64'),
+                    trt.Token(name='OP', src='.'),
+                    trt.Token(name='NAME', src='b64decode'),
+                    trt.Token(name='OP', src='('),
+                    trt.Token(name='NL', src='\n'),
+                ])
+
+                rb64 = base64.b64encode(rb).decode('ascii')
+                for chunk in itertools.batched(rb64, 96):
+                    ctls.append([
+                        trt.Token(name='UNIMPORTANT_WS', src='    '),
+                        trt.Token(name='STRING', src=f"'{''.join(chunk)}'"),
+                        trt.Token(name='NL', src='\n'),
+                    ])
+
+                ctls.append([
+                    trt.Token(name='OP', src=')'),
+                    trt.Token(name='NEWLINE', src='\n'),
+                ])
+
+                has_binary_resources = True
+
+            elif rsrc.kind == 'text':
+                with open(rf) as tf:
+                    rt = tf.read()  # noqa
+                rt = rt.replace('\\', '\\\\')  # Escape backslashes
+                rt = rt.replace('"""', r'\"\"\"')
+                ctls.append([
+                    trt.Token(name='NAME', src=rsrc.variable),
+                    trt.Token(name='UNIMPORTANT_WS', src=' '),
+                    trt.Token(name='OP', src='='),
+                    trt.Token(name='UNIMPORTANT_WS', src=' '),
+                    trt.Token(name='STRING', src=f'"""\\\n{rt}"""\n'),
+                    trt.Token(name='NEWLINE', src=''),
+                ])
+
+            else:
+                raise ValueError(rsrc.kind)
+
         else:
             ctls.append(line)
 
@@ -399,6 +487,8 @@ def make_src_file(
         content_lines=ctls,
 
         ruff_noqa=set(lang.flatten(tks.join_toks(l).strip().split()[3:] for l in rnls)),  # noqa
+
+        has_binary_resources=has_binary_resources,
     )
 
 
@@ -488,6 +578,8 @@ def gen_amalg(
     dct: dict = {
         ('sys', None, None): ['import sys\n'],
     }
+    if any(sf.has_binary_resources for sf in src_files.values()):
+        dct[('base64', None, None)] = ['import base64\n']
     for imp in gl_imps:
         dct.setdefault((imp.mod, imp.item, imp.as_), []).append(imp)
     for _, l in sorted(dct.items()):

omdev/interp/resolvers.py

@@ -35,7 +35,7 @@ class InterpResolver:
             if spec.contains(si)
         ]
 
-        slst = sorted(lst, key=lambda t: (-t[0], t[1]))
+        slst = sorted(lst, key=lambda t: (-t[0], t[1].version))
         if not slst:
             return None
 

omdev/scripts/interp.py

@@ -2530,7 +2530,7 @@ class InterpResolver:
             if spec.contains(si)
         ]
 
-        slst = sorted(lst, key=lambda t: (-t[0], t[1]))
+        slst = sorted(lst, key=lambda t: (-t[0], t[1].version))
         if not slst:
             return None
 

omdev/scripts/pyproject.py

@@ -5748,7 +5748,7 @@ class InterpResolver:
             if spec.contains(si)
         ]
 
-        slst = sorted(lst, key=lambda t: (-t[0], t[1]))
+        slst = sorted(lst, key=lambda t: (-t[0], t[1].version))
         if not slst:
             return None
 

omdev/tokens.py

@@ -61,7 +61,7 @@ def join_lines(ls: ta.Iterable[Tokens]) -> str:
 
 def match_toks(
         ts: ta.Iterable['trt.Token'],
-        pat: ta.Sequence[tuple[str | None, str | None]],
+        pat: ta.Sequence[tuple[str | None, str | tuple[str, ...] | None]],
 ) -> bool:
     it = iter(ts)
     for pn, ps in pat:
@@ -71,6 +71,13 @@ def match_toks(
             return False
         if pn is not None and t.name != pn:
             return False
-        if ps is not None and t.src != ps:
-            return False
+        if ps is not None:
+            if isinstance(ps, str):
+                if t.src != ps:
+                    return False
+            elif isinstance(ps, tuple):
+                if t.src not in ps:
+                    return False
+            else:
+                raise TypeError(ps)
     return True

omdev/tools/docker.py

@@ -1,6 +1,6 @@
 """
 TODO:
- - check for updates
+ - https://github.com/zeromake/docker-debug
 """
 import os
 import re
@@ -232,6 +232,19 @@ 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',
+            'lirantal/dockly',
+        )
+
 
 # @omlish-manifest
 _CLI_MODULE = CliModule('docker', __name__)

omdev/tools/git.py

@@ -1,3 +1,7 @@
+"""
+TODO:
+ - https://github.com/vegardit/bash-funk/blob/main/docs/git.md
+"""
 import os
 import re
 import subprocess

{omdev-0.0.0.dev145.dist-info → omdev-0.0.0.dev146.dist-info}/METADATA

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

{omdev-0.0.0.dev145.dist-info → omdev-0.0.0.dev146.dist-info}/RECORD

@@ -1,4 +1,4 @@
-omdev/.manifests.json,sha256=Uq3VB0ovogq663SM_1fuRBjqbod7kE30wNxBByQI2zo,8033
+omdev/.manifests.json,sha256=ln-OyFCqhvwbtxlfrQk-6s4Ilao4ufYVmQJQI_4UtT8,8033
 omdev/__about__.py,sha256=n5x-SO70OgbDQFzQ1d7sZDVMsnkQc4PxQZPFaIQFa0E,1281
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/bracepy.py,sha256=I8EdqtDvxzAi3I8TuMEW-RBfwXfqKbwp06CfOdj3L1o,2743
@@ -10,11 +10,11 @@ omdev/imgur.py,sha256=il12R3t19tALolteYCZywvcdQUEOcgvPyUYgWtKiqt4,2993
 omdev/pip.py,sha256=7cZ_IOpekQvgPm_gKnX3Pr8xjqUid50PPScTlZCYVlM,2118
 omdev/revisions.py,sha256=7tRBeDECSOhYfwSxJDrMFypQjtghLu9P4P0oFT3NHdQ,5008
 omdev/secrets.py,sha256=bcquaBIDKqX4UIKOzUuKrX7nxVCenj67rRHIMIrd9bk,540
-omdev/tokens.py,sha256=eCppK7BtlgAK_AmfO-Or_B-x85tqmu0HVla8d2gvB3I,1333
+omdev/tokens.py,sha256=zh2TCAfCbcq8ZnoVdQ824jrTiwNy3XJ_oCqlZpLpcCY,1574
 omdev/wheelfile.py,sha256=yfupGcGkbFlmzGzKU64k_vmOKpaKnUlDWxeGn2KdekU,10005
 omdev/amalg/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/amalg/__main__.py,sha256=h94M-VqZ3AFBU2a8zOsjeKK7RF6uINhTHl6OiGbVMgw,163
-omdev/amalg/amalg.py,sha256=AEhgXmc9y3zfvMpAdJUuTwlhYZ5bCAUrVf1WHsgV5PI,16084
+omdev/amalg/amalg.py,sha256=_5goY2wRrP9X4nma3MzDHTbCj7_bkfNxi98bRbd6eSQ,19240
 omdev/antlr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/antlr/consts.py,sha256=8pR6r0m0P3hAiyiAoJZ-nptd2GYbZ98mxwPL9cpaRuw,279
 omdev/antlr/gen.py,sha256=QnPyVWUrJYqHoOc3XsXA8fJdoiwAj6pyUwdG-DVrIeA,2953
@@ -75,7 +75,7 @@ omdev/interp/cli.py,sha256=sh7PZQoLletUViw1Y9OXNr9ekyNZ6YyxYuOQ_n9hyqU,2072
 omdev/interp/inspect.py,sha256=55_il4ehoW6Q468YE57w5CyZxHLNsndkRIH4W80OplM,2848
 omdev/interp/providers.py,sha256=PFEjozW0c33eqg8sno-GHMKbhVUzQF9jrAx-M0uQimk,1787
 omdev/interp/pyenv.py,sha256=rHps4saqLxp-udbZp-5RpFxNhZNQc6plqIvaCQpNBHo,13837
-omdev/interp/resolvers.py,sha256=tpzlmqGp1C4QKdA6TfcPmtmaygu7mb6WK2RPSbyNQ6s,3022
+omdev/interp/resolvers.py,sha256=O4QTqWGL7KXiJl3JN5BlbqT52FbhycrDSRd7M_jTeRs,3030
 omdev/interp/standalone.py,sha256=XcltiL7ypcfV89C82_3knQ3Kx7aW4wnnxf2056ZXC3A,7731
 omdev/interp/system.py,sha256=bI-JhX4GVJqW7wMxnIa-DGJWnCLmFcIsnl9pc1RGY2g,3513
 omdev/interp/types.py,sha256=EMN3StEMkFoQAMUIZd7JYL4uUWqzFGY-2hTL8EBznYM,2437
@@ -120,8 +120,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=Xzki1bTvF2uahDrK65_A-lbN29W67jE4t7v8SY__F44,74287
-omdev/scripts/pyproject.py,sha256=2EGOnpEQoFwWMmbeRgQ2aUhPDXkRNjJgttK5IGHK8RQ,179651
+omdev/scripts/interp.py,sha256=nda-QHD-do9MVfXrDlfqdaEXdNwacil48RHd3OG0DIw,74295
+omdev/scripts/pyproject.py,sha256=SW4lGBmdgoXD_2ekbeIj-LIGMqSnQoTV36eXWuvyhik,179659
 omdev/scripts/slowcat.py,sha256=lssv4yrgJHiWfOiHkUut2p8E8Tq32zB-ujXESQxFFHY,2728
 omdev/scripts/tmpexec.py,sha256=WTYcf56Tj2qjYV14AWmV8SfT0u6Y8eIU6cKgQRvEK3c,1442
 omdev/toml/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -130,8 +130,8 @@ 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=mv9XfitzqXl3vFHSenv01xHCxWf8g03rUAb_sqoty98,2556
-omdev/tools/docker.py,sha256=k2BrVvFYwyGov064CPHd_HWo9aqR1zHc2UeEsVwPth4,6827
-omdev/tools/git.py,sha256=bfhYUFip7zVxtsyXk8yEFbK2y2zguhvgraLhXc7A53M,6899
+omdev/tools/docker.py,sha256=jRmKn2fiDy6szeC3MA-mN34EuU_Pbc_jWtnPJG6LIac,7141
+omdev/tools/git.py,sha256=WJ7iEsC5UkMnsCv8jN5FAcjj8cURF_nK4pcaZQjY6NY,6976
 omdev/tools/importscan.py,sha256=nhJIhtjDY6eFVlReP7fegvv6L5ZjN-Z2VeyhsBonev4,4639
 omdev/tools/mkrelimp.py,sha256=wsJAjTIf3nqcSfnT9TkDpS1VUOoM9W2Az5tZdWuzyLM,4054
 omdev/tools/notebook.py,sha256=M8Xi_gfZdlahnyFLtp0RBgYZPSHWQStMMDYZc71Zync,3494
@@ -150,9 +150,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.dev145.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev145.dist-info/METADATA,sha256=5S-8kZx2EiUTEJZcw9CXWE1y9mnu_oo4UJQ1J2cOHP4,1760
-omdev-0.0.0.dev145.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-omdev-0.0.0.dev145.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev145.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev145.dist-info/RECORD,,
+omdev-0.0.0.dev146.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev146.dist-info/METADATA,sha256=IOaFWNLrbiDx0sOwGaw5D3Ae874Vk2qCBZE_-B88Blo,1760
+omdev-0.0.0.dev146.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+omdev-0.0.0.dev146.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev146.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev146.dist-info/RECORD,,