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

omdev/tools/docker.py

@@ -13,12 +13,14 @@ import re
 import shutil
 import subprocess
 import sys
+import threading
 import typing as ta
 
 from omlish import check
 from omlish import lang
 from omlish import marshal as msh
 from omlish.argparse import all as ap
+from omlish.concurrent import all as conc
 from omlish.docker import all as dck
 from omlish.docker.ns1 import build_docker_ns1_run_cmd
 from omlish.formats import json
@@ -204,6 +206,7 @@ class Cli(ap.Cli):
 
     @ap.cmd(
         ap.arg('-f', '--file'),
+        ap.arg('-p', '--parallelism', type=int, default=4),
     )
     def compose_image_updates(self) -> None:
         if self.args.file:
@@ -215,23 +218,32 @@ class Cli(ap.Cli):
             yml_src = f.read()
 
         cfg_dct = yaml.safe_load(yml_src)
-        for svc_name, svc_dct in cfg_dct.get('services', {}).items():
-            if not (img := svc_dct.get('image')):
-                continue
 
+        print_lock = threading.Lock()
+
+        def do_svc(svc_name: str, img: str) -> None:  # noqa
             repo, _, base = img.partition(':')
             try:
                 if (info := dck.get_hub_repo_info(repo)) is None:
-                    continue
+                    return
 
                 lt = dck.select_latest_tag(info.tags, base=base)
                 if f'{repo}:{lt}' == img:
-                    continue
+                    return
 
-                print(f'{svc_name}: {lt}')
+                with print_lock:
+                    print(f'{svc_name}: {lt}')
 
             except Exception as e:  # noqa
-                print(f'Error checking docker update for {svc_name}: {e!r}', file=sys.stderr)
+                with print_lock:
+                    print(f'Error checking docker update for {svc_name}: {e!r}', file=sys.stderr)
+
+        with conc.new_executor(self.args.parallelism) as exe:
+            conc.wait_futures([
+                exe.submit(do_svc, svc_name, img)
+                for svc_name, svc_dct in cfg_dct.get('services', {}).items()
+                if (img := svc_dct.get('image'))
+            ])
 
     #
 

omdev/tools/git/cli.py

