omdev 0.0.0.dev282__tar.gz → 0.0.0.dev284__tar.gz

{omdev-0.0.0.dev282/omdev.egg-info → omdev-0.0.0.dev284}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev282
+Version: 0.0.0.dev284
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,18 +12,17 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev282
+Requires-Dist: omlish==0.0.0.dev284
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
 Requires-Dist: docutils~=0.21; extra == "all"
-Requires-Dist: markdown-it-py~=3.7; extra == "all"
+Requires-Dist: markdown-it-py~=3.0; extra == "all"
 Requires-Dist: mypy~=1.15; extra == "all"
-Requires-Dist: gprof2dot~=2024.6; extra == "all"
+Requires-Dist: gprof2dot~=2025.4; extra == "all"
 Requires-Dist: prompt-toolkit~=3.0; extra == "all"
 Requires-Dist: segno~=1.6; extra == "all"
-Requires-Dist: wheel~=0.45; extra == "all"
 Provides-Extra: black
 Requires-Dist: black~=25.1; extra == "black"
 Provides-Extra: c
@@ -31,15 +30,13 @@ Requires-Dist: pycparser~=2.22; extra == "c"
 Requires-Dist: pcpp~=1.30; extra == "c"
 Provides-Extra: doc
 Requires-Dist: docutils~=0.21; extra == "doc"
-Requires-Dist: markdown-it-py~=3.7; extra == "doc"
+Requires-Dist: markdown-it-py~=3.0; extra == "doc"
 Provides-Extra: mypy
 Requires-Dist: mypy~=1.15; extra == "mypy"
 Provides-Extra: prof
-Requires-Dist: gprof2dot~=2024.6; extra == "prof"
+Requires-Dist: gprof2dot~=2025.4; 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: wheel
-Requires-Dist: wheel~=0.45; extra == "wheel"
 Dynamic: license-file

{omdev-0.0.0.dev282 → omdev-0.0.0.dev284}/omdev/.manifests.json

@@ -11,18 +11,6 @@
       }
     }
   },
-  {
-    "module": ".bracepy",
-    "attr": "_CLI_MODULE",
-    "file": "omdev/bracepy.py",
-    "line": 88,
-    "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "bracepy",
-        "mod_name": "omdev.bracepy"
-      }
-    }
-  },
   {
     "module": ".cc.__main__",
     "attr": "_CLI_MODULE",
@@ -47,18 +35,6 @@
       }
     }
   },
-  {
-    "module": ".classdot",
-    "attr": "_CLI_MODULE",
-    "file": "omdev/classdot.py",
-    "line": 62,
-    "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "py/classdot",
-        "mod_name": "omdev.classdot"
-      }
-    }
-  },
   {
     "module": ".cli.clicli",
     "attr": "_CLI_MODULE",
@@ -71,23 +47,11 @@
       }
     }
   },
