omdev 0.0.0.dev102__tar.gz → 0.0.0.dev104__tar.gz

{omdev-0.0.0.dev102/omdev.egg-info → omdev-0.0.0.dev104}/PKG-INFO

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

{omdev-0.0.0.dev102 → omdev-0.0.0.dev104}/omdev/.manifests.json

@@ -123,7 +123,7 @@
     "module": ".ptk.apps.ncdu",
     "attr": "_CLI_MODULE",
     "file": "omdev/ptk/apps/ncdu.py",
-    "line": 157,
+    "line": 155,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "ptk/ncdu",
@@ -219,7 +219,7 @@
     "module": ".tools.git",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/git.py",
-    "line": 124,
+    "line": 128,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "git",

{omdev-0.0.0.dev102 → omdev-0.0.0.dev104}/omdev/ptk/apps/ncdu.py

@@ -69,12 +69,10 @@ class NcduApp:
 
         self._kb = ptk.KeyBindings()
         self._kb.add('q')(self.exit_app)
-        for k in ['up', 'p']:
-            self._kb.add(k)(self.move_up)
-        for k in ['down', 'n']:
-            self._kb.add(k)(self.move_down)
-        self._kb.add('enter')(self.enter_directory)
-        self._kb.add('backspace')(self.go_back)
+        self._kb.add('up', 'p')(self.move_up)
+        self._kb.add('down', 'n')(self.move_down)
+        self._kb.add('right', 'enter')(self.enter_directory)
+        self._kb.add('left', 'backspace')(self.go_back)
 
         self._layout = ptk.Layout(ptk.Frame(self._text_area))
 

{omdev-0.0.0.dev102 → omdev-0.0.0.dev104}/omdev/scripts/execrss.py