@@ -21,7 +21,7 @@ TODO:
   fatal: Need to specify how to reconcile divergent branches.
 """
 import dataclasses as dc
-import logging
+import glob
 import os
 import shutil
 import tempfile
@@ -58,7 +58,7 @@ else:
     msh = lang.proxy_import('omlish.marshal')
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##
@@ -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,
@@ -316,6 +348,7 @@ class Cli(ap.Cli):
         ap.arg('-g', '--message-generator', nargs='?'),
         ap.arg('--dry-run', action='store_true'),
         ap.arg('-y', '--no-confirmation', action='store_true'),
+        ap.arg('-r', '--repository'),
         ap.arg('dir', nargs='*'),
         aliases=['acp'],
     )
@@ -337,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,
@@ -355,7 +386,7 @@ class Cli(ap.Cli):
 
                 check_call('git', 'commit', '-m', msg)
 
-            check_call('git', 'push')
+            check_call('git', 'push', *([self.args.repository] if self.args.repository is not None else []))
 
         if not self.args.dir:
             run(None)
@@ -452,6 +483,7 @@ class Cli(ap.Cli):
     BUILTIN_COMMIT_MESSAGES: ta.Mapping[str, str] = {
         'tableflip': '(╯°□°)╯︵ ┻━┻',
         'tableunflip': '┬─┬ノ(º _ ºノ)',
+        'shrug': r'¯\_(ツ)_/¯',
     }
 
     @ap.cmd(
@@ -501,10 +533,18 @@ class Cli(ap.Cli):
                 repo_dir = os.path.join(tmp_dir, repo_dir_name)
                 check.state(os.path.isdir(repo_dir))
 
+                #
+
                 git_dir = os.path.join(repo_dir, '.git')
                 check.state(os.path.isdir(git_dir))
                 shutil.rmtree(git_dir)
 
+                for f in glob.glob(os.path.join(repo_dir, '**/.gitattributes'), recursive=True):
+                    if os.path.isfile(f):
+                        os.unlink(f)
+
+                #
+
                 shutil.move(repo_dir, cwd)
 
                 out_dir = repo_dir_name

omdev/tools/git/messages.py

@@ -16,7 +16,7 @@ from . import consts
 ##
 
 
-class GitMessageGenerator(abc.ABC):
+class GitMessageGenerator(lang.Abstract):
     @dc.dataclass(frozen=True, kw_only=True)
     class GenerateCommitMessageArgs:
         cwd: str | None = None
@@ -44,7 +44,7 @@ class GitMessageGeneratorManifest(NameAliasesManifest, ModAttrManifest):
         return check.issubclass(self.resolve(), GitMessageGenerator)
 
 
-class StaticGitMessageGeneratorManifest(StaticModAttrManifest, GitMessageGeneratorManifest, abc.ABC):
+class StaticGitMessageGeneratorManifest(StaticModAttrManifest, GitMessageGeneratorManifest, lang.Abstract):
     pass
 
 

omdev/tools/json/cli.py

@@ -195,7 +195,7 @@ def _main() -> None:
         else:
             in_file = es.enter_context(open(args.file, 'rb'))
 
-        def yield_input() -> ta.Generator[bytes]:
+        def yield_input() -> ta.Iterator[bytes]:
             fd = check.isinstance(in_file.fileno(), int)
 
             while True:
@@ -240,7 +240,7 @@ def _main() -> None:
                 def flush_output(
                         fn: ta.Callable[[T], ta.Iterable[U]],
                         i: T,
-                ) -> ta.Generator[U]:
+                ) -> ta.Iterator[U]:
                     n = 0
                     for o in fn(i):
                         yield o
@@ -259,7 +259,7 @@ def _main() -> None:
                     def append_newlines(
                             fn: ta.Callable[[T], ta.Iterable[str]],
                             i: T,
-                    ) -> ta.Generator[str]:
+                    ) -> ta.Iterator[str]:
                         yield from fn(i)
                         yield '\n'
 
@@ -267,15 +267,15 @@ def _main() -> None:
                     pipeline = fp.bind(append_newlines, pipeline)  # Any -> [str]
                     pipeline = fp.bind(lang.flatmap, pipeline)  # [Any] -> [str]
                     pipeline = fp.pipe(fp.bind(lang.flatmap, processor.process), pipeline)  # [Any] -> [str]
-                    pipeline = fp.pipe(fp.bind(lang.flatmap, builder.build), pipeline)  # [JsonStreamParserEvent] -> [str]  # noqa
+                    pipeline = fp.pipe(fp.bind(lang.flatmap, builder.build), pipeline)  # [Event] -> [str]  # noqa
                     pipeline = fp.pipe(parser.parse, pipeline)  # bytes -> [str]
 
                 else:
                     renderer = StreamRenderer(cfg.rendering)
                     trailing_newline = True
 
-                    pipeline = renderer.render  # JsonStreamParserEvent -> [str]
-                    pipeline = fp.bind(lang.flatmap, pipeline)  # [JsonStreamParserEvent] -> [str]
+                    pipeline = renderer.render  # Event -> [str]
+                    pipeline = fp.bind(lang.flatmap, pipeline)  # [Event] -> [str]
                     pipeline = fp.pipe(parser.parse, pipeline)  # bytes -> [str]
 
                 pipeline = fp.bind(flush_output, pipeline)  # bytes -> [str]

omdev/tools/json/formats.py

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

omdev/tools/json/parsing.py

@@ -6,8 +6,8 @@ from omlish import check
 from omlish import lang
 from omlish.formats.json.stream.building import JsonValueBuilder
 from omlish.formats.json.stream.lexing import JsonStreamLexer
+from omlish.formats.json.stream.parsing import Event
 from omlish.formats.json.stream.parsing import JsonStreamParser
-from omlish.formats.json.stream.parsing import JsonStreamParserEvent
 from omlish.io.buffers import DelimitingBuffer
 
 from .formats import Format
@@ -22,7 +22,7 @@ class EagerParser:
 
         self._fmt = fmt
 
-    def parse(self, f: ta.TextIO) -> ta.Generator[ta.Any]:
+    def parse(self, f: ta.TextIO) -> ta.Iterator[ta.Any]:
         return self._fmt.load(f)
 
 
@@ -42,7 +42,7 @@ class DelimitingParser:
 
         self._db = DelimitingBuffer(delimiters)
 
-    def parse(self, b: bytes) -> ta.Generator[ta.Any]:
+    def parse(self, b: bytes) -> ta.Iterator[ta.Any]:
         for chunk in self._db.feed(b):
             s = check.isinstance(chunk, bytes).decode('utf-8')
             v = self._fmt.load(io.StringIO(s))
@@ -58,7 +58,7 @@ class StreamBuilder(lang.ExitStacked):
     def _enter_contexts(self) -> None:
         self._builder = self._enter_context(JsonValueBuilder())
 
-    def build(self, e: JsonStreamParserEvent) -> ta.Generator[ta.Any]:
+    def build(self, e: Event) -> ta.Iterator[ta.Any]:
         yield from check.not_none(self._builder)(e)
 
 
@@ -72,7 +72,7 @@ class StreamParser(lang.ExitStacked):
         self._lex = self._enter_context(JsonStreamLexer())
         self._parse = self._enter_context(JsonStreamParser())
 
-    def parse(self, b: bytes) -> ta.Generator[JsonStreamParserEvent]:
+    def parse(self, b: bytes) -> ta.Iterator[Event]:
         for s in self._decoder.decode(b, not b):
             for c in s:
                 for t in self._lex(c):

omdev/tools/json/processing.py

@@ -53,11 +53,14 @@ class Processor:
 
     def _marshal(self, v: ta.Any) -> ta.Any:
         return msh.MarshalContext(
-            msh.global_registry(),
-            factory=self._marshaler_factory(),
+            configs=msh.global_config_registry(),
+            marshal_factory_context=msh.MarshalFactoryContext(
+                configs=msh.global_config_registry(),
+                marshaler_factory=self._marshaler_factory(),
+            ),
         ).marshal(v)
 
-    def process(self, v: ta.Any) -> ta.Iterable[ta.Any]:
+    def process(self, v: ta.Any) -> ta.Iterator[ta.Any]:
         if self._jmespath_expr is not None:
             v = self._jmespath_expr.search(v)
 

omdev/tools/json/rendering.py

@@ -4,7 +4,7 @@ import typing as ta
 
 from omlish import lang
 from omlish.formats.json.rendering import JsonRenderer
-from omlish.formats.json.stream.parsing import JsonStreamParserEvent
+from omlish.formats.json.stream.parsing import Event
 from omlish.formats.json.stream.rendering import StreamJsonRenderer
 from omlish.formats.json5.rendering import Json5Renderer
 from omlish.term import codes as tc
@@ -101,5 +101,5 @@ class StreamRenderer(Renderer):
             **self._kw,
         )
 
-    def render(self, e: JsonStreamParserEvent) -> ta.Generator[str]:
+    def render(self, e: Event) -> ta.Iterator[str]:
         return self._renderer.render((e,))

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
 """