-  {
-    "module": ".findimports",
-    "attr": "_CLI_MODULE",
-    "file": "omdev/findimports.py",
-    "line": 81,
-    "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "py/findimports",
-        "mod_name": "omdev.findimports"
-      }
-    }
-  },
   {
     "module": ".imgur",
     "attr": "_FOO_CLI_MODULE",
     "file": "omdev/imgur.py",
-    "line": 130,
+    "line": 133,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "imgur",
@@ -156,50 +120,122 @@
     }
   },
   {
-    "module": ".pyproject.__main__",
+    "module": ".py.attrdocs",
     "attr": "_CLI_MODULE",
-    "file": "omdev/pyproject/__main__.py",
-    "line": 4,
+    "file": "omdev/py/attrdocs.py",
+    "line": 146,
     "value": {
       "$.cli.types.CliModule": {
-        "cmd_name": "pyproject",
-        "mod_name": "omdev.pyproject.__main__"
+        "cmd_name": "py/attrdocs",
+        "mod_name": "omdev.py.attrdocs"
+      }
+    }
+  },
+  {
+    "module": ".py.bracepy",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/py/bracepy.py",
+    "line": 94,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "bracepy",
+        "mod_name": "omdev.py.bracepy"
+      }
+    }
+  },
+  {
+    "module": ".py.classdot",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/py/classdot.py",
+    "line": 63,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "py/classdot",
+        "mod_name": "omdev.py.classdot"
+      }
+    }
+  },
+  {
+    "module": ".py.findimports",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/py/findimports.py",
+    "line": 87,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "py/findimports",
+        "mod_name": "omdev.py.findimports"
       }
     }
   },
   {
-    "module": ".scripts.execrss",
+    "module": ".py.scripts.execrss",
     "attr": "_CLI_MODULE",
-    "file": "omdev/scripts/execrss.py",
+    "file": "omdev/py/scripts/execrss.py",
     "line": 11,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "py/execrss",
-        "mod_name": "omdev.scripts.execrss"
+        "mod_name": "omdev.py.scripts.execrss"
       }
     }
   },
   {
-    "module": ".scripts.exectime",
+    "module": ".py.scripts.exectime",
     "attr": "_CLI_MODULE",
-    "file": "omdev/scripts/exectime.py",
+    "file": "omdev/py/scripts/exectime.py",
     "line": 66,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "py/exectime",
-        "mod_name": "omdev.scripts.exectime"
+        "mod_name": "omdev.py.scripts.exectime"
       }
     }
   },
   {
-    "module": ".scripts.importtrace",
+    "module": ".py.scripts.importtrace",
     "attr": "_CLI_MODULE",
-    "file": "omdev/scripts/importtrace.py",
+    "file": "omdev/py/scripts/importtrace.py",
     "line": 477,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "py/importtrace",
-        "mod_name": "omdev.scripts.importtrace"
+        "mod_name": "omdev.py.scripts.importtrace"
+      }
+    }
+  },
+  {
+    "module": ".py.tools.importscan",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/py/tools/importscan.py",
+    "line": 178,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "py/importscan",
+        "mod_name": "omdev.py.tools.importscan"
+      }
+    }
+  },
+  {
+    "module": ".py.tools.mkrelimp",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/py/tools/mkrelimp.py",
+    "line": 146,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "py/mkrelimp",
+        "mod_name": "omdev.py.tools.mkrelimp"
+      }
+    }
+  },
+  {
+    "module": ".pyproject.__main__",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/pyproject/__main__.py",
+    "line": 4,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "pyproject",
+        "mod_name": "omdev.pyproject.__main__"
       }
     }
   },
@@ -303,18 +339,6 @@
       }
     }
   },
-  {
-    "module": ".tools.importscan",
-    "attr": "_CLI_MODULE",
-    "file": "omdev/tools/importscan.py",
-    "line": 178,
-    "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "py/importscan",
-        "mod_name": "omdev.tools.importscan"
-      }
-    }
-  },
   {
     "module": ".tools.intellij",
     "attr": "_CLI_MODULE",
@@ -371,18 +395,6 @@
       }
     }
   },
