omlish 0.0.0.dev83__py3-none-any.whl → 0.0.0.dev84__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev83'
-__revision__ = '25a87321f2e19f536595fa049cd2f53fb5497448'
+__version__ = '0.0.0.dev84'
+__revision__ = 'b3347da7d48862b90c274893e4f9bfa477fecc70'
 
 
 #
@@ -101,7 +101,7 @@ class Project(ProjectBase):
 
             'apsw ~= 3.46',
 
-            'sqlean.py ~= 3.45; python_version < "3.13"',
+            'sqlean.py ~= 3.45',
 
             'duckdb ~= 1.1',
         ],

omlish/dataclasses/impl/fields.py

@@ -35,7 +35,7 @@ def raise_field_validation_error(
         field: str,
         fn: ta.Callable,
         value: ta.Any,
-):
+) -> ta.NoReturn:
     raise FieldValidationError(
         obj,
         field,

omlish/dataclasses/impl/init.py

@@ -23,6 +23,19 @@ from .utils import set_new_attribute
 MISSING = dc.MISSING
 
 
+##
+
+
+def raise_validation_error(
+        obj: ta.Any,
+        fn: ta.Callable,
+) -> ta.NoReturn:
+    raise ValidationError(obj, fn)
+
+
+##
+
+
 class InitFields(ta.NamedTuple):
     all: ta.Sequence[dc.Field]
     ordered: ta.Sequence[dc.Field]
@@ -57,6 +70,9 @@ def init_param(f: dc.Field) -> str:
     return f'{f.name}: __dataclass_type_{f.name}__{default}'  # noqa
 
 
+##
+
+
 class InitBuilder:
 
     def __init__(
@@ -100,7 +116,7 @@ class InitBuilder:
             '__dataclass_builtins_object__': object,
             '__dataclass_builtins_isinstance__': isinstance,
             '__dataclass_builtins_TypeError__': TypeError,
-            '__dataclass_ValidationError__': ValidationError,
+            '__dataclass_raise_validation_error__': raise_validation_error,
             '__dataclass_raise_field_validation_error__': raise_field_validation_error,
         })
 
@@ -128,7 +144,7 @@ class InitBuilder:
             locals[cn] = fn
             csig = inspect.signature(fn)
             cas = ', '.join(p.name for p in csig.parameters.values())
-            body_lines.append(f'if not {cn}({cas}): raise __dataclass_ValidationError__')
+            body_lines.append(f'if not {cn}({cas}): __dataclass_raise_validation_error__({self._self_name}, {cn})')
 
         inits = self._info.merged_metadata.get(Init, [])
         mro_dct = lang.build_mro_dict(self._info.cls)

omlish/formats/json/stream/build.py

@@ -1,6 +1,5 @@
 import typing as ta
 
-from ....genmachine import GenMachine
 from .lex import SCALAR_VALUE_TYPES
 from .parse import BeginArray
 from .parse import BeginObject
@@ -14,7 +13,7 @@ from .parse import Key
 ##
 
 