@@ -14,62 +14,33 @@ import os
 import socketserver
 import sys
 import threading
+import typing as ta
 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 | None,
+        *,
+        mode: ta.Literal['jsonl', 'json5', 'json', None] = None,
+) -> None:
+    if filepath == '-':
+        filepath = '/dev/stdin'
 
-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
@@ -81,13 +52,21 @@ def view_json(filepath: str, port: int) -> None:
         print(f'Error: Invalid JSON file. {e}', file=sys.stderr)
         return
 
-    if filepath.endswith('.jsonl'):
+    if mode is None:
+        if filepath.endswith('.jsonl'):
+            mode = 'json'
+        elif filepath.endswith('.json5'):
+            mode = 'json5'
+
+    if mode == 'jsonl':
         json_content = [json.loads(sl) for l in raw_content.splitlines() if (sl := l.strip())]
-    elif filepath.endswith('.json5'):
+    elif mode == 'json5':
         from omlish.formats import json5
         json_content = json5.loads(raw_content)
-    else:
+    elif mode in ('json', None):
         json_content = json.loads(raw_content)
+    else:
+        raise ValueError(mode)
 
     # Use compact dumps for embedding in JS, it's more efficient
     json_string = json.dumps(json_content)
@@ -102,15 +81,18 @@ def view_json(filepath: str, port: int) -> None:
                 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}'
@@ -132,19 +114,21 @@ 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()
 
-    view_json(args.filepath, args.port)
+    check.state(not (args.lines and args.five))
+
+    view_json(
+        args.filepath,
+        args.port,
+        mode='jsonl' if args.lines else 'json5' if args.five else None,
+    )
 
 
 if __name__ == '__main__':

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>