-  {
-    "module": ".tools.mkrelimp",
-    "attr": "_CLI_MODULE",
-    "file": "omdev/tools/mkrelimp.py",
-    "line": 146,
-    "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "py/mkrelimp",
-        "mod_name": "omdev.tools.mkrelimp"
-      }
-    }
-  },
   {
     "module": ".tools.notebook",
     "attr": "_CLI_MODULE",

{omdev-0.0.0.dev282 → omdev-0.0.0.dev284}/omdev/__about__.py

@@ -24,7 +24,7 @@ class Project(ProjectBase):
         'doc': [
             'docutils ~= 0.21',
 
-            'markdown-it-py ~= 3.7',
+            'markdown-it-py ~= 3.0',
             # 'mdit-py-plugins ~= 0.4',
         ],
 
@@ -33,7 +33,7 @@ class Project(ProjectBase):
         ],
 
         'prof': [
-            'gprof2dot ~= 2024.6',
+            'gprof2dot ~= 2025.4',
         ],
 
         'ptk': [
@@ -43,10 +43,6 @@ class Project(ProjectBase):
         'qr': [
             'segno ~= 1.6',
         ],
-
-        'wheel': [
-            'wheel ~= 0.45',
-        ],
     }
 
     entry_points = {

{omdev-0.0.0.dev282 → omdev-0.0.0.dev284}/omdev/cache/compute/types.py

@@ -90,7 +90,7 @@ class Object(lang.Abstract):
 
 
 @dc.dataclass(frozen=True)
-@dc.extra_params(cache_hash=True)
+@dc.extra_class_params(cache_hash=True)
 class CacheKey(lang.Abstract, ta.Generic[NameT]):
     name: NameT
 

{omdev-0.0.0.dev282 → omdev-0.0.0.dev284}/omdev/cmake.py

@@ -4,6 +4,9 @@ import typing as ta
 from omlish import dataclasses as dc
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class Command:
     name: str

{omdev-0.0.0.dev282 → omdev-0.0.0.dev284}/omdev/imgur.py

@@ -36,6 +36,9 @@ from .cli import CliModule
 from .home.secrets import load_secrets
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 @msh.update_object_metadata(unknown_field='x')
 class ImageUploadData:

{omdev-0.0.0.dev282 → omdev-0.0.0.dev284}/omdev/precheck/scripts.py

@@ -3,8 +3,8 @@ import os
 import stat
 import typing as ta
 
-from .. import findimports
 from .. import magic
+from ..py import findimports
 from .base import Precheck
 from .base import PrecheckContext
 

omdev-0.0.0.dev284/omdev/py/__init__.py

@@ -0,0 +1,3 @@
+"""
+Python source-related utilities.
+"""

omdev-0.0.0.dev284/omdev/py/attrdocs.py

@@ -0,0 +1,177 @@
+# ruff: noqa: N802
+import ast
+import dataclasses as dc
+import inspect
+import typing as ta
+
+from omlish import check
+from omlish import lang
+
+from ..tokens import all as tks
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class AttrDoc:
+    docstring: str | None = None
+    trailing_comment: str | None = None
+    preceding_comment: str | None = None
+
+    __repr__ = lang.AttrRepr.of(
+        'docstring',
+        'trailing_comment',
+        'preceding_comment',
+        value_filter=bool,
+    )
+
+
+_EMPTY_ATTR_DOC = AttrDoc()
+
+
+##
+
+
+class _AttrDocAstVisitor(ast.NodeVisitor):
+    def __init__(
+            self,
+            *,
+            tok_lines: ta.Sequence[tks.Tokens] | None = None,
+    ) -> None:
+        super().__init__()
+
+        self._tok_lines = tok_lines
+
+        self._attr_docs: dict[str, AttrDoc] = {}
+        self._target: str | None = None
+        self._prev_node_type: type[ast.AST] | None = None
+
+    @property
+    def attr_docs(self) -> ta.Mapping[str, AttrDoc]:
+        return self._attr_docs
+
+    #
+
+    def visit(self, node: ast.AST) -> ta.Any:
+        if isinstance(node, (ast.AsyncFunctionDef, ast.FunctionDef)):
+            self._prev_node_type = None
+            return None
+        node_result = super().visit(node)
+        self._prev_node_type = type(node)
+        return node_result
+
+    #
+
+    @staticmethod
+    def _comment_tok_src(tok: tks.Token) -> str:
+        check.state(tok.name == 'COMMENT')
+        tc = tok.src
+        check.state(tc[0] == '#')
+        return tc[1:].lstrip()
+
+    def _set_target(self, node: ast.Name) -> None:
+        self._target = node.id
+
+        ad = _EMPTY_ATTR_DOC
+
+        if self._tok_lines is not None:
+            line = self._tok_lines[node.lineno - 1]
+            for t in reversed(line):
+                if t.name not in tks.WS_NAMES:
+                    break
+                if t.name == 'COMMENT':
+                    ad = dc.replace(ad, trailing_comment=self._comment_tok_src(t))
+                    break
+
+            pll: list[str] = []
+            pln = node.lineno - 1
+            while pln > 0:
+                line = self._tok_lines[pln - 1]
+                no_ws_line = list(tks.ignore_ws(line, keep={'COMMENT'}))
+                if not no_ws_line or no_ws_line[0].name != 'COMMENT':  # noqa
+                    break
+                pll.append(self._comment_tok_src(no_ws_line[0]))
+                pln -= 1
+            if pll:
+                ad = dc.replace(ad, preceding_comment='\n'.join(reversed(pll)))
+
+        if ad is not _EMPTY_ATTR_DOC:
+            self._attr_docs[node.id] = ad
+
+    def visit_AnnAssign(self, node: ast.AnnAssign) -> ta.Any:
+        if isinstance(target := node.target, ast.Name):
+            self._set_target(target)
+
+    def visit_Assign(self, node: ast.Assign) -> ta.Any:
+        if len(node.targets) == 1 and isinstance(target := node.targets[0], ast.Name):
+            self._set_target(target)  # noqa
+
+    #
+
+    def visit_Expr(self, node: ast.Expr) -> ta.Any:
+        if (
+                isinstance(node.value, ast.Constant) and
+                isinstance(node.value.value, str) and
+                self._prev_node_type in (ast.Assign, ast.AnnAssign)
+        ):
+            docstring = inspect.cleandoc(node.value.value)
+            if self._target:
+                ex = self._attr_docs.get(self._target, _EMPTY_ATTR_DOC)
+                check.none(ex.docstring)
+                self._attr_docs[self._target] = dc.replace(ex, docstring=docstring)
+            self._target = None
+
+
+def extract_attr_docs(src: str) -> ta.Mapping[str, AttrDoc]:
+    if not src:
+        return {}
+
+    toks = tks.src_to_tokens(src)
+    tok_lines = tks.split_lines_dense(toks)
+
+    src_ast = ast.parse(src)
+
+    # import astpretty
+    # astpretty.pprint(src_ast)
+
+    ast_visitor = _AttrDocAstVisitor(tok_lines=tok_lines)
+    ast_visitor.visit(src_ast)
+    return ast_visitor.attr_docs
+
+
+##
+
+
+# @omlish-manifest
+_CLI_MODULE = {'$omdev.cli.types.CliModule': {
+    'cmd_name': 'py/attrdocs',
+    'mod_name': __name__,
+}}
+
+
+if __name__ == '__main__':
+    def _main() -> None:
+        import argparse
+
+        parser = argparse.ArgumentParser()
+        parser.add_argument('file')
+        args = parser.parse_args()
+
+        #
+
+        with open(args.file) as f:
+            src = f.read()
+
+        attr_docs = extract_attr_docs(src)
+
+        #
+
+        import json
+
+        print(json.dumps({
+            a: {k: v for k, v in dc.asdict(ad).items() if v}
+            for a, ad in sorted(attr_docs.items(), key=lambda t: t[0])
+        }))
+
+    _main()

{omdev-0.0.0.dev282/omdev → omdev-0.0.0.dev284/omdev/py}/bracepy.py

@@ -7,6 +7,9 @@ import io
 import tokenize
 
 
+##
+
+
 def translate_brace_python(
         s: str,
         *,
@@ -85,6 +88,9 @@ def translate_brace_python(
     return ret.getvalue()
 
 
+##
+
+
 # @omlish-manifest
 _CLI_MODULE = {'$omdev.cli.types.CliModule': {
     'cmd_name': 'bracepy',

{omdev-0.0.0.dev282/omdev → omdev-0.0.0.dev284/omdev/py}/classdot.py

@@ -7,7 +7,8 @@ import typing as ta
 
 from omlish.graphs import dot
 
-from .cli import CliModule
+
+##
 
 
 def gen_class_dot(roots: ta.Iterable[type]) -> dot.Graph:
@@ -60,7 +61,10 @@ def _main() -> None:
 
 
 # @omlish-manifest
-_CLI_MODULE = CliModule('py/classdot', __name__)
+_CLI_MODULE = {'$omdev.cli.types.CliModule': {
+    'cmd_name': 'py/classdot',
+    'mod_name': __name__,
+}}
 
 
 if __name__ == '__main__':

{omdev-0.0.0.dev282/omdev → omdev-0.0.0.dev284/omdev/py}/findimports.py

@@ -13,6 +13,9 @@ import sys
 import typing as ta
 
 
+##
+
+
 _BUILTIN_MODULE_NAMES = frozenset([*sys.builtin_module_names, *sys.stdlib_module_names])
 
 
@@ -78,6 +81,9 @@ def get_import_deps(imps: set[str]) -> set[str]:
     return {i for i in eimps if whichmod(i) != 'builtin'}
 
 
+##
+
+
 # @omlish-manifest
 _CLI_MODULE = {'$omdev.cli.types.CliModule': {
     'cmd_name': 'py/findimports',

{omdev-0.0.0.dev282/omdev → omdev-0.0.0.dev284/omdev/py}/tools/importscan.py

@@ -26,7 +26,7 @@ from omlish import check
 from omlish import concurrent as cu
 from omlish import lang
 
-from ..cli import CliModule
+from ...cli import CliModule
 
 
 ##

{omdev-0.0.0.dev282/omdev → omdev-0.0.0.dev284/omdev/py}/tools/mkrelimp.py

@@ -6,8 +6,8 @@ import typing as ta
 
 from omlish.logs import all as logs
 
-from ..cli import CliModule
-from ..tokens import all as tks
+from ...cli import CliModule
+from ...tokens import all as tks
 
 
 T = ta.TypeVar('T')