omdev 0.0.0.dev67__py3-none-any.whl → 0.0.0.dev69__py3-none-any.whl

omdev/.manifests.json

@@ -39,7 +39,7 @@
     "module": ".cli.clicli",
     "attr": "_CLI_MODULE",
     "file": "omdev/cli/clicli.py",
-    "line": 84,
+    "line": 88,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "cli",
@@ -171,7 +171,7 @@
     "module": ".tools.nbtools",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/nbtools.py",
-    "line": 44,
+    "line": 115,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": [

omdev/__about__.py

@@ -12,6 +12,10 @@ class Project(ProjectBase):
     ]
 
     optional_dependencies = {
+        'black': [
+            'black ~= 24.10',
+        ],
+
         'c': [
             'pycparser ~= 2.22',
             'cffi ~= 1.17',

omdev/cli/clicli.py

@@ -25,6 +25,10 @@ class CliCli(ap.Cli):
     def print_revision(self) -> None:
         print(__about__.__revision__)
 
+    @ap.command(name='home')
+    def print_home(self) -> None:
+        print(sys.prefix)
+
     @ap.command(
         ap.arg('--url', default=DEFAULT_REINSTALL_URL),
         ap.arg('--local', action='store_true'),

omdev/tools/nbtools.py

@@ -1,9 +1,13 @@
 import io
 import json
 import os.path
+import subprocess
 import sys
+import urllib.parse
+import urllib.request
 
 from omlish import argparse as ap
+from omlish import check
 
 from ..cli import CliModule
 
@@ -13,32 +17,99 @@ class Cli(ap.Cli):
         ap.arg('file'),
         ap.arg('-w', '--write', action='store_true'),
         ap.arg('-o', '--overwrite', action='store_true'),
+        ap.arg('--no-header', action='store_true'),
+        ap.arg('--keep-bangs', action='store_true'),
+        ap.arg('--black', action='store_true'),
     )
-    def code(self) -> None:
-        if self.args.write:
-            out_file = self.args.file.rpartition('.')[0] + '.py'
-            if os.path.isfile(out_file) and not self.args.overwrite:
-                raise OSError(f'File exists: {out_file}')
+    def strip_code(self) -> None:
+        out_file: str | None = None
+        out_header: list[str] = []
+
+        if ':' in self.args.file:
+            url = self.args.file
+            pu = urllib.parse.urlparse(url)
+            check.equal(pu.scheme, 'https')
+
+            out_header.append(f'# Origin: {url}')
+
+            if pu.hostname == 'github.com':
+                _, user, repo, blob, *rest = pu.path.split('/')
+                check.equal(blob, 'blob')
+                url = f'https://raw.githubusercontent.com/{user}/{repo}/refs/heads/{"/".join(rest)}'
+
+            elif pu.hostname == 'raw.githubusercontent.com':
+                pass
+
+            else:
+                raise ValueError(pu.hostname)
+
+            file = pu.path.split('/')[-1]
+            check.state(file.endswith('.ipynb'))
+
+            if self.args.write:
+                out_file = file.rpartition('.')[0] + '.py'
+
+            with urllib.request.urlopen(url) as resp:  # noqa
+                buf = resp.read()
+
+            dct = json.loads(buf.decode('utf-8'))
+
+        elif self.args.file == '-':
+            if self.args.write:
+                raise Exception('Write not supported with stdin')
+
+            dct = json.load(sys.stdin)
+
         else:
-            out_file = None
+            with open(self.args.file) as f:
+                dct = json.load(f)
+
+            if self.args.write:
+                out_file = self.args.file.rpartition('.')[0] + '.py'
 
-        with open(self.args.file) as f:
-            dct = json.load(f)
+        if out_file is not None and os.path.isfile(out_file) and not self.args.overwrite:
+            raise OSError(f'File exists: {out_file}')
+
+        delim = '\n##\n\n'
 
         out = io.StringIO()
+        if not self.args.no_header and out_header:
+            out.write('\n'.join(out_header))
+            out.write(delim)
+
         code_cells = [c for c in dct['cells'] if c['cell_type'] == 'code']
         for i, c in enumerate(code_cells):
             if i:
-                out.write('\n##\n\n')
-            out.write(''.join(c['source']))
+                out.write(delim)
+
+            src = ''.join(c['source'])
+            if not self.args.keep_bangs:
+                src = ''.join(
+                    ('# ' + l) if l.startswith('!') else l
+                    for l in src.splitlines(keepends=True)
+                )
+
+            out.write(src)
             out.write('\n')
 
+        out_src = out.getvalue()
+
+        if self.args.black:
+            proc = subprocess.run(
+                [sys.executable, '-m', 'black', '-'],
+                input=out_src.encode('utf-8'),
+                stdout=subprocess.PIPE,
+                check=True,
+            )
+            out_src = proc.stdout.decode('utf-8')
+
         if out_file is not None:
             with open(out_file, 'w') as f:
-                f.write(out.getvalue())
+                f.write(out_src)
             print(f'Wrote {out_file}')
+
         else:
-            sys.stdout.write(out.getvalue())
+            sys.stdout.write(out_src)
 
 
 # @omlish-manifest

{omdev-0.0.0.dev67.dist-info → omdev-0.0.0.dev69.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev67
+Version: 0.0.0.dev69
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,9 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: ~=3.12
 License-File: LICENSE
-Requires-Dist: omlish ==0.0.0.dev67
+Requires-Dist: omlish ==0.0.0.dev69
 Provides-Extra: all
+Requires-Dist: black ~=24.10 ; extra == 'all'
 Requires-Dist: pycparser ~=2.22 ; extra == 'all'
 Requires-Dist: cffi ~=1.17 ; extra == 'all'
 Requires-Dist: pcpp ~=1.30 ; extra == 'all'
@@ -21,6 +22,8 @@ Requires-Dist: docutils ~=0.21 ; extra == 'all'
 Requires-Dist: mypy ~=1.11 ; extra == 'all'
 Requires-Dist: tokenize-rt ~=6.0 ; extra == 'all'
 Requires-Dist: wheel ~=0.44 ; extra == 'all'
+Provides-Extra: black
+Requires-Dist: black ~=24.10 ; extra == 'black'
 Provides-Extra: c
 Requires-Dist: pycparser ~=2.22 ; extra == 'c'
 Requires-Dist: cffi ~=1.17 ; extra == 'c'

{omdev-0.0.0.dev67.dist-info → omdev-0.0.0.dev69.dist-info}/RECORD

@@ -1,5 +1,5 @@
-omdev/.manifests.json,sha256=-soVkIwt6YB1DbsxaHqGNe4N46stWaTqT6Z18vb-CiU,4476
-omdev/__about__.py,sha256=LqSNNFFcT84xW3W8fIOJ78kPYJKFLIXZyDX-AJREvN0,1005
+omdev/.manifests.json,sha256=uO7iZexM0Maf0zfoaBOG0fia5BzUfRQ3Ji9A4CSmd08,4477
+omdev/__about__.py,sha256=2mFs3ycC0n2aFJRsyL2yt4CVslLnIMTEYwXmubo7EeM,1066
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/bracepy.py,sha256=HwBK5XmlOsF_juTel25fRLJK9vHSJCWXuCc-OZlevRQ,2619
 omdev/classdot.py,sha256=K0YMTngaC6uuEKhDb95tFzW33Re_YEdgIWBBeze4PTI,1628
@@ -59,7 +59,7 @@ omdev/cexts/_distutils/compilers/options.py,sha256=H7r5IcLvga5Fs3jjXWIT-6ap3JBdu
 omdev/cexts/_distutils/compilers/unixccompiler.py,sha256=o1h8QuyupLntv4F21_XjzAZmCiwwxJuTmOirvBSL-Qw,15419
 omdev/cli/__init__.py,sha256=V_l6VP1SZMlJbO-8CJwSuO9TThOy2S_oaPepNYgIrbE,37
 omdev/cli/__main__.py,sha256=mOJpgc07o0r5luQ1DlX4tk2PqZkgmbwPbdzJ3KmtjgQ,138
-omdev/cli/clicli.py,sha256=rQ9-F9XI3BevnfIVALHVKrrHNQPdYhkQ-IKESTNB5RA,2447
+omdev/cli/clicli.py,sha256=S2iFrFpGrhm2Ls1Z9qiteBVDEdmF4QJgP3Vv5ndnQ8o,2537
 omdev/cli/install.py,sha256=C-W171YlIHt4Cfok-nWSMbHwWhqF_PFqq2HixFttYx8,4460
 omdev/cli/main.py,sha256=fQL-KdKZDmw00d8vtgxGmUc9Pp3dnhW1BW-Pzu6JPX0,4172
 omdev/cli/managers.py,sha256=tC4saQQhawMwmRzXs4ErKuO3P10rm7GhY2PUUsTK2Ss,1159
@@ -115,14 +115,14 @@ omdev/tools/dockertools.py,sha256=fkiIAzV-67b4knoF68P19shk94Vec_7xX8MwFGzvPlc,69
 omdev/tools/gittools.py,sha256=SMuKeonZP16lYBecmKB7sn_VZ-ljQnJJF6TGX0isVwA,2031
 omdev/tools/importscan.py,sha256=vxOMdAABShqt5-G3n6DGHopCZ5uGgciThY0MCa5W0mA,4066
 omdev/tools/mkrelimp.py,sha256=fwt4GWzenuLNVtzdK2uaJJTSuJbUVJZquF5adwAwlPg,4051
-omdev/tools/nbtools.py,sha256=JZcgTMX3IP-nAtk2QAVU_PXlF4FFNxRDebB8zQX_RQ0,1260
+omdev/tools/nbtools.py,sha256=5sAFXw0joeHsE1wCseiyYFHxE459UfE83S8VnHIRXiE,3395
 omdev/tools/piptools.py,sha256=-jR5q3w4sHqntxCLExFCBNIARB788FUsAbJ62PK2sBU,2774
 omdev/tools/proftools.py,sha256=xKSm_yPoCnfsvS3iT9MblDqFMuZmGfI3_koGj8amMyU,145
 omdev/tools/rst.py,sha256=6dWk8QZHoGiLSuBw3TKsXZjjFK6wWBEtPi9krdCLKKg,977
 omdev/tools/sqlrepl.py,sha256=tmFZh80-xsGM62dyQ7_UGLebChrj7IHbIPYBWDJMgVk,5741
-omdev-0.0.0.dev67.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev67.dist-info/METADATA,sha256=M8dV_C4AOWrLC0AwHO2mbcHF7x6USkIT-TJnGzGG4Y0,1252
-omdev-0.0.0.dev67.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-omdev-0.0.0.dev67.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev67.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev67.dist-info/RECORD,,
+omdev-0.0.0.dev69.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev69.dist-info/METADATA,sha256=iywdQ1OkwY6R1tyXqZ_19DKRmYK2uNHdW2xXLTx4VPs,1368
+omdev-0.0.0.dev69.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+omdev-0.0.0.dev69.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev69.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev69.dist-info/RECORD,,