omlish 0.0.0.dev29__tar.gz → 0.0.0.dev31__tar.gz

{omlish-0.0.0.dev29/omlish.egg-info → omlish-0.0.0.dev31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev29
+Version: 0.0.0.dev31
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -13,7 +13,7 @@ Classifier: Operating System :: POSIX
 Requires-Python: ~=3.12
 License-File: LICENSE
 Provides-Extra: all
-Requires-Dist: anyio~=4.5; extra == "all"
+Requires-Dist: anyio~=4.6; extra == "all"
 Requires-Dist: sniffio~=1.3; extra == "all"
 Requires-Dist: greenlet~=3.1; extra == "all"
 Requires-Dist: trio~=0.26; extra == "all"
@@ -42,15 +42,15 @@ Requires-Dist: sqlean.py~=3.45; python_version < "3.13" and extra == "all"
 Requires-Dist: duckdb~=1.1; extra == "all"
 Requires-Dist: pytest~=8.0; extra == "all"
 Provides-Extra: async
-Requires-Dist: anyio~=4.5; extra == "async"
+Requires-Dist: anyio~=4.6; extra == "async"
 Requires-Dist: sniffio~=1.3; extra == "async"
 Requires-Dist: greenlet~=3.1; extra == "async"
 Requires-Dist: trio~=0.26; extra == "async"
 Requires-Dist: trio-asyncio~=0.15; extra == "async"
-Provides-Extra: compression
-Requires-Dist: lz4~=4.0; extra == "compression"
-Requires-Dist: python-snappy~=0.7; python_version < "3.13" and extra == "compression"
-Requires-Dist: zstd~=1.5; extra == "compression"
+Provides-Extra: compress
+Requires-Dist: lz4~=4.0; extra == "compress"
+Requires-Dist: python-snappy~=0.7; python_version < "3.13" and extra == "compress"
+Requires-Dist: zstd~=1.5; extra == "compress"
 Provides-Extra: diag
 Requires-Dist: asttokens~=2.4; extra == "diag"
 Requires-Dist: executing~=2.1; extra == "diag"
@@ -67,15 +67,15 @@ Provides-Extra: misc
 Requires-Dist: wrapt~=1.14; extra == "misc"
 Provides-Extra: secrets
 Requires-Dist: cryptography~=43.0; extra == "secrets"
-Provides-Extra: sql
-Requires-Dist: sqlalchemy[asyncio]~=2.0; extra == "sql"
-Provides-Extra: sql-drivers
-Requires-Dist: pg8000~=1.31; extra == "sql-drivers"
-Requires-Dist: pymysql~=1.1; extra == "sql-drivers"
-Requires-Dist: aiomysql~=0.2; extra == "sql-drivers"
-Requires-Dist: aiosqlite~=0.20; extra == "sql-drivers"
-Requires-Dist: asyncpg~=0.29; python_version < "3.13" and extra == "sql-drivers"
-Requires-Dist: sqlean.py~=3.45; python_version < "3.13" and extra == "sql-drivers"
-Requires-Dist: duckdb~=1.1; extra == "sql-drivers"
+Provides-Extra: sqlalchemy
+Requires-Dist: sqlalchemy[asyncio]~=2.0; extra == "sqlalchemy"
+Provides-Extra: sqlalchemy-drivers
+Requires-Dist: pg8000~=1.31; extra == "sqlalchemy-drivers"
+Requires-Dist: pymysql~=1.1; extra == "sqlalchemy-drivers"
+Requires-Dist: aiomysql~=0.2; extra == "sqlalchemy-drivers"
+Requires-Dist: aiosqlite~=0.20; extra == "sqlalchemy-drivers"
+Requires-Dist: asyncpg~=0.29; python_version < "3.13" and extra == "sqlalchemy-drivers"
+Requires-Dist: sqlean.py~=3.45; python_version < "3.13" and extra == "sqlalchemy-drivers"
+Requires-Dist: duckdb~=1.1; extra == "sqlalchemy-drivers"
 Provides-Extra: testing
 Requires-Dist: pytest~=8.0; extra == "testing"

{omlish-0.0.0.dev29 → omlish-0.0.0.dev31}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev29'
-__revision__ = 'cde08614ca06e103fcae31adbb677c772002aef1'
+__version__ = '0.0.0.dev31'
+__revision__ = 'bd655a8d18c1cc31ce2c9d79fedaec771c5e1593'
 
 
 #
@@ -30,7 +30,7 @@ class Project(ProjectBase):
 
     optional_dependencies = {
         'async': [
-            'anyio ~= 4.5',
+            'anyio ~= 4.6',
             'sniffio ~= 1.3',
 
             'greenlet ~= 3.1',
@@ -39,7 +39,7 @@ class Project(ProjectBase):
             'trio-asyncio ~= 0.15',
         ],
 
-        'compression': [
+        'compress': [
             'lz4 ~= 4.0',
 
             'python-snappy ~= 0.7; python_version < "3.13"',
@@ -77,11 +77,11 @@ class Project(ProjectBase):
             'cryptography ~= 43.0',
         ],
 
-        'sql': [
+        'sqlalchemy': [
             'sqlalchemy[asyncio] ~= 2.0',
         ],
 
-        'sql-drivers': [
+        'sqlalchemy-drivers': [
             'pg8000 ~= 1.31',
             # 'psycopg2 ~= 2.9',
             # 'psycopg ~= 3.2',

{omlish-0.0.0.dev29 → omlish-0.0.0.dev31}/omlish/asyncs/anyio.py

@@ -4,7 +4,7 @@ TODO:
   - owned lock
   - async once
 
-lookit:
+See:
  - https://github.com/davidbrochart/sqlite-anyio/blob/a3ba4c6ef0535b14a5a60071fcd6ed565a514963/sqlite_anyio/sqlite.py
  - https://github.com/rafalkrupinski/ratelimit-anyio/blob/2910a8a3d6fa54ed17ee6ba457686c9f7a4c4beb/src/ratelimit_anyio/__init__.py
  - https://github.com/nekitdev/async-extensions/tree/main/async_extensions

{omlish-0.0.0.dev29 → omlish-0.0.0.dev31}/omlish/asyncs/bridge.py

@@ -12,8 +12,9 @@ TODO:
 See:
  - https://greenback.readthedocs.io/en/latest/
 """
+import functools  # noqa
 import itertools
-import sys
+import sys  # noqa
 import types
 import typing as ta
 import weakref
@@ -90,7 +91,7 @@ class UnexpectedBridgeNestingError(Exception):
 
 
 _DEBUG_PRINT: ta.Callable[..., None] | None = None
-# _DEBUG_PRINT = print  # noqa
+# _DEBUG_PRINT = functools.partial(print, file=sys.stderr)  # noqa
 
 _TRACK_TRANSITION_OBJS = False
 
@@ -253,8 +254,8 @@ def s_to_a(fn, *, require_await=False):
                 switch_occurred = True
                 try:
                     value = yield result
-                except BaseException:  # noqa
-                    result = g.throw(*sys.exc_info())
+                except BaseException as e:  # noqa
+                    result = g.throw(e)
                 else:
                     result = g.switch(value)
 
@@ -302,15 +303,22 @@ def a_to_s(fn):
 
             cr = gate()
             sv = None
+            he = False
             try:
                 while True:
-                    try:
-                        sv = cr.send(sv)
-                    except StopIteration:
-                        break
+                    if not he:
+                        try:
+                            sv = cr.send(sv)
+                        except StopIteration:
+                            break
+                    he = False
 
                     if ret is missing or cr.cr_await is not None or cr.cr_running:
-                        sv = s_to_a_await(sv)
+                        try:
+                            sv = s_to_a_await(sv)  # type: ignore
+                        except BaseException as e:  # noqa
+                            sv = cr.throw(e)
+                            he = True
 
             finally:
                 cr.close()

{omlish-0.0.0.dev29 → omlish-0.0.0.dev31}/omlish/asyncs/trio.py

@@ -1,5 +1,5 @@
 """
-lookit:
+See:
  - https://github.com/oremanj/trio-monitor
  - https://github.com/python-trio/trio-monitor/tree/master
  - https://github.com/python-trio/triopg

{omlish-0.0.0.dev29 → omlish-0.0.0.dev31}/omlish/bootstrap/main.py

@@ -1,3 +1,8 @@
+"""
+TODO:
+ - -x / --exec - os.exec entrypoint
+  - refuse to install non-exec-relevant Bootstraps when chosen
+"""
 # ruff: noqa: UP006 UP007
 import argparse
 import dataclasses as dc

{omlish-0.0.0.dev29 → omlish-0.0.0.dev31}/omlish/concurrent/threadlets.py

@@ -48,7 +48,7 @@ class Threadlet(abc.ABC):
         raise NotImplementedError
 
     @abc.abstractmethod
-    def throw(self, ex: Exception) -> ta.Any:
+    def throw(self, ex: BaseException) -> ta.Any:
         raise NotImplementedError
 
 
@@ -84,7 +84,7 @@ class GreenletThreadlet(Threadlet):
     def switch(self, *args: ta.Any, **kwargs: ta.Any) -> ta.Any:
         return self.g.switch(*args, **kwargs)
 
-    def throw(self, ex: Exception) -> ta.Any:
+    def throw(self, ex: BaseException) -> ta.Any:
         return self.g.throw(ex)
 
 

{omlish-0.0.0.dev29 → omlish-0.0.0.dev31}/omlish/diag/replserver/server.py

@@ -9,7 +9,7 @@ TODO:
  - optional ipython embed
  - https://github.com/python/cpython/tree/56470004e58911b146c016fc9fec4461b8f69454/Lib/_pyrepl
 
-lookit:
+See:
  - https://github.com/vxgmichel/aioconsole/blob/e55f4b0601da3b3a40a88c965526d35ab38b5841/aioconsole/server.py
  - https://github.com/nhoad/aiomanhole
  - https://github.com/twisted/twisted/blob/00aa56f5257060304d41f09651c6ab58ee6104d6/src/twisted/conch/manhole.py

{omlish-0.0.0.dev29 → omlish-0.0.0.dev31}/omlish/docker.py

@@ -107,6 +107,15 @@ def cli_inspect(ids: list[str]) -> list[Inspect]:
     return msh.unmarshal(json.loads(o.decode()), list[Inspect])
 
 
+def has_cli() -> bool:
+    try:
+        proc = subprocess.run(['docker', '--version'])  # noqa
+    except (FileNotFoundError, subprocess.CalledProcessError):
+        return False
+    else:
+        return not proc.returncode
+
+
 ##
 
 

omlish-0.0.0.dev31/omlish/fnpipes.py

@@ -0,0 +1,82 @@
+import abc
+import typing as ta
+
+
+T = ta.TypeVar('T')
+U = ta.TypeVar('U')
+
+
+class Fn(abc.ABC, ta.Generic[T]):
+    @abc.abstractmethod
+    def __call__(self, *args: ta.Any, **kwargs: ta.Any) -> T:
+        raise NotImplementedError
+
+    def pipe(self, fn: ta.Callable[..., U], *args: ta.Any, **kwargs: ta.Any) -> 'Fn[U]':
+        return Pipe([self], Bind(fn, *args, **kwargs))
+
+    def __or__(self, fn: ta.Callable[..., U]) -> 'Fn[U]':
+        return self.pipe(fn)
+
+    def apply(self, fn: ta.Callable[[T], ta.Any], *args: ta.Any, **kwargs: ta.Any) -> 'Fn[T]':
+        return Pipe([self], Apply(Bind(fn, *args, **kwargs)))
+
+    def __and__(self, fn: ta.Callable[[T], ta.Any]) -> 'Fn[T]':
+        return self.apply(fn)
+
+
+class Bind(Fn[T]):
+    def __init__(self, fn: ta.Callable[..., T], *args: ta.Any, **kwargs: ta.Any) -> None:
+        super().__init__()
+        if Ellipsis not in args and Ellipsis not in kwargs:
+            args += (Ellipsis,)
+        self._fn = fn
+        self._args = args
+        self._kwargs = kwargs
+
+    def __call__(self, *args: ta.Any, **kwargs: ta.Any) -> T:
+        fa: list = []
+        for a in self._args:
+            if a is Ellipsis:
+                fa.extend(args)
+            else:
+                fa.append(a)
+
+        fkw = {}
+        for k, v in self._kwargs.items():
+            if v is Ellipsis:
+                if len(args) != 1:
+                    raise ValueError(args)
+                fkw[k] = args[0]
+            else:
+                fkw[k] = v
+        fkw.update(kwargs)
+
+        return self._fn(*fa, **fkw)
+
+
+class Pipe(Fn[T]):
+    def __init__(self, lfns: ta.Sequence[ta.Callable], rfn: ta.Callable[..., T]) -> None:
+        super().__init__()
+        self._lfn, *self._rfns = [*lfns, rfn]
+
+    def __call__(self, *args: ta.Any, **kwargs: ta.Any) -> T:
+        o = self._lfn(*args, **kwargs)
+        for fn in self._rfns:
+            o = fn(o)
+        return o
+
+
+class Apply(Fn[T]):
+    def __init__(self, *fns: ta.Callable[[T], ta.Any]) -> None:
+        super().__init__()
+        self._fns = fns
+
+    def __call__(self, o: T) -> T:  # noqa
+        for fn in self._fns:
+            fn(o)
+        return o
+
+
+bind = Bind
+pipe = Pipe
+apply = Apply

{omlish-0.0.0.dev29 → omlish-0.0.0.dev31}/omlish/http/sessions.py

@@ -8,7 +8,7 @@ import time
 import typing as ta
 import zlib
 
-from .. import fnpairs as fps
+from .. import fnpairs as fpa
 from .. import lang
 from .. import secrets as sec
 from .cookies import dump_cookie
@@ -92,7 +92,7 @@ class SessionMarshal:
     def __init__(
             self,
             signer: Signer,
-            serializer: fps.ObjectStr = fps.of(JSON_TAGGER.dumps, JSON_TAGGER.loads),
+            serializer: fpa.ObjectStr = fpa.of(JSON_TAGGER.dumps, JSON_TAGGER.loads),
     ) -> None:
         super().__init__()
 

{omlish-0.0.0.dev29 → omlish-0.0.0.dev31}/omlish/lang/__init__.py

@@ -60,6 +60,7 @@ from .contextmanagers import (  # noqa
     NOP_CONTEXT_MANAGER,
     NopContextManaged,
     NopContextManager,
+    Timer,
     a_defer,
     attr_setting,
     breakpoint_on_exception,
@@ -188,8 +189,11 @@ from .strings import (  # noqa
     is_ident_cont,
     is_ident_start,
     is_sunder,
+    prefix_delimited,
     prefix_lines,
     snake_case,
+    strip_prefix,
+    strip_suffix,
 )
 
 from .sys import (  # noqa

{omlish-0.0.0.dev29 → omlish-0.0.0.dev31}/omlish/lang/classes/abstract.py

@@ -47,7 +47,7 @@ class Abstract(abc.ABC):  # noqa
                 seen.update(dir(b))
             if ams:
                 raise TypeError(
-                    f'Cannot subclass abstract class {cls.__name__} with abstract methods'
+                    f'Cannot subclass abstract class {cls.__name__} with abstract methods: '
                     f'{", ".join(map(str, sorted(ams)))}',
                 )
 

{omlish-0.0.0.dev29 → omlish-0.0.0.dev31}/omlish/lang/contextmanagers.py

@@ -7,6 +7,7 @@ import contextlib
 import contextvars
 import functools
 import threading
+import time
 import types
 import typing as ta
 
@@ -367,3 +368,37 @@ def default_lock(value: DefaultLockable, default: DefaultLockable = None) -> Loc
 
     else:
         raise TypeError(value)
+
+
+##
+
+
+class Timer:
+    def __init__(
+            self,
+            clock: ta.Callable[[], float] | None = None,
+    ) -> None:
+        super().__init__()
+        self._clock = clock if clock is not None else time.monotonic
+
+    _start: float
+    _end: float
+
+    @property
+    def start(self) -> float:
+        return self._start
+
+    @property
+    def end(self) -> float:
+        return self._end
+
+    @property
+    def elapsed(self) -> float:
+        return self._end - self._start
+
+    def __enter__(self) -> ta.Self:
+        self._start = self._clock()
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self._end = self._clock()

{omlish-0.0.0.dev29 → omlish-0.0.0.dev31}/omlish/lang/resources.py

@@ -27,6 +27,7 @@ def get_relative_resources(
 
     if os.sep in path:
         raise ValueError(path)  # noqa
+
     if not path.startswith('.'):
         path = '.' + path
     if set(path) - {'.'}:

{omlish-0.0.0.dev29 → omlish-0.0.0.dev31}/omlish/lang/strings.py

@@ -4,9 +4,22 @@ import unicodedata
 
 ##
 
+@ta.overload
+def prefix_delimited(s: str, p: str, d: str) -> str:
+    ...
+
+
+@ta.overload
+def prefix_delimited(s: bytes, p: bytes, d: bytes) -> bytes:
+    ...
+
+
+def prefix_delimited(s, p, d):
+    return d.join([p + l for l in s.split(d)])
+
 
 def prefix_lines(s: str, p: str) -> str:
-    return '\n'.join([p + l for l in s.split('\n')])
+    return prefix_delimited(s, p, '\n')
 
 
 def indent_lines(s: str, num: int) -> str:
@@ -16,6 +29,41 @@ def indent_lines(s: str, num: int) -> str:
 ##
 
 
+@ta.overload
+def strip_prefix(s: str, pfx: str) -> str:
+    ...
+
+
+@ta.overload
+def strip_prefix(s: bytes, pfx: bytes) -> bytes:
+    ...
+
+
+def strip_prefix(s, pfx):
+    if not s.startswith(pfx):
+        raise ValueError(f'{s!r} does not start with {pfx!r}')
+    return s[len(pfx):]
+
+
+@ta.overload
+def strip_suffix(s: str, sfx: str) -> str:
+    ...
+
+
+@ta.overload
+def strip_suffix(s: bytes, sfx: bytes) -> bytes:
+    ...
+
+
+def strip_suffix(s, sfx):
+    if not s.endswith(sfx):
+        raise ValueError(f'{s!r} does not end with {sfx!r}')
+    return s[:-len(sfx)]
+
+
+##
+
+
 def camel_case(name: str) -> str:
     return ''.join(map(str.capitalize, name.split('_')))  # noqa
 

{omlish-0.0.0.dev29 → omlish-0.0.0.dev31}/omlish/lite/logs.py

@@ -4,6 +4,7 @@ TODO:
  - debug
 """
 # ruff: noqa: UP006 UP007 N802
+import contextlib
 import datetime
 import logging
 import threading
@@ -203,6 +204,24 @@ class StandardLogHandler(ProxyLogHandler):
 ##
 
 
+@contextlib.contextmanager
+def _locking_logging_module_lock() -> ta.Iterator[None]:
+    if hasattr(logging, '_acquireLock'):
+        logging._acquireLock()  # noqa
+        try:
+            yield
+        finally:
+            logging._releaseLock()  # type: ignore  # noqa
+
+    elif hasattr(logging, '_lock'):
+        # https://github.com/python/cpython/commit/74723e11109a320e628898817ab449b3dad9ee96
+        with logging._lock:  # noqa
+            yield
+
+    else:
+        raise Exception("Can't find lock in logging module")
+
+
 def configure_standard_logging(
         level: ta.Union[int, str] = logging.INFO,
         *,
@@ -210,8 +229,7 @@ def configure_standard_logging(
         target: ta.Optional[logging.Logger] = None,
         force: bool = False,
 ) -> ta.Optional[StandardLogHandler]:
-    logging._acquireLock()  # type: ignore  # noqa
-    try:
+    with _locking_logging_module_lock():
         if target is None:
             target = logging.root
 
@@ -250,6 +268,3 @@ def configure_standard_logging(
         #
 
         return StandardLogHandler(handler)
-
-    finally:
-        logging._releaseLock()  # type: ignore  # noqa

{omlish-0.0.0.dev29 → omlish-0.0.0.dev31}/omlish/logs/noisy.py

@@ -5,6 +5,7 @@ NOISY_LOGGERS: set[str] = {
     'boto3.resources.action',
     'datadog.dogstatsd',
     'elasticsearch',
+    'httpx',
     'kazoo.client',
     'requests.packages.urllib3.connectionpool',
 }

{omlish-0.0.0.dev29 → omlish-0.0.0.dev31}/omlish/marshal/naming.py

@@ -1,3 +1,8 @@
+"""
+TODO:
+ - Namer: ta.TypeAlias = ta.Callable[[str], str] ?
+  - this interface is ~intentionally~ limited, but custom overrides would be useful
+"""
 import enum
 
 from .. import lang

{omlish-0.0.0.dev29 → omlish-0.0.0.dev31}/omlish/marshal/polymorphism.py

@@ -98,24 +98,34 @@ def polymorphism_from_subclasses(
         ty: type,
         *,
         naming: Naming | None = None,
+        strip_suffix: bool = False,
 ) -> Polymorphism:
     dct: dict[str, Impl] = {}
+
     seen: set[type] = set()
     todo: list[type] = [ty]
     while todo:
         cur = todo.pop()
         seen.add(cur)
-        if not lang.is_abstract_class(cur):
-            nam = cur.__name__
-            if naming is not None:
-                nam = translate_name(nam, naming)
-            if nam in dct:
-                raise KeyError(f'Duplicate name: {nam}')
-            dct[nam] = Impl(
-                cur,
-                nam,
-            )
+
         todo.extend(nxt for nxt in cur.__subclasses__() if nxt not in seen)
+
+        if lang.is_abstract_class(cur):
+            continue
+
+        name = cur.__name__
+        if strip_suffix:
+            name = lang.strip_suffix(name, ty.__name__)
+        if naming is not None:
+            name = translate_name(name, naming)
+        if name in dct:
+            raise KeyError(f'Duplicate name: {name}')
+
+        dct[name] = Impl(
+            cur,
+            name,
+        )
+
     return Polymorphism(ty, dct.values())
 
 

{omlish-0.0.0.dev29 → omlish-0.0.0.dev31}/omlish/matchfns.py

@@ -130,7 +130,7 @@ def multi(*children: MatchFn[P, T], strict: bool = False) -> MultiMatchFn:  # Mu
 ##
 
 
-class CachedMultiFn(MatchFn[P, T]):
+class CachedMatchFn(MatchFn[P, T]):
     @staticmethod
     def _default_key(*args, **kwargs):
         return (args, tuple(sorted(kwargs.items(), key=lambda t: t[0])))
@@ -187,7 +187,7 @@ class CachedMultiFn(MatchFn[P, T]):
         return self.__class__(self._f.__get__(instance, owner), key=self._key)  # noqa
 
 
-cached = CachedMultiFn
+cached = CachedMatchFn
 
 
 ##

{omlish-0.0.0.dev29 → omlish-0.0.0.dev31}/omlish/os.py

@@ -103,3 +103,20 @@ class Pidfile:
     def kill(self, sig: int = signal.SIGTERM) -> None:
         pid = self.read()
         os.kill(pid, sig)  # Still racy
+
+
+def touch(self, mode: int = 0o666, exist_ok: bool = True) -> None:
+    if exist_ok:
+        # First try to bump modification time
+        # Implementation note: GNU touch uses the UTIME_NOW option of the utimensat() / futimens() functions.
+        try:
+            os.utime(self, None)
+        except OSError:
+            pass
+        else:
+            return
+    flags = os.O_CREAT | os.O_WRONLY
+    if not exist_ok:
+        flags |= os.O_EXCL
+    fd = os.open(self, flags, mode)
+    os.close(fd)

omlish-0.0.0.dev31/omlish/specs/__init__.py

@@ -0,0 +1,9 @@
+"""
+TODO:
+ - avro
+ - jmespath
+ - jsonpatch
+ - jsonpointer.py
+ - openapi
+ - protobuf
+"""

omlish-0.0.0.dev31/omlish/sql/__init__.py

@@ -0,0 +1,13 @@
+from .dbs import (  # noqa
+    DbLoc,
+    DbSpec,
+    DbType,
+    DbTypes,
+    HostDbLoc,
+    UrlDbLoc,
+)
+
+from .qualifiedname import (  # noqa
+    QualifiedName,
+    qn,
+)