omdev 0.0.0.dev396__py3-none-any.whl → 0.0.0.dev397__py3-none-any.whl

omdev/.manifests.json

@@ -515,7 +515,7 @@
     "module": ".tools.prof",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/prof.py",
-    "line": 57,
+    "line": 128,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "prof",

omdev/dataclasses/codegen.py

@@ -7,7 +7,6 @@ TODO:
  - !! manifests for dataclass config?
   - more sparse / diffuse intent, not package-level
 """
-import json
 import logging
 import os.path
 import typing as ta
@@ -78,7 +77,7 @@ class DataclassCodeGen:
             for dp, _, fns in os.walk(root_dir):
                 if PACKAGE_CONFIG_FILE_NAME in fns:
                     with open(os.path.join(dp, PACKAGE_CONFIG_FILE_NAME)) as f:
-                        config = PackageConfig(**json.load(f))
+                        config = PackageConfig.loads(f.read())
                     pkg_parts = dp.split(os.sep)
                     trie[pkg_parts] = config
 

omdev/tools/prof.py

@@ -3,6 +3,7 @@ TODO:
  - a general purpose profile tool lol - or is this for / in bootstrap?
 """
 import os.path
+import shutil
 import subprocess
 import sys
 import tempfile
@@ -15,43 +16,113 @@ from ..cli import CliModule
 ##
 
 
+def pstats_to_pdf(
+        pstats_file: str,
+        pdf_file: str,
+) -> None:
+    dot = subprocess.check_output([
+        sys.executable,
+        '-m', 'gprof2dot',
+        '-f', 'pstats',
+        pstats_file,
+    ])
+
+    pdf = subprocess.check_output(
+        ['dot', '-Tpdf'],
+        input=dot,
+    )
+
+    with open(pdf_file, 'wb') as f:
+        f.write(pdf)
+
+
 class Cli(ap.Cli):
     @ap.cmd(
-        ap.arg('file'),
-        ap.arg('out-file', nargs='?'),
+        ap.arg('pstats-file'),
+        ap.arg('pdf-file', nargs='?'),
         ap.arg('-w', '--write', action='store_true'),
         ap.arg('-o', '--open', action='store_true'),
         ap.arg('-O', '--overwrite', action='store_true'),
     )
     def pstats_pdf(self) -> None:
-        out_file = self.args.out_file
-        if out_file is None and self.args.write:
-            out_file = self.args.file + '.pdf'
+        pdf_file = self.args.pdf_file
+        if pdf_file is None and self.args.write:
+            pdf_file = self.args.pstats_file + '.pdf'
 
-        if out_file is not None:
-            if os.path.exists(out_file) and not self.args.overwrite:
-                raise OSError(f'File exists: {out_file}')
+        if pdf_file is not None:
+            if os.path.exists(pdf_file) and not self.args.overwrite:
+                raise OSError(f'File exists: {pdf_file}')
         else:
-            out_file = tempfile.mktemp(suffix=os.path.basename(self.args.file) + '.pdf')  # noqa
+            pdf_file = tempfile.mktemp(suffix=os.path.basename(self.args.pstats_file) + '.pdf')  # noqa
+
+        pstats_to_pdf(
+            self.args.pstats_file,
+            self.args.pdf_file,
+        )
+
+        print(pdf_file)
+
+        if self.args.open:
+            subprocess.check_call(['open', pdf_file])
+
+    @ap.cmd(
+        ap.arg('src'),
+        ap.arg('out-file', nargs='?'),
+        ap.arg('-p', '--pdf', action='store_true'),
+        ap.arg('-o', '--open', action='store_true'),
+        ap.arg('-O', '--overwrite', action='store_true'),
+    )
+    def pstats_exec(self) -> None:
+        if self.args.out_file is not None:
+            if os.path.exists(self.args.out_file) and not self.args.overwrite:
+                raise OSError(f'File exists: {self.args.out_file}')
+
+        tmp_dir = tempfile.mkdtemp()
+
+        src_file = os.path.join(tmp_dir, 'pstats_exec.py')
+        with open(src_file, 'w') as f:
+            f.write(self.args.src)
+
+        pstats_file = os.path.join(tmp_dir, 'prof.pstats')
 
