omdev 0.0.0.dev107__py3-none-any.whl → 0.0.0.dev109__py3-none-any.whl

omdev/.manifests.json

@@ -282,7 +282,7 @@
     "module": ".tools.pip",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/pip.py",
-    "line": 88,
+    "line": 164,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "pip",
@@ -302,6 +302,18 @@
       }
     }
   },
+  {
+    "module": ".tools.qr",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/tools/qr.py",
+    "line": 74,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "qr",
+        "mod_name": "omdev.tools.qr"
+      }
+    }
+  },
   {
     "module": ".tools.sqlrepl",
     "attr": "_CLI_MODULE",

omdev/__about__.py

@@ -41,6 +41,10 @@ class Project(ProjectBase):
             'prompt-toolkit ~= 3.0',
         ],
 
+        'qr': [
+            'segno ~= 1.6',
+        ],
+
         'tokens': [
             'tokenize-rt ~= 6.1',
         ],

omdev/packaging/__init__.py

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

omdev/packaging/marshal.py

@@ -0,0 +1,82 @@
+"""
+NOTE: This cannot be auto-imported as @omlish-lite usage of other modules in this package requires it be importable on
+8.
+"""
+import dataclasses as dc
+import typing as ta
+
+from omlish import lang
+from omlish import marshal as msh
+from omlish import matchfns as mfs
+from omlish import reflect as rfl
+
+from .requires import RequiresMarkerItem
+from .requires import RequiresMarkerList
+from .requires import RequiresNode
+from .requires import RequiresOp
+from .requires import RequiresValue
+from .requires import RequiresVariable
+
+
+##
+
+
+class MarshalRequiresMarkerList(lang.NotInstantiable, lang.Final):
+    pass
+
+
+@dc.dataclass(frozen=True)
+class RequiresMarkerListMarshaler(msh.Marshaler):
+    item_m: msh.Marshaler
+    node_m: msh.Marshaler
+
+    def marshal(self, ctx: msh.MarshalContext, o: ta.Any) -> msh.Value:
+        def inner(c: ta.Any) -> ta.Any:
+            if isinstance(c, str):
+                return c
+            elif isinstance(c, RequiresMarkerItem):
+                return self.item_m.marshal(ctx, c)
+            elif isinstance(c, ta.Iterable):
+                return [inner(e) for e in c]
+            else:
+                raise TypeError(c)
+        return [inner(e) for e in o]
+
+
+class RequiresMarkerListMarshalerFactory(msh.MarshalerFactoryMatchClass):
+    @mfs.simple(lambda _, ctx, rty: rty is MarshalRequiresMarkerList)
+    def _build(self, ctx: msh.MarshalContext, rty: rfl.Type) -> msh.Marshaler:
+        return RequiresMarkerListMarshaler(
+            ctx.make(RequiresMarkerItem),
+            ctx.make(RequiresNode),
+        )
+
+
+##
+
+
+@lang.static_init
+def _install_standard_marshalling() -> None:
+    requires_node_poly = msh.Polymorphism(
+        RequiresNode,
+        [
+            msh.Impl(RequiresVariable, 'variable'),
+            msh.Impl(RequiresValue, 'value'),
+            msh.Impl(RequiresOp, 'op'),
+        ],
+    )
+    msh.STANDARD_MARSHALER_FACTORIES[0:0] = [
+        msh.PolymorphismMarshalerFactory(requires_node_poly),
+        msh.PolymorphismUnionMarshalerFactory(requires_node_poly.impls, allow_partial=True),
+        RequiresMarkerListMarshalerFactory(),
+
+    ]
+    msh.STANDARD_UNMARSHALER_FACTORIES[0:0] = [
+        msh.PolymorphismUnmarshalerFactory(requires_node_poly),
+    ]
+
+    msh.GLOBAL_REGISTRY.register(
+        RequiresMarkerList,
+        msh.ReflectOverride(MarshalRequiresMarkerList),
+        identity=True,
+    )

omdev/packaging/names.py

@@ -1,3 +1,4 @@
+# @omlish-lite
 # Copyright (c) Donald Stufft and individual contributors.
 # All rights reserved.
 #

omdev/packaging/requires.py

@@ -1,3 +1,4 @@
+# @omlish-lite
 # Copyright (c) Donald Stufft and individual contributors.
 # All rights reserved.
 #
@@ -194,10 +195,9 @@ class RequiresTokenizer:
         self.read()
 
 
+@dc.dataclass(frozen=True)
 class RequiresNode:
-    def __init__(self, value: str) -> None:
-        super().__init__()
-        self.value = value
+    value: str
 
     def __str__(self) -> str:
         return self.value
@@ -209,27 +209,36 @@ class RequiresNode:
         raise NotImplementedError
 
 
