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

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev314'
-__revision__ = '09a70779ef9cc803feb96bc005a44200e6368e22'
+__version__ = '0.0.0.dev315'
+__revision__ = '9f4bb119f0561532694288dd8bb808ce67ebb43d'
 
 
 #

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.dev314.dist-info → omlish-0.0.0.dev315.dist-info}/METADATA

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

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

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=orgsRvtpHu8tdhaCvlP9v3P495OJopYYiHKjK68WtWg,8587
-omlish/__about__.py,sha256=KdW3YR5-xk4PrgPu9drjg1QCLSwN66eeNnfbVgzpF-c,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
@@ -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.dev314.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev314.dist-info/METADATA,sha256=H6zdgadrYc1EUQZ205dMIBmPuvZtkXHKEvVAu1kyHYY,4416
-omlish-0.0.0.dev314.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-omlish-0.0.0.dev314.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev314.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev314.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.dev314.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