omdev 0.0.0.dev489__tar.gz → 0.0.0.dev491__tar.gz

{omdev-0.0.0.dev489/omdev.egg-info → omdev-0.0.0.dev491}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev489
+Version: 0.0.0.dev491
 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.dev489
+Requires-Dist: omlish==0.0.0.dev491
 Provides-Extra: all
 Requires-Dist: black~=25.12; extra == "all"
 Requires-Dist: pycparser~=2.23; extra == "all"
@@ -27,7 +27,7 @@ Requires-Dist: mypy~=1.19; extra == "all"
 Requires-Dist: gprof2dot~=2025.4; extra == "all"
 Requires-Dist: segno~=1.6; extra == "all"
 Requires-Dist: rich~=14.2; extra == "all"
-Requires-Dist: textual~=6.9; extra == "all"
+Requires-Dist: textual~=6.10; extra == "all"
 Provides-Extra: black
 Requires-Dist: black~=25.12; extra == "black"
 Provides-Extra: c
@@ -46,7 +46,7 @@ Provides-Extra: qr
 Requires-Dist: segno~=1.6; extra == "qr"
 Provides-Extra: tui
 Requires-Dist: rich~=14.2; extra == "tui"
-Requires-Dist: textual~=6.9; extra == "tui"
+Requires-Dist: textual~=6.10; extra == "tui"
 Dynamic: license-file
 
 # Overview

{omdev-0.0.0.dev489 → omdev-0.0.0.dev491}/omdev/.omlish-manifests.json

@@ -39,7 +39,7 @@
     "module": ".cli.clicli",
     "attr": "_CLI_MODULE",
     "file": "omdev/cli/clicli.py",
