chore(pyright): Prep pyright version for release; pyright >= v1.1.407 (#2120)

Author: schloerke

pyproject.toml

@@ -101,7 +101,7 @@ dev = [
     "isort>=5.10.1",
     "libsass>=0.23.0",
     "brand_yml>=0.1.0",
-    "pyright==1.1.398",
+    "pyright>=1.1.407",
     "pre-commit>=2.15.0",
     "wheel",
     "matplotlib",

shiny/_main_create.py

@@ -87,8 +87,15 @@ class ShinyTemplate:
     type: str = "app"
     title: str | None = None
     description: str | None = None
-    next_steps: list[str] = field(default_factory=list)
-    follow_up: list[ShinyTemplateFollowUp] = field(default_factory=list)
+    next_steps: list[str] = field(  # pyright: ignore[reportUnknownVariableType]
+        default_factory=list
+    )
+    # Black can't handle this line properly
+    # It should have `# pyright: ignore[reportUnknownVariableType]` but
+    # pyright gets confused with the comment in the middle of an expression
+    follow_up: list[ShinyTemplateFollowUp] = field(  # pyright: ignore
+        default_factory=list
+    )
     _express_available: bool | None = None
 
     @property

shiny/express/expressify_decorator/_expressify.py

@@ -51,7 +51,7 @@ class WrappedFunction(Protocol):
 
 def unwrap(fn: TFunc) -> TFunc:
     while isinstance(fn, WrappedFunction):
-        fn = fn.__wrapped__
+        fn = fn.__wrapped__  # pyright: ignore[reportAssignmentType]
     return fn
 
 

shiny/reactive/_poll.py

@@ -273,22 +273,31 @@ def file_reader(
     if isinstance(filepath, str):
         # Normalize filepath so it's always a function
 
-        filepath_value = filepath
+        filepath_str_value: str = filepath
 
         def filepath_func_str() -> str:
-            return filepath_value
+            return filepath_str_value
 
-        filepath = filepath_func_str
+        filepath_fn = filepath_func_str
     elif isinstance(filepath, os.PathLike):
-        filepath_value = filepath
+        # Can't use `# pyright: ignore[reportUnknownVariableType]` on the line below as
+        # Black can't format it properly
+        filepath_path_value: os.PathLike[str] = filepath  # pyright: ignore
 
         def filepath_func_pathlike() -> os.PathLike[str]:
-            return filepath_value
+            return filepath_path_value
 
-        filepath = filepath_func_pathlike
+        filepath_fn = filepath_func_pathlike
+    elif callable(filepath):
+        filepath_fn = filepath
+    else:
+        raise TypeError(
+            "`filepath` argument to reactive.file_reader() must be a str, "
+            "os.PathLike, or a no-argument function that returns one of those types."
+        )
 
     def check_timestamp():
-        path = filepath()
+        path = filepath_fn()
         return (path, os.path.getmtime(path), os.path.getsize(path))
 
     def wrapper(fn: Callable[[], T]) -> Callable[[], T]:

shiny/render/_data_frame_utils/_reactive_method.py

@@ -106,9 +106,12 @@ def calc_fn():
             # be garbage collected until `self` is garbage collected.
             if not hasattr(self.__dict__, "_reactive_calc_method"):
                 self.__dict__["_reactive_calc_method"] = {}
-            self_reactive_calc_cache: dict[str, reactive.Calc_[R]] = self.__dict__[
-                "_reactive_calc_method"
-            ]
+
+            # Can't use `# pyright: ignore[reportUnknownVariableType]` on the line below
+            # as Black can't format it properly
+            self_reactive_calc_cache: dict[str, reactive.Calc_[R]] = (  # type: ignore
+                self.__dict__["_reactive_calc_method"]
+            )
             if hasattr(self_reactive_calc_cache, fn.__name__):
                 raise AttributeError(
                     f"Reactive calc method `{fn.__name__}` has already be cached on self: {self}"

shiny/ui/_theme_brand.py

@@ -6,6 +6,7 @@
 
 if TYPE_CHECKING:
     from brand_yml import Brand
+
 from htmltools import HTMLDependency
 
 from .._versions import bootstrap as v_bootstrap
@@ -80,7 +81,7 @@ def _validate_defaults(self, x: Any) -> dict[str, YamlScalarType] | None:
                 f"Invalid brand `{self._path}.defaults`, must be a dictionary."
             )
 
-        y: dict[Any, Any] = x
+        y: dict[Any, Any] = x  # pyright: ignore[reportUnknownVariableType]
 
         if not all([isinstance(k, str) for k in y.keys()]):
             raise ValueError(

tests/playwright/shiny/inputs/input_file/app.py

@@ -55,7 +55,8 @@ def summary():
 
         # input.stats() is a list of strings; subset the columns based on the selected
         # checkboxes
-        return info_df.loc[:, input.stats()]
+        stats_cols: list[str] = input.stats()
+        return info_df.loc[:, stats_cols]
 
     @render.text
     def file2_info():