@@ -16,7 +16,17 @@ _CLI_MODULE = {'$omdev.cli.types.CliModule': {
 
 
 def _main() -> None:
-    [src] = sys.argv[1:]
+    if len(sys.argv) == 2:
+        pre = None
+        [src] = sys.argv[1:]
+    elif len(sys.argv) == 3:
+        [pre, src] = sys.argv[1:]
+    else:
+        raise Exception('Invalid arguments')
+
+    if pre:
+        exec(pre)
+
     start = _get_rss()
     exec(src)
     end = _get_rss()

{omdev-0.0.0.dev102 → omdev-0.0.0.dev104}/omdev/scripts/exectime.py

@@ -12,7 +12,17 @@ _CLI_MODULE = {'$omdev.cli.types.CliModule': {
 
 
 def _main() -> None:
-    [src] = sys.argv[1:]
+    if len(sys.argv) == 2:
+        pre = None
+        [src] = sys.argv[1:]
+    elif len(sys.argv) == 3:
+        [pre, src] = sys.argv[1:]
+    else:
+        raise Exception('Invalid arguments')
+
+    if pre:
+        exec(pre)
+
     co = compile(src, '<string>', 'exec')
     start = time.time_ns()
     exec(co)

{omdev-0.0.0.dev102 → omdev-0.0.0.dev104}/omdev/scripts/interp.py

@@ -51,7 +51,7 @@ VersionCmpLocalType = ta.Union['NegativeInfinityVersionType', _VersionCmpLocalTy
 VersionCmpKey = ta.Tuple[int, ta.Tuple[int, ...], VersionCmpPrePostDevType, VersionCmpPrePostDevType, VersionCmpPrePostDevType, VersionCmpLocalType]  # noqa
 VersionComparisonMethod = ta.Callable[[VersionCmpKey, VersionCmpKey], bool]
 
-# ../../../omlish/lite/check.py
+# ../../../omlish/lite/cached.py
 T = ta.TypeVar('T')
 
 # ../../packaging/specifiers.py
@@ -471,7 +471,7 @@ def canonicalize_version(
 # ../../../omlish/lite/cached.py
 
 
-class cached_nullary:  # noqa
+class _cached_nullary:  # noqa
     def __init__(self, fn):
         super().__init__()
         self._fn = fn
@@ -488,6 +488,10 @@ class cached_nullary:  # noqa
         return bound
 
 
+def cached_nullary(fn: ta.Callable[..., T]) -> ta.Callable[..., T]:
+    return _cached_nullary(fn)
+
+
 ########################################
 # ../../../omlish/lite/check.py
 
@@ -1692,6 +1696,24 @@ def subprocess_try_output_str(*args: str, **kwargs: ta.Any) -> ta.Optional[str]:
     return out.decode().strip() if out is not None else None
 
 
+##
+
+
+def subprocess_close(
+        proc: subprocess.Popen,
+        timeout: ta.Optional[float] = None,
+) -> None:
+    # TODO: terminate, sleep, kill
+    if proc.stdout:
+        proc.stdout.close()
+    if proc.stderr:
+        proc.stderr.close()
+    if proc.stdin:
+        proc.stdin.close()
+
+    proc.wait(timeout)
+
+
 ########################################
 # ../inspect.py
 

{omdev-0.0.0.dev102 → omdev-0.0.0.dev104}/omdev/scripts/pyproject.py

@@ -90,7 +90,7 @@ TomlParseFloat = ta.Callable[[str], ta.Any]
 TomlKey = ta.Tuple[str, ...]
 TomlPos = int  # ta.TypeAlias
 
-# ../../../omlish/lite/check.py
+# ../../../omlish/lite/cached.py
 T = ta.TypeVar('T')
 
 # ../../packaging/specifiers.py
@@ -1862,7 +1862,7 @@ class WheelFile(zipfile.ZipFile):
 # ../../../omlish/lite/cached.py
 
 
-class cached_nullary:  # noqa
+class _cached_nullary:  # noqa
     def __init__(self, fn):
         super().__init__()
         self._fn = fn
@@ -1879,6 +1879,10 @@ class cached_nullary:  # noqa
         return bound
 
 
+def cached_nullary(fn: ta.Callable[..., T]) -> ta.Callable[..., T]:
+    return _cached_nullary(fn)
+
+
 ########################################
 # ../../../omlish/lite/check.py
 
@@ -3235,7 +3239,7 @@ class DataclassObjMarshaler(ObjMarshaler):
         return {k: m.marshal(getattr(o, k)) for k, m in self.fs.items()}
 
     def unmarshal(self, o: ta.Any) -> ta.Any:
-        return self.ty(**{k: self.fs[k].unmarshal(v) for k, v in o.items() if self.nonstrict or k in self.fs})
+        return self.ty(**{k: self.fs[k].unmarshal(v) for k, v in o.items() if not self.nonstrict or k in self.fs})
 
 
 @dc.dataclass(frozen=True)
@@ -3295,7 +3299,10 @@ class UuidObjMarshaler(ObjMarshaler):
         return uuid.UUID(o)
 
 
-_OBJ_MARSHALERS: ta.Dict[ta.Any, ObjMarshaler] = {
+##
+
+
+_DEFAULT_OBJ_MARSHALERS: ta.Dict[ta.Any, ObjMarshaler] = {
     **{t: NopObjMarshaler() for t in (type(None),)},
     **{t: CastObjMarshaler(t) for t in (int, float, str, bool)},
     **{t: Base64ObjMarshaler(t) for t in (bytes, bytearray)},
@@ -3324,20 +3331,19 @@ _OBJ_MARSHALER_GENERIC_ITERABLE_TYPES: ta.Dict[ta.Any, type] = {
 }
 
 
-def register_opj_marshaler(ty: ta.Any, m: ObjMarshaler) -> None:
-    if ty in _OBJ_MARSHALERS:
-        raise KeyError(ty)
-    _OBJ_MARSHALERS[ty] = m
-
-
-def _make_obj_marshaler(ty: ta.Any) -> ObjMarshaler:
+def _make_obj_marshaler(
+        ty: ta.Any,
+        rec: ta.Callable[[ta.Any], ObjMarshaler],
+        *,
+        nonstrict_dataclasses: bool = False,
+) -> ObjMarshaler:
     if isinstance(ty, type):
         if abc.ABC in ty.__bases__:
             impls = [  # type: ignore
                 PolymorphicObjMarshaler.Impl(
                     ity,
                     ity.__qualname__,
-                    get_obj_marshaler(ity),
+                    rec(ity),
                 )
                 for ity in deep_subclasses(ty)
                 if abc.ABC not in ity.__bases__
@@ -3353,7 +3359,8 @@ def _make_obj_marshaler(ty: ta.Any) -> ObjMarshaler:
         if dc.is_dataclass(ty):
             return DataclassObjMarshaler(
                 ty,
-                {f.name: get_obj_marshaler(f.type) for f in dc.fields(ty)},
+                {f.name: rec(f.type) for f in dc.fields(ty)},
+                nonstrict=nonstrict_dataclasses,
             )
 
     if is_generic_alias(ty):
@@ -3363,7 +3370,7 @@ def _make_obj_marshaler(ty: ta.Any) -> ObjMarshaler:
             pass
         else:
             k, v = ta.get_args(ty)
-            return MappingObjMarshaler(mt, get_obj_marshaler(k), get_obj_marshaler(v))
+            return MappingObjMarshaler(mt, rec(k), rec(v))
 
         try:
             st = _OBJ_MARSHALER_GENERIC_ITERABLE_TYPES[ta.get_origin(ty)]
@@ -3371,33 +3378,71 @@ def _make_obj_marshaler(ty: ta.Any) -> ObjMarshaler:
             pass
         else:
             [e] = ta.get_args(ty)
-            return IterableObjMarshaler(st, get_obj_marshaler(e))
+            return IterableObjMarshaler(st, rec(e))
 
         if is_union_alias(ty):
-            return OptionalObjMarshaler(get_obj_marshaler(get_optional_alias_arg(ty)))
+            return OptionalObjMarshaler(rec(get_optional_alias_arg(ty)))
 
     raise TypeError(ty)
 
 
-def get_obj_marshaler(ty: ta.Any) -> ObjMarshaler:
-    try:
-        return _OBJ_MARSHALERS[ty]
-    except KeyError:
-        pass
+##
 
-    p = ProxyObjMarshaler()
-    _OBJ_MARSHALERS[ty] = p
-    try:
-        m = _make_obj_marshaler(ty)
-    except Exception:
-        del _OBJ_MARSHALERS[ty]
-        raise
-    else:
-        p.m = m
+
+_OBJ_MARSHALERS_LOCK = threading.RLock()
+
+_OBJ_MARSHALERS: ta.Dict[ta.Any, ObjMarshaler] = dict(_DEFAULT_OBJ_MARSHALERS)
+
+_OBJ_MARSHALER_PROXIES: ta.Dict[ta.Any, ProxyObjMarshaler] = {}
+
+
+def register_opj_marshaler(ty: ta.Any, m: ObjMarshaler) -> None:
+    with _OBJ_MARSHALERS_LOCK:
+        if ty in _OBJ_MARSHALERS:
+            raise KeyError(ty)
         _OBJ_MARSHALERS[ty] = m
+
+
+def get_obj_marshaler(
+        ty: ta.Any,
+        *,
+        no_cache: bool = False,
+        **kwargs: ta.Any,
+) -> ObjMarshaler:
+    with _OBJ_MARSHALERS_LOCK:
+        if not no_cache:
+            try:
+                return _OBJ_MARSHALERS[ty]
+            except KeyError:
+                pass
+
+        try:
+            return _OBJ_MARSHALER_PROXIES[ty]
+        except KeyError:
+            pass
+
+        rec = functools.partial(
+            get_obj_marshaler,
+            no_cache=no_cache,
+            **kwargs,
+        )
+
+        p = ProxyObjMarshaler()
+        _OBJ_MARSHALER_PROXIES[ty] = p
+        try:
+            m = _make_obj_marshaler(ty, rec, **kwargs)
+        finally:
+            del _OBJ_MARSHALER_PROXIES[ty]
+        p.m = m
+
+        if not no_cache:
+            _OBJ_MARSHALERS[ty] = m
         return m
 
 
+##
+
+
 def marshal_obj(o: ta.Any, ty: ta.Any = None) -> ta.Any:
     return get_obj_marshaler(ty if ty is not None else type(o)).marshal(o)
 
@@ -3916,6 +3961,24 @@ def subprocess_try_output_str(*args: str, **kwargs: ta.Any) -> ta.Optional[str]:
     return out.decode().strip() if out is not None else None
 
 
+##
+
+
+def subprocess_close(
+        proc: subprocess.Popen,
+        timeout: ta.Optional[float] = None,
+) -> None:
+    # TODO: terminate, sleep, kill
+    if proc.stdout:
+        proc.stdout.close()
+    if proc.stderr:
+        proc.stderr.close()
+    if proc.stdin:
+        proc.stdin.close()
+
+    proc.wait(timeout)
+
+
 ########################################
 # ../../interp/inspect.py
 

{omdev-0.0.0.dev102 → omdev-0.0.0.dev104}/omdev/tools/git.py

@@ -61,38 +61,42 @@ class Cli(ap.Cli):
         accepts_unknown=True,
     )
     def clone(self) -> None:
-        out_dir: str
-
-        if (m := self._GITHUB_PAT.fullmatch(self.args.repo)):
-            user = m.group('user')
-            repo = m.group('repo')
-
-            os.makedirs(user, 0o755, exist_ok=True)
-
-            subprocess.check_call([
-                'git',
-                'clone',
-                *self.unknown_args,
-                *self.args.args,
-                f'https://github.com/{user}/{repo}.git',
-                os.path.join(user, repo),
-            ])
-
-            out_dir = os.path.join(user, repo)
-
-        else:
-            parsed = urllib.parse.urlparse(self.args.repo)
-            out_dir = parsed.path.split('/')[-1]
-
-            subprocess.check_call([
-                'git',
-                'clone',
-                *self.unknown_args,
-                *self.args.args,
-                self.args.repo,
-            ])
-
-        print(out_dir)
+        # And expected usage is `cd $(om git clone foo/bar)` and an empty cd arg will return to the previous directory,
+        # so always output at least a . so it'll cd to the current dir at least lol - it still runs even if the proc
+        # fails.
+        out_dir = '.'
+        try:
+            if (m := self._GITHUB_PAT.fullmatch(self.args.repo)):
+                user = m.group('user')
+                repo = m.group('repo')
+
+                os.makedirs(user, 0o755, exist_ok=True)
+
+                subprocess.check_call([
+                    'git',
+                    'clone',
+                    *self.unknown_args,
+                    *self.args.args,
+                    f'https://github.com/{user}/{repo}.git',
+                    os.path.join(user, repo),
+                ])
+
+                out_dir = os.path.join(user, repo)
+
+            else:
+                parsed = urllib.parse.urlparse(self.args.repo)
+                out_dir = parsed.path.split('/')[-1]
+
+                subprocess.check_call([
+                    'git',
+                    'clone',
+                    *self.unknown_args,
+                    *self.args.args,
+                    self.args.repo,
+                ])
+
+        finally:
+            print(out_dir)
 
     @ap.command(
         ap.arg('rev', nargs='?', default='HEAD'),

{omdev-0.0.0.dev102 → omdev-0.0.0.dev104/omdev.egg-info}/PKG-INFO

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

{omdev-0.0.0.dev102 → omdev-0.0.0.dev104}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev102
+omlish==0.0.0.dev104
 
 [all]
 black~=24.10

{omdev-0.0.0.dev102 → omdev-0.0.0.dev104}/pyproject.toml

@@ -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.dev102'
+version = '0.0.0.dev104'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev102',
+    'omlish == 0.0.0.dev104',
 ]
 
 [project.optional-dependencies]