-    "line": 251,
+    "line": 263,
     "value": {
       "!.cli.types.CliModule": {
         "name": "cli",

omdev-0.0.0.dev491/omdev/README.md

@@ -0,0 +1,51 @@
+# Overview
+
+Development utilities and support code.
+
+# Notable packages
+
+- **[cli](https://github.com/wrmsr/omlish/blob/master/omdev/cli)** - The codebase's all-in-one CLI. This is not
+  installed as an entrypoint / command when this package is itself installed - that is separated into the `omdev-cli`
+  installable package so as to not pollute users' bin/ directories when depping this lib for its utility code.
+
+- **[amalg](https://github.com/wrmsr/omlish/blob/master/omdev/amalg)** - The [amalgamator](#amalgamation).
+
+- **[pyproject](https://github.com/wrmsr/omlish/blob/master/omdev/pyproject)**
+  ([amalg](https://github.com/wrmsr/omlish/blob/master/omdev/scripts/pyproject.py)) - python project management tool.
+  wrangles but does not replace tools like venv, pip, setuptools, and uv. does things like sets up venvs, generates
+  [`.pkg`](https://github.com/wrmsr/omlish/blob/master/.pkg) directories and their `pyproject.toml`'s (from their
+  `__about__.py`'s), and packages them. this should grow to eat more and more of the Makefile. as it is amalgamated it
+  requires no installation and can just be dropped into other projects / repos.
+
+- **[ci](https://github.com/wrmsr/omlish/blob/master/omdev/ci)**
+  ([amalg](https://github.com/wrmsr/omlish/blob/master/omdev/scripts/ci.py)) - ci runner. given a
+  [`compose.yml`](https://github.com/wrmsr/omlish/blob/master/docker/compose.yml)
+  and requirements.txt files, takes care of building and caching of containers and venvs and execution of required ci
+  commands. detects and [natively uses](https://github.com/wrmsr/omlish/blob/master/omdev/ci/github/api/v2)
+  github-action's caching system. unifies ci execution between local dev and github runners.
+
+- **[tools.json](https://github.com/wrmsr/omlish/blob/master/omdev/tools/json)** (cli: `om j`) - a tool for json-like
+  data, obviously in the vein of [jq](https://github.com/jqlang/jq) but using the internal
+  [jmespath](https://github.com/wrmsr/omlish/blob/master/omlish/specs/jmespath) engine. supports
+  [true streaming](https://github.com/wrmsr/omlish/blob/master/omlish/formats/json/stream) json input and output, as
+  well as [various other](https://github.com/wrmsr/omlish/blob/master/omdev/tools/json/formats.py) non-streaming input
+  formats.
+
+- **[tools.git](https://github.com/wrmsr/omlish/blob/master/omdev/tools/git)** (cli: `om git`) - a tool for various lazy
+  git operations, including the one that (poorly) writes all of these commit messages.
+
+# Amalgamation
+
+Amalgamation is the process of stitching together multiple python source files into a single self-contained python
+script. ['lite'](https://github.com/wrmsr/omlish/blob/master/omlish#lite-code) code is written in a style conducive to
+this.
+
+# Local storage
+
+Some of this code, when asked, will store things on the local filesystem. The only directories used (outside of ones
+explicitly specified as command or function arguments) are managed in
+[home.paths](https://github.com/wrmsr/omlish/blob/master/omdev/home/paths.py), and are the following:
+
+- `$OMLISH_HOME`, default of `~/.omlish` - persistent things like config and state.
+- `$OMLISH_CACHE`, default of `~/.cache/omlish` - used for things like the local ci cache and
+  [various other](https://github.com/search?q=repo%3Awrmsr%2Fomlish+%22dcache.%22&type=code) cached data.

{omdev-0.0.0.dev489 → omdev-0.0.0.dev491}/omdev/__about__.py

@@ -44,7 +44,7 @@ class Project(ProjectBase):
 
         'tui': [
             'rich ~= 14.2',
-            'textual ~= 6.9',
+            'textual ~= 6.10',
         ],
     }
 

{omdev-0.0.0.dev489 → omdev-0.0.0.dev491}/omdev/cli/clicli.py

@@ -5,6 +5,7 @@ import re
 import shlex
 import subprocess
 import sys
+import time
 import typing as ta
 import urllib.parse
 import urllib.request
@@ -104,23 +105,34 @@ class CliCli(ap.Cli):
         ap.arg('--no-uv', action='store_true'),
         ap.arg('--dry-run', action='store_true'),
         ap.arg('--must-upgrade', action='store_true'),
+        ap.arg('--must-upgrade-loop', action='store_true'),
         ap.arg('--version'),
         ap.arg('extra_deps', nargs='*'),
     )
     def reinstall(self) -> None:
         current_version = __about__.__version__
-        latest_version = _parse_latest_version_str(lookup_latest_package_version(__package__.split('.')[0]))
 
-        if self.args.version is not None:
-            target_version: str = self.args.version
-        else:
-            target_version = latest_version
-
-        if self.args.must_upgrade:
-            current_vo = Version(current_version)
-            target_vo = Version(target_version)
-            if not (target_vo > current_vo):
-                raise CliCli.ReinstallWouldNotUpgradeError(current_version, target_version)
+        while True:
+            latest_version = _parse_latest_version_str(lookup_latest_package_version(__package__.split('.')[0]))
+
+            if self.args.version is not None:
+                target_version: str = self.args.version
+            else:
+                target_version = latest_version
+
+            if self.args.must_upgrade or self.args.must_upgrade_loop:
+                current_vo = Version(current_version)
+                target_vo = Version(target_version)
+                if not (target_vo > current_vo):
+                    ex = CliCli.ReinstallWouldNotUpgradeError(current_version, target_version)
+                    if self.args.must_upgrade_loop:
+                        print(ex)
+                        time.sleep(1)
+                        continue
+                    else:
+                        raise ex
+
+            break
 
         #
 

{omdev-0.0.0.dev489 → omdev-0.0.0.dev491}/omdev/py/tools/pipdepup.py

@@ -1,5 +1,6 @@
 """
 TODO:
+ - output 2 tables lol
  - min_time_since_prev_version
   - without this the min age is moot lol, can still catch a bad release at the same time of day just n days later
    - * at least show 'suggested', 'suggested age', 'latest', 'latest age', 'number of releases between the 2' *
@@ -30,7 +31,7 @@ https://news.ycombinator.com/item?id=46005111
 # ~> https://github.com/pypa/pip/blob/a52069365063ea813fe3a3f8bac90397c9426d35/src/pip/_internal/commands/list.py (25.3)
 import dataclasses as dc
 import datetime
-import email.parser
+import itertools
 import os.path
 import ssl
 import typing as ta
@@ -312,16 +313,42 @@ class Package:
 
             return datetime.datetime.fromisoformat(check.isinstance(ut, str))  # noqa
 
+        @cached.property
+        def version(self) -> Version:
+            return self.install.version
+
+        @cached.property
+        def filetype(self) -> ta.Literal['wheel', 'sdist']:
+            if self.install.link.is_wheel:
+                return 'wheel'
+            else:
+                return 'sdist'
+
+    unfiltered_candidates: ta.Sequence[Candidate] | None = None
     candidates: ta.Sequence[Candidate] | None = None
 
-    @dc.dataclass(frozen=True, kw_only=True)
-    class LatestInfo:
-        candidate: 'Package.Candidate'
+    latest_candidate: Candidate | None = None
+    suggested_candidate: Candidate | None = None
+
+
+def get_best_candidate(
+        pkg: Package,
+        finder: MyPackageFinder,
+        candidates: ta.Sequence[Package.Candidate],
+) -> Package.Candidate | None:
+    candidates_by_install: ta.Mapping[InstallationCandidate, Package.Candidate] = col.make_map((
+        (c.install, c)
+        for c in candidates
+    ), strict=True, identity=True)
 
-        version: Version
-        filetype: str
+    evaluator = finder.make_candidate_evaluator(
+        project_name=pkg.dist.canonical_name,
+    )
+    best_install = evaluator.sort_best_candidate([c.install for c in candidates])
+    if best_install is None:
+        return None
 
-    latest_info: LatestInfo | None = None
+    return candidates_by_install[best_install]
 
 
 def set_package_finder_info(
@@ -332,17 +359,18 @@ def set_package_finder_info(
         max_uploaded_at: datetime.datetime | None = None,
         min_time_since_prev_version: datetime.timedelta | None = None,
 ) -> None:
-    candidates = [
+    pkg.unfiltered_candidates = [
         Package.Candidate(
             c,
             finder.get_link_pypi_dict(c.link),
         )
         for c in finder.find_all_candidates(pkg.dist.canonical_name)
     ]
-    pkg.candidates = candidates
 
     #
 
+    candidates = pkg.unfiltered_candidates
+
     if not pre:
         # Remove prereleases
         candidates = [
@@ -351,8 +379,16 @@ def set_package_finder_info(
             if not c.install.version.is_prerelease
         ]
 
+    pkg.candidates = candidates
+
     #
 
+    pkg.latest_candidate = get_best_candidate(pkg, finder, pkg.candidates)
+
+    #
+
+    suggested_candidates = candidates
+
     if min_time_since_prev_version is not None:
         # candidates_by_version = col.multi_map((c.install.version, c) for c in candidates)
         # uploaded_at_by_version = {
@@ -361,46 +397,17 @@ def set_package_finder_info(
         # }
         raise NotImplementedError
 
-    #
-
     if max_uploaded_at is not None:
-        candidates = [
+        suggested_candidates = [
             c
-            for c in candidates
+            for c in suggested_candidates
             if not (
                 (c_dt := c.upload_time()) is not None and
                 c_dt > max_uploaded_at
             )
         ]
 
-    #
-
-    candidates_by_install: ta.Mapping[InstallationCandidate, Package.Candidate] = col.make_map((
-        (c.install, c)
-        for c in candidates
-    ), strict=True, identity=True)
-
-    evaluator = finder.make_candidate_evaluator(
-        project_name=pkg.dist.canonical_name,
-    )
-    best_install = evaluator.sort_best_candidate([c.install for c in candidates])
-    if best_install is None:
-        return
-    best_candidate = candidates_by_install[best_install]
-
-    #
-
-    remote_version = best_candidate.install.version
-    if best_candidate.install.link.is_wheel:
-        typ = 'wheel'
-    else:
-        typ = 'sdist'
-
-    pkg.latest_info = Package.LatestInfo(
-        candidate=best_candidate,
-        version=remote_version,
-        filetype=typ,
-    )
+    pkg.suggested_candidate = get_best_candidate(pkg, finder, suggested_candidates)
 
 
 ##
@@ -474,20 +481,20 @@ def format_for_json(
     infos: list[dict[str, ta.Any]] = []
 
     for pkg in pkgs:
-        latest_info = check.not_none(pkg.latest_info)
+        latest = check.not_none(pkg.latest_candidate)
+        suggested = check.not_none(pkg.suggested_candidate)
 
         info = {
             'name': pkg.dist.raw_name,
             'version': pkg.version(),
             'location': pkg.dist.location or '',
             'installer': pkg.dist.installer,
-            'latest_version': str(latest_info.version),
-            'latest_filetype': latest_info.filetype,
+            'latest_version': str(latest.install.version),
+            'latest_upload_time': lut.isoformat() if (lut := latest.upload_time()) is not None else None,
+            'suggested_version': str(suggested.install.version),
+            'suggested_upload_time': sut.isoformat() if (sut := suggested.upload_time()) is not None else None,
         }
 
-        if (l_ut := latest_info.candidate.upload_time()) is not None:
-            info['latest_age'] = human_round_td(now_utc() - l_ut)
-
         if editable_project_location := pkg.dist.editable_project_location:
             info['editable_project_location'] = editable_project_location
 
@@ -502,59 +509,106 @@ def format_for_json(
 def format_for_columns(pkgs: ta.Sequence[Package]) -> tuple[list[list[str]], list[str]]:
     """Convert the package data into something usable by output_package_listing_columns."""
 
-    header = ['Package', 'Version', 'Latest', 'Age', 'Type']
+    header = [
+        ' ',
 
-    def wheel_build_tag(dist: BaseDistribution) -> str | None:
-        try:
-            wheel_file = dist.read_text('WHEEL')
-        except FileNotFoundError:
-            return None
-        return email.parser.Parser().parsestr(wheel_file).get('Build')
+        'Package',
+        'Current',
+
+        ' ',
+
+        'Suggested',
+        'Age',
+
+        ' ',
+
+        'Latest',
+        'Age',
+    ]
+
+    # def wheel_build_tag(dist: BaseDistribution) -> str | None:
+    #     try:
+    #         wheel_file = dist.read_text('WHEEL')
+    #     except FileNotFoundError:
+    #         return None
+    #     return email.parser.Parser().parsestr(wheel_file).get('Build')
 
-    build_tags = [wheel_build_tag(p.dist) for p in pkgs]
-    has_build_tags = any(build_tags)
-    if has_build_tags:
-        header.append('Build')
+    # build_tags = [wheel_build_tag(p.dist) for p in pkgs]
+    # has_build_tags = any(build_tags)
+    # if has_build_tags:
+    #     header.append('Build')
 
-    has_editables = any(x.dist.editable for x in pkgs)
-    if has_editables:
-        header.append('Editable project location')
+    # has_editables = any(x.dist.editable for x in pkgs)
+    # if has_editables:
+    #     header.append('Editable project location')
 
     data = []
-    for i, proj in enumerate(pkgs):
-        # if we're working on the 'outdated' list, separate out the latest_version and type
-        row = [proj.dist.raw_name, proj.dist.raw_version]
-
-        latest_info = check.not_none(proj.latest_info)
-        row.append(str(latest_info.version))
-        if (l_ut := latest_info.candidate.upload_time()) is not None:
-            row.append(human_round_td(now_utc() - l_ut))
-        else:
-            row.append('')
-        row.append(latest_info.filetype)
+    for proj in pkgs:
+        sc = check.not_none(proj.suggested_candidate)
+        lc = check.not_none(proj.latest_candidate)
+
+        row = [
+            '*' if lc is not sc else '',
+
+            proj.dist.raw_name,
+            proj.dist.raw_version,
+        ]
+
+        for c in [sc, lc]:
+            row.extend([
+                '|',
+
+                str(c.version),
+            ])
+
+            if (l_ut := c.upload_time()) is not None:
+                row.append(human_round_td(now_utc() - l_ut))
+            else:
+                row.append('')
+
+            # row.append(c.filetype)
 
-        if has_build_tags:
-            row.append(build_tags[i] or '')
+        # if has_build_tags:
+        #     row.append(build_tags[i] or '')
 
-        if has_editables:
-            row.append(proj.dist.editable_project_location or '')
+        # if has_editables:
+        #     row.append(proj.dist.editable_project_location or '')
 
         data.append(row)
 
     return data, header
 
 
+def _tabulate(
+        rows: ta.Iterable[ta.Iterable[ta.Any]],
+        *,
+        sep: str = ' ',
+) -> tuple[list[str], list[int]]:
+    """
+    Return a list of formatted rows and a list of column sizes.
+
+    For example::
+
+    >>> tabulate([['foobar', 2000], [0xdeadbeef]])
+    (['foobar     2000', '3735928559'], [10, 4])
+    """
+
+    rows = [tuple(map(str, row)) for row in rows]
+    sizes = [max(map(len, col)) for col in itertools.zip_longest(*rows, fillvalue='')]
+    table = [sep.join(map(str.ljust, row, sizes)).rstrip() for row in rows]
+    return table, sizes
+
+
 def render_package_listing_columns(data: list[list[str]], header: list[str]) -> list[str]:
     # insert the header first: we need to know the size of column names
     if len(data) > 0:
         data.insert(0, header)
 
-    from pip._internal.utils.misc import tabulate  # noqa
-    pkg_strings, sizes = tabulate(data)
+    pkg_strings, sizes = _tabulate(data, sep='  ')
 
     # Create and add a separator.
     if len(data) > 0:
-        pkg_strings.insert(1, ' '.join('-' * x for x in sizes))
+        pkg_strings.insert(1, '  '.join('-' * x for x in sizes))
 
     return pkg_strings
 
@@ -612,21 +666,27 @@ def _main() -> None:
 
     #
 
-    pkgs = [
+    outdated_pkgs = [
         pkg
         for pkg in pkgs
-        if (li := pkg.latest_info) is not None
+        if (li := pkg.latest_candidate) is not None
         and li.version > pkg.dist.version
     ]
 
-    pkgs.sort(key=lambda x: x.dist.raw_name)
+    outdated_pkgs.sort(key=lambda x: x.dist.raw_name)
 
     #
 
     if args.json:
-        print(json.dumps_pretty(format_for_json(pkgs)))
+        print(json.dumps_pretty(format_for_json(outdated_pkgs)))
+
     else:
-        print('\n'.join(render_package_listing_columns(*format_for_columns(pkgs))))
+        # stable_pkgs, unstable_pkgs = col.partition(
+        #     outdated_pkgs,
+        #     lambda pkg: pkg.latest_candidate is pkg.suggested_candidate,
+        # )
+
+        print('\n'.join(render_package_listing_columns(*format_for_columns(outdated_pkgs))))
 
 
 if __name__ == '__main__':

{omdev-0.0.0.dev489 → omdev-0.0.0.dev491}/omdev/tools/jsonview/cli.py

@@ -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-0.0.0.dev491/omdev/tools/jsonview/resources/jsonview.html.j2

@@ -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>