omlish 0.0.0.dev447__py3-none-any.whl → 0.0.0.dev493__py3-none-any.whl

omlish/typedvalues/marshal.py

@@ -1,9 +1,10 @@
+import typing as ta
+
 from .. import check
 from .. import dataclasses as dc
 from .. import lang
 from .. import marshal as msh
 from .. import reflect as rfl
-from ..funcs import match as mfs
 from .collection import TypedValues
 from .reflect import reflect_typed_values_impls
 from .values import ScalarTypedValue
@@ -14,60 +15,77 @@ from .values import TypedValue
 
 
 def _build_typed_value_poly(rty: rfl.Type) -> msh.Polymorphism:
-    ty: type[TypedValue] = check.issubclass(check.isinstance(rty, type), TypedValue)
+    ty: type[TypedValue] = check.issubclass(check.isinstance(rty, type), TypedValue)  # noqa
     check.state(lang.is_abstract_class(ty))
     return msh.polymorphism_from_subclasses(
         ty,
         naming=msh.Naming.SNAKE,
-        strip_suffix='auto',
+        strip_suffix=msh.AutoStripSuffix,
     )
 
 
-class TypedValueMarshalerFactory(msh.MarshalerFactoryMatchClass):
-    @mfs.simple(lambda _, ctx, rty: (
-        isinstance(rty, type) and
-        issubclass(rty, ScalarTypedValue) and
-        not lang.is_abstract_class(rty)
-    ))
-    def _build_scalar(self, ctx: msh.MarshalContext, rty: rfl.Type) -> msh.Marshaler:
-        dc_rfl = dc.reflect(check.isinstance(rty, type))
-        v_rty = check.single(dc_rfl.fields_inspection.generic_replaced_field_annotations.values())
-        v_m = ctx.make(v_rty)
-        return msh.WrappedMarshaler(lambda _, o: o.v, v_m)
-
-    @mfs.simple(lambda _, ctx, rty: (
-        isinstance(rty, type) and
-        issubclass(rty, TypedValue) and
-        lang.is_abstract_class(rty)
-    ))
-    def _build_abstract(self, ctx: msh.MarshalContext, rty: rfl.Type) -> msh.Marshaler:
-        return msh.make_polymorphism_marshaler(
+class TypedValueMarshalerFactory(msh.MarshalerFactoryMethodClass):
+    @msh.MarshalerFactoryMethodClass.make_marshaler.register
+    def _make_scalar(self, ctx: msh.MarshalFactoryContext, rty: rfl.Type) -> ta.Callable[[], msh.Marshaler] | None:
+        if not (
+            isinstance(rty, type) and
+            issubclass(rty, ScalarTypedValue) and
+            not lang.is_abstract_class(rty)
+        ):
+            return None
+
+        def inner() -> msh.Marshaler:
+            dc_rfl = dc.reflect(check.isinstance(rty, type))
+            v_rty = check.single(dc_rfl.fields_inspection.generic_replaced_field_annotations.values())
+            v_m = ctx.make_marshaler(v_rty)
+            return msh.WrappedMarshaler(lambda _, o: o.v, v_m)
+
+        return inner
+
+    @msh.MarshalerFactoryMethodClass.make_marshaler.register
+    def _make_abstract(self, ctx: msh.MarshalFactoryContext, rty: rfl.Type) -> ta.Callable[[], msh.Marshaler] | None:
+        if not (
+            isinstance(rty, type) and
+            issubclass(rty, TypedValue) and
+            lang.is_abstract_class(rty)
+        ):
+            return None
+
+        return lambda: msh.make_polymorphism_marshaler(
             _build_typed_value_poly(rty).impls,
             msh.WrapperTypeTagging(),
             ctx,
         )
 
 
-class TypedValueUnmarshalerFactory(msh.UnmarshalerFactoryMatchClass):
-    @mfs.simple(lambda _, ctx, rty: (
-        isinstance(rty, type) and
-        issubclass(rty, ScalarTypedValue) and
-        not lang.is_abstract_class(rty)
-    ))
-    def _build_scalar(self, ctx: msh.UnmarshalContext, rty: rfl.Type) -> msh.Unmarshaler:
-        rty = check.isinstance(rty, type)
-        dc_rfl = dc.reflect(rty)
-        v_rty = check.single(dc_rfl.fields_inspection.generic_replaced_field_annotations.values())
-        v_u = ctx.make(v_rty)
-        return msh.WrappedUnmarshaler(lambda _, v: rty(v), v_u)
-
-    @mfs.simple(lambda _, ctx, rty: (
-        isinstance(rty, type) and
-        issubclass(rty, TypedValue) and
-        lang.is_abstract_class(rty)
-    ))
-    def _build_abstract(self, ctx: msh.UnmarshalContext, rty: rfl.Type) -> msh.Unmarshaler:
-        return msh.make_polymorphism_unmarshaler(
+class TypedValueUnmarshalerFactory(msh.UnmarshalerFactoryMethodClass):
+    @msh.UnmarshalerFactoryMethodClass.make_unmarshaler.register
+    def _make_scalar(self, ctx: msh.UnmarshalFactoryContext, rty: rfl.Type) -> ta.Callable[[], msh.Unmarshaler] | None:
+        if not (
+            isinstance(rty, type) and
+            issubclass(rty, ScalarTypedValue) and
+            not lang.is_abstract_class(rty)
+        ):
+            return None
+
+        def inner() -> msh.Unmarshaler:
+            dc_rfl = dc.reflect(rty)
+            v_rty = check.single(dc_rfl.fields_inspection.generic_replaced_field_annotations.values())
+            v_u = ctx.make_unmarshaler(v_rty)
+            return msh.WrappedUnmarshaler(lambda _, v: rty(v), v_u)
+
+        return inner
+
+    @msh.UnmarshalerFactoryMethodClass.make_unmarshaler.register
+    def _make_abstract(self, ctx: msh.UnmarshalFactoryContext, rty: rfl.Type) -> ta.Callable[[], msh.Unmarshaler] | None:  # noqa
+        if not (
+            isinstance(rty, type) and
+            issubclass(rty, TypedValue) and
+            lang.is_abstract_class(rty)
+        ):
+            return None
+
+        return lambda: msh.make_polymorphism_unmarshaler(
             _build_typed_value_poly(rty).impls,
             msh.WrapperTypeTagging(),
             ctx,
@@ -99,7 +117,7 @@ def _build_typed_values_impls(rty: rfl.Type) -> msh.Impls:
 #
 
 
-def build_typed_values_marshaler(ctx: msh.MarshalContext, rty: rfl.Type) -> msh.Marshaler:
+def build_typed_values_marshaler(ctx: msh.MarshalFactoryContext, rty: rfl.Type) -> msh.Marshaler:
     tv_m = msh.make_polymorphism_marshaler(
         msh.Impls(_build_typed_values_impls(rty)),
         msh.WrapperTypeTagging(),
@@ -108,20 +126,24 @@ def build_typed_values_marshaler(ctx: msh.MarshalContext, rty: rfl.Type) -> msh.
     return msh.IterableMarshaler(tv_m)
 
 
-class TypedValuesMarshalerFactory(msh.MarshalerFactoryMatchClass):
-    @mfs.simple(lambda _, ctx, rty: isinstance(rty, rfl.Generic) and rty.cls is TypedValues)
-    def _build(self, ctx: msh.MarshalContext, rty: rfl.Type) -> msh.Marshaler:
-        return build_typed_values_marshaler(ctx, rty)
+class TypedValuesMarshalerFactory(msh.MarshalerFactoryMethodClass):
+    @msh.MarshalerFactoryMethodClass.make_marshaler.register
+    def _make_generic(self, ctx: msh.MarshalFactoryContext, rty: rfl.Type) -> ta.Callable[[], msh.Marshaler] | None:
+        if not (isinstance(rty, rfl.Generic) and rty.cls is TypedValues):
+            return None
+        return lambda: build_typed_values_marshaler(ctx, rty)
 
-    @mfs.simple(lambda _, ctx, rty: rty is TypedValues)
-    def _build_concrete(self, ctx: msh.MarshalContext, rty: rfl.Type) -> msh.Marshaler:
-        raise NotImplementedError
+    @msh.MarshalerFactoryMethodClass.make_marshaler.register
+    def _make_concrete(self, ctx: msh.MarshalFactoryContext, rty: rfl.Type) -> ta.Callable[[], msh.Marshaler] | None:
+        if rty is not TypedValues:
+            return None
+        return lambda: lang.raise_(NotImplementedError)
 
 
 #
 
 
-def build_typed_values_unmarshaler(ctx: msh.UnmarshalContext, rty: rfl.Type) -> msh.Unmarshaler:
+def build_typed_values_unmarshaler(ctx: msh.UnmarshalFactoryContext, rty: rfl.Type) -> msh.Unmarshaler:
     tv_u = msh.make_polymorphism_unmarshaler(
         msh.Impls(_build_typed_values_impls(rty)),
         msh.WrapperTypeTagging(),
@@ -130,21 +152,25 @@ def build_typed_values_unmarshaler(ctx: msh.UnmarshalContext, rty: rfl.Type) ->
     return msh.IterableUnmarshaler(lambda it: TypedValues(*it), tv_u)  # noqa
 
 
-class TypedValuesUnmarshalerFactory(msh.UnmarshalerFactoryMatchClass):
-    @mfs.simple(lambda _, ctx, rty: isinstance(rty, rfl.Generic) and rty.cls is TypedValues)
-    def _build(self, ctx: msh.UnmarshalContext, rty: rfl.Type) -> msh.Unmarshaler:
-        return build_typed_values_unmarshaler(ctx, rty)
+class TypedValuesUnmarshalerFactory(msh.UnmarshalerFactoryMethodClass):
+    @msh.UnmarshalerFactoryMethodClass.make_unmarshaler.register
+    def _build(self, ctx: msh.UnmarshalFactoryContext, rty: rfl.Type) -> ta.Callable[[], msh.Unmarshaler] | None:
+        if not (isinstance(rty, rfl.Generic) and rty.cls is TypedValues):
+            return None
+        return lambda: build_typed_values_unmarshaler(ctx, rty)
 
-    @mfs.simple(lambda _, ctx, rty: rty is TypedValues)
-    def _build_concrete(self, ctx: msh.UnmarshalContext, rty: rfl.Type) -> msh.Unmarshaler:
-        raise NotImplementedError
+    @msh.UnmarshalerFactoryMethodClass.make_unmarshaler.register
+    def _build_concrete(self, ctx: msh.UnmarshalFactoryContext, rty: rfl.Type) -> ta.Callable[[], msh.Unmarshaler] | None:  # noqa
+        if rty is not TypedValues:
+            return None
+        return lambda: lang.raise_(NotImplementedError)
 
 
 ##
 
 
 @lang.static_init
-def _install_standard_marshalling() -> None:
+def _install_standard_marshaling() -> None:
     msh.install_standard_factories(
         TypedValueMarshalerFactory(),
         TypedValueUnmarshalerFactory(),

omlish/typedvalues/values.py

@@ -11,7 +11,8 @@ T = ta.TypeVar('T')
 
 
 class TypedValue(lang.Abstract):
-    pass
+    def __bool__(self) -> ta.NoReturn:
+        raise TypeError(f"Cannot convert {self!r} to bool - use '.v' or 'is not None'.")
 
 
 ##

{omlish-0.0.0.dev447.dist-info → omlish-0.0.0.dev493.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev447
+Version: 0.0.0.dev493
 Summary: omlish
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -15,15 +15,15 @@ Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Provides-Extra: all
-Requires-Dist: anyio~=4.10; extra == "all"
+Requires-Dist: anyio~=4.11; extra == "all"
 Requires-Dist: sniffio~=1.3; extra == "all"
-Requires-Dist: greenlet~=3.2; extra == "all"
-Requires-Dist: trio~=0.31; extra == "all"
+Requires-Dist: greenlet~=3.3; extra == "all"
+Requires-Dist: trio~=0.32; extra == "all"
 Requires-Dist: trio-asyncio~=0.15; extra == "all"
 Requires-Dist: lz4~=4.4; extra == "all"
 Requires-Dist: python-snappy~=0.7; extra == "all"
 Requires-Dist: zstandard~=0.25; python_version < "3.14" and extra == "all"
-Requires-Dist: brotli~=1.1; extra == "all"
+Requires-Dist: brotli~=1.2; extra == "all"
 Requires-Dist: asttokens~=3.0; extra == "all"
 Requires-Dist: executing~=2.2; extra == "all"
 Requires-Dist: psutil~=7.1; extra == "all"
@@ -33,38 +33,38 @@ Requires-Dist: pyyaml~=6.0; extra == "all"
 Requires-Dist: cbor2~=5.7; extra == "all"
 Requires-Dist: cloudpickle~=3.1; extra == "all"
 Requires-Dist: httpx[http2]~=0.28; extra == "all"
-Requires-Dist: wrapt~=1.17; extra == "all"
-Requires-Dist: cryptography~=45.0; extra == "all"
+Requires-Dist: wrapt~=2.0; extra == "all"
+Requires-Dist: cryptography~=46.0; extra == "all"
 Requires-Dist: sqlalchemy[asyncio]~=2.0; extra == "all"
 Requires-Dist: pg8000~=1.31; extra == "all"
 Requires-Dist: pymysql~=1.1; extra == "all"
-Requires-Dist: aiomysql~=0.2; extra == "all"
-Requires-Dist: aiosqlite~=0.21; extra == "all"
-Requires-Dist: asyncpg~=0.30; extra == "all"
-Requires-Dist: apsw~=3.50; extra == "all"
+Requires-Dist: aiomysql~=0.3; extra == "all"
+Requires-Dist: aiosqlite~=0.22; extra == "all"
+Requires-Dist: asyncpg~=0.31; extra == "all"
+Requires-Dist: apsw~=3.51; extra == "all"
 Requires-Dist: sqlean.py~=3.50; extra == "all"
 Requires-Dist: duckdb~=1.4; extra == "all"
 Requires-Dist: markupsafe~=3.0; extra == "all"
 Requires-Dist: jinja2~=3.1; extra == "all"
-Requires-Dist: pytest~=8.4; extra == "all"
-Requires-Dist: anyio~=4.10; extra == "all"
+Requires-Dist: pytest~=9.0; extra == "all"
+Requires-Dist: anyio~=4.11; extra == "all"
 Requires-Dist: sniffio~=1.3; extra == "all"
 Requires-Dist: asttokens~=3.0; extra == "all"
 Requires-Dist: executing~=2.2; extra == "all"
 Requires-Dist: orjson~=3.11; extra == "all"
 Requires-Dist: pyyaml~=6.0; extra == "all"
-Requires-Dist: wrapt~=1.17; extra == "all"
+Requires-Dist: wrapt~=2.0; extra == "all"
 Provides-Extra: async
-Requires-Dist: anyio~=4.10; extra == "async"
+Requires-Dist: anyio~=4.11; extra == "async"
 Requires-Dist: sniffio~=1.3; extra == "async"
-Requires-Dist: greenlet~=3.2; extra == "async"
-Requires-Dist: trio~=0.31; extra == "async"
+Requires-Dist: greenlet~=3.3; extra == "async"
+Requires-Dist: trio~=0.32; extra == "async"
 Requires-Dist: trio-asyncio~=0.15; extra == "async"
 Provides-Extra: compress
 Requires-Dist: lz4~=4.4; extra == "compress"
 Requires-Dist: python-snappy~=0.7; extra == "compress"
 Requires-Dist: zstandard~=0.25; python_version < "3.14" and extra == "compress"
-Requires-Dist: brotli~=1.1; extra == "compress"
+Requires-Dist: brotli~=1.2; extra == "compress"
 Provides-Extra: diag
 Requires-Dist: asttokens~=3.0; extra == "diag"
 Requires-Dist: executing~=2.2; extra == "diag"
@@ -78,33 +78,33 @@ Requires-Dist: cloudpickle~=3.1; extra == "formats"
 Provides-Extra: http
 Requires-Dist: httpx[http2]~=0.28; extra == "http"
 Provides-Extra: misc
-Requires-Dist: wrapt~=1.17; extra == "misc"
+Requires-Dist: wrapt~=2.0; extra == "misc"
 Provides-Extra: secrets
-Requires-Dist: cryptography~=45.0; extra == "secrets"
+Requires-Dist: cryptography~=46.0; extra == "secrets"
 Provides-Extra: sqlalchemy
 Requires-Dist: sqlalchemy[asyncio]~=2.0; extra == "sqlalchemy"
 Provides-Extra: sqldrivers
 Requires-Dist: pg8000~=1.31; extra == "sqldrivers"
 Requires-Dist: pymysql~=1.1; extra == "sqldrivers"
-Requires-Dist: aiomysql~=0.2; extra == "sqldrivers"
-Requires-Dist: aiosqlite~=0.21; extra == "sqldrivers"
-Requires-Dist: asyncpg~=0.30; extra == "sqldrivers"
-Requires-Dist: apsw~=3.50; extra == "sqldrivers"
+Requires-Dist: aiomysql~=0.3; extra == "sqldrivers"
+Requires-Dist: aiosqlite~=0.22; extra == "sqldrivers"
+Requires-Dist: asyncpg~=0.31; extra == "sqldrivers"
+Requires-Dist: apsw~=3.51; extra == "sqldrivers"
 Requires-Dist: sqlean.py~=3.50; extra == "sqldrivers"
 Requires-Dist: duckdb~=1.4; extra == "sqldrivers"
 Provides-Extra: templates
 Requires-Dist: markupsafe~=3.0; extra == "templates"
 Requires-Dist: jinja2~=3.1; extra == "templates"
 Provides-Extra: testing
-Requires-Dist: pytest~=8.4; extra == "testing"
+Requires-Dist: pytest~=9.0; extra == "testing"
 Provides-Extra: plus
-Requires-Dist: anyio~=4.10; extra == "plus"
+Requires-Dist: anyio~=4.11; extra == "plus"
 Requires-Dist: sniffio~=1.3; extra == "plus"
 Requires-Dist: asttokens~=3.0; extra == "plus"
 Requires-Dist: executing~=2.2; extra == "plus"
 Requires-Dist: orjson~=3.11; extra == "plus"
 Requires-Dist: pyyaml~=6.0; extra == "plus"
-Requires-Dist: wrapt~=1.17; extra == "plus"
+Requires-Dist: wrapt~=2.0; extra == "plus"
 Dynamic: license-file
 
 # Overview
@@ -167,7 +167,7 @@ dependencies of any kind**.
   - An optional [metaclass](https://github.com/wrmsr/omlish/blob/master/omlish/dataclasses/metaclass) which removes the
     need for re-decorating subclasses (with support for inheritance of dataclass parameters like `frozen`), and some
     basic [base classes](https://github.com/wrmsr/omlish/blob/master/omlish/dataclasses/metaclass/bases.py).
-  - (Nearly finished) support for ahead-of-time / build-time code generation, greatly reducing import times.
+  - Support for ahead-of-time / build-time code generation, significantly reducing import times.
 
   The stdlib-equivalent api is exported in such a way as to appear to be direct aliases for the stdlib api itself,
   simplifying tool support.
@@ -234,7 +234,8 @@ dependencies of any kind**.
   - **[queries](https://github.com/wrmsr/omlish/blob/master/omlish/sql/queries)** - A SQL query builder with a fluent
     interface.
   - **[alchemy](https://github.com/wrmsr/omlish/blob/master/omlish/sql/alchemy)** - SQLAlchemy utilities. The codebase
-    is moving away from SQLAlchemy however in favor of its own internal SQL api.
+    has moved away from SQLAlchemy in favor of its own internal SQL api, but it will likely still remain as an optional
+    dep for the api adapter.
 
 - **[testing](https://github.com/wrmsr/omlish/blob/master/omlish/testing)** - Test - primarily pytest - helpers,
   including:
@@ -246,6 +247,10 @@ dependencies of any kind**.
     *any-future-event-loop-impl* without having multiple fighting plugins (*[I know, I know](https://xkcd.com/927/)*).
   - **[plugins](https://github.com/wrmsr/omlish/blob/master/omlish/testing/pytest/plugins)** - Various other plugins.
 
+- **[typedvalues](https://github.com/wrmsr/omlish/blob/master/omlish/typedvalues)** - A little toolkit around 'boxed'
+  values, whose 'box' types convey more information than the bare values themselves. A rebellion against kwargs and env
+  vars: instead of `foo(bar=1, baz=2)`, you do `foo(Bar(1), Baz(2))`.
+
 - **[lite](https://github.com/wrmsr/omlish/blob/master/omlish/lite)** - The standard library of 'lite' code. This is the
   only package beneath `lang`, and parts of it are re-exported by it for deduplication. On top of miscellaneous
   utilities it contains a handful of independent, self-contained, significantly simplified 'lite' equivalents of some
@@ -293,9 +298,8 @@ examples are:
 - **anyio** - While lite code must use only asyncio, non-trivial async standard code prefers to be written to anyio.
 - **pytest** - What is used for all standard testing - as lite code has no dependencies of any kind its testing uses
   stdlib's [unittest](https://docs.python.org/3/library/unittest.html).
-- **wrapt** - For (optionally-enabled) injector circular proxies.
-- **sqlalchemy** - Parts of the codebase use SQLAlchemy for db stuff, but it is being migrated away from in favor of the
-  internal api. It will however likely still remain as an optional dep for the api adapter.
+- **sqlalchemy** - The codebase has migrated away from SQLAlchemy in favor of the internal api but it retains it as an
+  optional dep to support adapting the internal api to it.
 
 Additionally, some catchall dep categories include: