fix mypy issues

Author: rmorshea

src/idom/server/flask.py

@@ -25,7 +25,7 @@
 import idom
 from idom.config import IDOM_CLIENT_BUILD_DIR, IDOM_DEBUG_MODE
 from idom.core.component import AbstractComponent, ComponentConstructor
-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 .utils import threaded, wait_on_event
@@ -159,22 +159,17 @@ def _setup_single_view_dispatcher_route(
 
     @sockets.route(_join_url_paths(config["url_prefix"], "/stream"))  # type: ignore
     def model_stream(ws: WebSocket) -> None:
-        send, recv = _make_send_recv_callbacks(ws)
-        dispatch_single_view_in_thread(constructor(**_get_query_params(ws)), send, recv)
-
+        def send(value: Any) -> None:
+            ws.send(json.dumps(value))
 
-def _make_send_recv_callbacks(ws: WebSocket) -> Tuple[SendCoroutine, RecvCoroutine]:
-    def send(value: Any) -> None:
-        ws.send(json.dumps(value))
+        def recv() -> Optional[LayoutEvent]:
+            event = ws.receive()
+            if event is not None:
+                return LayoutEvent(**json.loads(event))
+            else:
+                return None
 
-    def recv() -> Optional[LayoutEvent]:
-        event = ws.receive()
-        if event is not None:
-            return LayoutEvent(**json.loads(event))
-        else:
-            return None
-
-    return send, recv
+        dispatch_single_view_in_thread(constructor(**_get_query_params(ws)), send, recv)
 
 
 def _get_query_params(ws: WebSocket) -> Dict[str, Any]:

src/idom/server/tornado.py

@@ -137,13 +137,11 @@ def _setup_common_routes(config: Config) -> _RouteHandlerSpecs:
 def _add_handler(
     app: Application, config: Config, handlers: _RouteHandlerSpecs
 ) -> None:
-    app.add_handlers(
-        r".*",
-        [
-            (urljoin(config["url_prefix"], route_pattern),) + tuple(handler_info)
-            for route_pattern, *handler_info in handlers
-        ],
-    )
+    prefixed_handlers: List[Any] = [
+        (urljoin(config["url_prefix"], route_pattern),) + tuple(handler_info)
+        for route_pattern, *handler_info in handlers
+    ]
+    app.add_handlers(r".*", prefixed_handlers)
 
 
 def _setup_single_view_dispatcher_route(

src/idom/server/utils.py

@@ -35,7 +35,7 @@ def target() -> None:
     return cast(_Func, wrapper)
 
 
-def wait_on_event(description: str, event: Event, timeout: float) -> None:
+def wait_on_event(description: str, event: Event, timeout: Optional[float]) -> None:
     if not event.wait(timeout):
         raise TimeoutError(f"Did not {description} within {timeout} seconds")