PyPI - omdev - Versions diffs - 0.0.0.dev486__py3-none-any.whl → 0.0.0.dev500__py3-none-any.whl - Mend

omdev 0.0.0.dev486py3-none-any.whl → 0.0.0.dev500py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of omdev might be problematic. Click here for more details.

Files changed (43) hide show

omdev/.omlish-manifests.json +1 -1
omdev/README.md +51 -0
omdev/__about__.py +4 -2
omdev/ci/cli.py +1 -1
omdev/cli/clicli.py +37 -7
omdev/dataclasses/cli.py +1 -1
omdev/interp/cli.py +1 -1
omdev/interp/types.py +3 -2
omdev/interp/uv/provider.py +36 -0
omdev/manifests/main.py +1 -1
omdev/packaging/revisions.py +1 -1
omdev/py/tools/pipdepup.py +150 -93
omdev/pyproject/cli.py +1 -1
omdev/pyproject/pkg.py +1 -1
omdev/pyproject/reqs.py +8 -7
omdev/pyproject/tools/aboutdeps.py +5 -0
omdev/scripts/ci.py +361 -25
omdev/scripts/interp.py +43 -8
omdev/scripts/lib/logs.py +117 -21
omdev/scripts/pyproject.py +415 -39
omdev/tools/git/cli.py +43 -13
omdev/tools/json/formats.py +2 -0
omdev/tools/jsonview/cli.py +19 -61
omdev/tools/jsonview/resources/jsonview.html.j2 +43 -0
omdev/tools/pawk/README.md +195 -0
omdev/tui/apps/edit/main.py +5 -1
omdev/tui/apps/irc/app.py +28 -20
omdev/tui/apps/irc/commands.py +1 -1
omdev/tui/rich/__init__.py +12 -0
omdev/tui/textual/__init__.py +41 -2
omdev/tui/textual/app2.py +6 -1
omdev/tui/textual/debug/__init__.py +10 -0
omdev/tui/textual/debug/dominfo.py +151 -0
omdev/tui/textual/debug/screen.py +24 -0
omdev/tui/textual/devtools.py +187 -0
omdev/tui/textual/logging2.py +20 -0
omdev/tui/textual/types.py +45 -0
{omdev-0.0.0.dev486.dist-info → omdev-0.0.0.dev500.dist-info}/METADATA +10 -6
{omdev-0.0.0.dev486.dist-info → omdev-0.0.0.dev500.dist-info}/RECORD +43 -34
{omdev-0.0.0.dev486.dist-info → omdev-0.0.0.dev500.dist-info}/WHEEL +0 -0
{omdev-0.0.0.dev486.dist-info → omdev-0.0.0.dev500.dist-info}/entry_points.txt +0 -0
{omdev-0.0.0.dev486.dist-info → omdev-0.0.0.dev500.dist-info}/licenses/LICENSE +0 -0
{omdev-0.0.0.dev486.dist-info → omdev-0.0.0.dev500.dist-info}/top_level.txt +0 -0

omdev/tools/git/cli.py CHANGED Viewed

@@ -90,7 +90,12 @@ def get_first_commit_of_day(rev: str) -> str | None:
 class Cli(ap.Cli):
     @dc.dataclass(frozen=True, kw_only=True)
     class Config:
-        default_message_generator: str | None = None
+        @dc.dataclass(frozen=True, kw_only=True)
+        class MessageGenerator:
+            name: str
+            config: ta.Mapping[str, ta.Any] | None = None
+        message_generator: str | MessageGenerator | None = None
     _config_file_path_arg: ta.Optional[str] = ap.arg_('-c', '--config-file-path', nargs='?')
@@ -280,6 +285,35 @@ class Cli(ap.Cli):
     # Lazy helpers
+    def _make_git_message_generator(
+            self,
+            *,
+            name: str | None = None,
+            cwd: str | None = None,
+    ) -> GitMessageGenerator:
+        cls: type[GitMessageGenerator] = TimestampGitMessageGenerator
+        kw: dict[str, ta.Any] = {}
+        if name is None:
+            if cwd is None:
+                cwd = os.getcwd()
+            cfg = self.load_config(cwd).message_generator
+            if cfg is None:
+                pass
+            elif isinstance(cfg, str):
+                name = cfg
+            elif isinstance(cfg, Cli.Config.MessageGenerator):
+                name = cfg.name
+                kw.update(cfg.config or {})
+            else:
+                raise TypeError(cfg)
+        if name is not None:
+            cls = load_message_generator_manifests_map()[name].load_cls()
+        return cls(**kw)
     @ap.cmd(
         ap.arg('-g', '--message-generator', nargs='?'),
         ap.arg('dir', nargs='*'),
@@ -292,12 +326,10 @@ class Cli(ap.Cli):
             if not (st.has_staged or st.has_dirty):
                 return
-            mg_cls: type[GitMessageGenerator] = TimestampGitMessageGenerator
-            if (mg_name := self.args.message_generator) is None:
-                mg_name = self.load_config(cwd).default_message_generator
-            if mg_name is not None:
-                mg_cls = load_message_generator_manifests_map()[mg_name].load_cls()
-            mg = mg_cls()
+            mg = self._make_git_message_generator(
+                name=self.args.message_generator,
+                cwd=cwd,
+            )
             mgr = mg.generate_commit_message(GitMessageGenerator.GenerateCommitMessageArgs(
                 cwd=cwd,
@@ -338,12 +370,10 @@ class Cli(ap.Cli):
                     msg = self.args.message
                 else:
-                    mg_cls: type[GitMessageGenerator] = TimestampGitMessageGenerator
-                    if (mg_name := self.args.message_generator) is None:
-                        mg_name = self.load_config(cwd).default_message_generator
-                    if mg_name is not None:
-                        mg_cls = load_message_generator_manifests_map()[mg_name].load_cls()
-                    mg = mg_cls()
+                    mg = self._make_git_message_generator(
+                        name=self.args.message_generator,
+                        cwd=cwd,
+                    )
                     mgr = mg.generate_commit_message(GitMessageGenerator.GenerateCommitMessageArgs(
                         cwd=cwd,

omdev/tools/json/formats.py CHANGED Viewed

@@ -2,6 +2,8 @@
 TODO:
  - options lol - csv header, newline, etc
  - edn
+ - jsonl
+ - jsonc (just comments)
 """
 import dataclasses as dc
 import enum

omdev/tools/jsonview/cli.py CHANGED Viewed

@@ -3,7 +3,7 @@ TODO:
  - read from stdin
  - evaluate jmespath on server using extended engine
  - integrate with json tool
- - use omlish server and templates
+ - use omlish server
  - vendor deps, serve local
  - update to https://github.com/josdejong/svelte-jsoneditor
 """
@@ -19,61 +19,22 @@ import webbrowser
 from omlish import check
 from omlish import lang
+from omlish.sockets.ports import get_available_port
+from omlish.text import minja
 ##
-HTML_TEMPLATE = """
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>JSON Viewer</title>
-  <link
-    href="https://cdn.jsdelivr.net/npm/jsoneditor/dist/jsoneditor.min.css"
-    rel="stylesheet"
-    type="text/css"
-  >
-  <style>
-{css_src}
-  </style>
-</head>
-<body>
-  <div class="input-area">
-    <label for="jmespath-input">JMESPath:</label>
-    <input
-     type="text"
-     id="jmespath-input"
-     list="jmespath-history"
-     placeholder="Enter JMESPath expression..."
-     autocomplete="off"
-    >
-    <datalist id="jmespath-history"></datalist>
-    <span id="error-message"></span>
-  </div>
-  <div id="jsoneditor"></div>
-  <script src="https://cdn.jsdelivr.net/npm/jsoneditor@10.2.0/dist/jsoneditor.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/jmespath@0.16.0/jmespath.min.js"></script>
-  <script>
-    const originalJsonData = {json_data};
-  </script>
-  <script>
-{js_src}
-  </script>
-</body>
-</html>
-"""
+@lang.cached_function
+def html_template() -> minja.MinjaTemplate:
+    src = lang.get_relative_resources('resources', globals=globals())['jsonview.html.j2'].read_text()
+    return minja.compile_minja_template(src, ['ctx'])
 def view_json(
         filepath: str,
-        port: int,
+        port: int | None,
         *,
         mode: ta.Literal['jsonl', 'json5', 'json', None] = None,
 ) -> None:
@@ -120,15 +81,18 @@ def view_json(
                 self.send_response(200)
                 self.send_header('Content-type', 'text/html')
                 self.end_headers()
-                html_content = HTML_TEMPLATE.format(
-                    css_src=css_src,
-                    js_src=js_src,
+                html_content = html_template()(ctx=dict(
+                    css_src=css_src.strip(),
+                    js_src=js_src.strip(),
                     json_data=json_string,
-                )
+                ))
                 self.wfile.write(html_content.encode('utf-8'))
             else:
                 super().do_GET()
+    if port is None:
+        port = get_available_port()
     handler_cls = JsonViewerHttpRequestHandler
     with socketserver.TCPServer(('127.0.0.1', port), handler_cls) as httpd:
         url = f'http://127.0.0.1:{port}'
@@ -150,18 +114,12 @@ def _main() -> None:
         description='Launch a web-based JSON viewer with JMESPath transformations.',
         formatter_class=argparse.RawTextHelpFormatter,
     )
-    parser.add_argument(
-        'filepath',
-        help='The path to the JSON file you want to view.',
-    )
-    parser.add_argument(
-        '-p', '--port',
-        type=int,
-        default=(default_port := 8999),
-        help=f'The port to run the web server on. Defaults to {default_port}.',
-    )
+    parser.add_argument('filepath')
+    parser.add_argument('-p', '--port', type=int)
     parser.add_argument('-l', '--lines', action='store_true')
     parser.add_argument('-5', '--five', action='store_true')
     args = parser.parse_args()
     check.state(not (args.lines and args.five))

omdev/tools/jsonview/resources/jsonview.html.j2 ADDED Viewed

@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>JSON Viewer</title>
+  <link
+      href="https://cdn.jsdelivr.net/npm/jsoneditor/dist/jsoneditor.min.css"
+      rel="stylesheet"
+      type="text/css"
+  >
+  <style>
+{{ ctx['css_src'] }}
+  </style>
+</head>
+<body>
+<div class="input-area">
+  <label for="jmespath-input">JMESPath:</label>
+  <input
+      type="text"
+      id="jmespath-input"
+      list="jmespath-history"
+      placeholder="Enter JMESPath expression..."
+      autocomplete="off"
+  >
+  <datalist id="jmespath-history"></datalist>
+  <span id="error-message"></span>
+</div>
+<div id="jsoneditor"></div>
+<script src="https://cdn.jsdelivr.net/npm/jsoneditor@10.2.0/dist/jsoneditor.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/jmespath@0.16.0/jmespath.min.js"></script>
+<script>
+  const originalJsonData = {{ ctx['json_data'] }};
+</script>
+<script>
+{{ ctx['js_src'] }}
+</script>
+</body>
+</html>

omdev/tools/pawk/README.md ADDED Viewed

@@ -0,0 +1,195 @@
+[From alecthomas/pawk](https://github.com/alecthomas/pawk/blob/d60f78399e8a01857ebd73415a00e7eb424043ab/pawk.py)
+---
+PAWK - A Python line processor (like AWK)
+PAWK aims to bring the full power of Python to AWK-like line-processing.
+Here are some quick examples to show some of the advantages of pawk over AWK.
+The first example transforms `/etc/hosts` into a JSON map of host to IP:
+    cat /etc/hosts | pawk -B 'd={}' -E 'json.dumps(d)' '!/^#/ d[f[1]] = f[0]'
+Breaking this down:
+1. `-B 'd={}'` is a begin statement initializing a dictionary, executed once before processing begins.
+2. `-E 'json.dumps(d)'` is an end statement expression, producing the JSON representation of the dictionary `d`.
+3. `!/^#/` tells pawk to match any line *not* beginning with `#`.
+4. `d[f[1]] = f[0]` adds a dictionary entry where the key is the second field in the line (the first hostname) and the
+    value is the first field (the IP address).
+And another example showing how to bzip2-compress + base64-encode a file:
+    cat pawk.py | pawk -E 'base64.encodestring(bz2.compress(t))'
+### AWK example translations
+Most basic AWK constructs are available. You can find more idiomatic examples below in the example section, but here are
+a bunch of awk commands and their equivalent pawk commands to get started with:
+Print lines matching a pattern:
+    ls -l / | awk '/etc/'
+    ls -l / | pawk '/etc/'
+Print lines *not* matching a pattern:
+    ls -l / | awk '!/etc/'
+    ls -l / | pawk '!/etc/'
+Field slicing and dicing (here pawk wins because of Python's array slicing):
+    ls -l / | awk '/etc/ {print $5, $6, $7, $8, $9}'
+    ls -l / | pawk '/etc/ f[4:]'
+Begin and end actions (in this case, summing the sizes of all files):
+    ls -l | awk 'BEGIN {c = 0} {c += $5} END {print c}'
+    ls -l | pawk -B 'c = 0' -E 'c' 'c += int(f[4])'
+Print files where a field matches a numeric expression (in this case where files are > 1024 bytes):
+    ls -l | awk '$5 > 1024'
+    ls -l | pawk 'int(f[4]) > 1024'
+Matching a single field (any filename with "t" in it):
+    ls -l | awk '$NF ~/t/'
+    ls -l | pawk '"t" in f[-1]'
+## Expression evaluation
+PAWK evaluates a Python expression or statement against each line in stdin. The following variables are available in
+local context:
+- `line` - Current line text, including newline.
+- `l` - Current line text, excluding newline.
+- `n` - The current 1-based line number.
+- `f` - Fields of the line (split by the field separator `-F`).
+- `nf` - Number of fields in this line.
+- `m` - Tuple of match regular expression capture groups, if any.
+In the context of the `-E` block:
+- `t` - The entire input text up to the current cursor position.
+If the flag `-H, --header` is provided, each field in the first row of the input will be treated as field variable names
+in subsequent rows. The header is not output. For example, given the input:
+```
+count name
+12 bob
+34 fred
+```
+We could do:
+```
+$ pawk -H '"%s is %s" % (name, count)' < input.txt
+bob is 12
+fred is 34
+```
+To output a header as well, use `-B`:
+```
+$ pawk -H -B '"name is count"' '"%s is %s" % (name, count)' < input.txt
+name is count
+bob is 12
+fred is 34
+```
+Module references will be automatically imported if possible. Additionally, the `--import <module>[,<module>,...]` flag
+can be used to import symbols from a set of modules into the evaluation context.
+eg. `--import os.path` will import all symbols from `os.path`, such as `os.path.isfile()`, into the context.
+## Output
+### Line actions
+The type of the evaluated expression determines how output is displayed:
+- `tuple` or `list`: the elements are converted to strings and joined with the output delimiter (`-O`).
+- `None` or `False`: nothing is output for that line.
+- `True`: the original line is output.
+- Any other value is converted to a string.
+### Start/end blocks
+The rules are the same as for line actions with one difference.  Because there is no "line" that corresponds to them, an
+expression returning True is ignored.
+    $ echo -ne 'foo\nbar' | pawk -E t
+    foo
+    bar
+## Command-line usage
+```
+Usage: cat input | pawk [<options>] <expr>
+A Python line-processor (like awk).
+See https://github.com/alecthomas/pawk for details. Based on
+http://code.activestate.com/recipes/437932/.
+Options:
+  -h, --help            show this help message and exit
+  -I <filename>, --in_place=<filename>
+                        modify given input file in-place
+  -i <modules>, --import=<modules>
+                        comma-separated list of modules to "from x import *"
+                        from
+  -F <delim>            input delimiter
+  -O <delim>            output delimiter
+  -L <delim>            output line separator
+  -B <statement>, --begin=<statement>
+                        begin statement
+  -E <statement>, --end=<statement>
+                        end statement
+  -s, --statement       DEPRECATED. retained for backward compatibility
+  -H, --header          use first row as field variable names in subsequent
+                        rows
+  --strict              abort on exceptions
+```
+## Examples
+### Line processing
+Print the name and size of every file from stdin:
+    find . -type f | pawk 'f[0], os.stat(f[0]).st_size'
+> **Note:** this example also shows how pawk automatically imports referenced modules, in this case `os`.
+Print the sum size of all files from stdin:
+    find . -type f | \
+        pawk \
+            --begin 'c=0' \
+            --end c \
+            'c += os.stat(f[0]).st_size'
+Short-flag version:
+    find . -type f | pawk -B c=0 -E c 'c += os.stat(f[0]).st_size'
+### Whole-file processing
+If you do not provide a line expression, but do provide an end statement, pawk will accumulate each line, and the entire
+file's text will be available in the end statement as `t`. This is useful for operations on entire files, like the
+following example of converting a file from markdown to HTML:
+    cat README.md | \
+        pawk --end 'markdown.markdown(t)'
+Short-flag version:
+    cat README.md | pawk -E 'markdown.markdown(t)'

omdev/tui/apps/edit/main.py CHANGED Viewed

@@ -19,13 +19,17 @@ class QuitConfirmScreen(tx.ModalScreen[bool]):
         #dialog {
             width: 60;
             height: 11;
             border: thick $background 80%;
-            background: $surface;
             padding: 1 2;
+            background: $surface;
         }
         #question {
             height: 3;
             content-align: center middle;
         }

omdev/tui/apps/irc/app.py CHANGED Viewed

@@ -43,26 +43,34 @@ class IrcApp(tx.App):
     _commands: ta.ClassVar[ta.Mapping[str, IrcCommand]] = ALL_COMMANDS
     CSS = """
-    #messages {
-        height: 1fr;
-        overflow-y: auto;
-        border: none;
-        padding: 0;
-    }
-    #status {
-        height: 1;
-        background: $primary;
-        color: $text;
-        border: none;
-        padding: 0;
-    }
-    #input {
-        dock: bottom;
-        border: none;
-        padding: 0;
-    }
+        #messages {
+            height: 1fr;
+            border: none;
+            padding: 0;
+            overflow-y: auto;
+        }
+        #status {
+            height: 1;
+            border: none;
+            padding: 0;
+            color: $text;
+            background: $primary;
+        }
+        #input {
+            border: none;
+            padding: 0;
+            dock: bottom;
+        }
     """
     BINDINGS: ta.ClassVar[ta.Sequence[tx.Binding]] = [

omdev/tui/apps/irc/commands.py CHANGED Viewed

@@ -13,7 +13,7 @@ if ta.TYPE_CHECKING:
 ##
-class IrcCommand(abc.ABC):
+class IrcCommand(lang.Abstract):
     """Abstract base class for IRC commands."""
     def __init__(self) -> None:

omdev/tui/rich/__init__.py CHANGED Viewed

@@ -6,15 +6,27 @@ from omlish import lang as _lang
 with _lang.auto_proxy_init(globals()):
     ##
+    from rich import align  # noqa
     from rich import console  # noqa
     from rich import live  # noqa
     from rich import markdown  # noqa
     from rich import repr  # noqa
     from rich import text  # noqa
+    from rich.align import Align  # noqa
+    from rich.color import Color  # noqa
+    from rich.color import blend_rgb  # noqa
+    from rich.color_triplet import ColorTriplet  # noqa
     from rich.console import Console  # noqa
+    from rich.console import Group  # noqa
     from rich.live import Live  # noqa
     from rich.markdown import Markdown  # noqa
+    from rich.segment import Segment  # noqa
+    from rich.segment import SegmentLines  # noqa
+    from rich.style import Style  # noqa
+    from rich.syntax import Syntax  # noqa
+    from rich.table import Table  # noqa
     from rich.text import Text  # noqa
+    from rich.theme import Theme  # noqa
     ##

omdev/tui/textual/__init__.py CHANGED Viewed

@@ -6,6 +6,8 @@ from omlish import lang as _lang
 with _lang.auto_proxy_init(globals()):
     ##
+    from textual import LogGroup  # noqa
+    from textual import LogVerbosity  # noqa
     from textual import app  # noqa
     from textual import binding  # noqa
     from textual import constants  # noqa
@@ -78,6 +80,8 @@ with _lang.auto_proxy_init(globals()):
     from textual.content import ContentType  # noqa
     from textual.content import EMPTY_CONTENT  # noqa
     from textual.content import Span  # noqa
+    from textual.dom import DOMError  # noqa
+    from textual.dom import DOMNode  # noqa
     from textual.driver import Driver  # noqa
     from textual.events import Action  # noqa
     from textual.events import AppBlur  # noqa
@@ -210,12 +214,38 @@ with _lang.auto_proxy_init(globals()):
     from textual.widgets import Tooltip  # noqa
     from textual.widgets import Tree  # noqa
     from textual.widgets import Welcome  # noqa
-    from textual.widgets.option_list import OptionDoesNotExist  # noqa
-    from textual.widgets.option_list import Option  # noqa
+    from textual.widgets.markdown import MarkdownBlock  # noqa
+    from textual.widgets.markdown import MarkdownFence  # noqa
+    from textual.widgets.markdown import MarkdownStream  # noqa
+    from textual.widgets.markdown import MarkdownTableOfContents  # noqa
     from textual.widgets.option_list import DuplicateID  # noqa
+    from textual.widgets.option_list import Option  # noqa
+    from textual.widgets.option_list import OptionDoesNotExist  # noqa
     ##
+    from textual_dev.client import DevtoolsClient  # noqa
+    from textual_dev.client import DevtoolsConnectionError  # noqa
+    from textual_dev.client import DevtoolsConsole  # noqa
+    from textual_dev.client import DevtoolsLog  # noqa
+    ##
+    from . devtools import (  # noqa
+        DevtoolsConfig,
+        connect_devtools,
+        DevtoolsAppMixin,
+        DevtoolsSetup,
+        DevtoolsManager,
+        DevtoolsLoggingHandler,
+        set_root_logger_to_devtools,
+    )
+    from . import debug  # noqa
     from .app2 import (  # noqa
         App,
     )
@@ -224,3 +254,12 @@ with _lang.auto_proxy_init(globals()):
         PendingWritesDriverMixin,
         get_pending_writes_driver_class,
     )
+    from .logging2 import (  # noqa
+        translate_log_level,
+    )
+    from .types import (  # noqa
+        TopRightBottomLeft,
+        trbl_to_dict,
+    )

omdev/tui/textual/app2.py CHANGED Viewed

@@ -3,9 +3,14 @@ import typing as ta
 from textual.app import App as App_
 from textual.binding import BindingType  # noqa
+from .devtools import DevtoolsAppMixin
 ##
-class App(App_):
+class App(
+    DevtoolsAppMixin,
+    App_,
+):
     BINDINGS: ta.ClassVar[ta.Sequence[BindingType]] = App_.BINDINGS  # type: ignore[assignment]

omdev/tui/textual/debug/__init__.py ADDED Viewed

@@ -0,0 +1,10 @@
+# ruff: noqa: F401
+# flake8: noqa: F401
+from omlish import lang as _lang
+with _lang.auto_proxy_init(globals()):
+    ##
+    from . import dominfo  # noqa
+    from . import screen  # noqa

omdev 0.0.0.dev486__py3-none-any.whl → 0.0.0.dev500__py3-none-any.whl

Potentially problematic release.

omdev 0.0.0.dev486py3-none-any.whl → 0.0.0.dev500py3-none-any.whl