+@dc.dataclass(frozen=True)
 class RequiresVariable(RequiresNode):
     def serialize(self) -> str:
         return str(self)
 
 
+@dc.dataclass(frozen=True)
 class RequiresValue(RequiresNode):
     def serialize(self) -> str:
         return f'"{self}"'
 
 
+@dc.dataclass(frozen=True)
 class RequiresOp(RequiresNode):
     def serialize(self) -> str:
         return str(self)
 
 
 RequiresMarkerVar = ta.Union['RequiresVariable', 'RequiresValue']
-RequiresMarkerItem = ta.Tuple['RequiresMarkerVar', 'RequiresOp', 'RequiresMarkerVar']
+
 RequiresMarkerAtom = ta.Union['RequiresMarkerItem', ta.Sequence['RequiresMarkerAtom']]
 RequiresMarkerList = ta.Sequence[ta.Union['RequiresMarkerList', 'RequiresMarkerAtom', str]]
 
 
+class RequiresMarkerItem(ta.NamedTuple):
+    l: ta.Union[RequiresVariable, RequiresValue]
+    op: RequiresOp
+    r: ta.Union[RequiresVariable, RequiresValue]
+
+
 class ParsedRequirement(ta.NamedTuple):
     name: str
     url: str
@@ -441,7 +450,7 @@ def _parse_requires_marker_item(tokenizer: RequiresTokenizer) -> RequiresMarkerI
     tokenizer.consume('WS')
     marker_var_right = _parse_requires_marker_var(tokenizer)
     tokenizer.consume('WS')
-    return (marker_var_left, marker_op, marker_var_right)
+    return RequiresMarkerItem(marker_var_left, marker_op, marker_var_right)
 
 
 def _parse_requires_marker_var(tokenizer: RequiresTokenizer) -> RequiresMarkerVar:

omdev/packaging/specifiers.py

@@ -1,3 +1,4 @@
+# @omlish-lite
 # Copyright (c) Donald Stufft and individual contributors.
 # All rights reserved.
 #

omdev/packaging/versions.py

@@ -1,3 +1,4 @@
+# @omlish-lite
 # Copyright (c) Donald Stufft and individual contributors.
 # All rights reserved.
 #

omdev/tools/pip.py

@@ -1,18 +1,35 @@
+"""
+TODO:
+ - https://github.com/pypa/pip/blob/420435903ff2fc694d6950a47b896427ecaed78f/src/pip/_internal/req/req_file.py ?
+"""
+import contextlib
 import importlib.metadata
 import io
+import os.path
 import sys
+import typing as ta
 import urllib.request
-import xml.etree.ElementTree as ET  # noqa
 
 from omlish import argparse as ap
 from omlish import check
+from omlish import lang
+from omlish import marshal as msh
+from omlish.formats import json
 
 from ..cli import CliModule
+from ..packaging import marshal as _  # noqa
 from ..packaging.names import canonicalize_name
+from ..packaging.requires import ParsedRequirement
 from ..packaging.requires import RequiresVariable
 from ..packaging.requires import parse_requirement
 
 
+if ta.TYPE_CHECKING:
+    import xml.etree.ElementTree as ET  # noqa
+else:
+    ET = lang.proxy_import('xml.etree.ElementTree')
+
+
 PYPI_URL = 'https://pypi.org/'
 
 
@@ -84,6 +101,65 @@ class Cli(ap.Cli):
             if not uses_by_req.get(d):
                 print(d)
 
+    @ap.command(
+        ap.arg('files', nargs='*'),
+        ap.arg('-r', '--follow-requirements', action='store_true'),
+        ap.arg('-j', '--json', action='store_true'),
+        ap.arg('-b', '--bare', action='store_true'),
+    )
+    def parse(self) -> None:
+        def print_req(req: ParsedRequirement) -> None:
+            if self.args.json:
+                req_m = msh.marshal(req)
+                print(json.dumps(req_m))
+
+            elif self.args.bare:
+                print(req.name)
+
+            else:
+                print(f'{req.name}{req.specifier or ""}')
+
+        #
+
+        seen_files: set[str] = set()
+
+        def do_file(file: ta.TextIO | str) -> None:
+            if isinstance(file, str) and file in seen_files:
+                return
+
+            with contextlib.ExitStack() as es:
+                f: ta.TextIO
+                if isinstance(file, str):
+                    f = es.enter_context(open(file))
+                else:
+                    f = file
+
+                for l in f:
+                    if '#' in l:
+                        l = l.partition('#')[0]
+
+                    if not (l := l.strip()):
+                        continue
+
+                    if l.startswith('git+'):
+                        continue  # FIXME
+
+                    elif l.startswith('-r'):  # noqa
+                        if self.args.follow_requirements:
+                            base_dir = os.path.dirname(file) if isinstance(file, str) else '.'
+                            r_file = os.path.join(base_dir, l[2:].strip())
+                            do_file(r_file)
+
+                    else:
+                        req = parse_requirement(l)
+                        print_req(req)
+
+        if self.args.files:
+            for file in self.args.files:
+                do_file(file)
+        else:
+            do_file(sys.stdin)
+
 
 # @omlish-manifest
 _CLI_MODULE = CliModule('pip', __name__)

