PyPI - omdev - Versions diffs - 0.0.0.dev345__tar.gz → 0.0.0.dev347__tar.gz - Mend

omdev 0.0.0.dev345tar.gz → 0.0.0.dev347tar.gz

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 (317) hide show

{omdev-0.0.0.dev345/omdev.egg-info → omdev-0.0.0.dev347}/PKG-INFO RENAMED Viewed

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

{omdev-0.0.0.dev345 → omdev-0.0.0.dev347}/omdev/.manifests.json RENAMED Viewed

@@ -408,6 +408,21 @@
       }
     }
   },
+  {
+    "module": ".tools.jsonview.__main__",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/tools/jsonview/__main__.py",
+    "line": 4,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": [
+          "jsonview",
+          "jv"
+        ],
+        "mod_name": "omdev.tools.jsonview.__main__"
+      }
+    }
+  },
   {
     "module": ".tools.linehisto",
     "attr": "_CLI_MODULE",
@@ -509,6 +524,21 @@
       }
     }
   },
+  {
+    "module": ".tools.shell",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/tools/shell.py",
+    "line": 110,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": [
+          "shell",
+          "sh"
+        ],
+        "mod_name": "omdev.tools.shell"
+      }
+    }
+  },
   {
     "module": ".tools.sqlrepl",
     "attr": "_CLI_MODULE",

omdev-0.0.0.dev347/omdev/tools/jsonview/__main__.py ADDED Viewed

@@ -0,0 +1,11 @@
+from ...cli import CliModule
+# @omlish-manifest
+_CLI_MODULE = CliModule(['jsonview', 'jv'], __name__)
+if __name__ == '__main__':
+    from .cli import _main
+    _main()

omdev-0.0.0.dev347/omdev/tools/jsonview/cli.py ADDED Viewed

@@ -0,0 +1,142 @@
+import argparse
+import http.server
+import json
+import os
+import socketserver
+import sys
+import threading
+import webbrowser
+from omlish import lang
+##
+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>
+"""
+def view_json(filepath: str, port: int) -> None:
+    if not os.path.exists(filepath):
+        print(f"Error: File not found at '{filepath}'", file=sys.stderr)
+        return
+    try:
+        with open(filepath, encoding='utf-8') as f:
+            raw_content = f.read()
+    except json.JSONDecodeError as e:
+        print(f'Error: Invalid JSON file. {e}', file=sys.stderr)
+        return
+    if filepath.endswith('.jsonl'):
+        json_content = [json.loads(sl) for l in raw_content.splitlines() if (sl := l.strip())]
+    elif filepath.endswith('.json5'):
+        from omlish.formats import json5
+        json_content = json5.loads(raw_content)
+    else:
+        json_content = json.loads(raw_content)
+    # Use compact dumps for embedding in JS, it's more efficient
+    json_string = json.dumps(json_content)
+    resources = lang.get_relative_resources('resources', globals=globals())
+    css_src = resources['jsonview.css'].read_text()
+    js_src = resources['jsonview.js'].read_text()
+    class JsonViewerHttpRequestHandler(http.server.SimpleHTTPRequestHandler):
+        def do_GET(self) -> None:  # noqa
+            if self.path == '/':
+                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,
+                    json_data=json_string,
+                )
+                self.wfile.write(html_content.encode('utf-8'))
+            else:
+                super().do_GET()
+    handler_cls = JsonViewerHttpRequestHandler
+    with socketserver.TCPServer(('127.0.0.1', port), handler_cls) as httpd:
+        url = f'http://127.0.0.1:{port}'
+        print(f'Serving JSON file: {os.path.abspath(filepath)}', file=sys.stderr)
+        print(f'Viewer running at: {url}', file=sys.stderr)
+        print('Press Ctrl+C to stop the server.', file=sys.stderr)
+        threading.Timer(1, lambda: webbrowser.open_new(url)).start()
+        try:
+            httpd.serve_forever()
+        except KeyboardInterrupt:
+            print('\nShutting down server.', file=sys.stderr)
+            httpd.shutdown()
+def _main() -> None:
+    parser = argparse.ArgumentParser(
+        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}.',
+    )
+    args = parser.parse_args()
+    view_json(args.filepath, args.port)
+if __name__ == '__main__':
+    _main()

omdev-0.0.0.dev347/omdev/tools/jsonview/resources/__init__.py ADDED Viewed

File without changes

omdev-0.0.0.dev347/omdev/tools/jsonview/resources/jsonview.css ADDED Viewed

@@ -0,0 +1,37 @@
+html, body {
+    height: 100%;
+    margin: 0;
+    padding: 0;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+    font-family: sans-serif;
+}
+.input-area {
+    padding: 10px;
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    border-bottom: 1px solid #ccc;
+    flex-shrink: 0;
+}
+#jmespath-input {
+    flex-grow: 1;
+    padding: 8px;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    font-size: 14px;
+}
+#error-message {
+    color: red;
+    font-size: 14px;
+    white-space: nowrap;
+}
+#jsoneditor {
+    flex-grow: 1;
+    overflow: auto;
+}

omdev-0.0.0.dev347/omdev/tools/jsonview/resources/jsonview.js ADDED Viewed

@@ -0,0 +1,67 @@
+const container = document.getElementById('jsoneditor');
+const jmespathInput = document.getElementById('jmespath-input');
+const errorMessage = document.getElementById('error-message');
+const historyDataList = document.getElementById('jmespath-history');
+let jmespathHistory = [];
+const options = {
+  mode: 'tree',
+      modes: ['code', 'form', 'text', 'tree', 'view', 'preview'],
+      onError: function (err) {
+    alert(err.toString());
+  }
+};
+const editor = new JSONEditor(container, options);
+editor.set(originalJsonData);
+editor.expandAll();
+let debounceTimer;
+function updateHistory(expression) {
+  if (!expression || jmespathHistory.includes(expression)) {
+    return;
+  }
+  jmespathHistory.unshift(expression);
+  historyDataList.innerHTML = '';
+  jmespathHistory.forEach(item => {
+    const option = document.createElement('option');
+    option.value = item;
+    historyDataList.appendChild(option);
+  });
+}
+function updateView() {
+  const expression = jmespathInput.value.trim();
+  errorMessage.textContent = '';
+  if (expression === '') {
+    editor.set(originalJsonData);
+    editor.expandAll();
+    return;
+  }
+  try {
+    const result = jmespath.search(originalJsonData, expression);
+    editor.set(result);
+    editor.expandAll();
+    updateHistory(expression);
+  } catch (err) {
+    errorMessage.textContent = 'Invalid JMESPath expression';
+  }
+}
+jmespathInput.addEventListener('input', () => {
+  clearTimeout(debounceTimer);
+  debounceTimer = setTimeout(updateView, 50);
+});
+jmespathInput.addEventListener('keydown', (event) => {
+  if (event.key === 'Enter') {
+    clearTimeout(debounceTimer);
+    updateView();
+  }
+});

omdev-0.0.0.dev347/omdev/tools/pawk/__init__.py ADDED Viewed

File without changes

omdev-0.0.0.dev347/omdev/tools/shell.py ADDED Viewed

@@ -0,0 +1,119 @@
+import shlex
+import typing as ta
+from omlish import check
+from omlish.argparse import all as ap
+from omlish.formats import json
+from ..cli.types import CliModule
+##
+DEFAULT_DELIMITER = ' '
+def _print_list(
+        lst: ta.Iterable[str],
+        *,
+        delimiter: str | None = None,
+) -> None:
+    check.not_isinstance(lst, str)
+    if delimiter is None:
+        delimiter = DEFAULT_DELIMITER
+    for e in lst:
+        check.not_in(delimiter, e)
+    print(delimiter.join(lst))
+##
+class ShellCli(ap.Cli):
+    @ap.cmd(
+        ap.arg('strs', nargs='*'),
+        ap.arg('--delimiter', '-d'),
+    )
+    def quote(self) -> None:
+        _print_list(
+            [shlex.quote(e) for e in self.args.strs],
+            delimiter=self.args.delimiter,
+        )
+    #
+    _PREFIX_OR_INTERLEAVE_ARGS: ta.ClassVar[ta.Sequence[ta.Any]] = [
+        ap.arg('--quote', '-q', action='store_true'),
+        ap.arg('--delimiter', '-d'),
+    ]
+    def _prefix_or_interleave(
+            self,
+            mode: ta.Literal['prefix', 'interleave'],
+            separator: str,
+            items: ta.Iterable[str],
+    ) -> None:
+        lst = []
+        for i, e in enumerate(check.not_isinstance(items, str)):
+            if i or mode != 'interleave':
+                lst.append(separator)
+            if self.args.quote:
+                e = shlex.quote(e)
+            lst.append(e)
+        _print_list(
+            lst,
+            delimiter=self.args.delimiter,
+        )
+    @ap.cmd(
+        ap.arg('prefix'),
+        ap.arg('items', nargs='*'),
+        *_PREFIX_OR_INTERLEAVE_ARGS,
+    )
+    def prefix(self) -> None:
+        self._prefix_or_interleave(
+            'prefix',
+            self.args.prefix,
+            self.args.items,
+        )
+    @ap.cmd(
+        ap.arg('separator'),
+        ap.arg('items', nargs='*'),
+        *_PREFIX_OR_INTERLEAVE_ARGS,
+    )
+    def interleave(self) -> None:
+        self._prefix_or_interleave(
+            'interleave',
+            self.args.separator,
+            self.args.items,
+        )
+    #
+    @ap.cmd(accepts_unknown=True)
+    def argv(self) -> None:
+        print(json.dumps_pretty(self.unknown_args))
+##
+# @omlish-manifest
+_CLI_MODULE = CliModule(['shell', 'sh'], __name__)
+def _main() -> None:
+    ShellCli().cli_run_and_exit()
+if __name__ == '__main__':
+    _main()

{omdev-0.0.0.dev345 → omdev-0.0.0.dev347/omdev.egg-info}/PKG-INFO RENAMED Viewed

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

{omdev-0.0.0.dev345 → omdev-0.0.0.dev347}/omdev.egg-info/SOURCES.txt RENAMED Viewed

@@ -284,6 +284,7 @@ omdev/tools/pip.py
 omdev/tools/prof.py
 omdev/tools/qr.py
 omdev/tools/shadow.py
+omdev/tools/shell.py
 omdev/tools/sqlrepl.py
 omdev/tools/antlr/__init__.py
 omdev/tools/antlr/__main__.py
@@ -303,6 +304,12 @@ omdev/tools/json/io.py
 omdev/tools/json/parsing.py
 omdev/tools/json/processing.py
 omdev/tools/json/rendering.py
+omdev/tools/jsonview/__init__.py
+omdev/tools/jsonview/__main__.py
+omdev/tools/jsonview/cli.py
+omdev/tools/jsonview/resources/__init__.py
+omdev/tools/jsonview/resources/jsonview.css
+omdev/tools/jsonview/resources/jsonview.js
 omdev/tools/pawk/__init__.py
 omdev/tools/pawk/__main__.py
 omdev/tools/pawk/pawk.py

{omdev-0.0.0.dev345 → omdev-0.0.0.dev347}/omdev.egg-info/requires.txt RENAMED Viewed

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev345
+omlish==0.0.0.dev347
 [all]
 black~=25.1

{omdev-0.0.0.dev345 → omdev-0.0.0.dev347}/pyproject.toml RENAMED Viewed

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev345'
+version = '0.0.0.dev347'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev345',
+    'omlish == 0.0.0.dev347',
 ]
 [project.optional-dependencies]
@@ -92,4 +92,6 @@ exclude = [
     'LICENSE.txt',
     'cc/cdeps.toml',
     'pyproject/resources/*.sh',
+    'tools/jsonview/resources/*.css',
+    'tools/jsonview/resources/*.js',
 ]