fix cov

Author: rmorshea

src/idom/server/flask.py

@@ -9,7 +9,7 @@
 from queue import Queue as ThreadQueue
 from threading import Event as ThreadEvent
 from threading import Thread
-from typing import Any, Callable, Dict, NamedTuple, Optional, Union, cast
+from typing import Any, Callable, Dict, NamedTuple, NoReturn, Optional, Union, cast
 
 from flask import (
     Blueprint,
@@ -84,13 +84,12 @@ async def serve_development_app(
 
     server: Ref[BaseWSGIServer] = Ref()
 
-    def run_server() -> None:  # pragma: no cover
-        # we don't cover this function because coverage doesn't work right in threads
+    def run_server() -> None:
         server.current = make_server(host, port, app, threaded=True)
         if started:
             loop.call_soon_threadsafe(started.set)
         try:
-            server.current.serve_forever()
+            server.current.serve_forever()  # type: ignore
         finally:
             loop.call_soon_threadsafe(stopped.set)
 
@@ -178,12 +177,8 @@ def model_stream(ws: WebSocket, path: str = "") -> None:
         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() -> LayoutEvent:
+            return LayoutEvent(**json.loads(ws.receive()))
 
         dispatch_in_thread(ws, path, constructor(), send, recv)
 
@@ -197,7 +192,7 @@ def dispatch_in_thread(
     component: ComponentType,
     send: Callable[[Any], None],
     recv: Callable[[], Optional[LayoutEvent]],
-) -> None:
+) -> NoReturn:
     dispatch_thread_info_created = ThreadEvent()
     dispatch_thread_info_ref: idom.Ref[Optional[_DispatcherThreadInfo]] = idom.Ref(None)
 
@@ -255,21 +250,14 @@ def run_send() -> None:
     try:
         while True:
             value = recv()
-            if value is None:
-                stop.set()
-                break
-            # BUG: https://github.com/nedbat/coveragepy/issues/1012
-            # Coverage isn't able to support concurrency coverage for both threading and gevent
-            dispatch_thread_info.dispatch_loop.call_soon_threadsafe(  # pragma: no cover
+            dispatch_thread_info.dispatch_loop.call_soon_threadsafe(
                 dispatch_thread_info.async_recv_queue.put_nowait, value
             )
     finally:
         dispatch_thread_info.dispatch_loop.call_soon_threadsafe(
             dispatch_thread_info.dispatch_future.cancel
         )
 
-    return None
-
 
 @dataclass
 class Connection:
@@ -290,9 +278,3 @@ class _DispatcherThreadInfo(NamedTuple):
     dispatch_future: "asyncio.Future[Any]"
     thread_send_queue: "ThreadQueue[LayoutUpdate]"
     async_recv_queue: "AsyncQueue[LayoutEvent]"
-
-
-def _join_url_paths(*args: str) -> str:
-    # urllib.parse.urljoin performs more logic than is needed. Thus we need a util func
-    # to join paths as if they were POSIX paths.
-    return "/".join(map(lambda x: str(x).rstrip("/"), filter(None, args)))

src/idom/server/sanic.py

@@ -32,8 +32,8 @@
 
 logger = logging.getLogger(__name__)
 
-ConnectionContext: type[Context[request.Request | None]] = create_context(
-    None, "RequestContext"
+ConnectionContext: type[Context[Connection | None]] = create_context(
+    None, "ConnectionContext"
 )
 
 
@@ -69,12 +69,12 @@ async def serve_development_app(
 
 def use_connection() -> Connection:
     """Get the current :class:`Connection`"""
-    request = use_context(ConnectionContext)
-    if request is None:
+    connection = use_context(ConnectionContext)
+    if connection is None:
         raise RuntimeError(  # pragma: no cover
-            "No request. Are you running with a Sanic server?"
+            "No connection. Are you running with a Sanic server?"
         )
-    return request
+    return connection
 
 
 def use_scope() -> ASGIScope:
@@ -112,17 +112,17 @@ def _setup_common_routes(blueprint: Blueprint, options: Options) -> None:
 
     if options.serve_static_files:
 
-        @blueprint.route("/")
-        @blueprint.route("/<path:path>")
         async def single_page_app_files(
-            request: request.Request, path: str = ""
+            request: request.Request,
+            path: str = "",
         ) -> response.HTTPResponse:
             path = urllib_parse.unquote(path)
             return await response.file(CLIENT_BUILD_DIR / client_build_dir_path(path))
 
-        @blueprint.route("/_api/modules/<path:path>")
-        @blueprint.route("/<_:path>/_api/modules/<path:path>")
-        async def single_page_app_files(
+        blueprint.add_route(single_page_app_files, "/")
+        blueprint.add_route(single_page_app_files, "/<path:path>")
+
+        async def web_module_files(
             request: request.Request,
             path: str,
             _: str = "",  # this is not used
@@ -131,12 +131,13 @@ async def single_page_app_files(
             path = urllib_parse.unquote(path)
             return await response.file(wm_dir.joinpath(*path.split("/")))
 
+        blueprint.add_route(web_module_files, "/_api/modules/<path:path>")
+        blueprint.add_route(web_module_files, "/<_:path>/_api/modules/<path:path>")
+
 
 def _setup_single_view_dispatcher_route(
     blueprint: Blueprint, constructor: RootComponentConstructor
 ) -> None:
-    @blueprint.websocket("/_api/stream")
-    @blueprint.websocket("/<path:path>/_api/stream")  # type: ignore
     async def model_stream(
         request: request.Request, socket: WebSocketCommonProtocol, path: str = ""
     ) -> None:
@@ -148,6 +149,9 @@ async def model_stream(
             recv,
         )
 
+    blueprint.add_websocket_route(model_stream, "/_api/stream")
+    blueprint.add_websocket_route(model_stream, "/<path:path>/_api/stream")
+
 
 @dataclass
 class Connection:

src/idom/server/tornado.py

@@ -177,7 +177,7 @@ class ModelStreamHandler(WebSocketHandler):
     def initialize(self, component_constructor: ComponentConstructor) -> None:
         self._component_constructor = component_constructor
 
-    async def open(self, *args, **kwargs) -> None:
+    async def open(self, *args: Any, **kwargs: Any) -> None:
         message_queue: "AsyncQueue[str]" = AsyncQueue()
 
         async def send(value: VdomJsonPatch) -> None: