omdev 0.0.0.dev282__py3-none-any.whl → 0.0.0.dev283__py3-none-any.whl

omdev/.manifests.json

@@ -11,11 +11,23 @@
       }
     }
   },
+  {
+    "module": ".attrdocs",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/attrdocs.py",
+    "line": 146,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "py/attrdocs",
+        "mod_name": "omdev.attrdocs"
+      }
+    }
+  },
   {
     "module": ".bracepy",
     "attr": "_CLI_MODULE",
     "file": "omdev/bracepy.py",
-    "line": 88,
+    "line": 94,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "bracepy",
@@ -51,7 +63,7 @@
     "module": ".classdot",
     "attr": "_CLI_MODULE",
     "file": "omdev/classdot.py",
-    "line": 62,
+    "line": 65,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "py/classdot",
@@ -75,7 +87,7 @@
     "module": ".findimports",
     "attr": "_CLI_MODULE",
     "file": "omdev/findimports.py",
-    "line": 81,
+    "line": 87,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "py/findimports",
@@ -87,7 +99,7 @@
     "module": ".imgur",
     "attr": "_FOO_CLI_MODULE",
     "file": "omdev/imgur.py",
-    "line": 130,
+    "line": 133,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "imgur",

omdev/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/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/classdot.py

@@ -10,6 +10,9 @@ from omlish.graphs import dot
 from .cli import CliModule
 
 
+##
+
+
 def gen_class_dot(roots: ta.Iterable[type]) -> dot.Graph:
     roots = set(roots)
     root_tup = tuple(roots)

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/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/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/tokens/all.py

@@ -14,6 +14,7 @@ from .utils import (  # noqa
     ignore_ws,
 
     split_lines,
+    split_lines_dense,
     join_toks,
     join_lines,
 

omdev/tokens/utils.py

@@ -42,6 +42,15 @@ def split_lines(ts: Tokens) -> list[Tokens]:
     return [list(it) for g, it in itertools.groupby(ts, lambda t: t.line)]
 
 
+def split_lines_dense(ts: Tokens) -> list[Tokens]:
+    lines: list[list[Token]] = []
+    for t in ts:
+        while len(lines) < (t.line or 0):
+            lines.append([])
+        lines[-1].append(t)
+    return lines  # type: ignore[return-value]
+
+
 def join_toks(ts: Tokens) -> str:
     return ''.join(t.src for t in ts)
 

{omdev-0.0.0.dev282.dist-info → omdev-0.0.0.dev283.dist-info}/METADATA

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

{omdev-0.0.0.dev282.dist-info → omdev-0.0.0.dev283.dist-info}/RECORD

@@ -1,11 +1,12 @@
-omdev/.manifests.json,sha256=6ctfThA3b81KIbdc0sNzL63fepwPCfqzH7uRp0edxfc,10078
+omdev/.manifests.json,sha256=gpOkgx7EEYTrLPBJ-QnaUrW0fpWe9Lj6T3Wsye9wHgg,10325
 omdev/__about__.py,sha256=TeZN9riO-ekcaVodONcH5Es3OsQwWS7lu_dQHdzY_t4,1231
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omdev/bracepy.py,sha256=I8EdqtDvxzAi3I8TuMEW-RBfwXfqKbwp06CfOdj3L1o,2743
-omdev/classdot.py,sha256=YOvgy6x295I_8NKBbBlRVd3AN7Osirm_Lqt4Wj0j9rY,1631
-omdev/cmake.py,sha256=oBAp1K8h-iCDd9uCn-OpNpZ6n36oYFkWLIiTyQw4irU,4573
-omdev/findimports.py,sha256=2t8QP852saEEJFeXySEzhi_nxRSxghlkXz2jVdvy08M,2392
-omdev/imgur.py,sha256=Uyz8nkORlhfXXK5Sty16tX8ro8s-b7LrxjOECv4_sB0,3005
+omdev/attrdocs.py,sha256=XGY87xd9FZJqzGI8V9g4sSeQMWYu7oHD_klzC8YwZhk,4528
+omdev/bracepy.py,sha256=PPPoTMj4FJ5Lk3GGPEEWBGU7Kl1eCJBApSJnRvRj2Ms,2753
+omdev/classdot.py,sha256=Gmw4pFEFSnm6HBz65dI5-J8hNH1BSYgH_vsMcYKzbB4,1636
+omdev/cmake.py,sha256=9rfSvFHPmKDj9ngvfDB2vK8O-xO_ZwUm7hMKLWA-yOw,4578
+omdev/findimports.py,sha256=CDorwWr9hdIGnV-gvYQykdiz9hEsu8JrEZAF5sD_89w,2402
+omdev/imgur.py,sha256=TkjK_M4nDarEmbP-FhVkt_VzSY2jHkZnKGnhnZ1zJAs,3010
 omdev/pip.py,sha256=PqzAWDO_CbiZvXzJAZcCkFqWynUDls1jIgBWlrswQyA,2012
 omdev/tagstrings.py,sha256=zIP7nzcsZf5te0lphu6k36ND_cOvNFRg00neoTcoCs8,5484
 omdev/amalg/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -219,9 +220,9 @@ omdev/scripts/pyproject.py,sha256=dcWEUuHsE8_zIJ26s8MMlPlFgJzlE49kVhh2sQLDlKQ,26
 omdev/scripts/slowcat.py,sha256=lssv4yrgJHiWfOiHkUut2p8E8Tq32zB-ujXESQxFFHY,2728
 omdev/scripts/tmpexec.py,sha256=WTYcf56Tj2qjYV14AWmV8SfT0u6Y8eIU6cKgQRvEK3c,1442
 omdev/tokens/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omdev/tokens/all.py,sha256=4t_3NnU-ph_ehyC3XLB_J_lIda7KD1Xvc7rKexOVBAo,686
+omdev/tokens/all.py,sha256=YT7d-jrEssJBCTC8ljVcQT7BPrCW_r1JCmE8OFzbgFg,709
 omdev/tokens/tokenizert.py,sha256=-KM5ajybESWCMtqxSm_5ktyu8s-p1MdTgYA4ungyrkM,7840
-omdev/tokens/utils.py,sha256=DJA2jsDzrtQxnO0bdkUk1-GmenX4ECugdhl1xOBe7QI,1448
+omdev/tokens/utils.py,sha256=HN3nZhaZ0Fc7PxuUWLIMIm-l7jTh3R83-1dULkX9i2g,1698
 omdev/tools/__init__.py,sha256=iVJAOQ0viGTQOm0DLX4uZLro-9jOioYJGLg9s0kDx1A,78
 omdev/tools/cloc.py,sha256=jYlMHBae9oGKN4VKeBGuqjiQNcM2be7KIoTF0oNwx_I,5205
 omdev/tools/diff.py,sha256=_ThKWXFE-bG5SPDYNs8GqstEUPzL_PTWb03nJN0laLg,515
@@ -254,9 +255,9 @@ omdev/tools/json/rendering.py,sha256=tMcjOW5edfozcMSTxxvF7WVTsbYLoe9bCKFh50qyaGw
 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=zsEkfQX0jF5bn712uqPAyBSdJt2dno1LH2oeSMNfXQI,11424
-omdev-0.0.0.dev282.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev282.dist-info/METADATA,sha256=r2Lfs-wg3GiySKVrdY6UMsqfmklwBh7KSNswxGHChU0,1588
-omdev-0.0.0.dev282.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-omdev-0.0.0.dev282.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev282.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev282.dist-info/RECORD,,
+omdev-0.0.0.dev283.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev283.dist-info/METADATA,sha256=deF-r5kF_saAx6QkRAyDHWoQQlItNcTo9ejJRCZRkyc,1588
+omdev-0.0.0.dev283.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+omdev-0.0.0.dev283.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev283.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev283.dist-info/RECORD,,