-class JsonObjectBuilder(GenMachine[JsonStreamParserEvent, ta.Any]):
+class JsonObjectBuilder:
     def __init__(
             self,
             *,
@@ -23,91 +22,88 @@ class JsonObjectBuilder(GenMachine[JsonStreamParserEvent, ta.Any]):
         self._stack: list[JsonStreamObject | list | Key] = []
         self._yield_object_lists = yield_object_lists
 
-        super().__init__(self._do())
+    class StateError(Exception):
+        pass
 
-    def _do(self):
-        stk = self._stack
-
-        def emit_value(v):
-            if not stk:
-                return (v,)
+    def __enter__(self) -> ta.Self:
+        return self
 
-            tv = stk[-1]
-            if isinstance(tv, Key):
-                stk.pop()
-                if not stk:
-                    raise self.StateError
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        if exc_type is None:
+            self.close()
 
-                tv2 = stk[-1]
-                if not isinstance(tv2, JsonStreamObject):
-                    raise self.StateError
+    def close(self) -> None:
+        if self._stack:
+            raise self.StateError
 
-                tv2.append((tv.key, v))
-                return ()
+    def _emit_value(self, v):
+        if not (stk := self._stack):
+            return (v,)
 
-            elif isinstance(tv, list):
-                tv.append(v)
-                return ()
+        tv = stk[-1]
+        if isinstance(tv, Key):
+            stk.pop()
+            if not stk:
+                raise self.StateError
 
-            else:
+            tv2 = stk[-1]
+            if not isinstance(tv2, JsonStreamObject):
                 raise self.StateError
 
-        while True:
-            try:
-                e = yield None
-            except GeneratorExit:
-                if stk:
-                    raise self.StateError from None
-                else:
-                    raise
+            tv2.append((tv.key, v))
+            return ()
+
+        elif isinstance(tv, list):
+            tv.append(v)
+            return ()
 
-            #
+        else:
+            raise self.StateError
 
-            if isinstance(e, SCALAR_VALUE_TYPES):
-                if t := emit_value(e):
-                    yield t
-                continue
+    def __call__(self, e: JsonStreamParserEvent) -> ta.Any:
+        stk = self._stack
+
+        #
+
+        if isinstance(e, SCALAR_VALUE_TYPES):
+            return self._emit_value(e)
 
-            #
+        #
 
-            elif e is BeginObject:
-                stk.append(JsonStreamObject())
-                continue
+        elif e is BeginObject:
+            stk.append(JsonStreamObject())
+            return ()
 
-            elif isinstance(e, Key):
-                if not stk or not isinstance(stk[-1], JsonStreamObject):
-                    raise self.StateError
+        elif isinstance(e, Key):
+            if not stk or not isinstance(stk[-1], JsonStreamObject):
+                raise self.StateError
 
-                stk.append(e)
-                continue
+            stk.append(e)
+            return ()
 
-            elif e is EndObject:
-                tv: ta.Any
-                if not stk or not isinstance(tv := stk.pop(), JsonStreamObject):
-                    raise self.StateError
+        elif e is EndObject:
+            tv: ta.Any
+            if not stk or not isinstance(tv := stk.pop(), JsonStreamObject):
+                raise self.StateError
 
-                if not self._yield_object_lists:
-                    tv = dict(tv)
+            if not self._yield_object_lists:
+                tv = dict(tv)
 
-                if t := emit_value(tv):
-                    yield t
-                continue
+            return self._emit_value(tv)
 
-            #
+        #
 
-            elif e is BeginArray:
-                stk.append([])
-                continue
+        elif e is BeginArray:
+            stk.append([])
+            return ()
 
-            elif e is EndArray:
-                if not stk or not isinstance(tv := stk.pop(), list):
-                    raise self.StateError
+        elif e is EndArray:
+            if not stk or not isinstance(tv := stk.pop(), list):
+                raise self.StateError
 
-                if t := emit_value(tv):
-                    yield t
-                continue
+            return self._emit_value(tv)
 
-            #
+        #
 
-            else:
-                raise TypeError(e)
+        else:
+            raise TypeError(e)

{omlish-0.0.0.dev83.dist-info → omlish-0.0.0.dev84.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev83
+Version: 0.0.0.dev84
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -40,9 +40,9 @@ Requires-Dist: aiomysql ~=0.2 ; extra == 'all'
 Requires-Dist: aiosqlite ~=0.20 ; extra == 'all'
 Requires-Dist: asyncpg ~=0.30 ; extra == 'all'
 Requires-Dist: apsw ~=3.46 ; extra == 'all'
+Requires-Dist: sqlean.py ~=3.45 ; extra == 'all'
 Requires-Dist: duckdb ~=1.1 ; extra == 'all'
 Requires-Dist: pytest ~=8.0 ; extra == 'all'
-Requires-Dist: sqlean.py ~=3.45 ; (python_version < "3.13") and extra == 'all'
 Provides-Extra: async
 Requires-Dist: anyio ~=4.6 ; extra == 'async'
 Requires-Dist: sniffio ~=1.3 ; extra == 'async'
@@ -87,8 +87,8 @@ Requires-Dist: aiomysql ~=0.2 ; extra == 'sqldrivers'
 Requires-Dist: aiosqlite ~=0.20 ; extra == 'sqldrivers'
 Requires-Dist: asyncpg ~=0.30 ; extra == 'sqldrivers'
 Requires-Dist: apsw ~=3.46 ; extra == 'sqldrivers'
+Requires-Dist: sqlean.py ~=3.45 ; extra == 'sqldrivers'
 Requires-Dist: duckdb ~=1.1 ; extra == 'sqldrivers'
-Requires-Dist: sqlean.py ~=3.45 ; (python_version < "3.13") and extra == 'sqldrivers'
 Provides-Extra: testing
 Requires-Dist: pytest ~=8.0 ; extra == 'testing'
 

{omlish-0.0.0.dev83.dist-info → omlish-0.0.0.dev84.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=hTFp9tvE72BxKloIq1s1SS0LRQlIsvMtO69Sbc47rKg,1704
-omlish/__about__.py,sha256=ekzbyJ-nihCL3SJ4lJ_uq-a-V1a5SLP_kMNo0ugzCOw,3370
+omlish/__about__.py,sha256=oOKwJVkrCVI_eRBapOS36eRWek5mbyQvP62epTd67RE,3345
 omlish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/argparse.py,sha256=Dc73G8lyoQBLvXhMYUbzQUh4SJu_OTvKUXjSUxq_ang,7499
 omlish/c3.py,sha256=4vogWgwPb8TbNS2KkZxpoWbwjj7MuHG2lQG-hdtkvjI,8062
@@ -132,10 +132,10 @@ omlish/dataclasses/impl/as_.py,sha256=CD-t7hkC1EP2F_jvZKIA_cVoDuwZ-Ln_xC4fJumPYX
 omlish/dataclasses/impl/copy.py,sha256=Tn8_n6Vohs-w4otbGdubBEvhd3TsSTaM3EfNGdS2LYo,591
 omlish/dataclasses/impl/descriptors.py,sha256=rEYE1Len99agTQCC25hSPMnM19BgPr0ZChABGi58Fdk,2476
 omlish/dataclasses/impl/exceptions.py,sha256=-vqxZmfXVflymVuiM553XTlJProse5HEMktTpfdPCIY,1275
-omlish/dataclasses/impl/fields.py,sha256=DbdTUnwFNL7KxNZBmEAGg4muMyFWbiMR8BUtUAOLrrc,6863
+omlish/dataclasses/impl/fields.py,sha256=4_5qMz9LlOS6U67cDKQ-oorTtSGGxR77I4hw88soM44,6878
 omlish/dataclasses/impl/frozen.py,sha256=x87DSM8FIMZ3c_BIUE8NooCkExFjPsabeqIueEP5qKs,2988
 omlish/dataclasses/impl/hashing.py,sha256=FKnHuXCg9ylrzK2TLGqO5yfRN4HX3F415CSLlVYXtYE,3190
-omlish/dataclasses/impl/init.py,sha256=t8wFWS5jw1XaY8KwL5iLSoeON0iILA2sqa-lDair0Ck,6181
+omlish/dataclasses/impl/init.py,sha256=5kYcMDlI6EVeLQ6RCTk1bvYjb-cwg0AYfVE9FPZJlYI,6365
 omlish/dataclasses/impl/internals.py,sha256=UvZYjrLT1S8ntyxJ_vRPIkPOF00K8HatGAygErgoXTU,2990
 omlish/dataclasses/impl/main.py,sha256=Ti0PKbFKraKvfmoPuR-G7nLVNzRC8mvEuXhCuC-M2kc,2574
 omlish/dataclasses/impl/metaclass.py,sha256=Fb0ExFiyYdOpvck4ayXMr_vEVDvHLhe28Ns3F4aduM8,3222
@@ -200,7 +200,7 @@ omlish/formats/json/cli/__main__.py,sha256=1wxxKZVkj_u7HCcewwMIbGuZj_Wph95yrUbm4
 omlish/formats/json/cli/cli.py,sha256=GkdNokklRuDWiXAIai1wijSBFVJlpdlNLTQ3Lyucos0,5493
 omlish/formats/json/cli/formats.py,sha256=tqEZKby4HeafGcaUs-m8B-2ZV12dRo40rzL-V99cp00,1714
 omlish/formats/json/stream/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/formats/json/stream/build.py,sha256=2Bikvvcaqad85J3kvmD6I5Dqp8NstyP6Gb2COeN-lxs,2780
+omlish/formats/json/stream/build.py,sha256=6deXBxTx1toFAPShz2Jo5OiXxH5Y4ppG8gDPRFoUgjA,2461
 omlish/formats/json/stream/lex.py,sha256=hMnsZld72XE7GCWdjbUANRxrruuBSSQeCm8wypMiMv0,6172
 omlish/formats/json/stream/parse.py,sha256=WkbW7tvcdrTSluKhw70nPvjsq943eryVcjx8FSz78tM,5198
 omlish/formats/json/stream/render.py,sha256=B9ZNuBiDJOT25prhIsZu1ICKjxk4eMPwpgQF37NPufs,3212
@@ -453,9 +453,9 @@ omlish/text/delimit.py,sha256=ubPXcXQmtbOVrUsNh5gH1mDq5H-n1y2R4cPL5_DQf68,4928
 omlish/text/glyphsplit.py,sha256=Ug-dPRO7x-OrNNr8g1y6DotSZ2KH0S-VcOmUobwa4B0,3296
 omlish/text/indent.py,sha256=6Jj6TFY9unaPa4xPzrnZemJ-fHsV53IamP93XGjSUHs,1274
 omlish/text/parts.py,sha256=7vPF1aTZdvLVYJ4EwBZVzRSy8XB3YqPd7JwEnNGGAOo,6495
-omlish-0.0.0.dev83.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev83.dist-info/METADATA,sha256=3V-8-n6HgqRRGC2ot30034BVPmmVkrX9-QfCfx7sLSQ,4047
-omlish-0.0.0.dev83.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-omlish-0.0.0.dev83.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev83.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev83.dist-info/RECORD,,
+omlish-0.0.0.dev84.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev84.dist-info/METADATA,sha256=Ui6NExa9RJ31Hhf-FtoRkeGzkSw-2RiAy2bI-1Octl8,3987
+omlish-0.0.0.dev84.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+omlish-0.0.0.dev84.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev84.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev84.dist-info/RECORD,,