-        dot = subprocess.check_output([
+        # TODO: --python - and handle env vars, unset venv and pythonpath stuff - helper for this, scrub env
+        #  - share with execstat, -x
+        subprocess.check_call([
             sys.executable,
-            '-m', 'gprof2dot',
-            '-f', 'pstats',
-            self.args.file,
+            '-m', 'cProfile',
+            '-o', pstats_file,
+            os.path.abspath(src_file),
         ])
 
-        pdf = subprocess.check_output(
-            ['dot', '-Tpdf'],
-            input=dot,
-        )
+        if self.args.pdf:
+            out_file = os.path.join(tmp_dir, 'pstats.pdf')
+
+            pstats_to_pdf(
+                pstats_file,
+                out_file,
+            )
+
+        else:
+            out_file = pstats_file
+
+        if self.args.out_file is not None:
+            shutil.move(out_file, self.args.out_file)
+            out_file = self.args.out_file
 
-        with open(out_file, 'wb') as f:
-            f.write(pdf)
         print(out_file)
 
         if self.args.open:
-            subprocess.check_call(['open', out_file])
+            if self.args.pdf:
+                subprocess.check_call(['open', out_file])
+
+            else:
+                # Alt: python -i <setup.py> where setup.py is 'import pstats; stats = pstats.Stats(<out_file>)'
+                os.execl(
+                    sys.executable,
+                    sys.executable,
+                    '-m', 'pstats',
+                    out_file,
+                )
 
 
 # @omlish-manifest

{omdev-0.0.0.dev396.dist-info → omdev-0.0.0.dev397.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev396
+Version: 0.0.0.dev397
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev396
+Requires-Dist: omlish==0.0.0.dev397
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev396.dist-info → omdev-0.0.0.dev397.dist-info}/RECORD

@@ -1,4 +1,4 @@
-omdev/.manifests.json,sha256=zs6pTjCl5WETKw4-z4zXwBY5t-hWIhu-tjcxr_K3Nmo,12451
+omdev/.manifests.json,sha256=vqg148YzWHn61WpGqC2PuTiOIR2HcH5O55XZZGTcnVw,12452
 omdev/__about__.py,sha256=fQNmzSa1MntcPSrzg_Vpo6JRU2RbXik2NqRz0oQCApE,1202
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cmake.py,sha256=9rfSvFHPmKDj9ngvfDB2vK8O-xO_ZwUm7hMKLWA-yOw,4578
@@ -128,7 +128,7 @@ omdev/cmdlog/cmdlog.py,sha256=MJqfCG7sVWjSK_i1shD7cgWpFZXZkPvGhGEh-yd6iwM,1982
 omdev/dataclasses/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/dataclasses/__main__.py,sha256=N-a0Lf_s7D0VajuZCCY_dt8R4rSpeck9inbCsoIvciQ,175
 omdev/dataclasses/cli.py,sha256=j5GfpJQSkA_jmV94XTVb3amCFYjgrasMs-bp_zJEkqE,445
-omdev/dataclasses/codegen.py,sha256=yXTgTBSHafFwkbPOlnyxgaO_S5rDpSxB4awA5U6qMPU,3041
+omdev/dataclasses/codegen.py,sha256=T9SYsTjmNrM1HMUFVMO46-Szd3DH0Em0B-I_UTan6qg,3029
 omdev/dataserver/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/dataserver/handlers.py,sha256=YTuRfZehP9panTwq8dPReHZwXF1_fFIueh-_ZoztA98,5446
 omdev/dataserver/http.py,sha256=SMS6w-GVevG58FypqmPytcEqW8aUWpd2_F6JlBDIuBc,1730
@@ -288,7 +288,7 @@ omdev/tools/linehisto.py,sha256=0ZNm34EuiZBE9Q2YC6KNLNNydNT8QPSOwvYzXiU9S2Q,8881
 omdev/tools/mkenv.py,sha256=G2tu5bmiyKFyZuqtUoM7Z-6AI6CI86F2LwoIozoWOvo,2300
 omdev/tools/notebook.py,sha256=MGi2JEwyIPR1n7gakaaYZL1HHbSVmDKGQROqH56ppgU,3499
 omdev/tools/pip.py,sha256=HF5ILsNcU1IGn9bRthwjp4XicafZWR7zdp6rOhqSMiw,3464
-omdev/tools/prof.py,sha256=yPU0gkw4yWVsbAr3L95sO2FC8MM1DpzZiVVMcQlFt4c,1472
+omdev/tools/prof.py,sha256=AWcuToo3VACxyFRdUEmdqtGcfidPlvJCwkD-q_b6uIs,3485
 omdev/tools/qr.py,sha256=1p4tMJmImDa4YTQQNPwQPkM8FnhGRYj6J79BJR-MNHo,1742
 omdev/tools/shadow.py,sha256=4E2ilxa16liIvQxvgU37ITkOMrP6ufShRQfeW7wwtRc,1697
 omdev/tools/shell.py,sha256=5hF_8DCtB3XrzJSfmQDsr7X3Fi9KRV4M70q9qp0KREA,2341
@@ -321,9 +321,9 @@ omdev/tools/jsonview/resources/jsonview.js,sha256=faDvXDOXKvEvjOuIlz4D3F2ReQXb_b
 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=ao5mdrpiSU4AZ8mBozoEaV3UVlmVTnRG9wD9XP70MZE,11429
-omdev-0.0.0.dev396.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev396.dist-info/METADATA,sha256=P-t7fBSvtfmpL6qn22sWqHkKJ5RS-fAAjn_ncEb9nQw,5094
-omdev-0.0.0.dev396.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omdev-0.0.0.dev396.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev396.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev396.dist-info/RECORD,,
+omdev-0.0.0.dev397.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev397.dist-info/METADATA,sha256=bAgNwHp9Gc2_P6AUojLiMF61tGyHIvXlOmx8C065zhI,5094
+omdev-0.0.0.dev397.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omdev-0.0.0.dev397.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev397.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev397.dist-info/RECORD,,