omlish 0.0.0.dev313__py3-none-any.whl → 0.0.0.dev315__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev313'
-__revision__ = 'b40a99c0b9588df1eabcb40ae8daec374426ea55'
+__version__ = '0.0.0.dev315'
+__revision__ = '9f4bb119f0561532694288dd8bb808ce67ebb43d'
 
 
 #

omlish/collections/hasheq.py

@@ -118,6 +118,8 @@ class HashEqMap(ta.MutableMapping[K, V]):
         for i, e in enumerate(l):
             if self._hash_eq.eq(k, e.k):
                 del l[i]
+                if not l:
+                    del self._dct[h]
                 self._len -= 1
                 return
         raise KeyError(k)

omlish/collections/sorted/skiplist.py

@@ -57,6 +57,7 @@ class SkipList(SortedCollection[T]):
             comparator = SortedCollection.default_comparator
         self._compare = comparator
         self._max_height = max_height
+
         self._head = SkipList._Node(None, self._max_height)
         self._height = 1
         self._head.next = [None] * self._max_height

omlish/lang/__init__.py

@@ -160,6 +160,7 @@ from .functions import (  # noqa
     as_async,
     call_with,
     coalesce,
+    cond_kw,
     constant,
     finally_,
     identity,
@@ -171,6 +172,7 @@ from .functions import (  # noqa
     maybe_call,
     new_function,
     new_function_kwargs,
+    nullary_constant,
     opt_coalesce,
     opt_fn,
     opt_kw,
@@ -178,7 +180,7 @@ from .functions import (  # noqa
     raise_,
     raising,
     recurse,
-    strict_constant,
+    truthy_kw,
     try_,
     void,
 )

omlish/lang/cached/function.py

@@ -7,6 +7,7 @@ TODO:
   - also just riic
  - !! reconcile A().f() with A.f(A())
   - unbound descriptor *should* still hit instance cache
+ - significant_kwargs_order=False - stdlib has significant kwarg order
  - integrate / expose with collections.cache
  - weakrefs (selectable by arg)
  - more rigorous descriptor pickling

omlish/lang/functions.py

@@ -26,6 +26,7 @@ def call_with(fn: ta.Any, *args: ta.Any, **kwargs: ta.Any) -> ta.Callable[[T], T
     def inner(obj):
         fn(obj, *args, **kwargs)
         return obj
+
     return inner
 
 
@@ -55,6 +56,7 @@ def raise_(o: BaseException) -> ta.NoReturn:
 def raising(o: BaseException) -> ta.Callable[..., ta.NoReturn]:
     def inner(*args, **kwargs):
         raise o
+
     return inner
 
 
@@ -97,6 +99,7 @@ def opt_fn(fn: ta.Callable[[F], T]) -> ta.Callable[[F | None], T | None]:
             return fn(v)
         else:
             return None
+
     return inner
 
 
@@ -115,7 +118,7 @@ class constant(_constant[T]):  # noqa
         return self._obj
 
 
-class strict_constant(_constant[T]):  # noqa
+class nullary_constant(_constant[T]):  # noqa
     def __call__(self) -> T:
         return self._obj
 
@@ -165,6 +168,7 @@ def as_async(fn: ta.Callable[P, T]) -> ta.Callable[P, ta.Awaitable[T]]:
     @functools.wraps(fn)
     async def inner(*args, **kwargs):
         return fn(*args, **kwargs)
+
     return inner
 
 
@@ -180,19 +184,20 @@ def periodically(
         initial: ta.Any = _MISSING,
         *,
         include_runtime: bool = False,
+        clock: ta.Callable[[], float] = time.monotonic,
 ) -> CallableT:
-    nxt = time.time() + interval_s
+    nxt = clock() + interval_s
     ret = initial
 
     @functools.wraps(fn)
     def inner(*args, **kwargs):
         nonlocal nxt, ret
-        if time.time() >= nxt or ret is _MISSING:
+        if clock() >= nxt or ret is _MISSING:
             if include_runtime:
-                nxt = time.time() + interval_s
+                nxt = clock() + interval_s
             ret = fn(*args, **kwargs)
             if not include_runtime:
-                nxt = time.time() + interval_s
+                nxt = clock() + interval_s
         return ret
 
     return inner  # type: ignore
@@ -208,6 +213,7 @@ class Args:
 
     def __init__(self, *args: ta.Any, **kwargs: ta.Any) -> None:
         super().__init__()
+
         self.args = args
         self.kwargs = kwargs
 
@@ -248,10 +254,18 @@ def opt_coalesce(*vs: T | None) -> T | None:
 ##
 
 
-def opt_kw(**kwargs: ta.Any) -> dict[str, ta.Any]:
+def cond_kw(cond: ta.Callable[[T], bool], **kwargs: T) -> dict[str, T]:
+    return {k: v for k, v in kwargs.items() if cond(v)}
+
+
+def opt_kw(**kwargs: T | None) -> dict[str, T]:
     return {k: v for k, v in kwargs.items() if v is not None}
 
 
+def truthy_kw(**kwargs: T) -> dict[str, T]:
+    return {k: v for k, v in kwargs.items() if v}
+
+
 ##
 
 

omlish/specs/jsonschema/__init__.py

@@ -2,6 +2,7 @@ from .keywords.base import (  # noqa
     Keyword,
     Keywords,
     KnownKeyword,
+    UnknownKeyword,
 )
 
 from .keywords.core import (  # noqa
@@ -39,10 +40,6 @@ from .keywords.render import (  # noqa
     render_keywords,
 )
 
-from .keywords.unknown import (  # noqa
-    UnknownKeyword,
-)
-
 from .keywords.validation import (  # noqa
     AdditionalProperties,
     AnyOf,

omlish/specs/jsonschema/keywords/base.py

@@ -49,6 +49,15 @@ class KnownKeyword(Keyword, lang.Abstract):
 ##
 
 
+@dc.dataclass(frozen=True)
+class UnknownKeyword(Keyword, lang.Final):
+    tag: str  # type: ignore[misc]
+    value: ta.Any
+
+
+##
+
+
 @dc.dataclass(frozen=True)
 class Keywords(lang.Final):
     lst: ta.Sequence[Keyword]
@@ -56,7 +65,7 @@ class Keywords(lang.Final):
     @cached.property
     @dc.init
     def by_type(self) -> ta.Mapping[type[Keyword], Keyword]:
-        return col.make_map_by(type, self.lst, strict=True)  # noqa
+        return col.make_map_by(type, (k for k in self.lst if not isinstance(k, UnknownKeyword)), strict=True)  # noqa
 
     @cached.property
     @dc.init

omlish/specs/jsonschema/keywords/parse.py

@@ -16,10 +16,10 @@ from .base import NumberKeyword
 from .base import StrKeyword
 from .base import StrOrStrArrayKeyword
 from .base import StrToKeywordsKeyword
+from .base import UnknownKeyword
 from .core import CoreKeyword
 from .format import FormatKeyword
 from .metadata import MetadataKeyword
-from .unknown import UnknownKeyword
 from .validation import ValidationKeyword
 
 

omlish/specs/jsonschema/keywords/render.py

@@ -12,7 +12,7 @@ from .base import NumberKeyword
 from .base import StrKeyword
 from .base import StrOrStrArrayKeyword
 from .base import StrToKeywordsKeyword
-from .unknown import UnknownKeyword
+from .base import UnknownKeyword
 
 
 ##

omlish/sql/api/resources.py

@@ -44,8 +44,10 @@ class Closer(lang.Abstract):
 
     @ta.final
     def close(self) -> None:
-        self.__closed = True
-        self._close()
+        try:
+            self._close()
+        finally:
+            self.__closed = True
 
     def _close(self) -> None:
         pass

{omlish-0.0.0.dev313.dist-info → omlish-0.0.0.dev315.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev313
+Version: 0.0.0.dev315
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev313.dist-info → omlish-0.0.0.dev315.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=orgsRvtpHu8tdhaCvlP9v3P495OJopYYiHKjK68WtWg,8587
-omlish/__about__.py,sha256=81wh26UgL3RY-CfQ-CEVjRjEa68mTK45CUp7tU4yYx8,3478
+omlish/__about__.py,sha256=LDFOlaYknirgV_RjbBKwDWTdloPE5HH2GlmJgG9phI4,3478
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -81,7 +81,7 @@ omlish/collections/abc.py,sha256=ikTJlJ5dhXjU6tlNsI0Wm0_7GaIEpe3mftpvdGY_nc8,262
 omlish/collections/coerce.py,sha256=tAls15v_7p5bUN33R7Zbko87KW5toWHl9fRialCqyNY,7030
 omlish/collections/errors.py,sha256=shcS-NCnEUudF8qC_SmO2TQyjivKlS4TDjaz_faqQ0c,44
 omlish/collections/frozen.py,sha256=LMbAHYDENIQk1hvjCTvpnx66m1TalrHa4CSn8n_tsXQ,4142
-omlish/collections/hasheq.py,sha256=swOBPEnU_C0SU3VqWJX9mr0BfZLD0A-4Ke9Vahj3fE4,3669
+omlish/collections/hasheq.py,sha256=uHypfZlHhicQPvx9OOlpT9MSLwfc_mFil-WaxF9dTOo,3732
 omlish/collections/identity.py,sha256=xtoczgBPYzr6r2lJS-eti2kEnN8rVDvNGDCG3TA6vRo,3405
 omlish/collections/mappings.py,sha256=iXb7oq1rCQak0KgzblgrzWCJLrkfJAYHFvl9lprOVUI,2804
 omlish/collections/ordered.py,sha256=7zTbrAt12rf6i33XHkQERKar258fJacaw_WbtGEBgWo,2338
@@ -104,7 +104,7 @@ omlish/collections/persistent/persistent.py,sha256=boBSZ9yEhVfnxxxv1LrCBzWYfHCa_
 omlish/collections/persistent/treap.py,sha256=o7vhnn8kHde_Plk0sojlJZkkKwp8hpj2IekhcvbYqHs,7739
 omlish/collections/persistent/treapmap.py,sha256=BdqZC6WvwJ0iF0rMgdoRie6PxqrApE2PKQ3j-hFLOR4,6311
 omlish/collections/sorted/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/collections/sorted/skiplist.py,sha256=ezXBHGDD0C8jBbo-F83-xAMu8jhbTD2g1-kTRx7CaXc,6193
+omlish/collections/sorted/skiplist.py,sha256=bcTO1hZvV5EnYxBZ3YBhdewXP_2aCTZra7tJ0pA7jjo,6194
 omlish/collections/sorted/sorted.py,sha256=Y_-7bA8hXG1KXEx5sS_EoLiH-Ru6ERJEsjHIcJ-8-IA,3968
 omlish/concurrent/__init__.py,sha256=9p-s8MvBEYDqHIoYU3OYoe-Nni22QdkW7nhZGEukJTM,197
 omlish/concurrent/executors.py,sha256=mF-rjJWzNFxwB1-_H7rHuwoImpl4FtNM6W3wcqM3NEE,1291
@@ -402,7 +402,7 @@ 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=2wsMTbYWBl5grBKkdiotqi8iCncfuBJDBA_nD0hz0SI,5879
+omlish/lang/__init__.py,sha256=7T9vv39wNkm9jb0LOpzQ1eMxtoMbltMCU554FqTZ4eY,5908
 omlish/lang/attrs.py,sha256=i7euRF81uNF8QDmUVXSK_BtqLGshaMi4VVdUnMjiMwg,5050
 omlish/lang/casing.py,sha256=cFUlbDdXLhwnWwcYx4qnM5c4zGX7hIRUfcjiZbxUD28,4636
 omlish/lang/clsdct.py,sha256=HAGIvBSbCefzRjXriwYSBLO7QHKRv2UsE78jixOb-fA,1828
@@ -412,7 +412,7 @@ omlish/lang/contextmanagers.py,sha256=pN8X4ZCagqU9_xWumi8gZPdMIWlInA-_zQrkl7o5VP
 omlish/lang/datetimes.py,sha256=mrTtA67JYpfQwSlzdPcBtvm6dAyYM_dXNnlxFwFQH0M,228
 omlish/lang/descriptors.py,sha256=zBtgO9LjdSTGHNUgiIqswh78WOVoGH6KzS0NbgB1Wls,6572
 omlish/lang/enums.py,sha256=F9tflHfaAoV2MpyuhZzpfX9-H55M3zNa9hCszsngEo8,111
-omlish/lang/functions.py,sha256=51CoKtH_-CXUsKvtCexaR3OLZOtIwSdv4f4DtGBZdpA,6029
+omlish/lang/functions.py,sha256=75JhKRNhe2iDeqN7yCdLTw_q5k1VFpdphypqb4yy2I0,6298
 omlish/lang/generators.py,sha256=yd3ebG2LlA3XQImP8rplt6tSToXwMxhlGRGCkdJ87ME,5230
 omlish/lang/imports.py,sha256=y9W9Y-d_cQ35QCLuSIPoa6vnEqSErFCz8b-34IH128U,10552
 omlish/lang/iterables.py,sha256=StoGp9yaP3njdLKHoWYcEevO3eE8SHEPYl5_avZob24,2149
@@ -427,7 +427,7 @@ omlish/lang/strings.py,sha256=kJmRFd1D36xXcjd9MdB12BCwF_-MVhNr-TpWj7hMi_4,4252
 omlish/lang/sys.py,sha256=b4qOPiJZQru_mbb04FNfOjYWUxlV2becZOoc-yya_rQ,411
 omlish/lang/typing.py,sha256=Zdad9Zv0sa-hIaUXPrzPidT7sDVpRcussAI7D-j-I1c,3296
 omlish/lang/cached/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/lang/cached/function.py,sha256=0uTtDR1uaxwB2uTB_JTFcCr2c9NxsiWVvCLKVWUUHUw,9641
+omlish/lang/cached/function.py,sha256=gXrU4DYO952lCJpNDuSTVb83f0tVjVnaG3BY2Sqab0k,9712
 omlish/lang/cached/property.py,sha256=WHYyg4-6EA86TcNMfbXTjVhjEZPc0kngt9hfY3WN5w8,2768
 omlish/lang/classes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/lang/classes/abstract.py,sha256=n4rDlDraUKxPF0GtOWEFZ6mEzEDmP7Z8LSI6Jww_thw,3715
@@ -625,16 +625,15 @@ omlish/specs/jsonrpc/conns.py,sha256=zvWnBHuSoGnvbGVk72Usp4IFsLscrzPozqR2hmFjnDI
 omlish/specs/jsonrpc/errors.py,sha256=-Zgmlo6bV6J8w5f8h9axQgLquIFBHDgIwcpufEH5NsE,707
 omlish/specs/jsonrpc/marshal.py,sha256=HM736piPGnBZrg8CMLDX-L5fZpegyF6l6JUjzLoSDtk,1852
 omlish/specs/jsonrpc/types.py,sha256=Se9ecG-_k-kY_Qlt9QD2t3y26oY4sXTcskp6XZfVans,3054
-omlish/specs/jsonschema/__init__.py,sha256=55P7Yg2MprqDyaifac2ExNzK6blTZuDP4ejrUXZWpt8,1129
+omlish/specs/jsonschema/__init__.py,sha256=rdHG_0kKn64qizk0UI5S2uXV2hzf5vxnt4SXRw9yGuU,1086
 omlish/specs/jsonschema/types.py,sha256=_H7ma99hD3_Xu42BFGHOXRI5p79tY8WBX8QE36k7lbw,472
 omlish/specs/jsonschema/keywords/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/specs/jsonschema/keywords/base.py,sha256=KYxKDxZtJGykLcJPTPvDMPDbbmuUw6RLOGgpCNkFcww,2830
+omlish/specs/jsonschema/keywords/base.py,sha256=QjkMrKw58j99r-Ug2I4Y-SGbyKSTVho5FUP_lWDQ4wA,3010
 omlish/specs/jsonschema/keywords/core.py,sha256=3Pbi8d-eocEAxEdemNa0ldp5lrLWNmH0Tye-5rglUoU,535
 omlish/specs/jsonschema/keywords/format.py,sha256=9trrxHe38FDx47I8UfvO4PD_IygRlkEyTUJ3XlxDM6Y,244
 omlish/specs/jsonschema/keywords/metadata.py,sha256=IVWQKWT9xi0R07pXc79ErT7RBu5b6Kzg4pWYIITIRbs,336
-omlish/specs/jsonschema/keywords/parse.py,sha256=8lx17ZoaMF0u0NyAIVM9EmZD6gYLANlw0-zr9DN2HTA,4414
-omlish/specs/jsonschema/keywords/render.py,sha256=wZ9yvfscnW8fYlQTXzmJjMYTKhSTg9hjrtlAEwMRaMQ,1947
-omlish/specs/jsonschema/keywords/unknown.py,sha256=iYIQlBbLUqISvTvj_Kup4wVDRxcEwmnLTyAAWjlxsck,234
+omlish/specs/jsonschema/keywords/parse.py,sha256=HdG-0bivCTe3YFRsrgW15o2S--Re73JOTMMaxYKFIn0,4411
+omlish/specs/jsonschema/keywords/render.py,sha256=Viy3cbDcA2pCtR4z0pi4Q2oMsQDCf01vXsbMO70PlCc,1944
 omlish/specs/jsonschema/keywords/validation.py,sha256=bKu1bDOms5zxg5Xme1ki_jb7TYDFEOv_JKOzeYbxuYQ,1970
 omlish/specs/jsonschema/schemas/LICENSE,sha256=CU2AUO-rKNc9s9vngzyGxUMgaZ0Aevr8lgN2DFFFxKw,1491
 omlish/specs/jsonschema/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -684,7 +683,7 @@ omlish/sql/api/dbapi.py,sha256=bDVqmljmLMdurMhIy3vx-dJvK1KiZ7XBhZ2Zx6W9aBs,2627
 omlish/sql/api/errors.py,sha256=YtC2gz5DqRTT3uCJniUOufVH1GEnFIc5ElkYLK3BHwM,230
 omlish/sql/api/funcs.py,sha256=Raa8kL65l1JprMsJupFw-8EPO6MxxDhm0OPSwecMLOI,2045
 omlish/sql/api/queries.py,sha256=OVsVqNyXXJQVDPfV3GFE2gwnHyGEenS65rTQRTNGx1Y,735
-omlish/sql/api/resources.py,sha256=DTVQmKjhaLi27jHWYkF20VhwGvIazZWxyKzF0Wn9-dc,2228
+omlish/sql/api/resources.py,sha256=RcjnsNoyFWG0VR8YDijwuyZtnxlGQe8jiPQVl_inzIc,2266
 omlish/sql/api/rows.py,sha256=Jo3AA_6Wt7tlwLO6-rp0arzYFqZXSxPudGPkW2xCYgQ,1346
 omlish/sql/parsing/Minisql.g4,sha256=Jw8xT-8UI6ySHAgStyCg5QX9NTCinvTenLJReWiZIJU,4578
 omlish/sql/parsing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -854,9 +853,9 @@ omlish/typedvalues/holder.py,sha256=ZTnHiw-K38ciOBLEdwgrltr7Xp8jjEs_0Lp69DH-G-o,
 omlish/typedvalues/marshal.py,sha256=hWHRLcrGav7lvXJDtb9bNI0ickl4SKPQ6F4BbTpqw3A,4219
 omlish/typedvalues/reflect.py,sha256=Ih1YgU-srUjsvBn_P7C66f73_VCvcwqE3ffeBnZBgt4,674
 omlish/typedvalues/values.py,sha256=ym46I-q2QJ_6l4UlERqv3yj87R-kp8nCKMRph0xQ3UA,1307
-omlish-0.0.0.dev313.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev313.dist-info/METADATA,sha256=eQlRCzJ8ZodiSbL3uCYUvZ6vSf4BK4OFmIZJBCpbrs0,4416
-omlish-0.0.0.dev313.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-omlish-0.0.0.dev313.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev313.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev313.dist-info/RECORD,,
+omlish-0.0.0.dev315.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev315.dist-info/METADATA,sha256=Ork2jAan-wlGr9Z5xsOAkIrAD3jNAWqjaz6nKg7XiUs,4416
+omlish-0.0.0.dev315.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+omlish-0.0.0.dev315.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev315.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev315.dist-info/RECORD,,

{omlish-0.0.0.dev313.dist-info → omlish-0.0.0.dev315.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.4.0)
+Generator: setuptools (80.7.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

omlish/specs/jsonschema/keywords/unknown.py

@@ -1,14 +0,0 @@
-import typing as ta
-
-from .... import dataclasses as dc
-from .... import lang
-from .base import Keyword
-
-
-##
-
-
-@dc.dataclass(frozen=True)
-class UnknownKeyword(Keyword, lang.Final):
-    tag: str  # type: ignore[misc]
-    value: ta.Any