omlish 0.0.0.dev290__tar.gz → 0.0.0.dev292__tar.gz

{omlish-0.0.0.dev290/omlish.egg-info → omlish-0.0.0.dev292}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev290
+Version: 0.0.0.dev292
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

omlish-0.0.0.dev292/README.md

@@ -0,0 +1,31 @@
+It's like my previous python monorepo-ey thing [`omnibus`](https://github.com/wrmsr/omnibus/tree/wrmsr_exp_split)... ish.
+
+Core packages begin with `om`, scratch app is in `app`, temp / dump code is in `x`.
+
+----
+
+The core packages are:
+
+- **omlish**: core foundational code
+- **omdev**: development utilities
+- **omserv**: production web server
+- **ominfra**: infrastructure and cloud code
+- **ommlx**: ml / ai code
+
+----
+
+Core packages installable from pypi, or from git via:
+
+```bash
+pip install 'git+https://github.com/wrmsr/omlish@master#subdirectory=.pkg/<pkg>'
+```
+
+Core packages have no required dependencies, but numerous optional ones - see their respective `pyproject.toml` files for details.
+
+The CLI is installable through uvx or pipx via:
+
+```bash
+curl -LsSf 'https://raw.githubusercontent.com/wrmsr/omlish/master/omdev/cli/install.py' | python3 -
+```
+
+Additional deps to be injected may be appended to the command.

{omlish-0.0.0.dev290 → omlish-0.0.0.dev292}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev290'
-__revision__ = 'ebbb2a4babf1f763c1caf685dbe12bcde2fa251f'
+__version__ = '0.0.0.dev292'
+__revision__ = '049add36e73b2356410aa68bca39c19cff8047d2'
 
 
 #

{omlish-0.0.0.dev290 → omlish-0.0.0.dev292}/omlish/dispatch/methods.py

@@ -16,12 +16,14 @@ from .impls import get_impl_func_cls_set
 
 
 T = ta.TypeVar('T')
+R = ta.TypeVar('R')
+P = ta.ParamSpec('P')
 
 
 ##
 
 
