omlish 0.0.0.dev27__tar.gz → 0.0.0.dev29__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev27
+Version: 0.0.0.dev29
 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,7 +42,7 @@ 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"
@@ -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: 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: testing
 Requires-Dist: pytest~=8.0; extra == "testing"

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

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev27'
-__revision__ = 'c62e03dc2f032aa532d2c2b9f0d71ff96158cdec'
+__version__ = '0.0.0.dev29'
+__revision__ = 'cde08614ca06e103fcae31adbb677c772002aef1'
 
 
 #
@@ -30,7 +30,7 @@ class Project(ProjectBase):
 
     optional_dependencies = {
         'async': [
-            'anyio ~= 4.4',
+            'anyio ~= 4.5',
             'sniffio ~= 1.3',
 
             'greenlet ~= 3.1',
@@ -70,8 +70,6 @@ class Project(ProjectBase):
         ],
 
         'misc': [
-            'jinja2 ~= 3.1',
-
             'wrapt ~= 1.14',
         ],
 
@@ -81,7 +79,9 @@ class Project(ProjectBase):
 
         'sql': [
             'sqlalchemy[asyncio] ~= 2.0',
+        ],
 
+        'sql-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.dev27 → omlish-0.0.0.dev29}/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.dev27 → omlish-0.0.0.dev29}/omlish/dataclasses/impl/api.py

@@ -36,6 +36,7 @@ def field(  # noqa
         check_type: bool | None = None,
         override: bool = False,
         repr_fn: ta.Callable[[ta.Any], str | None] | None = None,
+        frozen: bool | None = None,
 ):  # -> dc.Field
     if default is not MISSING and default_factory is not MISSING:
         raise ValueError('cannot specify both default and default_factory')
@@ -47,6 +48,7 @@ def field(  # noqa
         check_type=check_type,
         override=override,
         repr_fn=repr_fn,
+        frozen=frozen,
     )
 
     md: ta.Mapping = {FieldExtras: fx}

{omlish-0.0.0.dev27 → omlish-0.0.0.dev29}/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.dev27 → omlish-0.0.0.dev29}/omlish/dataclasses/impl/params.py

@@ -42,12 +42,13 @@ from .metadata import METADATA_ATTR
 
 @dc.dataclass(frozen=True, kw_only=True)
 class FieldExtras(lang.Final):
-    derive: ta.Callable[..., ta.Any] | None = None
+    derive: ta.Callable[..., ta.Any] | None = None  # TODO
     coerce: bool | ta.Callable[[ta.Any], ta.Any] | None = None
     validate: ta.Callable[[ta.Any], bool] | None = None
     check_type: bool | None = None
     override: bool = False
     repr_fn: ta.Callable[[ta.Any], str | None] | None = None
+    frozen: bool | None = None  # TODO
 
 
 DEFAULT_FIELD_EXTRAS = FieldExtras()

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

@@ -170,9 +170,9 @@ _LIKELY_IN_DOCKER_PATTERN = re.compile(r'^overlay / .*/docker/')
 
 
 def is_likely_in_docker() -> bool:
-    if sys.platform != 'linux':
+    if getattr(sys, 'platform') != 'linux':
         return False
-    with open('/proc/mounts') as f:  # type: ignore
+    with open('/proc/mounts') as f:
         ls = f.readlines()
     return any(_LIKELY_IN_DOCKER_PATTERN.match(l) for l in ls)
 

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

