omlish 0.0.0.dev290__py3-none-any.whl → 0.0.0.dev292__py3-none-any.whl

omlish/__about__.py

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

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/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/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/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/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.dist-info → omlish-0.0.0.dev292.dist-info}/METADATA

@@ -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.dist-info → omlish-0.0.0.dev292.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=pjGUyLHaoWpPqRP3jz2u1fC1qoRc2lvrEcpU_Ax2tdg,8253
-omlish/__about__.py,sha256=oeR_9krsJobU57yaBP1YUrwkXI9RXjfl3IONZ25CSmw,3444
+omlish/__about__.py,sha256=35DcIUR8xZ1fV59-t4ejDVrAHFLqGSDxuBoLBDriBvA,3444
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -292,7 +292,7 @@ omlish/dispatch/_dispatch3.py,sha256=9Zjd7bINAC3keiaBdssc4v5dY0-8OI6XooV2DR9U7Z0
 omlish/dispatch/dispatch.py,sha256=KA5l49AiGLRjp4J7RDJW9RiDp9WUD1ewR1AOPEF8g38,3062
 omlish/dispatch/functions.py,sha256=cwNzGIg2ZIalEgn9I03cnJVbMTHjWloyDTaowlO3UPs,1524
 omlish/dispatch/impls.py,sha256=K_okKvpZml4NkTHJmTVyMQSrIaIJcqTEgkreGwukaOw,1895
-omlish/dispatch/methods.py,sha256=K5w9Bb4jjCEpz3H95VMsv8ITXSO_7F6Jp5K5Fcd4gjQ,6955
+omlish/dispatch/methods.py,sha256=CeGVwiUdeadzyOe0xQVY_jegyj0tdHLQZpaIlLkJNnY,7330
 omlish/docker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/docker/all.py,sha256=xXRgJgLGPwAtr7bDMJ_Dp9jTfOwfGvohNhc6LsoELJc,514
 omlish/docker/cli.py,sha256=gtb9kitVfGnd4cr587NsVVk8D5Ok5y5SAsqD_SwGrSA,2565
@@ -460,12 +460,12 @@ omlish/iterators/iterators.py,sha256=RxW35yQ5ed8vBQ22IqpDXFx-i5JiLQdp7-pkMZXhJJ8
 omlish/iterators/recipes.py,sha256=wOwOZg-zWG9Zc3wcAxJFSe2rtavVBYwZOfG09qYEx_4,472
 omlish/iterators/tools.py,sha256=c4hArZEVV8y9_dFfmRwakusv1cWJLT4MkTkGRjnGN5U,2556
 omlish/iterators/unique.py,sha256=Nw0pSaNEcHAkve0ugfLPvJcirDOn9ECyC5wIL8JlJKI,1395
-omlish/lang/__init__.py,sha256=hv6BlnJfD7gHFyOGXl1lgbo3vHkmsivqy462JwA04tM,5316
+omlish/lang/__init__.py,sha256=KCzbT9IMWi2TNldAlDZ6b8Rr-7hyV9Ne6kIKJLXNAxg,5315
 omlish/lang/attrs.py,sha256=i7euRF81uNF8QDmUVXSK_BtqLGshaMi4VVdUnMjiMwg,5050
 omlish/lang/clsdct.py,sha256=HAGIvBSbCefzRjXriwYSBLO7QHKRv2UsE78jixOb-fA,1828
 omlish/lang/collections.py,sha256=aGi0j6VzVe2nz4l357Y4RD5_XNl8OJbmM5qM6BclrrY,1895
 omlish/lang/comparison.py,sha256=MOwEG0Yny-jBPHO9kQto9FSRyeNpQW24UABsghkrHxY,1356
-omlish/lang/contextmanagers.py,sha256=UPH6daYwSP9cH5AfSVsJyEHk1UURMGhVPM5ZRhp_Hvw,7576
+omlish/lang/contextmanagers.py,sha256=pN8X4ZCagqU9_xWumi8gZPdMIWlInA-_zQrkl7o5VP0,7258
 omlish/lang/datetimes.py,sha256=mrTtA67JYpfQwSlzdPcBtvm6dAyYM_dXNnlxFwFQH0M,228
 omlish/lang/descriptors.py,sha256=zBtgO9LjdSTGHNUgiIqswh78WOVoGH6KzS0NbgB1Wls,6572
 omlish/lang/enums.py,sha256=F9tflHfaAoV2MpyuhZzpfX9-H55M3zNa9hCszsngEo8,111
