fix type annotations

Author: rmorshea

src/idom/core/dispatcher.py

@@ -37,25 +37,26 @@ async def dispatch_single_view(
             task_group.start_soon(_single_incoming_loop, layout, recv)
 
 
-_SharedDispatchFuture = Callable[[SendCoroutine, RecvCoroutine], Future]
+_SharedViewDispatcherFuture = Callable[[SendCoroutine, RecvCoroutine], Future[None]]
+_SharedViewDispatcherCoro = Callable[[SendCoroutine, RecvCoroutine], Awaitable[None]]
 
 
 @asynccontextmanager
 async def create_shared_view_dispatcher(
     layout: Layout, run_forever: bool = False
-) -> AsyncIterator[_SharedDispatchFuture]:
+) -> AsyncIterator[_SharedViewDispatcherFuture]:
     with layout:
         (
             dispatch_shared_view,
             model_state,
             all_update_queues,
         ) = await _make_shared_view_dispatcher(layout)
 
-        dispatch_tasks: List[Future] = []
+        dispatch_tasks: List[Future[None]] = []
 
         def dispatch_shared_view_soon(
             send: SendCoroutine, recv: RecvCoroutine
-        ) -> Future:
+        ) -> Future[None]:
             future = ensure_future(dispatch_shared_view(send, recv))
             dispatch_tasks.append(future)
             return future
@@ -87,10 +88,10 @@ def dispatch_shared_view_soon(
 
 def ensure_shared_view_dispatcher_future(
     layout: Layout,
-) -> Tuple[Future, _SharedDispatchFuture]:
-    dispatcher_future = Future()
+) -> Tuple[Future[None], _SharedViewDispatcherCoro]:
+    dispatcher_future: Future[_SharedViewDispatcherCoro] = Future()
 
-    async def dispatch_shared_view_forever():
+    async def dispatch_shared_view_forever() -> None:
         with layout:
             (
                 dispatch_shared_view,
@@ -113,12 +114,9 @@ async def dispatch(send: SendCoroutine, recv: RecvCoroutine) -> None:
     return ensure_future(dispatch_shared_view_forever()), dispatch
 
 
-_SharedDispatchCoroutine = Callable[[SendCoroutine, RecvCoroutine], Awaitable[None]]
-
-
 async def _make_shared_view_dispatcher(
     layout: Layout,
-) -> Tuple[_SharedDispatchCoroutine, Ref[Any], WeakSet[Queue[LayoutUpdate]]]:
+) -> Tuple[_SharedViewDispatcherCoro, Ref[Any], WeakSet[Queue[LayoutUpdate]]]:
     initial_update = await layout.render()
     model_state = Ref(initial_update.apply_to({}))
 
@@ -158,7 +156,7 @@ async def _shared_outgoing_loop(
 
 async def _wait_until_first_complete(
     *tasks: Awaitable[Any],
-) -> Sequence[Future]:
+) -> Sequence[Future[Any]]:
     futures = [ensure_future(t) for t in tasks]
     await wait(futures, return_when=FIRST_COMPLETED)
     return futures

src/idom/core/layout.py

@@ -47,7 +47,7 @@ class LayoutEvent(NamedTuple):
     """A list of event data passed to the event handler."""
 
 
-_Self = TypeVar("_Self")
+_Self = TypeVar("_Self", bound="Layout")
 
 
 class Layout:

src/idom/server/fastapi.py

@@ -3,9 +3,8 @@
 import logging
 import sys
 import time
-from asyncio.futures import Future
 from threading import Event, Thread
-from typing import Any, Awaitable, Callable, Dict, Optional, Tuple, Union
+from typing import Any, Dict, Optional, Tuple, Union
 
 from fastapi import APIRouter, FastAPI, Request, WebSocket
 from fastapi.middleware.cors import CORSMiddleware
