omlish 0.0.0.dev28__tar.gz → 0.0.0.dev30__tar.gz

{omlish-0.0.0.dev28/omlish.egg-info → omlish-0.0.0.dev30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev28
+Version: 0.0.0.dev30
 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.4; extra == "all"
+Requires-Dist: anyio~=4.5; extra == "all"
 Requires-Dist: sniffio~=1.3; extra == "all"
 Requires-Dist: greenlet~=3.1; extra == "all"
 Requires-Dist: trio~=0.26; extra == "all"
@@ -30,7 +30,6 @@ Requires-Dist: json5~=0.9; extra == "all"
 Requires-Dist: pyyaml~=5.0; extra == "all"
 Requires-Dist: cloudpickle~=3.0; extra == "all"
 Requires-Dist: httpx[http2]~=0.27; extra == "all"
-Requires-Dist: jinja2~=3.1; extra == "all"
 Requires-Dist: wrapt~=1.14; extra == "all"
 Requires-Dist: cryptography~=43.0; extra == "all"
 Requires-Dist: sqlalchemy[asyncio]~=2.0; extra == "all"
@@ -43,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.4; extra == "async"
+Requires-Dist: anyio~=4.5; 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"
@@ -65,19 +64,18 @@ Requires-Dist: cloudpickle~=3.0; extra == "formats"
 Provides-Extra: http
 Requires-Dist: httpx[http2]~=0.27; extra == "http"
 Provides-Extra: misc
-Requires-Dist: jinja2~=3.1; 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"
-Requires-Dist: pg8000~=1.31; extra == "sql"
-Requires-Dist: pymysql~=1.1; extra == "sql"
-Requires-Dist: aiomysql~=0.2; extra == "sql"
-Requires-Dist: aiosqlite~=0.20; extra == "sql"
-Requires-Dist: asyncpg~=0.29; python_version < "3.13" and extra == "sql"
-Provides-Extra: sqlx
-Requires-Dist: sqlean.py~=3.45; python_version < "3.13" and extra == "sqlx"
-Requires-Dist: duckdb~=1.1; extra == "sqlx"
+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.dev28 → omlish-0.0.0.dev30}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev28'
-__revision__ = '8adf3c1230237633abb8801258638f0ae2fa4099'
+__version__ = '0.0.0.dev30'
+__revision__ = '1378b0a61f7d3ec16204c06bc87e5215b062d378'
 
 
 #
@@ -30,7 +30,7 @@ class Project(ProjectBase):
 
     optional_dependencies = {
         'async': [
-            'anyio ~= 4.4',
+            'anyio ~= 4.5',
             '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"',
@@ -70,8 +70,6 @@ class Project(ProjectBase):
         ],
 
         'misc': [
-            'jinja2 ~= 3.1',
-
             'wrapt ~= 1.14',
         ],
 
@@ -79,9 +77,11 @@ class Project(ProjectBase):
             'cryptography ~= 43.0',
         ],
 
-        'sql': [
+        'sqlalchemy': [
             'sqlalchemy[asyncio] ~= 2.0',
+        ],
 
+        'sqlalchemy-drivers': [
             'pg8000 ~= 1.31',
             # 'psycopg2 ~= 2.9',
             # 'psycopg ~= 3.2',
@@ -93,9 +93,7 @@ class Project(ProjectBase):
             'aiomysql ~= 0.2',
             'aiosqlite ~= 0.20',
             'asyncpg ~= 0.29; python_version < "3.13"',
-        ],
 
-        'sqlx': [
             'sqlean.py ~= 3.45; python_version < "3.13"',
 
             'duckdb ~= 1.1',

{omlish-0.0.0.dev28 → omlish-0.0.0.dev30}/omlish/collections/treap.py

@@ -17,7 +17,6 @@ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER I
 OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 """
 # ruff: noqa: SLF001
-
 import typing as ta
 
 

{omlish-0.0.0.dev28 → omlish-0.0.0.dev30}/omlish/dataclasses/impl/fields.py

@@ -178,6 +178,9 @@ def field_init(
     if fx.derive is not None:
         raise NotImplementedError
 
+    if fx.frozen:
+        raise NotImplementedError
+
     if fx.coerce is not None:
         cn = f'__dataclass_coerce__{f.name}__'
         locals[cn] = fx.coerce

{omlish-0.0.0.dev28 → omlish-0.0.0.dev30}/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.dev30/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.dev28 → omlish-0.0.0.dev30}/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.dev28 → omlish-0.0.0.dev30}/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,
@@ -98,6 +99,7 @@ from .functions import (  # noqa
     Args,
     VoidError,
     as_async,
+    coalesce,
     constant,
     finally_,
     identity,
@@ -107,6 +109,7 @@ from .functions import (  # noqa
     isinstance_of,
     issubclass_of,
     maybe_call,
+    opt_coalesce,
     periodically,
     raise_,
     raising,
@@ -186,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.dev28 → omlish-0.0.0.dev30}/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.dev28 → omlish-0.0.0.dev30}/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.dev28 → omlish-0.0.0.dev30}/omlish/lang/functions.py

@@ -183,3 +183,20 @@ class Args:
 
     def __call__(self, fn: ta.Callable[..., T]) -> T:
         return fn(*self.args, **self.kwargs)
+
+
+##
+
+
+def coalesce(*vs: T | None) -> T:
+    for v in vs:
+        if v is not None:
+            return v
+    raise ValueError('No value given')
+
+
+def opt_coalesce(*vs: T | None) -> T | None:
+    for v in vs:
+        if v is not None:
+            return v
+    return None

{omlish-0.0.0.dev28 → omlish-0.0.0.dev30}/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.dev28 → omlish-0.0.0.dev30}/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.dev28 → omlish-0.0.0.dev30}/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.dev28 → omlish-0.0.0.dev30}/omlish/lite/secrets.py

@@ -20,3 +20,17 @@ class Secret:
 
     def reveal(self) -> str:
         return getattr(self, self._VALUE_ATTR)()
+
+    #
+
+    def __reduce__(self) -> ta.NoReturn:
+        raise TypeError
+
+    def __reduce_ex__(self, protocol) -> ta.NoReturn:
+        raise TypeError
+
+    def __getstate__(self) -> ta.NoReturn:
+        raise TypeError
+
+    def __setstate__(self, state) -> ta.NoReturn:
+        raise TypeError

{omlish-0.0.0.dev28 → omlish-0.0.0.dev30}/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.dev28 → omlish-0.0.0.dev30}/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.dev28/omlish/math.py → omlish-0.0.0.dev30/omlish/math/bits.py

@@ -1,15 +1,10 @@
 import functools
-import struct
 import typing as ta
 
 
 ##
 
 
-def isclose(a: float, b: float, *, rel_tol: float = 1e-09, abs_tol: float = 0.0) -> float:
-    return abs(a - b) <= max(rel_tol * max(abs(a), abs(b)), abs_tol)
-
-
 def get_bit(bit: int, value: int) -> int:
     return (value >> bit) & 1
 
@@ -29,14 +24,6 @@ def set_bits(bits_from: int, num_bits: int, bits_value: int, value: int) -> int:
     return value & ~(((1 << num_bits) - 1) << bits_from) | (bits_value << bits_from)
 
 
-def float_to_bytes(f: float) -> bytes:
-    return struct.pack('>f', f)
-
-
-def bytes_to_float(b: bytes) -> float:
-    return struct.unpack('>f', b)[0]
-
-
 ##
 
 

omlish-0.0.0.dev30/omlish/math/floats.py

@@ -0,0 +1,13 @@
+import struct
+
+
+def isclose(a: float, b: float, *, rel_tol: float = 1e-09, abs_tol: float = 0.0) -> float:
+    return abs(a - b) <= max(rel_tol * max(abs(a), abs(b)), abs_tol)
+
+
+def float_to_bytes(f: float) -> bytes:
+    return struct.pack('>f', f)
+
+
+def bytes_to_float(b: bytes) -> float:
+    return struct.unpack('>f', b)[0]

{omlish-0.0.0.dev28/omlish → omlish-0.0.0.dev30/omlish/math}/stats.py

@@ -3,6 +3,7 @@ TODO:
  - reservoir
  - dep tdigest?
  - struct-of-arrays - array.array('f', ...) - backed SamplingHistogram
+ - https://docs.python.org/3/library/statistics.html
 """
 import bisect
 import collections
@@ -14,8 +15,8 @@ import random
 import time
 import typing as ta
 
-from . import cached
-from . import check
+from .. import cached
+from .. import check
 
 
 ##

{omlish-0.0.0.dev28 → omlish-0.0.0.dev30}/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.dev30/omlish/specs/__init__.py

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

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

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