-class Method:
+class Method(ta.Generic[P, R]):
     def __init__(
             self,
             func: ta.Callable,
@@ -170,13 +172,27 @@ class Method:
             func = self.get_dispatch_func(instance_cls)
         return func.__get__(instance, owner)  # noqa
 
-    def __call__(self, instance, *args, **kwargs):
+    def __call__(self, *args: P.args, **kwargs: P.kwargs) -> R:
+        instance, *rest = args
         instance_cls = type(instance)
         try:
             func = self._dispatch_func_cache[weakref.ref(instance_cls)]
         except KeyError:
             func = self.get_dispatch_func(instance_cls)
-        return func.__get__(instance)(*args, **kwargs)  # noqa
+        return func.__get__(instance)(*rest, **kwargs)  # noqa
+
+
+##
+
+
+@ta.overload
+def method(func: ta.Callable[P, R], /, *, installable: bool = False) -> Method[P, R]:  # noqa
+    ...
+
+
+@ta.overload
+def method(func: None = None, /, *, installable: bool = False) -> ta.Callable[[ta.Callable[P, R]], Method[P, R]]:  # noqa
+    ...
 
 
 def method(func=None, /, *, installable=False):  # noqa
@@ -186,6 +202,9 @@ def method(func=None, /, *, installable=False):  # noqa
     return Method(func, **kw)
 
 
+#
+
+
 def install_method(
         mth: ta.Any,
         *,

{omlish-0.0.0.dev290 → omlish-0.0.0.dev292}/omlish/lang/__init__.py

@@ -96,12 +96,10 @@ from .contextmanagers import (  # noqa
     NOP_CONTEXT_MANAGER,
     NopContextManager,
     Timer,
-    a_defer,
     breakpoint_on_exception,
     context_var_setting,
     context_wrapped,
     default_lock,
-    defer,
     disposing,
     maybe_managing,
 )
@@ -296,9 +294,11 @@ from .typing import (  # noqa
 ##
 
 from ..lite.contextmanagers import (  # noqa
-    attr_setting,
     AsyncExitStacked,
     ExitStacked,
+    adefer,
+    attr_setting,
+    defer,
 )
 
 from ..lite.imports import (  # noqa

{omlish-0.0.0.dev290 → omlish-0.0.0.dev292}/omlish/lang/contextmanagers.py

@@ -119,22 +119,6 @@ class AsyncContextManager(abc.ABC, ta.Generic[T]):
 ##
 
 
-@contextlib.contextmanager
-def defer(fn: ta.Callable) -> ta.Generator[ta.Callable, None, None]:
-    try:
-        yield fn
-    finally:
-        fn()
-
-
-@contextlib.asynccontextmanager
-async def a_defer(fn: ta.Awaitable) -> ta.AsyncGenerator[ta.Awaitable, None]:
-    try:
-        yield fn
-    finally:
-        await fn
-
-
 @contextlib.contextmanager
 def maybe_managing(obj: T) -> ta.Iterator[T]:
     if isinstance(obj, ta.ContextManager):

{omlish-0.0.0.dev290 → omlish-0.0.0.dev292}/omlish/lite/contextmanagers.py

@@ -1,5 +1,6 @@
 # ruff: noqa: UP007
 import contextlib
+import functools
 import sys
 import typing as ta
 
@@ -146,7 +147,9 @@ class AsyncExitStacked:
 
 
 @contextlib.contextmanager
-def defer(fn: ta.Callable) -> ta.Generator[ta.Callable, None, None]:
+def defer(fn: ta.Callable, *args: ta.Any, **kwargs: ta.Any) -> ta.Generator[ta.Callable, None, None]:
+    if args or kwargs:
+        fn = functools.partial(fn, *args, **kwargs)
     try:
         yield fn
     finally:
@@ -154,11 +157,11 @@ def defer(fn: ta.Callable) -> ta.Generator[ta.Callable, None, None]:
 
 
 @contextlib.asynccontextmanager
-async def adefer(fn: ta.Callable) -> ta.AsyncGenerator[ta.Callable, None]:
+async def adefer(fn: ta.Awaitable) -> ta.AsyncGenerator[ta.Awaitable, None]:
     try:
         yield fn
     finally:
-        await fn()
+        await fn
 
 
 ##

omlish-0.0.0.dev292/omlish/subprocesses/editor.py

@@ -0,0 +1,97 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
+import dataclasses as dc
+import os
+import tempfile
+import typing as ta
+
+from ..lite.cached import cached_nullary
+from ..lite.contextmanagers import ExitStacked
+from ..lite.contextmanagers import defer
+from .run import SubprocessRun
+from .run import SubprocessRunnable
+from .run import SubprocessRunOutput
+
+
+##
+
+
+class EditTextWithUserEditor(SubprocessRunnable, ExitStacked):
+    def __init__(self, initial_text: str = '') -> None:
+        super().__init__()
+
+        self._initial_text = initial_text
+
+    @dc.dataclass(frozen=True)
+    class _TempFile:
+        path: str
+        before_mtime: float
+
+    @cached_nullary
+    def _temp_file(self) -> _TempFile:
+        with tempfile.NamedTemporaryFile(
+                mode='r+',
+                delete=False,
+        ) as ntf:
+            ntf.write(self._initial_text)
+            ntf.flush()
+            before_mtime = os.stat(ntf.name).st_mtime
+
+        self._enter_context(defer(os.unlink, ntf.name))  # noqa
+
+        return EditTextWithUserEditor._TempFile(
+            ntf.name,
+            before_mtime,
+        )
+
+    def make_run(self) -> SubprocessRun:
+        tf = self._temp_file()
+
+        editor = os.environ.get('EDITOR', 'vi')
+
+        return SubprocessRun.of(
+            editor,
+            tf.path,
+        )
+
+    def handle_run_output(self, output: SubprocessRunOutput) -> ta.Optional[str]:
+        tf = self._temp_file()
+
+        if output.returncode != 0:
+            return None
+
+        after_mtime = os.stat(tf.path).st_mtime
+
+        if after_mtime == tf.before_mtime:
+            # No changes made; assuming cancel.
+            return None
+
+        with open(tf.path) as f:
+            content = f.read().strip()
+            if not content:
+                # Empty file; assuming cancel.
+                return None
+
+        return content
+
+
+def edit_text_with_user_editor(
+        initial_text: str = '',
+        subprocesses: ta.Optional[ta.Any] = None,  # AbstractSubprocesses
+) -> ta.Optional[str]:
+    with EditTextWithUserEditor(initial_text) as cmd:
+        return cmd.run(subprocesses)
+
+
+##
+
+
+if __name__ == '__main__':
+    def _main() -> None:
+        text = edit_text_with_user_editor('# Write your message here.\n')
+        if text is not None:
+            print('User submitted:\n', text)
+        else:
+            print('Operation canceled.')
+
+    _main()

{omlish-0.0.0.dev290 → omlish-0.0.0.dev292/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev290
+Version: 0.0.0.dev292
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev290 → omlish-0.0.0.dev292}/omlish.egg-info/SOURCES.txt

@@ -1,6 +1,6 @@
 LICENSE
 MANIFEST.in
-README.rst
+README.md
 pyproject.toml
 omlish/.manifests.json
 omlish/__about__.py
@@ -779,6 +779,7 @@ omlish/sql/tabledefs/tabledefs.py
 omlish/subprocesses/__init__.py
 omlish/subprocesses/async_.py
 omlish/subprocesses/base.py
+omlish/subprocesses/editor.py
 omlish/subprocesses/run.py
 omlish/subprocesses/sync.py
 omlish/subprocesses/utils.py

{omlish-0.0.0.dev290 → omlish-0.0.0.dev292}/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.dev290'
+version = '0.0.0.dev292'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',

omlish-0.0.0.dev290/README.rst

@@ -1,38 +0,0 @@
-It's like my previous python monorepo-ey thing `omnibus
-<https://github.com/wrmsr/omnibus/tree/wrmsr_exp_split>`_... ish.
-
-Core packages begin with ``om``, scratch app is in ``app``, temp / dump code is in ``x``.
-
-----
-
-The core packages are:
-
-omlish
-  core foundational code
-omdev
-  development utilities
-omserv
-  production web server
-ominfra
-  infrastructure and cloud code
-ommlx
-  ml / ai code
-
-----
-
-Core packages installable from pypi, or from git via:
-
-.. code-block::
-
-  pip install 'git+https://github.com/wrmsr/omlish@master#subdirectory=.pkg/<pkg>'
-
-Core packages have no required dependencies, but numerous optional ones - see their respective ``pyproject.toml`` files
-for details.
-
-The cli is installable through uvx or pipx via:
-
-.. code-block::
-
-  curl -LsSf https://raw.githubusercontent.com/wrmsr/omlish/master/omdev/cli/install.py | python3 -
-
-Additional deps to be injected may be appended to the command.