@@ -502,7 +502,7 @@ omlish/lite/__init__.py,sha256=ISLhM4q0LR1XXTCaHdZOZxBRyIsoZqYm4u0bf1BPcVk,148
 omlish/lite/cached.py,sha256=O7ozcoDNFm1Hg2wtpHEqYSp_i_nCLNOP6Ueq_Uk-7mU,1300
 omlish/lite/check.py,sha256=OLwtE2x6nlbGx4vS3Rda7zMHpgqzDSLJminTAX2lqLA,13529
 omlish/lite/configs.py,sha256=Ev_19sbII67pTWzInYjYqa9VyTiZBvyjhZqyG8TtufE,908
-omlish/lite/contextmanagers.py,sha256=XSCwr9GpPBJxXR9Vr07M4A_BH3uLpZettyoSE5KqJu8,5566
+omlish/lite/contextmanagers.py,sha256=WrL2NPT7OA5JvHp4H-opwsCpYTHod27EJ4qB1cJ9Mjc,5691
 omlish/lite/dataclasses.py,sha256=t1G5-xOuvE6o6w9RyqHzLT9wHD0HkqBh5P8HUZWxGzs,1912
 omlish/lite/imports.py,sha256=o9WWrNrWg0hKeMvaj91giaovED_9VFanN2MyEHBGekY,1346
 omlish/lite/inject.py,sha256=-tTsOqqef-Ix5Tgl2DP_JAsNWJQDFUptERl3lk14Uzs,29007
@@ -769,6 +769,7 @@ omlish/sql/tabledefs/tabledefs.py,sha256=lIhvlt0pk6G7RZAtDFsFXm5j0l9BvRfnP7vNGey
 omlish/subprocesses/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/subprocesses/async_.py,sha256=hPQTWFa3k5CE_s9p1JTY4KdTPOsqLJtq3lGMRznrVpY,2373
 omlish/subprocesses/base.py,sha256=W6El-PUKKF9KLAks5LB6kzqs_n3FfkblJ-JOv6NFQbY,6133
+omlish/subprocesses/editor.py,sha256=nLrudPayAZxv0u5LtZFecR_zdSEk0bd8G3XFjbOD81M,2386
 omlish/subprocesses/run.py,sha256=3jwSnQJvFMDMHmJvtAkrrK5D-i7_8cw12vX84EWTuJo,3668
 omlish/subprocesses/sync.py,sha256=HKmKM99_Y7tkJRg_n5onXrw41IZt5M5fqU0281LY-mo,3671
 omlish/subprocesses/utils.py,sha256=MJb6hvKhZceTmBeFVqlc5oM7rDxWkUzSzK9nKvbIvM8,396
@@ -831,9 +832,9 @@ omlish/typedvalues/holder.py,sha256=4SwRezsmuDDEO5gENGx8kTm30pblF5UktoEAu02i-Gk,
 omlish/typedvalues/marshal.py,sha256=Rr-4DZ90BoD5Z9gT18QhZH2yMA3-gPJBK8GUrGkp8VA,4245
 omlish/typedvalues/reflect.py,sha256=y_7IY8_4cLVRvD3ug-_-cDaO5RtzC1rLVFzkeAPALf8,683
 omlish/typedvalues/values.py,sha256=Q_5IiQM3Vka4wGVd-scaslb4-oCMjFcIOksIrKE-JIM,1229
-omlish-0.0.0.dev290.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev290.dist-info/METADATA,sha256=mlzTXMgNxL2crv8buBrhFsKzvguDXk_sMGiWLJEKHZc,4316
-omlish-0.0.0.dev290.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-omlish-0.0.0.dev290.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev290.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev290.dist-info/RECORD,,
+omlish-0.0.0.dev292.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev292.dist-info/METADATA,sha256=kDZfh7WmEgxzVyOJP7bSmYSh1RzTqJOv4VdFbKI55fk,4316
+omlish-0.0.0.dev292.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+omlish-0.0.0.dev292.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev292.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev292.dist-info/RECORD,,