Merge pull request #228 from aiokitchen/threaded-typing

Threaded typing

Author: mosquito

.github/workflows/publish.yml

@@ -13,10 +13,10 @@ jobs:
 
       - uses: actions/checkout@v2
 
-      - name: Setup python3.9
+      - name: Setup python3.10
         uses: actions/setup-python@v2
         with:
-          python-version: "3.9"
+          python-version: "3.10"
 
       - name: Resetting git to master
         run: git reset --hard master

.github/workflows/tests.yml

@@ -55,7 +55,6 @@ jobs:
 
       matrix:
         python:
-          - '3.9'
           - '3.10'
           - '3.11'
           - '3.12'
@@ -117,7 +116,6 @@ jobs:
 
       matrix:
         python:
-          - '3.9'
           - '3.10'
           - '3.11'
     steps:

aiomisc/entrypoint.py

@@ -419,7 +419,7 @@ def _on_interrupt(self, loop: asyncio.AbstractEventLoop) -> None:
         handle = loop.call_later(self.shutdown_timeout, task.cancel)
 
         def on_shutdown_finish(task: asyncio.Future) -> None:
-            nonlocal handle, loop
+            nonlocal handle, loop   # noqa
 
             if task.cancelled():
                 log.warning(

aiomisc/iterator_wrapper.py

@@ -9,7 +9,7 @@
 from types import TracebackType
 from typing import (
     Any, AsyncIterator, Awaitable, Callable, Deque, Generator, NoReturn,
-    Optional, Type, TypeVar, Union,
+    Optional, Type, TypeVar, Union, Generic, ParamSpec,
 )
 from weakref import finalize
 
@@ -19,8 +19,9 @@
 
 T = TypeVar("T")
 R = TypeVar("R")
+P = ParamSpec("P")
 
-GenType = Generator[T, R, None]
+GenType = Generator[T, None, None]
 FuncType = Callable[[], GenType]
 
 
@@ -144,7 +145,7 @@ class IteratorWrapperStatistic(Statistic):
     enqueued: int
 
 
-class IteratorWrapper(AsyncIterator, EventLoopMixin):
+class IteratorWrapper(Generic[P, T], AsyncIterator, EventLoopMixin):
     __slots__ = (
         "__channel",
         "__close_event",
@@ -155,9 +156,11 @@ class IteratorWrapper(AsyncIterator, EventLoopMixin):
     ) + EventLoopMixin.__slots__
 
     def __init__(
-        self, gen_func: FuncType,
+        self,
+        gen_func: Callable[P, Generator[T, None, None]],
         loop: Optional[asyncio.AbstractEventLoop] = None,
-        max_size: int = 0, executor: Optional[Executor] = None,
+        max_size: int = 0,
+        executor: Optional[Executor] = None,
         statistic_name: Optional[str] = None,
     ):
 
@@ -227,11 +230,9 @@ async def wait_closed(self) -> None:
             await asyncio.gather(self.__gen_task, return_exceptions=True)
 
     def _run(self) -> Any:
-        return self.loop.run_in_executor(
-            self.executor, self._in_thread,
-        )
+        return self.loop.run_in_executor(self.executor, self._in_thread)
 
-    def __aiter__(self) -> AsyncIterator[Any]:
+    def __aiter__(self) -> AsyncIterator[T]:
         if not self.loop.is_running():
             raise RuntimeError("Event loop is not running")
 
@@ -242,7 +243,7 @@ def __aiter__(self) -> AsyncIterator[Any]:
             self.__gen_task = gen_task
         return IteratorProxy(self, self.close)
 
-    async def __anext__(self) -> Awaitable[T]:
+    async def __anext__(self) -> T:
         try:
             item, is_exc = await self.__channel.get()
         except ChannelClosed:
@@ -269,13 +270,13 @@ async def __aexit__(
         await self.close()
 
 
-class IteratorProxy(AsyncIterator):
+class IteratorProxy(Generic[T], AsyncIterator):
     def __init__(
-        self, iterator: AsyncIterator,
+        self, iterator: AsyncIterator[T],
         finalizer: Callable[[], Any],
     ):
         self.__iterator = iterator
         finalize(self, finalizer)
 
-    def __anext__(self) -> Awaitable[Any]:
+    def __anext__(self) -> Awaitable[T]:
         return self.__iterator.__anext__()

aiomisc/service/base.py

@@ -1,15 +1,13 @@
 import asyncio
 from abc import ABC, ABCMeta, abstractmethod
-from typing import (
-    Any, Coroutine, Dict, Generator, Optional, Set, Tuple, TypeVar, Union,
-)
+from typing import Any, Coroutine, Dict, Optional, Set, Tuple, TypeVar, Union
 
 from ..context import Context, get_context
 from ..utils import cancel_tasks
 
 
 T = TypeVar("T")
-CoroutineType = Union[Coroutine[Any, Any, T], Generator[Any, None, T]]
+CoroutineType = Union[Coroutine[Any, Any, T]]
 
 
 class ServiceMeta(ABCMeta):