From 6df5cfe43be5ec97b9a5f0e918d5998c0a4473c1 Mon Sep 17 00:00:00 2001 From: Khaleel Al-Adhami Date: Tue, 18 Feb 2025 15:31:07 -0800 Subject: [PATCH] remove somehow even more optionals --- reflex/components/base/document.pyi | 2 +- reflex/components/base/meta.pyi | 30 +++++++++---------- reflex/components/core/upload.pyi | 6 ++-- reflex/components/datadisplay/code.pyi | 4 +-- reflex/components/next/video.pyi | 2 +- reflex/components/radix/primitives/drawer.pyi | 4 +-- .../components/radix/primitives/progress.pyi | 12 ++++---- reflex/components/radix/themes/base.pyi | 2 +- reflex/components/radix/themes/color_mode.pyi | 4 +-- .../radix/themes/components/slider.pyi | 2 +- reflex/components/sonner/toast.pyi | 2 +- reflex/experimental/layout.pyi | 6 ++-- reflex/testing.py | 12 ++++---- reflex/utils/pyi_generator.py | 4 +-- 14 files changed, 46 insertions(+), 46 deletions(-) diff --git a/reflex/components/base/document.pyi b/reflex/components/base/document.pyi index 4aa45ea04..f3f2aa0ef 100644 --- a/reflex/components/base/document.pyi +++ b/reflex/components/base/document.pyi @@ -62,7 +62,7 @@ class Html(NextDocumentLib): def create( # type: ignore cls, *children, - lang: Optional[str] = None, + lang: str | None = None, style: Style | None = None, key: Any | None = None, id: Any | None = None, diff --git a/reflex/components/base/meta.pyi b/reflex/components/base/meta.pyi index df9c1d7ff..ad2bd9065 100644 --- a/reflex/components/base/meta.pyi +++ b/reflex/components/base/meta.pyi @@ -63,11 +63,11 @@ class Meta(Component): def create( # type: ignore cls, *children, - char_set: Optional[str] = None, - content: Optional[str] = None, - name: Optional[str] = None, - property: Optional[str] = None, - http_equiv: Optional[str] = None, + char_set: str | None = None, + content: str | None = None, + name: str | None = None, + property: str | None = None, + http_equiv: str | None = None, style: Style | None = None, key: Any | None = None, id: Any | None = None, @@ -119,11 +119,11 @@ class Description(Meta): def create( # type: ignore cls, *children, - name: Optional[str] = None, - char_set: Optional[str] = None, - content: Optional[str] = None, - property: Optional[str] = None, - http_equiv: Optional[str] = None, + name: str | None = None, + char_set: str | None = None, + content: str | None = None, + property: str | None = None, + http_equiv: str | None = None, style: Style | None = None, key: Any | None = None, id: Any | None = None, @@ -175,11 +175,11 @@ class Image(Meta): def create( # type: ignore cls, *children, - property: Optional[str] = None, - char_set: Optional[str] = None, - content: Optional[str] = None, - name: Optional[str] = None, - http_equiv: Optional[str] = None, + property: str | None = None, + char_set: str | None = None, + content: str | None = None, + name: str | None = None, + http_equiv: str | None = None, style: Style | None = None, key: Any | None = None, id: Any | None = None, diff --git a/reflex/components/core/upload.pyi b/reflex/components/core/upload.pyi index 7356505c7..039a529f9 100644 --- a/reflex/components/core/upload.pyi +++ b/reflex/components/core/upload.pyi @@ -139,7 +139,7 @@ class Upload(MemoizationLeaf): def create( # type: ignore cls, *children, - accept: Var[Optional[dict[str, List]]] | dict[str, List] | None = None, + accept: Var[dict[str, List] | None] | dict[str, List] | None = None, disabled: Var[bool] | bool | None = None, max_files: Var[int] | int | None = None, max_size: Var[int] | int | None = None, @@ -205,7 +205,7 @@ class StyledUpload(Upload): def create( # type: ignore cls, *children, - accept: Var[Optional[dict[str, List]]] | dict[str, List] | None = None, + accept: Var[dict[str, List] | None] | dict[str, List] | None = None, disabled: Var[bool] | bool | None = None, max_files: Var[int] | int | None = None, max_size: Var[int] | int | None = None, @@ -271,7 +271,7 @@ class UploadNamespace(ComponentNamespace): @staticmethod def __call__( *children, - accept: Var[Optional[dict[str, List]]] | dict[str, List] | None = None, + accept: Var[dict[str, List] | None] | dict[str, List] | None = None, disabled: Var[bool] | bool | None = None, max_files: Var[int] | int | None = None, max_size: Var[int] | int | None = None, diff --git a/reflex/components/datadisplay/code.pyi b/reflex/components/datadisplay/code.pyi index 9b73bbb8d..753042987 100644 --- a/reflex/components/datadisplay/code.pyi +++ b/reflex/components/datadisplay/code.pyi @@ -927,7 +927,7 @@ class CodeBlock(Component, MarkdownComponentMap): wrap_long_lines: Var[bool] | bool | None = None, custom_style: dict[str, str | Var | Color] | None = None, code_tag_props: Var[dict[str, str]] | dict[str, str] | None = None, - can_copy: Optional[bool] = None, + can_copy: bool | None = None, copy_button: Component | bool | None = None, style: Style | None = None, key: Any | None = None, @@ -1562,7 +1562,7 @@ class CodeblockNamespace(ComponentNamespace): wrap_long_lines: Var[bool] | bool | None = None, custom_style: dict[str, str | Var | Color] | None = None, code_tag_props: Var[dict[str, str]] | dict[str, str] | None = None, - can_copy: Optional[bool] = None, + can_copy: bool | None = None, copy_button: Component | bool | None = None, style: Style | None = None, key: Any | None = None, diff --git a/reflex/components/next/video.pyi b/reflex/components/next/video.pyi index 126eaef14..e5acd81ab 100644 --- a/reflex/components/next/video.pyi +++ b/reflex/components/next/video.pyi @@ -19,7 +19,7 @@ class Video(NextComponent): cls, *children, src: Var[str] | str | None = None, - as_: Optional[Component] = None, + as_: Component | None = None, style: Style | None = None, key: Any | None = None, id: Any | None = None, diff --git a/reflex/components/radix/primitives/drawer.pyi b/reflex/components/radix/primitives/drawer.pyi index 78f92dbf7..5075e435b 100644 --- a/reflex/components/radix/primitives/drawer.pyi +++ b/reflex/components/radix/primitives/drawer.pyi @@ -75,7 +75,7 @@ class DrawerRoot(DrawerComponent): | None = None, dismissible: Var[bool] | bool | None = None, handle_only: Var[bool] | bool | None = None, - snap_points: Optional[list[float | str]] = None, + snap_points: list[float | str] | None = None, fade_from_index: Var[int] | int | None = None, scroll_lock_timeout: Var[int] | int | None = None, prevent_scroll_restoration: Var[bool] | bool | None = None, @@ -554,7 +554,7 @@ class Drawer(ComponentNamespace): | None = None, dismissible: Var[bool] | bool | None = None, handle_only: Var[bool] | bool | None = None, - snap_points: Optional[list[float | str]] = None, + snap_points: list[float | str] | None = None, fade_from_index: Var[int] | int | None = None, scroll_lock_timeout: Var[int] | int | None = None, prevent_scroll_restoration: Var[bool] | bool | None = None, diff --git a/reflex/components/radix/primitives/progress.pyi b/reflex/components/radix/primitives/progress.pyi index 73de7b865..553c12ac5 100644 --- a/reflex/components/radix/primitives/progress.pyi +++ b/reflex/components/radix/primitives/progress.pyi @@ -119,8 +119,8 @@ class ProgressIndicator(ProgressComponent): def create( # type: ignore cls, *children, - value: Var[Optional[int]] | int | None = None, - max: Var[Optional[int]] | int | None = None, + value: Var[int | None] | int | None = None, + max: Var[int | None] | int | None = None, color_scheme: Literal[ "amber", "blue", @@ -290,8 +290,8 @@ class Progress(ProgressRoot): ] ] | None = None, - value: Var[Optional[int]] | int | None = None, - max: Var[Optional[int]] | int | None = None, + value: Var[int | None] | int | None = None, + max: Var[int | None] | int | None = None, radius: Literal["full", "large", "medium", "none", "small"] | Var[Literal["full", "large", "medium", "none", "small"]] | None = None, @@ -406,8 +406,8 @@ class ProgressNamespace(ComponentNamespace): ] ] | None = None, - value: Var[Optional[int]] | int | None = None, - max: Var[Optional[int]] | int | None = None, + value: Var[int | None] | int | None = None, + max: Var[int | None] | int | None = None, radius: Literal["full", "large", "medium", "none", "small"] | Var[Literal["full", "large", "medium", "none", "small"]] | None = None, diff --git a/reflex/components/radix/themes/base.pyi b/reflex/components/radix/themes/base.pyi index ccfad7dfb..c8803aa21 100644 --- a/reflex/components/radix/themes/base.pyi +++ b/reflex/components/radix/themes/base.pyi @@ -369,7 +369,7 @@ class Theme(RadixThemesComponent): def create( # type: ignore cls, *children, - color_mode: Optional[Literal["dark", "inherit", "light"]] = None, + color_mode: Literal["dark", "inherit", "light"] | None = None, theme_panel: bool | None = False, has_background: Var[bool] | bool | None = None, appearance: Literal["dark", "inherit", "light"] diff --git a/reflex/components/radix/themes/color_mode.pyi b/reflex/components/radix/themes/color_mode.pyi index 1c2b4b0a6..f439282c4 100644 --- a/reflex/components/radix/themes/color_mode.pyi +++ b/reflex/components/radix/themes/color_mode.pyi @@ -26,8 +26,8 @@ class ColorModeIcon(Cond): cls, *children, cond: Any | Var[Any] | None = None, - comp1: Optional[BaseComponent] = None, - comp2: Optional[BaseComponent] = None, + comp1: BaseComponent | None = None, + comp2: BaseComponent | None = None, style: Style | None = None, key: Any | None = None, id: Any | None = None, diff --git a/reflex/components/radix/themes/components/slider.pyi b/reflex/components/radix/themes/components/slider.pyi index fe1f00cf8..bdcfbf5c4 100644 --- a/reflex/components/radix/themes/components/slider.pyi +++ b/reflex/components/radix/themes/components/slider.pyi @@ -102,7 +102,7 @@ class Slider(RadixThemesComponent): | None = None, value: Var[list[float | int]] | list[float | int] | None = None, name: Var[str] | str | None = None, - width: Var[Optional[str]] | str | None = None, + width: Var[str | None] | str | None = None, min: Var[float | int] | float | int | None = None, max: Var[float | int] | float | int | None = None, step: Var[float | int] | float | int | None = None, diff --git a/reflex/components/sonner/toast.pyi b/reflex/components/sonner/toast.pyi index 441288ab5..7a4a07473 100644 --- a/reflex/components/sonner/toast.pyi +++ b/reflex/components/sonner/toast.pyi @@ -182,7 +182,7 @@ class ToastNamespace(ComponentNamespace): @staticmethod def __call__( - message: str | Var = "", level: Optional[str] = None, **props + message: str | Var = "", level: str | None = None, **props ) -> "EventSpec": """Send a toast message. diff --git a/reflex/experimental/layout.pyi b/reflex/experimental/layout.pyi index 8388ed1f2..aba9dade7 100644 --- a/reflex/experimental/layout.pyi +++ b/reflex/experimental/layout.pyi @@ -257,7 +257,7 @@ class DrawerSidebar(DrawerRoot): | None = None, dismissible: Var[bool] | bool | None = None, handle_only: Var[bool] | bool | None = None, - snap_points: Optional[list[float | str]] = None, + snap_points: list[float | str] | None = None, fade_from_index: Var[int] | int | None = None, scroll_lock_timeout: Var[int] | int | None = None, prevent_scroll_restoration: Var[bool] | bool | None = None, @@ -354,7 +354,7 @@ class Layout(Box): def create( # type: ignore cls, *children, - sidebar: Optional[Component] = None, + sidebar: Component | None = None, access_key: Var[str] | str | None = None, auto_capitalize: Literal[ "characters", "none", "off", "on", "sentences", "words" @@ -576,7 +576,7 @@ class LayoutNamespace(ComponentNamespace): @staticmethod def __call__( *children, - sidebar: Optional[Component] = None, + sidebar: Component | None = None, access_key: Var[str] | str | None = None, auto_capitalize: Literal[ "characters", "none", "off", "on", "sentences", "words" diff --git a/reflex/testing.py b/reflex/testing.py index 48b3fd063..b51d99b1f 100644 --- a/reflex/testing.py +++ b/reflex/testing.py @@ -116,9 +116,9 @@ class AppHarness: """AppHarness executes a reflex app in-process for testing.""" app_name: str - app_source: Optional[ - Callable[[], None] | types.ModuleType | str | functools.partial[Any] - ] + app_source: ( + Callable[[], None] | types.ModuleType | str | functools.partial[Any] | None + ) app_path: Path app_module_path: Path app_module: types.ModuleType | None = None @@ -136,9 +136,9 @@ class AppHarness: def create( cls, root: Path, - app_source: Optional[ - Callable[[], None] | types.ModuleType | str | functools.partial[Any] - ] = None, + app_source: ( + Callable[[], None] | types.ModuleType | str | functools.partial[Any] | None + ) = None, app_name: str | None = None, ) -> "AppHarness": """Create an AppHarness instance at root. diff --git a/reflex/utils/pyi_generator.py b/reflex/utils/pyi_generator.py index 65b1c0807..f960b358d 100644 --- a/reflex/utils/pyi_generator.py +++ b/reflex/utils/pyi_generator.py @@ -144,7 +144,7 @@ def _get_type_hint( ] res_args.sort() if len(res_args) == 1: - return f"Optional[{res_args[0]}]" + return f"{res_args[0]} | None" else: res = f"{' | '.join(res_args)}" return f"{res} | None" @@ -212,7 +212,7 @@ def _get_type_hint( ) else: res = value.__name__ - if is_optional and not res.startswith("Optional"): + if is_optional and not res.startswith("Optional") and not res.endswith("| None"): res = f"{res} | None" return res