remove somehow even more optionals
This commit is contained in:
parent
a6b9f4f1c8
commit
6df5cfe43b
@ -62,7 +62,7 @@ class Html(NextDocumentLib):
|
|||||||
def create( # type: ignore
|
def create( # type: ignore
|
||||||
cls,
|
cls,
|
||||||
*children,
|
*children,
|
||||||
lang: Optional[str] = None,
|
lang: str | None = None,
|
||||||
style: Style | None = None,
|
style: Style | None = None,
|
||||||
key: Any | None = None,
|
key: Any | None = None,
|
||||||
id: Any | None = None,
|
id: Any | None = None,
|
||||||
|
@ -63,11 +63,11 @@ class Meta(Component):
|
|||||||
def create( # type: ignore
|
def create( # type: ignore
|
||||||
cls,
|
cls,
|
||||||
*children,
|
*children,
|
||||||
char_set: Optional[str] = None,
|
char_set: str | None = None,
|
||||||
content: Optional[str] = None,
|
content: str | None = None,
|
||||||
name: Optional[str] = None,
|
name: str | None = None,
|
||||||
property: Optional[str] = None,
|
property: str | None = None,
|
||||||
http_equiv: Optional[str] = None,
|
http_equiv: str | None = None,
|
||||||
style: Style | None = None,
|
style: Style | None = None,
|
||||||
key: Any | None = None,
|
key: Any | None = None,
|
||||||
id: Any | None = None,
|
id: Any | None = None,
|
||||||
@ -119,11 +119,11 @@ class Description(Meta):
|
|||||||
def create( # type: ignore
|
def create( # type: ignore
|
||||||
cls,
|
cls,
|
||||||
*children,
|
*children,
|
||||||
name: Optional[str] = None,
|
name: str | None = None,
|
||||||
char_set: Optional[str] = None,
|
char_set: str | None = None,
|
||||||
content: Optional[str] = None,
|
content: str | None = None,
|
||||||
property: Optional[str] = None,
|
property: str | None = None,
|
||||||
http_equiv: Optional[str] = None,
|
http_equiv: str | None = None,
|
||||||
style: Style | None = None,
|
style: Style | None = None,
|
||||||
key: Any | None = None,
|
key: Any | None = None,
|
||||||
id: Any | None = None,
|
id: Any | None = None,
|
||||||
@ -175,11 +175,11 @@ class Image(Meta):
|
|||||||
def create( # type: ignore
|
def create( # type: ignore
|
||||||
cls,
|
cls,
|
||||||
*children,
|
*children,
|
||||||
property: Optional[str] = None,
|
property: str | None = None,
|
||||||
char_set: Optional[str] = None,
|
char_set: str | None = None,
|
||||||
content: Optional[str] = None,
|
content: str | None = None,
|
||||||
name: Optional[str] = None,
|
name: str | None = None,
|
||||||
http_equiv: Optional[str] = None,
|
http_equiv: str | None = None,
|
||||||
style: Style | None = None,
|
style: Style | None = None,
|
||||||
key: Any | None = None,
|
key: Any | None = None,
|
||||||
id: Any | None = None,
|
id: Any | None = None,
|
||||||
|
@ -139,7 +139,7 @@ class Upload(MemoizationLeaf):
|
|||||||
def create( # type: ignore
|
def create( # type: ignore
|
||||||
cls,
|
cls,
|
||||||
*children,
|
*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,
|
disabled: Var[bool] | bool | None = None,
|
||||||
max_files: Var[int] | int | None = None,
|
max_files: Var[int] | int | None = None,
|
||||||
max_size: Var[int] | int | None = None,
|
max_size: Var[int] | int | None = None,
|
||||||
@ -205,7 +205,7 @@ class StyledUpload(Upload):
|
|||||||
def create( # type: ignore
|
def create( # type: ignore
|
||||||
cls,
|
cls,
|
||||||
*children,
|
*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,
|
disabled: Var[bool] | bool | None = None,
|
||||||
max_files: Var[int] | int | None = None,
|
max_files: Var[int] | int | None = None,
|
||||||
max_size: Var[int] | int | None = None,
|
max_size: Var[int] | int | None = None,
|
||||||
@ -271,7 +271,7 @@ class UploadNamespace(ComponentNamespace):
|
|||||||
@staticmethod
|
@staticmethod
|
||||||
def __call__(
|
def __call__(
|
||||||
*children,
|
*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,
|
disabled: Var[bool] | bool | None = None,
|
||||||
max_files: Var[int] | int | None = None,
|
max_files: Var[int] | int | None = None,
|
||||||
max_size: Var[int] | int | None = None,
|
max_size: Var[int] | int | None = None,
|
||||||
|
@ -927,7 +927,7 @@ class CodeBlock(Component, MarkdownComponentMap):
|
|||||||
wrap_long_lines: Var[bool] | bool | None = None,
|
wrap_long_lines: Var[bool] | bool | None = None,
|
||||||
custom_style: dict[str, str | Var | Color] | None = None,
|
custom_style: dict[str, str | Var | Color] | None = None,
|
||||||
code_tag_props: Var[dict[str, str]] | dict[str, str] | 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,
|
copy_button: Component | bool | None = None,
|
||||||
style: Style | None = None,
|
style: Style | None = None,
|
||||||
key: Any | None = None,
|
key: Any | None = None,
|
||||||
@ -1562,7 +1562,7 @@ class CodeblockNamespace(ComponentNamespace):
|
|||||||
wrap_long_lines: Var[bool] | bool | None = None,
|
wrap_long_lines: Var[bool] | bool | None = None,
|
||||||
custom_style: dict[str, str | Var | Color] | None = None,
|
custom_style: dict[str, str | Var | Color] | None = None,
|
||||||
code_tag_props: Var[dict[str, str]] | dict[str, str] | 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,
|
copy_button: Component | bool | None = None,
|
||||||
style: Style | None = None,
|
style: Style | None = None,
|
||||||
key: Any | None = None,
|
key: Any | None = None,
|
||||||
|
@ -19,7 +19,7 @@ class Video(NextComponent):
|
|||||||
cls,
|
cls,
|
||||||
*children,
|
*children,
|
||||||
src: Var[str] | str | None = None,
|
src: Var[str] | str | None = None,
|
||||||
as_: Optional[Component] = None,
|
as_: Component | None = None,
|
||||||
style: Style | None = None,
|
style: Style | None = None,
|
||||||
key: Any | None = None,
|
key: Any | None = None,
|
||||||
id: Any | None = None,
|
id: Any | None = None,
|
||||||
|
@ -75,7 +75,7 @@ class DrawerRoot(DrawerComponent):
|
|||||||
| None = None,
|
| None = None,
|
||||||
dismissible: Var[bool] | bool | None = None,
|
dismissible: Var[bool] | bool | None = None,
|
||||||
handle_only: 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,
|
fade_from_index: Var[int] | int | None = None,
|
||||||
scroll_lock_timeout: Var[int] | int | None = None,
|
scroll_lock_timeout: Var[int] | int | None = None,
|
||||||
prevent_scroll_restoration: Var[bool] | bool | None = None,
|
prevent_scroll_restoration: Var[bool] | bool | None = None,
|
||||||
@ -554,7 +554,7 @@ class Drawer(ComponentNamespace):
|
|||||||
| None = None,
|
| None = None,
|
||||||
dismissible: Var[bool] | bool | None = None,
|
dismissible: Var[bool] | bool | None = None,
|
||||||
handle_only: 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,
|
fade_from_index: Var[int] | int | None = None,
|
||||||
scroll_lock_timeout: Var[int] | int | None = None,
|
scroll_lock_timeout: Var[int] | int | None = None,
|
||||||
prevent_scroll_restoration: Var[bool] | bool | None = None,
|
prevent_scroll_restoration: Var[bool] | bool | None = None,
|
||||||
|
@ -119,8 +119,8 @@ class ProgressIndicator(ProgressComponent):
|
|||||||
def create( # type: ignore
|
def create( # type: ignore
|
||||||
cls,
|
cls,
|
||||||
*children,
|
*children,
|
||||||
value: Var[Optional[int]] | int | None = None,
|
value: Var[int | None] | int | None = None,
|
||||||
max: Var[Optional[int]] | int | None = None,
|
max: Var[int | None] | int | None = None,
|
||||||
color_scheme: Literal[
|
color_scheme: Literal[
|
||||||
"amber",
|
"amber",
|
||||||
"blue",
|
"blue",
|
||||||
@ -290,8 +290,8 @@ class Progress(ProgressRoot):
|
|||||||
]
|
]
|
||||||
]
|
]
|
||||||
| None = None,
|
| None = None,
|
||||||
value: Var[Optional[int]] | int | None = None,
|
value: Var[int | None] | int | None = None,
|
||||||
max: Var[Optional[int]] | int | None = None,
|
max: Var[int | None] | int | None = None,
|
||||||
radius: Literal["full", "large", "medium", "none", "small"]
|
radius: Literal["full", "large", "medium", "none", "small"]
|
||||||
| Var[Literal["full", "large", "medium", "none", "small"]]
|
| Var[Literal["full", "large", "medium", "none", "small"]]
|
||||||
| None = None,
|
| None = None,
|
||||||
@ -406,8 +406,8 @@ class ProgressNamespace(ComponentNamespace):
|
|||||||
]
|
]
|
||||||
]
|
]
|
||||||
| None = None,
|
| None = None,
|
||||||
value: Var[Optional[int]] | int | None = None,
|
value: Var[int | None] | int | None = None,
|
||||||
max: Var[Optional[int]] | int | None = None,
|
max: Var[int | None] | int | None = None,
|
||||||
radius: Literal["full", "large", "medium", "none", "small"]
|
radius: Literal["full", "large", "medium", "none", "small"]
|
||||||
| Var[Literal["full", "large", "medium", "none", "small"]]
|
| Var[Literal["full", "large", "medium", "none", "small"]]
|
||||||
| None = None,
|
| None = None,
|
||||||
|
@ -369,7 +369,7 @@ class Theme(RadixThemesComponent):
|
|||||||
def create( # type: ignore
|
def create( # type: ignore
|
||||||
cls,
|
cls,
|
||||||
*children,
|
*children,
|
||||||
color_mode: Optional[Literal["dark", "inherit", "light"]] = None,
|
color_mode: Literal["dark", "inherit", "light"] | None = None,
|
||||||
theme_panel: bool | None = False,
|
theme_panel: bool | None = False,
|
||||||
has_background: Var[bool] | bool | None = None,
|
has_background: Var[bool] | bool | None = None,
|
||||||
appearance: Literal["dark", "inherit", "light"]
|
appearance: Literal["dark", "inherit", "light"]
|
||||||
|
@ -26,8 +26,8 @@ class ColorModeIcon(Cond):
|
|||||||
cls,
|
cls,
|
||||||
*children,
|
*children,
|
||||||
cond: Any | Var[Any] | None = None,
|
cond: Any | Var[Any] | None = None,
|
||||||
comp1: Optional[BaseComponent] = None,
|
comp1: BaseComponent | None = None,
|
||||||
comp2: Optional[BaseComponent] = None,
|
comp2: BaseComponent | None = None,
|
||||||
style: Style | None = None,
|
style: Style | None = None,
|
||||||
key: Any | None = None,
|
key: Any | None = None,
|
||||||
id: Any | None = None,
|
id: Any | None = None,
|
||||||
|
@ -102,7 +102,7 @@ class Slider(RadixThemesComponent):
|
|||||||
| None = None,
|
| None = None,
|
||||||
value: Var[list[float | int]] | list[float | int] | None = None,
|
value: Var[list[float | int]] | list[float | int] | None = None,
|
||||||
name: Var[str] | str | 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,
|
min: Var[float | int] | float | int | None = None,
|
||||||
max: Var[float | int] | float | int | None = None,
|
max: Var[float | int] | float | int | None = None,
|
||||||
step: Var[float | int] | float | int | None = None,
|
step: Var[float | int] | float | int | None = None,
|
||||||
|
@ -182,7 +182,7 @@ class ToastNamespace(ComponentNamespace):
|
|||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def __call__(
|
def __call__(
|
||||||
message: str | Var = "", level: Optional[str] = None, **props
|
message: str | Var = "", level: str | None = None, **props
|
||||||
) -> "EventSpec":
|
) -> "EventSpec":
|
||||||
"""Send a toast message.
|
"""Send a toast message.
|
||||||
|
|
||||||
|
@ -257,7 +257,7 @@ class DrawerSidebar(DrawerRoot):
|
|||||||
| None = None,
|
| None = None,
|
||||||
dismissible: Var[bool] | bool | None = None,
|
dismissible: Var[bool] | bool | None = None,
|
||||||
handle_only: 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,
|
fade_from_index: Var[int] | int | None = None,
|
||||||
scroll_lock_timeout: Var[int] | int | None = None,
|
scroll_lock_timeout: Var[int] | int | None = None,
|
||||||
prevent_scroll_restoration: Var[bool] | bool | None = None,
|
prevent_scroll_restoration: Var[bool] | bool | None = None,
|
||||||
@ -354,7 +354,7 @@ class Layout(Box):
|
|||||||
def create( # type: ignore
|
def create( # type: ignore
|
||||||
cls,
|
cls,
|
||||||
*children,
|
*children,
|
||||||
sidebar: Optional[Component] = None,
|
sidebar: Component | None = None,
|
||||||
access_key: Var[str] | str | None = None,
|
access_key: Var[str] | str | None = None,
|
||||||
auto_capitalize: Literal[
|
auto_capitalize: Literal[
|
||||||
"characters", "none", "off", "on", "sentences", "words"
|
"characters", "none", "off", "on", "sentences", "words"
|
||||||
@ -576,7 +576,7 @@ class LayoutNamespace(ComponentNamespace):
|
|||||||
@staticmethod
|
@staticmethod
|
||||||
def __call__(
|
def __call__(
|
||||||
*children,
|
*children,
|
||||||
sidebar: Optional[Component] = None,
|
sidebar: Component | None = None,
|
||||||
access_key: Var[str] | str | None = None,
|
access_key: Var[str] | str | None = None,
|
||||||
auto_capitalize: Literal[
|
auto_capitalize: Literal[
|
||||||
"characters", "none", "off", "on", "sentences", "words"
|
"characters", "none", "off", "on", "sentences", "words"
|
||||||
|
@ -116,9 +116,9 @@ class AppHarness:
|
|||||||
"""AppHarness executes a reflex app in-process for testing."""
|
"""AppHarness executes a reflex app in-process for testing."""
|
||||||
|
|
||||||
app_name: str
|
app_name: str
|
||||||
app_source: Optional[
|
app_source: (
|
||||||
Callable[[], None] | types.ModuleType | str | functools.partial[Any]
|
Callable[[], None] | types.ModuleType | str | functools.partial[Any] | None
|
||||||
]
|
)
|
||||||
app_path: Path
|
app_path: Path
|
||||||
app_module_path: Path
|
app_module_path: Path
|
||||||
app_module: types.ModuleType | None = None
|
app_module: types.ModuleType | None = None
|
||||||
@ -136,9 +136,9 @@ class AppHarness:
|
|||||||
def create(
|
def create(
|
||||||
cls,
|
cls,
|
||||||
root: Path,
|
root: Path,
|
||||||
app_source: Optional[
|
app_source: (
|
||||||
Callable[[], None] | types.ModuleType | str | functools.partial[Any]
|
Callable[[], None] | types.ModuleType | str | functools.partial[Any] | None
|
||||||
] = None,
|
) = None,
|
||||||
app_name: str | None = None,
|
app_name: str | None = None,
|
||||||
) -> "AppHarness":
|
) -> "AppHarness":
|
||||||
"""Create an AppHarness instance at root.
|
"""Create an AppHarness instance at root.
|
||||||
|
@ -144,7 +144,7 @@ def _get_type_hint(
|
|||||||
]
|
]
|
||||||
res_args.sort()
|
res_args.sort()
|
||||||
if len(res_args) == 1:
|
if len(res_args) == 1:
|
||||||
return f"Optional[{res_args[0]}]"
|
return f"{res_args[0]} | None"
|
||||||
else:
|
else:
|
||||||
res = f"{' | '.join(res_args)}"
|
res = f"{' | '.join(res_args)}"
|
||||||
return f"{res} | None"
|
return f"{res} | None"
|
||||||
@ -212,7 +212,7 @@ def _get_type_hint(
|
|||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
res = value.__name__
|
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"
|
res = f"{res} | None"
|
||||||
return res
|
return res
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user