Typing fixes

Author: wch

shiny/_app.py

@@ -6,7 +6,7 @@
 from contextlib import AsyncExitStack, asynccontextmanager
 from inspect import signature
 from pathlib import Path
-from typing import Any, Callable, Optional, TypeVar, cast
+from typing import Any, Callable, Mapping, Optional, TypeVar, cast
 
 import starlette.applications
 import starlette.exceptions
@@ -113,7 +113,7 @@ def __init__(
             Callable[[Inputs], None] | Callable[[Inputs, Outputs, Session], None] | None
         ),
         *,
-        static_assets: Optional[str | Path | dict[str, str | Path]] = None,
+        static_assets: Optional[str | Path | Mapping[str, str | Path]] = None,
         debug: bool = False,
     ) -> None:
         # Used to store callbacks to be called when the app is shutting down (according
@@ -143,7 +143,7 @@ def __init__(
         if static_assets is None:
             static_assets = {}
 
-        if isinstance(static_assets, dict):
+        if isinstance(static_assets, Mapping):
             static_assets_map = {k: Path(v) for k, v in static_assets.items()}
         else:
             static_assets_map = {"/": Path(static_assets)}

shiny/express/_run.py

@@ -1,10 +1,9 @@
 from __future__ import annotations
 
 import ast
-import os
 import sys
 from pathlib import Path
-from typing import cast
+from typing import Mapping, cast
 
 from htmltools import Tag, TagList
 
@@ -200,9 +199,7 @@ class AppOpts(TypedDict):
 
 @no_example()
 def app_opts(
-    static_assets: (
-        str | os.PathLike[str] | dict[str, str | Path] | MISSING_TYPE
-    ) = MISSING,
+    static_assets: str | Path | Mapping[str, str | Path] | MISSING_TYPE = MISSING,
     debug: bool | MISSING_TYPE = MISSING,
 ):
     """
@@ -230,7 +227,7 @@ def app_opts(
         return
 
     if not isinstance(static_assets, MISSING_TYPE):
-        if isinstance(static_assets, (str, os.PathLike)):
+        if isinstance(static_assets, (str, Path)):
             static_assets = {"/": Path(static_assets)}
 
         # Convert string values to Paths. (Need new var name to help type checker.)