@@ -98,6 +98,7 @@ from .functions import (  # noqa
     Args,
     VoidError,
     as_async,
+    coalesce,
     constant,
     finally_,
     identity,
@@ -107,6 +108,7 @@ from .functions import (  # noqa
     isinstance_of,
     issubclass_of,
     maybe_call,
+    opt_coalesce,
     periodically,
     raise_,
     raising,

{omlish-0.0.0.dev27 → omlish-0.0.0.dev29}/omlish/lang/descriptors.py

@@ -57,11 +57,6 @@ def unwrap_method_descriptors(fn: ta.Callable) -> ta.Callable:
 ##
 
 
-def unwrap_func(fn: ta.Callable) -> ta.Callable:
-    fn, _ = unwrap_func_with_partials(fn)
-    return fn
-
-
 def unwrap_func_with_partials(fn: ta.Callable) -> tuple[ta.Callable, list[functools.partial]]:
     ps = []
     while True:
@@ -88,6 +83,11 @@ def unwrap_func_with_partials(fn: ta.Callable) -> tuple[ta.Callable, list[functo
     return fn, ps
 
 
+def unwrap_func(fn: ta.Callable) -> ta.Callable:
+    uw, _ = unwrap_func_with_partials(fn)
+    return uw
+
+
 ##
 
 

{omlish-0.0.0.dev27 → omlish-0.0.0.dev29}/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.dev27 → omlish-0.0.0.dev29}/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.dev27 → omlish-0.0.0.dev29}/omlish/marshal/__init__.py

@@ -55,8 +55,13 @@ from .helpers import (  # noqa
 )
 
 from .objects import (  # noqa
+    FieldInfo,
     FieldMetadata,
+    ObjectMarshaler,
     ObjectMetadata,
+    ObjectUnmarshaler,
+    SimpleObjectMarshalerFactory,
+    SimpleObjectUnmarshalerFactory,
 )
 
 from .polymorphism import (  # noqa

{omlish-0.0.0.dev27 → omlish-0.0.0.dev29}/omlish/marshal/objects.py

@@ -9,6 +9,7 @@ import typing as ta
 
 from .. import check
 from .. import dataclasses as dc
+from .. import reflect as rfl
 from .base import MarshalContext
 from .base import Marshaler
 from .base import MarshalerFactory
@@ -87,6 +88,27 @@ class ObjectMarshaler(Marshaler):
         return ret
 
 
+@dc.dataclass(frozen=True)
+class SimpleObjectMarshalerFactory(MarshalerFactory):
+    dct: ta.Mapping[type, ta.Sequence[FieldInfo]]
+    unknown_field: str | None = None
+
+    def guard(self, ctx: MarshalContext, rty: rfl.Type) -> bool:
+        return isinstance(rty, type) and rty in self.dct
+
+    def fn(self, ctx: MarshalContext, rty: rfl.Type) -> Marshaler:
+        ty = check.isinstance(rty, type)
+        flds = self.dct[ty]
+        fields = [
+            (fi, ctx.make(fi.type))
+            for fi in flds
+        ]
+        return ObjectMarshaler(
+            fields,
+            unknown_field=self.unknown_field,
+        )
+
+
 ##
 
 
@@ -123,3 +145,26 @@ class ObjectUnmarshaler(Unmarshaler):
             kw[fi.name] = u.unmarshal(ctx, mv)
 
         return self.cls(**kw)
+
+
+@dc.dataclass(frozen=True)
+class SimpleObjectUnmarshalerFactory(UnmarshalerFactory):
+    dct: ta.Mapping[type, ta.Sequence[FieldInfo]]
+    unknown_field: str | None = None
+
+    def guard(self, ctx: UnmarshalContext, rty: rfl.Type) -> bool:
+        return isinstance(rty, type) and rty in self.dct
+
+    def fn(self, ctx: UnmarshalContext, rty: rfl.Type) -> Unmarshaler:
+        ty = check.isinstance(rty, type)
+        flds = self.dct[ty]
+        fields_by_unmarshal_name = {
+            n: (fi, ctx.make(fi.type))
+            for fi in flds
+            for n in fi.unmarshal_names
+        }
+        return ObjectUnmarshaler(
+            ty,
+            fields_by_unmarshal_name,
+            unknown_field=self.unknown_field,
+        )

omlish-0.0.0.dev27/omlish/math.py → omlish-0.0.0.dev29/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.dev29/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.dev27/omlish → omlish-0.0.0.dev29/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
 
 
 ##