@@ -162,6 +161,11 @@ def _run_application_in_thread(
         # uvicorn does the event loop setup for us
         self._run_application(config, app, host, port, args, kwargs)
 
+    async def _run_dispatcher(
+        self, send: SendCoroutine, recv: RecvCoroutine, params: Dict[str, Any]
+    ) -> None:
+        raise NotImplementedError()
+
 
 class PerClientStateServer(FastApiRenderServer):
     """Each client view will have its own state."""
@@ -182,9 +186,6 @@ async def _run_dispatcher(
 class SharedClientStateServer(FastApiRenderServer):
     """All connected client views will have shared state."""
 
-    _dispatch_daemon_future: Future
-    _dispatch_coroutine: Callable[[SendCoroutine, RecvCoroutine], Awaitable[None]]
-
     def _setup_application(self, config: Config, app: FastAPI) -> None:
         app.on_event("startup")(self._activate_dispatcher)
         app.on_event("shutdown")(self._deactivate_dispatcher)

src/idom/server/flask.py

@@ -19,7 +19,7 @@
 import idom
 from idom.config import IDOM_CLIENT_BUILD_DIR
 from idom.core.component import AbstractComponent
-from idom.core.dispatcher import RecvCoroutine, SendCoroutine, dispatch_single_view
+from idom.core.dispatcher import dispatch_single_view
 from idom.core.layout import LayoutEvent, LayoutUpdate
 
 from .base import AbstractRenderServer
@@ -171,24 +171,32 @@ def _generic_run_application(
         self._wsgi_server.serve_forever()
 
     def _run_dispatcher(
-        self, query_params: Dict[str, Any], send: SendCoroutine, recv: RecvCoroutine
-    ):
+        self,
+        query_params: Dict[str, Any],
+        send: Callable[[Any], None],
+        recv: Callable[[], Optional[LayoutEvent]],
+    ) -> None:
         raise NotImplementedError()
 
 
 class PerClientStateServer(FlaskRenderServer):
     """Each client view will have its own state."""
 
     def _run_dispatcher(
-        self, query_params: Dict[str, Any], send: SendCoroutine, recv: RecvCoroutine
-    ):
+        self,
+        query_params: Dict[str, Any],
+        send: Callable[[Any], None],
+        recv: Callable[[], Optional[LayoutEvent]],
+    ) -> None:
         dispatch_single_view_in_thread(
             self._root_component_constructor(**query_params), send, recv
         )
 
 
 def dispatch_single_view_in_thread(
-    component: AbstractComponent, send: SendCoroutine, recv: RecvCoroutine
+    component: AbstractComponent,
+    send: Callable[[Any], None],
+    recv: Callable[[], Optional[LayoutEvent]],
 ) -> None:
     dispatch_thread_info_created = ThreadEvent()
     dispatch_thread_info_ref: idom.Ref[Optional[_DispatcherThreadInfo]] = idom.Ref(None)

src/idom/server/sanic.py

@@ -1,7 +1,7 @@
 import asyncio
 import json
 from threading import Event
-from typing import Any, Awaitable, Callable, Dict, Optional, Tuple, Union
+from typing import Any, Dict, Optional, Tuple, Union
 
 from mypy_extensions import TypedDict
 from sanic import Blueprint, Sanic, request, response
@@ -108,6 +108,11 @@ def redirect_to_index(
                         f"{blueprint.url_prefix}/client/index.html?{request.query_string}"
                     )
 
+    async def _run_dispatcher(
+        self, send: SendCoroutine, recv: RecvCoroutine, params: Dict[str, Any]
+    ) -> None:
+        raise NotImplementedError()
+
     def _run_application(
         self,
         config: Config,
@@ -182,9 +187,6 @@ async def _run_dispatcher(
 class SharedClientStateServer(SanicRenderServer):
     """All connected client views will have shared state."""
 
-    _dispatch_daemon_future: asyncio.Future
-    _dispatch_coroutine: Callable[[SendCoroutine, RecvCoroutine], Awaitable[None]]
-
     def _setup_application(self, config: Config, app: Sanic) -> None:
         app.register_listener(self._activate_dispatcher, "before_server_start")
         app.register_listener(self._deactivate_dispatcher, "before_server_stop")

src/idom/server/tornado.py

@@ -129,8 +129,8 @@ def _run_application_in_thread(
 class PerClientStateModelStreamHandler(WebSocketHandler):
     """A web-socket handler that serves up a new model stream to each new client"""
 
-    _dispatch_future: Future
-    _message_queue: "AsyncQueue[str]"
+    _dispatch_future: Future[None]
+    _message_queue: AsyncQueue[str]
 
     def initialize(self, component_constructor: ComponentConstructor) -> None:
         self._component_constructor = component_constructor