Upgrade pyright

Author: dbrattli

.pre-commit-config.yaml

@@ -14,7 +14,7 @@ repos:
         language: node
         pass_filenames: false
         types: [python]
-        additional_dependencies: ["pyright@1.1.388"]
+        additional_dependencies: ["pyright@1.1.407"]
     repo: local
   - hooks:
       - id: mypy

reactivex/notification.py

@@ -1,6 +1,6 @@
 from abc import abstractmethod
 from collections.abc import Callable
-from typing import Any, Generic, TypeVar
+from typing import Any, Generic, TypeVar, cast
 
 from reactivex import abc, typing
 from reactivex.scheduler import ImmediateScheduler
@@ -44,7 +44,7 @@ def accept(
             Result produced by the observation."""
 
         if isinstance(on_next, abc.ObserverBase):
-            return self._accept_observer(on_next)
+            return self._accept_observer(cast(abc.ObserverBase[_T], on_next))
 
         return self._accept(on_next, on_error, on_completed)
 

reactivex/observable/zip.py

@@ -1,6 +1,6 @@
 from asyncio import Future
 from threading import RLock
-from typing import Any
+from typing import Any, cast
 
 from reactivex import Observable, abc, from_future
 from reactivex.disposable import CompositeDisposable, SingleAssignmentDisposable
@@ -67,7 +67,8 @@ def completed(i: int) -> None:
         def func(i: int) -> None:
             source: Observable[Any] = sources[i]
             if isinstance(source, Future):
-                source = from_future(source)
+                source_ = cast(Future[Any], source)
+                source = from_future(source_)
 
             sad = SingleAssignmentDisposable()
 

reactivex/operators/_combinelatest.py

@@ -1,5 +1,5 @@
 from collections.abc import Callable
-from typing import Any
+from typing import Any, cast
 
 import reactivex
 from reactivex import Observable
@@ -8,7 +8,7 @@
 def combine_latest_(
     *others: Observable[Any],
 ) -> Callable[[Observable[Any]], Observable[Any]]:
-    def combine_latest(source: Observable[Any]) -> Observable[Any]:
+    def combine_latest(source: Observable[Any]) -> Observable[tuple[Any, ...]]:
         """Merges the specified observable sequences into one
         observable sequence by creating a tuple whenever any
         of the observable sequences produces an element.
@@ -21,9 +21,12 @@ def combine_latest(source: Observable[Any]) -> Observable[Any]:
             elements of the sources into a tuple.
         """
 
-        sources = (source,) + others
+        sources: tuple[Observable[Any], ...] = (source, *others)
 
-        return reactivex.combine_latest(*sources)
+        ret: Observable[tuple[Any, ...]] = cast(
+            Observable[tuple[Any, ...]], reactivex.combine_latest(*sources)
+        )
+        return ret
 
     return combine_latest
 

reactivex/operators/_delaywithmapper.py

@@ -1,5 +1,5 @@
 from collections.abc import Callable
-from typing import Any, TypeVar
+from typing import Any, TypeVar, cast
 
 from reactivex import Observable, abc, typing
 from reactivex.disposable import (
@@ -39,7 +39,7 @@ def delay_with_mapper(source: Observable[_T]) -> Observable[_T]:
 
         if isinstance(subscription_delay, abc.ObservableBase):
             mapper = delay_duration_mapper
-            sub_delay = subscription_delay
+            sub_delay = cast(Observable[Any], subscription_delay)
         else:
             mapper = subscription_delay
 

reactivex/operators/_flatmap.py

@@ -27,7 +27,7 @@ def projection(x: _T1, i: int) -> Observable[Any]:
         if isinstance(mapper_result, Future):
             result: Observable[Any] = from_future(cast("Future[Any]", mapper_result))
         elif isinstance(mapper_result, Observable):
-            result = mapper_result
+            result = cast(Observable[Any], mapper_result)
         else:
             result = from_(mapper_result)
         return result

reactivex/operators/_forkjoin.py

@@ -1,5 +1,5 @@
 from collections.abc import Callable
-from typing import Any
+from typing import Any, cast
 
 import reactivex
 from reactivex import Observable
@@ -21,7 +21,7 @@ def fork_join(source: Observable[Any]) -> Observable[tuple[Any, ...]]:
             An observable sequence containing the result of combining
             last element from each source in given sequence.
         """
-        return reactivex.fork_join(source, *args)
+        return cast(Observable[tuple[Any, ...]], reactivex.fork_join(source, *args))
 
     return fork_join
 

reactivex/testing/marbles.py

@@ -1,6 +1,6 @@
 from collections.abc import Generator
 from contextlib import contextmanager
-from typing import Any, NamedTuple
+from typing import Any, NamedTuple, cast
 from warnings import warn
 
 import reactivex
@@ -104,7 +104,7 @@ def test_start(
         check()
 
         if isinstance(create, Observable):
-            create_: Observable[Any] = create
+            create_ = cast(Observable[Any], create)
 
             def default_create() -> Observable[Any]:
                 return create_