omlish 0.0.0.dev28__tar.gz → 0.0.0.dev29__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev28
+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.dev28 → omlish-0.0.0.dev29}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev28'
-__revision__ = '8adf3c1230237633abb8801258638f0ae2fa4099'
+__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.dev28 → 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.dev28 → 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.dev28 → 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.dev28 → 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.dev28 → 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.dev28/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.dev28/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
 
 
 ##

{omlish-0.0.0.dev28 → omlish-0.0.0.dev29}/omlish/text/asdl.py

@@ -217,7 +217,7 @@ class TokenKind(enum.IntEnum):
     COMMA = enum.auto()
     QUESTION = enum.auto()
     PIPE = enum.auto()
-    AstERISK = enum.auto()
+    ASTERISK = enum.auto()
     L_PAREN = enum.auto()
     R_PAREN = enum.auto()
     L_BRACE = enum.auto()
@@ -231,7 +231,7 @@ OPERATOR_TABLE: ta.Mapping[str, TokenKind] = {
     '|': TokenKind.PIPE,
     '(': TokenKind.L_PAREN,
     ')': TokenKind.R_PAREN,
-    '*': TokenKind.AstERISK,
+    '*': TokenKind.ASTERISK,
     '{': TokenKind.L_BRACE,
     '}': TokenKind.R_BRACE,
 }
@@ -373,7 +373,7 @@ class AsdlParser:
 
     def _parse_optional_field_quantifier(self) -> tuple[bool, bool]:  # (seq, opt)
         is_seq, is_opt = False, False
-        if self.cur().kind == TokenKind.AstERISK:
+        if self.cur().kind == TokenKind.ASTERISK:
             is_seq = True
             self._advance()
         elif self.cur().kind == TokenKind.QUESTION:
@@ -394,7 +394,8 @@ class AsdlParser:
     _id_kinds = (TokenKind.CONSTRUCTOR_ID, TokenKind.TYPE_ID)
 
     def _match(self, kind: TokenKind | tuple[TokenKind, ...]) -> str:
-        """The 'match' primitive of RD parsers.
+        """
+        The 'match' primitive of RD parsers.
 
         * Verifies that the current token is of the given kind (kind can be a tuple, in which the kind must match one of
           its members).

{omlish-0.0.0.dev28 → omlish-0.0.0.dev29}/omlish/text/parts.py

@@ -30,7 +30,7 @@ def _check_part(o: PartT) -> PartT:
     return o
 
 
-def _check_optional_part(o: PartT | None) -> PartT | None:
+def _check_opt_part(o: PartT | None) -> PartT | None:
     if o is None:
         return None
     return _check_part(o)
@@ -49,7 +49,7 @@ class Wrap(DataPart, lang.Final):
 
 
 class List(DataPart, lang.Final):
-    parts: ta.Sequence[Part | None] = dc.xfield(coerce=col.seq_of(_check_optional_part))
+    parts: ta.Sequence[Part | None] = dc.xfield(coerce=col.seq_of(_check_opt_part))
     delimiter: str = dc.field(default=',')  # FIXME: , check_type=str)
     trailer: bool = dc.field(default=False)  # FIXME: , check_type=bool)
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev28
+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.dev28 → omlish-0.0.0.dev29}/omlish.egg-info/SOURCES.txt

@@ -18,11 +18,9 @@ omlish/genmachine.py
 omlish/iterators.py
 omlish/libc.py
 omlish/matchfns.py
-omlish/math.py
 omlish/multiprocessing.py
 omlish/os.py
 omlish/runmodule.py
-omlish/stats.py
 omlish/sync.py
 omlish/term.py
 omlish.egg-info/PKG-INFO
@@ -251,6 +249,10 @@ omlish/marshal/unions.py
 omlish/marshal/utils.py
 omlish/marshal/uuids.py
 omlish/marshal/values.py
+omlish/math/__init__.py
+omlish/math/bits.py
+omlish/math/floats.py
+omlish/math/stats.py
 omlish/reflect/__init__.py
 omlish/reflect/isinstance.py
 omlish/reflect/ops.py

{omlish-0.0.0.dev28 → omlish-0.0.0.dev29}/omlish.egg-info/requires.txt

@@ -1,6 +1,6 @@
 
 [all]
-anyio~=4.4
+anyio~=4.5
 sniffio~=1.3
 greenlet~=3.1
 trio~=0.26
@@ -16,7 +16,6 @@ json5~=0.9
 pyyaml~=5.0
 cloudpickle~=3.0
 httpx[http2]~=0.27
-jinja2~=3.1
 wrapt~=1.14
 cryptography~=43.0
 sqlalchemy[asyncio]~=2.0
@@ -33,7 +32,7 @@ asyncpg~=0.29
 sqlean.py~=3.45
 
 [async]
-anyio~=4.4
+anyio~=4.5
 sniffio~=1.3
 greenlet~=3.1
 trio~=0.26
@@ -62,7 +61,6 @@ cloudpickle~=3.0
 httpx[http2]~=0.27
 
 [misc]
-jinja2~=3.1
 wrapt~=1.14
 
 [secrets]
@@ -70,18 +68,16 @@ cryptography~=43.0
 
 [sql]
 sqlalchemy[asyncio]~=2.0
+
+[sql-drivers]
 pg8000~=1.31
 pymysql~=1.1
 aiomysql~=0.2
 aiosqlite~=0.20
-
-[sql:python_version < "3.13"]
-asyncpg~=0.29
-
-[sqlx]
 duckdb~=1.1
 
-[sqlx:python_version < "3.13"]
+[sql-drivers:python_version < "3.13"]
+asyncpg~=0.29
 sqlean.py~=3.45
 
 [testing]

{omlish-0.0.0.dev28 → omlish-0.0.0.dev29}/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.dev28'
+version = '0.0.0.dev29'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -24,7 +24,7 @@ description = 'omlish'
 
 [project.optional-dependencies]
 all = [
-    'anyio ~= 4.4',
+    'anyio ~= 4.5',
     'sniffio ~= 1.3',
     'greenlet ~= 3.1',
     'trio ~= 0.26',
@@ -41,7 +41,6 @@ all = [
     'pyyaml ~= 5.0',
     'cloudpickle ~= 3.0',
     'httpx[http2] ~= 0.27',
-    'jinja2 ~= 3.1',
     'wrapt ~= 1.14',
     'cryptography ~= 43.0',
     'sqlalchemy[asyncio] ~= 2.0',
@@ -55,7 +54,7 @@ all = [
     'pytest ~= 8.0',
 ]
 async = [
-    'anyio ~= 4.4',
+    'anyio ~= 4.5',
     'sniffio ~= 1.3',
     'greenlet ~= 3.1',
     'trio ~= 0.26',
@@ -82,7 +81,6 @@ http = [
     'httpx[http2] ~= 0.27',
 ]
 misc = [
-    'jinja2 ~= 3.1',
     'wrapt ~= 1.14',
 ]
 secrets = [
@@ -90,13 +88,13 @@ secrets = [
 ]
 sql = [
     'sqlalchemy[asyncio] ~= 2.0',
+]
+sql-drivers = [
     'pg8000 ~= 1.31',
     'pymysql ~= 1.1',
     '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',
 ]