omdev/tools/qr.py

@@ -0,0 +1,79 @@
+"""
+https://segno.readthedocs.io/en/stable/comparison-qrcode-libs.html
+- https://github.com/nayuki/QR-Code-generator
+- https://github.com/heuer/segno/
+- https://github.com/lincolnloop/python-qrcode
+"""
+import argparse
+import os
+import subprocess
+import sys
+import tempfile
+import typing as ta
+
+from omlish import lang
+
+from ..cli import CliModule
+
+
+if ta.TYPE_CHECKING:
+    import segno
+else:
+    segno = lang.proxy_import('segno')
+
+
+def _main() -> None:
+    parser = argparse.ArgumentParser()
+    parser.add_argument('content', nargs='?')
+
+    parser.add_argument('-x', '--target-size', type=int)
+
+    parser.add_argument('-o', '--output')
+    parser.add_argument('-O', '--open', action='store_true')
+
+    parser.add_argument(
+        '--error', '-e',
+        help=(
+            'Error correction level: '
+            '"L": 7%% (default), '
+            '"M": 15%%, '
+            '"Q": 25%%, '
+            '"H": 30%%, '
+            '"-": no error correction (used for M1 symbols)'
+        ),
+        choices=('L', 'M', 'Q', 'H', '-'),
+    )
+    args = parser.parse_args()
+
+    if (content := args.content) is None:
+        content = sys.stdin.read()
+
+    qr = segno.make(content)
+
+    if (tx := args.target_size) is not None:
+        sz = max(*qr.symbol_size())
+        sc = max(float(tx) / sz, 1)
+    else:
+        sc = 1
+
+    if args.output is not None:
+        out_file = args.output
+    else:
+        fd, out_file = tempfile.mkstemp(suffix='-qrcode.png')
+        os.close(fd)
+
+    qr.save(out_file, scale=sc)
+
+    if args.output is None:
+        print(out_file)
+
+    if args.open:
+        subprocess.check_call(['open', out_file])
+
+
+# @omlish-manifest
+_CLI_MODULE = CliModule('qr', __name__)
+
+
+if __name__ == '__main__':
+    _main()

