fix: typing issues of funix()

Author: luochen1990

backend/funix/decorator/__init__.py

@@ -8,7 +8,7 @@
 from inspect import getsource, isgeneratorfunction, signature
 from secrets import token_hex
 from types import ModuleType
-from typing import Callable, Optional, Union
+from typing import Callable, Optional, Union, ParamSpec, TypeVar
 from uuid import uuid4
 
 from docstring_parser import parse
@@ -195,6 +195,11 @@ def object_is_handled(app_: Flask, object_id: int) -> bool:
     return app_.name in handled_object and object_id in handled_object[app_.name]
 
 
+P = ParamSpec("P")
+R = TypeVar("R")
+
+RateLimiter = Union[Limiter, list['RateLimiter'], dict[str, 'RateLimiter'], None]
+
 def funix(
     path: Optional[str] = None,
     title: Optional[str] = None,
@@ -217,7 +222,7 @@ def funix(
     pre_fill: PreFillType = None,
     menu: Optional[str] = None,
     default: bool = False,
-    rate_limit: Union[Limiter, list, dict, None] = None,
+    rate_limit: RateLimiter = None,
     reactive: ReactiveType = None,
     print_to_web: bool = False,
     autorun: bool = False,
@@ -297,7 +302,7 @@ def funix(
     if app_.name not in handled_object:
         handled_object[app_.name] = []
 
-    def decorator(function: Callable) -> callable:
+    def decorator(function: Callable[P, R]) -> Callable[P, R]:
         """
         Decorator for functions to convert them to web apps
 

backend/funix/hint/__init__.py

@@ -23,7 +23,7 @@
 For yodas only, the destination of the page.
 """
 
-Parameters = str | tuple
+Parameters = str | tuple[str, ...]
 """
 Parameters.
 
@@ -52,9 +52,9 @@
 AcceptableWidgetsList = list(getattr(AcceptableWidgets, "__args__"))
 
 WidgetsValue = (
-    list[AcceptableWidgets | tuple[AcceptableWidgets, dict]]
+    list[AcceptableWidgets | tuple[AcceptableWidgets, dict[str, Any]]]
     | AcceptableWidgets
-    | tuple[AcceptableWidgets, dict]
+    | tuple[AcceptableWidgets, dict[str, Any]]
 )
 """
 The value of the `widgets`.
@@ -97,7 +97,7 @@
     {("a", "b"): "cell"} -> The parameter `a` and `b` are cells.
 """
 
-WhitelistValues = list[list] | list
+WhitelistValues = list[list[str]] | list[str]
 """
 The value of the `whitelist`.
 
@@ -116,7 +116,7 @@
                                               `["a", "b"]`, for `b` the whitelist is `["c", "d"]`.
 """
 
-ExamplesValues = list[list] | list
+ExamplesValues = list[list[str]] | list[str]
 """
 The value of the `examples`.
 
@@ -225,7 +225,7 @@ class ConditionalVisible(TypedDict):
     {"a": {"widget": "sheet"}} -> The parameter `a` has a widget, and the widget is `sheet`.
 """
 
-PreFillArgumentFrom = Callable | tuple[Callable, int]
+PreFillArgumentFrom = Callable[..., Any] | tuple[Callable[..., Any], int]
 """
 Pre-fill argument from.
 
@@ -245,7 +245,7 @@ class ConditionalVisible(TypedDict):
 
 PreFillEmpty = TypeVar("PreFillEmpty")
 
-ReactiveType = Optional[dict[str, Callable | tuple[Callable, dict[str, str]]]]
+ReactiveType = Optional[dict[str, Callable[..., Any] | tuple[Callable[..., Any], dict[str, str]]]]
 """
 Document is on the way
 """

backend/funix/py.typed

@@ -55,5 +55,15 @@ homepage = "https://github.com/TexteaInc/funix"
 [project.scripts]
 funix = "funix.__main__:cli_main"
 
+[tool.pyright]
+include = ["src"]
+exclude = ["**/node_modules", "**/__pycache__"]
+strict = ["src"]
+typeCheckingMode = "strict"
+
+useLibraryCodeForTypes = true
+reportMissingImports = true
+reportMissingTypeStubs = false
+
 [tool.setuptools.packages.find]
 where = ["backend"]