omlish 0.0.0.dev438__tar.gz → 0.0.0.dev439__tar.gz

{omlish-0.0.0.dev438/omlish.egg-info → omlish-0.0.0.dev439}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev438
+Version: 0.0.0.dev439
 Summary: omlish
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -150,7 +150,7 @@ dependencies of any kind**.
   - **[identity](https://github.com/wrmsr/omlish/blob/master/omlish/collections/identity.py)** - Identity-keyed
     collections.
   - **[sorted](https://github.com/wrmsr/omlish/blob/master/omlish/collections/sorted)** - Interfaces for value-sorted
-    collections and key-sorted mappings, and a simple but - correct skiplist-backed implementation.
+    collections and key-sorted mappings, and a simple but correct skiplist-backed implementation.
   - **[persistent](https://github.com/wrmsr/omlish/blob/master/omlish/collections/persistent)** - Interfaces for
     [persistent](https://en.wikipedia.org/wiki/Persistent_data_structure) maps, and a simple but correct treap-backed
     implementation.

{omlish-0.0.0.dev438 → omlish-0.0.0.dev439}/README.md

@@ -41,7 +41,7 @@ dependencies of any kind**.
   - **[identity](https://github.com/wrmsr/omlish/blob/master/omlish/collections/identity.py)** - Identity-keyed
     collections.
   - **[sorted](https://github.com/wrmsr/omlish/blob/master/omlish/collections/sorted)** - Interfaces for value-sorted
-    collections and key-sorted mappings, and a simple but - correct skiplist-backed implementation.
+    collections and key-sorted mappings, and a simple but correct skiplist-backed implementation.
   - **[persistent](https://github.com/wrmsr/omlish/blob/master/omlish/collections/persistent)** - Interfaces for
     [persistent](https://en.wikipedia.org/wiki/Persistent_data_structure) maps, and a simple but correct treap-backed
     implementation.

{omlish-0.0.0.dev438 → omlish-0.0.0.dev439}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev438'
-__revision__ = '5451232ca0015e84e38bd53d3c368a9d659ea8ec'
+__version__ = '0.0.0.dev439'
+__revision__ = '3f7c136d6cdb4f4c2e749cf404632d93585559e3'
 
 
 #

{omlish-0.0.0.dev438 → omlish-0.0.0.dev439}/omlish/dataclasses/impl/api/classes/make.py

@@ -142,7 +142,7 @@ def make_dataclass(  # noqa
 
     if module is None:
         try:
-            module = sys._getframemodulename(_frame_offset) or '__main__'  # type: ignore  # noqa
+            module = sys._getframemodulename(_frame_offset) or '__main__'  # noqa
         except AttributeError:
             with contextlib.suppress(AttributeError, ValueError):
                 module = sys._getframe(_frame_offset).f_globals.get('__name__', '__main__')  # noqa

{omlish-0.0.0.dev438 → omlish-0.0.0.dev439}/omlish/dataclasses/tools/static.py

@@ -142,7 +142,7 @@ class Static(lang.Abstract):
                     n_md[_ExtraFieldParamsMetadata] = {
                         fs_f.name: getattr(x_fs, fs_f.name)
                         for fs_f in dc.fields(FieldSpec)  # noqa
-                        if fs_f not in dc.Field.__slots__  # type: ignore[attr-defined]
+                        if fs_f not in dc.Field.__slots__
                         and fs_f.name not in ('default', 'default_factory')
                     }
                     new_fld.metadata = n_md  # type: ignore[assignment]

{omlish-0.0.0.dev438 → omlish-0.0.0.dev439}/omlish/formats/json/stream/__init__.py

@@ -36,8 +36,8 @@ from .parsing import (  # noqa
     BeginArray,
     EndArray,
 
-    JsonStreamParserEvent,
-    JsonStreamParserEvents,
+    Event,
+    Events,
 
     yield_parser_events,
 

{omlish-0.0.0.dev438 → omlish-0.0.0.dev439}/omlish/formats/json/stream/building.py

@@ -5,8 +5,8 @@ from .parsing import BeginArray
 from .parsing import BeginObject
 from .parsing import EndArray
 from .parsing import EndObject
+from .parsing import Event
 from .parsing import JsonStreamObject
-from .parsing import JsonStreamParserEvent
 from .parsing import Key
 
 
@@ -62,7 +62,7 @@ class JsonValueBuilder:
         else:
             raise self.StateError
 
-    def __call__(self, e: JsonStreamParserEvent) -> ta.Iterable[ta.Any]:
+    def __call__(self, e: Event) -> ta.Iterable[ta.Any]:
         stk = self._stack
 
         #

{omlish-0.0.0.dev438 → omlish-0.0.0.dev439}/omlish/formats/json/stream/parsing.py

@@ -35,7 +35,7 @@ class EndArray(lang.Marker):
     pass
 
 
-JsonStreamParserEvent: ta.TypeAlias = ta.Union[  # noqa
+Event: ta.TypeAlias = ta.Union[  # noqa
     type[BeginObject],
     Key,
     type[EndObject],
@@ -47,7 +47,7 @@ JsonStreamParserEvent: ta.TypeAlias = ta.Union[  # noqa
 ]
 
 
-class JsonStreamParserEvents(lang.Namespace):
+class Events(lang.Namespace):
     BeginObject = BeginObject
     Key = Key
     EndObject = EndObject
@@ -59,7 +59,7 @@ class JsonStreamParserEvents(lang.Namespace):
 ##
 
 
-def yield_parser_events(obj: ta.Any) -> ta.Generator[JsonStreamParserEvent]:
+def yield_parser_events(obj: ta.Any) -> ta.Iterator[Event]:
     if isinstance(obj, SCALAR_VALUE_TYPES):
         yield obj  # type: ignore
 
@@ -95,7 +95,7 @@ class JsonStreamObject(list):
         return f'{self.__class__.__name__}({super().__repr__()})'
 
 
-class JsonStreamParser(GenMachine[Token, JsonStreamParserEvent]):
+class JsonStreamParser(GenMachine[Token, Event]):
     def __init__(
             self,
             *,

{omlish-0.0.0.dev438 → omlish-0.0.0.dev439}/omlish/formats/json/stream/rendering.py

@@ -7,14 +7,14 @@ from .parsing import BeginArray
 from .parsing import BeginObject
 from .parsing import EndArray
 from .parsing import EndObject
-from .parsing import JsonStreamParserEvent
+from .parsing import Event
 from .parsing import Key
 
 
 ##
 
 
-class StreamJsonRenderer(AbstractJsonRenderer[ta.Iterable[JsonStreamParserEvent]]):
+class StreamJsonRenderer(AbstractJsonRenderer[ta.Iterable[Event]]):
     def __init__(
             self,
             *,
@@ -36,7 +36,7 @@ class StreamJsonRenderer(AbstractJsonRenderer[ta.Iterable[JsonStreamParserEvent]
             self,
             o: ta.Any,
             state: AbstractJsonRenderer.State = AbstractJsonRenderer.State.VALUE,
-    ) -> ta.Generator[str]:
+    ) -> ta.Iterator[str]:
         if self._style is not None:
             pre, post = self._style(o, state)
             yield pre
@@ -52,7 +52,7 @@ class StreamJsonRenderer(AbstractJsonRenderer[ta.Iterable[JsonStreamParserEvent]
         if post:
             yield post
 
-    def _render(self, e: JsonStreamParserEvent) -> ta.Generator[str]:
+    def _render(self, e: Event) -> ta.Iterator[str]:
         if self._need_delimit:
             yield self._delimiter
             self._need_delimit = False
@@ -124,12 +124,12 @@ class StreamJsonRenderer(AbstractJsonRenderer[ta.Iterable[JsonStreamParserEvent]
         else:
             raise TypeError(e)
 
-    def render(self, events: ta.Iterable[JsonStreamParserEvent]) -> ta.Generator[str]:
+    def render(self, events: ta.Iterable[Event]) -> ta.Iterator[str]:
         for e in events:
             yield from self._render(e)
 
     @classmethod
-    def render_str(cls, i: ta.Iterable[JsonStreamParserEvent], /, **kwargs: ta.Any) -> str:
+    def render_str(cls, i: ta.Iterable[Event], /, **kwargs: ta.Any) -> str:
         out = io.StringIO()
         for s in cls(**kwargs).render(i):
             out.write(s)

{omlish-0.0.0.dev438 → omlish-0.0.0.dev439}/omlish/formats/json/stream/utils.py

@@ -31,8 +31,8 @@ from .building import JsonValueBuilder
 from .errors import JsonStreamError
 from .lexing import JsonStreamLexer
 from .lexing import Token
+from .parsing import Event
 from .parsing import JsonStreamParser
-from .parsing import JsonStreamParserEvent
 
 
 ##
@@ -110,7 +110,7 @@ class DebugJsonStreamValueParser(JsonStreamValueParser):
 
         self._chars: list[str] = []
         self._tokens: list[Token] = []
-        self._events: list[JsonStreamParserEvent] = []
+        self._events: list[Event] = []
         self._values: list[ta.Any] = []
 
     def feed(self, i: ta.Iterable[str]) -> ta.Iterator[ta.Any]:

{omlish-0.0.0.dev438 → omlish-0.0.0.dev439}/omlish/inject/__init__.py

@@ -123,6 +123,7 @@ with _lang.auto_proxy_init(globals()):
     )
 
     from .providers import (  # noqa
+        AsyncFnProvider,
         ConstProvider,
         CtorProvider,
         FnProvider,

{omlish-0.0.0.dev438 → omlish-0.0.0.dev439}/omlish/iterators/__init__.py

@@ -22,6 +22,8 @@ with _lang.auto_proxy_init(globals()):
         unzip,
     )
 
+    from . import transforms as tf  # noqa
+
     from .unique import (  # noqa
         UniqueItem,
         UniqueIterator,

omlish-0.0.0.dev439/omlish/iterators/transforms.py

@@ -0,0 +1,204 @@
+import abc
+import dataclasses as dc
+import itertools
+import typing as ta
+
+from .. import lang
+
+
+T = ta.TypeVar('T')
+U = ta.TypeVar('U')
+
+Transform: ta.TypeAlias = ta.Callable[[ta.Iterable[T]], ta.Iterable[U]]
+
+X0 = ta.TypeVar('X0')
+X1 = ta.TypeVar('X1')
+X2 = ta.TypeVar('X2')
+X3 = ta.TypeVar('X3')
+X4 = ta.TypeVar('X4')
+X5 = ta.TypeVar('X5')
+
+
+##
+
+
+_filter = filter
+_map = map
+_zip = zip
+
+
+##
+
+
+class Transform_(lang.Abstract, ta.Generic[T, U]):  # noqa
+    @abc.abstractmethod
+    def __call__(self, it: ta.Iterable[T]) -> ta.Iterable[U]:
+        raise NotImplementedError
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class Filter(Transform_[T, T]):
+    fn: ta.Callable[[T], bool] | None
+
+    def __call__(self, it: ta.Iterable[T]) -> ta.Iterable[T]:
+        return _filter(self.fn, it)
+
+
+filter = Filter  # noqa
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class Map(Transform_[T, U]):
+    fn: ta.Callable[[T], U]
+
+    def __call__(self, it: ta.Iterable[T]) -> ta.Iterable[U]:
+        return _map(self.fn, it)
+
+
+map = Map  # noqa
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class Apply(Transform_[T, T]):
+    fn: ta.Callable[[T], ta.Any]
+
+    def __call__(self, it: ta.Iterable[T]) -> ta.Iterable[T]:
+        return _map(lambda e: (self.fn(e), e)[1], it)
+
+
+apply = Apply
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class Flatten(Transform_[ta.Iterable[T], T]):
+    def __call__(self, it: ta.Iterable[ta.Iterable[T]]) -> ta.Iterable[U]:
+        return itertools.chain.from_iterable(it)  # type: ignore[arg-type]
+
+
+flatten = Flatten
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class FlatMap(Transform_[T, U]):
+    fn: ta.Callable[[T], ta.Iterable[U]]
+
+    def __call__(self, it: ta.Iterable[T]) -> ta.Iterable[U]:
+        return itertools.chain.from_iterable(_map(self.fn, it))
+
+
+flat_map = FlatMap
+
+# Alternatively:
+# def flat_map(fn: ta.Callable[[T], ta.Iterable[U]]) -> Transform[T, U]:
+#     return compose(map(fn), flatten())
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class Compose(Transform_[T, U]):
+    tfs: ta.Sequence[Transform]
+
+    def __call__(self, it: ta.Iterable[T]) -> ta.Iterable[U]:
+        for tf in self.tfs:
+            it = tf(it)
+        return it  # type: ignore[return-value]
+
+
+@ta.overload
+def compose(
+        tf0: Transform[T, U],
+) -> Transform[T, U]:
+    ...
+
+
+@ta.overload
+def compose(
+        tf0: Transform[T, X0],
+        tf1: Transform[X0, U],
+) -> Transform[T, U]:
+    ...
+
+
+@ta.overload
+def compose(
+        tf0: Transform[T, X0],
+        tf1: Transform[X0, X1],
+        tf2: Transform[X1, U],
+) -> Transform[T, U]:
+    ...
+
+
+@ta.overload
+def compose(
+        tf0: Transform[T, X0],
+        tf1: Transform[X0, X1],
+        tf2: Transform[X1, X2],
+        tf3: Transform[X2, U],
+) -> Transform[T, U]:
+    ...
+
+
+@ta.overload
+def compose(
+        tf0: Transform[T, X0],
+        tf1: Transform[X0, X1],
+        tf2: Transform[X1, X2],
+        tf3: Transform[X2, X3],
+        tf4: Transform[X3, U],
+) -> Transform[T, U]:
+    ...
+
+
+@ta.overload
+def compose(
+        tf0: Transform[T, X0],
+        tf1: Transform[X0, X1],
+        tf2: Transform[X1, X2],
+        tf3: Transform[X2, X3],
+        tf4: Transform[X3, X4],
+        tf5: Transform[X4, U],
+) -> Transform[T, U]:
+    ...
+
+
+@ta.overload
+def compose(
+        tf0: Transform[T, X0],
+        tf1: Transform[X0, X1],
+        tf2: Transform[X1, X2],
+        tf3: Transform[X2, X3],
+        tf4: Transform[X3, X4],
+        tf5: Transform[X4, X5],
+        tf6: Transform[X5, U],
+) -> Transform[T, U]:
+    ...
+
+
+@ta.overload
+def compose(
+        *tf: Transform,
+) -> Transform:
+    ...
+
+
+def compose(tf0, *tfn):
+    if not tfn:
+        return tf0
+    return Compose([tf0, *tfn])

{omlish-0.0.0.dev438 → omlish-0.0.0.dev439}/omlish/lang/classes/bindable.py

@@ -19,7 +19,7 @@ class _ClassOrInstanceMethod:
 
 class BindableClass(ta.Generic[T]):
     # FIXME: apparently can't have TypeVars in ClassVars, but could stick in a @classmethod (which gets transformed)...
-    _bound: ta.ClassVar[type[T] | None] = None  # type: ignore[misc]
+    _bound: ta.ClassVar[type[T] | None] = None
 
     def __init__(self, *, _bound):
         super().__init__()

{omlish-0.0.0.dev438 → omlish-0.0.0.dev439}/omlish/lang/classes/restrict.py

@@ -32,6 +32,14 @@ class Final(Abstract):
             elif Final in base.__mro__:
                 raise FinalTypeError(base)
 
+        # Per `ta.final`:
+        try:
+            cls.__final__ = True  # type: ignore[attr-defined]
+        except (AttributeError, TypeError):
+            # Skip the attribute silently if it is not writable. AttributeError happens if the object has __slots__ or
+            # a read-only property, TypeError if it's a builtin class.
+            pass
+
 
 ##
 

{omlish-0.0.0.dev438 → omlish-0.0.0.dev439}/omlish/lite/inject.py

@@ -1,4 +1,5 @@
 # ruff: noqa: UP006 UP007 UP043 UP045
+# @omlish-amalg ../../omdev/scripts/inject.py
 import abc
 import contextlib
 import contextvars

{omlish-0.0.0.dev438 → omlish-0.0.0.dev439}/omlish/lite/marshal.py

@@ -1,4 +1,5 @@
 # ruff: noqa: UP006 UP007 UP045
+# @omlish-amalg ../../omdev/scripts/marshal.py
 """
 TODO:
  - pickle stdlib objs? have to pin to 3.8 pickle protocol, will be cross-version

{omlish-0.0.0.dev438 → omlish-0.0.0.dev439}/omlish/reflect/types.py

@@ -225,7 +225,7 @@ def is_simple_generic_alias_type(oty: type) -> bool:
 
 def get_params(obj: ta.Any) -> tuple[ta.TypeVar, ...]:
     if isinstance(obj, type):
-        if issubclass(obj, ta.Generic):  # type: ignore
+        if issubclass(obj, ta.Generic):
             return obj.__dict__.get('__parameters__', ())  # noqa
 
         if (ks := _KNOWN_SPECIALS.get_by_origin(obj)) is not None:
@@ -591,7 +591,7 @@ class Reflector:
                     obj,
                 )
 
-            if issubclass(obj, ta.Generic):  # type: ignore
+            if issubclass(obj, ta.Generic):
                 params = get_params(obj)
                 if params:
                     return Generic(

{omlish-0.0.0.dev438 → omlish-0.0.0.dev439}/omlish/sql/queries/_marshal.py

@@ -40,7 +40,7 @@ class OpMarshalerUnmarshaler(msh.Marshaler, msh.Unmarshaler):
         return col.make_map(((o.name, o) for _, o in self.ns), strict=True)
 
     def marshal(self, ctx: msh.MarshalContext, o: ta.Any) -> msh.Value:
-        return check.isinstance(o, self.ty).name  # type: ignore  # noqa
+        return check.isinstance(o, self.ty).name
 
     def unmarshal(self, ctx: msh.UnmarshalContext, v: msh.Value) -> ta.Any:
         return self.by_name[check.isinstance(v, str)]

{omlish-0.0.0.dev438 → omlish-0.0.0.dev439/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev438
+Version: 0.0.0.dev439
 Summary: omlish
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -150,7 +150,7 @@ dependencies of any kind**.
   - **[identity](https://github.com/wrmsr/omlish/blob/master/omlish/collections/identity.py)** - Identity-keyed
     collections.
   - **[sorted](https://github.com/wrmsr/omlish/blob/master/omlish/collections/sorted)** - Interfaces for value-sorted
-    collections and key-sorted mappings, and a simple but - correct skiplist-backed implementation.
+    collections and key-sorted mappings, and a simple but correct skiplist-backed implementation.
   - **[persistent](https://github.com/wrmsr/omlish/blob/master/omlish/collections/persistent)** - Interfaces for
     [persistent](https://en.wikipedia.org/wiki/Persistent_data_structure) maps, and a simple but correct treap-backed
     implementation.

{omlish-0.0.0.dev438 → omlish-0.0.0.dev439}/omlish.egg-info/SOURCES.txt

@@ -422,6 +422,7 @@ omlish/iterators/__init__.py
 omlish/iterators/iterators.py
 omlish/iterators/recipes.py
 omlish/iterators/tools.py
+omlish/iterators/transforms.py
 omlish/iterators/unique.py
 omlish/lang/__init__.py
 omlish/lang/asyncs.py

{omlish-0.0.0.dev438 → omlish-0.0.0.dev439}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev438'
+version = '0.0.0.dev439'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',