{omdev-0.0.0.dev107.dist-info → omdev-0.0.0.dev109.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev107
+Version: 0.0.0.dev109
 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.dev107
+Requires-Dist: omlish ==0.0.0.dev109
 Provides-Extra: all
 Requires-Dist: black ~=24.10 ; extra == 'all'
 Requires-Dist: pycparser ~=2.22 ; extra == 'all'
@@ -23,6 +23,7 @@ Requires-Dist: markdown ~=3.7 ; extra == 'all'
 Requires-Dist: mypy ~=1.11 ; extra == 'all'
 Requires-Dist: gprof2dot ~=2024.6 ; extra == 'all'
 Requires-Dist: prompt-toolkit ~=3.0 ; extra == 'all'
+Requires-Dist: segno ~=1.6 ; extra == 'all'
 Requires-Dist: tokenize-rt ~=6.1 ; extra == 'all'
 Requires-Dist: wheel ~=0.44 ; extra == 'all'
 Provides-Extra: black
@@ -40,6 +41,8 @@ Provides-Extra: prof
 Requires-Dist: gprof2dot ~=2024.6 ; extra == 'prof'
 Provides-Extra: ptk
 Requires-Dist: prompt-toolkit ~=3.0 ; extra == 'ptk'
+Provides-Extra: qr
+Requires-Dist: segno ~=1.6 ; extra == 'qr'
 Provides-Extra: tokens
 Requires-Dist: tokenize-rt ~=6.1 ; extra == 'tokens'
 Provides-Extra: wheel

{omdev-0.0.0.dev107.dist-info → omdev-0.0.0.dev109.dist-info}/RECORD

@@ -1,5 +1,5 @@
-omdev/.manifests.json,sha256=V5q8HDU47d2-GTm_W_-iEVx0R8weTrzg_3PcmNCZXxA,6713
-omdev/__about__.py,sha256=ON7EnhbxbwLsMj60wkd9OEYPloXZ7jmnMMzeLg44LXY,1225
+omdev/.manifests.json,sha256=7k8X6dwsYix3aVgNr4us8gpWAOW47Kr6PvOwgERlXyA,6951
+omdev/__about__.py,sha256=n5x-SO70OgbDQFzQ1d7sZDVMsnkQc4PxQZPFaIQFa0E,1281
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/bracepy.py,sha256=I8EdqtDvxzAi3I8TuMEW-RBfwXfqKbwp06CfOdj3L1o,2743
 omdev/classdot.py,sha256=YOvgy6x295I_8NKBbBlRVd3AN7Osirm_Lqt4Wj0j9rY,1631
@@ -89,11 +89,12 @@ omdev/manifests/load.py,sha256=LtEsluDdd8CkNGj0QGBxee3twBn095Fru0xz2mtr7uk,4788
 omdev/manifests/types.py,sha256=Jv6PAdVLPb9Hh4y6vDhPlWuMNBBViin1bC_u83jfsH4,234
 omdev/mypy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/mypy/debug.py,sha256=WcZw-3Z1njg_KFGqi3DB6RuqbBa3dLArJnjVCuY1Mn0,3003
-omdev/packaging/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
-omdev/packaging/names.py,sha256=lwws9dgClio0_-w6fZcihOKxx4FPkrHUxum918KjZO8,2513
-omdev/packaging/requires.py,sha256=VQ-rRDK4_w2R-0xMTbLCwhvZwkO-qgS8uEMbRhNmfOw,15598
-omdev/packaging/specifiers.py,sha256=6Odf9e6farwlPRsD_YqwTfYKG-BXn_dIcKtqfkhfodI,17432
-omdev/packaging/versions.py,sha256=ei2eopEsJq3zSMJmezK1nzZgikgCdxFtnF3f69nCRZQ,12246
+omdev/packaging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+omdev/packaging/marshal.py,sha256=mWRuZ_okYxRJXylKFQLQpC8Pp7xjkUEfWYNzQIS5A2c,2376
+omdev/packaging/names.py,sha256=-a7AykFPVR1i6EYJepbe3ABRrZQ_tPPmK5olzbn9HLI,2528
+omdev/packaging/requires.py,sha256=kyyVCM0RyaKqmXd6tU5zf0QjWvCLQMNV_ev5hvOee_o,15731
+omdev/packaging/specifiers.py,sha256=X8xOcwRLXTQYx5mYAS3ijqoTLlCtYESyUu4fX9bvblY,17447
+omdev/packaging/versions.py,sha256=K4eUOUvLmYcR4aeUywekeWTBqAvZchrIxLf7dl07MS4,12261
 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
@@ -130,15 +131,16 @@ omdev/tools/git.py,sha256=87DrMPtMLVPJ0R6yazX8JkKe8KIQyfEAcI0tYIQgKjU,4188
 omdev/tools/importscan.py,sha256=QeGjR3UGcuuuDUiisFuAXWHlcKJScGxGEcU6tfOh2CM,4069
 omdev/tools/mkrelimp.py,sha256=wsJAjTIf3nqcSfnT9TkDpS1VUOoM9W2Az5tZdWuzyLM,4054
 omdev/tools/notebook.py,sha256=M8Xi_gfZdlahnyFLtp0RBgYZPSHWQStMMDYZc71Zync,3494
-omdev/tools/pip.py,sha256=-jR5q3w4sHqntxCLExFCBNIARB788FUsAbJ62PK2sBU,2774
+omdev/tools/pip.py,sha256=_O7WAACQ1F1ffH4ogZHcppT4P8VQxWQchJMLn9FvsJc,5073
 omdev/tools/prof.py,sha256=8ZU9x_Dq8eT2ZFwU9sJpDIvxcIn9qBc8y2ELKPb5e5M,1382
+omdev/tools/qr.py,sha256=tm68lPwEAkEwIL2sUKPKBYfwwPtjVWG1DBZwur8_jY8,1737
 omdev/tools/sqlrepl.py,sha256=tmFZh80-xsGM62dyQ7_UGLebChrj7IHbIPYBWDJMgVk,5741
 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.dev107.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev107.dist-info/METADATA,sha256=YvVixJXzhPOArqpAuSbxYpi67N4-8pmSm4kcBZjTm8E,1704
-omdev-0.0.0.dev107.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-omdev-0.0.0.dev107.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev107.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev107.dist-info/RECORD,,
+omdev-0.0.0.dev109.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev109.dist-info/METADATA,sha256=7MFiPl54Th78lW2YIYpz80vxX6hgmmMSkQbZTruU3YA,1810
+omdev-0.0.0.dev109.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+omdev-0.0.0.dev109.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev109.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev109.dist-info/RECORD,,