Pyright upgrade (#36)

- Typing cleanup

Author: dbrattli

.pre-commit-config.yaml

@@ -26,5 +26,5 @@ repos:
         language: node
         pass_filenames: false
         types: [python]
-        additional_dependencies: ["[email protected].127"]
+        additional_dependencies: ["[email protected].158"]
     repo: local

expression/collections/asyncseq.py

@@ -63,21 +63,21 @@ async def repeat(value: TSource, times: Optional[int] = None) -> AsyncIterable[T
 
 
 @overload
-async def range(stop: int) -> AsyncIterable[int]:
+def range(stop: int) -> AsyncIterable[int]:
     ...
 
 
 @overload
-async def range(start: int, stop: int) -> AsyncIterable[int]:
+def range(start: int, stop: int) -> AsyncIterable[int]:
     ...
 
 
 @overload
-async def range(start: int, stop: int, step: int) -> AsyncIterable[int]:
+def range(start: int, stop: int, step: int) -> AsyncIterable[int]:
     ...
 
 
-async def range(*args: Any, **kw: Any) -> AsyncIterable[Any]:
+async def range(*args: int, **kw: int) -> AsyncIterable[int]:
     for value in builtins.range(*args, **kw):
         yield value
 

expression/collections/frozenlist.py

@@ -30,7 +30,6 @@
     Iterator,
     List,
     Optional,
-    Protocol,
     Tuple,
     TypeVar,
     cast,
@@ -438,8 +437,8 @@ def __getitem__(self, key: Any) -> Any:
     def __iter__(self) -> Iterator[TSource]:
         return iter(self.value)
 
-    def __eq__(self, other: Any) -> bool:
-        return self.value == other
+    def __eq__(self, o: Any) -> bool:
+        return self.value == o
 
     def __len__(self) -> int:
         return len(self.value)
@@ -464,20 +463,6 @@ def __repr__(self) -> str:
         return str(self)
 
 
-class Cata(Protocol[TSourceIn, TResultOut]):
-    """A partially applied exit function."""
-
-    def __call__(self, source: FrozenList[TSourceIn]) -> TResultOut:
-        ...
-
-
-class Projection(Protocol[TSourceIn, TResultOut]):
-    """A partially applied filter function."""
-
-    def __call__(self, __source: FrozenList[TSourceIn]) -> FrozenList[TResultOut]:
-        ...
-
-
 def append(source: FrozenList[TSource]) -> Callable[[FrozenList[TSource]], FrozenList[TSource]]:
     def _append(other: FrozenList[TSource]) -> FrozenList[TSource]:
         return source.append(other)
@@ -634,7 +619,7 @@ def indexed(source: FrozenList[TSource]) -> FrozenList[Tuple[int, TSource]]:
     return source.indexed()
 
 
-def item(index: int) -> Cata[TSource, TSource]:
+def item(index: int) -> Callable[[FrozenList[TSource]], TSource]:
     """Indexes into the list. The first element has index 0.
 
     Args:
@@ -655,7 +640,7 @@ def is_empty(source: FrozenList[Any]) -> bool:
     return source.is_empty()
 
 
-def map(mapper: Callable[[TSource], TResult]) -> Projection[TSource, TResult]:
+def map(mapper: Callable[[TSource], TResult]) -> Callable[[FrozenList[TSource]], FrozenList[TResult]]:
     """Map list.
 
     Builds a new collection whose elements are the results of applying
@@ -674,7 +659,7 @@ def _map(source: FrozenList[TSource]) -> FrozenList[TResult]:
     return _map
 
 
-def mapi(mapper: Callable[[int, TSource], TResult]) -> Projection[TSource, TResult]:
+def mapi(mapper: Callable[[int, TSource], TResult]) -> Callable[[FrozenList[TSource]], FrozenList[TResult]]:
     """Map list with index.
 
     Builds a new collection whose elements are the results of
@@ -735,7 +720,7 @@ def singleton(value: TSource) -> FrozenList[TSource]:
     return FrozenList((value,))
 
 
-def skip(count: int) -> Projection[TSource, TSource]:
+def skip(count: int) -> Callable[[FrozenList[TSource]], FrozenList[TSource]]:
     """Returns the list after removing the first N elements.
 
     Args:
@@ -751,7 +736,7 @@ def _skip(source: FrozenList[TSource]) -> FrozenList[TSource]:
     return _skip
 
 
-def skip_last(count: int) -> Projection[TSource, TSource]:
+def skip_last(count: int) -> Callable[[FrozenList[TSource]], FrozenList[TSource]]:
     """Returns the list after removing the last N elements.
 
     Args:
@@ -771,7 +756,7 @@ def tail(source: FrozenList[TSource]) -> FrozenList[TSource]:
     return source.tail()
 
 
-def take(count: int) -> Projection[TSource, TSource]:
+def take(count: int) -> Callable[[FrozenList[TSource]], FrozenList[TSource]]:
     """Returns the first N elements of the list.
 
     Args:
@@ -787,7 +772,7 @@ def _take(source: FrozenList[TSource]) -> FrozenList[TSource]:
     return _take
 
 
-def take_last(count: int) -> Projection[TSource, TSource]:
+def take_last(count: int) -> Callable[[FrozenList[TSource]], FrozenList[TSource]]:
     """Returns a specified number of contiguous elements from the end of
     the list.
 

expression/collections/map.py

@@ -248,8 +248,8 @@ def combine_hash(x: int, y: int) -> int:
             res = combine_hash(res, hash(y))
         return res
 
-    def __getitem__(self, key: Key) -> Value:
-        return maptree.find(key, self._tree)
+    def __getitem__(self, k: Key) -> Value:
+        return maptree.find(k, self._tree)
 
     def __iter__(self) -> Iterator[Key]:
         xs = maptree.mk_iterator(self._tree)
@@ -259,14 +259,14 @@ def __len__(self) -> int:
         """Return the number of bindings in the map."""
         return maptree.size(self._tree)
 
-    def __contains__(self, key: Any) -> bool:
-        return self.contains_key(key)
+    def __contains__(self, o: Any) -> bool:
+        return self.contains_key(o)
 
-    def __eq__(self, other: Any) -> bool:
-        if not isinstance(other, Map):
+    def __eq__(self, o: Any) -> bool:
+        if not isinstance(o, Map):
             return False
 
-        other = cast(Map[Any, Any], other)
+        other = cast(Map[Any, Any], o)
         iterator: Iterator[Tuple[Any, Any]] = iter(other.to_seq())
 
         for kv in self.to_seq():

expression/collections/seq.py

@@ -26,7 +26,7 @@
 import builtins
 import functools
 import itertools
-from typing import TYPE_CHECKING, Any, Callable, Iterable, Iterator, Optional, Protocol, Tuple, TypeVar, cast, overload
+from typing import TYPE_CHECKING, Any, Callable, Iterable, Iterator, Optional, Tuple, TypeVar, cast, overload
 
 from expression.core import Case, Option, SupportsLessThan, identity, pipe
 
@@ -350,18 +350,7 @@ def __iter__(self) -> Iterator[TSource]:
         return builtins.iter(xs)
 
 
-class Projection(Protocol[TSourceIn, TResultOut]):
-    """Sequence transformation protocol.
-
-    A sequence transformation protocol that encapsulates a function of
-    type `Iterable[TSource]) -> Iterable[TResult]`
-    """
-
-    def __call__(self, __source: Iterable[TSourceIn]) -> Iterable[TResultOut]:
-        raise NotImplementedError
-
-
-def append(*others: Iterable[TSource]) -> Projection[TSource, TSource]:
+def append(*others: Iterable[TSource]) -> Callable[[Iterable[TSource]], Iterable[TSource]]:
     """Wraps the given enumerations as a single concatenated
     enumeration."""
 
@@ -371,7 +360,7 @@ def _(source: Iterable[TSource]) -> Iterable[TSource]:
     return _
 
 
-def choose(chooser: Callable[[TSource], Option[TResult]]) -> Projection[TSource, TResult]:
+def choose(chooser: Callable[[TSource], Option[TResult]]) -> Callable[[Iterable[TSource]], Iterable[TResult]]:
     """Choose items from the sequence.
 
     Applies the given function to each element of the list. Returns
@@ -395,7 +384,7 @@ def mapper(x: TSource) -> Iterable[TResult]:
     return _choose
 
 
-def collect(mapping: Callable[[TSource], Iterable[TResult]]) -> Projection[TSource, TResult]:
+def collect(mapping: Callable[[TSource], Iterable[TResult]]) -> Callable[[Iterable[TSource]], Iterable[TResult]]:
     def _collect(source: Iterable[TSource]) -> Iterable[TResult]:
         def gen():
             for xs in source:
@@ -444,7 +433,7 @@ def delay(generator: Callable[[], Iterable[TSource]]) -> Iterable[TSource]:
 """The empty sequence."""
 
 
-def filter(predicate: Callable[[TSource], bool]) -> Projection[TSource, TSource]:
+def filter(predicate: Callable[[TSource], bool]) -> Callable[[Iterable[TSource]], Iterable[TSource]]:
     """Filter sequence.
 
     Filters the sequence to a new sequence containing only the
@@ -609,7 +598,7 @@ def length(source: Seq[Any]) -> int:
     return builtins.sum(1 for _ in source)
 
 
-def map(mapper: Callable[[TSource], TResult]) -> Projection[TSource, TResult]:
+def map(mapper: Callable[[TSource], TResult]) -> Callable[[Iterable[TSource]], Iterable[TResult]]:
     """Map source sequence.
 
     Builds a new collection whose elements are the results of
@@ -641,7 +630,7 @@ def gen():
     return _map
 
 
-def mapi(mapping: Callable[[int, TSource], TResult]) -> Projection[TSource, TResult]:
+def mapi(mapping: Callable[[int, TSource], TResult]) -> Callable[[Iterable[TSource]], Iterable[TResult]]:
     """Map list with index.
 
     Builds a new collection whose elements are the results of
@@ -766,7 +755,7 @@ def singleton(item: TSource) -> Seq[TSource]:
     return Seq([item])
 
 
-def skip(count: int) -> Projection[Any, Any]:
+def skip(count: int) -> Callable[[Iterable[TSource]], Iterable[TSource]]:
     """Returns a sequence that skips N elements of the underlying
     sequence and then yields the remaining elements of the sequence.
 
@@ -809,7 +798,7 @@ def tail(source: Iterable[TSource]) -> Iterable[TSource]:
     return proj(source)
 
 
-def take(count: int) -> Projection[Any, Any]:
+def take(count: int) -> Callable[[Iterable[TSource]], Iterable[TSource]]:
     """Returns the first N elements of the sequence.
 
     Args:
@@ -932,7 +921,6 @@ def _zip(source2: Iterable[TResult]) -> Iterable[Tuple[TSource, TResult]]:
     "sum_by",
     "tail",
     "take",
-    "Projection",
     "unfold",
     "zip",
 ]

expression/core/aiotools.py

@@ -44,7 +44,7 @@ def cancel(_: OperationCanceledError) -> None:
         future.cancel()
 
     callback(done, error, cancel)
-    return asyncio.ensure_future(future)
+    return future
 
 
 def start(computation: Awaitable[Any], token: Optional[CancellationToken] = None) -> None:
@@ -66,6 +66,8 @@ def cb():
 
 
 def start_immediate(computation: Awaitable[Any], token: Optional[CancellationToken] = None) -> None:
+    """Runs an asynchronous computation, starting immediately on the
+    current operating system thread."""
     task = asyncio.create_task(computation)
 
     def cb() -> None:
@@ -99,6 +101,9 @@ async def empty() -> None:
 
 
 def from_result(result: TSource) -> Awaitable[TSource]:
+    """Creates a async operation that's completed successfully with the
+    specified result."""
+
     async def from_result(result: TSource) -> TSource:
         """Async return value"""
         return result

expression/core/choice.py

@@ -69,9 +69,9 @@ def match(cls, case: Case[A_]) -> Iterable[A_]:
     def match(cls, case: Any) -> Iterable[Any]:
         return case(cls)
 
-    def __eq__(self, other: Any) -> bool:
-        if isinstance(other, Choice1of2):
-            return self.value == other.value
+    def __eq__(self, o: Any) -> bool:
+        if isinstance(o, Choice1of2):
+            return self.value == o.value
         return False
 
     def __str__(self) -> str:
@@ -103,9 +103,9 @@ def match(cls, case: Case[B_]) -> Iterable[B_]:
     def match(cls, case: Any) -> Iterable[Any]:
         return case(cls)
 
-    def __eq__(self, other: Any) -> bool:
-        if isinstance(other, Choice2of2):
-            return self.value == other.value
+    def __eq__(self, o: Any) -> bool:
+        if isinstance(o, Choice2of2):
+            return self.value == o.value
         return False
 
     def __str__(self) -> str: