From 2243535b6aeac5dd7ea0a28bc7f8c9e1ff3cb5b3 Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Tue, 28 Apr 2026 22:30:48 +0200 Subject: [PATCH 01/57] initial migration --- .../workflows/check_outdated_dependencies.yml | 4 +- .pre-commit-config.yaml | 7 +- AGENTS.md | 4 +- CONTRIBUTING.md | 4 +- .../reflex_docs/pages/docs/cloud_cliref.py | 2 +- .../templates/docpage/sidebar/sidebar.py | 26 ++-- docs/app/reflex_docs/utils/http.py | 2 +- docs/getting_started/chat_tutorial_utils.py | 2 +- .../src/reflex_base/components/component.py | 61 ++++---- .../src/reflex_base/components/field.py | 2 +- .../src/reflex_base/components/props.py | 6 +- .../src/reflex_base/environment.py | 4 +- .../src/reflex_base/event/__init__.py | 92 ++++++------- .../src/reflex_base/event/context.py | 2 +- .../event/processor/base_state_processor.py | 6 +- .../event/processor/event_processor.py | 8 +- .../reflex_base/plugins/shared_tailwind.py | 8 +- packages/reflex-base/src/reflex_base/style.py | 6 +- .../src/reflex_base/utils/console.py | 2 +- .../src/reflex_base/utils/decorator.py | 8 +- .../src/reflex_base/utils/format.py | 4 +- .../src/reflex_base/utils/imports.py | 2 +- .../src/reflex_base/utils/pyi_generator.py | 22 +-- .../src/reflex_base/utils/serializers.py | 4 +- .../src/reflex_base/utils/types.py | 78 +++++------ .../reflex-base/src/reflex_base/vars/base.py | 121 ++++++++-------- .../src/reflex_base/vars/dep_tracking.py | 16 +-- .../src/reflex_base/vars/function.py | 6 +- .../src/reflex_base/vars/number.py | 6 +- .../src/reflex_base/vars/object.py | 20 +-- .../src/reflex_base/vars/sequence.py | 14 +- .../src/reflex_components_code/code.py | 2 +- .../shiki_code_block.py | 12 +- .../src/reflex_components_core/base/meta.py | 4 +- .../src/reflex_components_core/core/banner.py | 2 +- .../core/breakpoints.py | 1 - .../src/reflex_components_core/core/cond.py | 12 +- .../reflex_components_core/core/debounce.py | 6 +- .../reflex_components_core/core/foreach.py | 8 +- .../src/reflex_components_core/core/match.py | 2 +- .../src/reflex_components_core/core/upload.py | 6 +- .../el/elements/forms.py | 2 +- .../dataeditor.py | 2 +- .../blocks/plain.py | 18 +-- .../components/base/__init__.py | 2 +- .../components/base/checkbox.py | 4 +- .../components/base/context_menu.py | 2 +- .../components/base/input.py | 8 +- .../components/base/menu.py | 2 +- .../components/base/scroll_area.py | 4 +- .../components/base/select.py | 2 +- .../components/base/tabs.py | 2 +- .../utils/twmerge.py | 2 +- .../primitives/accordion.py | 8 +- .../themes/components/checkbox.py | 2 +- .../themes/components/icon_button.py | 4 +- .../themes/components/radio_group.py | 12 +- .../themes/components/separator.py | 2 +- .../themes/components/slider.py | 2 +- .../themes/layout/container.py | 2 +- .../themes/layout/list.py | 6 +- .../themes/layout/section.py | 2 +- .../themes/layout/stack.py | 8 +- .../themes/typography/text.py | 4 +- .../react_player.py | 2 +- .../reflex_components_recharts/cartesian.py | 26 ++-- .../src/reflex_components_recharts/general.py | 10 +- .../src/reflex_components_recharts/polar.py | 14 +- .../src/reflex_components_sonner/toast.py | 16 +-- .../src/reflex_docgen/markdown/_parser.py | 4 +- .../src/reflex_cli/core/config.py | 2 +- .../src/reflex_cli/deployments.py | 4 +- .../src/reflex_cli/utils/dependency.py | 2 +- .../src/reflex_cli/utils/hosting.py | 6 +- .../src/reflex_cli/v2/cli.py | 10 +- .../src/reflex_cli/v2/deployments.py | 4 +- .../src/reflex_cli/v2/secrets.py | 4 +- .../components/blocks/flexdown.py | 1 - .../components/blocks/headings.py | 1 - pyi_hashes.json | 119 ---------------- pyproject.toml | 28 +--- reflex/_upload.py | 1 - reflex/app.py | 8 +- reflex/app_mixins/lifespan.py | 8 +- reflex/app_mixins/middleware.py | 6 +- reflex/assets.py | 2 +- reflex/compiler/compiler.py | 8 +- reflex/compiler/templates.py | 1 - reflex/compiler/utils.py | 11 +- reflex/components/component.py | 1 - reflex/components/dynamic.py | 1 - reflex/components/field.py | 1 - reflex/components/literals.py | 1 - reflex/components/props.py | 1 - reflex/components/tags/__init__.py | 1 - reflex/components/tags/cond_tag.py | 1 - reflex/components/tags/iter_tag.py | 1 - reflex/components/tags/match_tag.py | 1 - reflex/components/tags/tag.py | 1 - reflex/components/tags/tagless.py | 1 - reflex/config.py | 1 - reflex/constants/base.py | 1 - reflex/constants/colors.py | 1 - reflex/constants/compiler.py | 1 - reflex/constants/config.py | 1 - reflex/constants/custom_components.py | 1 - reflex/constants/event.py | 1 - reflex/constants/installer.py | 1 - reflex/constants/route.py | 1 - reflex/constants/state.py | 1 - reflex/constants/utils.py | 1 - reflex/custom_components/custom_components.py | 2 +- reflex/environment.py | 1 - reflex/event.py | 4 +- reflex/experimental/client_state.py | 8 +- reflex/experimental/memo.py | 33 ++--- reflex/istate/manager/__init__.py | 8 +- reflex/istate/manager/disk.py | 2 +- reflex/istate/manager/redis.py | 13 +- reflex/istate/proxy.py | 26 ++-- reflex/istate/shared.py | 6 +- reflex/model.py | 16 ++- reflex/page.py | 2 +- reflex/plugins/_screenshot.py | 1 - reflex/plugins/base.py | 1 - reflex/plugins/shared_tailwind.py | 1 - reflex/plugins/sitemap.py | 1 - reflex/plugins/tailwind_v3.py | 1 - reflex/plugins/tailwind_v4.py | 1 - reflex/reflex.py | 2 +- reflex/state.py | 38 ++--- reflex/style.py | 1 - reflex/testing.py | 36 +++-- reflex/utils/compat.py | 1 - reflex/utils/console.py | 1 - reflex/utils/decorator.py | 1 - reflex/utils/exceptions.py | 1 - reflex/utils/exec.py | 2 +- reflex/utils/format.py | 1 - reflex/utils/imports.py | 1 - reflex/utils/lazy_loader.py | 1 - reflex/utils/prerequisites.py | 2 +- reflex/utils/processes.py | 4 +- reflex/utils/pyi_generator.py | 1 - reflex/utils/serializers.py | 1 - reflex/utils/tasks.py | 6 +- reflex/utils/telemetry.py | 2 +- reflex/utils/types.py | 1 - reflex/vars/__init__.py | 1 - reflex/vars/base.py | 1 - reflex/vars/color.py | 1 - reflex/vars/datetime.py | 1 - reflex/vars/dep_tracking.py | 1 - reflex/vars/function.py | 1 - reflex/vars/number.py | 1 - reflex/vars/object.py | 1 - reflex/vars/sequence.py | 1 - tests/benchmarks/test_event_processing.py | 2 +- tests/integration/test_background_task.py | 4 +- tests/integration/test_component_state.py | 14 +- tests/integration/test_dynamic_components.py | 2 - tests/integration/test_dynamic_routes.py | 18 +-- tests/integration/test_event_actions.py | 52 ++++--- tests/integration/test_exception_handlers.py | 2 +- tests/integration/test_lifespan.py | 12 +- tests/integration/test_linked_state.py | 8 +- tests/integration/test_login_flow.py | 4 +- tests/integration/test_upload.py | 10 +- tests/integration/test_var_operations.py | 14 +- .../tests_playwright/test_appearance.py | 2 +- .../tests_playwright/test_frontend_path.py | 4 +- tests/units/compiler/test_compiler.py | 18 +-- tests/units/components/core/test_colors.py | 6 +- tests/units/components/core/test_cond.py | 24 ++-- tests/units/components/core/test_foreach.py | 4 +- tests/units/components/core/test_html.py | 4 +- tests/units/components/core/test_upload.py | 10 +- .../units/components/datadisplay/test_code.py | 2 +- .../components/datadisplay/test_datatable.py | 12 +- .../components/datadisplay/test_shiki_code.py | 10 +- tests/units/components/forms/test_form.py | 2 +- tests/units/components/media/test_image.py | 4 +- .../components/radix/test_icon_button.py | 2 +- tests/units/components/test_component.py | 37 ++--- tests/units/components/test_props.py | 4 +- .../components/typography/test_markdown.py | 2 +- tests/units/conftest.py | 4 +- .../units/docgen/test_class_and_component.py | 2 +- tests/units/experimental/test_memo.py | 12 +- tests/units/istate/manager/test_expiration.py | 16 +-- tests/units/istate/manager/test_redis.py | 62 ++++----- .../event/processor/test_event_processor.py | 2 +- .../dataset/classvar_and_private.py | 2 +- .../pyi_generator/dataset/simple_component.py | 2 +- .../dataset/staticmethod_namespace.py | 2 +- tests/units/reflex_cli/v2/test_apps.py | 2 +- tests/units/reflex_cli/v2/test_project.py | 2 +- tests/units/reflex_cli/v2/test_secrets.py | 2 +- .../reflex_cli/v2/test_vmtypes_regions.py | 2 +- tests/units/test_app.py | 48 +++---- tests/units/test_config.py | 12 +- tests/units/test_environment.py | 6 +- tests/units/test_event.py | 10 +- tests/units/test_health_endpoint.py | 2 +- tests/units/test_model.py | 8 +- tests/units/test_prerequisites.py | 2 +- tests/units/test_sqlalchemy.py | 8 +- tests/units/test_state.py | 130 +++++++++--------- tests/units/test_var.py | 12 +- tests/units/utils/test_format.py | 4 +- tests/units/utils/test_token_manager.py | 10 +- tests/units/vars/test_dep_tracking.py | 2 +- tests/units/vars/test_object.py | 8 +- uv.lock | 41 ++++-- 214 files changed, 893 insertions(+), 1076 deletions(-) diff --git a/.github/workflows/check_outdated_dependencies.yml b/.github/workflows/check_outdated_dependencies.yml index 1a206f2697b..4959638a23e 100644 --- a/.github/workflows/check_outdated_dependencies.yml +++ b/.github/workflows/check_outdated_dependencies.yml @@ -29,14 +29,14 @@ jobs: echo "Outdated:" echo "$outdated" - filtered_outdated=$(echo "$outdated" | grep -vE 'pyright|ruff' || true) + filtered_outdated=$(echo "$outdated" | grep -vE 'ty|ruff' || true) if [ ! -z "$filtered_outdated" ]; then echo "Outdated dependencies found:" echo "$filtered_outdated" exit 1 else - echo "All dependencies are up to date. (pyright and ruff are ignored)" + echo "All dependencies are up to date. (ty and ruff are ignored)" fi frontend: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a06454f5d16..9af827ba829 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -34,11 +34,12 @@ repos: require_serial: true - repo: local hooks: - - id: pyright - name: pyright - entry: pyright + - id: ty + name: ty + entry: ty check language: system types: [python] + pass_filenames: false require_serial: true - repo: https://github.com/biomejs/pre-commit rev: 19865851e014cbe6138e295365f95ca51bf953f8 # v0.6.1 diff --git a/AGENTS.md b/AGENTS.md index 3c9593ff624..f2fbbded2b8 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -18,7 +18,7 @@ uv run pytest tests/units --cov --no-cov-on-fail --cov-report= # unit tests (> uv run pytest tests/integration # integration tests (slow) uv run ruff check . # lint uv run ruff format . # format -uv run pyright reflex tests # type check +uv run ty check # type check uv run python scripts/make_pyi.py # regenerate .pyi stubs uv run pre-commit run --all-files # all pre-commit hooks ``` @@ -121,7 +121,7 @@ if TYPE_CHECKING: Before submitting: 1. Tests pass with adequate coverage 2. `uv run ruff check .` and `uv run ruff format .` clean -3. `uv run pyright reflex tests` passes +3. `uv run ty check` passes 4. `pyi_hashes.json` updated if components changed 5. Documentation updated if user-facing behavior changed 6. Deprecation warnings added if breaking changes introduced diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 823202f3cbd..c956e181f14 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -73,7 +73,7 @@ Next make sure all the following tests pass. This ensures that every new change ```bash uv run ruff check . -uv run pyright reflex tests +uv run ty check ``` Finally, run `ruff` to format your code. @@ -82,7 +82,7 @@ Finally, run `ruff` to format your code. uv run ruff format . ``` -Consider installing git pre-commit hooks so Ruff, Pyright, and `make_pyi` will run automatically before each commit. +Consider installing git pre-commit hooks so Ruff, ty, and `make_pyi` will run automatically before each commit. ```bash uv run pre-commit install diff --git a/docs/app/reflex_docs/pages/docs/cloud_cliref.py b/docs/app/reflex_docs/pages/docs/cloud_cliref.py index b8051fba339..ee08864dcc8 100644 --- a/docs/app/reflex_docs/pages/docs/cloud_cliref.py +++ b/docs/app/reflex_docs/pages/docs/cloud_cliref.py @@ -260,7 +260,7 @@ def process_command(command: click.Command, name: str) -> str: if find_spec("typer") is not None and find_spec("typer.main") is not None: - import typer # pyright: ignore[reportMissingImports] + import typer # ty: ignore[unresolved-import] if isinstance(cli, typer.Typer): cli = typer.main.get_command(cli) diff --git a/docs/app/reflex_docs/templates/docpage/sidebar/sidebar.py b/docs/app/reflex_docs/templates/docpage/sidebar/sidebar.py index a41dfe03d0f..dd41022d31c 100644 --- a/docs/app/reflex_docs/templates/docpage/sidebar/sidebar.py +++ b/docs/app/reflex_docs/templates/docpage/sidebar/sidebar.py @@ -440,9 +440,9 @@ def sidebar_comp( ) _is_docs_ai_builder = _path.startswith("/docs/ai/") | _path.startswith("/ai/") - return rx.box( # pyright: ignore [reportCallIssue] + return rx.box( # ty: ignore[missing-argument, unknown-argument, call-non-callable, too-many-positional-arguments, no-matching-overload] # Handle sidebar categories for docs/cloud first - rx.cond( # pyright: ignore [reportCallIssue] + rx.cond( # ty: ignore[missing-argument, unknown-argument, call-non-callable, too-many-positional-arguments, no-matching-overload] _is_docs_hosting, rx.el.ul( sidebar_category( @@ -453,7 +453,7 @@ def sidebar_comp( # ), class_name="flex flex-col items-start gap-2 w-full list-none", ), - rx.cond( # pyright: ignore [reportCallIssue] + rx.cond( # ty: ignore[missing-argument, unknown-argument, call-non-callable, too-many-positional-arguments, no-matching-overload] _is_docs_ai_builder, rx.el.ul( sidebar_category( @@ -506,9 +506,9 @@ def sidebar_comp( ), ), # Handle the sidebar content based on docs/cloud or docs - rx.cond( # pyright: ignore [reportCallIssue] + rx.cond( # ty: ignore[missing-argument, unknown-argument, call-non-callable, too-many-positional-arguments, no-matching-overload] _is_docs_hosting, - rx.match( # pyright: ignore [reportCallIssue] + rx.match( # ty: ignore[missing-argument, unknown-argument, call-non-callable, too-many-positional-arguments, no-matching-overload] SidebarState.sidebar_index, ( 0, @@ -537,9 +537,9 @@ def sidebar_comp( # ), # ), ), - rx.cond( # pyright: ignore [reportCallIssue] + rx.cond( # ty: ignore[missing-argument, unknown-argument, call-non-callable, too-many-positional-arguments, no-matching-overload] _is_docs_ai_builder, - rx.match( # pyright: ignore [reportCallIssue] + rx.match( # ty: ignore[missing-argument, unknown-argument, call-non-callable, too-many-positional-arguments, no-matching-overload] SidebarState.sidebar_index, ( 0, @@ -604,7 +604,7 @@ def sidebar_comp( # ), # ), ), - rx.match( # pyright: ignore [reportCallIssue] + rx.match( # ty: ignore[missing-argument, unknown-argument, call-non-callable, too-many-positional-arguments, no-matching-overload] SidebarState.sidebar_index, ( 0, @@ -657,17 +657,17 @@ def sidebar_comp( graphing_libs_index, url, ), - rx.link( # pyright: ignore [reportCallIssue] - rx.box( # pyright: ignore [reportCallIssue] - rx.box( # pyright: ignore [reportCallIssue] - rx.icon("atom", size=16), # pyright: ignore [reportCallIssue] + rx.link( # ty: ignore[missing-argument, unknown-argument, call-non-callable, too-many-positional-arguments, no-matching-overload] + rx.box( # ty: ignore[missing-argument, unknown-argument, call-non-callable, too-many-positional-arguments, no-matching-overload] + rx.box( # ty: ignore[missing-argument, unknown-argument, call-non-callable, too-many-positional-arguments, no-matching-overload] + rx.icon("atom", size=16), # ty: ignore[missing-argument, unknown-argument, call-non-callable, too-many-positional-arguments, no-matching-overload] rx.el.h5( "Custom Components", class_name="font-smbold text-[0.875rem] text-slate-12 leading-5 tracking-[-0.01313rem] transition-color", ), class_name="flex flex-row items-center gap-3 text-slate-12", ), - rx.text( # pyright: ignore [reportCallIssue] + rx.text( # ty: ignore[missing-argument, unknown-argument, call-non-callable, too-many-positional-arguments, no-matching-overload] "See what components people have made with Reflex!", class_name="font-small text-slate-9", ), diff --git a/docs/app/reflex_docs/utils/http.py b/docs/app/reflex_docs/utils/http.py index 5ee033d5a82..f8ee50e985f 100644 --- a/docs/app/reflex_docs/utils/http.py +++ b/docs/app/reflex_docs/utils/http.py @@ -26,7 +26,7 @@ def once(f: Callable[[], T]) -> Callable[[], T]: def wrapper() -> T: nonlocal value value = f() if value is unset else value - return value # pyright: ignore[reportReturnType] + return value # ty: ignore[invalid-return-type] return wrapper diff --git a/docs/getting_started/chat_tutorial_utils.py b/docs/getting_started/chat_tutorial_utils.py index 4bf4a7d1859..ca1a2565c57 100644 --- a/docs/getting_started/chat_tutorial_utils.py +++ b/docs/getting_started/chat_tutorial_utils.py @@ -4,7 +4,7 @@ import os -import openai # pyright: ignore[reportMissingImports] +import openai # ty: ignore[unresolved-import] import reflex as rx diff --git a/packages/reflex-base/src/reflex_base/components/component.py b/packages/reflex-base/src/reflex_base/components/component.py index 8f47f447c7d..82ce57c0104 100644 --- a/packages/reflex-base/src/reflex_base/components/component.py +++ b/packages/reflex-base/src/reflex_base/components/component.py @@ -138,12 +138,12 @@ def field( if default is not MISSING and default_factory is not None: msg = "cannot specify both default and default_factory" raise ValueError(msg) - return ComponentField( # pyright: ignore [reportReturnType] + return ComponentField( default=default, default_factory=default_factory, is_javascript=is_javascript_property, doc=doc, - ) + ) # ty:ignore[invalid-return-type] @dataclass_transform(kw_only_default=True, field_specifiers=(field,)) @@ -385,7 +385,7 @@ def _get_all_imports(self) -> ParsedImportDict: """ @abstractmethod - def _get_all_dynamic_imports(self) -> set[str]: + def _get_all_dynamic_imports(self) -> set[str]: # ty:ignore[invalid-type-form] """Get dynamic imports for the component. Returns: @@ -412,7 +412,7 @@ def _get_all_refs(self) -> dict[str, None]: class ComponentNamespace(SimpleNamespace): """A namespace to manage components with subcomponents.""" - def __hash__(self) -> int: # pyright: ignore [reportIncompatibleVariableOverride] + def __hash__(self) -> int: """Get the hash of the namespace. Returns: @@ -574,15 +574,15 @@ class TriggerDefinition: description="Fired when focus has left the element (or left some element inside of it). For example, it is called when the user clicks outside of a focused text input.", ), EventTriggers.ON_CLICK: TriggerDefinition( - spec=pointer_event_spec, # pyright: ignore [reportArgumentType] + spec=pointer_event_spec, description="Fired when the user clicks on an element. For example, it's called when the user clicks on a button.", ), EventTriggers.ON_CONTEXT_MENU: TriggerDefinition( - spec=pointer_event_spec, # pyright: ignore [reportArgumentType] + spec=pointer_event_spec, description="Fired when the user right-clicks on an element.", ), EventTriggers.ON_DOUBLE_CLICK: TriggerDefinition( - spec=pointer_event_spec, # pyright: ignore [reportArgumentType] + spec=pointer_event_spec, description="Fired when the user double-clicks on an element.", ), EventTriggers.ON_MOUSE_DOWN: TriggerDefinition( @@ -1005,7 +1005,7 @@ def get_event_triggers(cls) -> dict[str, types.ArgsSpec | Sequence[types.ArgsSpe """ # Look for component specific triggers, # e.g. variable declared as EventHandler types. - return DEFAULT_TRIGGERS | args_specs_from_fields(cls.get_fields()) # pyright: ignore [reportOperatorIssue] + return DEFAULT_TRIGGERS | args_specs_from_fields(cls.get_fields()) def __repr__(self) -> str: """Represent the component in React. @@ -1249,9 +1249,9 @@ def _get_component_style(self, styles: ComponentStyle | Style) -> Style | None: The style of the component. """ component_style = None - if (style := styles.get(type(self))) is not None: # pyright: ignore [reportArgumentType] + if (style := styles.get(type(self))) is not None: # ty:ignore[invalid-argument-type] component_style = Style(style) - if (style := styles.get(self.create)) is not None: # pyright: ignore [reportArgumentType] + if (style := styles.get(self.create)) is not None: # ty:ignore[invalid-argument-type] component_style = Style(style) return component_style @@ -2085,13 +2085,13 @@ def get_args_spec(key: str) -> types.ArgsSpec | Sequence[types.ArgsSpec]: to_camel_cased_props = { format.to_camel_case(key): None for key in props if key not in event_types } - self.get_props = lambda: to_camel_cased_props # pyright: ignore [reportIncompatibleVariableOverride] + self.get_props = lambda: to_camel_cased_props # ty:ignore[invalid-assignment] # Unset the style. self.style = Style() # Set the tag to the name of the function. - self.tag = format.to_title_case(self.component_fn.__name__) + self.tag = format.to_title_case(self.component_fn.__name__) # ty:ignore[unresolved-attribute] for key, value in props.items(): # Skip kwargs that are not props. @@ -2156,7 +2156,7 @@ def _get_event_spec_from_args_spec(name: str, event: EventChain) -> Callable: """ def fn(*args): - return run_script(Var(name).to(FunctionVar).call(*args)) + return run_script(Var(name).to(FunctionVar).call(*args)) # ty:ignore[unresolved-attribute] if event.args_spec: arg_spec = ( @@ -2165,7 +2165,7 @@ def fn(*args): else event.args_spec[0] ) names = inspect.getfullargspec(arg_spec).args - fn.__signature__ = inspect.Signature( # pyright: ignore[reportFunctionMemberAccess] + fn.__signature__ = inspect.Signature( # ty:ignore[unresolved-attribute] parameters=[ inspect.Parameter( name=name, @@ -2881,31 +2881,32 @@ def render_dict_to_var(tag: dict | Component | str) -> Var: return Var.create(tag) if "contents" in tag: - return Var(tag["contents"]) + return Var(tag["contents"]) # ty:ignore[invalid-argument-type] if "iterable" in tag: function_return = LiteralArrayVar.create([ - render_dict_to_var(child.render()) for child in tag["children"] + render_dict_to_var(child.render()) + for child in tag["children"] # ty:ignore[invalid-argument-type, not-iterable] ]) func = ArgsFunctionOperation.create( - (tag["arg_var_name"], tag["index_var_name"]), + (tag["arg_var_name"], tag["index_var_name"]), # ty:ignore[invalid-argument-type] function_return, ) return FunctionStringVar.create("Array.prototype.map.call").call( - tag["iterable"] - if not isinstance(tag["iterable"], ObjectVar) - else tag["iterable"].items(), + tag["iterable"] # ty:ignore[invalid-argument-type] + if not isinstance(tag["iterable"], ObjectVar) # ty:ignore[invalid-argument-type] + else tag["iterable"].items(), # ty:ignore[invalid-argument-type] func, ) if "match_cases" in tag: - element = Var(tag["cond"]) + element = Var(tag["cond"]) # ty:ignore[invalid-argument-type] - conditionals = render_dict_to_var(tag["default"]) + conditionals = render_dict_to_var(tag["default"]) # ty:ignore[invalid-argument-type] - for case in tag["match_cases"][::-1]: + for case in tag["match_cases"][::-1]: # ty:ignore[invalid-argument-type, not-subscriptable] conditions, return_value = case condition = Var.create(False) for pattern in conditions: @@ -2923,16 +2924,16 @@ def render_dict_to_var(tag: dict | Component | str) -> Var: if "cond_state" in tag: return ternary_operation( - Var(tag["cond_state"]), - render_dict_to_var(tag["true_value"]), - render_dict_to_var(tag["false_value"]) - if tag["false_value"] is not None + Var(tag["cond_state"]), # ty:ignore[invalid-argument-type] + render_dict_to_var(tag["true_value"]), # ty:ignore[invalid-argument-type] + render_dict_to_var(tag["false_value"]) # ty:ignore[invalid-argument-type] + if tag["false_value"] is not None # ty:ignore[invalid-argument-type] else LiteralNoneVar.create(), ) - props = Var("({" + ",".join(tag["props"]) + "})") + props = Var("({" + ",".join(tag["props"]) + "})") # ty:ignore[invalid-argument-type, no-matching-overload] - raw_tag_name = tag.get("name") + raw_tag_name = tag.get("name") # ty:ignore[invalid-argument-type] tag_name = Var(raw_tag_name or "Fragment") return FunctionStringVar.create( @@ -2940,7 +2941,7 @@ def render_dict_to_var(tag: dict | Component | str) -> Var: ).call( tag_name, props, - *[render_dict_to_var(child) for child in tag["children"]], + *[render_dict_to_var(child) for child in tag["children"]], # ty:ignore[invalid-argument-type, not-iterable] ) diff --git a/packages/reflex-base/src/reflex_base/components/field.py b/packages/reflex-base/src/reflex_base/components/field.py index 5487bdd923d..f1c9a09ed30 100644 --- a/packages/reflex-base/src/reflex_base/components/field.py +++ b/packages/reflex-base/src/reflex_base/components/field.py @@ -35,7 +35,7 @@ def __init__( # Process type annotation type_origin = get_origin(annotated_type) or annotated_type if type_origin is Annotated: - type_origin = annotated_type.__origin__ # pyright: ignore [reportAttributeAccessIssue] + type_origin = annotated_type.__origin__ # ty:ignore[unresolved-attribute] # For Annotated types, use the actual type inside the annotation self.type_ = annotated_type else: diff --git a/packages/reflex-base/src/reflex_base/components/props.py b/packages/reflex-base/src/reflex_base/components/props.py index 13f1eabca59..d2646cac295 100644 --- a/packages/reflex-base/src/reflex_base/components/props.py +++ b/packages/reflex-base/src/reflex_base/components/props.py @@ -158,11 +158,11 @@ def props_field( if default is not MISSING and default_factory is not None: msg = "cannot specify both default and default_factory" raise ValueError(msg) - return PropsField( # pyright: ignore [reportReturnType] + return PropsField( default=default, default_factory=default_factory, annotated_type=MISSING, - ) + ) # ty:ignore[invalid-return-type] @dataclass_transform(field_specifiers=(props_field,)) @@ -283,7 +283,7 @@ def __init__(self, **kwargs): ) @classmethod - def get_fields(cls) -> dict[str, Any]: + def get_fields(cls) -> dict[str, Any]: # ty:ignore[invalid-type-form] """Get the fields of the object. Returns: diff --git a/packages/reflex-base/src/reflex_base/environment.py b/packages/reflex-base/src/reflex_base/environment.py index 31ebe795998..b5c144a87c5 100644 --- a/packages/reflex-base/src/reflex_base/environment.py +++ b/packages/reflex-base/src/reflex_base/environment.py @@ -454,7 +454,7 @@ def get_type_hints_environment(cls: type) -> dict[str, Any]: return get_type_hints(cls) -class env_var: # noqa: N801 # pyright: ignore [reportRedeclaration] +class env_var: # noqa: N801 """Descriptor for environment variables.""" name: str @@ -811,7 +811,7 @@ class EnvironmentVariables: try: from dotenv import load_dotenv except ImportError: - load_dotenv = None + load_dotenv = None # ty:ignore[invalid-assignment] def _paths_from_env_files(env_files: str) -> list[Path]: diff --git a/packages/reflex-base/src/reflex_base/event/__init__.py b/packages/reflex-base/src/reflex_base/event/__init__.py index 8762e694d18..7050fa42fe2 100644 --- a/packages/reflex-base/src/reflex_base/event/__init__.py +++ b/packages/reflex-base/src/reflex_base/event/__init__.py @@ -115,7 +115,7 @@ def from_event_type( for e in events: if callable(e) and getattr(e, "__name__", "") == "": # A lambda was returned, assume the user wants to call it with no args. - e = e() + e = e() # ty:ignore[call-top-callable] if isinstance(e, Event): # If the event is already an event, append it to the list. if router_data is not None and e.router_data != router_data: @@ -381,7 +381,7 @@ def _parameters(self) -> Mapping[str, inspect.Parameter]: return parameters @classmethod - def __class_getitem__(cls, args_spec: str) -> Annotated: + def __class_getitem__(cls, args_spec: str) -> Annotated: # ty:ignore[invalid-type-form] """Get a typed EventHandler. Args: @@ -390,7 +390,7 @@ def __class_getitem__(cls, args_spec: str) -> Annotated: Returns: The EventHandler class item. """ - return Annotated[cls, args_spec] + return Annotated[cls, args_spec] # ty:ignore[invalid-type-form] @property def is_background(self) -> bool: @@ -487,7 +487,7 @@ class EventSpec(EventActionsMixin): args: The arguments to pass to the function. """ - handler: EventHandler = dataclasses.field(default=None) # pyright: ignore [reportAssignmentType] + handler: EventHandler = dataclasses.field(default=None) # ty:ignore[invalid-assignment] client_handler_name: str = dataclasses.field(default="") @@ -699,7 +699,7 @@ def create( events.append(v) elif isinstance(v, FunctionVar): # Apply the args_spec transformations as partial arguments to the function. - events.append(v.partial(*parse_args_spec(args_spec)[0])) + events.append(v.partial(*parse_args_spec(args_spec)[0])) # ty:ignore[no-matching-overload] elif isinstance(v, Callable): # Call the lambda to get the event chain. events.extend(call_event_fn(v, args_spec, key=key)) @@ -786,7 +786,7 @@ def int_input_event(e: ObjectVar[JavascriptInputEvent]) -> tuple[Var[int]]: Returns: The value from the input event as an int. """ - return (Var("Number").to(FunctionVar).call(e.target.value).to(int),) + return (Var("Number").to(FunctionVar).call(e.target.value).to(int),) # ty:ignore[unresolved-attribute] def float_input_event(e: ObjectVar[JavascriptInputEvent]) -> tuple[Var[float]]: @@ -798,7 +798,7 @@ def float_input_event(e: ObjectVar[JavascriptInputEvent]) -> tuple[Var[float]]: Returns: The value from the input event as a float. """ - return (Var("Number").to(FunctionVar).call(e.target.value).to(float),) + return (Var("Number").to(FunctionVar).call(e.target.value).to(float),) # ty:ignore[unresolved-attribute] def checked_input_event(e: ObjectVar[JavascriptInputEvent]) -> tuple[Var[bool]]: @@ -864,7 +864,7 @@ def key_event( "shift_key": e.shiftKey, }, ).to(KeyInputInfo), - ) + ) # ty:ignore[invalid-return-type] @dataclasses.dataclass( @@ -932,7 +932,7 @@ def pointer_event_spec( "shift_key": e.shiftKey, }, ).to(PointerEventInfo), - ) + ) # ty:ignore[invalid-return-type] def no_args_event_spec() -> tuple[()]: @@ -964,7 +964,7 @@ def __call__(self, *values: Var[T]) -> tuple[Var[T], ...]: @overload -def passthrough_event_spec( # pyright: ignore [reportOverlappingOverload] +def passthrough_event_spec( event_type: type[T], / ) -> Callable[[Var[T]], tuple[Var[T]]]: ... @@ -979,7 +979,7 @@ def passthrough_event_spec( def passthrough_event_spec(*event_types: type[T]) -> IdentityEventReturn[T]: ... -def passthrough_event_spec(*event_types: type[T]) -> IdentityEventReturn[T]: # pyright: ignore [reportInconsistentOverload] +def passthrough_event_spec(*event_types: type[T]) -> IdentityEventReturn[T]: """A helper function that returns the input event as output. Args: @@ -992,22 +992,22 @@ def passthrough_event_spec(*event_types: type[T]) -> IdentityEventReturn[T]: # def inner(*values: Var[T]) -> tuple[Var[T], ...]: return values - inner_type = tuple(Var[event_type] for event_type in event_types) - return_annotation = tuple[inner_type] + inner_type = tuple(Var[event_type] for event_type in event_types) # ty:ignore[invalid-type-form] + return_annotation = tuple[inner_type] # ty:ignore[invalid-type-form] - inner.__signature__ = inspect.signature(inner).replace( # pyright: ignore [reportFunctionMemberAccess] + inner.__signature__ = inspect.signature(inner).replace( # ty:ignore[unresolved-attribute] parameters=[ inspect.Parameter( f"ev_{i}", kind=inspect.Parameter.POSITIONAL_OR_KEYWORD, - annotation=Var[event_type], + annotation=Var[event_type], # ty:ignore[invalid-type-form] ) for i, event_type in enumerate(event_types) ], return_annotation=return_annotation, ) for i, event_type in enumerate(event_types): - inner.__annotations__[f"ev_{i}"] = Var[event_type] + inner.__annotations__[f"ev_{i}"] = Var[event_type] # ty:ignore[invalid-type-form] inner.__annotations__["return"] = return_annotation return inner @@ -1063,7 +1063,7 @@ def _as_event_spec( _js_expr="filesById", _var_type=dict[str, Any], _var_data=VarData.merge(upload_files_context_var_data), - ).to(ObjectVar)[LiteralVar.create(upload_id)] + ).to(ObjectVar)[LiteralVar.create(upload_id)] # ty:ignore[not-subscriptable] spec_args = [ ( Var(_js_expr="files"), @@ -1203,7 +1203,7 @@ def fn(): return None fn.__qualname__ = name - fn.__signature__ = sig # pyright: ignore [reportFunctionMemberAccess] + fn.__signature__ = sig # ty:ignore[unresolved-attribute] return EventSpec( handler=EventHandler(fn=fn), args=tuple( @@ -1271,7 +1271,7 @@ def console_log(message: str | Var[str]) -> EventSpec: Returns: An event to log the message. """ - return run_script(Var("console").to(dict).log.to(FunctionVar).call(message)) + return run_script(Var("console").to(dict).log.to(FunctionVar).call(message)) # ty:ignore[unresolved-attribute] @once @@ -1291,7 +1291,7 @@ def back() -> EventSpec: An event to go back one page. """ return run_script( - Var("window").to(dict).history.to(dict).back.to(FunctionVar).call() + Var("window").to(dict).history.to(dict).back.to(FunctionVar).call() # ty:ignore[unresolved-attribute] ) @@ -1304,7 +1304,7 @@ def window_alert(message: str | Var[str]) -> EventSpec: Returns: An event to alert the message. """ - return run_script(Var("window").to(dict).alert.to(FunctionVar).call(message)) + return run_script(Var("window").to(dict).alert.to(FunctionVar).call(message)) # ty:ignore[unresolved-attribute] def set_focus(ref: str) -> EventSpec: @@ -1466,7 +1466,7 @@ def set_clipboard(content: str | Var[str]) -> EventSpec: return run_script( Var("navigator") .to(dict) - .clipboard.to(dict) + .clipboard.to(dict) # ty:ignore[unresolved-attribute] .writeText.to(FunctionVar) .call(content) ) @@ -1580,8 +1580,8 @@ def call_script( javascript_code, original_code = ( LiteralVar.create(javascript_code), javascript_code, - ) - if not javascript_code._get_all_var_data(): + ) # ty:ignore[invalid-assignment] + if not javascript_code._get_all_var_data(): # ty:ignore[unresolved-attribute] # Without VarData, cast to string and eval the code in the event loop. javascript_code = str(Var(_js_expr=original_code)) @@ -1922,7 +1922,7 @@ def parse_args_spec(arg_spec: ArgsSpec | Sequence[ArgsSpec]): # if there's multiple, the first is the default if isinstance(arg_spec, Sequence): annotations = [get_type_hints(one_arg_spec) for one_arg_spec in arg_spec] - arg_spec = arg_spec[0] + arg_spec = arg_spec[0] # ty:ignore[invalid-assignment] else: annotations = [get_type_hints(arg_spec)] @@ -1932,11 +1932,11 @@ def parse_args_spec(arg_spec: ArgsSpec | Sequence[ArgsSpec]): arg_spec(*[ Var(f"_{l_arg}").to( unwrap_var_annotation( - resolve_annotation(annotations[0], l_arg, spec=arg_spec) + resolve_annotation(annotations[0], l_arg, spec=arg_spec) # ty:ignore[invalid-argument-type] ) ) for l_arg in spec.args - ]) + ]) # ty:ignore[call-non-callable] ), annotations @@ -2142,7 +2142,7 @@ def fix_events( for e in events: if callable(e) and getattr(e, "__name__", "") == "": # A lambda was returned, assume the user wants to call it with no args. - e = e() + e = e() # ty:ignore[call-top-callable] if isinstance(e, Event): # If the event is already an event, append it to the list. out.append(e) @@ -2202,7 +2202,7 @@ def bool(self) -> NoReturn: class LiteralEventVar(VarOperationCall, LiteralVar, EventVar): """A literal event var.""" - _var_value: EventSpec = dataclasses.field(default=None) # pyright: ignore [reportAssignmentType] + _var_value: EventSpec = dataclasses.field(default=None) # ty:ignore[invalid-assignment] def __hash__(self) -> int: """Get the hash of the var. @@ -2238,7 +2238,7 @@ def no_args(): try: value = call_event_handler(value, no_args) except EventFnArgMismatchError: - msg = f"Event handler {value.fn.__qualname__} used inside of a rx.cond() must not take any arguments." + msg = f"Event handler {value.fn.__qualname__} used inside of a rx.cond() must not take any arguments." # ty:ignore[unresolved-attribute] raise EventFnArgMismatchError(msg) from None return cls( @@ -2289,7 +2289,7 @@ def bool(self) -> NoReturn: class LiteralEventChainVar(ArgsFunctionOperationBuilder, LiteralVar, EventChainVar): """A literal event chain var.""" - _var_value: EventChain = dataclasses.field(default=None) # pyright: ignore [reportAssignmentType] + _var_value: EventChain = dataclasses.field(default=None) # ty:ignore[invalid-assignment] def __hash__(self) -> int: """Get the hash of the var. @@ -2322,7 +2322,7 @@ def create( if isinstance(value.args_spec, Sequence) else value.args_spec ) - sig = inspect.signature(arg_spec) # pyright: ignore [reportArgumentType] + sig = inspect.signature(arg_spec) # ty:ignore[invalid-argument-type] arg_vars = () if sig.parameters: arg_def = tuple(f"_{p}" for p in sig.parameters) @@ -2359,7 +2359,7 @@ def create( LiteralVar.create([LiteralVar.create(event)]), arg_def_expr, _EMPTY_EVENT_ACTIONS, - ) + ) # ty:ignore[no-matching-overload] ) for event in value.events ] @@ -2370,7 +2370,7 @@ def create( _EMPTY_EVENTS, arg_def_expr, _EMPTY_EVENT_ACTIONS, - ) + ) # ty:ignore[no-matching-overload] ) if len(statements) == 1 and not value.event_actions: @@ -2423,7 +2423,7 @@ def __init__(self, func: Callable[[Any, Unpack[P]], Any]): Args: func: The function to be wrapped. """ - self.func = func + self.func = func # ty:ignore[invalid-assignment] @overload def __call__( @@ -2459,7 +2459,7 @@ def __call__( value4: V4 | Var[V4], ) -> "EventCallback[Unpack[Q]]": ... - def __call__(self, *values) -> "EventCallback": # pyright: ignore [reportInconsistentOverload] + def __call__(self, *values) -> "EventCallback": """Call the function with the values. Args: @@ -2468,7 +2468,7 @@ def __call__(self, *values) -> "EventCallback": # pyright: ignore [reportIncons Returns: The function with the values. """ - return self.func(*values) # pyright: ignore [reportArgumentType] + return self.func(*values) @overload def __get__( @@ -2476,7 +2476,7 @@ def __get__( ) -> "EventCallback[Unpack[P]]": ... @overload - def __get__(self, instance: Any, owner: Any) -> "Callable[[Unpack[P]]]": ... + def __get__(self, instance: Any, owner: Any) -> "Callable[[Unpack[P]]]": ... # ty:ignore[invalid-type-form] def __get__(self, instance: Any, owner: Any) -> Callable: """Get the function with the instance bound to it. @@ -2736,7 +2736,7 @@ def wrapper( types = get_type_hints(func) state_arg_name = next(iter(inspect.signature(func).parameters), None) state_cls = state_arg_name and types.get(state_arg_name) - if state_cls and issubclass(state_cls, BaseState): + if state_cls and issubclass(state_cls, BaseState): # ty:ignore[invalid-argument-type] name = ( (func.__module__ + "." + qualname) .replace(".", "_") @@ -2762,7 +2762,7 @@ def wrapper( event_actions = _build_event_actions() if event_actions: setattr(func, EVENT_ACTIONS_MARKER, event_actions) - return func # pyright: ignore [reportReturnType] + return func if func is not None: return wrapper(func) @@ -2816,7 +2816,7 @@ def wrapper( __file__ = __file__ @property - def BaseState(self) -> "type[BaseState]": # noqa: N802 + def BaseState(self) -> "type[BaseState]": # noqa: N802 # ty:ignore[invalid-type-form] """Get the BaseState class. A reference to BaseState is needed for doc generation when resolving @@ -2832,9 +2832,9 @@ def BaseState(self) -> "type[BaseState]": # noqa: N802 event = EventNamespace -event.event = event # pyright: ignore[reportAttributeAccessIssue] +event.event = event # ty:ignore[unresolved-attribute] _this = sys.modules[__name__] -event.__path__ = _this.__path__ # pyright: ignore[reportAttributeAccessIssue] -event.__spec__ = _this.__spec__ # pyright: ignore[reportAttributeAccessIssue] -event.__package__ = _this.__package__ # pyright: ignore[reportAttributeAccessIssue] -sys.modules[__name__] = event # pyright: ignore[reportArgumentType] +event.__path__ = _this.__path__ # ty:ignore[unresolved-attribute] +event.__spec__ = _this.__spec__ # ty:ignore[unresolved-attribute] +event.__package__ = _this.__package__ # ty:ignore[unresolved-attribute] +sys.modules[__name__] = event # ty:ignore[invalid-assignment] diff --git a/packages/reflex-base/src/reflex_base/event/context.py b/packages/reflex-base/src/reflex_base/event/context.py index df3f0200e62..88ee1dc8827 100644 --- a/packages/reflex-base/src/reflex_base/event/context.py +++ b/packages/reflex-base/src/reflex_base/event/context.py @@ -24,7 +24,7 @@ def get_name(cls: type | Callable) -> str: The name of the state/func. """ module = cls.__module__.replace(".", "___") - qualname = getattr(cls, "__qualname__", cls.__name__).replace(".", "___") + qualname = getattr(cls, "__qualname__", cls.__name__).replace(".", "___") # ty:ignore[unresolved-attribute] return to_snake_case(f"{module}___{qualname}") diff --git a/packages/reflex-base/src/reflex_base/event/processor/base_state_processor.py b/packages/reflex-base/src/reflex_base/event/processor/base_state_processor.py index c8ad3e5d589..1f7134d76ef 100644 --- a/packages/reflex-base/src/reflex_base/event/processor/base_state_processor.py +++ b/packages/reflex-base/src/reflex_base/event/processor/base_state_processor.py @@ -251,7 +251,9 @@ async def process_event( try: while True: await chain_updates( - next(events), root_state=root_state, handler_name=handler_name + next(events), # ty:ignore[invalid-argument-type] + root_state=root_state, + handler_name=handler_name, ) except StopIteration as si: # the "return" value of the generator is not available @@ -391,7 +393,7 @@ async def _handle_backend_exception( if events := self.backend_exception_handler(ex): await chain_updates( events=events, - handler_name=self.backend_exception_handler.__qualname__, + handler_name=self.backend_exception_handler.__qualname__, # ty:ignore[unresolved-attribute] ) diff --git a/packages/reflex-base/src/reflex_base/event/processor/event_processor.py b/packages/reflex-base/src/reflex_base/event/processor/event_processor.py index 7d9296fe4dd..5555848fdc4 100644 --- a/packages/reflex-base/src/reflex_base/event/processor/event_processor.py +++ b/packages/reflex-base/src/reflex_base/event/processor/event_processor.py @@ -32,7 +32,7 @@ if hasattr(asyncio, "QueueShutDown"): - class QueueShutDown(asyncio.QueueShutDown): # pyright: ignore[reportRedeclaration] + class QueueShutDown(asyncio.QueueShutDown): """Exception raised when trying to put an item into a shut down queue.""" else: @@ -586,7 +586,7 @@ def _create_event_task( name=f"reflex_event|{entry.event.name}|{entry.ctx.token}|{time.time()}", ) if sys.version_info < (3, 12): - task._event_ctx = entry.ctx # pyright: ignore[reportAttributeAccessIssue] + task._event_ctx = entry.ctx # ty:ignore[unresolved-attribute] self._tasks[entry.ctx.txid] = task task.add_done_callback(self._finish_task) return task @@ -710,7 +710,7 @@ def _finish_task(self, task: asyncio.Task): if sys.version_info < (3, 12): # py3.11 compat - task_ctx = task._event_ctx # type: ignore[attr-defined] + task_ctx = task._event_ctx # type: ignore[attr-defined] # ty:ignore[unresolved-attribute] else: task_ctx = task.get_context().run(EventContext.get) self._tasks.pop(task_ctx.txid, None) @@ -746,7 +746,7 @@ def _finish_task(self, task: asyncio.Task): name=f"reflex_backend_exception_handler|task=[{task.get_name()}]|{time.time()}", ) if sys.version_info < (3, 12): - t._event_ctx = task_ctx # pyright: ignore[reportAttributeAccessIssue] + t._event_ctx = task_ctx # ty:ignore[unresolved-attribute] t.add_done_callback(self._finish_task) return console.error( diff --git a/packages/reflex-base/src/reflex_base/plugins/shared_tailwind.py b/packages/reflex-base/src/reflex_base/plugins/shared_tailwind.py index 62180093ee6..e32ddcacc89 100644 --- a/packages/reflex-base/src/reflex_base/plugins/shared_tailwind.py +++ b/packages/reflex-base/src/reflex_base/plugins/shared_tailwind.py @@ -106,7 +106,7 @@ def tailwind_config_js_template( # Extract destructured imports from plugin dicts only imports = [ - plugin["import"] + plugin["import"] # ty:ignore[invalid-argument-type] for plugin in plugins if isinstance(plugin, Mapping) and "import" in plugin ] @@ -121,7 +121,7 @@ def tailwind_config_js_template( for i, plugin in enumerate(plugins, 1): if isinstance(plugin, Mapping) and "call" not in plugin: plugin_imports.append( - f"import plugin{i} from {json.dumps(plugin['name'])};" + f"import plugin{i} from {json.dumps(plugin['name'])};" # ty:ignore[invalid-argument-type] ) elif not isinstance(plugin, Mapping): plugin_imports.append(f"import plugin{i} from {json.dumps(plugin)};") @@ -139,8 +139,8 @@ def tailwind_config_js_template( if isinstance(plugin, Mapping) and "call" in plugin: args_part = "" if "args" in plugin: - args_part = json.dumps(plugin["args"]) - plugin_list.append(f"{plugin['call']}({args_part})") + args_part = json.dumps(plugin["args"]) # ty:ignore[invalid-argument-type, invalid-key] + plugin_list.append(f"{plugin['call']}({args_part})") # ty:ignore[invalid-argument-type, invalid-key] else: plugin_list.append(f"plugin{i}") diff --git a/packages/reflex-base/src/reflex_base/style.py b/packages/reflex-base/src/reflex_base/style.py index d80d650297c..c2ac51a28d0 100644 --- a/packages/reflex-base/src/reflex_base/style.py +++ b/packages/reflex-base/src/reflex_base/style.py @@ -68,7 +68,7 @@ def set_color_mode( ).to(FunctionVar) return run_script( - base_setter.call(new_color_mode), + base_setter.call(new_color_mode), # ty:ignore[unresolved-attribute] ) @@ -154,7 +154,7 @@ def convert_list( for responsive_item in responsive_list: if isinstance(responsive_item, dict): # Recursively format nested style dictionaries. - item, item_var_data = convert(responsive_item) + item, item_var_data = convert(responsive_item) # ty:ignore[invalid-argument-type] else: item, item_var_data = convert_item(responsive_item) converted_value.append(item) @@ -365,7 +365,7 @@ def format_as_emotion(style_dict: dict[str, Any]) -> Style | None: else: # Apply media queries from responsive value list. mbps = { - media_query([0, *breakpoints_values][bp]): ( + media_query([0, *breakpoints_values][bp]): ( # ty:ignore[invalid-argument-type] bp_value if isinstance(bp_value, dict) else {key: bp_value} ) for bp, bp_value in enumerate(value) diff --git a/packages/reflex-base/src/reflex_base/utils/console.py b/packages/reflex-base/src/reflex_base/utils/console.py index b7a9539f77b..8ac45fcbab9 100644 --- a/packages/reflex-base/src/reflex_base/utils/console.py +++ b/packages/reflex-base/src/reflex_base/utils/console.py @@ -275,7 +275,7 @@ def _exclude_paths_from_frame_info() -> list[Path]: try: import reflex as rx except ImportError: - rx = None + rx = None # ty:ignore[invalid-assignment] # Exclude utility modules that should never be the source of deprecated reflex usage. exclude_modules: list[ModuleType | None] = [ diff --git a/packages/reflex-base/src/reflex_base/utils/decorator.py b/packages/reflex-base/src/reflex_base/utils/decorator.py index f1b31419fbc..f7f00371fca 100644 --- a/packages/reflex-base/src/reflex_base/utils/decorator.py +++ b/packages/reflex-base/src/reflex_base/utils/decorator.py @@ -24,7 +24,7 @@ def once(f: Callable[[], T]) -> Callable[[], T]: def wrapper() -> T: nonlocal value value = f() if value is unset else value - return value # pyright: ignore[reportReturnType] + return value # ty:ignore[invalid-return-type] return wrapper @@ -66,7 +66,7 @@ def debug(f: Callable[P, T]) -> Callable[P, T]: def wrapper(*args: P.args, **kwargs: P.kwargs) -> T: result = f(*args, **kwargs) print( # noqa: T201 - f"Calling {f.__name__} with args: {args} and kwargs: {kwargs}, result: {result}" + f"Calling {f.__name__} with args: {args} and kwargs: {kwargs}, result: {result}" # ty:ignore[unresolved-attribute] ) return result @@ -108,7 +108,7 @@ def cached_procedure( The decorated function. """ - def _inner_decorator(func: Callable[P, Picklable]) -> Callable[P, Picklable]: + def _inner_decorator(func: Callable[P, Picklable]) -> Callable[P, Picklable]: # ty:ignore[invalid-type-form] def _inner(*args: P.args, **kwargs: P.kwargs) -> Picklable: cache_file = cache_file_path() @@ -123,7 +123,7 @@ def _inner(*args: P.args, **kwargs: P.kwargs) -> Picklable: from reflex_base.utils import console console.debug( - f"Using cached value for {func.__name__} with payload: {new_payload}" + f"Using cached value for {func.__name__} with payload: {new_payload}" # ty:ignore[unresolved-attribute] ) return cast("Picklable", value) diff --git a/packages/reflex-base/src/reflex_base/utils/format.py b/packages/reflex-base/src/reflex_base/utils/format.py index c8f11e01f02..3736154c077 100644 --- a/packages/reflex-base/src/reflex_base/utils/format.py +++ b/packages/reflex-base/src/reflex_base/utils/format.py @@ -404,7 +404,7 @@ def format_prop( # For dictionaries, convert any properties to strings. if isinstance(prop, dict): - prop = serializers.serialize_dict(prop) # pyright: ignore [reportAttributeAccessIssue] + prop = serializers.serialize_dict(prop) # ty:ignore[unresolved-attribute] else: # Dump the prop as JSON. @@ -577,7 +577,7 @@ def _default_args_spec(): if isinstance(spec, (EventHandler, EventSpec)): specs = [call_event_handler(spec, args_spec or _default_args_spec)] elif isinstance(spec, type(lambda: None)): - specs = call_event_fn(spec, args_spec or _default_args_spec) # pyright: ignore [reportAssignmentType, reportArgumentType] + specs = call_event_fn(spec, args_spec or _default_args_spec) # ty:ignore[invalid-assignment] if isinstance(specs, Var): msg = f"Invalid event spec: {specs}. Expected a list of EventSpecs." raise ValueError(msg) diff --git a/packages/reflex-base/src/reflex_base/utils/imports.py b/packages/reflex-base/src/reflex_base/utils/imports.py index e4ec1935739..d48646b514d 100644 --- a/packages/reflex-base/src/reflex_base/utils/imports.py +++ b/packages/reflex-base/src/reflex_base/utils/imports.py @@ -50,7 +50,7 @@ def merge_imports( if isinstance(fields, (list, tuple, set)): all_imports[lib].extend( ImportVar(field) if isinstance(field, str) else field - for field in fields + for field in fields # ty:ignore[invalid-argument-type] ) else: all_imports[lib].append( diff --git a/packages/reflex-base/src/reflex_base/utils/pyi_generator.py b/packages/reflex-base/src/reflex_base/utils/pyi_generator.py index 0425f03d7b1..63ccf75fe86 100644 --- a/packages/reflex-base/src/reflex_base/utils/pyi_generator.py +++ b/packages/reflex-base/src/reflex_base/utils/pyi_generator.py @@ -490,7 +490,7 @@ def _get_class_event_triggers(target_class: type) -> frozenset[str]: Returns: The event trigger names defined on the class. """ - return frozenset(target_class.get_event_triggers()) + return frozenset(target_class.get_event_triggers()) # ty:ignore[unresolved-attribute] def _generate_imports( @@ -506,7 +506,7 @@ def _generate_imports( """ return [ *[ - ast.ImportFrom(module=name, names=[ast.alias(name=val) for val in values]) # pyright: ignore [reportCallIssue] + ast.ImportFrom(module=name, names=[ast.alias(name=val) for val in values]) # ty:ignore[no-matching-overload] for name, values in DEFAULT_IMPORTS.items() ], ast.Import([ast.alias("reflex")]), @@ -641,7 +641,7 @@ def _extract_class_props_as_ast_nodes( # with the annotation in some cases. with contextlib.suppress(AttributeError, KeyError): # Try to get default from pydantic field definition. - default = target_class.__fields__[name].default + default = target_class.__fields__[name].default # ty:ignore[unresolved-attribute] if isinstance(default, Var): default = default._decode() @@ -658,7 +658,7 @@ def _extract_class_props_as_ast_nodes( ) ), ), - ast.Constant(value=default), # pyright: ignore [reportArgumentType] + ast.Constant(value=default), )) return kwargs @@ -746,7 +746,7 @@ def type_to_ast( return ast.Name(id=str(typ)) # Get the base type name (List, Dict, Optional, etc.) - base_name = getattr(origin, "_name", origin.__name__) + base_name = getattr(origin, "_name", origin.__name__) # ty:ignore[unresolved-attribute] # Get type arguments args = get_args(typ) @@ -837,7 +837,9 @@ def _generate_component_create_functiondef( # kwargs associated with props defined in the class and its parents all_classes = [c for c in clz.__mro__ if issubclass(c, Component)] prop_kwargs = _extract_class_props_as_ast_nodes( - clz.create, all_classes, type_hint_globals + clz.create, + all_classes, # ty:ignore[invalid-argument-type] + type_hint_globals, ) all_props = [arg[0].arg for arg in prop_kwargs] kwargs.extend(prop_kwargs) @@ -964,7 +966,7 @@ def figure_out_return_type(annotation: Any): defaults=[], ) - return ast.FunctionDef( # pyright: ignore [reportCallIssue] + return ast.FunctionDef( name="create", args=create_args, body=[ @@ -1016,7 +1018,7 @@ def _generate_staticmethod_call_functiondef( else [] ), ) - return ast.FunctionDef( # pyright: ignore [reportCallIssue] + return ast.FunctionDef( name="__call__", args=call_args, body=[ @@ -1067,7 +1069,7 @@ def _generate_namespace_call_functiondef( # Determine which class is wrapped by the namespace __call__ method component_clz = clz.__call__.__self__ - if clz.__call__.__func__.__name__ != "create": # pyright: ignore [reportFunctionMemberAccess] + if clz.__call__.__func__.__name__ != "create": return None if not issubclass(component_clz, Component): @@ -1158,7 +1160,7 @@ def visit_Module(self, node: ast.Module) -> ast.Module: The modified Module node. """ self.generic_visit(node) - return self._remove_docstring(node) # pyright: ignore [reportReturnType] + return self._remove_docstring(node) # ty:ignore[invalid-return-type] def visit_Import( self, node: ast.Import | ast.ImportFrom diff --git a/packages/reflex-base/src/reflex_base/utils/serializers.py b/packages/reflex-base/src/reflex_base/utils/serializers.py index d20a29e3890..c30d4b02a85 100644 --- a/packages/reflex-base/src/reflex_base/utils/serializers.py +++ b/packages/reflex-base/src/reflex_base/utils/serializers.py @@ -93,7 +93,7 @@ def wrapper(fn: SERIALIZED_FUNCTION) -> SERIALIZED_FUNCTION: # Make sure the type is not already registered. registered_fn = SERIALIZERS.get(type_) if registered_fn is not None and registered_fn != fn and overwrite is not True: - message = f"Overwriting serializer for type {type_} from {registered_fn.__module__}:{registered_fn.__qualname__} to {fn.__module__}:{fn.__qualname__}." + message = f"Overwriting serializer for type {type_} from {registered_fn.__module__}:{registered_fn.__qualname__} to {fn.__module__}:{fn.__qualname__}." # ty:ignore[unresolved-attribute] if overwrite is False: raise ValueError(message) caller_frame = next( @@ -494,7 +494,7 @@ def serialize_image(image: Img) -> str: base64_image = base64.b64encode(image_bytes).decode("utf-8") try: # Newer method to get the mime type, but does not always work. - mime_type = image.get_format_mimetype() # pyright: ignore [reportAttributeAccessIssue] + mime_type = image.get_format_mimetype() # ty:ignore[unresolved-attribute] except AttributeError: try: # Fallback method diff --git a/packages/reflex-base/src/reflex_base/utils/types.py b/packages/reflex-base/src/reflex_base/utils/types.py index 0d2e63858f9..e78395d74ed 100644 --- a/packages/reflex-base/src/reflex_base/utils/types.py +++ b/packages/reflex-base/src/reflex_base/utils/types.py @@ -25,9 +25,9 @@ Tuple, TypeVar, Union, - _eval_type, # pyright: ignore [reportAttributeAccessIssue] - _GenericAlias, # pyright: ignore [reportAttributeAccessIssue] - _SpecialGenericAlias, # pyright: ignore [reportAttributeAccessIssue] + _eval_type, # ty:ignore[unresolved-import] + _GenericAlias, # ty:ignore[unresolved-import] + _SpecialGenericAlias, # ty:ignore[unresolved-import] get_args, is_typeddict, ) @@ -71,24 +71,24 @@ def __call__(self) -> Sequence[Var]: ... class _ArgsSpec1(Protocol): - def __call__(self, var1: VAR1, /) -> Sequence[Var]: ... # pyright: ignore [reportInvalidTypeVarUse] + def __call__(self, var1: VAR1, /) -> Sequence[Var]: ... class _ArgsSpec2(Protocol): - def __call__(self, var1: VAR1, var2: VAR2, /) -> Sequence[Var]: ... # pyright: ignore [reportInvalidTypeVarUse] + def __call__(self, var1: VAR1, var2: VAR2, /) -> Sequence[Var]: ... class _ArgsSpec3(Protocol): - def __call__(self, var1: VAR1, var2: VAR2, var3: VAR3, /) -> Sequence[Var]: ... # pyright: ignore [reportInvalidTypeVarUse] + def __call__(self, var1: VAR1, var2: VAR2, var3: VAR3, /) -> Sequence[Var]: ... class _ArgsSpec4(Protocol): def __call__( self, - var1: VAR1, # pyright: ignore [reportInvalidTypeVarUse] - var2: VAR2, # pyright: ignore [reportInvalidTypeVarUse] - var3: VAR3, # pyright: ignore [reportInvalidTypeVarUse] - var4: VAR4, # pyright: ignore [reportInvalidTypeVarUse] + var1: VAR1, + var2: VAR2, + var3: VAR3, + var4: VAR4, /, ) -> Sequence[Var]: ... @@ -96,11 +96,11 @@ def __call__( class _ArgsSpec5(Protocol): def __call__( self, - var1: VAR1, # pyright: ignore [reportInvalidTypeVarUse] - var2: VAR2, # pyright: ignore [reportInvalidTypeVarUse] - var3: VAR3, # pyright: ignore [reportInvalidTypeVarUse] - var4: VAR4, # pyright: ignore [reportInvalidTypeVarUse] - var5: VAR5, # pyright: ignore [reportInvalidTypeVarUse] + var1: VAR1, + var2: VAR2, + var3: VAR3, + var4: VAR4, + var5: VAR5, /, ) -> Sequence[Var]: ... @@ -108,12 +108,12 @@ def __call__( class _ArgsSpec6(Protocol): def __call__( self, - var1: VAR1, # pyright: ignore [reportInvalidTypeVarUse] - var2: VAR2, # pyright: ignore [reportInvalidTypeVarUse] - var3: VAR3, # pyright: ignore [reportInvalidTypeVarUse] - var4: VAR4, # pyright: ignore [reportInvalidTypeVarUse] - var5: VAR5, # pyright: ignore [reportInvalidTypeVarUse] - var6: VAR6, # pyright: ignore [reportInvalidTypeVarUse] + var1: VAR1, + var2: VAR2, + var3: VAR3, + var4: VAR4, + var5: VAR5, + var6: VAR6, /, ) -> Sequence[Var]: ... @@ -121,13 +121,13 @@ def __call__( class _ArgsSpec7(Protocol): def __call__( self, - var1: VAR1, # pyright: ignore [reportInvalidTypeVarUse] - var2: VAR2, # pyright: ignore [reportInvalidTypeVarUse] - var3: VAR3, # pyright: ignore [reportInvalidTypeVarUse] - var4: VAR4, # pyright: ignore [reportInvalidTypeVarUse] - var5: VAR5, # pyright: ignore [reportInvalidTypeVarUse] - var6: VAR6, # pyright: ignore [reportInvalidTypeVarUse] - var7: VAR7, # pyright: ignore [reportInvalidTypeVarUse] + var1: VAR1, + var2: VAR2, + var3: VAR3, + var4: VAR4, + var5: VAR5, + var6: VAR6, + var7: VAR7, /, ) -> Sequence[Var]: ... @@ -232,7 +232,7 @@ def get_type_hints(obj: Any) -> dict[str, Any]: def _unionize(args: list[GenericType]) -> GenericType: if not args: - return Any # pyright: ignore [reportReturnType] + return Any if len(args) == 1: return args[0] return Union[tuple(args)] # noqa: UP007 @@ -304,7 +304,7 @@ def has_args(cls: type) -> bool: # Check if the class inherits from a generic class (using __orig_bases__) if hasattr(cls, "__orig_bases__"): - for base in cls.__orig_bases__: + for base in cls.__orig_bases__: # ty:ignore[not-iterable] if get_args(base): return True @@ -461,13 +461,13 @@ def get_attribute_access_type(cls: GenericType, name: str) -> GenericType | None if type_ is not None: if hasattr(column_type, "item_type"): try: - item_type = column_type.item_type.python_type # pyright: ignore [reportAttributeAccessIssue] + item_type = column_type.item_type.python_type except NotImplementedError: item_type = None if item_type is not None: if type_ in PrimitiveToAnnotation: type_ = PrimitiveToAnnotation[type_] - type_ = type_[item_type] # pyright: ignore [reportIndexIssue] + type_ = type_[item_type] if hasattr(column, "nullable") and column.nullable: type_ = type_ | None return type_ @@ -485,8 +485,8 @@ def get_attribute_access_type(cls: GenericType, name: str) -> GenericType | None return list[ get_attribute_access_type( attr.target_class, - attr.remote_attr.key, # pyright: ignore [reportAttributeAccessIssue] - ) + attr.remote_attr.key, + ) # ty:ignore[invalid-type-form] ] elif ( isinstance(cls, type) @@ -494,7 +494,7 @@ def get_attribute_access_type(cls: GenericType, name: str) -> GenericType | None and issubclass(cls, sqlmodel_types) ): # Check in the annotations directly (for sqlmodel.Relationship) - hints = get_type_hints(cls) # pyright: ignore [reportArgumentType] + hints = get_type_hints(cls) if name in hints: type_ = hints[name] type_origin = get_origin(type_) @@ -510,7 +510,7 @@ def get_attribute_access_type(cls: GenericType, name: str) -> GenericType | None # Bare class exceptions = NameError try: - hints = get_type_hints(cls) # pyright: ignore [reportArgumentType] + hints = get_type_hints(cls) if name in hints: return hints[name] except exceptions as e: @@ -540,7 +540,7 @@ def get_base_class(cls: GenericType) -> type: return type(get_args(cls)[0]) if is_union(cls): - return tuple(get_base_class(arg) for arg in get_args(cls)) # pyright: ignore [reportReturnType] + return tuple(get_base_class(arg) for arg in get_args(cls)) # ty:ignore[invalid-return-type] return get_base_class(cls.__origin__) if is_generic_alias(cls) else cls @@ -927,9 +927,9 @@ def validate_literal(key: str, value: Any, expected_type: type, comp_name: str): is_literal(expected_type) and not isinstance(value, Var) # validating vars is not supported yet. and not is_encoded_fstring(value) # f-strings are not supported. - and value not in expected_type.__args__ + and value not in expected_type.__args__ # ty:ignore[unresolved-attribute] ): - allowed_values = expected_type.__args__ + allowed_values = expected_type.__args__ # ty:ignore[unresolved-attribute] if value not in allowed_values: allowed_value_str = ",".join([ str(v) if not isinstance(v, str) else f"'{v}'" for v in allowed_values diff --git a/packages/reflex-base/src/reflex_base/vars/base.py b/packages/reflex-base/src/reflex_base/vars/base.py index 4034b69aa3c..8338de6a085 100644 --- a/packages/reflex-base/src/reflex_base/vars/base.py +++ b/packages/reflex-base/src/reflex_base/vars/base.py @@ -179,7 +179,7 @@ def __init__( if hooks and any(hooks.values()): # Merge our dependencies first, so they can be referenced. - merged_var_data = VarData.merge(*hooks.values(), self) + merged_var_data = VarData.merge(*hooks.values(), self) # ty:ignore[invalid-argument-type] if merged_var_data is not None: object.__setattr__(self, "state", merged_var_data.state) object.__setattr__(self, "field_name", merged_var_data.field_name) @@ -410,7 +410,7 @@ def __str__(self) -> str: return self._js_expr @property - def _var_is_local(self) -> bool: + def _var_is_local(self) -> bool: # ty:ignore[invalid-type-form] """Whether this is a local javascript variable. Returns: @@ -419,7 +419,7 @@ def _var_is_local(self) -> bool: return False @property - def _var_is_string(self) -> bool: + def _var_is_string(self) -> bool: # ty:ignore[invalid-type-form] """Whether the var is a string literal. Returns: @@ -456,7 +456,7 @@ def __init_subclass__( frozen=True, slots=True, ) - class ToVarOperation(ToOperation, cls): + class ToVarOperation(ToOperation, cls): # ty:ignore[shadowed-type-variable] """Base class of converting a var to another var type.""" _original: Var = dataclasses.field( @@ -525,7 +525,7 @@ def __deepcopy__(self, memo: dict[int, Any]) -> Self: """ return self - def equals(self, other: Var) -> bool: + def equals(self, other: Var) -> bool: # ty:ignore[invalid-type-form] """Check if two vars are equal. Args: @@ -602,7 +602,7 @@ def _replace( @overload @classmethod - def create( # pyright: ignore[reportOverlappingOverload] + def create( cls, value: NoReturn, _var_data: VarData | None = None, @@ -610,9 +610,9 @@ def create( # pyright: ignore[reportOverlappingOverload] @overload @classmethod - def create( # pyright: ignore[reportOverlappingOverload] + def create( cls, - value: bool, + value: bool, # ty:ignore[invalid-type-form] _var_data: VarData | None = None, ) -> LiteralBooleanVar: ... @@ -642,7 +642,7 @@ def create( @overload @classmethod - def create( # pyright: ignore [reportOverlappingOverload] + def create( cls, value: Color, _var_data: VarData | None = None, @@ -650,7 +650,7 @@ def create( # pyright: ignore [reportOverlappingOverload] @overload @classmethod - def create( # pyright: ignore [reportOverlappingOverload] + def create( cls, value: LITERAL_STRING_T, _var_data: VarData | None = None, @@ -658,7 +658,7 @@ def create( # pyright: ignore [reportOverlappingOverload] @overload @classmethod - def create( # pyright: ignore [reportOverlappingOverload] + def create( cls, value: STRING_T, _var_data: VarData | None = None, @@ -666,7 +666,7 @@ def create( # pyright: ignore [reportOverlappingOverload] @overload @classmethod - def create( # pyright: ignore[reportOverlappingOverload] + def create( cls, value: None, _var_data: VarData | None = None, @@ -713,9 +713,9 @@ def create( """ # If the value is already a var, do nothing. if isinstance(value, Var): - return value + return value # ty:ignore[invalid-return-type] - return LiteralVar.create(value, _var_data=_var_data) + return LiteralVar.create(value, _var_data=_var_data) # ty:ignore[invalid-return-type] def __format__(self, format_spec: str) -> str: """Format the var into a Javascript equivalent to an f-string. @@ -734,10 +734,10 @@ def __format__(self, format_spec: str) -> str: return f"{constants.REFLEX_VAR_OPENING_TAG}{hashed_var}{constants.REFLEX_VAR_CLOSING_TAG}{self._js_expr}" @overload - def to(self, output: type[str]) -> StringVar: ... # pyright: ignore[reportOverlappingOverload] + def to(self, output: type[str]) -> StringVar: ... @overload - def to(self, output: type[bool]) -> BooleanVar: ... + def to(self, output: type[bool]) -> BooleanVar: ... # ty:ignore[invalid-type-form] @overload def to(self, output: type[int]) -> NumberVar[int]: ... @@ -806,7 +806,7 @@ def to( return self.to(var_subclass.var_subclass, output) if fixed_output_type is None: - return get_to_operation(NoneVar).create(self) # pyright: ignore [reportReturnType] + return get_to_operation(NoneVar).create(self) # Handle fixed_output_type being Base or a dataclass. if can_use_in_object_var(output): @@ -820,7 +820,7 @@ def to( new_var_type = var_type else: new_var_type = var_type or current_var_type - return var_subclass.to_var_subclass.create( # pyright: ignore [reportReturnType] + return var_subclass.to_var_subclass.create( value=self, _var_type=new_var_type ) @@ -841,13 +841,13 @@ def to( return self @overload - def guess_type(self: Var[NoReturn]) -> Var[Any]: ... # pyright: ignore [reportOverlappingOverload] + def guess_type(self: Var[NoReturn]) -> Var[Any]: ... @overload def guess_type(self: Var[str]) -> StringVar: ... @overload - def guess_type(self: Var[bool]) -> BooleanVar: ... + def guess_type(self: Var[bool]) -> BooleanVar: ... # ty:ignore[invalid-type-form] @overload def guess_type(self: Var[int] | Var[float] | Var[int | float]) -> NumberVar: ... @@ -985,13 +985,13 @@ def _var_set_state(self, state: type[BaseState] | str) -> Self: else format_state_name(state.get_full_name()) ) - return StateOperation.create( # pyright: ignore [reportReturnType] + return StateOperation.create( formatted_state_name, self, _var_data=VarData.merge( VarData.from_state(state, self._js_expr), self._var_data ), - ).guess_type() + ).guess_type() # ty:ignore[invalid-return-type] def __eq__(self, other: Var | Any) -> BooleanVar: """Check if the current variable is equal to the given variable. @@ -1109,7 +1109,7 @@ def __invert__(self) -> BooleanVar: """ return ~self.bool() - def to_string(self, use_json: bool = True) -> StringVar: + def to_string(self, use_json: bool = True) -> StringVar: # ty:ignore[invalid-type-form] """Convert the var to a string. Args: @@ -1124,7 +1124,7 @@ def to_string(self, use_json: bool = True) -> StringVar: return ( JSON_STRINGIFY.call(self).to(StringVar) if use_json - else PROTOTYPE_TO_STRING.call(self).to(StringVar) + else PROTOTYPE_TO_STRING.call(self).to(StringVar) # ty:ignore[invalid-return-type] ) def _as_ref(self) -> Var: @@ -1385,10 +1385,10 @@ def create( The ToOperation. """ return cls( - _js_expr="", # pyright: ignore [reportCallIssue] - _var_data=_var_data, # pyright: ignore [reportCallIssue] - _var_type=_var_type or cls._default_var_type, # pyright: ignore [reportCallIssue, reportAttributeAccessIssue] - _original=value, # pyright: ignore [reportCallIssue] + _js_expr="", # ty:ignore[unknown-argument] + _var_data=_var_data, # ty:ignore[unknown-argument] + _var_type=_var_type or cls._default_var_type, # ty:ignore[unknown-argument, unresolved-attribute] + _original=value, # ty:ignore[unknown-argument] ) @@ -1649,7 +1649,7 @@ def get_python_literal(value: LiteralVar | Any) -> Any | None: # NoReturn is used to match CustomVarOperationReturn with no type hint. @overload -def var_operation( # pyright: ignore [reportOverlappingOverload] +def var_operation( func: Callable[P, CustomVarOperationReturn[NoReturn]], ) -> Callable[P, Var]: ... @@ -1661,7 +1661,7 @@ def var_operation( @overload -def var_operation( # pyright: ignore [reportOverlappingOverload] +def var_operation( func: Callable[P, CustomVarOperationReturn[bool]] | Callable[P, CustomVarOperationReturn[bool | None]], ) -> Callable[P, BooleanVar]: ... @@ -1711,7 +1711,7 @@ def var_operation( ) -> Callable[P, Var[T]]: ... -def var_operation( # pyright: ignore [reportInconsistentOverload] +def var_operation( func: Callable[P, CustomVarOperationReturn[T]], ) -> Callable[P, Var[T]]: """Decorator for creating a var operation. @@ -1743,9 +1743,9 @@ def wrapper(*args: P.args, **kwargs: P.kwargs) -> Var[T]: } return CustomVarOperation.create( - name=func.__name__, + name=func.__name__, # ty:ignore[unresolved-attribute] args=tuple(list(args_vars.items()) + list(kwargs_vars.items())), - return_var=func(*args_vars.values(), **kwargs_vars), # pyright: ignore [reportCallIssue, reportReturnType] + return_var=func(*args_vars.values(), **kwargs_vars), # ty:ignore[invalid-argument-type] ).guess_type() return wrapper @@ -1768,21 +1768,21 @@ def figure_out_type(value: Any) -> types.GenericType: if isinstance(value, list): if not value: return Sequence[NoReturn] - return Sequence[unionize(*{figure_out_type(v) for v in value[:100]})] + return Sequence[unionize(*{figure_out_type(v) for v in value[:100]})] # ty:ignore[invalid-type-form] if isinstance(value, set): - return set[unionize(*{figure_out_type(v) for v in value})] + return set[unionize(*{figure_out_type(v) for v in value})] # ty:ignore[invalid-type-form] if isinstance(value, tuple): if not value: return tuple[NoReturn, ...] if len(value) <= 5: - return tuple[tuple(figure_out_type(v) for v in value)] - return tuple[unionize(*{figure_out_type(v) for v in value[:100]}), ...] + return tuple[tuple(figure_out_type(v) for v in value)] # ty:ignore[invalid-type-form] + return tuple[unionize(*{figure_out_type(v) for v in value[:100]}), ...] # ty:ignore[invalid-type-form] if isinstance(value, Mapping): if not value: return Mapping[NoReturn, NoReturn] return Mapping[ - unionize(*{figure_out_type(k) for k in list(value.keys())[:100]}), - unionize(*{figure_out_type(v) for v in list(value.values())[:100]}), + unionize(*{figure_out_type(k) for k in list(value.keys())[:100]}), # ty:ignore[invalid-type-form] + unionize(*{figure_out_type(v) for v in list(value.values())[:100]}), # ty:ignore[invalid-type-form] ] return type(value) @@ -1912,7 +1912,7 @@ def __getattr__(self, name: str) -> Any: next_class = parent_classes[parent_classes.index(CachedVarOperation) + 1] - return next_class.__getattr__(self, name) + return next_class.__getattr__(self, name) # ty:ignore[unresolved-attribute] def _get_all_var_data(self) -> VarData | None: """Get all VarData associated with the Var. @@ -2073,7 +2073,7 @@ class ComputedVar(Var[RETURN_TYPE]): _fget: Callable[[BaseState], RETURN_TYPE] = dataclasses.field( default_factory=lambda: lambda _: None - ) # pyright: ignore [reportAssignmentType] + ) # ty:ignore[invalid-assignment] _name: str = dataclasses.field(default="") @@ -2109,9 +2109,9 @@ def __init__( ) if hint is Any: - raise UntypedComputedVarError(var_name=fget.__name__) + raise UntypedComputedVarError(var_name=fget.__name__) # ty:ignore[unresolved-attribute] is_using_fget_name = "_js_expr" not in kwargs - js_expr = kwargs.pop("_js_expr", fget.__name__ + FIELD_MARKER) + js_expr = kwargs.pop("_js_expr", fget.__name__ + FIELD_MARKER) # ty:ignore[unresolved-attribute] kwargs.setdefault("_var_type", hint) Var.__init__( @@ -2120,7 +2120,7 @@ def __init__( _var_type=kwargs.pop("_var_type"), _var_data=kwargs.pop( "_var_data", - VarData(field_name=fget.__name__) if is_using_fget_name else None, + VarData(field_name=fget.__name__) if is_using_fget_name else None, # ty:ignore[unresolved-attribute] ), ) @@ -2129,12 +2129,12 @@ def __init__( raise TypeError(msg) if backend is None: - backend = fget.__name__.startswith("_") + backend = fget.__name__.startswith("_") # ty:ignore[unresolved-attribute] object.__setattr__(self, "_backend", backend) object.__setattr__(self, "_initial_value", initial_value) object.__setattr__(self, "_cache", cache) - object.__setattr__(self, "_name", fget.__name__) + object.__setattr__(self, "_name", fget.__name__) # ty:ignore[unresolved-attribute] if isinstance(interval, int): interval = datetime.timedelta(seconds=interval) @@ -2359,18 +2359,18 @@ def __get__(self, instance: BaseState | None, owner: type): """ if instance is None: state_where_defined = owner - while self._name in state_where_defined.inherited_vars: - state_where_defined = state_where_defined.get_parent_state() + while self._name in state_where_defined.inherited_vars: # ty:ignore[unresolved-attribute] + state_where_defined = state_where_defined.get_parent_state() # ty:ignore[unresolved-attribute] field_name = ( - format_state_name(state_where_defined.get_full_name()) + format_state_name(state_where_defined.get_full_name()) # ty:ignore[unresolved-attribute] + "." + self._js_expr ) return dispatch( field_name, - var_data=VarData.from_state(state_where_defined, self._name), + var_data=VarData.from_state(state_where_defined, self._name), # ty:ignore[invalid-argument-type] result_var_type=self._var_type, existing_var=self, ) @@ -2507,7 +2507,7 @@ def _determine_var_type(self) -> type: hints = get_type_hints(self._fget) if "return" in hints: return hints["return"] - return Any # pyright: ignore [reportReturnType] + return Any @property def __class__(self) -> type: @@ -2769,7 +2769,7 @@ def computed_var( if fget is not None: sign = inspect.signature(fget) if len(sign.parameters) != 1: - raise ComputedVarSignatureError(fget.__name__, signature=str(sign)) + raise ComputedVarSignatureError(fget.__name__, signature=str(sign)) # ty:ignore[unresolved-attribute] if inspect.iscoroutinefunction(fget): computed_var_cls = AsyncComputedVar @@ -3140,13 +3140,13 @@ def transform(fn: Callable[[Var], Var]) -> Callable[[Var], Var]: origin = get_origin(return_type) if origin is not Var: - msg = f"Expected return type of {fn.__name__} to be a Var, got {origin}." + msg = f"Expected return type of {fn.__name__} to be a Var, got {origin}." # ty:ignore[unresolved-attribute] raise TypeError(msg) generic_args = get_args(return_type) if not generic_args: - msg = f"Expected Var return type of {fn.__name__} to have a generic type." + msg = f"Expected Var return type of {fn.__name__} to have a generic type." # ty:ignore[unresolved-attribute] raise TypeError(msg) generic_type = get_origin(generic_args[0]) or generic_args[0] @@ -3197,7 +3197,7 @@ def dispatch( fn_return_origin = get_origin(fn_return) or fn_return if fn_return_origin is not Var: - msg = f"Expected return type of {fn.__name__} to be a Var, got {fn_return}." + msg = f"Expected return type of {fn.__name__} to be a Var, got {fn_return}." # ty:ignore[unresolved-attribute] raise TypeError(msg) fn_return_generic_args = get_args(fn_return) @@ -3209,7 +3209,7 @@ def dispatch( arg_origin = get_origin(fn_first_arg_type) or fn_first_arg_type if arg_origin is not Var: - msg = f"Expected first argument of {fn.__name__} to be a Var, got {fn_first_arg_type}." + msg = f"Expected first argument of {fn.__name__} to be a Var, got {fn_first_arg_type}." # ty:ignore[unresolved-attribute] raise TypeError(msg) arg_generic_args = get_args(fn_first_arg_type) @@ -3275,8 +3275,7 @@ def __init__( default: FIELD_TYPE | _MISSING_TYPE = MISSING, default_factory: Callable[[], FIELD_TYPE] | None = None, is_var: bool = True, - annotated_type: GenericType # pyright: ignore [reportRedeclaration] - | _MISSING_TYPE = MISSING, + annotated_type: GenericType | _MISSING_TYPE = MISSING, ) -> None: """Initialize the field. @@ -3300,7 +3299,7 @@ def __init__( if self.default is MISSING and self.default_factory is None: default_value = types.get_default_value_for_type(annotated_type) if default_value is None and not types.is_optional(annotated_type): - annotated_type = annotated_type | None + annotated_type = annotated_type | None # ty:ignore[conflicting-declarations] if types.is_immutable(default_value): self.default = default_value else: @@ -3310,7 +3309,7 @@ def __init__( self.outer_type_ = self.annotated_type = annotated_type if type_origin is Annotated: - type_origin = annotated_type.__origin__ # pyright: ignore [reportAttributeAccessIssue] + type_origin = annotated_type.__origin__ self.type_ = self.type_origin = type_origin else: @@ -3433,7 +3432,7 @@ def __get__(self, instance: None, owner: Any) -> Var[FIELD_TYPE]: ... @overload def __get__(self, instance: Any, owner: Any) -> FIELD_TYPE: ... - def __get__(self, instance: Any, owner: Any): # pyright: ignore [reportInconsistentOverload] + def __get__(self, instance: Any, owner: Any): """Get the Var. Args: diff --git a/packages/reflex-base/src/reflex_base/vars/dep_tracking.py b/packages/reflex-base/src/reflex_base/vars/dep_tracking.py index b8642d2ef6e..577e8d7ca84 100644 --- a/packages/reflex-base/src/reflex_base/vars/dep_tracking.py +++ b/packages/reflex-base/src/reflex_base/vars/dep_tracking.py @@ -96,7 +96,7 @@ class DependencyTracker: _getting_state_class: type[BaseState] | ModuleType | None = dataclasses.field( default=None ) - _get_var_value_positions: dis.Positions | None = dataclasses.field(default=None) + _get_var_value_positions: dis.Positions | None = dataclasses.field(default=None) # ty:ignore[unresolved-attribute] _last_import_name: str | None = dataclasses.field(default=None) INVALID_NAMES: ClassVar[list[str]] = ["parent_state", "substates", "get_substate"] @@ -105,10 +105,10 @@ def __post_init__(self): """After initializing, populate the dependencies dict.""" with contextlib.suppress(AttributeError): # unbox functools.partial - self.func = cast(FunctionType, self.func.func) # pyright: ignore[reportAttributeAccessIssue] + self.func = cast(FunctionType, self.func.func) # ty:ignore[unresolved-attribute] with contextlib.suppress(AttributeError): # unbox EventHandler - self.func = cast(FunctionType, self.func.fn) # pyright: ignore[reportAttributeAccessIssue,reportFunctionMemberAccess] + self.func = cast(FunctionType, self.func.fn) # ty:ignore[unresolved-attribute] if isinstance(self.func, FunctionType): with contextlib.suppress(AttributeError, IndexError): @@ -216,7 +216,7 @@ def _get_globals(self) -> dict[str, Any]: """ if isinstance(self.func, CodeType): return {} - return self.func.__globals__ # pyright: ignore[reportAttributeAccessIssue] + return self.func.__globals__ def _get_closure(self) -> dict[str, Any]: """Get the closure of the function, with unbound values omitted. @@ -229,7 +229,7 @@ def _get_closure(self) -> dict[str, Any]: return { var_name: get_cell_value(cell) for var_name, cell in zip( - self.func.__code__.co_freevars, # pyright: ignore[reportAttributeAccessIssue] + self.func.__code__.co_freevars, self.func.__closure__ or (), strict=False, ) @@ -311,7 +311,7 @@ def handle_getting_state_post_await(self, instruction: dis.Instruction) -> None: # Attribute access on an inline `get_state`, not assigned to a variable. self.load_attr_or_method(instruction) - def _eval_var(self, positions: dis.Positions) -> Var: + def _eval_var(self, positions: dis.Positions) -> Var: # ty:ignore[unresolved-attribute] """Evaluate instructions from the wrapped function to get the Var object. Args: @@ -372,10 +372,10 @@ def handle_getting_var(self, instruction: dis.Instruction) -> None: VarValueError: if the source code for the var cannot be determined. """ if instruction.opname == "CALL": - if instruction.positions is None: + if instruction.positions is None: # ty:ignore[unresolved-attribute] msg = f"Cannot determine the source code for the var in {self.func!r}." raise VarValueError(msg) - the_var = self._eval_var(instruction.positions) + the_var = self._eval_var(instruction.positions) # ty:ignore[unresolved-attribute] the_var_data = the_var._get_all_var_data() if the_var_data is None: msg = f"Cannot determine the source code for the var in {self.func!r}." diff --git a/packages/reflex-base/src/reflex_base/vars/function.py b/packages/reflex-base/src/reflex_base/vars/function.py index 812c7d72d8b..e3acfd10e95 100644 --- a/packages/reflex-base/src/reflex_base/vars/function.py +++ b/packages/reflex-base/src/reflex_base/vars/function.py @@ -176,7 +176,7 @@ def partial( @overload def partial(self, *args: Var | Any) -> FunctionVar: ... - def partial(self, *args: Var | Any) -> FunctionVar: # pyright: ignore [reportInconsistentOverload] + def partial(self, *args: Var | Any) -> FunctionVar: """Partially apply the function with the given arguments. Args: @@ -250,7 +250,7 @@ def call( @overload def call(self, *args: Var | Any) -> Var: ... - def call(self, *args: Var | Any) -> Var: # pyright: ignore [reportInconsistentOverload] + def call(self, *args: Var | Any) -> Var: """Call the function with the given arguments. Args: @@ -279,7 +279,7 @@ class FunctionStringVar(FunctionVar[CALLABLE_TYPE]): def create( cls, func: str, - _var_type: type[OTHER_CALLABLE_TYPE] = ReflexCallable[Any, Any], + _var_type: type[OTHER_CALLABLE_TYPE] = ReflexCallable[Any, Any], # ty:ignore[invalid-parameter-default] _var_data: VarData | None = None, ) -> FunctionStringVar[OTHER_CALLABLE_TYPE]: """Create a new function var from a string. diff --git a/packages/reflex-base/src/reflex_base/vars/number.py b/packages/reflex-base/src/reflex_base/vars/number.py index ae3f8ac4987..cc1ee6f3f18 100644 --- a/packages/reflex-base/src/reflex_base/vars/number.py +++ b/packages/reflex-base/src/reflex_base/vars/number.py @@ -294,7 +294,7 @@ def __neg__(self) -> NumberVar: Returns: The number negation operation. """ - return number_negate_operation(self) # pyright: ignore [reportReturnType] + return number_negate_operation(self) def __invert__(self): """Boolean NOT the number. @@ -523,7 +523,7 @@ def wrapper(lhs: number_types, rhs: number_types) -> NumberVar: Returns: The binary number operation. """ - return operation(lhs, rhs) # pyright: ignore [reportReturnType, reportArgumentType] + return operation(lhs, rhs) return wrapper @@ -1137,7 +1137,7 @@ def ternary_operation( Returns: The ternary operation. """ - type_value: type[T] | type[U] = unionize(if_true._var_type, if_false._var_type) + type_value: type[T] | type[U] = unionize(if_true._var_type, if_false._var_type) # ty:ignore[invalid-assignment] value: CustomVarOperationReturn[T | U] = var_operation_return( js_expression=f"({condition} ? {if_true} : {if_false})", var_type=type_value, diff --git a/packages/reflex-base/src/reflex_base/vars/object.py b/packages/reflex-base/src/reflex_base/vars/object.py index 307240f7186..a3d61d84533 100644 --- a/packages/reflex-base/src/reflex_base/vars/object.py +++ b/packages/reflex-base/src/reflex_base/vars/object.py @@ -170,7 +170,7 @@ def merge(self, other: ObjectVar): # NoReturn is used here to catch when key value is Any @overload - def __getitem__( # pyright: ignore [reportOverlappingOverload] + def __getitem__( self: ObjectVar[Mapping[Any, NoReturn]], key: Var | Any, ) -> Var: ... @@ -255,9 +255,9 @@ def get(self, key: Var | Any, default: Var | Any | None = None) -> Var: if default is None: default = Var.create(None) - value = self.__getitem__(key) # pyright: ignore[reportUnknownVariableType,reportAttributeAccessIssue,reportUnknownMemberType] + value = self.__getitem__(key) # ty:ignore[no-matching-overload] - return cond( # pyright: ignore[reportUnknownVariableType] + return cond( value, value, default, @@ -265,7 +265,7 @@ def get(self, key: Var | Any, default: Var | Any | None = None) -> Var: # NoReturn is used here to catch when key value is Any @overload - def __getattr__( # pyright: ignore [reportOverlappingOverload] + def __getattr__( self: ObjectVar[Mapping[Any, NoReturn]], name: str, ) -> Var: ... @@ -384,7 +384,7 @@ def _key_type(self) -> type: The type of the keys of the object. """ args_list = typing.get_args(self._var_type) - return args_list[0] if args_list else Any # pyright: ignore [reportReturnType] + return args_list[0] if args_list else Any def _value_type(self) -> type: """Get the type of the values of the object. @@ -393,7 +393,7 @@ def _value_type(self) -> type: The type of the values of the object. """ args_list = typing.get_args(self._var_type) - return args_list[1] if args_list else Any # pyright: ignore [reportReturnType] + return args_list[1] if args_list else Any @cached_property_no_lock def _cached_var_name(self) -> str: @@ -542,7 +542,7 @@ def object_values_operation(value: ObjectVar): """ return var_operation_return( js_expression=f"Object.values({value} ?? {{}})", - var_type=list[value._value_type()], + var_type=list[value._value_type()], # ty:ignore[invalid-type-form] ) @@ -558,7 +558,7 @@ def object_entries_operation(value: ObjectVar): """ return var_operation_return( js_expression=f"Object.entries({value} ?? {{}})", - var_type=list[tuple[str, value._value_type()]], + var_type=list[tuple[str, value._value_type()]], # ty:ignore[invalid-type-form] ) @@ -576,8 +576,8 @@ def object_merge_operation(lhs: ObjectVar, rhs: ObjectVar): return var_operation_return( js_expression=f"({{...{lhs}, ...{rhs}}})", var_type=Mapping[ - lhs._key_type() | rhs._key_type(), - lhs._value_type() | rhs._value_type(), + lhs._key_type() | rhs._key_type(), # ty:ignore[invalid-type-form] + lhs._value_type() | rhs._value_type(), # ty:ignore[invalid-type-form] ], ) diff --git a/packages/reflex-base/src/reflex_base/vars/sequence.py b/packages/reflex-base/src/reflex_base/vars/sequence.py index a296f0052b8..0f4db6f0a6d 100644 --- a/packages/reflex-base/src/reflex_base/vars/sequence.py +++ b/packages/reflex-base/src/reflex_base/vars/sequence.py @@ -100,7 +100,7 @@ def reverse(self) -> ArrayVar[ARRAY_VAR_TYPE]: Returns: The reversed array. """ - return array_reverse_operation(self) + return array_reverse_operation(self) # ty:ignore[invalid-return-type] def __add__(self, other: ArrayVar[ARRAY_VAR_TYPE]) -> ArrayVar[ARRAY_VAR_TYPE]: """Concatenate two arrays. @@ -114,7 +114,7 @@ def __add__(self, other: ArrayVar[ARRAY_VAR_TYPE]) -> ArrayVar[ARRAY_VAR_TYPE]: if not isinstance(other, ArrayVar): raise_unsupported_operand_types("+", (type(self), type(other))) - return array_concat_operation(self, other) + return array_concat_operation(self, other) # ty:ignore[invalid-return-type] @overload def __getitem__(self, i: slice) -> ArrayVar[ARRAY_VAR_TYPE]: ... @@ -145,7 +145,7 @@ def __getitem__( ) -> NumberVar: ... @overload - def __getitem__( # pyright: ignore [reportOverlappingOverload] + def __getitem__( self: ArrayVar[tuple[str, Any]], i: Literal[0, -2] ) -> StringVar: ... @@ -317,7 +317,7 @@ def pluck(self, field: StringVar | str) -> ArrayVar: Returns: The array pluck operation. """ - return array_pluck_operation(self, field) + return array_pluck_operation(self, field) # ty:ignore[invalid-return-type] def __mul__(self, other: NumberVar | int) -> ArrayVar[ARRAY_VAR_TYPE]: """Multiply the sequence by a number or integer. @@ -333,7 +333,7 @@ def __mul__(self, other: NumberVar | int) -> ArrayVar[ARRAY_VAR_TYPE]: ): raise_unsupported_operand_types("*", (type(self), type(other))) - return repeat_array_operation(self, other) + return repeat_array_operation(self, other) # ty:ignore[invalid-return-type] __rmul__ = __mul__ @@ -830,7 +830,7 @@ def __ge__(self, other: StringVar | str) -> BooleanVar: return string_ge_operation(self, other) @overload - def replace( # pyright: ignore [reportOverlappingOverload] + def replace( self, search_value: StringVar | str, new_value: StringVar | str ) -> StringVar: ... @@ -839,7 +839,7 @@ def replace( self, search_value: Any, new_value: Any ) -> CustomVarOperationReturn[StringVar]: ... - def replace(self, search_value: Any, new_value: Any) -> StringVar: # pyright: ignore [reportInconsistentOverload] + def replace(self, search_value: Any, new_value: Any) -> StringVar: """Replace a string with a value. Args: diff --git a/packages/reflex-components-code/src/reflex_components_code/code.py b/packages/reflex-components-code/src/reflex_components_code/code.py index eb96cde27d6..83f44c5c260 100644 --- a/packages/reflex-components-code/src/reflex_components_code/code.py +++ b/packages/reflex-components-code/src/reflex_components_code/code.py @@ -393,7 +393,7 @@ class CodeBlock(Component, MarkdownComponentMap): language: Var[LiteralCodeLanguage] = field( default=Var.create("python"), doc="The language to use." - ) + ) # ty:ignore[invalid-assignment] code: Var[str] = field(doc="The code to display.") diff --git a/packages/reflex-components-code/src/reflex_components_code/shiki_code_block.py b/packages/reflex-components-code/src/reflex_components_code/shiki_code_block.py index f18568d5912..7b4d9869775 100644 --- a/packages/reflex-components-code/src/reflex_components_code/shiki_code_block.py +++ b/packages/reflex-components-code/src/reflex_components_code/shiki_code_block.py @@ -550,11 +550,11 @@ class ShikiCodeBlock(Component, MarkdownComponentMap): language: Var[LiteralCodeLanguage] = field( default=Var.create("python"), doc="The language to use." - ) + ) # ty:ignore[invalid-assignment] theme: Var[LiteralCodeTheme] = field( default=Var.create("one-light"), doc='The theme to use ("light" or "dark").' - ) + ) # ty:ignore[invalid-assignment] themes: Var[list[dict[str, Any]] | dict[str, str]] = field( doc="The set of themes to use for different modes." @@ -565,11 +565,11 @@ class ShikiCodeBlock(Component, MarkdownComponentMap): transformers: Var[list[ShikiBaseTransformers | dict[str, Any]]] = field( default=Var.create([]), doc="The transformers to use for the syntax highlighter.", - ) + ) # ty:ignore[invalid-assignment] decorations: Var[list[ShikiDecorations]] = field( default=Var.create([]), doc="The decorations to use for the syntax highlighter." - ) + ) # ty:ignore[invalid-assignment] @classmethod def create( @@ -613,7 +613,7 @@ def create( transformer_styles = {} # Collect styles from transformers and wrapper - for transformer in code_block.transformers._var_value: # pyright: ignore [reportAttributeAccessIssue] + for transformer in code_block.transformers._var_value: # ty:ignore[unresolved-attribute] if isinstance(transformer, ShikiBaseTransformers) and transformer.style: transformer_styles.update(transformer.style) transformer_styles.update(code_wrapper_props.pop("style", {})) @@ -668,7 +668,7 @@ def create_transformer(cls, library: str, fns: list[str]) -> ShikiBaseTransforme raise ValueError(msg) return ShikiBaseTransformers( library=library, - fns=[FunctionStringVar.create(fn) for fn in fns], # pyright: ignore [reportCallIssue] + fns=[FunctionStringVar.create(fn) for fn in fns], ) def _render(self, props: dict[str, Any] | None = None): diff --git a/packages/reflex-components-core/src/reflex_components_core/base/meta.py b/packages/reflex-components-core/src/reflex_components_core/base/meta.py index a5485c96b0d..bec7edefb5a 100644 --- a/packages/reflex-components-core/src/reflex_components_core/base/meta.py +++ b/packages/reflex-components-core/src/reflex_components_core/base/meta.py @@ -36,7 +36,7 @@ class Description(elements.Meta): name: Var[str] = field( default=Var.create("description"), doc="The type of the description." - ) + ) # ty:ignore[invalid-assignment] class Image(elements.Meta): @@ -44,4 +44,4 @@ class Image(elements.Meta): property: Var[str] = field( default=Var.create("og:image"), doc="The type of the image." - ) + ) # ty:ignore[invalid-assignment] diff --git a/packages/reflex-components-core/src/reflex_components_core/core/banner.py b/packages/reflex-components-core/src/reflex_components_core/core/banner.py index 8d9af0bef76..5272fb8c4e9 100644 --- a/packages/reflex-components-core/src/reflex_components_core/core/banner.py +++ b/packages/reflex-components-core/src/reflex_components_core/core/banner.py @@ -102,7 +102,7 @@ def add_hooks(self) -> list[str | Var]: close_button=True, duration=120000, id=toast_id, - ) # pyright: ignore [reportCallIssue] + ) if environment.REFLEX_DOES_BACKEND_COLD_START.get(): loading_message = Var.create("Backend is starting.") diff --git a/packages/reflex-components-core/src/reflex_components_core/core/breakpoints.py b/packages/reflex-components-core/src/reflex_components_core/core/breakpoints.py index e6277d6327d..1d406a2f916 100644 --- a/packages/reflex-components-core/src/reflex_components_core/core/breakpoints.py +++ b/packages/reflex-components-core/src/reflex_components_core/core/breakpoints.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.breakpoints import * # pragma: no cover diff --git a/packages/reflex-components-core/src/reflex_components_core/core/cond.py b/packages/reflex-components-core/src/reflex_components_core/core/cond.py index 98ba56d170d..360c756cab7 100644 --- a/packages/reflex-components-core/src/reflex_components_core/core/cond.py +++ b/packages/reflex-components-core/src/reflex_components_core/core/cond.py @@ -92,7 +92,7 @@ def add_imports(self) -> ImportDict: @overload -def cond(condition: Any, c1: Component, c2: Any, /) -> Component: ... # pyright: ignore [reportOverlappingOverload] +def cond(condition: Any, c1: Component, c2: Any, /) -> Component: ... @overload @@ -100,7 +100,7 @@ def cond(condition: Any, c1: Component, /) -> Component: ... @overload -def cond(condition: Any, c1: Any, c2: Component, /) -> Component: ... # pyright: ignore [reportOverlappingOverload] +def cond(condition: Any, c1: Any, c2: Component, /) -> Component: ... T = TypeVar("T", covariant=True) @@ -108,15 +108,15 @@ def cond(condition: Any, c1: Any, c2: Component, /) -> Component: ... # pyright @overload -def cond(condition: Any, c1: Var[T], c2: Var[U], /) -> Var[T | U]: ... # pyright: ignore [reportOverlappingOverload] +def cond(condition: Any, c1: Var[T], c2: Var[U], /) -> Var[T | U]: ... @overload -def cond(condition: Any, c1: T, c2: Var[U], /) -> Var[T | U]: ... # pyright: ignore [reportOverlappingOverload] +def cond(condition: Any, c1: T, c2: Var[U], /) -> Var[T | U]: ... @overload -def cond(condition: Any, c1: Var[T], c2: U, /) -> Var[T | U]: ... # pyright: ignore [reportOverlappingOverload] +def cond(condition: Any, c1: Var[T], c2: U, /) -> Var[T | U]: ... @overload @@ -173,7 +173,7 @@ def cond(condition: Any, c1: Any, c2: Any = types.Unset(), /) -> Component | Var @overload -def color_mode_cond(light: Component, dark: Component | None = None) -> Component: ... # pyright: ignore [reportOverlappingOverload] +def color_mode_cond(light: Component, dark: Component | None = None) -> Component: ... @overload diff --git a/packages/reflex-components-core/src/reflex_components_core/core/debounce.py b/packages/reflex-components-core/src/reflex_components_core/core/debounce.py index 500cd1f96a6..81d5637314d 100644 --- a/packages/reflex-components-core/src/reflex_components_core/core/debounce.py +++ b/packages/reflex-components-core/src/reflex_components_core/core/debounce.py @@ -133,12 +133,12 @@ def create(cls, *children: Component, **props: Any) -> Component: ) component = super().create(**props) - component._get_style = child._get_style + component._get_style = child._get_style # ty:ignore[invalid-assignment] component.event_triggers.update(child.event_triggers) component.children = child.children - component._rename_props = child._rename_props # pyright: ignore[reportAttributeAccessIssue] + component._rename_props = child._rename_props # ty:ignore[invalid-attribute-access] outer_get_all_custom_code = component._get_all_custom_code - component._get_all_custom_code = lambda: ( + component._get_all_custom_code = lambda: ( # ty:ignore[invalid-assignment] outer_get_all_custom_code() | (child._get_all_custom_code()) ) return component diff --git a/packages/reflex-components-core/src/reflex_components_core/core/foreach.py b/packages/reflex-components-core/src/reflex_components_core/core/foreach.py index 1df59feda9d..85d8136d1f5 100644 --- a/packages/reflex-components-core/src/reflex_components_core/core/foreach.py +++ b/packages/reflex-components-core/src/reflex_components_core/core/foreach.py @@ -72,9 +72,9 @@ def create( LiteralVar.create(iterable).guess_type() if not isinstance(iterable, Var) else iterable.guess_type() - ) + ) # ty:ignore[invalid-assignment] - if iterable._var_type == Any: + if iterable._var_type == Any: # ty:ignore[unresolved-attribute] msg = ( f"Could not foreach over var `{iterable!s}` of type Any. " "(If you are trying to foreach over a state var, add a type annotation to the var). " @@ -97,7 +97,7 @@ def create( if not isinstance(iterable, ArrayVar): msg = ( - f"Could not foreach over var `{iterable!s}` of type {iterable._var_type}. " + f"Could not foreach over var `{iterable!s}` of type {iterable._var_type}. " # ty:ignore[unresolved-attribute] "See https://reflex.dev/docs/library/dynamic-rendering/foreach/" ) raise ForeachVarError(msg) @@ -149,7 +149,7 @@ def _render(self) -> IterTag: if (render_fn_code := getattr(render_fn, "__code__", None)) is not None: code_hash = md5(render_fn_code.co_code).hexdigest() elif isinstance(render_fn, functools.partial): - code_hash = md5(render_fn.func.__code__.co_code).hexdigest() + code_hash = md5(render_fn.func.__code__.co_code).hexdigest() # ty:ignore[unresolved-attribute] else: code_hash = md5(repr(render_fn).encode()).hexdigest() props["index_var_name"] = f"index_{code_hash}" diff --git a/packages/reflex-components-core/src/reflex_components_core/core/match.py b/packages/reflex-components-core/src/reflex_components_core/core/match.py index d062587b04c..5eb7d11bd99 100644 --- a/packages/reflex-components-core/src/reflex_components_core/core/match.py +++ b/packages/reflex-components-core/src/reflex_components_core/core/match.py @@ -247,7 +247,7 @@ def _create_match_cond_var_or_component( cond=match_cond_var, match_cases=match_cases, default=default, - children=[case[1] for case in match_cases] + [default], # pyright: ignore [reportArgumentType] + children=[case[1] for case in match_cases] + [default], # ty:ignore[invalid-argument-type] ) ) diff --git a/packages/reflex-components-core/src/reflex_components_core/core/upload.py b/packages/reflex-components-core/src/reflex_components_core/core/upload.py index 642ef851749..4d2b59a2d16 100644 --- a/packages/reflex-components-core/src/reflex_components_core/core/upload.py +++ b/packages/reflex-components-core/src/reflex_components_core/core/upload.py @@ -118,7 +118,7 @@ def clear_selected_files(id_: str = DEFAULT_UPLOAD_ID) -> EventSpec: # UploadFilesProvider assigns a special function to clear selected files # into the shared global refs object to make it accessible outside a React # component via `run_script` (otherwise backend could never clear files). - return run_script(Var("__clear_selected_files")._as_ref().to(FunctionVar).call(id_)) + return run_script(Var("__clear_selected_files")._as_ref().to(FunctionVar).call(id_)) # ty:ignore[unresolved-attribute] def cancel_upload(upload_id: str) -> EventSpec: @@ -169,7 +169,7 @@ def get_upload_url(file_path: str | Var[str]) -> Var[str]: """ Upload.is_used = True - return Var.create(f"{uploaded_files_url_prefix}/{file_path}") + return Var.create(f"{uploaded_files_url_prefix}/{file_path}") # ty:ignore[invalid-return-type] _on_drop_spec = passthrough_event_spec(list[UploadFile]) @@ -201,7 +201,7 @@ def _format_rejected_file_record(rf: ObjectVar[dict[str, Any]]) -> str: title="Files not Accepted", description=rejected_files .to(ArrayVar) - .foreach(_format_rejected_file_record) + .foreach(_format_rejected_file_record) # ty:ignore[unresolved-attribute] .join("\n\n"), close_button=True, style={"white_space": "pre-line"}, diff --git a/packages/reflex-components-core/src/reflex_components_core/el/elements/forms.py b/packages/reflex-components-core/src/reflex_components_core/el/elements/forms.py index 8a2422081a5..18b3989774b 100644 --- a/packages/reflex-components-core/src/reflex_components_core/el/elements/forms.py +++ b/packages/reflex-components-core/src/reflex_components_core/el/elements/forms.py @@ -196,7 +196,7 @@ def create(cls, *children, **props): # Render the form hooks and use the hash of the resulting code to create a unique name. props["handle_submit_unique_name"] = "" form = super().create(*children, **props) - form.handle_submit_unique_name = md5( # pyright: ignore[reportAttributeAccessIssue] + form.handle_submit_unique_name = md5( # ty:ignore[unresolved-attribute] str(form._get_all_hooks()).encode("utf-8") ).hexdigest() return form diff --git a/packages/reflex-components-dataeditor/src/reflex_components_dataeditor/dataeditor.py b/packages/reflex-components-dataeditor/src/reflex_components_dataeditor/dataeditor.py index b5399be80cc..b8f91d49f2a 100644 --- a/packages/reflex-components-dataeditor/src/reflex_components_dataeditor/dataeditor.py +++ b/packages/reflex-components-dataeditor/src/reflex_components_dataeditor/dataeditor.py @@ -364,7 +364,7 @@ class DataEditor(NoSSRComponent): ) on_finished_editing: EventHandler[ - passthrough_event_spec(GridCell | None, tuple[int, int]) + passthrough_event_spec(GridCell | None, tuple[int, int]) # ty:ignore[no-matching-overload] ] = field(doc="Fired when editing is finished.") on_row_appended: EventHandler[no_args_event_spec] = field( diff --git a/packages/reflex-components-internal/src/reflex_components_internal/blocks/plain.py b/packages/reflex-components-internal/src/reflex_components_internal/blocks/plain.py index c0e6134ff27..5a66c892fdf 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/blocks/plain.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/blocks/plain.py @@ -18,27 +18,27 @@ class PlainChat(rx.Component): tag = "PlainChat" - full_name: rx.Var[str] = rx.Var.create("User") - short_name: rx.Var[str] = rx.Var.create("User") - chat_avatar_url: rx.Var[str] = rx.Var.create("") - external_id: rx.Var[str] = rx.Var.create("") + full_name: rx.Var[str] = rx.Var.create("User") # ty:ignore[invalid-assignment] + short_name: rx.Var[str] = rx.Var.create("User") # ty:ignore[invalid-assignment] + chat_avatar_url: rx.Var[str] = rx.Var.create("") # ty:ignore[invalid-assignment] + external_id: rx.Var[str] = rx.Var.create("") # ty:ignore[invalid-assignment] hide_launcher: rx.Var[bool] = rx.Var.create(True) # Optional email authentication - email: rx.Var[str] = rx.Var.create("") - email_hash: rx.Var[str] = rx.Var.create("") + email: rx.Var[str] = rx.Var.create("") # ty:ignore[invalid-assignment] + email_hash: rx.Var[str] = rx.Var.create("") # ty:ignore[invalid-assignment] # Optional built-in email verification require_authentication: rx.Var[bool] = rx.Var.create(False) # Optional tier ID for thread details - tier_id: rx.Var[str] = rx.Var.create("") + tier_id: rx.Var[str] = rx.Var.create("") # ty:ignore[invalid-assignment] # Entry point options # Type is either 'default' or 'chat'. 'default' opens intro screen, 'chat' opens straight into chat - entry_point_type: rx.Var[str] = rx.Var.create("") + entry_point_type: rx.Var[str] = rx.Var.create("") # ty:ignore[invalid-assignment] # The external ID of which chat to open. If not provided it defaults to the last conversation - entry_point_external_id: rx.Var[str] = rx.Var.create("") + entry_point_external_id: rx.Var[str] = rx.Var.create("") # ty:ignore[invalid-assignment] # Prevents the user from going back to the intro screen to start a new chat single_chat_mode: rx.Var[bool] = rx.Var.create(False) diff --git a/packages/reflex-components-internal/src/reflex_components_internal/components/base/__init__.py b/packages/reflex-components-internal/src/reflex_components_internal/components/base/__init__.py index a1097feeba0..a8d118dd3d2 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/components/base/__init__.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/components/base/__init__.py @@ -11,5 +11,5 @@ __getattr__, __dir__, __all__ = lazy_loader.attach( __name__, submodules=_SUBMODULES, - submod_attrs=_SUBMOD_ATTRS, + submod_attrs=_SUBMOD_ATTRS, # ty:ignore[invalid-argument-type] ) diff --git a/packages/reflex-components-internal/src/reflex_components_internal/components/base/checkbox.py b/packages/reflex-components-internal/src/reflex_components_internal/components/base/checkbox.py index 4e5a135af9c..3d8d8880913 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/components/base/checkbox.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/components/base/checkbox.py @@ -123,7 +123,7 @@ def create(cls, *children, **props) -> BaseUIComponent: """ class_name = props.pop("class_name", "") if label := props.pop("label", None): - return Label.create( # pyright: ignore[reportReturnType] + return Label.create( CheckboxRoot.create( CheckboxIndicator.create(), *children, @@ -131,7 +131,7 @@ def create(cls, *children, **props) -> BaseUIComponent: ), label, class_name=cn(ClassNames.LABEL, class_name), - ) + ) # ty:ignore[invalid-return-type] return CheckboxRoot.create( CheckboxIndicator.create(), *children, diff --git a/packages/reflex-components-internal/src/reflex_components_internal/components/base/context_menu.py b/packages/reflex-components-internal/src/reflex_components_internal/components/base/context_menu.py index 2e69eba8c9b..9b1ec268c98 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/components/base/context_menu.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/components/base/context_menu.py @@ -377,7 +377,7 @@ class ContextMenuRadioGroup(ContextMenuBaseComponent): value: Var[str | int] # Event handler called when the value changes. - on_value_change: EventHandler[passthrough_event_spec(str | int, dict)] + on_value_change: EventHandler[passthrough_event_spec(str | int, dict)] # ty:ignore[no-matching-overload] # Whether the component should ignore user interaction. Defaults to False. disabled: Var[bool] diff --git a/packages/reflex-components-internal/src/reflex_components_internal/components/base/input.py b/packages/reflex-components-internal/src/reflex_components_internal/components/base/input.py index 824836ea4af..f349a3476e5 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/components/base/input.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/components/base/input.py @@ -59,7 +59,7 @@ class InputRoot(InputBaseComponent, ReflexInput): render_: Var[Component] @classmethod - def create(cls, *children, **props) -> "InputRoot": # pyright: ignore[reportIncompatibleMethodOverride] + def create(cls, *children, **props) -> "InputRoot": """Create a high level input component with simplified API. Returns: @@ -67,7 +67,7 @@ def create(cls, *children, **props) -> "InputRoot": # pyright: ignore[reportInc """ props["data-slot"] = "input" cls.set_class_name(ClassNames.INPUT, props) - return super().create(*children, **props) # pyright: ignore[reportReturnType] + return super().create(*children, **props) # ty:ignore[invalid-return-type] class HighLevelInput(InputBaseComponent): @@ -151,7 +151,7 @@ def create(cls, *children, **props) -> BaseUIComponent: }, }) - return Div.create( # pyright: ignore[reportReturnType] + return Div.create( ( Span.create( hi(icon, class_name="text-secondary-12 size-4 pointer-events-none"), @@ -166,7 +166,7 @@ def create(cls, *children, **props) -> BaseUIComponent: on_click=set_focus(id), class_name=cn(f"{ClassNames.DIV} {INPUT_SIZE_VARIANTS[size]}", class_name), **props, - ) + ) # ty:ignore[invalid-return-type] @staticmethod def _create_clear_button(id: str, clear_events: list[EventHandler]) -> Button: diff --git a/packages/reflex-components-internal/src/reflex_components_internal/components/base/menu.py b/packages/reflex-components-internal/src/reflex_components_internal/components/base/menu.py index 84429654c75..dda6d6823fe 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/components/base/menu.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/components/base/menu.py @@ -461,7 +461,7 @@ class MenuRadioGroup(MenuBaseComponent): value: Var[str | int] # Function called when the selected value changes. - on_value_change: EventHandler[passthrough_event_spec(str | int, dict)] + on_value_change: EventHandler[passthrough_event_spec(str | int, dict)] # ty:ignore[no-matching-overload] # Whether the component should ignore user interaction. Defaults to False. disabled: Var[bool] diff --git a/packages/reflex-components-internal/src/reflex_components_internal/components/base/scroll_area.py b/packages/reflex-components-internal/src/reflex_components_internal/components/base/scroll_area.py index 00069d8664d..48baaccb8a4 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/components/base/scroll_area.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/components/base/scroll_area.py @@ -103,7 +103,7 @@ class ScrollAreaScrollbar(ScrollAreaBaseComponent): tag = "ScrollArea.Scrollbar" # Orientation of the scrollbar - orientation: Var[LiteralOrientation] = Var.create("vertical") + orientation: Var[LiteralOrientation] = Var.create("vertical") # ty:ignore[invalid-assignment] # Whether to keep the HTML element in the DOM when the viewport isn't scrollable keep_mounted: Var[bool] = Var.create(False) @@ -178,7 +178,7 @@ class HighLevelScrollArea(ScrollAreaRoot): """High level wrapper for the Scroll Area component.""" # Orientation of the scroll area - orientation: Var[LiteralOrientation] = Var.create("vertical") + orientation: Var[LiteralOrientation] = Var.create("vertical") # ty:ignore[invalid-assignment] # Whether to keep the HTML element in the DOM when the viewport isn't scrollable keep_mounted: Var[bool] = Var.create(False) diff --git a/packages/reflex-components-internal/src/reflex_components_internal/components/base/select.py b/packages/reflex-components-internal/src/reflex_components_internal/components/base/select.py index ddde1a10dcc..fcffa267f85 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/components/base/select.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/components/base/select.py @@ -448,7 +448,7 @@ class SelectSeparator(SelectBaseComponent): tag = "Select.Separator" # The orientation of the separator. - orientation: Var[LiteralOrientation] = Var.create("horizontal") + orientation: Var[LiteralOrientation] = Var.create("horizontal") # ty:ignore[invalid-assignment] # The render prop render_: Var[Component] diff --git a/packages/reflex-components-internal/src/reflex_components_internal/components/base/tabs.py b/packages/reflex-components-internal/src/reflex_components_internal/components/base/tabs.py index 4fe83c92479..0a3ef5ff0a4 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/components/base/tabs.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/components/base/tabs.py @@ -62,7 +62,7 @@ class TabsRoot(TabsBaseComponent): value: Var[str | int] # Callback invoked when new value is being set. - on_value_change: EventHandler[passthrough_event_spec(str | dict)] + on_value_change: EventHandler[passthrough_event_spec(str | dict)] # ty:ignore[no-matching-overload] # The component orientation (layout flow direction). Defaults to "horizontal". orientation: Var[LiteralOrientation] diff --git a/packages/reflex-components-internal/src/reflex_components_internal/utils/twmerge.py b/packages/reflex-components-internal/src/reflex_components_internal/utils/twmerge.py index d737a62ef5f..470f2fbd01e 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/utils/twmerge.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/utils/twmerge.py @@ -22,4 +22,4 @@ def cn( Var: A Var representing the merged classes string. """ - return CN.call(*classes).to(str) + return CN.call(*classes).to(str) # ty:ignore[unresolved-attribute] diff --git a/packages/reflex-components-radix/src/reflex_components_radix/primitives/accordion.py b/packages/reflex-components-radix/src/reflex_components_radix/primitives/accordion.py index d95226a3bdc..ff102609d40 100644 --- a/packages/reflex-components-radix/src/reflex_components_radix/primitives/accordion.py +++ b/packages/reflex-components-radix/src/reflex_components_radix/primitives/accordion.py @@ -123,7 +123,7 @@ class AccordionRoot(AccordionComponent): easing: Var[str] = field( default=LiteralVar.create(DEFAULT_ANIMATION_EASING), doc="The easing function to use for the animation.", - ) + ) # ty:ignore[invalid-assignment] show_dividers: Var[bool] = field(doc="Whether to show divider lines between items.") @@ -203,7 +203,7 @@ class AccordionItem(AccordionComponent): content: Var[Component | str | None] = field( default=Var.create(None), doc="The content of the accordion item." - ) + ) # ty:ignore[invalid-assignment] _valid_children: ClassVar[list[str]] = [ "AccordionHeader", @@ -483,11 +483,11 @@ def add_style(self) -> dict[str, Any] | None: """ slide_down = SLIDE_DOWN.to(str) + Var.create( " var(--animation-duration) var(--animation-easing)", - ) + ) # ty:ignore[unsupported-operator] slide_up = SLIDE_UP.to(str) + Var.create( " var(--animation-duration) var(--animation-easing)", - ) + ) # ty:ignore[unsupported-operator] return { "overflow": "hidden", diff --git a/packages/reflex-components-radix/src/reflex_components_radix/themes/components/checkbox.py b/packages/reflex-components-radix/src/reflex_components_radix/themes/components/checkbox.py index bad90762fe4..db116a187e5 100644 --- a/packages/reflex-components-radix/src/reflex_components_radix/themes/components/checkbox.py +++ b/packages/reflex-components-radix/src/reflex_components_radix/themes/components/checkbox.py @@ -119,7 +119,7 @@ class HighLevelCheckbox(RadixThemesComponent): ) @classmethod - def create(cls, text: Var[str] = Var.create(""), **props) -> Component: + def create(cls, text: Var[str] = Var.create(""), **props) -> Component: # ty:ignore[invalid-parameter-default] """Create a checkbox with a label. Args: diff --git a/packages/reflex-components-radix/src/reflex_components_radix/themes/components/icon_button.py b/packages/reflex-components-radix/src/reflex_components_radix/themes/components/icon_button.py index d0e089e9041..508d67380e4 100644 --- a/packages/reflex-components-radix/src/reflex_components_radix/themes/components/icon_button.py +++ b/packages/reflex-components-radix/src/reflex_components_radix/themes/components/icon_button.py @@ -76,7 +76,7 @@ def create(cls, *children, **props) -> Component: raise ValueError(msg) if "size" in props: if isinstance(props["size"], str): - children[0].size = RADIX_TO_LUCIDE_SIZE[props["size"]] # pyright: ignore[reportAttributeAccessIssue] + children[0].size = RADIX_TO_LUCIDE_SIZE[props["size"]] # ty:ignore[invalid-assignment] else: size_map_var = Match.create( props["size"], @@ -86,7 +86,7 @@ def create(cls, *children, **props) -> Component: if not isinstance(size_map_var, Var): msg = f"Match did not return a Var: {size_map_var}" raise ValueError(msg) - children[0].size = size_map_var # pyright: ignore[reportAttributeAccessIssue] + children[0].size = size_map_var # ty:ignore[invalid-assignment] return super().create(*children, **props) def add_style(self): diff --git a/packages/reflex-components-radix/src/reflex_components_radix/themes/components/radio_group.py b/packages/reflex-components-radix/src/reflex_components_radix/themes/components/radio_group.py index bbe96e1a2cb..466cff67e8f 100644 --- a/packages/reflex-components-radix/src/reflex_components_radix/themes/components/radio_group.py +++ b/packages/reflex-components-radix/src/reflex_components_radix/themes/components/radio_group.py @@ -33,11 +33,11 @@ class RadioGroupRoot(RadixThemesComponent): size: Var[Responsive[Literal["1", "2", "3"]]] = field( default=LiteralVar.create("2"), doc='The size of the radio group: "1" | "2" | "3"', - ) + ) # ty:ignore[invalid-assignment] variant: Var[Literal["classic", "surface", "soft"]] = field( default=LiteralVar.create("classic"), doc="The variant of the radio group" - ) + ) # ty:ignore[invalid-assignment] color_scheme: Var[LiteralAccentColor] = field(doc="The color of the radio group") @@ -94,20 +94,20 @@ class HighLevelRadioGroup(RadixThemesComponent): direction: Var[LiteralFlexDirection] = field( default=LiteralVar.create("row"), doc="The direction of the radio group." - ) + ) # ty:ignore[invalid-assignment] spacing: Var[LiteralSpacing] = field( default=LiteralVar.create("2"), doc="The gap between the items of the radio group.", - ) + ) # ty:ignore[invalid-assignment] size: Var[Literal["1", "2", "3"]] = field( default=LiteralVar.create("2"), doc="The size of the radio group." - ) + ) # ty:ignore[invalid-assignment] variant: Var[Literal["classic", "surface", "soft"]] = field( default=LiteralVar.create("classic"), doc="The variant of the radio group" - ) + ) # ty:ignore[invalid-assignment] color_scheme: Var[LiteralAccentColor] = field(doc="The color of the radio group") diff --git a/packages/reflex-components-radix/src/reflex_components_radix/themes/components/separator.py b/packages/reflex-components-radix/src/reflex_components_radix/themes/components/separator.py index a3e0100c936..95a408d7f61 100644 --- a/packages/reflex-components-radix/src/reflex_components_radix/themes/components/separator.py +++ b/packages/reflex-components-radix/src/reflex_components_radix/themes/components/separator.py @@ -19,7 +19,7 @@ class Separator(RadixThemesComponent): size: Var[Responsive[LiteralSeparatorSize]] = field( default=LiteralVar.create("4"), doc='The size of the separator: "1" | "2" | "3" | "4"', - ) + ) # ty:ignore[invalid-assignment] color_scheme: Var[LiteralAccentColor] = field(doc="The color of the separator") diff --git a/packages/reflex-components-radix/src/reflex_components_radix/themes/components/slider.py b/packages/reflex-components-radix/src/reflex_components_radix/themes/components/slider.py index e96690d0bc5..b8ac00c1639 100644 --- a/packages/reflex-components-radix/src/reflex_components_radix/themes/components/slider.py +++ b/packages/reflex-components-radix/src/reflex_components_radix/themes/components/slider.py @@ -56,7 +56,7 @@ class Slider(RadixThemesComponent): width: Var[str | None] = field( default=Var.create("100%"), doc="The width of the slider." - ) + ) # ty:ignore[invalid-assignment] min: Var[float | int] = field(doc="The minimum value of the slider.") diff --git a/packages/reflex-components-radix/src/reflex_components_radix/themes/layout/container.py b/packages/reflex-components-radix/src/reflex_components_radix/themes/layout/container.py index d9ef24a186b..5e592318960 100644 --- a/packages/reflex-components-radix/src/reflex_components_radix/themes/layout/container.py +++ b/packages/reflex-components-radix/src/reflex_components_radix/themes/layout/container.py @@ -26,7 +26,7 @@ class Container(elements.Div, RadixThemesComponent): size: Var[Responsive[LiteralContainerSize]] = field( default=LiteralVar.create("3"), doc='The size of the container: "1" - "4" (default "3")', - ) + ) # ty:ignore[invalid-assignment] @classmethod def create( diff --git a/packages/reflex-components-radix/src/reflex_components_radix/themes/layout/list.py b/packages/reflex-components-radix/src/reflex_components_radix/themes/layout/list.py index 9ba8e1e747c..77442afb3e6 100644 --- a/packages/reflex-components-radix/src/reflex_components_radix/themes/layout/list.py +++ b/packages/reflex-components-radix/src/reflex_components_radix/themes/layout/list.py @@ -48,11 +48,11 @@ class BaseList(BaseHTML, MarkdownComponentMap): LiteralListStyleTypeUnordered | LiteralListStyleTypeOrdered ] = field( default=Var.create("none"), doc='The style of the list. Default to "none".' - ) + ) # ty:ignore[invalid-assignment] items: Var[Iterable] = field( default=Var.create([]), doc="A list of items to add to the list." - ) + ) # ty:ignore[invalid-assignment] @classmethod def create( @@ -174,7 +174,7 @@ def create(cls, *children, **props): for child in children: if isinstance(child, Text): - child.as_ = "span" # pyright: ignore[reportAttributeAccessIssue] + child.as_ = "span" elif isinstance(child, Icon) and "display" not in child.style: child.style["display"] = "inline" return super().create(*children, **props) diff --git a/packages/reflex-components-radix/src/reflex_components_radix/themes/layout/section.py b/packages/reflex-components-radix/src/reflex_components_radix/themes/layout/section.py index 76a9838a293..0d9dbdc3eb3 100644 --- a/packages/reflex-components-radix/src/reflex_components_radix/themes/layout/section.py +++ b/packages/reflex-components-radix/src/reflex_components_radix/themes/layout/section.py @@ -22,7 +22,7 @@ class Section(elements.Section, RadixThemesComponent): size: Var[Responsive[LiteralSectionSize]] = field( default=LiteralVar.create("2"), doc='The size of the section: "1" - "3" (default "2")', - ) + ) # ty:ignore[invalid-assignment] section = Section.create diff --git a/packages/reflex-components-radix/src/reflex_components_radix/themes/layout/stack.py b/packages/reflex-components-radix/src/reflex_components_radix/themes/layout/stack.py index 6773f2563eb..f83839b3580 100644 --- a/packages/reflex-components-radix/src/reflex_components_radix/themes/layout/stack.py +++ b/packages/reflex-components-radix/src/reflex_components_radix/themes/layout/stack.py @@ -16,11 +16,11 @@ class Stack(Flex): spacing: Var[Responsive[LiteralSpacing]] = field( default=Var.create("3"), doc="The spacing between each stack item." - ) + ) # ty:ignore[invalid-assignment] align: Var[Responsive[LiteralAlign]] = field( default=Var.create("start"), doc="The alignment of the stack items." - ) + ) # ty:ignore[invalid-assignment] @classmethod def create( @@ -54,7 +54,7 @@ class VStack(Stack): direction: Var[Responsive[LiteralFlexDirection]] = field( default=Var.create("column"), doc="The direction of the stack." - ) + ) # ty:ignore[invalid-assignment] class HStack(Stack): @@ -62,7 +62,7 @@ class HStack(Stack): direction: Var[Responsive[LiteralFlexDirection]] = field( default=Var.create("row"), doc="The direction of the stack." - ) + ) # ty:ignore[invalid-assignment] stack = Stack.create diff --git a/packages/reflex-components-radix/src/reflex_components_radix/themes/typography/text.py b/packages/reflex-components-radix/src/reflex_components_radix/themes/typography/text.py index b020987d728..12e1559967a 100644 --- a/packages/reflex-components-radix/src/reflex_components_radix/themes/typography/text.py +++ b/packages/reflex-components-radix/src/reflex_components_radix/themes/typography/text.py @@ -51,7 +51,7 @@ class Text(elements.Span, RadixThemesComponent, MarkdownComponentMap): as_: Var[LiteralType] = field( default=Var.create("p"), doc="Change the default rendered element into a semantically appropriate alternative (cannot be used with asChild)", - ) + ) # ty:ignore[invalid-assignment] size: Var[Responsive[LiteralTextSize]] = field(doc='Text size: "1" - "9"') @@ -79,7 +79,7 @@ class Text(elements.Span, RadixThemesComponent, MarkdownComponentMap): class Span(Text): """A variant of text rendering as element.""" - as_: Var[LiteralType] = Var.create("span") + as_: Var[LiteralType] = Var.create("span") # ty:ignore[invalid-assignment] class Em(elements.Em, RadixThemesComponent): diff --git a/packages/reflex-components-react-player/src/reflex_components_react_player/react_player.py b/packages/reflex-components-react-player/src/reflex_components_react_player/react_player.py index 77a4cdea940..6ce142ab21e 100644 --- a/packages/reflex-components-react-player/src/reflex_components_react_player/react_player.py +++ b/packages/reflex-components-react-player/src/reflex_components_react_player/react_player.py @@ -56,7 +56,7 @@ def _on_progress_signature(event: ReactPlayerEvent) -> list[Var[Progress]]: "duration": 0.0, }, ).to(Progress) - ] + ] # ty:ignore[invalid-return-type] def _player_info_key_or_zero(event: ReactPlayerEvent, key: str) -> Var[float]: diff --git a/packages/reflex-components-recharts/src/reflex_components_recharts/cartesian.py b/packages/reflex-components-recharts/src/reflex_components_recharts/cartesian.py index 712623b4d51..d5cbc5830f5 100644 --- a/packages/reflex-components-recharts/src/reflex_components_recharts/cartesian.py +++ b/packages/reflex-components-recharts/src/reflex_components_recharts/cartesian.py @@ -121,7 +121,7 @@ class Axis(Recharts): stroke: Var[str | Color] = field( default=LiteralVar.create(Color("gray", 9)), doc='The stroke color of axis. Default: rx.color("gray", 9)', - ) + ) # ty:ignore[invalid-assignment] text_anchor: Var[LiteralTextAnchor] = field( doc='The text anchor of axis. Default: "middle"' @@ -216,7 +216,7 @@ class ZAxis(Recharts): range: Var[Sequence[int]] = field( default=LiteralVar.create([60, 400]), doc="The range of axis. Default: [60, 400]", - ) + ) # ty:ignore[invalid-assignment] unit: Var[str | int] = field( doc="The unit of data displayed in the axis. This option will be used to represent an index unit in a scatter chart." @@ -241,12 +241,12 @@ class Brush(Recharts): stroke: Var[str | Color] = field( default=LiteralVar.create(Color("gray", 9)), doc='Stroke color. Default: rx.color("gray", 9)', - ) + ) # ty:ignore[invalid-assignment] fill: Var[str | Color] = field( default=LiteralVar.create(Color("gray", 2)), doc='The fill color of brush. Default: rx.color("gray", 2)', - ) + ) # ty:ignore[invalid-assignment] data_key: Var[str | int] = field(doc="The key of data displayed in the axis.") @@ -390,7 +390,7 @@ class Area(Cartesian): stroke: Var[str | Color] = field( default=LiteralVar.create(Color("accent", 9)), doc='The color of the line stroke. Default: rx.color("accent", 9)', - ) + ) # ty:ignore[invalid-assignment] stroke_width: Var[str | int | float] = field( doc="The width of the line stroke. Default: 1" @@ -399,12 +399,12 @@ class Area(Cartesian): fill: Var[str | Color] = field( default=LiteralVar.create(Color("accent", 5)), doc='The color of the area fill. Default: rx.color("accent", 5)', - ) + ) # ty:ignore[invalid-assignment] type_: Var[LiteralCurveType] = field( default=LiteralVar.create("monotone"), doc="The interpolation type of area. And customized interpolation function can be set to type. 'basis' | 'basisClosed' | 'basisOpen' | 'bumpX' | 'bumpY' | 'bump' | 'linear' | 'linearClosed' | 'natural' | 'monotoneX' | 'monotoneY' | 'monotone' | 'step' | 'stepBefore' | 'stepAfter'. Default: \"monotone\"", - ) + ) # ty:ignore[invalid-assignment] dot: Var[ACTIVE_DOT_TYPE] = field( doc="If false set, dots will not be drawn. If true set, dots will be drawn which have the props calculated internally. Default: False" @@ -452,7 +452,7 @@ class Bar(Cartesian): fill: Var[str | Color] = field( default=LiteralVar.create(Color("accent", 9)), doc='The width of the line stroke. Default: Color("accent", 9)', - ) + ) # ty:ignore[invalid-assignment] background: Var[bool] = field( doc="If false set, background of bars will not be drawn. If true set, background of bars will be drawn which have the props calculated internally. Default: False" @@ -505,7 +505,7 @@ class Line(Cartesian): stroke: Var[str | Color] = field( default=LiteralVar.create(Color("accent", 9)), doc='The color of the line stroke. Default: rx.color("accent", 9)', - ) + ) # ty:ignore[invalid-assignment] stroke_width: Var[str | int | float] = field( doc="The width of the line stroke. Default: 1" @@ -597,7 +597,7 @@ class Scatter(Recharts): fill: Var[str | Color] = field( default=LiteralVar.create(Color("accent", 9)), doc='The fill color of the scatter. Default: rx.color("accent", 9)', - ) + ) # ty:ignore[invalid-assignment] # Valid children components. _valid_children: ClassVar[list[str]] = ["LabelList", "ErrorBar"] @@ -691,7 +691,7 @@ class Funnel(Recharts): stroke: Var[str | Color] = field( default=LiteralVar.create(Color("gray", 3)), doc='Stroke color. Default: rx.color("gray", 3)', - ) + ) # ty:ignore[invalid-assignment] trapezoids: Var[Sequence[dict[str, Any]]] = field( doc="The coordinates of all the trapezoids in the funnel, usually calculated internally." @@ -761,7 +761,7 @@ class ErrorBar(Recharts): stroke: Var[str | Color] = field( default=LiteralVar.create(Color("gray", 8)), doc='The stroke color of error bar. Default: rx.color("gray", 8)', - ) + ) # ty:ignore[invalid-assignment] stroke_width: Var[str | int | float] = field( doc="The stroke width of error bar. Default: 1.5" @@ -972,7 +972,7 @@ class CartesianGrid(Grid): stroke: Var[str | Color] = field( default=LiteralVar.create(Color("gray", 7)), doc='the stroke color of grid. Default: rx.color("gray", 7)', - ) + ) # ty:ignore[invalid-assignment] class CartesianAxis(Grid): diff --git a/packages/reflex-components-recharts/src/reflex_components_recharts/general.py b/packages/reflex-components-recharts/src/reflex_components_recharts/general.py index d3dcaa97926..ec118b091a3 100644 --- a/packages/reflex-components-recharts/src/reflex_components_recharts/general.py +++ b/packages/reflex-components-recharts/src/reflex_components_recharts/general.py @@ -184,7 +184,7 @@ class GraphingTooltip(Recharts): "color": Color("gray", 12), }), doc='The style of default tooltip content item which is a li element. Default: {"color": rx.color("gray", 12)}', - ) + ) # ty:ignore[invalid-assignment] wrapper_style: Var[dict[str, Any]] = field( doc="The style of tooltip wrapper which is a dom element. Default: {}" @@ -197,12 +197,12 @@ class GraphingTooltip(Recharts): "borderRadius": "8px", }), doc='The style of tooltip content which is a dom element. Default: {"background": rx.color("gray", 1), "borderColor": rx.color("gray", 4), "borderRadius": "8px"}', - ) + ) # ty:ignore[invalid-assignment] label_style: Var[dict[str, Any]] = field( default=LiteralVar.create({"color": Color("gray", 11)}), doc='The style of default tooltip label which is a p element. Default: {"color": rx.color("gray", 11)}', - ) + ) # ty:ignore[invalid-assignment] allow_escape_view_box: Var[dict[str, bool]] = field( doc='This option allows the tooltip to extend beyond the viewBox of the chart itself. Default: {"x": False, "y": False}' @@ -275,12 +275,12 @@ class LabelList(Recharts): fill: Var[str | Color] = field( default=LiteralVar.create(Color("gray", 10)), doc='The fill color of each label. Default: rx.color("gray", 10)', - ) + ) # ty:ignore[invalid-assignment] stroke: Var[str | Color] = field( default=LiteralVar.create("none"), doc='The stroke color of each label. Default: "none"', - ) + ) # ty:ignore[invalid-assignment] class Cell(Recharts): diff --git a/packages/reflex-components-recharts/src/reflex_components_recharts/polar.py b/packages/reflex-components-recharts/src/reflex_components_recharts/polar.py index d83d7e9a4f9..6f5a9a355d0 100644 --- a/packages/reflex-components-recharts/src/reflex_components_recharts/polar.py +++ b/packages/reflex-components-recharts/src/reflex_components_recharts/polar.py @@ -83,12 +83,12 @@ class Pie(Recharts): stroke: Var[str | Color] = field( default=LiteralVar.create(Color("accent", 9)), doc='Stoke color. Default: rx.color("accent", 9)', - ) + ) # ty:ignore[invalid-assignment] fill: Var[str | Color] = field( default=LiteralVar.create(Color("accent", 3)), doc='Fill color. Default: rx.color("accent", 3)', - ) + ) # ty:ignore[invalid-assignment] is_animation_active: Var[bool] = field( doc="If set false, animation of tooltip will be disabled. Default: true in CSR, and false in SSR" @@ -151,12 +151,12 @@ class Radar(Recharts): stroke: Var[str | Color] = field( default=LiteralVar.create(Color("accent", 9)), doc='Stoke color. Default: rx.color("accent", 9)', - ) + ) # ty:ignore[invalid-assignment] fill: Var[str | Color] = field( default=LiteralVar.create(Color("accent", 3)), doc='Fill color. Default: rx.color("accent", 3)', - ) + ) # ty:ignore[invalid-assignment] fill_opacity: Var[float] = field( default=LiteralVar.create(0.6), @@ -321,7 +321,7 @@ class PolarAngleAxis(Recharts): stroke: Var[str | Color] = field( default=LiteralVar.create(Color("gray", 10)), doc='The stroke color of axis. Default: rx.color("gray", 10)', - ) + ) # ty:ignore[invalid-assignment] allow_duplicated_category: Var[bool] = field( doc='Allow the axis has duplicated categorys or not when the type of axis is "category". Default: True' @@ -393,7 +393,7 @@ class PolarGrid(Recharts): stroke: Var[str | Color] = field( default=LiteralVar.create(Color("gray", 10)), doc='The stroke color of grid. Default: rx.color("gray", 10)', - ) + ) # ty:ignore[invalid-assignment] # Valid children components _valid_children: ClassVar[list[str]] = ["RadarChart", "RadiarBarChart"] @@ -456,7 +456,7 @@ class PolarRadiusAxis(Recharts): stroke: Var[str | Color] = field( default=LiteralVar.create(Color("gray", 10)), doc='The stroke color of axis. Default: rx.color("gray", 10)', - ) + ) # ty:ignore[invalid-assignment] @classmethod def get_event_triggers(cls) -> dict[str, Var | Any]: diff --git a/packages/reflex-components-sonner/src/reflex_components_sonner/toast.py b/packages/reflex-components-sonner/src/reflex_components_sonner/toast.py index f08457b526d..2e996934618 100644 --- a/packages/reflex-components-sonner/src/reflex_components_sonner/toast.py +++ b/packages/reflex-components-sonner/src/reflex_components_sonner/toast.py @@ -137,7 +137,7 @@ class ToastProps(NoExtrasAllowedProps): # Function that gets called when the toast disappears automatically after it's timeout (duration` prop). on_auto_close: Any | None - def dict(self, *args: Any, **kwargs: Any) -> dict[str, Any]: + def dict(self, *args: Any, **kwargs: Any) -> dict[str, Any]: # ty:ignore[invalid-type-form] """Convert the object to a dictionary. Args: @@ -152,11 +152,11 @@ def dict(self, *args: Any, **kwargs: Any) -> dict[str, Any]: if "action" in d: d["action"] = self.action if isinstance(self.action, dict): - d["action"] = ToastAction(**self.action) + d["action"] = ToastAction(**self.action) # ty:ignore[invalid-argument-type] if "cancel" in d: d["cancel"] = self.cancel if isinstance(self.cancel, dict): - d["cancel"] = ToastAction(**self.cancel) + d["cancel"] = ToastAction(**self.cancel) # ty:ignore[invalid-argument-type] if "onDismiss" in d: d["onDismiss"] = format.format_queue_events( self.on_dismiss, _toast_callback_signature @@ -191,7 +191,7 @@ class Toaster(Component): position: Var[LiteralPosition] = field( default=LiteralVar.create("bottom-right"), doc="the position of the toast" - ) + ) # ty:ignore[invalid-assignment] close_button: Var[bool] = field( default=LiteralVar.create(False), doc="whether to show the close button" @@ -260,7 +260,7 @@ def send_toast( ValueError: If the Toaster component is not created. """ toast_command = ( - ObjectVar.__getattr__(toast_ref.to(dict), level) if level else toast_ref + ObjectVar.__getattr__(toast_ref.to(dict), level) if level else toast_ref # ty:ignore[no-matching-overload] ).to(FunctionVar) if isinstance(message, Var): @@ -271,10 +271,10 @@ def send_toast( raise ValueError(msg) if props: - args = LiteralVar.create(ToastProps(component_name="rx.toast", **props)) # pyright: ignore [reportCallIssue] - toast = toast_command.call(message, args) + args = LiteralVar.create(ToastProps(component_name="rx.toast", **props)) # ty:ignore[unknown-argument] + toast = toast_command.call(message, args) # ty:ignore[unresolved-attribute] else: - toast = toast_command.call(message) + toast = toast_command.call(message) # ty:ignore[unresolved-attribute] if fallback_to_alert: toast = ternary_operation( diff --git a/packages/reflex-docgen/src/reflex_docgen/markdown/_parser.py b/packages/reflex-docgen/src/reflex_docgen/markdown/_parser.py index d9f1a782ced..99de7e9b099 100644 --- a/packages/reflex-docgen/src/reflex_docgen/markdown/_parser.py +++ b/packages/reflex-docgen/src/reflex_docgen/markdown/_parser.py @@ -273,9 +273,9 @@ def _convert_block(token: BlockToken) -> Block | None: raise TypeError(msg) item_blocks = _convert_block_children(item_token) items.append(ListItem(children=item_blocks)) - # List.start is an instance attribute (int | None) but pyright sees + # List.start is an instance attribute (int | None) but the type checker sees # the classmethod start(cls, line) instead. - list_start = cast("int | None", token.start) # pyright: ignore[reportAttributeAccessIssue] + list_start = cast("int | None", token.start) return ListBlock( ordered=list_start is not None, start=list_start, diff --git a/packages/reflex-hosting-cli/src/reflex_cli/core/config.py b/packages/reflex-hosting-cli/src/reflex_cli/core/config.py index f1cbb31b43c..1243e6b66db 100644 --- a/packages/reflex-hosting-cli/src/reflex_cli/core/config.py +++ b/packages/reflex-hosting-cli/src/reflex_cli/core/config.py @@ -241,7 +241,7 @@ def from_toml( raise ConfigError(f"Config file not found at {pyproject_path}.") try: - import tomllib + import tomllib # ty:ignore[unresolved-import] except ImportError as e: raise ConfigError( "TOML support is not available. Please use Python 3.11 or later." diff --git a/packages/reflex-hosting-cli/src/reflex_cli/deployments.py b/packages/reflex-hosting-cli/src/reflex_cli/deployments.py index 665d417592e..4b29b96bb38 100644 --- a/packages/reflex-hosting-cli/src/reflex_cli/deployments.py +++ b/packages/reflex-hosting-cli/src/reflex_cli/deployments.py @@ -229,7 +229,7 @@ def get_group_from_info(group_info: TyperInfo, *args, **kwargs): original_get_group_from_info, ) - typer.main.get_group_from_info = get_group_from_info + typer.main.get_group_from_info = get_group_from_info # ty:ignore[invalid-assignment] return fake_typer_app @@ -239,4 +239,4 @@ def get_group_from_info(group_info: TyperInfo, *args, **kwargs): and find_spec("typer.core") is not None and find_spec("typer.models") is not None ): - deployments_cli = _patch_typer(deployments_cli) # pyright: ignore[reportAssignmentType] + deployments_cli = _patch_typer(deployments_cli) # ty:ignore[invalid-assignment] diff --git a/packages/reflex-hosting-cli/src/reflex_cli/utils/dependency.py b/packages/reflex-hosting-cli/src/reflex_cli/utils/dependency.py index 0709d123a4d..13499a9eb72 100644 --- a/packages/reflex-hosting-cli/src/reflex_cli/utils/dependency.py +++ b/packages/reflex-hosting-cli/src/reflex_cli/utils/dependency.py @@ -31,7 +31,7 @@ def detect_encoding(filename: Path) -> str | None: raise FileNotFoundError for encoding in [ - None if sys.version_info < (3, 10) else io.text_encoding(None), + None if sys.version_info < (3, 10) else io.text_encoding(None), # ty:ignore[unresolved-attribute] "utf-8", ]: try: diff --git a/packages/reflex-hosting-cli/src/reflex_cli/utils/hosting.py b/packages/reflex-hosting-cli/src/reflex_cli/utils/hosting.py index 010aa1b2823..35925ec3f21 100644 --- a/packages/reflex-hosting-cli/src/reflex_cli/utils/hosting.py +++ b/packages/reflex-hosting-cli/src/reflex_cli/utils/hosting.py @@ -123,13 +123,13 @@ def create( """ if isinstance(regions, list): - regions = dict.fromkeys(regions, 1) + regions = dict.fromkeys(regions, 1) # ty:ignore[invalid-assignment] return cls( scale_type, vm_type, tuple( Region(name=name, number_of_machines=number) - for name, number in regions.items() + for name, number in regions.items() # ty:ignore[unresolved-attribute] ) if regions else (), @@ -340,7 +340,7 @@ def open(self, url: str, new: int = 0, autoraise: bool = True): return False -webbrowser.BackgroundBrowser = SilentBackgroundBrowser +webbrowser.BackgroundBrowser = SilentBackgroundBrowser # ty:ignore[invalid-assignment] def get_existing_access_token() -> str: diff --git a/packages/reflex-hosting-cli/src/reflex_cli/v2/cli.py b/packages/reflex-hosting-cli/src/reflex_cli/v2/cli.py index 106dcedf475..b860ac7edaf 100644 --- a/packages/reflex-hosting-cli/src/reflex_cli/v2/cli.py +++ b/packages/reflex-hosting-cli/src/reflex_cli/v2/cli.py @@ -379,7 +379,7 @@ def deploy( if envfile: try: - from dotenv import dotenv_values # pyright: ignore[reportMissingImports] + from dotenv import dotenv_values processed_envs = dotenv_values(envfile) except ImportError: @@ -406,7 +406,7 @@ def deploy( False, True, True, - ) # pyright: ignore[reportCallIssue] + ) # ty:ignore[missing-argument] else: export_fn( str(temporary_dir_path), @@ -415,7 +415,7 @@ def deploy( False, True, include_db, - True, # pyright: ignore[reportCallIssue] + True, # ty:ignore[too-many-positional-arguments] ) except Exception as ex: console.error(f"Unable to export due to: {ex}") @@ -427,7 +427,7 @@ def deploy( try: # Check if the reflex version is >= 0.7.6 if rx_version <= breaking_version: - export_fn(str(temporary_dir_path), server_url, host_url, True, False, True) # pyright: ignore[reportCallIssue] + export_fn(str(temporary_dir_path), server_url, host_url, True, False, True) # ty:ignore[missing-argument] else: export_fn( str(temporary_dir_path), @@ -436,7 +436,7 @@ def deploy( True, False, include_db, - True, # pyright: ignore[reportCallIssue] + True, # ty:ignore[too-many-positional-arguments] ) except ImportError as ie: console.error( diff --git a/packages/reflex-hosting-cli/src/reflex_cli/v2/deployments.py b/packages/reflex-hosting-cli/src/reflex_cli/v2/deployments.py index 8042bf8f6c5..d1047329c0c 100644 --- a/packages/reflex-hosting-cli/src/reflex_cli/v2/deployments.py +++ b/packages/reflex-hosting-cli/src/reflex_cli/v2/deployments.py @@ -92,7 +92,7 @@ def get_group_from_info(group_info: TyperInfo, *args, **kwargs): original_get_group_from_info, ) - typer.main.get_group_from_info = get_group_from_info + typer.main.get_group_from_info = get_group_from_info # ty:ignore[invalid-assignment] return fake_typer_app @@ -102,7 +102,7 @@ def get_group_from_info(group_info: TyperInfo, *args, **kwargs): and find_spec("typer.core") is not None and find_spec("typer.models") is not None ): - hosting_cli = _patch_typer(hosting_cli) # pyright: ignore[reportAssignmentType] + hosting_cli = _patch_typer(hosting_cli) # ty:ignore[invalid-assignment] TIME_FORMAT_HELP = "Accepts ISO 8601 format, unix epoch or time relative to now. For time relative to now, use the format: . Valid units are d (day), h (hour), m (minute), s (second). For example, 1d for 1 day ago from now." MIN_LOGS_LIMIT = 50 diff --git a/packages/reflex-hosting-cli/src/reflex_cli/v2/secrets.py b/packages/reflex-hosting-cli/src/reflex_cli/v2/secrets.py index 3f1b28f66a6..4ad17f8741f 100644 --- a/packages/reflex-hosting-cli/src/reflex_cli/v2/secrets.py +++ b/packages/reflex-hosting-cli/src/reflex_cli/v2/secrets.py @@ -158,9 +158,7 @@ def update_secrets( if envfile: try: - from dotenv import ( # pyright: ignore[reportMissingImports] - dotenv_values, - ) + from dotenv import dotenv_values except ImportError: console.error( """The `python-dotenv` package is required to load environment variables from a file. Run `pip install "python-dotenv>=1.0.1"`.""" diff --git a/packages/reflex-site-shared/src/reflex_site_shared/components/blocks/flexdown.py b/packages/reflex-site-shared/src/reflex_site_shared/components/blocks/flexdown.py index 5b52091bf83..a35d4896022 100644 --- a/packages/reflex-site-shared/src/reflex_site_shared/components/blocks/flexdown.py +++ b/packages/reflex-site-shared/src/reflex_site_shared/components/blocks/flexdown.py @@ -1,6 +1,5 @@ """Flexdown module — component maps and markdown helpers.""" -# pyright: reportAttributeAccessIssue=false from reflex_base.constants.colors import ColorType from reflex_components_code.shiki_code_block import code_block as shiki_code_block diff --git a/packages/reflex-site-shared/src/reflex_site_shared/components/blocks/headings.py b/packages/reflex-site-shared/src/reflex_site_shared/components/blocks/headings.py index 4a0808f6613..ec1abdc49fd 100644 --- a/packages/reflex-site-shared/src/reflex_site_shared/components/blocks/headings.py +++ b/packages/reflex-site-shared/src/reflex_site_shared/components/blocks/headings.py @@ -1,4 +1,3 @@ -# pyright: reportArgumentType=false, reportReturnType=false, reportOperatorIssue=false """Template for documentation pages.""" from typing import ClassVar diff --git a/pyi_hashes.json b/pyi_hashes.json index b0bf954a0a2..e4c8693d9c8 100644 --- a/pyi_hashes.json +++ b/pyi_hashes.json @@ -1,123 +1,4 @@ { - "packages/reflex-components-code/src/reflex_components_code/code.pyi": "a879ccd253e901964a7ab7ea7154f904", - "packages/reflex-components-code/src/reflex_components_code/shiki_code_block.pyi": "d3e0c33fdc34f5c154ac387d550c0d29", - "packages/reflex-components-core/src/reflex_components_core/__init__.pyi": "82b29d23f2490161d42fd21021bd39c3", - "packages/reflex-components-core/src/reflex_components_core/base/__init__.pyi": "7009187aaaf191814d031e5462c48318", - "packages/reflex-components-core/src/reflex_components_core/base/app_wrap.pyi": "ecccfd8a9b0e8b2f4128ff13ff27a9da", - "packages/reflex-components-core/src/reflex_components_core/base/body.pyi": "2535814d409e5feaf57da63dcf0abeaf", - "packages/reflex-components-core/src/reflex_components_core/base/document.pyi": "a2e67a9814dc61853ca2299d9d9c698d", - "packages/reflex-components-core/src/reflex_components_core/base/error_boundary.pyi": "59170074a1a228ce58685f3f207954f2", - "packages/reflex-components-core/src/reflex_components_core/base/fragment.pyi": "e4cbfc46eabb904596be4372392add35", - "packages/reflex-components-core/src/reflex_components_core/base/link.pyi": "629a483c570b04ca3d83ecdc53914770", - "packages/reflex-components-core/src/reflex_components_core/base/meta.pyi": "0cfa2d8c52321ce7440e887d03007d5b", - "packages/reflex-components-core/src/reflex_components_core/base/script.pyi": "bfc7fb609b822f597d1141595f8090fe", - "packages/reflex-components-core/src/reflex_components_core/base/strict_mode.pyi": "8ee129808abb4389cbd77a1736190eae", - "packages/reflex-components-core/src/reflex_components_core/core/__init__.pyi": "dd5142b3c9087bf2bf22651adf6f2724", - "packages/reflex-components-core/src/reflex_components_core/core/auto_scroll.pyi": "918dfad4d5925addd0f741e754b3b076", - "packages/reflex-components-core/src/reflex_components_core/core/banner.pyi": "6040fbada9b96c55637a9c8cc21a5e10", - "packages/reflex-components-core/src/reflex_components_core/core/clipboard.pyi": "e3950e0963a6d04299ff58294687e407", - "packages/reflex-components-core/src/reflex_components_core/core/debounce.pyi": "dd221754c5e076a3a833c8584da72dc5", - "packages/reflex-components-core/src/reflex_components_core/core/helmet.pyi": "7fd81a99bde5b0ff94bb52523597fd5c", - "packages/reflex-components-core/src/reflex_components_core/core/html.pyi": "753d6ae315369530dad450ed643f5be6", - "packages/reflex-components-core/src/reflex_components_core/core/sticky.pyi": "ba60a7d9cba75b27a1133bd63a9fbd59", - "packages/reflex-components-core/src/reflex_components_core/core/upload.pyi": "48bccd1cf1cedaf24503e7dbd2c0b02b", - "packages/reflex-components-core/src/reflex_components_core/core/window_events.pyi": "cab827931770be082cd1598a9908abbc", - "packages/reflex-components-core/src/reflex_components_core/datadisplay/__init__.pyi": "c96fed4da42a13576d64f84e3c7cb25c", - "packages/reflex-components-core/src/reflex_components_core/el/__init__.pyi": "f09129ddefb57ab4c7769c86dc9a3153", - "packages/reflex-components-core/src/reflex_components_core/el/element.pyi": "ff68d843c5987d3f0d773a6367eb9c63", - "packages/reflex-components-core/src/reflex_components_core/el/elements/__init__.pyi": "e6c845f2f29eb079697a2e31b0c2f23a", - "packages/reflex-components-core/src/reflex_components_core/el/elements/base.pyi": "d2500a39e6e532bb90c83438343905bf", - "packages/reflex-components-core/src/reflex_components_core/el/elements/forms.pyi": "ca840a20c8e1c1f5335fb815a25b6c32", - "packages/reflex-components-core/src/reflex_components_core/el/elements/inline.pyi": "c38a432d1fd0c3208c4fc3a546c67e4d", - "packages/reflex-components-core/src/reflex_components_core/el/elements/media.pyi": "b794f4f4f7ad17c6939d5526b9c63397", - "packages/reflex-components-core/src/reflex_components_core/el/elements/metadata.pyi": "f9e51feebda79fb063bc264a235df0c3", - "packages/reflex-components-core/src/reflex_components_core/el/elements/other.pyi": "c86abf00384b5f15725a0daf2533848d", - "packages/reflex-components-core/src/reflex_components_core/el/elements/scripts.pyi": "222176bffc14191018fd0e3af3741aff", - "packages/reflex-components-core/src/reflex_components_core/el/elements/sectioning.pyi": "fbbe0bf222d4196c32c88d05cb077997", - "packages/reflex-components-core/src/reflex_components_core/el/elements/tables.pyi": "cba93678248925c981935a251379aa7c", - "packages/reflex-components-core/src/reflex_components_core/el/elements/typography.pyi": "4abedc6f98f6d54194ff9e7f1f76314e", - "packages/reflex-components-core/src/reflex_components_core/react_router/dom.pyi": "1074a512195ae23d479c4a2d553954e1", - "packages/reflex-components-dataeditor/src/reflex_components_dataeditor/dataeditor.pyi": "8e379fa038c7c6c0672639eb5902934d", - "packages/reflex-components-gridjs/src/reflex_components_gridjs/datatable.pyi": "d2dc211d707c402eb24678a4cba945f7", - "packages/reflex-components-lucide/src/reflex_components_lucide/icon.pyi": "e3ec310276f9d091fbb0261e523ca9ed", - "packages/reflex-components-markdown/src/reflex_components_markdown/markdown.pyi": "da02f81678d920a68101c08fe64483a5", - "packages/reflex-components-moment/src/reflex_components_moment/moment.pyi": "d6a02e447dfd3c91bba84bcd02722aed", - "packages/reflex-components-plotly/src/reflex_components_plotly/plotly.pyi": "91e956633778c6992f04940c69ff7140", - "packages/reflex-components-radix/src/reflex_components_radix/__init__.pyi": "19216eb3618f68c8a76e5e43801cf4af", - "packages/reflex-components-radix/src/reflex_components_radix/primitives/__init__.pyi": "5404a8da97e8b5129133d7f300e3f642", - "packages/reflex-components-radix/src/reflex_components_radix/primitives/accordion.pyi": "e8ef2b44f2afe3e9b8d678d523673882", - "packages/reflex-components-radix/src/reflex_components_radix/primitives/base.pyi": "e779c6739baee98c8a588768a88de45a", - "packages/reflex-components-radix/src/reflex_components_radix/primitives/dialog.pyi": "ffb06f3aa8722c2345a952869118e224", - "packages/reflex-components-radix/src/reflex_components_radix/primitives/drawer.pyi": "cc724f697e62efba294e19b58c6f1bd8", - "packages/reflex-components-radix/src/reflex_components_radix/primitives/form.pyi": "4d6121ccc963c64e33c49acd4295eb7a", - "packages/reflex-components-radix/src/reflex_components_radix/primitives/progress.pyi": "b3b66ec57525c53ea741897e2bc8370e", - "packages/reflex-components-radix/src/reflex_components_radix/primitives/slider.pyi": "c86bc8d4604e3d8c8d40baad2ac6dc17", - "packages/reflex-components-radix/src/reflex_components_radix/themes/__init__.pyi": "b433b9a099dc5b0ab008d02c85d38059", - "packages/reflex-components-radix/src/reflex_components_radix/themes/base.pyi": "e75cbf2a34620721432b1556f3c875cd", - "packages/reflex-components-radix/src/reflex_components_radix/themes/color_mode.pyi": "ed020269e4728cc6abe72354193146b7", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/__init__.pyi": "f10f0169f81c78290333da831915762f", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/alert_dialog.pyi": "d5e0419729df4ddf2caf214f40ae7845", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/aspect_ratio.pyi": "613abb9870259547c99eb434a3a17512", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/avatar.pyi": "1671e796449b236386d8f53d33e42b2f", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/badge.pyi": "9fde9929ca5197e0e1880bce9a08e926", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/button.pyi": "e5d6387a93c74dafaa0d6f1719e08bac", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/callout.pyi": "31da62c4d8c1d459089aab32cd232feb", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/card.pyi": "76afb58340c6be1f26b7b110473efa55", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/checkbox.pyi": "6cbf013e21d7280118dfd7383998b3bf", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/checkbox_cards.pyi": "63b4134246f68f9f556896d6ce194462", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/checkbox_group.pyi": "ec3f89e7d187303344d4127a83522b22", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/context_menu.pyi": "99541ee46f112eb4096f903a99f5ffb8", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/data_list.pyi": "1dfd91741ff402b3ed93b6daca4939f3", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/dialog.pyi": "ed9198da4a7950a8579e50ad970c34ef", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/dropdown_menu.pyi": "15f9cee0584414f2d2e0fb82c167f216", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/hover_card.pyi": "3f328bb0ba5225e4478febf8c7623833", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/icon_button.pyi": "be8eed28e19221a406e554829809ff0d", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/inset.pyi": "9b2adf18f7d239b8e7431f39042ed301", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/popover.pyi": "4d5813a47b8f8b6ac317ca01d87d9afb", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/progress.pyi": "1ab01f45a4c5ef4211eacc00cc99e4a5", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/radio.pyi": "38a7412205a98617f98218a5b213ada1", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/radio_cards.pyi": "d84b16ac16083a534199fd23659aaa06", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/radio_group.pyi": "51fda6313f1ce86d5b1ffdfd68ae8b74", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/scroll_area.pyi": "bba40e5eae75314157378c9e8b0eea73", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/segmented_control.pyi": "bf9f751a701137bfedc254657d4c5be4", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/select.pyi": "605479e11d19dd7730c90125b198c9b6", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/separator.pyi": "519781d33b99c675a12014d400e54d08", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/skeleton.pyi": "f4848f7d89abb4c78f6db52c624cdabf", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/slider.pyi": "61a08374fa19a0bb3f52b8654effc0f2", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/spinner.pyi": "530c51742031389d4b2ae43548ff0f03", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/switch.pyi": "23b21bc11a0012e13ce9bb79b47ba146", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/table.pyi": "8364f40600870bafa585528d9cadedf8", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/tabs.pyi": "3a52910c327f55656eb59309f9362361", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/text_area.pyi": "fcf562b2f61ecdcc2de6f70d2ebf9907", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/text_field.pyi": "250b7e77b67e7d8cd3fff2b40526c04c", - "packages/reflex-components-radix/src/reflex_components_radix/themes/components/tooltip.pyi": "799acce0af81899a3a310bdcd43c403b", - "packages/reflex-components-radix/src/reflex_components_radix/themes/layout/__init__.pyi": "9e452af27229b676ad0146e40f75bed5", - "packages/reflex-components-radix/src/reflex_components_radix/themes/layout/base.pyi": "5b262189e235cac17182e79188b1681a", - "packages/reflex-components-radix/src/reflex_components_radix/themes/layout/box.pyi": "e06c8fd64132765d61b9edb87a48558b", - "packages/reflex-components-radix/src/reflex_components_radix/themes/layout/center.pyi": "5aa934d7c6ba3889fa943eabee7dc05f", - "packages/reflex-components-radix/src/reflex_components_radix/themes/layout/container.pyi": "c67fafd1aec105cb5a9927ff0e6d2071", - "packages/reflex-components-radix/src/reflex_components_radix/themes/layout/flex.pyi": "aa68061a8e5dfd4adf336d1d1cb000fb", - "packages/reflex-components-radix/src/reflex_components_radix/themes/layout/grid.pyi": "06b92d31331c6f08b5083fcc811b754a", - "packages/reflex-components-radix/src/reflex_components_radix/themes/layout/list.pyi": "e7cd3a9cea1c34e21f731f1bd05c1ceb", - "packages/reflex-components-radix/src/reflex_components_radix/themes/layout/section.pyi": "8c968fead3155b2d51c687459811b5df", - "packages/reflex-components-radix/src/reflex_components_radix/themes/layout/spacer.pyi": "cfc8a927642e5b68feabc80080aeb8dc", - "packages/reflex-components-radix/src/reflex_components_radix/themes/layout/stack.pyi": "cf88cf870eefaacaf765ead10fb4593b", - "packages/reflex-components-radix/src/reflex_components_radix/themes/typography/__init__.pyi": "de7ee994f66a4c1d1a6ac2ad3370c30e", - "packages/reflex-components-radix/src/reflex_components_radix/themes/typography/blockquote.pyi": "92d5a2df77a69a28a4d591000ee46bd1", - "packages/reflex-components-radix/src/reflex_components_radix/themes/typography/code.pyi": "8a1e4376cadf4961212d39a5128a0e4f", - "packages/reflex-components-radix/src/reflex_components_radix/themes/typography/heading.pyi": "34c7ed3fe1e5f702a98d72751b0052fa", - "packages/reflex-components-radix/src/reflex_components_radix/themes/typography/link.pyi": "619a9d8351748fffe76136002931e583", - "packages/reflex-components-radix/src/reflex_components_radix/themes/typography/text.pyi": "4919daa4483b7c12f6fafd02a2275e0f", - "packages/reflex-components-react-player/src/reflex_components_react_player/audio.pyi": "0817c9232a6e4790cff8ea8aa6001950", - "packages/reflex-components-react-player/src/reflex_components_react_player/react_player.pyi": "6c1c26149d57c708fab04b82de0eb515", - "packages/reflex-components-react-player/src/reflex_components_react_player/video.pyi": "75207a9fe4f37ec2a2f1becbbbd5237b", - "packages/reflex-components-recharts/src/reflex_components_recharts/__init__.pyi": "7b8b69840a3637c1f1cac45ba815cccf", - "packages/reflex-components-recharts/src/reflex_components_recharts/cartesian.pyi": "277bbf09d72e0c450241f0b7d39ebb60", - "packages/reflex-components-recharts/src/reflex_components_recharts/charts.pyi": "be20d1d71c3b16f7e973a0329c3d81d6", - "packages/reflex-components-recharts/src/reflex_components_recharts/general.pyi": "c051ab3a26c23107043e203b060e1412", - "packages/reflex-components-recharts/src/reflex_components_recharts/polar.pyi": "1979bb6c22bb7a0d3342b2d63fb19d74", - "packages/reflex-components-recharts/src/reflex_components_recharts/recharts.pyi": "234407dbd466bf9c87d75ce979ab0e2d", - "packages/reflex-components-sonner/src/reflex_components_sonner/toast.pyi": "2c5fadcc014056f041cd4d916137d9e7", "reflex/__init__.pyi": "3a9bb8544cbc338ffaf0a5927d9156df", "reflex/components/__init__.pyi": "f39a2af77f438fa243c58c965f19d42e", "reflex/experimental/memo.pyi": "2c119a0dfea362dcd8193786363cbc02" diff --git a/pyproject.toml b/pyproject.toml index 778c9c49bf4..2899761f5ce 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -93,7 +93,6 @@ dev = [ "psutil", "psycopg[binary]", "pydantic", - "pyright", "pytest-asyncio", "pytest-benchmark", "pytest-codspeed", @@ -111,6 +110,7 @@ dev = [ "sqlmodel", "starlette-admin", "toml", + "ty", "typer", "uvicorn", ] @@ -136,25 +136,7 @@ path = "scripts/hatch_build.py" dependencies = ["plotly", "ruff"] require-runtime-dependencies = true -[tool.pyright] -extraPaths = [ - "packages/reflex-code/src", - "packages/reflex-components/src", - "packages/reflex-dataeditor/src", - "packages/reflex-gridjs/src", - "packages/reflex-lucide/src", - "packages/reflex-markdown/src", - "packages/reflex-moment/src", - "packages/reflex-plotly/src", - "packages/reflex-radix/src", - "packages/reflex-react-player/src", - "packages/reflex-react-router/src", - "packages/reflex-recharts/src", - "packages/reflex-sonner/src", - "packages/reflex-components-internal/src", - "packages/reflex-site-shared/src", - "packages/integrations-docs/src", -] +[tool.ty.src] exclude = [ ".venv", "**/__pycache__", @@ -164,9 +146,11 @@ exclude = [ "docs", "packages/reflex-site-shared", "packages/integrations-docs", - "packages/reflex-ui-shared", ] -reportIncompatibleMethodOverride = false + +[tool.ty.rules] +invalid-method-override = "ignore" +unsupported-base = "ignore" [tool.ruff] target-version = "py310" diff --git a/reflex/_upload.py b/reflex/_upload.py index b8b2dcfe48f..96c43b34020 100644 --- a/reflex/_upload.py +++ b/reflex/_upload.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_components_core.core._upload.""" from reflex_components_core.core._upload import * # pragma: no cover diff --git a/reflex/app.py b/reflex/app.py index 240da421ef5..7c2c70b52e8 100644 --- a/reflex/app.py +++ b/reflex/app.py @@ -716,7 +716,7 @@ def __call__(self) -> ASGIApp: [self.api_transformer] if not isinstance(self.api_transformer, Sequence) else self.api_transformer - ) + ) # ty:ignore[invalid-assignment] for api_transformer in api_transformers: if isinstance(api_transformer, Starlette): @@ -871,7 +871,7 @@ def add_page( msg = "Route must be set if component is not a callable." raise exceptions.RouteValueError(msg) # Format the route. - route = format.format_route(format.to_kebab_case(component.__name__)) + route = format.format_route(format.to_kebab_case(component.__name__)) # ty:ignore[unresolved-attribute] else: route = format.format_route(route) @@ -1525,7 +1525,7 @@ def _submit_work_without_advancing( ) if self.theme is not None: # Fix #2992 by removing the top-level appearance prop - self.theme.appearance = None # pyright: ignore[reportAttributeAccessIssue] + self.theme.appearance = None # ty:ignore[unresolved-attribute] progress.advance(task) # Compile the app root. @@ -1644,7 +1644,7 @@ def modify_state( previous_dirty_vars: dict[str, set[str]] | None = None, ) -> contextlib.AbstractAsyncContextManager[BaseState]: ... - @contextlib.asynccontextmanager + @contextlib.asynccontextmanager # ty:ignore[no-matching-overload] async def modify_state( self, token: BaseStateToken | str, diff --git a/reflex/app_mixins/lifespan.py b/reflex/app_mixins/lifespan.py index bac00517bb0..e672c61a18d 100644 --- a/reflex/app_mixins/lifespan.py +++ b/reflex/app_mixins/lifespan.py @@ -34,7 +34,7 @@ def _get_task_name(task: asyncio.Task | Callable) -> str: """ if isinstance(task, asyncio.Task): return task.get_name() - return task.__name__ # pyright: ignore[reportAttributeAccessIssue] + return task.__name__ # ty:ignore[unresolved-attribute] @dataclasses.dataclass @@ -122,7 +122,7 @@ async def _run_lifespan_tasks(self, app: Starlette): task.cancel(msg="lifespan_cleanup") # Disassociate sid / token pairings so they can be reconnected properly. try: - event_namespace = self.event_namespace # pyright: ignore[reportAttributeAccessIssue] + event_namespace = self.event_namespace # ty:ignore[unresolved-attribute] except AttributeError: pass else: @@ -133,7 +133,7 @@ async def _run_lifespan_tasks(self, app: Starlette): console.error(f"Error during lifespan cleanup: {e}") # Flush any pending writes from the state manager. try: - state_manager = self.state_manager # pyright: ignore[reportAttributeAccessIssue] + state_manager = self.state_manager # ty:ignore[unresolved-attribute] except AttributeError: pass else: @@ -183,7 +183,7 @@ def register_lifespan_task( ) raise RuntimeError(msg) if inspect.isgeneratorfunction(task) or inspect.isasyncgenfunction(task): - msg = f"Task {task.__name__} of type generator must be decorated with contextlib.asynccontextmanager." + msg = f"Task {task.__name__} of type generator must be decorated with contextlib.asynccontextmanager." # ty:ignore[unresolved-attribute] raise InvalidLifespanTaskTypeError(msg) task_name = _get_task_name(task) diff --git a/reflex/app_mixins/middleware.py b/reflex/app_mixins/middleware.py index c9bea19e922..f9c5f4fe451 100644 --- a/reflex/app_mixins/middleware.py +++ b/reflex/app_mixins/middleware.py @@ -49,7 +49,7 @@ async def _preprocess(self, state: BaseState, event: Event) -> StateUpdate | Non An optional state to return. """ for middleware in self._middlewares: - out = middleware.preprocess(app=self, state=state, event=event) # pyright: ignore [reportArgumentType] + out = middleware.preprocess(app=self, state=state, event=event) # ty:ignore[invalid-argument-type] if inspect.isawaitable(out): out = await out if out is not None: @@ -75,11 +75,11 @@ async def _postprocess( out = update for middleware in self._middlewares: out = middleware.postprocess( - app=self, # pyright: ignore [reportArgumentType] + app=self, # ty:ignore[invalid-argument-type] state=state, event=event, update=update, ) if inspect.isawaitable(out): out = await out - return out # pyright: ignore[reportReturnType] + return out diff --git a/reflex/assets.py b/reflex/assets.py index 06e4e739b9a..522b16ed3d2 100644 --- a/reflex/assets.py +++ b/reflex/assets.py @@ -65,7 +65,7 @@ def __new__( else: relative_path = str.__new__( str, - object, # pyright: ignore[reportArgumentType] + object, # ty:ignore[invalid-argument-type] "utf-8" if encoding is None else encoding, "strict" if errors is None else errors, ) diff --git a/reflex/compiler/compiler.py b/reflex/compiler/compiler.py index feec49ee69a..d6a80d0856a 100644 --- a/reflex/compiler/compiler.py +++ b/reflex/compiler/compiler.py @@ -714,8 +714,8 @@ def readable_name_from_component( if module is not None: module_name = module.__name__ if module_name is not None: - return f"{module_name}.{component.__name__}" - return component.__name__ + return f"{module_name}.{component.__name__}" # ty:ignore[unresolved-attribute] + return component.__name__ # ty:ignore[unresolved-attribute] return None @@ -766,7 +766,7 @@ def into_component(component: Component | ComponentCallable) -> Component: raise TypeError(msg) try: - component_called = component() + component_called = component() # ty:ignore[call-top-callable] except KeyError as e: if isinstance(e, ReflexError): _modify_exception(e) @@ -860,7 +860,7 @@ def compile_unevaluated_page( # Add meta information to the component. utils.add_meta( component, - **meta_args, + **meta_args, # ty:ignore[invalid-argument-type] ) except Exception as e: diff --git a/reflex/compiler/templates.py b/reflex/compiler/templates.py index 7ac0223331d..486858ed475 100644 --- a/reflex/compiler/templates.py +++ b/reflex/compiler/templates.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.compiler.templates import * # pragma: no cover diff --git a/reflex/compiler/utils.py b/reflex/compiler/utils.py index bb812c67c5f..45fd1b82a18 100644 --- a/reflex/compiler/utils.py +++ b/reflex/compiler/utils.py @@ -188,7 +188,7 @@ def save_error(error: Exception) -> str: timestamp = datetime.now().strftime("%Y-%m-%d__%H-%M-%S") constants.Reflex.LOGS_DIR.mkdir(parents=True, exist_ok=True) log_path = constants.Reflex.LOGS_DIR / f"error_{timestamp}.log" - traceback.TracebackException.from_exception(error).print(file=log_path.open("w+")) + traceback.TracebackException.from_exception(error).print(file=log_path.open("w+")) # ty:ignore[unresolved-attribute] return str(log_path) @@ -223,7 +223,7 @@ def compile_state(state: type[BaseState]) -> dict: resolved_initial_state = pool.submit( asyncio.run, _resolve_delta(initial_state) ).result() - return _sorted_keys(resolved_initial_state) + return _sorted_keys(resolved_initial_state) # ty:ignore[invalid-argument-type] # Normally the compile runs before any event loop starts, we asyncio.run is available for calling. return _sorted_keys(asyncio.run(_resolve_delta(initial_state))) @@ -483,11 +483,10 @@ def create_document_root( for component in head_components or []: if isinstance(component, Meta): - if component.char_set is not None: # pyright: ignore[reportAttributeAccessIssue] + if component.char_set is not None: # ty:ignore[unresolved-attribute] existing_meta_types.add("char_set") - if ( - (name := component.name) is not None # pyright: ignore[reportAttributeAccessIssue] - and name.equals(Var.create("viewport")) + if (name := component.name) is not None and name.equals( # ty:ignore[unresolved-attribute] + Var.create("viewport") ): existing_meta_types.add("viewport") diff --git a/reflex/components/component.py b/reflex/components/component.py index 4affaccc7fe..fddd1f07bee 100644 --- a/reflex/components/component.py +++ b/reflex/components/component.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.components.component import * # pragma: no cover diff --git a/reflex/components/dynamic.py b/reflex/components/dynamic.py index f2612eb8532..8fd607067a8 100644 --- a/reflex/components/dynamic.py +++ b/reflex/components/dynamic.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.components.dynamic import * # pragma: no cover diff --git a/reflex/components/field.py b/reflex/components/field.py index 6fe5b1dd916..5c41215c895 100644 --- a/reflex/components/field.py +++ b/reflex/components/field.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.components.field import * # pragma: no cover diff --git a/reflex/components/literals.py b/reflex/components/literals.py index 0738bda1331..d6a5ee042d5 100644 --- a/reflex/components/literals.py +++ b/reflex/components/literals.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.components.literals.""" from reflex_base.components.literals import * # pragma: no cover diff --git a/reflex/components/props.py b/reflex/components/props.py index 8ea89b2ab1b..b8cdfe7ffc0 100644 --- a/reflex/components/props.py +++ b/reflex/components/props.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.components.props.""" from reflex_base.components.props import * # pragma: no cover diff --git a/reflex/components/tags/__init__.py b/reflex/components/tags/__init__.py index 855786c12bf..e3e1c3fa6c2 100644 --- a/reflex/components/tags/__init__.py +++ b/reflex/components/tags/__init__.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.components.tags import * # pragma: no cover diff --git a/reflex/components/tags/cond_tag.py b/reflex/components/tags/cond_tag.py index 5d9a8b0a226..677ddc5d630 100644 --- a/reflex/components/tags/cond_tag.py +++ b/reflex/components/tags/cond_tag.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.components.tags.cond_tag import * # pragma: no cover diff --git a/reflex/components/tags/iter_tag.py b/reflex/components/tags/iter_tag.py index 9bb13e2ba03..414d830dd1e 100644 --- a/reflex/components/tags/iter_tag.py +++ b/reflex/components/tags/iter_tag.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.components.tags.iter_tag import * # pragma: no cover diff --git a/reflex/components/tags/match_tag.py b/reflex/components/tags/match_tag.py index b3f09d058a3..5995bcd4f84 100644 --- a/reflex/components/tags/match_tag.py +++ b/reflex/components/tags/match_tag.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.components.tags.match_tag import * # pragma: no cover diff --git a/reflex/components/tags/tag.py b/reflex/components/tags/tag.py index 95365b678a8..2ae9df9c94b 100644 --- a/reflex/components/tags/tag.py +++ b/reflex/components/tags/tag.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.components.tags.tag import * # pragma: no cover diff --git a/reflex/components/tags/tagless.py b/reflex/components/tags/tagless.py index cf0d12ee2ff..3ae0c1c7351 100644 --- a/reflex/components/tags/tagless.py +++ b/reflex/components/tags/tagless.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.components.tags.tagless import * # pragma: no cover diff --git a/reflex/config.py b/reflex/config.py index 1d015fcf056..1054947ad34 100644 --- a/reflex/config.py +++ b/reflex/config.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.config.""" from reflex_base.config import * # pragma: no cover diff --git a/reflex/constants/base.py b/reflex/constants/base.py index b500c7e5f0c..f42e8240952 100644 --- a/reflex/constants/base.py +++ b/reflex/constants/base.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.constants.base import * # pragma: no cover diff --git a/reflex/constants/colors.py b/reflex/constants/colors.py index c1f1bf610fe..1b7d9cca3e5 100644 --- a/reflex/constants/colors.py +++ b/reflex/constants/colors.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.constants.colors import * # pragma: no cover diff --git a/reflex/constants/compiler.py b/reflex/constants/compiler.py index e8a4e38a6eb..c99bef62b4a 100644 --- a/reflex/constants/compiler.py +++ b/reflex/constants/compiler.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.constants.compiler import * # pragma: no cover diff --git a/reflex/constants/config.py b/reflex/constants/config.py index 1263c236c93..fca2cac594f 100644 --- a/reflex/constants/config.py +++ b/reflex/constants/config.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.constants.config.""" from reflex_base.constants.config import * # pragma: no cover diff --git a/reflex/constants/custom_components.py b/reflex/constants/custom_components.py index 03a7f79c998..09327836782 100644 --- a/reflex/constants/custom_components.py +++ b/reflex/constants/custom_components.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.constants.custom_components.""" from reflex_base.constants.custom_components import * # pragma: no cover diff --git a/reflex/constants/event.py b/reflex/constants/event.py index 823ac585643..886ea8ef1bc 100644 --- a/reflex/constants/event.py +++ b/reflex/constants/event.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.constants.event import * # pragma: no cover diff --git a/reflex/constants/installer.py b/reflex/constants/installer.py index 54bf46fb30e..e2560af2a80 100644 --- a/reflex/constants/installer.py +++ b/reflex/constants/installer.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.constants.installer.""" from reflex_base.constants.installer import * # pragma: no cover diff --git a/reflex/constants/route.py b/reflex/constants/route.py index aa301e230de..9b0455f728a 100644 --- a/reflex/constants/route.py +++ b/reflex/constants/route.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.constants.route.""" from reflex_base.constants.route import * # pragma: no cover diff --git a/reflex/constants/state.py b/reflex/constants/state.py index 3782112b6fa..9f953ccf490 100644 --- a/reflex/constants/state.py +++ b/reflex/constants/state.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.constants.state import * # pragma: no cover diff --git a/reflex/constants/utils.py b/reflex/constants/utils.py index 0c983c73dfd..dd6aaae4c32 100644 --- a/reflex/constants/utils.py +++ b/reflex/constants/utils.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.constants.utils.""" from reflex_base.constants.utils import * # pragma: no cover diff --git a/reflex/custom_components/custom_components.py b/reflex/custom_components/custom_components.py index 6b612a0628f..6865a3cbbf2 100644 --- a/reflex/custom_components/custom_components.py +++ b/reflex/custom_components/custom_components.py @@ -618,7 +618,7 @@ def _make_pyi_files(): for top_level_dir in Path.cwd().iterdir(): if not top_level_dir.is_dir() or top_level_dir.name.startswith("."): continue - for dir, _, _ in top_level_dir.walk(): + for dir, _, _ in top_level_dir.walk(): # ty:ignore[unresolved-attribute] if "__pycache__" in dir.name: continue PyiGenerator().scan_all([dir]) diff --git a/reflex/environment.py b/reflex/environment.py index e0dbb564d1e..cf8e3bf0fde 100644 --- a/reflex/environment.py +++ b/reflex/environment.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.environment.""" from reflex_base.environment import * # pragma: no cover diff --git a/reflex/event.py b/reflex/event.py index fde5429e092..1a930f2773a 100644 --- a/reflex/event.py +++ b/reflex/event.py @@ -2,7 +2,7 @@ import sys -from reflex_base.event import * # pyright: ignore[reportWildcardImportFromLibrary] +from reflex_base.event import * from reflex_base.event import event -sys.modules[__name__] = event # pyright: ignore[reportArgumentType] +sys.modules[__name__] = event # ty:ignore[invalid-assignment] diff --git a/reflex/experimental/client_state.py b/reflex/experimental/client_state.py index 95fdbf06885..e937058a43f 100644 --- a/reflex/experimental/client_state.py +++ b/reflex/experimental/client_state.py @@ -136,11 +136,11 @@ def create( args_names=(arg_name,), return_expr=Var("Array.prototype.forEach.call") .to(FunctionVar) - .call( + .call( # ty:ignore[unresolved-attribute] ( Var("Object.values") .to(FunctionVar) - .call(Var(_client_state_ref_dict(setter_name))) + .call(Var(_client_state_ref_dict(setter_name))) # ty:ignore[unresolved-attribute] .to(list) .to(list) ) @@ -149,7 +149,7 @@ def create( ]).to(list), ArgsFunctionOperationBuilder.create( args_names=("setter",), - return_expr=Var("setter").to(FunctionVar).call(Var(arg_name)), + return_expr=Var("setter").to(FunctionVar).call(Var(arg_name)), # ty:ignore[unresolved-attribute] ), ), ) @@ -238,7 +238,7 @@ def set_value(self, value: Any = NoValue) -> Var: args_names=(re.sub(r"(\?\.)?\[\".*\"\]", "", value_str),) if value_str.startswith("_") else (), - return_expr=setter.call(value_var), + return_expr=setter.call(value_var), # ty:ignore[unresolved-attribute] ) return setter.to(FunctionVar, EventChain) diff --git a/reflex/experimental/memo.py b/reflex/experimental/memo.py index 7dee0c72eea..d5122357d29 100644 --- a/reflex/experimental/memo.py +++ b/reflex/experimental/memo.py @@ -172,7 +172,7 @@ def _is_memo_reregistration( type(existing) is type(definition) and existing.python_name == definition.python_name and existing.fn.__module__ == definition.fn.__module__ - and existing.fn.__qualname__ == definition.fn.__qualname__ + and existing.fn.__qualname__ == definition.fn.__qualname__ # ty:ignore[unresolved-attribute] ) @@ -509,22 +509,22 @@ def _analyze_params( for parameter in signature.parameters.values(): if parameter.kind is inspect.Parameter.VAR_POSITIONAL: - msg = f"`@rx._x.memo` does not support `*args` in `{fn.__name__}`." + msg = f"`@rx._x.memo` does not support `*args` in `{fn.__name__}`." # ty:ignore[unresolved-attribute] raise TypeError(msg) if parameter.kind is inspect.Parameter.VAR_KEYWORD: - msg = f"`@rx._x.memo` does not support `**kwargs` in `{fn.__name__}`." + msg = f"`@rx._x.memo` does not support `**kwargs` in `{fn.__name__}`." # ty:ignore[unresolved-attribute] raise TypeError(msg) if parameter.kind is inspect.Parameter.POSITIONAL_ONLY: msg = ( f"`@rx._x.memo` does not support positional-only parameters in " - f"`{fn.__name__}`." + f"`{fn.__name__}`." # ty:ignore[unresolved-attribute] ) raise TypeError(msg) annotation = hints.get(parameter.name, parameter.annotation) if annotation is inspect.Parameter.empty: msg = ( - f"All parameters of `{fn.__name__}` must be annotated as `rx.Var[...]` " + f"All parameters of `{fn.__name__}` must be annotated as `rx.Var[...]` " # ty:ignore[unresolved-attribute] f"or `rx.RestProp`. Missing annotation for `{parameter.name}`." ) raise TypeError(msg) @@ -536,14 +536,14 @@ def _analyze_params( if parameter.name == "children" and not is_children: msg = ( - f"`children` in `{fn.__name__}` must be annotated as " + f"`children` in `{fn.__name__}` must be annotated as " # ty:ignore[unresolved-attribute] "`rx.Var[rx.Component]`." ) raise TypeError(msg) if not is_rest and not _is_var_annotation(annotation): msg = ( - f"All parameters of `{fn.__name__}` must be annotated as `rx.Var[...]` " + f"All parameters of `{fn.__name__}` must be annotated as `rx.Var[...]` " # ty:ignore[unresolved-attribute] f"or `rx.RestProp`, got `{annotation}` for `{parameter.name}`." ) raise TypeError(msg) @@ -552,7 +552,7 @@ def _analyze_params( rest_count += 1 if rest_count > 1: msg = ( - f"`@rx._x.memo` only supports one `rx.RestProp` in `{fn.__name__}`." + f"`@rx._x.memo` only supports one `rx.RestProp` in `{fn.__name__}`." # ty:ignore[unresolved-attribute] ) raise TypeError(msg) @@ -594,7 +594,7 @@ def _create_function_definition( """ params = _analyze_params(fn, for_component=False) return_expr = Var.create(_evaluate_memo_function(fn, params)) - _validate_var_return_expr(return_expr, fn.__name__) + _validate_var_return_expr(return_expr, fn.__name__) # ty:ignore[unresolved-attribute] children_param = _get_children_param(params) rest_param = _get_rest_param(params) @@ -620,11 +620,12 @@ def _create_function_definition( return ExperimentalMemoFunctionDefinition( fn=fn, - python_name=fn.__name__, + python_name=fn.__name__, # ty:ignore[unresolved-attribute] params=params, function=function, imported_var=_imported_function_var( - fn.__name__, _annotation_inner_type(return_annotation) + fn.__name__, # ty:ignore[unresolved-attribute] + _annotation_inner_type(return_annotation), ), ) @@ -649,16 +650,16 @@ def _create_component_definition( component = _normalize_component_return(_evaluate_memo_function(fn, params)) if component is None: msg = ( - f"Component-returning `@rx._x.memo` `{fn.__name__}` must return an " + f"Component-returning `@rx._x.memo` `{fn.__name__}` must return an " # ty:ignore[unresolved-attribute] "`rx.Component` or `rx.Var[rx.Component]`." ) raise TypeError(msg) return ExperimentalMemoComponentDefinition( fn=fn, - python_name=fn.__name__, + python_name=fn.__name__, # ty:ignore[unresolved-attribute] params=params, - export_name=format.to_title_case(fn.__name__), + export_name=format.to_title_case(fn.__name__), # ty:ignore[unresolved-attribute] component=_lift_rest_props(component), ) @@ -966,7 +967,7 @@ def memo(fn: Callable[..., Any]) -> Callable[..., Any]: return_annotation = hints.get("return", inspect.Signature.empty) if return_annotation is inspect.Signature.empty: msg = ( - f"`@rx._x.memo` requires a return annotation on `{fn.__name__}`. " + f"`@rx._x.memo` requires a return annotation on `{fn.__name__}`. " # ty:ignore[unresolved-attribute] "Use `-> rx.Component` or `-> rx.Var[...]`." ) raise TypeError(msg) @@ -982,7 +983,7 @@ def memo(fn: Callable[..., Any]) -> Callable[..., Any]: return _create_function_wrapper(definition) msg = ( - f"`@rx._x.memo` on `{fn.__name__}` must return `rx.Component` or `rx.Var[...]`, " + f"`@rx._x.memo` on `{fn.__name__}` must return `rx.Component` or `rx.Var[...]`, " # ty:ignore[unresolved-attribute] f"got `{return_annotation}`." ) raise TypeError(msg) diff --git a/reflex/istate/manager/__init__.py b/reflex/istate/manager/__init__.py index 5e3d71ee0e6..84eae3a0241 100644 --- a/reflex/istate/manager/__init__.py +++ b/reflex/istate/manager/__init__.py @@ -105,7 +105,7 @@ def _coerce_token(token: StateToken[TOKEN_TYPE] | str) -> StateToken[TOKEN_TYPE] from reflex.istate.manager.token import BaseStateToken from reflex.state import State - return BaseStateToken.from_legacy_token(token, root_state=State) # type: ignore[return-value] + return BaseStateToken.from_legacy_token(token, root_state=State) # type: ignore[return-value] # ty:ignore[invalid-return-type] return token @overload @@ -189,7 +189,7 @@ async def set_state( """ @abstractmethod - @contextlib.asynccontextmanager + @contextlib.asynccontextmanager # ty:ignore[no-matching-overload] async def modify_state( self, token: StateToken[TOKEN_TYPE] | str, @@ -204,9 +204,9 @@ async def modify_state( Yields: The state for the token. """ - yield # pyright: ignore[reportReturnType] + yield # ty:ignore[invalid-yield] - @contextlib.asynccontextmanager + @contextlib.asynccontextmanager # ty:ignore[no-matching-overload] async def modify_state_with_links( self, token: StateToken[TOKEN_TYPE] | str, diff --git a/reflex/istate/manager/disk.py b/reflex/istate/manager/disk.py index 9b75533ad93..d5f327c8969 100644 --- a/reflex/istate/manager/disk.py +++ b/reflex/istate/manager/disk.py @@ -198,7 +198,7 @@ async def get_state( if state is None: state = token.cls() self.states[token.cache_key] = state - return cast(TOKEN_TYPE, state) + return cast(TOKEN_TYPE, state) # ty:ignore[redundant-cast] async def set_state_for_substate( self, token: StateToken[TOKEN_TYPE], substate: TOKEN_TYPE diff --git a/reflex/istate/manager/redis.py b/reflex/istate/manager/redis.py index 3a98e16c0d4..f8d2fdf70ae 100644 --- a/reflex/istate/manager/redis.py +++ b/reflex/istate/manager/redis.py @@ -467,9 +467,9 @@ async def _try_modify_state( return # Opportunistically reuse existing lock. - async with self._get_state_cached(token) as cached_state: + async with self._get_state_cached(token) as cached_state: # ty:ignore[invalid-argument-type] if cached_state is not None: - yield cached_state + yield cached_state # ty:ignore[invalid-yield] self._notify_next_waiter(self._lock_key(token)) return @@ -547,7 +547,7 @@ async def modify_state( """ token = self._coerce_token(token) while True: - async with self._try_modify_state(token, **context) as state_instance: + async with self._try_modify_state(token, **context) as state_instance: # ty:ignore[invalid-argument-type] if state_instance is not None: yield cast(TOKEN_TYPE, state_instance) return @@ -587,7 +587,8 @@ async def _get_state_cached( raise ValueError # noqa: TRY301 except ValueError: await self.get_state( - token, for_state_instance=cached_state + token, # ty:ignore[invalid-argument-type] + for_state_instance=cached_state, ) yield cast(TOKEN_TYPE, cached_state) return @@ -816,7 +817,7 @@ async def _subscribe_lock_updates(self): lock_waiter_key_pattern: self._handle_lock_contention, } async with self.redis.pubsub() as pubsub: - await pubsub.psubscribe(**handlers) # pyright: ignore[reportArgumentType] + await pubsub.psubscribe(**handlers) self._lock_updates_subscribed.set() try: async for _ in pubsub.listen(): @@ -933,7 +934,7 @@ async def _n_lock_contenders(self, lock_key: bytes) -> int: res = self.redis.scard(lock_key + b"_waiters") if inspect.isawaitable(res): res = await res - return res + return res # ty:ignore[invalid-return-type] @contextlib.asynccontextmanager async def _request_lock_release( diff --git a/reflex/istate/proxy.py b/reflex/istate/proxy.py index ce9aa3c8618..1db820f53f6 100644 --- a/reflex/istate/proxy.py +++ b/reflex/istate/proxy.py @@ -220,7 +220,7 @@ def __getattr__(self, name: str) -> Any: ) raise ImmutableStateError(msg) - value = super().__getattr__(name) # pyright: ignore[reportAttributeAccessIssue] + value = super().__getattr__(name) # ty:ignore[unresolved-attribute] if not name.startswith("_self_") and isinstance(value, MutableProxy): # ensure mutations to these containers are blocked unless proxy is _mutable return ImmutableMutableProxy( @@ -310,7 +310,7 @@ async def get_state(self, state_cls: type[T_STATE]) -> T_STATE: await self.__wrapped__.get_state(state_cls), event=self._self_event, parent_state_proxy=self, - ) # pyright: ignore [reportReturnType] + ) # ty:ignore[invalid-return-type] async def _as_state_update(self, *args, **kwargs) -> StateUpdate: """Temporarily allow mutability to access parent_state. @@ -433,14 +433,14 @@ def __new__(cls, wrapped: Any, *args, **kwargs) -> MutableProxy: wrapper_cls_name, (cls,), { - dataclasses._FIELDS: getattr( # pyright: ignore [reportAttributeAccessIssue] + dataclasses._FIELDS: getattr( # ty:ignore[unresolved-attribute] wrapped_cls, - dataclasses._FIELDS, # pyright: ignore [reportAttributeAccessIssue] + dataclasses._FIELDS, # ty:ignore[unresolved-attribute] ), }, ) cls = cls.__dataclass_proxies__[wrapper_cls_name] - return super().__new__(cls) # pyright: ignore[reportArgumentType] + return super().__new__(cls) def __init__(self, wrapped: Any, state: BaseState, field_name: str): """Create a proxy for a mutable object that tracks changes. @@ -560,7 +560,7 @@ def __getattr__(self, __name: str) -> Any: Returns: The attribute value. """ - value = super().__getattr__(__name) # pyright: ignore[reportAttributeAccessIssue] + value = super().__getattr__(__name) # ty:ignore[unresolved-attribute] if callable(value): if __name in self.__mark_dirty_attrs__: @@ -571,7 +571,7 @@ def __getattr__(self, __name: str) -> Any: # Wrap special methods that may return mutable objects tied to the state. value = wrapt.FunctionWrapper( value, - self._wrap_recursive_decorator, # pyright: ignore[reportArgumentType] + self._wrap_recursive_decorator, # ty:ignore[invalid-argument-type] ) if ( @@ -602,7 +602,7 @@ def __getitem__(self, key: Any) -> Any: Returns: The item value. """ - value = super().__getitem__(key) # pyright: ignore[reportAttributeAccessIssue] + value = super().__getitem__(key) # ty:ignore[unresolved-attribute] if isinstance(key, slice) and isinstance(value, list): return [self._wrap_recursive(item) for item in value] # Recursively wrap mutable items retrieved through this proxy. @@ -614,7 +614,7 @@ def __iter__(self) -> Any: Yields: Each item value (possibly wrapped in MutableProxy). """ - for value in super().__iter__(): # pyright: ignore[reportAttributeAccessIssue] + for value in super().__iter__(): # ty:ignore[unresolved-attribute] # Recursively wrap mutable items retrieved through this proxy. yield self._wrap_recursive(value) @@ -632,7 +632,7 @@ def __delitem__(self, key: str): Args: key: The key of the item. """ - self._mark_dirty(super().__delitem__, args=(key,)) # pyright: ignore[reportAttributeAccessIssue] + self._mark_dirty(super().__delitem__, args=(key,)) # ty:ignore[unresolved-attribute] def __setitem__(self, key: str, value: Any): """Set the item on the proxied object and mark state dirty. @@ -641,7 +641,7 @@ def __setitem__(self, key: str, value: Any): key: The key of the item. value: The value of the item. """ - self._mark_dirty(super().__setitem__, args=(key, value)) # pyright: ignore[reportAttributeAccessIssue] + self._mark_dirty(super().__setitem__, args=(key, value)) # ty:ignore[unresolved-attribute] def __setattr__(self, name: str, value: Any): """Set the attribute on the proxied object and mark state dirty. @@ -734,7 +734,7 @@ def _json_encoder_default_wrapper(self: json.JSONEncoder, o: Any) -> Any: return _orig_json_encoder_default(self, o) -json.JSONEncoder.default = _json_encoder_default_wrapper +json.JSONEncoder.default = _json_encoder_default_wrapper # ty:ignore[invalid-assignment] class ImmutableMutableProxy(MutableProxy): @@ -770,7 +770,7 @@ def _mark_dirty( Raises: ImmutableStateError: if the StateProxy is not mutable. """ - if not self._self_state._is_mutable(): # pyright: ignore[reportAttributeAccessIssue] + if not self._self_state._is_mutable(): # ty:ignore[unresolved-attribute] msg = ( "Background task StateProxy is immutable outside of a context " "manager. Use `async with self` to modify state." diff --git a/reflex/istate/shared.py b/reflex/istate/shared.py index 41b1f519cd3..d3eb05a95fd 100644 --- a/reflex/istate/shared.py +++ b/reflex/istate/shared.py @@ -402,10 +402,8 @@ async def _modify_linked_states( # Go through all linked states and patch them in if they are present in the tree for linked_state_name, linked_token in self._reflex_internal_links.items(): linked_state_cls: type[SharedState] = ( - self.get_root_state().get_class_substate( # pyright: ignore[reportAssignmentType] - linked_state_name - ) - ) + self.get_root_state().get_class_substate(linked_state_name) + ) # ty:ignore[invalid-assignment] try: original_state = self._get_state_from_cache(linked_state_cls) except ValueError: diff --git a/reflex/model.py b/reflex/model.py index 050a144a60a..5245f975e27 100644 --- a/reflex/model.py +++ b/reflex/model.py @@ -51,7 +51,7 @@ def __init__(self, *args, **kwargs): _print_db_not_available(*args, **kwargs) -if find_spec("sqlalchemy"): +if TYPE_CHECKING or find_spec("sqlalchemy"): import sqlalchemy import sqlalchemy.exc import sqlalchemy.ext.asyncio @@ -252,14 +252,16 @@ def get_metadata(cls) -> sqlalchemy.MetaData: return metadata -else: +elif not TYPE_CHECKING: get_engine_args = _print_db_not_available get_engine = _print_db_not_available get_async_engine = _print_db_not_available sqla_session = _print_db_not_available - ModelRegistry = _ClassThatErrorsOnInit # pyright: ignore [reportAssignmentType] + ModelRegistry = _ClassThatErrorsOnInit -if find_spec("sqlmodel") and find_spec("sqlalchemy") and find_spec("pydantic"): +if TYPE_CHECKING or ( + find_spec("sqlmodel") and find_spec("sqlalchemy") and find_spec("pydantic") +): import alembic.autogenerate import alembic.command import alembic.config @@ -361,7 +363,7 @@ class Model(sqlmodel.SQLModel): id: int | None = sqlmodel.Field(default=None, primary_key=True) - model_config = { # pyright: ignore [reportAssignmentType] + model_config = { "arbitrary_types_allowed": True, "use_enum_values": True, "extra": "allow", @@ -629,8 +631,8 @@ def asession(url: str | None = None) -> AsyncSession: ) return _AsyncSessionLocal[url]() -else: +elif not TYPE_CHECKING: get_db_status = _print_db_not_available session = _print_db_not_available asession = _print_db_not_available - Model = _ClassThatErrorsOnInit # pyright: ignore [reportAssignmentType] + Model = _ClassThatErrorsOnInit diff --git a/reflex/page.py b/reflex/page.py index 2e3f8fc613e..435e18513ad 100644 --- a/reflex/page.py +++ b/reflex/page.py @@ -122,4 +122,4 @@ def __new__( page_namespace = PageNamespace -sys.modules[__name__] = page_namespace # pyright: ignore[reportArgumentType] +sys.modules[__name__] = page_namespace # ty:ignore[invalid-assignment] diff --git a/reflex/plugins/_screenshot.py b/reflex/plugins/_screenshot.py index bd0bbb878bd..a73a2b2dd60 100644 --- a/reflex/plugins/_screenshot.py +++ b/reflex/plugins/_screenshot.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.plugins._screenshot.""" from reflex_base.plugins._screenshot import * # pragma: no cover diff --git a/reflex/plugins/base.py b/reflex/plugins/base.py index c7f85b406cc..535102b293b 100644 --- a/reflex/plugins/base.py +++ b/reflex/plugins/base.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.plugins.base.""" from reflex_base.plugins.base import * # pragma: no cover diff --git a/reflex/plugins/shared_tailwind.py b/reflex/plugins/shared_tailwind.py index ae1d730334d..16bb2425e85 100644 --- a/reflex/plugins/shared_tailwind.py +++ b/reflex/plugins/shared_tailwind.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.plugins.shared_tailwind.""" from reflex_base.plugins.shared_tailwind import * # pragma: no cover diff --git a/reflex/plugins/sitemap.py b/reflex/plugins/sitemap.py index de79b9c18ed..02ddf01b9cb 100644 --- a/reflex/plugins/sitemap.py +++ b/reflex/plugins/sitemap.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.plugins.sitemap.""" from reflex_base.plugins.sitemap import * # pragma: no cover diff --git a/reflex/plugins/tailwind_v3.py b/reflex/plugins/tailwind_v3.py index a5baf1b5c70..95c1f702260 100644 --- a/reflex/plugins/tailwind_v3.py +++ b/reflex/plugins/tailwind_v3.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.plugins.tailwind_v3.""" from reflex_base.plugins.tailwind_v3 import * # pragma: no cover diff --git a/reflex/plugins/tailwind_v4.py b/reflex/plugins/tailwind_v4.py index 177e12c219f..2102166f8de 100644 --- a/reflex/plugins/tailwind_v4.py +++ b/reflex/plugins/tailwind_v4.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.plugins.tailwind_v4.""" from reflex_base.plugins.tailwind_v4 import * # pragma: no cover diff --git a/reflex/reflex.py b/reflex/reflex.py index bf8a66afecd..c0a97f22de8 100644 --- a/reflex/reflex.py +++ b/reflex/reflex.py @@ -926,7 +926,7 @@ def _convert_reflex_loglevel_to_reflex_cli_loglevel( if find_spec("typer") and find_spec("typer.main"): - import typer # pyright: ignore[reportMissingImports] + import typer if isinstance(hosting_cli, typer.Typer): hosting_cli_command = typer.main.get_command(hosting_cli) diff --git a/reflex/state.py b/reflex/state.py index c09d68658f8..3959b2f949c 100644 --- a/reflex/state.py +++ b/reflex/state.py @@ -300,7 +300,7 @@ def _override_base_method(fn: Callable[PARAMS, RETURN]) -> Callable[PARAMS, RETU Returns: The marked function. """ - fn.__override_base_method__ = True # pyright: ignore[reportFunctionMemberAccess] + fn.__override_base_method__ = True # ty:ignore[unresolved-attribute] return fn @@ -418,7 +418,7 @@ def __init__( "See https://reflex.dev/docs/state/ for further information." ) raise ReflexRuntimeError(msg) - if self._mixin: + if self._mixin: # ty:ignore[unresolved-attribute] msg = f"{type(self).__name__} is a state mixin and cannot be instantiated directly." raise ReflexRuntimeError(msg) kwargs["parent_state"] = parent_state @@ -600,7 +600,7 @@ def __init_subclass__(cls, mixin: bool = False, **kwargs): if parent_state is not None and parent_state.event_handlers.get(name): continue value = cls._copy_fn(value) - value.__qualname__ = f"{cls.__name__}.{name}" + value.__qualname__ = f"{cls.__name__}.{name}" # ty:ignore[unresolved-attribute] events[name] = value # Create the setvar event handler for this state @@ -646,11 +646,11 @@ def _copy_fn(fn: Callable) -> Callable: The copied function. """ newfn = FunctionType( - fn.__code__, - fn.__globals__, - name=fn.__name__, - argdefs=fn.__defaults__, - closure=fn.__closure__, + fn.__code__, # ty:ignore[unresolved-attribute] + fn.__globals__, # ty:ignore[unresolved-attribute] + name=fn.__name__, # ty:ignore[unresolved-attribute] + argdefs=fn.__defaults__, # ty:ignore[unresolved-attribute] + closure=fn.__closure__, # ty:ignore[unresolved-attribute] ) newfn.__annotations__ = fn.__annotations__ if mark := getattr(fn, BACKGROUND_TASK_MARKER, None): @@ -697,7 +697,7 @@ def _evaluate(cls, f: Callable[[Self], Any], of_type: type | None = None) -> Var of_type = of_type or Component unique_var_name = ( - ("dynamic_" + f.__module__ + "_" + f.__qualname__) + ("dynamic_" + f.__module__ + "_" + f.__qualname__) # ty:ignore[unresolved-attribute] .replace("<", "") .replace(">", "") .replace(".", "_") @@ -765,7 +765,7 @@ def _handle_local_def(cls): @classmethod @functools.cache - def _get_type_hints(cls) -> dict[str, Any]: + def _get_type_hints(cls) -> dict[str, Any]: # ty:ignore[invalid-type-form] """Get the type hints for this class. If the class is dynamic, evaluate the type hints with the original @@ -1210,7 +1210,7 @@ def _get_var_default(cls, name: str, annotation_value: Any) -> Any: return None @staticmethod - def _get_base_functions() -> dict[str, FunctionType]: + def _get_base_functions() -> dict[str, FunctionType]: # ty:ignore[invalid-type-form] """Get all functions of the state class excluding dunder methods. Returns: @@ -1223,7 +1223,7 @@ def _get_base_functions() -> dict[str, FunctionType]: } @classmethod - def _update_substate_inherited_vars(cls, vars_to_add: dict[str, Var]): + def _update_substate_inherited_vars(cls, vars_to_add: dict[str, Var]): # ty:ignore[invalid-type-form] """Update the inherited vars of substates recursively when new vars are added. Also updates the var dependency tracking dicts after adding vars. @@ -1244,7 +1244,7 @@ def _update_substate_inherited_vars(cls, vars_to_add: dict[str, Var]): cls._init_var_dependency_dicts() @classmethod - def setup_dynamic_args(cls, args: dict[str, str]): + def setup_dynamic_args(cls, args: dict[str, str]): # ty:ignore[invalid-type-form] """Set up args for easy access in renderer. Args: @@ -1355,7 +1355,7 @@ def _get_attribute(self, name: str) -> Any: else: fn = functools.partial(handler.fn, self) fn.__module__ = handler.fn.__module__ - fn.__qualname__ = handler.fn.__qualname__ + fn.__qualname__ = handler.fn.__qualname__ # ty:ignore[unresolved-attribute] return fn backend_vars = super().__getattribute__("_backend_vars") or {} @@ -1661,7 +1661,7 @@ async def get_var_value(self, var: Var[VAR_TYPE]) -> VAR_TYPE: if ( var_value := getattr(var, "_var_value", unset) ) is not unset and not isinstance(var_value, Var): - return var_value # pyright: ignore [reportReturnType] + return var_value # ty:ignore[invalid-return-type] var_data = var._get_all_var_data() if var_data is None or not var_data.state: @@ -1858,7 +1858,7 @@ def get_value(self, key: str) -> Any: def dict( self, include_computed: bool = True, initial: bool = False, **kwargs - ) -> dict[str, Any]: + ) -> dict[str, Any]: # ty:ignore[invalid-type-form] """Convert the object to a dictionary. Args: @@ -1955,7 +1955,7 @@ def __getstate__(self): state.pop(inherited_var_name, None) return state - def __setstate__(self, state: dict[str, Any]): + def __setstate__(self, state: dict[str, Any]): # ty:ignore[invalid-type-form] """Set the state from redis deserialization. This method is called by pickle to deserialize the object. @@ -2165,7 +2165,7 @@ async def _get_state_from_redis(self, state_cls: type[T_STATE]) -> T_STATE: from reflex.istate.shared import SharedStateBaseInternal shared_base = await self.get_state(SharedStateBaseInternal) - return await shared_base._resolve_linked_state(state_cls, linked_token) # type: ignore[return-value] + return await shared_base._resolve_linked_state(state_cls, linked_token) # type: ignore[return-value] # ty:ignore[invalid-return-type] return await super()._get_state_from_redis(state_cls) @event @@ -2415,7 +2415,7 @@ def __init__(self, *args, **kwargs): Raises: ReflexRuntimeError: If the ComponentState is initialized directly. """ - if self._mixin: + if self._mixin: # ty:ignore[unresolved-attribute] raise ReflexRuntimeError( f"{ComponentState.__name__} {type(self).__name__} is not meant to be initialized directly. " + "Use the `create` method to create a new instance and access the state via the `State` attribute." diff --git a/reflex/style.py b/reflex/style.py index 7bea29b6a8e..86dd70eb1c4 100644 --- a/reflex/style.py +++ b/reflex/style.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.style import * # pragma: no cover diff --git a/reflex/testing.py b/reflex/testing.py index 9a3ff023049..7e13a4decc0 100644 --- a/reflex/testing.py +++ b/reflex/testing.py @@ -67,7 +67,7 @@ T = TypeVar("T") TimeoutType = int | float | None if platform.system() == "Windows": - FRONTEND_POPEN_ARGS["creationflags"] = subprocess.CREATE_NEW_PROCESS_GROUP # pyright: ignore [reportAttributeAccessIssue] + FRONTEND_POPEN_ARGS["creationflags"] = subprocess.CREATE_NEW_PROCESS_GROUP # ty:ignore[unresolved-attribute] FRONTEND_POPEN_ARGS["shell"] = True else: FRONTEND_POPEN_ARGS["start_new_session"] = True @@ -120,7 +120,7 @@ class AppHarness: backend: uvicorn.Server | None = None _frontends: list[WebDriver] = dataclasses.field(default_factory=list) _registry_token: contextvars.Token[RegistrationContext] | None = None - _base_registration_context: ClassVar[RegistrationContext] | None = None + _base_registration_context: ClassVar[RegistrationContext] | None = None # ty:ignore[invalid-type-form] @classmethod def create( @@ -152,14 +152,14 @@ def create( elif isinstance(app_source, functools.partial): keywords = app_source.keywords slug_suffix = "_".join([str(v) for v in keywords.values()]) - func_name = app_source.func.__name__ + func_name = app_source.func.__name__ # ty:ignore[unresolved-attribute] app_name = f"{func_name}_{slug_suffix}" app_name = re.sub(r"[^a-zA-Z0-9_]", "_", app_name) elif isinstance(app_source, str): msg = "app_name must be provided when app_source is a string." raise ValueError(msg) else: - app_name = app_source.__name__ + app_name = app_source.__name__ # ty:ignore[unresolved-attribute] app_name = app_name.lower() while "__" in app_name: @@ -249,7 +249,7 @@ def _initialize_app(self): if self.app_source is not None: app_globals = self._get_globals_from_signature(self.app_source) if isinstance(self.app_source, functools.partial): - self.app_source = self.app_source.func + self.app_source = self.app_source.func # ty:ignore[invalid-assignment] # get the source from a function or module object source_code = "\n".join([ "\n".join([ @@ -406,9 +406,7 @@ def _wait_frontend(self): def consume_frontend_output(): while True: try: - line = ( - self.frontend_process.stdout.readline() # pyright: ignore [reportOptionalMemberAccess] - ) + line = self.frontend_process.stdout.readline() # ty:ignore[unresolved-attribute] # catch I/O operation on closed file. except ValueError as e: console.error(str(e)) @@ -635,29 +633,29 @@ def frontend( want_headless = True if driver_clz is None: requested_driver = environment.APP_HARNESS_DRIVER.get() - driver_clz = getattr(webdriver, requested_driver) # pyright: ignore [reportPossiblyUnboundVariable] + driver_clz = getattr(webdriver, requested_driver) if driver_options is None: - driver_options = getattr(webdriver, f"{requested_driver}Options")() # pyright: ignore [reportPossiblyUnboundVariable] - if driver_clz is webdriver.Chrome: # pyright: ignore [reportPossiblyUnboundVariable] + driver_options = getattr(webdriver, f"{requested_driver}Options")() + if driver_clz is webdriver.Chrome: if driver_options is None: from selenium.webdriver.chrome.options import Options - driver_options = Options() # pyright: ignore [reportPossiblyUnboundVariable] + driver_options = Options() driver_options.add_argument("--class=AppHarness") if want_headless: driver_options.add_argument("--headless=new") - elif driver_clz is webdriver.Firefox: # pyright: ignore [reportPossiblyUnboundVariable] + elif driver_clz is webdriver.Firefox: if driver_options is None: from selenium.webdriver.firefox.options import Options - driver_options = Options() # pyright: ignore [reportPossiblyUnboundVariable] + driver_options = Options() if want_headless: driver_options.add_argument("-headless") - elif driver_clz is webdriver.Edge: # pyright: ignore [reportPossiblyUnboundVariable] + elif driver_clz is webdriver.Edge: if driver_options is None: from selenium.webdriver.edge.options import Options - driver_options = Options() # pyright: ignore [reportPossiblyUnboundVariable] + driver_options = Options() if want_headless: driver_options.add_argument("headless") if driver_options is None: @@ -674,7 +672,7 @@ def frontend( driver_options.set_capability(key, value) if driver_kwargs is None: driver_kwargs = {} - driver = driver_clz(options=driver_options, **driver_kwargs) # pyright: ignore [reportOptionalCall, reportArgumentType] + driver = driver_clz(options=driver_options, **driver_kwargs) driver.get(self.frontend_url) self._frontends.append(driver) return driver @@ -874,8 +872,8 @@ def finish_request(self, request: socket.socket, client_address: tuple[str, int] request, client_address, self, - directory=str(self.root), # pyright: ignore [reportCallIssue] - error_page_map=self.error_page_map, # pyright: ignore [reportCallIssue] + directory=str(self.root), # ty:ignore[unknown-argument] + error_page_map=self.error_page_map, # ty:ignore[unknown-argument] ) diff --git a/reflex/utils/compat.py b/reflex/utils/compat.py index fa8ecc8f9a4..c58106c8654 100644 --- a/reflex/utils/compat.py +++ b/reflex/utils/compat.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.utils.compat import * # pragma: no cover diff --git a/reflex/utils/console.py b/reflex/utils/console.py index 6c884425034..2ebeeac662b 100644 --- a/reflex/utils/console.py +++ b/reflex/utils/console.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.utils.console import * # pragma: no cover diff --git a/reflex/utils/decorator.py b/reflex/utils/decorator.py index 6846799fcd9..2bb924b5228 100644 --- a/reflex/utils/decorator.py +++ b/reflex/utils/decorator.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.utils.decorator import * # pragma: no cover diff --git a/reflex/utils/exceptions.py b/reflex/utils/exceptions.py index c08487e6e96..ee4c8a37ec4 100644 --- a/reflex/utils/exceptions.py +++ b/reflex/utils/exceptions.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.utils.exceptions import * # pragma: no cover diff --git a/reflex/utils/exec.py b/reflex/utils/exec.py index f2cbf387a10..c5b83c2a7db 100644 --- a/reflex/utils/exec.py +++ b/reflex/utils/exec.py @@ -194,7 +194,7 @@ def run_process_and_launch_url( } } if constants.IS_WINDOWS and backend_present: - kwargs["creationflags"] = subprocess.CREATE_NEW_PROCESS_GROUP # pyright: ignore [reportAttributeAccessIssue] + kwargs["creationflags"] = subprocess.CREATE_NEW_PROCESS_GROUP # ty:ignore[unresolved-attribute] process = processes.new_process( run_command, cwd=get_web_dir(), diff --git a/reflex/utils/format.py b/reflex/utils/format.py index 1a168466b76..8ed7a0b63be 100644 --- a/reflex/utils/format.py +++ b/reflex/utils/format.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.utils.format import * # pragma: no cover diff --git a/reflex/utils/imports.py b/reflex/utils/imports.py index 3b93770f60e..be6a1f4e811 100644 --- a/reflex/utils/imports.py +++ b/reflex/utils/imports.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.utils.imports import * # pragma: no cover diff --git a/reflex/utils/lazy_loader.py b/reflex/utils/lazy_loader.py index 7c1a5ca3a59..b895936b937 100644 --- a/reflex/utils/lazy_loader.py +++ b/reflex/utils/lazy_loader.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.utils.lazy_loader.""" from reflex_base.utils.lazy_loader import * # pragma: no cover diff --git a/reflex/utils/prerequisites.py b/reflex/utils/prerequisites.py index 06662e53aa0..5ff187e6f74 100644 --- a/reflex/utils/prerequisites.py +++ b/reflex/utils/prerequisites.py @@ -359,7 +359,7 @@ def compile_or_validate_app( try: colorize = _can_colorize() - traceback.print_exception(e, colorize=colorize) # pyright: ignore[reportCallIssue] + traceback.print_exception(e, colorize=colorize) # ty:ignore[no-matching-overload] except Exception: traceback.print_exception(e) return False diff --git a/reflex/utils/processes.py b/reflex/utils/processes.py index 71a74a01df5..26618c49fc7 100644 --- a/reflex/utils/processes.py +++ b/reflex/utils/processes.py @@ -255,7 +255,7 @@ def subprocess_p_open(args: subprocess._CMD, **kwargs): fn: Callable[..., subprocess.CompletedProcess[str] | subprocess.Popen[str]] = ( subprocess.run if run else subprocess_p_open ) - return fn(non_empty_args, **kwargs) + return fn(non_empty_args, **kwargs) # ty:ignore[no-matching-overload] @contextlib.contextmanager @@ -283,7 +283,7 @@ def run_concurrently_context( try: executor = futures.ThreadPoolExecutor(max_workers=len(fns)) # Submit the tasks. - tasks = [executor.submit(*fn) for fn in fns] + tasks = [executor.submit(*fn) for fn in fns] # ty:ignore[invalid-argument-type] # Yield control back to the main thread while tasks are running. yield tasks diff --git a/reflex/utils/pyi_generator.py b/reflex/utils/pyi_generator.py index 02c8dbd99cd..8e3e1a96a25 100644 --- a/reflex/utils/pyi_generator.py +++ b/reflex/utils/pyi_generator.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.utils.pyi_generator import * # pragma: no cover diff --git a/reflex/utils/serializers.py b/reflex/utils/serializers.py index 53bdb151e7b..60d36df58c3 100644 --- a/reflex/utils/serializers.py +++ b/reflex/utils/serializers.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.utils.serializers import * # pragma: no cover diff --git a/reflex/utils/tasks.py b/reflex/utils/tasks.py index 99dd15ee4e3..3c576d3e40a 100644 --- a/reflex/utils/tasks.py +++ b/reflex/utils/tasks.py @@ -47,10 +47,10 @@ async def _run_forever( exception_count += 1 if exception_count >= exception_limit: console.error( - f"{coro_function.__name__}: task exceeded exception limit {exception_limit} within {exception_limit_window}s: {e}" + f"{coro_function.__name__}: task exceeded exception limit {exception_limit} within {exception_limit_window}s: {e}" # ty:ignore[unresolved-attribute] ) raise - console.error(f"{coro_function.__name__}: task error suppressed: {e}") + console.error(f"{coro_function.__name__}: task error suppressed: {e}") # ty:ignore[unresolved-attribute] await asyncio.sleep(exception_delay) continue raise @@ -105,7 +105,7 @@ def ensure_task( exception_limit_window=exception_limit_window, **kwargs, ) - task_name = f"reflex_ensure_task|{type(owner).__name__}.{task_attribute}={coro_function.__name__}|{time.time()}" + task_name = f"reflex_ensure_task|{type(owner).__name__}.{task_attribute}={coro_function.__name__}|{time.time()}" # ty:ignore[unresolved-attribute] if task_context is not None: # Run the task in the given context (not needed after Python 3.11+ which supports passing context to create_task directly). task = task_context.run(asyncio.create_task, rf_coro, name=task_name) diff --git a/reflex/utils/telemetry.py b/reflex/utils/telemetry.py index dcdecd5e0a9..fb8088d6165 100644 --- a/reflex/utils/telemetry.py +++ b/reflex/utils/telemetry.py @@ -293,7 +293,7 @@ def _prepare_event(event: str, **kwargs) -> _Event | None: if key in properties or key not in kwargs: continue - properties[key] = kwargs[key] + properties[key] = kwargs[key] # ty:ignore[invalid-key] stamp = datetime.now(UTC).isoformat() diff --git a/reflex/utils/types.py b/reflex/utils/types.py index e271a4755a0..0dd41e1d13c 100644 --- a/reflex/utils/types.py +++ b/reflex/utils/types.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.utils.types import * # pragma: no cover diff --git a/reflex/vars/__init__.py b/reflex/vars/__init__.py index 11d95952307..8854e8b66ad 100644 --- a/reflex/vars/__init__.py +++ b/reflex/vars/__init__.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Immutable-Based Var System.""" from reflex_base.vars import * # pragma: no cover diff --git a/reflex/vars/base.py b/reflex/vars/base.py index ebb21f5cb18..19323076605 100644 --- a/reflex/vars/base.py +++ b/reflex/vars/base.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.vars.base import * # pragma: no cover diff --git a/reflex/vars/color.py b/reflex/vars/color.py index 2b53da8dced..bd6da9bd19d 100644 --- a/reflex/vars/color.py +++ b/reflex/vars/color.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.vars.color import * # pragma: no cover diff --git a/reflex/vars/datetime.py b/reflex/vars/datetime.py index 8a1beb83e60..479450b042f 100644 --- a/reflex/vars/datetime.py +++ b/reflex/vars/datetime.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.vars.datetime import * # pragma: no cover diff --git a/reflex/vars/dep_tracking.py b/reflex/vars/dep_tracking.py index d2bdb2a3144..c4cee730dc6 100644 --- a/reflex/vars/dep_tracking.py +++ b/reflex/vars/dep_tracking.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.vars.dep_tracking import * # pragma: no cover diff --git a/reflex/vars/function.py b/reflex/vars/function.py index 126f11e7ffc..9b7a62a3906 100644 --- a/reflex/vars/function.py +++ b/reflex/vars/function.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.vars.function import * # pragma: no cover diff --git a/reflex/vars/number.py b/reflex/vars/number.py index b76889a407e..fabf4a62194 100644 --- a/reflex/vars/number.py +++ b/reflex/vars/number.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.vars.number import * # pragma: no cover diff --git a/reflex/vars/object.py b/reflex/vars/object.py index 898093c6666..71fb0fc21b9 100644 --- a/reflex/vars/object.py +++ b/reflex/vars/object.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.vars.object import * # pragma: no cover diff --git a/reflex/vars/sequence.py b/reflex/vars/sequence.py index 7bfdd606ede..2afa4af0d66 100644 --- a/reflex/vars/sequence.py +++ b/reflex/vars/sequence.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.vars.sequence import * # pragma: no cover diff --git a/tests/benchmarks/test_event_processing.py b/tests/benchmarks/test_event_processing.py index 15acf8094d4..ce5f5a1e7e5 100644 --- a/tests/benchmarks/test_event_processing.py +++ b/tests/benchmarks/test_event_processing.py @@ -90,7 +90,7 @@ async def run_events(num_events: int, num_expected_deltas: int) -> None: async with processor as p: async for _ in asyncio.as_completed([ await p.enqueue(token, event) for _ in range(num_events) - ]): + ]): # ty:ignore[not-iterable] pass assert len(emitted_deltas) == num_expected_deltas diff --git a/tests/integration/test_background_task.py b/tests/integration/test_background_task.py index 283dbe4cd12..792e6892e46 100644 --- a/tests/integration/test_background_task.py +++ b/tests/integration/test_background_task.py @@ -334,9 +334,7 @@ def test_background_task( AppHarness.expect(lambda: counter.text == "620", timeout=40) AppHarness.expect(lambda: counter_async_cv.text == "620", timeout=40) # all tasks should have exited and cleaned up - AppHarness.expect( - lambda: not background_task.app_instance.event_processor._tasks # pyright: ignore [reportOptionalMemberAccess] - ) + AppHarness.expect(lambda: not background_task.app_instance.event_processor._tasks) # ty:ignore[unresolved-attribute] def test_nested_async_with_self( diff --git a/tests/integration/test_component_state.py b/tests/integration/test_component_state.py index b9e3a9047bc..94a122b1839 100644 --- a/tests/integration/test_component_state.py +++ b/tests/integration/test_component_state.py @@ -29,12 +29,12 @@ class MultiCounter(rx.ComponentState, Generic[E]): @rx.event def increment(self): self.count += 1 - self._be = self.count # pyright: ignore [reportAttributeAccessIssue] + self._be = self.count # ty:ignore[invalid-assignment] @rx.event def assert_be(self, value: E): assert self._backend_vars != self.backend_vars - assert self._be == int(value) # pyright: ignore [reportAttributeAccessIssue, reportArgumentType] + assert self._be == int(value) # ty:ignore[invalid-argument-type] @rx.event def assert_be_none(self): @@ -43,15 +43,15 @@ def assert_be_none(self): for name, value in self.backend_vars.items() if name not in self.inherited_backend_vars } - assert self._be is None # pyright: ignore [reportAttributeAccessIssue] + assert self._be is None @rx.event def assert_be_int(self, value: int): - assert self._be_int == value # pyright: ignore [reportAttributeAccessIssue] + assert self._be_int == value @rx.event def assert_be_str(self, value: str): - assert self._be_str == value # pyright: ignore [reportAttributeAccessIssue] + assert self._be_str == value @classmethod def get_component(cls, *children, **props): @@ -70,7 +70,7 @@ def get_component(cls, *children, **props): "Assert _be", id=f"{eid}-assert-be", ), - on_submit=lambda fd: cls.assert_be(fd.to(dict)["be_value"]), # pyright: ignore [reportAttributeAccessIssue] + on_submit=lambda fd: cls.assert_be(fd.to(dict)["be_value"]), reset_on_submit=True, ), rx.button( @@ -135,7 +135,7 @@ def index(): mc_d, rx.button( "Inc A", - on_click=mc_a.State.increment, # pyright: ignore [reportAttributeAccessIssue, reportOptionalMemberAccess] + on_click=mc_a.State.increment, # ty:ignore[unresolved-attribute] id="inc-a", ), rx.text( diff --git a/tests/integration/test_dynamic_components.py b/tests/integration/test_dynamic_components.py index cbd60fc227a..12eb5502739 100644 --- a/tests/integration/test_dynamic_components.py +++ b/tests/integration/test_dynamic_components.py @@ -8,8 +8,6 @@ from reflex.testing import AppHarness -# pyright: reportOptionalMemberAccess=false, reportGeneralTypeIssues=false, reportUnknownMemberType=false - def DynamicComponents(): """App with var operations.""" diff --git a/tests/integration/test_dynamic_routes.py b/tests/integration/test_dynamic_routes.py index 7c3e7641f86..2047e670909 100644 --- a/tests/integration/test_dynamic_routes.py +++ b/tests/integration/test_dynamic_routes.py @@ -24,7 +24,7 @@ class DynamicState(rx.State): @rx.event def on_load(self): - page_data = f"{self.router.page.path}-{self.page_id or 'no page id'}" # pyright: ignore[reportAttributeAccessIssue] + page_data = f"{self.router.page.path}-{self.page_id or 'no page id'}" # ty:ignore[unresolved-attribute] print(f"on_load: {page_data}") self.order.append(page_data) @@ -44,7 +44,7 @@ def on_load_static(self): @rx.var def next_page(self) -> str: try: - return str(int(self.page_id) + 1) # pyright: ignore[reportAttributeAccessIssue] + return str(int(self.page_id) + 1) # ty:ignore[unresolved-attribute] except ValueError: return "0" @@ -59,7 +59,7 @@ def index(): read_only=True, id="token", ), - rx.input(value=rx.State.page_id, read_only=True, id="page_id"), # pyright: ignore [reportAttributeAccessIssue] + rx.input(value=rx.State.page_id, read_only=True, id="page_id"), # ty:ignore[unresolved-attribute] rx.input( value=DynamicState.router.page.raw_path, read_only=True, @@ -75,7 +75,7 @@ def index(): rx.link("missing", href="/missing", id="link_missing"), rx.vstack( rx.foreach( - DynamicState.order, # pyright: ignore [reportAttributeAccessIssue] + DynamicState.order, rx.text, ), id="event_order", @@ -88,7 +88,7 @@ class ArgState(rx.State): @rx.var(cache=False) def arg(self) -> int: - return int(self.arg_str or 0) # pyright: ignore[reportAttributeAccessIssue] + return int(self.arg_str or 0) # ty:ignore[unresolved-attribute] class ArgSubState(ArgState): @rx.var @@ -97,7 +97,7 @@ def cached_arg(self) -> int: @rx.var def cached_arg_str(self) -> str: - return self.arg_str # pyright: ignore[reportAttributeAccessIssue] + return self.arg_str # ty:ignore[unresolved-attribute] @rx.page(route="/arg/[arg_str]") def arg() -> rx.Component: @@ -110,11 +110,11 @@ def arg() -> rx.Component: rx.data_list.root( rx.data_list.item( rx.data_list.label("rx.State.arg_str (dynamic)"), - rx.data_list.value(rx.State.arg_str, id="state-arg_str"), # pyright: ignore [reportAttributeAccessIssue] + rx.data_list.value(rx.State.arg_str, id="state-arg_str"), # ty:ignore[unresolved-attribute] ), rx.data_list.item( rx.data_list.label("ArgState.arg_str (dynamic) (inherited)"), - rx.data_list.value(ArgState.arg_str, id="argstate-arg_str"), # pyright: ignore [reportAttributeAccessIssue] + rx.data_list.value(ArgState.arg_str, id="argstate-arg_str"), # ty:ignore[unresolved-attribute] ), rx.data_list.item( rx.data_list.label("ArgState.arg"), @@ -122,7 +122,7 @@ def arg() -> rx.Component: ), rx.data_list.item( rx.data_list.label("ArgSubState.arg_str (dynamic) (inherited)"), - rx.data_list.value(ArgSubState.arg_str, id="argsubstate-arg_str"), # pyright: ignore [reportAttributeAccessIssue] + rx.data_list.value(ArgSubState.arg_str, id="argsubstate-arg_str"), # ty:ignore[unresolved-attribute] ), rx.data_list.item( rx.data_list.label("ArgSubState.arg (inherited)"), diff --git a/tests/integration/test_event_actions.py b/tests/integration/test_event_actions.py index f253c306fd1..6ab1720d9f7 100644 --- a/tests/integration/test_event_actions.py +++ b/tests/integration/test_event_actions.py @@ -76,12 +76,12 @@ def index(): ), rx.button( "Click event", - on_click=EventActionState.on_click("no_event_actions"), # pyright: ignore [reportCallIssue] + on_click=EventActionState.on_click("no_event_actions"), # ty:ignore[invalid-argument-type, missing-argument] id="btn-click-event", ), rx.button( "Click stop propagation", - on_click=EventActionState.on_click("stop_propagation").stop_propagation, # pyright: ignore [reportCallIssue] + on_click=EventActionState.on_click("stop_propagation").stop_propagation, # ty:ignore[invalid-argument-type, missing-argument] id="btn-click-stop-propagation", ), rx.button( @@ -97,15 +97,15 @@ def index(): rx.link( "Link", href="?link", - on_click=EventActionState.on_click("link_no_event_actions"), # pyright: ignore [reportCallIssue] + on_click=EventActionState.on_click("link_no_event_actions"), # ty:ignore[invalid-argument-type, missing-argument] id="link", ), rx.link( "Link Stop Propagation", href="?link-stop-propagation", - on_click=EventActionState.on_click( # pyright: ignore [reportCallIssue] - "link_stop_propagation" - ).stop_propagation, + on_click=EventActionState.on_click( + "link_stop_propagation" # ty:ignore[invalid-argument-type] + ).stop_propagation, # ty:ignore[missing-argument] id="link-stop-propagation", ), rx.link( @@ -117,44 +117,42 @@ def index(): rx.link( "Link Prevent Default", href="/invalid", - on_click=EventActionState.on_click( # pyright: ignore [reportCallIssue] - "link_prevent_default" - ).prevent_default, + on_click=EventActionState.on_click( + "link_prevent_default" # ty:ignore[invalid-argument-type] + ).prevent_default, # ty:ignore[missing-argument] id="link-prevent-default", ), rx.link( "Link Both", href="/invalid", - on_click=EventActionState.on_click( # pyright: ignore [reportCallIssue] - "link_both" - ).stop_propagation.prevent_default, + on_click=EventActionState.on_click( + "link_both" # ty:ignore[invalid-argument-type] + ).stop_propagation.prevent_default, # ty:ignore[missing-argument] id="link-stop-propagation-prevent-default", ), EventFiringComponent.create( id="custom-stop-propagation", - on_click=EventActionState.on_click( # pyright: ignore [reportCallIssue] - "custom-stop-propagation" - ).stop_propagation, + on_click=EventActionState.on_click( + "custom-stop-propagation" # ty:ignore[invalid-argument-type] + ).stop_propagation, # ty:ignore[missing-argument] ), EventFiringComponent.create( id="custom-prevent-default", - on_click=EventActionState.on_click( # pyright: ignore [reportCallIssue] - "custom-prevent-default" - ).prevent_default, + on_click=EventActionState.on_click( + "custom-prevent-default" # ty:ignore[invalid-argument-type] + ).prevent_default, # ty:ignore[missing-argument] ), rx.button( "Throttle", id="btn-throttle", on_click=lambda: ( - EventActionState.on_click_throttle.throttle( # pyright: ignore [reportFunctionMemberAccess] - 200 - ).stop_propagation + EventActionState.on_click_throttle.throttle(200).stop_propagation # ty:ignore[unresolved-attribute] ), ), rx.button( "Debounce", id="btn-debounce", - on_click=EventActionState.on_click_debounce.debounce( # pyright: ignore [reportFunctionMemberAccess] + on_click=EventActionState.on_click_debounce.debounce( # ty:ignore[unresolved-attribute] 200 ).stop_propagation, ), @@ -165,7 +163,7 @@ def index(): ), id="event_order", ), - on_click=EventActionState.on_click("outer"), # pyright: ignore [reportCallIssue] + on_click=EventActionState.on_click("outer"), # ty:ignore[invalid-argument-type, missing-argument] ), rx.form( rx.dialog.root( rx.dialog.trigger( @@ -176,12 +174,12 @@ def index(): rx.dialog.close( rx.form( rx.button("Submit", id="btn-submit"), - on_submit=EventActionState.on_submit.stop_propagation, # pyright: ignore [reportCallIssue] + on_submit=EventActionState.on_submit.stop_propagation, ), ), ), ), - on_submit=EventActionState.on_submit, # pyright: ignore [reportCallIssue] + on_submit=EventActionState.on_submit, ) app = rx.App() @@ -361,8 +359,8 @@ def test_event_actions_dialog_form_in_form( driver.find_element(By.ID, open_dialog_id).click() el = wait.until(EC.element_to_be_clickable((By.ID, submit_button_id))) - el.click() # pyright: ignore[reportAttributeAccessIssue] - el.send_keys(Keys.ESCAPE) # pyright: ignore[reportAttributeAccessIssue] + el.click() + el.send_keys(Keys.ESCAPE) btn_no_events = wait.until(EC.element_to_be_clickable((By.ID, "btn-no-events"))) btn_no_events.location_once_scrolled_into_view diff --git a/tests/integration/test_exception_handlers.py b/tests/integration/test_exception_handlers.py index 8c24cfaa45e..bdf956c7cf5 100644 --- a/tests/integration/test_exception_handlers.py +++ b/tests/integration/test_exception_handlers.py @@ -53,7 +53,7 @@ def index(): ), rx.button( "induce_backend_error", - on_click=lambda: TestAppState.divide_by_number(0), # pyright: ignore [reportCallIssue] + on_click=lambda: TestAppState.divide_by_number(0), # ty:ignore[invalid-argument-type, missing-argument] id="induce-backend-error-btn", ), rx.button( diff --git a/tests/integration/test_lifespan.py b/tests/integration/test_lifespan.py index 1f3185db86c..9938eda856e 100644 --- a/tests/integration/test_lifespan.py +++ b/tests/integration/test_lifespan.py @@ -35,9 +35,9 @@ def LifespanApp( @asynccontextmanager async def lifespan_context(app, inc: int = 1): - global lifespan_context_global + global lifespan_context_global # ty:ignore[unresolved-global] print(f"Lifespan context entered: {app}.") - lifespan_context_global += inc # pyright: ignore[reportUnboundVariable] + lifespan_context_global += inc # ty:ignore[unresolved-reference] try: yield finally: @@ -45,22 +45,22 @@ async def lifespan_context(app, inc: int = 1): lifespan_context_global += inc async def lifespan_task(inc: int = 1): - global lifespan_task_global + global lifespan_task_global # ty:ignore[unresolved-global] print("Lifespan global started.") try: while True: - lifespan_task_global += inc # pyright: ignore[reportUnboundVariable, reportPossiblyUnboundVariable] + lifespan_task_global += inc await asyncio.sleep(0.1) except asyncio.CancelledError as ce: print(f"Lifespan global cancelled: {ce}.") lifespan_task_global = 0 async def raw_asyncio_task_coro(): - global raw_asyncio_task_global + global raw_asyncio_task_global # ty:ignore[unresolved-global] print("Raw asyncio task started.") try: while True: - raw_asyncio_task_global += 1 # pyright: ignore[reportUnboundVariable, reportPossiblyUnboundVariable] + raw_asyncio_task_global += 1 await asyncio.sleep(0.1) except asyncio.CancelledError as ce: print(f"Raw asyncio task cancelled: {ce}.") diff --git a/tests/integration/test_linked_state.py b/tests/integration/test_linked_state.py index 6670b18df16..0520cab5db0 100644 --- a/tests/integration/test_linked_state.py +++ b/tests/integration/test_linked_state.py @@ -62,9 +62,9 @@ def clear_event_link_status(self): @rx.event async def on_load_link_default(self): - linked_state = await self._link_to(self.room or "default") # pyright: ignore[reportAttributeAccessIssue] - if self.room: # pyright: ignore[reportAttributeAccessIssue] - assert linked_state._linked_to == self.room # pyright: ignore[reportAttributeAccessIssue] + linked_state = await self._link_to(self.room or "default") # ty:ignore[unresolved-attribute] + if self.room: # ty:ignore[unresolved-attribute] + assert linked_state._linked_to == self.room # ty:ignore[unresolved-attribute] else: assert linked_state._linked_to == "default" @@ -82,7 +82,7 @@ class SharedNotes(rx.SharedState): @rx.event async def on_load_link_default(self): - linked_state = await self._link_to(self.room or "default") # pyright: ignore[reportAttributeAccessIssue] + linked_state = await self._link_to(self.room or "default") # ty:ignore[unresolved-attribute] initial_note = self.router.page.params.get("initial_note", "") if initial_note: linked_state.note = initial_note diff --git a/tests/integration/test_login_flow.py b/tests/integration/test_login_flow.py index 17681370d62..f6abb2ea6e2 100644 --- a/tests/integration/test_login_flow.py +++ b/tests/integration/test_login_flow.py @@ -36,8 +36,8 @@ def login(self): yield rx.redirect("/") def index(): - return rx.cond( # pyright: ignore [reportCallIssue] - State.is_hydrated & State.auth_token, # pyright: ignore [reportOperatorIssue] + return rx.cond( + State.is_hydrated & State.auth_token, # ty:ignore[unsupported-operator] rx.vstack( rx.heading(State.auth_token, id="auth-token"), rx.button("Logout", on_click=State.logout, id="logout"), diff --git a/tests/integration/test_upload.py b/tests/integration/test_upload.py index ddddd0ad445..c6d872492ac 100644 --- a/tests/integration/test_upload.py +++ b/tests/integration/test_upload.py @@ -164,7 +164,7 @@ def index(): ), rx.button( "Upload", - on_click=lambda: UploadState.handle_upload(rx.upload_files()), # pyright: ignore [reportArgumentType] + on_click=lambda: UploadState.handle_upload(rx.upload_files()), id="upload_button", ), rx.box( @@ -190,7 +190,7 @@ def index(): rx.button( "Upload", on_click=UploadState.handle_upload_secondary( - rx.upload_files( # pyright: ignore [reportArgumentType] + rx.upload_files( upload_id="secondary", on_upload_progress=UploadState.upload_progress, ), @@ -232,7 +232,7 @@ def index(): rx.button( "Upload", on_click=UploadState.handle_upload_tertiary( - rx.upload_files( # pyright: ignore [reportArgumentType] + rx.upload_files( upload_id="tertiary", ), ), @@ -254,7 +254,7 @@ def index(): rx.text("Drag and drop files here or click to select files"), ), on_drop=UploadState.handle_upload_quaternary( - rx.upload_files( # pyright: ignore [reportArgumentType] + rx.upload_files( upload_id="quaternary", ), ), @@ -275,7 +275,7 @@ def index(): rx.button( "Upload", on_click=UploadState.handle_upload_stream( - rx.upload_files_chunk( # pyright: ignore [reportArgumentType] + rx.upload_files_chunk( upload_id="streaming", on_upload_progress=UploadState.stream_upload_progress, ) diff --git a/tests/integration/test_var_operations.py b/tests/integration/test_var_operations.py index 1f752b71f2a..1bd353d0ce2 100644 --- a/tests/integration/test_var_operations.py +++ b/tests/integration/test_var_operations.py @@ -581,23 +581,23 @@ def index(): rx.box( # Test that foreach works with various non-array inputs without throwing rx.foreach( - rx.Var("undefined").to(list), + rx.Var("undefined").to(list), # ty:ignore[invalid-argument-type] rx.text.span, ), rx.foreach( - rx.Var("null").to(list), + rx.Var("null").to(list), # ty:ignore[invalid-argument-type] rx.text.span, ), rx.foreach( - rx.Var("({})").to(list), + rx.Var("({})").to(list), # ty:ignore[invalid-argument-type] rx.text.span, ), rx.foreach( - rx.Var("2").to(list), + rx.Var("2").to(list), # ty:ignore[invalid-argument-type] rx.text.span, ), rx.foreach( - rx.Var("false").to(list), + rx.Var("false").to(list), # ty:ignore[invalid-argument-type] rx.text.span, ), ), @@ -701,7 +701,7 @@ def index(): id="optional_list", ), rx.box( - rx.foreach(VarOperationState.optional_dict, rx.text.span), + rx.foreach(VarOperationState.optional_dict, rx.text.span), # ty:ignore[invalid-argument-type] id="optional_dict", ), rx.box( @@ -709,7 +709,7 @@ def index(): id="optional_list_value", ), rx.box( - rx.foreach(VarOperationState.optional_dict_value, rx.text.span), + rx.foreach(VarOperationState.optional_dict_value, rx.text.span), # ty:ignore[invalid-argument-type] id="optional_dict_value", ), rx.box( diff --git a/tests/integration/tests_playwright/test_appearance.py b/tests/integration/tests_playwright/test_appearance.py index 9090dac672d..1626c7993a4 100644 --- a/tests/integration/tests_playwright/test_appearance.py +++ b/tests/integration/tests_playwright/test_appearance.py @@ -65,7 +65,7 @@ def index(): rx.icon(tag="moon", size=20), value="dark", ), - on_change=set_color_mode, # pyright: ignore[reportArgumentType] + on_change=set_color_mode, variant="classic", radius="large", value=color_mode, diff --git a/tests/integration/tests_playwright/test_frontend_path.py b/tests/integration/tests_playwright/test_frontend_path.py index 8434938a894..947d2be1b1d 100644 --- a/tests/integration/tests_playwright/test_frontend_path.py +++ b/tests/integration/tests_playwright/test_frontend_path.py @@ -41,7 +41,7 @@ def on_load_static(self): @rx.event def on_load_dynamic(self): - page_id = self.page_id # pyright: ignore[reportAttributeAccessIssue] + page_id = self.page_id # ty:ignore[unresolved-attribute] self.on_load_events.append(f"dynamic-{page_id}") @rx.event @@ -180,7 +180,7 @@ def static_page(): @rx.page("/dynamic/[page_id]", on_load=FPState.on_load_dynamic) def dynamic_page(): return rx.box( - rx.text(f"dynamic page {rx.State.page_id}", id="page-id"), # pyright: ignore[reportAttributeAccessIssue] + rx.text(f"dynamic page {rx.State.page_id}", id="page-id"), # ty:ignore[unresolved-attribute] rx.input( value=FPState.router.session.client_token, read_only=True, diff --git a/tests/units/compiler/test_compiler.py b/tests/units/compiler/test_compiler.py index 47a82c08400..2dd0eff4827 100644 --- a/tests/units/compiler/test_compiler.py +++ b/tests/units/compiler/test_compiler.py @@ -369,17 +369,17 @@ def test_create_document_root(): assert isinstance(root, Html) assert isinstance(root.children[0], Head) # Default language. - lang = root.lang # pyright: ignore [reportAttributeAccessIssue] + lang = root.lang # ty:ignore[unresolved-attribute] assert isinstance(lang, LiteralStringVar) assert lang.equals(Var.create("en")) # No children in head. assert len(root.children[0].children) == 6 assert isinstance(root.children[0].children[1], Meta) - char_set = root.children[0].children[1].char_set # pyright: ignore [reportAttributeAccessIssue] + char_set = root.children[0].children[1].char_set # ty:ignore[unresolved-attribute] assert isinstance(char_set, LiteralStringVar) assert char_set.equals(Var.create("utf-8")) assert isinstance(root.children[0].children[2], Meta) - name = root.children[0].children[2].name # pyright: ignore [reportAttributeAccessIssue] + name = root.children[0].children[2].name # ty:ignore[unresolved-attribute] assert isinstance(name, LiteralStringVar) assert name.equals(Var.create("viewport")) assert isinstance(root.children[0].children[3], document.Meta) @@ -411,7 +411,7 @@ def test_create_document_root_with_scripts(): "link", "Links", ] - lang = root.lang # pyright: ignore [reportAttributeAccessIssue] + lang = root.lang # ty:ignore[unresolved-attribute] assert isinstance(lang, LiteralStringVar) assert lang.equals(Var.create("rx")) assert isinstance(root.custom_attrs, dict) @@ -430,7 +430,7 @@ def test_create_document_root_with_meta_char_set(): assert len(root.children[0].children) == 6 names = [c.tag for c in root.children[0].children] assert names == ["script", "meta", "meta", "Meta", "link", "Links"] - assert str(root.children[0].children[1].char_set) == '"cp1252"' # pyright: ignore [reportAttributeAccessIssue] + assert str(root.children[0].children[1].char_set) == '"cp1252"' # ty:ignore[unresolved-attribute] def test_create_document_root_with_meta_viewport(): @@ -446,7 +446,7 @@ def test_create_document_root_with_meta_viewport(): assert len(root.children[0].children) == 7 names = [c.tag for c in root.children[0].children] assert names == ["script", "meta", "meta", "meta", "Meta", "link", "Links"] - assert str(root.children[0].children[1].http_equiv) == '"refresh"' # pyright: ignore [reportAttributeAccessIssue] - assert str(root.children[0].children[2].name) == '"viewport"' # pyright: ignore [reportAttributeAccessIssue] - assert str(root.children[0].children[2].content) == '"foo"' # pyright: ignore [reportAttributeAccessIssue] - assert str(root.children[0].children[3].char_set) == '"utf-8"' # pyright: ignore [reportAttributeAccessIssue] + assert str(root.children[0].children[1].http_equiv) == '"refresh"' # ty:ignore[unresolved-attribute] + assert str(root.children[0].children[2].name) == '"viewport"' # ty:ignore[unresolved-attribute] + assert str(root.children[0].children[2].content) == '"foo"' # ty:ignore[unresolved-attribute] + assert str(root.children[0].children[3].char_set) == '"utf-8"' # ty:ignore[unresolved-attribute] diff --git a/tests/units/components/core/test_colors.py b/tests/units/components/core/test_colors.py index 48b074b3103..12eac2d8f11 100644 --- a/tests/units/components/core/test_colors.py +++ b/tests/units/components/core/test_colors.py @@ -24,7 +24,7 @@ def create_color_var(color): color_with_fstring = rx.color( - f"{ColorState.color}", # pyright: ignore [reportArgumentType] + f"{ColorState.color}", # ty:ignore[invalid-argument-type] ColorState.shade, ) @@ -55,7 +55,7 @@ def create_color_var(color): ( create_color_var( rx.color( - f"{ColorState.color_part}ato", # pyright: ignore [reportArgumentType] + f"{ColorState.color_part}ato", # ty:ignore[invalid-argument-type] ColorState.shade, ) ), @@ -143,4 +143,4 @@ def test_radix_color(color, expected): expected (str): The expected custom_style string, radix or literal """ code_block = CodeBlock.create("Hello World", background_color=color) - assert str(code_block.custom_style["backgroundColor"]) == expected # pyright: ignore [reportAttributeAccessIssue] + assert str(code_block.custom_style["backgroundColor"]) == expected # ty:ignore[unresolved-attribute] diff --git a/tests/units/components/core/test_cond.py b/tests/units/components/core/test_cond.py index bf10dc968bd..e1844ffe468 100644 --- a/tests/units/components/core/test_cond.py +++ b/tests/units/components/core/test_cond.py @@ -17,7 +17,7 @@ @pytest.fixture def cond_state(request): class CondState(BaseState): - value: request.param["value_type"] = request.param["value"] # pyright: ignore [reportInvalidTypeForm, reportUndefinedVariable] # noqa: F821 + value: request.param["value_type"] = request.param["value"] # noqa: F821 return CondState @@ -44,7 +44,7 @@ def test_validate_cond(cond_state: BaseState): cond_state: A fixture. """ cond_component = cond( - cond_state.value, # pyright: ignore[reportAttributeAccessIssue] + cond_state.value, # ty:ignore[unresolved-attribute] Text.create("cond is True"), Text.create("cond is False"), ) @@ -52,7 +52,7 @@ def test_validate_cond(cond_state: BaseState): assert cond_dict["name"] == "Fragment" [condition] = cond_dict["children"] - assert condition["cond_state"] == str(cond_state.value.bool()) # pyright: ignore[reportAttributeAccessIssue] + assert condition["cond_state"] == str(cond_state.value.bool()) # ty:ignore[unresolved-attribute] # true value true_value = condition["true_value"] @@ -115,12 +115,12 @@ def test_cond_no_else(): comp = comp.children[0] assert isinstance(comp, Cond) assert comp.cond._decode() is True - assert comp.children[0].render() == Fragment.create(Text.create("hello")).render() # pyright: ignore [reportOptionalMemberAccess] + assert comp.children[0].render() == Fragment.create(Text.create("hello")).render() assert comp.children[1] == Fragment.create() # Props do not support the use of cond without else with pytest.raises(ValueError): - cond(True, "hello") # pyright: ignore [reportArgumentType] + cond(True, "hello") # ty:ignore[invalid-argument-type] def test_cond_computed_var(): @@ -150,11 +150,11 @@ def computed_str(self) -> str: def test_cond_assert_types() -> None: - """Test that pyright infers the correct return types for cond overloads.""" + """Test that the type checker infers the correct return types for cond overloads.""" text_comp = Text.create("hello") text_comp2 = Text.create("world") var_int: Var[int] = LiteralVar.create(1) - var_str: Var[str] = LiteralVar.create("a") + var_str: Var[str] = LiteralVar.create("a") # ty:ignore[invalid-assignment] # Component, Component -> Component _ = assert_type(cond(True, text_comp, text_comp2), Component) @@ -169,10 +169,10 @@ def test_cond_assert_types() -> None: _ = assert_type(cond(True, "hello", text_comp), Component) # T, T -> Var[T] - _ = assert_type(cond(True, "hello", "world"), Var[str]) + _ = assert_type(cond(True, "hello", "world"), Var[str]) # ty:ignore[type-assertion-failure] # T, U -> Var[T | U] - _ = assert_type(cond(True, "hello", 3), Var[str | int]) + _ = assert_type(cond(True, "hello", 3), Var[str | int]) # ty:ignore[type-assertion-failure] # T, Var[T] -> Var[T] _ = assert_type(cond(True, "hello", var_str), Var[str]) @@ -181,10 +181,10 @@ def test_cond_assert_types() -> None: _ = assert_type(cond(True, var_str, "world"), Var[str]) # T, Var[U] -> Var[T | U] - _ = assert_type(cond(True, "hello", var_int), Var[str | int]) + _ = assert_type(cond(True, "hello", var_int), Var[str | int]) # ty:ignore[type-assertion-failure] # Var[T], U -> Var[T | U] - _ = assert_type(cond(True, var_str, 3), Var[int | Literal["a"]]) + _ = assert_type(cond(True, var_str, 3), Var[int | Literal["a"]]) # ty:ignore[type-assertion-failure] # Var[T], Var[U] -> Var[T | U] - _ = assert_type(cond(True, var_int, var_str), Var[int | Literal["a"]]) + _ = assert_type(cond(True, var_int, var_str), Var[int | Literal["a"]]) # ty:ignore[type-assertion-failure] diff --git a/tests/units/components/core/test_foreach.py b/tests/units/components/core/test_foreach.py index cec2db1c95a..57c5a4ce077 100644 --- a/tests/units/components/core/test_foreach.py +++ b/tests/units/components/core/test_foreach.py @@ -317,11 +317,11 @@ def test_optional_list(): ) Foreach.create( - ForEachState.optional_dict, + ForEachState.optional_dict, # ty:ignore[invalid-argument-type] lambda color: text(color[0], color[1]), ) Foreach.create( - ForEachState.optional_dict_value, + ForEachState.optional_dict_value, # ty:ignore[invalid-argument-type] lambda color: text(color[0], color[1]), ) diff --git a/tests/units/components/core/test_html.py b/tests/units/components/core/test_html.py index 4241c9344ab..fd53a50485c 100644 --- a/tests/units/components/core/test_html.py +++ b/tests/units/components/core/test_html.py @@ -16,7 +16,7 @@ def test_html_many_children(): def test_html_create(): html = Html.create("

Hello !

") - assert str(html.dangerouslySetInnerHTML) == '({ ["__html"] : "

Hello !

" })' # pyright: ignore [reportAttributeAccessIssue] + assert str(html.dangerouslySetInnerHTML) == '({ ["__html"] : "

Hello !

" })' # ty:ignore[unresolved-attribute] assert ( str(html) == 'jsx("div",{className:"rx-Html",dangerouslySetInnerHTML:({ ["__html"] : "

Hello !

" })},)' @@ -31,7 +31,7 @@ class TestState(State): html = Html.create(f"

Hello {TestState.myvar}!

") - html_dangerouslySetInnerHTML = html.dangerouslySetInnerHTML # pyright: ignore [reportAttributeAccessIssue] + html_dangerouslySetInnerHTML = html.dangerouslySetInnerHTML # ty:ignore[unresolved-attribute] assert ( str(html_dangerouslySetInnerHTML) diff --git a/tests/units/components/core/test_upload.py b/tests/units/components/core/test_upload.py index d3a1e4c19aa..cfe875ee8f7 100644 --- a/tests/units/components/core/test_upload.py +++ b/tests/units/components/core/test_upload.py @@ -8,7 +8,7 @@ StyledUpload, Upload, UploadNamespace, - _on_drop_spec, # pyright: ignore [reportAttributeAccessIssue] + _on_drop_spec, cancel_upload, get_upload_url, ) @@ -74,7 +74,7 @@ def test_get_upload_url(): def test__on_drop_spec(): - assert isinstance(_on_drop_spec(LiteralVar.create([])), tuple) + assert isinstance(_on_drop_spec(LiteralVar.create([])), tuple) # ty:ignore[invalid-argument-type] @pytest.mark.parametrize("component", [Upload, GhostUpload]) @@ -157,7 +157,7 @@ def test_upload_create(): up_comp_5 = Upload.create( id="foo_id", on_drop=StreamingUploadStateTest.chunk_drop_handler( - rx.upload_files_chunk(upload_id="foo_id") # pyright: ignore[reportArgumentType] + rx.upload_files_chunk(upload_id="foo_id") ), ) assert isinstance(up_comp_5, Upload) @@ -166,7 +166,7 @@ def test_upload_create(): up_comp_6 = Upload.create( id="foo_id", on_drop=StreamingUploadStateTest.chunk_upload_alias_handler( - rx.upload_files_chunk(upload_id="foo_id") # pyright: ignore[reportArgumentType] + rx.upload_files_chunk(upload_id="foo_id") ), ) assert isinstance(up_comp_6, Upload) @@ -189,7 +189,7 @@ def test_upload_button_handlers_allow_custom_param_names(): chunk_button = rx.button( "Upload", on_click=StreamingUploadStateTest.chunk_upload_alias_handler( - rx.upload_files_chunk(upload_id="foo_id") # pyright: ignore[reportArgumentType] + rx.upload_files_chunk(upload_id="foo_id") ), ) chunk_chain = cast(EventChain, chunk_button.event_triggers["on_click"]) diff --git a/tests/units/components/datadisplay/test_code.py b/tests/units/components/datadisplay/test_code.py index 5b20c0584ea..0d8ca65aa48 100644 --- a/tests/units/components/datadisplay/test_code.py +++ b/tests/units/components/datadisplay/test_code.py @@ -9,4 +9,4 @@ def test_code_light_dark_theme(theme, expected): code_block = CodeBlock.create(theme=theme) - assert code_block.theme._js_expr == expected # pyright: ignore [reportAttributeAccessIssue] + assert code_block.theme._js_expr == expected # ty:ignore[unresolved-attribute] diff --git a/tests/units/components/datadisplay/test_datatable.py b/tests/units/components/datadisplay/test_datatable.py index 684248e875c..54d3ece0672 100644 --- a/tests/units/components/datadisplay/test_datatable.py +++ b/tests/units/components/datadisplay/test_datatable.py @@ -16,7 +16,7 @@ { "data": pd.DataFrame( [["foo", "bar"], ["foo1", "bar1"]], - columns=["column1", "column2"], # pyright: ignore [reportArgumentType] + columns=["column1", "column2"], ) }, "data", @@ -34,13 +34,13 @@ def test_validate_data_table(data_table_state: rx.State, expected): expected: expected var name. """ - if not types.is_dataframe(data_table_state.data._var_type): # pyright: ignore[reportAttributeAccessIssue] + if not types.is_dataframe(data_table_state.data._var_type): # ty:ignore[unresolved-attribute] data_table_component = DataTable.create( - data=data_table_state.data, # pyright: ignore[reportAttributeAccessIssue] - columns=data_table_state.columns, # pyright: ignore[reportAttributeAccessIssue] + data=data_table_state.data, # ty:ignore[unresolved-attribute] + columns=data_table_state.columns, # ty:ignore[unresolved-attribute] ) else: - data_table_component = DataTable.create(data=data_table_state.data) # pyright: ignore[reportAttributeAccessIssue] + data_table_component = DataTable.create(data=data_table_state.data) # ty:ignore[unresolved-attribute] data_table_dict = data_table_component.render() @@ -127,7 +127,7 @@ def test_serialize_dataframe(): """Test if dataframe is serialized correctly.""" simple_dataframe = pd.DataFrame( [["foo", "bar"], ["foo1", "bar1"]], - columns=["column1", "column2"], # pyright: ignore [reportArgumentType] + columns=["column1", "column2"], ) value = serialize(simple_dataframe) assert value == serialize_dataframe(simple_dataframe) diff --git a/tests/units/components/datadisplay/test_shiki_code.py b/tests/units/components/datadisplay/test_shiki_code.py index b405127ee5e..4a44fb0f917 100644 --- a/tests/units/components/datadisplay/test_shiki_code.py +++ b/tests/units/components/datadisplay/test_shiki_code.py @@ -95,7 +95,7 @@ def test_create_shiki_code_block( # Test that the first child is the code code_block_component = component.children[0] - assert code_block_component.code._var_value == expected_first_child # pyright: ignore [reportAttributeAccessIssue] + assert code_block_component.code._var_value == expected_first_child # ty:ignore[unresolved-attribute] applied_styles = component.style for key, value in expected_styles.items(): @@ -130,12 +130,12 @@ def test_create_shiki_high_level_code_block( # Test that the first child is the code block component code_block_component = component.children[0] - assert code_block_component.code._var_value == children[0] # pyright: ignore [reportAttributeAccessIssue] + assert code_block_component.code._var_value == children[0] # ty:ignore[unresolved-attribute] # Check if the transformer is set correctly if expected if expected_transformers: exp_trans_names = [t.__name__ for t in expected_transformers] - for transformer in code_block_component.transformers._var_value: # pyright: ignore [reportAttributeAccessIssue] + for transformer in code_block_component.transformers._var_value: # ty:ignore[unresolved-attribute] assert type(transformer).__name__ in exp_trans_names # Check if the second child is the copy button if can_copy is True @@ -163,12 +163,12 @@ def test_shiki_high_level_code_block_theme_language_mapping(children, props): if "theme" in props: assert component.children[ 0 - ].theme._var_value == ShikiHighLevelCodeBlock._map_themes(props["theme"]) # pyright: ignore [reportAttributeAccessIssue] + ].theme._var_value == ShikiHighLevelCodeBlock._map_themes(props["theme"]) # ty:ignore[unresolved-attribute] # Test that the language is mapped correctly if "language" in props: assert component.children[ 0 - ].language._var_value == ShikiHighLevelCodeBlock._map_languages( # pyright: ignore [reportAttributeAccessIssue] + ].language._var_value == ShikiHighLevelCodeBlock._map_languages( # ty:ignore[unresolved-attribute] props["language"] ) diff --git a/tests/units/components/forms/test_form.py b/tests/units/components/forms/test_form.py index f3ea3c03228..e38695ecf1a 100644 --- a/tests/units/components/forms/test_form.py +++ b/tests/units/components/forms/test_form.py @@ -10,7 +10,7 @@ def test_render_on_submit(): _var_type=EventChain, ) f = Form.create(on_submit=submit_it) - exp_submit_name = f"handleSubmit_{f.handle_submit_unique_name}" # pyright: ignore [reportAttributeAccessIssue] + exp_submit_name = f"handleSubmit_{f.handle_submit_unique_name}" # ty:ignore[unresolved-attribute] assert f"onSubmit:{exp_submit_name}" in f.render()["props"] diff --git a/tests/units/components/media/test_image.py b/tests/units/components/media/test_image.py index 9692c3b99f8..2585ee8eb11 100644 --- a/tests/units/components/media/test_image.py +++ b/tests/units/components/media/test_image.py @@ -16,7 +16,7 @@ def pil_image() -> Img: """ rng = np.random.default_rng() imarray = rng.random((100, 100, 3)) * 255 - return PIL.Image.fromarray(imarray.astype("uint8")).convert("RGBA") # pyright: ignore [reportAttributeAccessIssue] + return PIL.Image.fromarray(imarray.astype("uint8")).convert("RGBA") # ty:ignore[possibly-missing-submodule] def test_serialize_image(pil_image: Img): @@ -34,4 +34,4 @@ def test_serialize_image(pil_image: Img): def test_set_src_str(): """Test that setting the src works.""" image = rx.image(src="pic2.jpeg") - assert str(image.src) == '"pic2.jpeg"' # pyright: ignore [reportAttributeAccessIssue] + assert str(image.src) == '"pic2.jpeg"' # ty:ignore[unresolved-attribute] diff --git a/tests/units/components/radix/test_icon_button.py b/tests/units/components/radix/test_icon_button.py index f8abcedebf8..ee5ffe178a9 100644 --- a/tests/units/components/radix/test_icon_button.py +++ b/tests/units/components/radix/test_icon_button.py @@ -25,5 +25,5 @@ def test_icon_button_size_prop(): ib1 = IconButton.create("activity", size="2") assert isinstance(ib1, IconButton) - ib2 = IconButton.create("activity", size=LiteralVar.create("2")) + ib2 = IconButton.create("activity", size=LiteralVar.create("2")) # ty:ignore[invalid-argument-type] assert isinstance(ib2, IconButton) diff --git a/tests/units/components/test_component.py b/tests/units/components/test_component.py index de397442311..db68c9a8454 100644 --- a/tests/units/components/test_component.py +++ b/tests/units/components/test_component.py @@ -43,8 +43,8 @@ import reflex as rx from reflex import ( - _COMPONENTS_BASE_MAPPING, # pyright: ignore[reportAttributeAccessIssue] - _COMPONENTS_CORE_MAPPING, # pyright: ignore[reportAttributeAccessIssue] + _COMPONENTS_BASE_MAPPING, # ty:ignore[unresolved-import] + _COMPONENTS_CORE_MAPPING, # ty:ignore[unresolved-import] ) from reflex.compiler.utils import compile_custom_component from reflex.state import BaseState @@ -873,7 +873,7 @@ def test_create_custom_component(my_component): """ component = rx.memo(my_component)(prop1="test", prop2=1) assert component.tag == "MyComponent" - assert set(component.get_props()) == {"prop1", "prop2"} + assert set(component.get_props()) == {"prop1", "prop2"} # ty:ignore[missing-argument] assert component.tag in CUSTOM_COMPONENTS @@ -1313,7 +1313,7 @@ def handler2(self, arg): id="fstring-bare", ), pytest.param( - rx.text(as_=TEST_VAR), + rx.text(as_=TEST_VAR), # ty:ignore[invalid-argument-type] [TEST_VAR], id="direct-prop", ), @@ -1359,7 +1359,7 @@ def handler2(self, arg): ), pytest.param( rx.fragment(class_name=[TEST_VAR, "other-class"]), - [Var.create([TEST_VAR, "other-class"]).join(" ")], + [Var.create([TEST_VAR, "other-class"]).join(" ")], # ty:ignore[unresolved-attribute] id="fstring-dual-class_name", ), pytest.param( @@ -1414,17 +1414,17 @@ def handler2(self, arg): id="direct-event-handler", ), pytest.param( - rx.fragment(on_blur=EventState.handler2(TEST_VAR)), # pyright: ignore [reportCallIssue] + rx.fragment(on_blur=EventState.handler2(TEST_VAR)), # ty:ignore[invalid-argument-type, missing-argument] [ARG_VAR, TEST_VAR], id="direct-event-handler-arg", ), pytest.param( - rx.fragment(on_blur=EventState.handler2(EventState.v)), # pyright: ignore [reportCallIssue] + rx.fragment(on_blur=EventState.handler2(EventState.v)), # ty:ignore[invalid-argument-type, missing-argument] [ARG_VAR, EventState.v], id="direct-event-handler-arg2", ), pytest.param( - rx.fragment(on_blur=lambda: EventState.handler2(TEST_VAR)), # pyright: ignore [reportCallIssue] + rx.fragment(on_blur=lambda: EventState.handler2(TEST_VAR)), # ty:ignore[invalid-argument-type, missing-argument] [ARG_VAR, TEST_VAR], id="direct-event-handler-lambda", ), @@ -1584,7 +1584,7 @@ def test_validate_valid_children(): True, rx.fragment(valid_component2()), rx.fragment( - rx.foreach(LiteralVar.create([1, 2, 3]), lambda x: valid_component2(x)) + rx.foreach(LiteralVar.create([1, 2, 3]), lambda x: valid_component2(x)) # ty:ignore[invalid-argument-type] ), ) ) @@ -1644,7 +1644,7 @@ def test_validate_valid_parents(): rx.fragment(valid_component3()), rx.fragment( rx.foreach( - LiteralVar.create([1, 2, 3]), + LiteralVar.create([1, 2, 3]), # ty:ignore[invalid-argument-type] lambda x: valid_component2(valid_component3(x)), ) ), @@ -1730,7 +1730,8 @@ def test_validate_invalid_children(): rx.fragment(invalid_component()), rx.fragment( rx.foreach( - LiteralVar.create([1, 2, 3]), lambda x: invalid_component(x) + LiteralVar.create([1, 2, 3]), # ty:ignore[invalid-argument-type] + lambda x: invalid_component(x), ) ), ) @@ -1918,7 +1919,7 @@ def get_event_triggers(cls) -> dict[str, Any]: ) def test_component_add_imports(tags): class BaseComponent(Component): - def _get_imports(self) -> ImportDict: # pyright: ignore [reportIncompatibleMethodOverride] + def _get_imports(self) -> ImportDict: return {} class Reference(Component): @@ -1930,7 +1931,7 @@ def _get_imports(self) -> ParsedImportDict: ) class TestBase(Component): - def add_imports( # pyright: ignore [reportIncompatibleMethodOverride] + def add_imports( self, ) -> dict[str, str | ImportVar | list[str] | list[ImportVar]]: return {"foo": "bar"} @@ -1960,7 +1961,7 @@ class ChildComponent1(BaseComponent): pass class GrandchildComponent1(ChildComponent1): - def add_hooks(self): # pyright: ignore [reportIncompatibleMethodOverride] + def add_hooks(self): return [ "const hook2 = 43", "const hook3 = 44", @@ -1973,11 +1974,11 @@ def add_hooks(self): ] class GrandchildComponent2(ChildComponent1): - def _get_hooks(self): # pyright: ignore [reportIncompatibleMethodOverride] + def _get_hooks(self): return "const hook5 = 46" class GreatGrandchildComponent2(GrandchildComponent2): - def add_hooks(self): # pyright: ignore [reportIncompatibleMethodOverride] + def add_hooks(self): return [ "const hook2 = 43", "const hook6 = 47", @@ -2052,7 +2053,7 @@ def add_custom_code(self): ] class GrandchildComponent2(ChildComponent1): - def _get_custom_code(self): # pyright: ignore [reportIncompatibleMethodOverride] + def _get_custom_code(self): return "const custom_code5 = 46" class GreatGrandchildComponent2(GrandchildComponent2): @@ -2170,7 +2171,7 @@ def add_style(self): class StyledComponent(ParentComponent): tag = "StyledComponent" - def add_style(self): # pyright: ignore [reportIncompatibleMethodOverride] + def add_style(self): return { "color": v1, "fake": v2, diff --git a/tests/units/components/test_props.py b/tests/units/components/test_props.py index e14f1e05158..772dbf863bd 100644 --- a/tests/units/components/test_props.py +++ b/tests/units/components/test_props.py @@ -206,8 +206,8 @@ def handle_input(self, value: str): pass props = EventProps( - on_click=FooState.handle_click, # pyright: ignore[reportArgumentType] - not_start_with_on=FooState.handle_input, # pyright: ignore[reportArgumentType] + on_click=FooState.handle_click, + not_start_with_on=FooState.handle_input, ) props_dict = props.dict() assert isinstance(props_dict["onClick"], EventChain) diff --git a/tests/units/components/typography/test_markdown.py b/tests/units/components/typography/test_markdown.py index 2ddc591252b..780713121f1 100644 --- a/tests/units/components/typography/test_markdown.py +++ b/tests/units/components/typography/test_markdown.py @@ -29,7 +29,7 @@ def test_get_component(tag, expected): expected: The expected component. """ md = Markdown.create("# Hello") - assert tag in md.component_map # pyright: ignore [reportAttributeAccessIssue] + assert tag in md.component_map # ty:ignore[unresolved-attribute] assert md.get_component(tag).tag == expected diff --git a/tests/units/conftest.py b/tests/units/conftest.py index 36baee0ec8e..a5eb3ad31d5 100644 --- a/tests/units/conftest.py +++ b/tests/units/conftest.py @@ -92,7 +92,7 @@ def upload_sub_state_event_spec(): Returns: Event Spec. """ - return EventSpec(handler=SubUploadState.handle_upload, upload=True) # pyright: ignore [reportCallIssue] + return EventSpec(handler=SubUploadState.handle_upload, upload=True) # ty:ignore[invalid-argument-type, unknown-argument] @pytest.fixture @@ -102,7 +102,7 @@ def upload_event_spec(): Returns: Event Spec. """ - return EventSpec(handler=UploadState.handle_upload1, upload=True) # pyright: ignore [reportCallIssue] + return EventSpec(handler=UploadState.handle_upload1, upload=True) # ty:ignore[invalid-argument-type, unknown-argument] @pytest.fixture diff --git a/tests/units/docgen/test_class_and_component.py b/tests/units/docgen/test_class_and_component.py index 215f6875793..3bc7a458389 100644 --- a/tests/units/docgen/test_class_and_component.py +++ b/tests/units/docgen/test_class_and_component.py @@ -315,7 +315,7 @@ class _DataclassWithFieldDoc: name: From docstring. """ - name: str = dataclasses.field(default="x", doc="From field.doc") + name: str = dataclasses.field(default="x", doc="From field.doc") # ty:ignore[no-matching-overload] doc = generate_class_documentation(_DataclassWithFieldDoc) fields_by_name = {f.name: f for f in doc.fields} diff --git a/tests/units/experimental/test_memo.py b/tests/units/experimental/test_memo.py index f202ecf05d8..bce64382bb1 100644 --- a/tests/units/experimental/test_memo.py +++ b/tests/units/experimental/test_memo.py @@ -141,7 +141,7 @@ def merge_styles( base: rx.Var[dict[str, str]], overrides: rx.RestProp, ) -> rx.Var[Any]: - return base.to(dict).merge(overrides) + return base.to(dict).merge(overrides) # ty:ignore[unresolved-attribute] base = Var(_js_expr="base", _var_type=dict[str, str]) merged = merge_styles(base=base, color="red", class_name="primary") @@ -197,13 +197,13 @@ def test_memo_requires_var_annotations(): @rx._x.memo def bad_annotation(value: int) -> rx.Var[str]: - return rx.Var.create("x") + return rx.Var.create("x") # ty:ignore[invalid-return-type] with pytest.raises(TypeError, match="Missing annotation"): @rx._x.memo def missing_annotation(value) -> rx.Var[str]: - return rx.Var.create("x") + return rx.Var.create("x") # ty:ignore[invalid-return-type] def test_memo_rejects_invalid_children_annotation(): @@ -240,7 +240,7 @@ def foo_bar() -> rx.Component: @rx._x.memo def FooBar() -> rx.Var[str]: - return rx.Var.create("x") + return rx.Var.create("x") # ty:ignore[invalid-return-type] def test_memo_rejects_component_export_name_collision(): @@ -263,13 +263,13 @@ def test_memo_rejects_varargs(): @rx._x.memo def bad_args(*values: rx.Var[str]) -> rx.Var[str]: - return rx.Var.create("x") + return rx.Var.create("x") # ty:ignore[invalid-return-type] with pytest.raises(TypeError, match=r"\*\*kwargs"): @rx._x.memo def bad_kwargs(**values: rx.Var[str]) -> rx.Var[str]: - return rx.Var.create("x") + return rx.Var.create("x") # ty:ignore[invalid-return-type] def test_component_memo_rejects_invalid_positional_usage(): diff --git a/tests/units/istate/manager/test_expiration.py b/tests/units/istate/manager/test_expiration.py index f20ea71b052..3c14a600084 100644 --- a/tests/units/istate/manager/test_expiration.py +++ b/tests/units/istate/manager/test_expiration.py @@ -59,8 +59,8 @@ async def test_memory_state_manager_evicts_expired_state( """Expired states should be removed from the in-memory cache and locks.""" state_token = BaseStateToken(ident=token, cls=ExpiringState) - async with state_manager_memory.modify_state(state_token) as state: - state.value = 42 + async with state_manager_memory.modify_state(state_token) as state: # ty:ignore[invalid-argument-type] + state.value = 42 # ty:ignore[unresolved-attribute] assert token in state_manager_memory.states assert token in state_manager_memory._states_locks @@ -91,7 +91,7 @@ async def test_memory_state_manager_get_state_refreshes_expiration( same_state = await state_manager_memory.get_state(state_token) assert same_state is state - assert state_manager_memory._token_expires_at[token] > expires_at + assert state_manager_memory._token_expires_at[token] > expires_at # ty:ignore[unsupported-operator] await asyncio.sleep(0.6) @@ -116,7 +116,7 @@ async def test_memory_state_manager_set_state_refreshes_expiration( await state_manager_memory.set_state(state_token, state) - assert state_manager_memory._token_expires_at[token] > expires_at + assert state_manager_memory._token_expires_at[token] > expires_at # ty:ignore[unsupported-operator] await asyncio.sleep(0.6) @@ -139,7 +139,7 @@ async def test_memory_state_manager_multiple_accesses_extend_expiration( for _ in range(3): await asyncio.sleep(0.25) assert await state_manager_memory.get_state(state_token) is state - assert state_manager_memory._token_expires_at[token] > expires_at + assert state_manager_memory._token_expires_at[token] > expires_at # ty:ignore[unsupported-operator] expires_at = state_manager_memory._token_expires_at[token] await asyncio.sleep(0.6) @@ -196,13 +196,13 @@ async def test_memory_state_manager_refreshes_expiration_after_locked_access( """Releasing a long-held state should start a fresh expiration window.""" state_token = BaseStateToken(ident=token, cls=ExpiringState) - async with state_manager_memory.modify_state(state_token) as state: - state.value = 5 + async with state_manager_memory.modify_state(state_token) as state: # ty:ignore[invalid-argument-type] + state.value = 5 # ty:ignore[unresolved-attribute] expires_at = state_manager_memory._token_expires_at[token] await asyncio.sleep(1.2) assert token in state_manager_memory.states - assert state_manager_memory._token_expires_at[token] > expires_at + assert state_manager_memory._token_expires_at[token] > expires_at # ty:ignore[unsupported-operator] await asyncio.sleep(0.6) diff --git a/tests/units/istate/manager/test_redis.py b/tests/units/istate/manager/test_redis.py index 0b37389a337..bca09046aea 100644 --- a/tests/units/istate/manager/test_redis.py +++ b/tests/units/istate/manager/test_redis.py @@ -71,7 +71,7 @@ def event_log(state_manager_redis: StateManagerRedis) -> list[dict[str, Any]]: Returns: The redis event log. """ - return state_manager_redis.redis._internals["event_log"] # pyright: ignore[reportAttributeAccessIssue] + return state_manager_redis.redis._internals["event_log"] # ty:ignore[unresolved-attribute] @pytest.fixture @@ -87,7 +87,7 @@ def event_log_on_update(state_manager_redis: StateManagerRedis) -> asyncio.Event Returns: The event that is set when new events are added to the redis event log. """ - return state_manager_redis.redis._internals["event_log_on_update"] # pyright: ignore[reportAttributeAccessIssue] + return state_manager_redis.redis._internals["event_log_on_update"] # ty:ignore[unresolved-attribute] @pytest.mark.asyncio @@ -131,13 +131,13 @@ async def test_modify( # Initial modify should set count to 1 async with state_manager_redis.modify_state( - BaseStateToken(ident=token, cls=root_state) + BaseStateToken(ident=token, cls=root_state) # ty:ignore[invalid-argument-type] ) as new_state: - new_state.count = 1 + new_state.count = 1 # ty:ignore[unresolved-attribute] # Subsequent modify should set count to 2 async with state_manager_redis.modify_state( - BaseStateToken(ident=token, cls=root_state) + BaseStateToken(ident=token, cls=root_state) # ty:ignore[invalid-argument-type] ) as new_state: assert isinstance(new_state, root_state) assert new_state.count == 1 @@ -178,9 +178,9 @@ async def test_modify_oplock( # Initial modify should set count to 1 async with state_manager_redis.modify_state( - BaseStateToken(ident=token, cls=root_state), + BaseStateToken(ident=token, cls=root_state), # ty:ignore[invalid-argument-type] ) as new_state: - new_state.count = 1 + new_state.count = 1 # ty:ignore[unresolved-attribute] # Initial state manager should be holding a lease lease_task_1 = state_manager_redis._local_leases.get(token) @@ -202,9 +202,9 @@ async def test_modify_oplock( # The second modify should NOT trigger another redis lock async with state_manager_redis.modify_state( - BaseStateToken(ident=token, cls=root_state), + BaseStateToken(ident=token, cls=root_state), # ty:ignore[invalid-argument-type] ) as new_state: - new_state.count = 2 + new_state.count = 2 # ty:ignore[unresolved-attribute] assert state_lock_1.locked() lock_events_after = len([ @@ -218,9 +218,9 @@ async def test_modify_oplock( # Contend the lock from another state manager event_log_on_update.clear() async with state_manager_2.modify_state( - BaseStateToken(ident=token, cls=root_state), + BaseStateToken(ident=token, cls=root_state), # ty:ignore[invalid-argument-type] ) as new_state: - new_state.count = 3 + new_state.count = 3 # ty:ignore[unresolved-attribute] state_lock_2 = state_manager_2._cached_states_locks.get(token) assert state_lock_2 is not None assert state_lock_2.locked() @@ -315,7 +315,7 @@ async def test_oplock_contention_queue( async def modify_1(): async with state_manager_redis.modify_state( - BaseStateToken(ident=token, cls=root_state), + BaseStateToken(ident=token, cls=root_state), # ty:ignore[invalid-argument-type] ) as new_state: assert isinstance(new_state, root_state) new_state.count += 1 @@ -326,7 +326,7 @@ async def modify_2(): await modify_started.wait() modify_2_started.set() async with state_manager_2.modify_state( - BaseStateToken(ident=token, cls=root_state), + BaseStateToken(ident=token, cls=root_state), # ty:ignore[invalid-argument-type] ) as new_state: assert isinstance(new_state, root_state) new_state.count += 1 @@ -336,7 +336,7 @@ async def modify_3(): await modify_started.wait() modify_2_started.set() async with state_manager_2.modify_state( - BaseStateToken(ident=token, cls=root_state), + BaseStateToken(ident=token, cls=root_state), # ty:ignore[invalid-argument-type] ) as new_state: assert isinstance(new_state, root_state) new_state.count += 1 @@ -414,7 +414,7 @@ async def test_oplock_contention_no_lease( async def modify_1(): async with state_manager_redis.modify_state( - BaseStateToken(ident=token, cls=root_state), + BaseStateToken(ident=token, cls=root_state), # ty:ignore[invalid-argument-type] ) as new_state: assert isinstance(new_state, root_state) new_state.count += 1 @@ -425,7 +425,7 @@ async def modify_2(): await modify_started.wait() modify_2_started.set() async with state_manager_2.modify_state( - BaseStateToken(ident=token, cls=root_state), + BaseStateToken(ident=token, cls=root_state), # ty:ignore[invalid-argument-type] ) as new_state: assert isinstance(new_state, root_state) new_state.count += 1 @@ -435,7 +435,7 @@ async def modify_3(): await modify_started.wait() modify_2_started.set() async with state_manager_3.modify_state( - BaseStateToken(ident=token, cls=root_state), + BaseStateToken(ident=token, cls=root_state), # ty:ignore[invalid-argument-type] ) as new_state: assert isinstance(new_state, root_state) new_state.count += 1 @@ -514,7 +514,7 @@ async def test_oplock_contention_racers( async def modify_1(): nonlocal lease_1 async with state_manager_redis.modify_state( - BaseStateToken(ident=token, cls=root_state), + BaseStateToken(ident=token, cls=root_state), # ty:ignore[invalid-argument-type] ) as new_state: lease_1 = await state_manager_redis._get_local_lease(token) assert isinstance(new_state, root_state) @@ -525,7 +525,7 @@ async def modify_2(): await asyncio.sleep(racer_delay) nonlocal lease_2 async with state_manager_2.modify_state( - BaseStateToken(ident=token, cls=root_state), + BaseStateToken(ident=token, cls=root_state), # ty:ignore[invalid-argument-type] ) as new_state: lease_2 = await state_manager_2._get_local_lease(token) assert isinstance(new_state, root_state) @@ -574,7 +574,7 @@ async def canceller(): task = asyncio.create_task(canceller()) async with state_manager_redis.modify_state( - BaseStateToken(ident=token, cls=root_state), + BaseStateToken(ident=token, cls=root_state), # ty:ignore[invalid-argument-type] ) as new_state: assert await state_manager_redis._get_local_lease(token) is None assert isinstance(new_state, root_state) @@ -602,24 +602,24 @@ async def test_oplock_fetch_substate( state_manager_redis._oplock_enabled = True async with state_manager_redis.modify_state( - BaseStateToken(ident=token, cls=SubState1), + BaseStateToken(ident=token, cls=SubState1), # ty:ignore[invalid-argument-type] ) as new_state: - assert SubState1.get_name() in new_state.substates - assert SubState2.get_name() not in new_state.substates + assert SubState1.get_name() in new_state.substates # ty:ignore[unresolved-attribute] + assert SubState2.get_name() not in new_state.substates # ty:ignore[unresolved-attribute] async with state_manager_redis.modify_state( - BaseStateToken(ident=token, cls=SubState2), + BaseStateToken(ident=token, cls=SubState2), # ty:ignore[invalid-argument-type] ) as new_state: # Both substates should be fetched and cached. - assert SubState1.get_name() in new_state.substates - assert SubState2.get_name() in new_state.substates + assert SubState1.get_name() in new_state.substates # ty:ignore[unresolved-attribute] + assert SubState2.get_name() in new_state.substates # ty:ignore[unresolved-attribute] async with state_manager_redis.modify_state( - BaseStateToken(ident=token, cls=SubState1), + BaseStateToken(ident=token, cls=SubState1), # ty:ignore[invalid-argument-type] ) as new_state: # Both substates should be fetched and cached now. - assert SubState1.get_name() in new_state.substates - assert SubState2.get_name() in new_state.substates + assert SubState1.get_name() in new_state.substates # ty:ignore[unresolved-attribute] + assert SubState2.get_name() in new_state.substates # ty:ignore[unresolved-attribute] # Should have still only been one lock acquisition. lock_events = len([ @@ -677,7 +677,7 @@ async def test_oplock_hold_oplock_after_cancel( async def modify(): async with state_manager_redis.modify_state( - BaseStateToken(ident=token, cls=root_state), + BaseStateToken(ident=token, cls=root_state), # ty:ignore[invalid-argument-type] ) as new_state: modify_started.set() assert isinstance(new_state, root_state) @@ -714,7 +714,7 @@ async def modify(): # Modify the state again, this should get a new lock and lease event_log_on_update.clear() async with state_manager_redis.modify_state( - BaseStateToken(ident=token, cls=root_state), + BaseStateToken(ident=token, cls=root_state), # ty:ignore[invalid-argument-type] ) as new_state: assert isinstance(new_state, root_state) new_state.count += 1 diff --git a/tests/units/reflex_base/event/processor/test_event_processor.py b/tests/units/reflex_base/event/processor/test_event_processor.py index bcc1108be98..5029f1fb6ce 100644 --- a/tests/units/reflex_base/event/processor/test_event_processor.py +++ b/tests/units/reflex_base/event/processor/test_event_processor.py @@ -124,7 +124,7 @@ async def _background_slow_logging_handler(value: str = "default"): _CALL_LOG.append({"value": value}) -_background_slow_logging_handler._reflex_background_task = True # type: ignore[attr-defined] +_background_slow_logging_handler._reflex_background_task = True # type: ignore[attr-defined] # ty:ignore[unresolved-attribute] noop_event = EventHandler(fn=_noop_handler) diff --git a/tests/units/reflex_base/utils/pyi_generator/dataset/classvar_and_private.py b/tests/units/reflex_base/utils/pyi_generator/dataset/classvar_and_private.py index e9aa27b9243..b7ee8e9f0dc 100644 --- a/tests/units/reflex_base/utils/pyi_generator/dataset/classvar_and_private.py +++ b/tests/units/reflex_base/utils/pyi_generator/dataset/classvar_and_private.py @@ -30,7 +30,7 @@ class StrictComponent(Component): _valid_children: ClassVar[list[str]] = ["ChildA", "ChildB"] # The memoization mode. - _memoization_mode: ClassVar[Any] = None + _memoization_mode: ClassVar[Any] = None # ty:ignore[invalid-attribute-override] # A public prop that should appear in create(). visible_prop: Var[str] = field(doc="A prop visible in the stub.") diff --git a/tests/units/reflex_base/utils/pyi_generator/dataset/simple_component.py b/tests/units/reflex_base/utils/pyi_generator/dataset/simple_component.py index 4f18d8e6740..6ff58ad4d6b 100644 --- a/tests/units/reflex_base/utils/pyi_generator/dataset/simple_component.py +++ b/tests/units/reflex_base/utils/pyi_generator/dataset/simple_component.py @@ -40,7 +40,7 @@ class SimpleComponent(Component): label: Var[str] = field( default=Var.create("default"), doc="An optional label with a default value.", - ) + ) # ty:ignore[invalid-assignment] description: Var[str] """A detailed description of the component.""" diff --git a/tests/units/reflex_base/utils/pyi_generator/dataset/staticmethod_namespace.py b/tests/units/reflex_base/utils/pyi_generator/dataset/staticmethod_namespace.py index 3f5fc00f725..380b534009c 100644 --- a/tests/units/reflex_base/utils/pyi_generator/dataset/staticmethod_namespace.py +++ b/tests/units/reflex_base/utils/pyi_generator/dataset/staticmethod_namespace.py @@ -29,7 +29,7 @@ def send_notification(message: str, level: str = "info") -> EventSpec: Returns: The event spec. """ - return EventSpec() # type: ignore[call-arg] + return EventSpec() # type: ignore[call-arg] # ty:ignore[missing-argument] class Notify(ComponentNamespace): diff --git a/tests/units/reflex_cli/v2/test_apps.py b/tests/units/reflex_cli/v2/test_apps.py index 218068dc8f0..84d48c41a7e 100644 --- a/tests/units/reflex_cli/v2/test_apps.py +++ b/tests/units/reflex_cli/v2/test_apps.py @@ -15,7 +15,7 @@ hosting_cli = ( get_command(hosting_cli) if isinstance(hosting_cli, Typer) else hosting_cli -) +) # ty:ignore[invalid-assignment] runner = CliRunner() diff --git a/tests/units/reflex_cli/v2/test_project.py b/tests/units/reflex_cli/v2/test_project.py index 81e494cade0..343232d49f8 100644 --- a/tests/units/reflex_cli/v2/test_project.py +++ b/tests/units/reflex_cli/v2/test_project.py @@ -11,7 +11,7 @@ hosting_cli = ( get_command(hosting_cli) if isinstance(hosting_cli, Typer) else hosting_cli -) +) # ty:ignore[invalid-assignment] runner = CliRunner() diff --git a/tests/units/reflex_cli/v2/test_secrets.py b/tests/units/reflex_cli/v2/test_secrets.py index 0ee199b698f..a9e4263a1b2 100644 --- a/tests/units/reflex_cli/v2/test_secrets.py +++ b/tests/units/reflex_cli/v2/test_secrets.py @@ -10,7 +10,7 @@ hosting_cli = ( get_command(hosting_cli) if isinstance(hosting_cli, Typer) else hosting_cli -) +) # ty:ignore[invalid-assignment] runner = CliRunner() diff --git a/tests/units/reflex_cli/v2/test_vmtypes_regions.py b/tests/units/reflex_cli/v2/test_vmtypes_regions.py index b3231cc84ef..8bdcccb71d0 100644 --- a/tests/units/reflex_cli/v2/test_vmtypes_regions.py +++ b/tests/units/reflex_cli/v2/test_vmtypes_regions.py @@ -10,7 +10,7 @@ hosting_cli = ( get_command(hosting_cli) if isinstance(hosting_cli, Typer) else hosting_cli -) +) # ty:ignore[invalid-assignment] runner = CliRunner() diff --git a/tests/units/test_app.py b/tests/units/test_app.py index 077b7babb07..6219bcbd8a9 100644 --- a/tests/units/test_app.py +++ b/tests/units/test_app.py @@ -192,16 +192,16 @@ class TestAuthProvider(AuthProvider): login_path: str = "/login" logout_path: str = "/logout" - def login(self): # pyright: ignore [reportIncompatibleMethodOverride] + def login(self): """Login.""" - def is_authenticated(self): # pyright: ignore [reportIncompatibleMethodOverride] + def is_authenticated(self): """Is authenticated.""" - def get_admin_user(self): # pyright: ignore [reportIncompatibleMethodOverride] + def get_admin_user(self): """Get admin user.""" - def logout(self): # pyright: ignore [reportIncompatibleMethodOverride] + def logout(self): """Logout.""" return TestAuthProvider @@ -535,7 +535,7 @@ async def test_dynamic_var_event( clean_registration_context: The registration context fixture, which is cleared before each test. """ clean_registration_context.register_base_state(test_state) - state = test_state() # pyright: ignore [reportCallIssue] + state = test_state() # ty:ignore[missing-argument] state.add_var("int_val", int, 0) def set_int_val(self, value: int): @@ -771,7 +771,7 @@ class DictMutationTestState(BaseState): def add_age(self): """Add an age to the dict.""" - self.details.update({"age": 20}) # pyright: ignore [reportCallIssue, reportArgumentType] + self.details.update({"age": 20}) # ty:ignore[no-matching-overload] def change_name(self): """Change the name in the dict.""" @@ -809,7 +809,7 @@ def add_street_to_home_address(self): def change_friend_name(self): """Change the friend's name in the nested dict.""" - self.friend_in_nested_dict["friend"]["name"] = "Tommy" + self.friend_in_nested_dict["friend"]["name"] = "Tommy" # ty:ignore[invalid-assignment] def remove_friend(self): """Remove the friend from the nested dict.""" @@ -817,7 +817,7 @@ def remove_friend(self): def add_friend_age(self): """Add an age to the friend in the nested dict.""" - self.friend_in_nested_dict["friend"]["age"] = 30 + self.friend_in_nested_dict["friend"]["age"] = 30 # ty:ignore[invalid-assignment] return DictMutationTestState() @@ -1093,7 +1093,7 @@ async def test_upload_file_keeps_form_open_until_stream_completes( form_data = FormData([("files", file1), ("files", file2)]) original_close = form_data.close form_close = AsyncMock(side_effect=original_close) - form_data.close = form_close + form_data.close = form_close # ty:ignore[invalid-assignment] async def form(): # noqa: RUF029 return form_data @@ -1203,7 +1203,7 @@ async def test_upload_file_closes_form_on_form_error( form_data = FormData([("files", file1)]) original_close = form_data.close form_close = AsyncMock(side_effect=original_close) - form_data.close = form_close + form_data.close = form_close # ty:ignore[invalid-assignment] async def cancelled_form(): await asyncio.sleep(0) @@ -1239,7 +1239,7 @@ async def test_upload_file_closes_form_on_event_creation_cancellation( form_data = FormData([("files", file1)]) original_close = form_data.close form_close = AsyncMock(side_effect=original_close) - form_data.close = form_close + form_data.close = form_close # ty:ignore[invalid-assignment] async def form(): # noqa: RUF029 return form_data @@ -1248,7 +1248,7 @@ async def form(): # noqa: RUF029 # Patch getlist on the form_data to raise CancelledError during event # creation (after form is parsed, before streaming begins). - form_data.getlist = Mock(side_effect=asyncio.CancelledError) + form_data.getlist = Mock(side_effect=asyncio.CancelledError) # ty:ignore[invalid-assignment] upload_fn = upload(app) with pytest.raises(asyncio.CancelledError): @@ -1286,7 +1286,7 @@ async def test_upload_file_closes_form_if_response_cancelled_before_stream_start form_data = FormData([("files", file1)]) original_close = form_data.close form_close = AsyncMock(side_effect=original_close) - form_data.close = form_close + form_data.close = form_close # ty:ignore[invalid-assignment] async def form(): # noqa: RUF029 return form_data @@ -1337,7 +1337,7 @@ async def test_upload_file_cancels_buffered_handler_on_disconnect(token: str): form_data = FormData([("files", file1)]) original_close = form_data.close form_close = AsyncMock(side_effect=original_close) - form_data.close = form_close + form_data.close = form_close # ty:ignore[invalid-assignment] async def form(): # noqa: RUF029 return form_data @@ -1405,7 +1405,7 @@ async def test_upload_file_raises_client_disconnect_when_stream_send_fails( form_data = FormData([("files", file1)]) original_close = form_data.close form_close = AsyncMock(side_effect=original_close) - form_data.close = form_close + form_data.close = form_close # ty:ignore[invalid-assignment] async def form(): # noqa: RUF029 return form_data @@ -1821,7 +1821,7 @@ def comp_dynamic(self) -> str: Returns: same as self.dynamic """ - return self.dynamic # pyright: ignore[reportAttributeAccessIssue] + return self.dynamic # ty:ignore[unresolved-attribute] def test_dynamic_arg_shadow( @@ -1873,7 +1873,7 @@ def cleanup_dynamic_arg(): """Fixture to reset DynamicState class vars after each test.""" yield with contextlib.suppress(AttributeError): - del State.dynamic # pyright: ignore[reportAttributeAccessIssue] + del State.dynamic # ty:ignore[unresolved-attribute] State.computed_vars.pop("dynamic", None) State.vars.pop("dynamic", None) @@ -1997,14 +1997,14 @@ def _dynamic_state_event(name, val, **kwargs): if isinstance(app.state_manager, StateManagerRedis): # When redis is used, the state is not updated until the processing is complete state = await app.state_manager.get_state(substate_token) - assert state.dynamic == prev_exp_val # pyright: ignore[reportAttributeAccessIssue] + assert state.dynamic == prev_exp_val # ty:ignore[unresolved-attribute] if environment.REFLEX_OPLOCK_ENABLED.get(): await app.state_manager.close() # check that router data was written to the state_manager store state = await app.state_manager.get_state(substate_token) - assert state.dynamic == exp_val # pyright: ignore[reportAttributeAccessIssue] + assert state.dynamic == exp_val # ty:ignore[unresolved-attribute] # a simple state update event should NOT trigger on_load or route var side effects emitted_deltas.clear() @@ -2115,7 +2115,7 @@ def compilable_app(tmp_path: Path) -> Generator[tuple[App, Path], None, None]: """, ) app = App(theme=None) - app._get_frontend_packages = unittest.mock.Mock() + app._get_frontend_packages = unittest.mock.Mock() # ty:ignore[invalid-assignment] with chdir(app_path): yield app, web_dir @@ -2198,19 +2198,19 @@ def test_app_wrap_priority( class Fragment1(Component): tag = "Fragment1" - def _get_app_wrap_components(self) -> dict[tuple[int, str], Component]: # pyright: ignore [reportIncompatibleMethodOverride] + def _get_app_wrap_components(self) -> dict[tuple[int, str], Component]: return {(99, "Box"): rx.box()} class Fragment2(Component): tag = "Fragment2" - def _get_app_wrap_components(self) -> dict[tuple[int, str], Component]: # pyright: ignore [reportIncompatibleMethodOverride] + def _get_app_wrap_components(self) -> dict[tuple[int, str], Component]: return {(50, "Text"): rx.text()} class Fragment3(Component): tag = "Fragment3" - def _get_app_wrap_components(self) -> dict[tuple[int, str], Component]: # pyright: ignore [reportIncompatibleMethodOverride] + def _get_app_wrap_components(self) -> dict[tuple[int, str], Component]: return {(10, "Fragment2"): Fragment2.create()} def page(): @@ -2271,7 +2271,7 @@ def test_raise_on_state(): def test_call_app(): """Test that the app can be called.""" app = App() - app._compile = unittest.mock.Mock() + app._compile = unittest.mock.Mock() # ty:ignore[invalid-assignment] api = app() assert isinstance(api, Starlette) diff --git a/tests/units/test_config.py b/tests/units/test_config.py index 68b2c64e975..c6acc891221 100644 --- a/tests/units/test_config.py +++ b/tests/units/test_config.py @@ -24,7 +24,7 @@ def test_requires_app_name(): """Test that a config requires an app_name.""" with pytest.raises(TypeError): - rx.Config() # pyright: ignore[reportCallIssue] + rx.Config() # ty:ignore[missing-argument] def test_set_app_name(base_config_values): @@ -341,7 +341,7 @@ def test_replace_defaults( exp_config_values: The expected config values. """ mock_os_env = os.environ.copy() - monkeypatch.setattr(reflex_base.config.os, "environ", mock_os_env) # pyright: ignore[reportPrivateImportUsage] + monkeypatch.setattr(reflex_base.config.os, "environ", mock_os_env) mock_os_env.update({k: str(v) for k, v in env_vars.items()}) c = rx.Config(app_name="a", **config_kwargs) c._set_persistent(**set_persistent_vars) @@ -511,14 +511,14 @@ def test_disable_with_plugin_class(self): def test_disable_with_plugin_instance_backward_compat(self): """Test disabling a plugin by passing an instance (deprecated).""" - config = rx.Config(app_name="test", disable_plugins=[SitemapPlugin()]) # pyright: ignore[reportArgumentType] + config = rx.Config(app_name="test", disable_plugins=[SitemapPlugin()]) # ty:ignore[invalid-argument-type] assert not any(isinstance(p, SitemapPlugin) for p in config.plugins) def test_disable_with_string_backward_compat(self): """Test disabling a plugin by passing a string (deprecated).""" config = rx.Config( app_name="test", - disable_plugins=["reflex.plugins.sitemap.SitemapPlugin"], # pyright: ignore[reportArgumentType] + disable_plugins=["reflex.plugins.sitemap.SitemapPlugin"], # ty:ignore[invalid-argument-type] ) assert not any(isinstance(p, SitemapPlugin) for p in config.plugins) @@ -532,14 +532,14 @@ def test_disable_plugins_normalized_to_classes(self): def test_disable_instance_normalized_to_class(self): """Test that a Plugin instance in disable_plugins is normalized to its class.""" - config = rx.Config(app_name="test", disable_plugins=[SitemapPlugin()]) # pyright: ignore[reportArgumentType] + config = rx.Config(app_name="test", disable_plugins=[SitemapPlugin()]) # ty:ignore[invalid-argument-type] assert config.disable_plugins == [SitemapPlugin] def test_disable_string_normalized_to_class(self): """Test that a string in disable_plugins is normalized to the class.""" config = rx.Config( app_name="test", - disable_plugins=["reflex.plugins.sitemap.SitemapPlugin"], # pyright: ignore[reportArgumentType] + disable_plugins=["reflex.plugins.sitemap.SitemapPlugin"], # ty:ignore[invalid-argument-type] ) assert config.disable_plugins == [SitemapPlugin] diff --git a/tests/units/test_environment.py b/tests/units/test_environment.py index 59e3c5ed438..513dad83b37 100644 --- a/tests/units/test_environment.py +++ b/tests/units/test_environment.py @@ -349,7 +349,7 @@ def test_get_with_default(self): def test_set_string_value(self): """Test setting a string value.""" env_var_instance = EnvVar("TEST_VAR", "default", str) - env_var_instance.set("new_value") # type: ignore[arg-type] + env_var_instance.set("new_value") # type: ignore[arg-type] # ty:ignore[invalid-argument-type] assert os.environ.get("TEST_VAR") == "new_value" # Clean up del os.environ["TEST_VAR"] @@ -368,7 +368,7 @@ def test_set_none_value(self, monkeypatch): def test_set_enum_value(self): """Test setting an enum value.""" env_var_instance = EnvVar("TEST_VAR", _TestEnum.VALUE1, _TestEnum) - env_var_instance.set(_TestEnum.VALUE2) # type: ignore[arg-type] + env_var_instance.set(_TestEnum.VALUE2) # type: ignore[arg-type] # ty:ignore[invalid-argument-type] assert os.environ.get("TEST_VAR") == "value2" # Clean up del os.environ["TEST_VAR"] @@ -376,7 +376,7 @@ def test_set_enum_value(self): def test_set_list_value(self): """Test setting a list value.""" env_var_instance = EnvVar("TEST_VAR", [], list[int]) - env_var_instance.set([1, 2, 3]) # type: ignore[arg-type] + env_var_instance.set([1, 2, 3]) # type: ignore[arg-type] # ty:ignore[invalid-argument-type] assert os.environ.get("TEST_VAR") == "1:2:3" # Clean up del os.environ["TEST_VAR"] diff --git a/tests/units/test_event.py b/tests/units/test_event.py index c332a57b892..34c7ebcc917 100644 --- a/tests/units/test_event.py +++ b/tests/units/test_event.py @@ -38,7 +38,7 @@ def make_var(value) -> Var: def make_timeout_logger() -> EventChainVar: return rx.vars.FunctionStringVar.create( "(...args) => { setTimeout(() => console.log('Timeout reached!', args), 1000); }" - ).to(EventChain) + ).to(EventChain) # ty:ignore[invalid-return-type] def test_create_event(): @@ -452,7 +452,7 @@ def handler(self): assert isinstance(handler, EventHandler) assert not handler.event_actions - sp_handler = EventActionState.handler.stop_propagation # pyright: ignore [reportFunctionMemberAccess] + sp_handler = EventActionState.handler.stop_propagation # ty:ignore[unresolved-attribute] assert sp_handler.event_actions == {"stopPropagation": True} # should NOT affect other references to the handler assert not handler.event_actions @@ -614,7 +614,7 @@ def handle_no_actions(self): # Test background + event actions work together bg_temporal_handler = MyTestState.handle_background_temporal assert bg_temporal_handler.event_actions == {"temporal": True} - assert hasattr(bg_temporal_handler.fn, BACKGROUND_TASK_MARKER) # pyright: ignore [reportAttributeAccessIssue] + assert hasattr(bg_temporal_handler.fn, BACKGROUND_TASK_MARKER) # Test no event actions (existing behavior preserved) no_actions_handler = MyTestState.handle_no_actions @@ -689,12 +689,12 @@ async def handle_old_background(self): old_handler = MyTestState.handle_old_style assert isinstance(old_handler, EventHandler) assert old_handler.event_actions == {} - assert not hasattr(old_handler.fn, BACKGROUND_TASK_MARKER) # pyright: ignore [reportAttributeAccessIssue] + assert not hasattr(old_handler.fn, BACKGROUND_TASK_MARKER) # Old background parameter should work unchanged bg_handler = MyTestState.handle_old_background assert bg_handler.event_actions == {} - assert hasattr(bg_handler.fn, BACKGROUND_TASK_MARKER) # pyright: ignore [reportAttributeAccessIssue] + assert hasattr(bg_handler.fn, BACKGROUND_TASK_MARKER) def test_event_var_in_rx_cond(): diff --git a/tests/units/test_health_endpoint.py b/tests/units/test_health_endpoint.py index e86f0589716..a12753a23fc 100644 --- a/tests/units/test_health_endpoint.py +++ b/tests/units/test_health_endpoint.py @@ -66,7 +66,7 @@ async def test_get_redis_status( # Case 2: Database connection error (OperationalError) ( MagicMock(), - sqlalchemy.exc.OperationalError("error", "error", "error"), # pyright: ignore[reportArgumentType] + sqlalchemy.exc.OperationalError("error", "error", "error"), # ty:ignore[invalid-argument-type] {"db": False}, ), ], diff --git a/tests/units/test_model.py b/tests/units/test_model.py index 92565b9b8ba..827bfa820a9 100644 --- a/tests/units/test_model.py +++ b/tests/units/test_model.py @@ -98,7 +98,7 @@ def test_automigration( assert versions.exists() # initial table - class AlembicThing(Model, table=True): # pyright: ignore [reportRedeclaration] + class AlembicThing(Model, table=True): t1: str with Model.get_db_engine().connect() as connection: @@ -117,7 +117,7 @@ class AlembicThing(Model, table=True): # pyright: ignore [reportRedeclaration] model_registry.get_metadata().clear() # Create column t2, mark t1 as optional with default - class AlembicThing(Model, table=True): # pyright: ignore [reportRedeclaration] + class AlembicThing(Model, table=True): t1: str | None = "default" t2: str = "bar" @@ -137,7 +137,7 @@ class AlembicThing(Model, table=True): # pyright: ignore [reportRedeclaration] model_registry.get_metadata().clear() # Drop column t1 - class AlembicThing(Model, table=True): # pyright: ignore [reportRedeclaration] + class AlembicThing(Model, table=True): t2: str = "bar" assert Model.migrate(autogenerate=True) @@ -172,7 +172,7 @@ class AlembicSecond(Model, table=True): # drop table (AlembicSecond) model_registry.get_metadata().clear() - class AlembicThing(Model, table=True): # pyright: ignore [reportRedeclaration] + class AlembicThing(Model, table=True): t2: str = "bar" assert Model.migrate(autogenerate=True) diff --git a/tests/units/test_prerequisites.py b/tests/units/test_prerequisites.py index c9cb76c3c0b..51a01535075 100644 --- a/tests/units/test_prerequisites.py +++ b/tests/units/test_prerequisites.py @@ -93,7 +93,7 @@ def test_initialise_vite_config(config, expected_output): def test_cached_procedure(): call_count = 0 - temp_file = tempfile.mktemp() + temp_file = tempfile.mktemp() # ty:ignore[deprecated] @cached_procedure( cache_file_path=lambda: Path(temp_file), payload_fn=lambda: "constant" diff --git a/tests/units/test_sqlalchemy.py b/tests/units/test_sqlalchemy.py index e414deb7349..07cd825836a 100644 --- a/tests/units/test_sqlalchemy.py +++ b/tests/units/test_sqlalchemy.py @@ -184,7 +184,7 @@ class ModelBase(Base, MappedAsDataclass): id: Mapped[int | None] = mapped_column(primary_key=True, default=None) # initial table - class AlembicThing(ModelBase): # pyright: ignore[reportRedeclaration] + class AlembicThing(ModelBase): t1: Mapped[str] = mapped_column(default="") with Model.get_db_engine().connect() as connection: @@ -203,7 +203,7 @@ class AlembicThing(ModelBase): # pyright: ignore[reportRedeclaration] model_registry.get_metadata().clear() # Create column t2, mark t1 as optional with default - class AlembicThing(ModelBase): # pyright: ignore[reportRedeclaration] + class AlembicThing(ModelBase): t1: Mapped[str | None] = mapped_column(default="default") t2: Mapped[str] = mapped_column(default="bar") @@ -223,7 +223,7 @@ class AlembicThing(ModelBase): # pyright: ignore[reportRedeclaration] model_registry.get_metadata().clear() # Drop column t1 - class AlembicThing(ModelBase): # pyright: ignore[reportRedeclaration] + class AlembicThing(ModelBase): t2: Mapped[str] = mapped_column(default="bar") assert Model.migrate(autogenerate=True) @@ -258,7 +258,7 @@ class AlembicSecond(ModelBase): # drop table (AlembicSecond) model_registry.get_metadata().clear() - class AlembicThing(ModelBase): # pyright: ignore[reportRedeclaration] + class AlembicThing(ModelBase): t2: Mapped[str] = mapped_column(default="bar") assert Model.migrate(autogenerate=True) diff --git a/tests/units/test_state.py b/tests/units/test_state.py index cb2bf87bdd2..6b7eb3303f0 100644 --- a/tests/units/test_state.py +++ b/tests/units/test_state.py @@ -123,7 +123,7 @@ class TestMixin(BaseState, mixin=True): _mixin_backend: rx.Field[int] = rx.field(default_factory=lambda: 10) -class TestState(TestMixin, BaseState): # pyright: ignore[reportUnsafeMultipleInheritance] +class TestState(TestMixin, BaseState): """A test state.""" # Set this class as not test one @@ -288,7 +288,7 @@ def test_state() -> TestState: Returns: A test state. """ - return TestState() # pyright: ignore [reportCallIssue] + return TestState() # ty:ignore[missing-argument] @pytest.fixture @@ -468,13 +468,13 @@ def test_dict(test_state: TestState): def test_class_indexing_with_vars(): """Test that we can index into a state var with another var.""" - prop = TestState.array[TestState.num1] # pyright: ignore [reportCallIssue, reportArgumentType] + prop = TestState.array[TestState.num1] # ty:ignore[invalid-argument-type] assert ( str(prop) == f"{TestState.get_name()}.array{FIELD_MARKER}?.at?.({TestState.get_name()}.num1{FIELD_MARKER})" ) - prop = TestState.mapping["a"][TestState.num1] # pyright: ignore [reportCallIssue, reportArgumentType] + prop = TestState.mapping["a"][TestState.num1] assert ( str(prop) == f'{TestState.get_name()}.mapping{FIELD_MARKER}?.["a"]?.at?.({TestState.get_name()}.num1{FIELD_MARKER})' @@ -594,11 +594,11 @@ def test_get_class_var(): def test_set_class_var(): """Test setting the var of a class.""" with pytest.raises(AttributeError): - TestState.num3 # pyright: ignore [reportAttributeAccessIssue] + TestState.num3 # ty:ignore[unresolved-attribute] TestState._set_var( "num3", Var(_js_expr="num3", _var_type=int)._var_set_state(TestState) ) - var = TestState.num3 # pyright: ignore [reportAttributeAccessIssue] + var = TestState.num3 # ty:ignore[unresolved-attribute] assert var._js_expr == TestState.get_full_name() + ".num3" assert var._var_type is int assert var._var_state == TestState.get_full_name() @@ -1109,22 +1109,22 @@ class DynamicState(BaseState): assert not hasattr(ds1, "dynamic_int") ds1.add_var("dynamic_int", int, 42) # Existing instances get the BaseVar - assert ds1.dynamic_int.equals(DynamicState.dynamic_int) # pyright: ignore [reportAttributeAccessIssue] + assert ds1.dynamic_int.equals(DynamicState.dynamic_int) # ty:ignore[unresolved-attribute] # New instances get an actual value with the default - assert DynamicState().dynamic_int == 42 # pyright: ignore[reportAttributeAccessIssue] + assert DynamicState().dynamic_int == 42 # ty:ignore[unresolved-attribute] ds1.add_var("dynamic_list", list[int], [5, 10]) - assert ds1.dynamic_list.equals(DynamicState.dynamic_list) # pyright: ignore [reportAttributeAccessIssue] + assert ds1.dynamic_list.equals(DynamicState.dynamic_list) # ty:ignore[unresolved-attribute] ds2 = DynamicState() - assert ds2.dynamic_list == [5, 10] # pyright: ignore[reportAttributeAccessIssue] - ds2.dynamic_list.append(15) # pyright: ignore[reportAttributeAccessIssue] - assert ds2.dynamic_list == [5, 10, 15] # pyright: ignore[reportAttributeAccessIssue] - assert DynamicState().dynamic_list == [5, 10] # pyright: ignore[reportAttributeAccessIssue] + assert ds2.dynamic_list == [5, 10] # ty:ignore[unresolved-attribute] + ds2.dynamic_list.append(15) # ty:ignore[unresolved-attribute] + assert ds2.dynamic_list == [5, 10, 15] # ty:ignore[unresolved-attribute] + assert DynamicState().dynamic_list == [5, 10] # ty:ignore[unresolved-attribute] ds1.add_var("dynamic_dict", dict[str, int], {"k1": 5, "k2": 10}) - assert ds1.dynamic_dict.equals(DynamicState.dynamic_dict) # pyright: ignore [reportAttributeAccessIssue] - assert ds2.dynamic_dict.equals(DynamicState.dynamic_dict) # pyright: ignore [reportAttributeAccessIssue] - assert DynamicState().dynamic_dict == {"k1": 5, "k2": 10} # pyright: ignore[reportAttributeAccessIssue] + assert ds1.dynamic_dict.equals(DynamicState.dynamic_dict) # ty:ignore[unresolved-attribute] + assert ds2.dynamic_dict.equals(DynamicState.dynamic_dict) # ty:ignore[unresolved-attribute] + assert DynamicState().dynamic_dict == {"k1": 5, "k2": 10} # ty:ignore[unresolved-attribute] class InterdependentState(BaseState): @@ -1548,7 +1548,7 @@ def cached_x_side_effect(self) -> int: return counter if use_partial: - HandlerState.handler = functools.partial(HandlerState.handler.fn) # pyright: ignore [reportFunctionMemberAccess] + HandlerState.handler = functools.partial(HandlerState.handler.fn) # ty:ignore[invalid-assignment, unresolved-attribute] assert isinstance(HandlerState.handler, functools.partial) else: assert isinstance(HandlerState.handler, EventHandler) @@ -2036,11 +2036,11 @@ def loop_exception_handler(loop, context): asyncio.get_event_loop().set_exception_handler(loop_exception_handler) - async with state_manager_redis.modify_state(substate_token_redis): + async with state_manager_redis.modify_state(substate_token_redis): # ty:ignore[invalid-argument-type] await asyncio.sleep(0.01) if environment.REFLEX_OPLOCK_ENABLED.get(): - async with state_manager_redis.modify_state(substate_token_redis): + async with state_manager_redis.modify_state(substate_token_redis): # ty:ignore[invalid-argument-type] await asyncio.sleep(LOCK_EXPIRE_SLEEP) await asyncio.sleep(LOCK_EXPIRE_SLEEP) assert loop_exception is not None @@ -2048,7 +2048,7 @@ def loop_exception_handler(loop, context): raise loop_exception else: with pytest.raises(LockExpiredError): - async with state_manager_redis.modify_state(substate_token_redis): + async with state_manager_redis.modify_state(substate_token_redis): # ty:ignore[invalid-argument-type] await asyncio.sleep(LOCK_EXPIRE_SLEEP) assert loop_exception is None @@ -2091,17 +2091,17 @@ def loop_exception_handler(loop, context): waiter_event = asyncio.Event() async def _coro_blocker(): - async with state_manager_redis.modify_state(substate_token_redis) as state: + async with state_manager_redis.modify_state(substate_token_redis) as state: # ty:ignore[invalid-argument-type] order.append("blocker") waiter_event.set() await asyncio.sleep(LOCK_EXPIRE_SLEEP) - state.num1 = unexp_num1 + state.num1 = unexp_num1 # ty:ignore[unresolved-attribute] async def _coro_waiter(): await waiter_event.wait() - async with state_manager_redis.modify_state(substate_token_redis) as state: + async with state_manager_redis.modify_state(substate_token_redis) as state: # ty:ignore[invalid-argument-type] order.append("waiter") - state.num1 = exp_num1 + state.num1 = exp_num1 # ty:ignore[unresolved-attribute] tasks = [ asyncio.create_task(_coro_blocker()), @@ -2153,7 +2153,7 @@ async def test_state_manager_lock_warning_threshold_contend( order = [] async def _coro_blocker(): - async with state_manager_redis.modify_state(substate_token_redis): + async with state_manager_redis.modify_state(substate_token_redis): # ty:ignore[invalid-argument-type] order.append("blocker") await asyncio.sleep(LOCK_WARN_SLEEP) @@ -2204,7 +2204,7 @@ def mock_app_simple(monkeypatch) -> rx.App: setattr(app_module, CompileVars.APP, app) app._state = TestState - app.event_namespace.emit = CopyingAsyncMock() # pyright: ignore [reportOptionalMemberAccess] + app.event_namespace.emit = CopyingAsyncMock() # ty:ignore[invalid-assignment] def _mock_get_app(*args, **kwargs): return app_module @@ -2639,7 +2639,7 @@ def assert_array_dirty(): assert_array_dirty() mutable_state.array.reverse() assert_array_dirty() - mutable_state.array.sort() # pyright: ignore[reportCallIssue] + mutable_state.array.sort() # ty:ignore[invalid-argument-type] assert_array_dirty() mutable_state.array[0] = 666 assert_array_dirty() @@ -2659,7 +2659,7 @@ def assert_array_dirty(): assert isinstance(mutable_state.array[0], MutableProxy) for item in mutable_state.array: assert isinstance(item, MutableProxy) - item["foo"] = "bar" # pyright: ignore[reportArgumentType, reportCallIssue] + item["foo"] = "bar" assert_array_dirty() @@ -2731,10 +2731,10 @@ def assert_hashmap_dirty(): mutable_value_third_ref = mutable_state.hashmap.pop("setdefault_mutable_key") assert not isinstance(mutable_value_third_ref, MutableProxy) assert_hashmap_dirty() - mutable_value_third_ref.append("baz") # pyright: ignore[reportAttributeAccessIssue] + mutable_value_third_ref.append("baz") # ty:ignore[unresolved-attribute] assert not mutable_state.dirty_vars # Unfortunately previous refs still will mark the state dirty... nothing doing about that - assert mutable_value.pop() # pyright: ignore[reportCallIssue] + assert mutable_value.pop() assert_hashmap_dirty() @@ -2891,7 +2891,7 @@ def test_duplicate_substate_class(mocker: MockerFixture): class TestState(BaseState): pass - class ChildTestState(TestState): # pyright: ignore [reportRedeclaration] + class ChildTestState(TestState): pass class ChildTestState(TestState): # noqa: F811 @@ -2934,21 +2934,21 @@ class MutableResetState(BaseState): items: list[list[int]] = default instance = MutableResetState() - assert instance.items.__wrapped__ is not default # pyright: ignore [reportAttributeAccessIssue] + assert instance.items.__wrapped__ is not default # ty:ignore[unresolved-attribute] assert instance.items == default == copied_default instance.items.append([3, 3]) assert instance.items != default assert instance.items != copied_default instance.reset() - assert instance.items.__wrapped__ is not default # pyright: ignore [reportAttributeAccessIssue] + assert instance.items.__wrapped__ is not default # ty:ignore[unresolved-attribute] assert instance.items == default == copied_default instance.items.append([3, 3]) assert instance.items != default assert instance.items != copied_default instance.reset() - assert instance.items.__wrapped__ is not default # pyright: ignore [reportAttributeAccessIssue] + assert instance.items.__wrapped__ is not default # ty:ignore[unresolved-attribute] assert instance.items == default == copied_default instance.items.append([3, 3]) assert instance.items != default @@ -3010,31 +3010,29 @@ class UnionState(BaseState): c3r: Custom3 = Custom3(c2r=Custom2(c1r=Custom1(foo=""))) custom_union: Custom1 | Custom2 | Custom3 = Custom1(foo="") - assert str(UnionState.c3.c2) == f'{UnionState.c3!s}?.["c2"]' # pyright: ignore [reportOptionalMemberAccess] - assert str(UnionState.c3.c2.c1) == f'{UnionState.c3!s}?.["c2"]?.["c1"]' # pyright: ignore [reportOptionalMemberAccess] + assert str(UnionState.c3.c2) == f'{UnionState.c3!s}?.["c2"]' # ty:ignore[unresolved-attribute] + assert str(UnionState.c3.c2.c1) == f'{UnionState.c3!s}?.["c2"]?.["c1"]' # ty:ignore[unresolved-attribute] + assert str(UnionState.c3.c2.c1.foo) == f'{UnionState.c3!s}?.["c2"]?.["c1"]?.["foo"]' # ty:ignore[unresolved-attribute] assert ( - str(UnionState.c3.c2.c1.foo) == f'{UnionState.c3!s}?.["c2"]?.["c1"]?.["foo"]' # pyright: ignore [reportOptionalMemberAccess] + str(UnionState.c3.c2.c1r.foo) == f'{UnionState.c3!s}?.["c2"]?.["c1r"]?.["foo"]' # ty:ignore[unresolved-attribute] ) + assert str(UnionState.c3.c2r.c1) == f'{UnionState.c3!s}?.["c2r"]?.["c1"]' # ty:ignore[unresolved-attribute] assert ( - str(UnionState.c3.c2.c1r.foo) == f'{UnionState.c3!s}?.["c2"]?.["c1r"]?.["foo"]' # pyright: ignore [reportOptionalMemberAccess] + str(UnionState.c3.c2r.c1.foo) == f'{UnionState.c3!s}?.["c2r"]?.["c1"]?.["foo"]' # ty:ignore[unresolved-attribute] ) - assert str(UnionState.c3.c2r.c1) == f'{UnionState.c3!s}?.["c2r"]?.["c1"]' # pyright: ignore [reportOptionalMemberAccess] assert ( - str(UnionState.c3.c2r.c1.foo) == f'{UnionState.c3!s}?.["c2r"]?.["c1"]?.["foo"]' # pyright: ignore [reportOptionalMemberAccess] - ) - assert ( - str(UnionState.c3.c2r.c1r.foo) # pyright: ignore [reportOptionalMemberAccess] + str(UnionState.c3.c2r.c1r.foo) # ty:ignore[unresolved-attribute] == f'{UnionState.c3!s}?.["c2r"]?.["c1r"]?.["foo"]' ) assert str(UnionState.c3i.c2) == f'{UnionState.c3i!s}?.["c2"]' assert str(UnionState.c3r.c2) == f'{UnionState.c3r!s}?.["c2"]' - assert UnionState.custom_union.foo is not None # pyright: ignore [reportAttributeAccessIssue] - assert UnionState.custom_union.c1 is not None # pyright: ignore [reportAttributeAccessIssue] - assert UnionState.custom_union.c1r is not None # pyright: ignore [reportAttributeAccessIssue] - assert UnionState.custom_union.c2 is not None # pyright: ignore [reportAttributeAccessIssue] - assert UnionState.custom_union.c2r is not None # pyright: ignore [reportAttributeAccessIssue] - assert types.is_optional(UnionState.opt_int._var_type) # pyright: ignore [reportAttributeAccessIssue, reportOptionalMemberAccess] - assert types.is_union(UnionState.int_float._var_type) # pyright: ignore [reportAttributeAccessIssue] + assert UnionState.custom_union.foo is not None # ty:ignore[unresolved-attribute] + assert UnionState.custom_union.c1 is not None # ty:ignore[unresolved-attribute] + assert UnionState.custom_union.c1r is not None # ty:ignore[unresolved-attribute] + assert UnionState.custom_union.c2 is not None # ty:ignore[unresolved-attribute] + assert UnionState.custom_union.c2r is not None # ty:ignore[unresolved-attribute] + assert types.is_optional(UnionState.opt_int._var_type) # ty:ignore[unresolved-attribute] + assert types.is_union(UnionState.int_float._var_type) # ty:ignore[unresolved-attribute] def test_set_base_field_via_setter(): @@ -3197,7 +3195,7 @@ def index(): app._compile_page("index") on_load_internal_name = format.format_event_handler( - OnLoadInternalState.on_load_internal # pyright: ignore[reportArgumentType] + OnLoadInternalState.on_load_internal # ty:ignore[invalid-argument-type] ) async with mock_base_state_event_processor as processor: @@ -3261,7 +3259,7 @@ def index(): app._compile_page("index") on_load_internal_name = format.format_event_handler( - OnLoadInternalState.on_load_internal # pyright: ignore[reportArgumentType] + OnLoadInternalState.on_load_internal # ty:ignore[invalid-argument-type] ) async with mock_base_state_event_processor as processor: @@ -3704,9 +3702,9 @@ def test_redis_state_manager_config_knobs(tmp_path, expiration_kwargs, expected_ reflex_base.config.get_config(reload=True) state_manager = StateManagerRedis(redis=mock_redis()) - assert state_manager.lock_expiration == expected_values[0] # pyright: ignore [reportAttributeAccessIssue] - assert state_manager.token_expiration == expected_values[1] # pyright: ignore [reportAttributeAccessIssue] - assert state_manager.lock_warning_threshold == expected_values[2] # pyright: ignore [reportAttributeAccessIssue] + assert state_manager.lock_expiration == expected_values[0] + assert state_manager.token_expiration == expected_values[1] + assert state_manager.lock_warning_threshold == expected_values[2] @pytest.mark.parametrize( @@ -3890,7 +3888,7 @@ def test_mixin_state() -> None: assert "computed" in UsesMixinState.vars assert ( - UsesMixinState(_reflex_internal_init=True)._backend_no_default # pyright: ignore [reportCallIssue] + UsesMixinState(_reflex_internal_init=True)._backend_no_default # ty:ignore[missing-argument, unknown-argument] is not UsesMixinState.backend_vars["_backend_no_default"] ) @@ -3961,7 +3959,7 @@ def test_assignment_to_undeclared_vars(): class State(BaseState): val: str _val: str - __val: str # pyright: ignore [reportGeneralTypeIssues] + __val: str def handle_supported_regular_vars(self): self.val = "no underscore" @@ -3981,8 +3979,8 @@ class Substate(State): def handle_var(self): self.value = 20 - state = State() # pyright: ignore [reportCallIssue] - sub_state = Substate() # pyright: ignore [reportCallIssue] + state = State() # ty:ignore[missing-argument] + sub_state = Substate() # ty:ignore[missing-argument] with pytest.raises(SetUndefinedStateVarError): state.handle_regular_var() @@ -4017,10 +4015,10 @@ class Child(State): bs_token = BaseStateToken(ident=token, cls=Root) dsm = StateManagerDisk() - async with dsm.modify_state(bs_token) as root: - s = await root.get_state(State) + async with dsm.modify_state(bs_token) as root: # ty:ignore[invalid-argument-type] + s = await root.get_state(State) # ty:ignore[unresolved-attribute] s.num += 1 - c = await root.get_state(Child) + c = await root.get_state(Child) # ty:ignore[unresolved-attribute] assert s._get_was_touched() assert not c._get_was_touched() await dsm.close() @@ -4048,7 +4046,7 @@ class DillState(BaseState): _f: Callable | None = None _g: Any = None - state = DillState(_reflex_internal_init=True) # pyright: ignore [reportCallIssue] + state = DillState(_reflex_internal_init=True) # ty:ignore[unknown-argument] state._o = Obj(f=lambda: 42) state._f = lambda: 420 @@ -4062,7 +4060,7 @@ class DillState(BaseState): assert unpickled_state._o.f() == 42 # Threading locks are unpicklable normally, and raise TypeError instead of PicklingError. - state2 = DillState(_reflex_internal_init=True) # pyright: ignore [reportCallIssue] + state2 = DillState(_reflex_internal_init=True) # ty:ignore[unknown-argument] state2._g = threading.Lock() pk2 = state2._serialize() unpickled_state2 = BaseState._deserialize(pk2) @@ -4070,7 +4068,7 @@ class DillState(BaseState): assert isinstance(unpickled_state2._g, type(threading.Lock())) # Some object, like generator, are still unpicklable with dill. - state3 = DillState(_reflex_internal_init=True) # pyright: ignore [reportCallIssue] + state3 = DillState(_reflex_internal_init=True) # ty:ignore[unknown-argument] state3._g = (i for i in range(10)) with pytest.raises(StateSerializationError): @@ -4307,7 +4305,7 @@ def py_Any(self, a: Any): # noqa: D102 assert isinstance(a, list) self.passed = True - def py_unresolvable(self, u: Unresolvable): # noqa: D102, F821 # pyright: ignore [reportUndefinedVariable] + def py_unresolvable(self, u: Unresolvable): # noqa: D102, F821 # ty:ignore[unresolved-reference] assert isinstance(u, list) self.passed = True diff --git a/tests/units/test_var.py b/tests/units/test_var.py index a96e4b2fb2e..4d0d915dc53 100644 --- a/tests/units/test_var.py +++ b/tests/units/test_var.py @@ -358,10 +358,10 @@ def test_basic_operations(TestObj): == '["1", "2", "3"].slice().reverse()' ) assert ( - str(Var(_js_expr="foo")._var_set_state("state").to(list).reverse()) + str(Var(_js_expr="foo")._var_set_state("state").to(list).reverse()) # ty:ignore[unresolved-attribute] == "state.foo.slice().reverse()" ) - assert str(Var(_js_expr="foo").to(list).reverse()) == "foo.slice().reverse()" + assert str(Var(_js_expr="foo").to(list).reverse()) == "foo.slice().reverse()" # ty:ignore[unresolved-attribute] assert str(Var(_js_expr="foo", _var_type=str).js_type()) == "(typeof(foo))" @@ -1157,7 +1157,7 @@ def test_type_chains(): == '(Object.entries(({ ["a"] : 1, ["b"] : 2, ["c"] : 3 }) ?? {})?.at?.(1)?.at?.(1) - 1)' ) assert ( - str(object_var["c"] + object_var["b"]) # pyright: ignore [reportCallIssue, reportOperatorIssue] + str(object_var["c"] + object_var["b"]) == '(({ ["a"] : 1, ["b"] : 2, ["c"] : 3 })?.["c"] + ({ ["a"] : 1, ["b"] : 2, ["c"] : 3 })?.["b"])' ) @@ -1167,7 +1167,7 @@ def test_nested_dict(): assert ( str(arr[0]["bar"][0]) - == '[({ ["bar"] : ["foo", "bar"] })]?.at?.(0)?.["bar"]?.at?.(0)' # pyright: ignore [reportIndexIssue] + == '[({ ["bar"] : ["foo", "bar"] })]?.at?.(0)?.["bar"]?.at?.(0)' ) @@ -1364,7 +1364,7 @@ def test_unsupported_types_for_contains(var: Var): var: The base var. """ with pytest.raises(TypeError) as err: - assert var.contains(1) # pyright: ignore [reportAttributeAccessIssue] + assert var.contains(1) # ty:ignore[unresolved-attribute] assert ( err.value.args[0] == f"Var of type {var._var_type} does not support contains check." @@ -1394,7 +1394,7 @@ def test_unsupported_types_for_string_contains(other): def test_unsupported_default_contains(): with pytest.raises(TypeError) as err: - assert 1 in Var(_js_expr="var", _var_type=str).guess_type() # pyright: ignore [reportOperatorIssue] + assert 1 in Var(_js_expr="var", _var_type=str).guess_type() assert ( err.value.args[0] == "'in' operator not supported for Var types, use Var.contains() instead." diff --git a/tests/units/utils/test_format.py b/tests/units/utils/test_format.py index 6d60c2f2109..b3e21057082 100644 --- a/tests/units/utils/test_format.py +++ b/tests/units/utils/test_format.py @@ -692,7 +692,7 @@ def test_format_query_params(input, output): ("input", "output"), [ ( - TestState(_reflex_internal_init=True).dict(), # pyright: ignore [reportCallIssue] + TestState(_reflex_internal_init=True).dict(), # ty:ignore[missing-argument, unknown-argument] { TestState.get_full_name(): { "array" + FIELD_MARKER: [1, 2, 3.15], @@ -726,7 +726,7 @@ def test_format_query_params(input, output): }, ), ( - DateTimeState(_reflex_internal_init=True).dict(), # pyright: ignore [reportCallIssue] + DateTimeState(_reflex_internal_init=True).dict(), # ty:ignore[unknown-argument] { DateTimeState.get_full_name(): { "d" + FIELD_MARKER: "1989-11-09", diff --git a/tests/units/utils/test_token_manager.py b/tests/units/utils/test_token_manager.py index 7e9da751b6c..b73cc0946df 100644 --- a/tests/units/utils/test_token_manager.py +++ b/tests/units/utils/test_token_manager.py @@ -525,7 +525,7 @@ def new_event_namespace() -> EventNamespace: ) event_namespace = EventNamespace(namespace=namespace, app=mock_app) - event_namespace.emit = AsyncMock() + event_namespace.emit = AsyncMock() # ty:ignore[invalid-assignment] created_objs.append(event_namespace) return event_namespace @@ -629,9 +629,9 @@ async def test_redis_token_manager_lost_and_found( event_namespace_factory: Factory fixture for EventNamespace instances. """ event_namespace1 = event_namespace_factory() - emit1_mock: Mock = event_namespace1.emit # pyright: ignore[reportAssignmentType] + emit1_mock: Mock = event_namespace1.emit # ty:ignore[invalid-assignment] event_namespace2 = event_namespace_factory() - emit2_mock: Mock = event_namespace2.emit # pyright: ignore[reportAssignmentType] + emit2_mock: Mock = event_namespace2.emit # ty:ignore[invalid-assignment] await event_namespace1.on_connect(sid="sid1", environ=query_string_for("token1")) await event_namespace2.on_connect(sid="sid2", environ=query_string_for("token2")) @@ -684,9 +684,9 @@ async def test_redis_token_manager_lost_and_found_router_data( event_namespace_factory: Factory fixture for EventNamespace instances. """ event_namespace1 = event_namespace_factory() - emit1_mock: Mock = event_namespace1.emit # pyright: ignore[reportAssignmentType] + emit1_mock: Mock = event_namespace1.emit # ty:ignore[invalid-assignment] event_namespace2 = event_namespace_factory() - emit2_mock: Mock = event_namespace2.emit # pyright: ignore[reportAssignmentType] + emit2_mock: Mock = event_namespace2.emit # ty:ignore[invalid-assignment] await event_namespace1.on_connect(sid="sid1", environ=query_string_for("token1")) await event_namespace2.on_connect(sid="sid2", environ=query_string_for("token2")) diff --git a/tests/units/vars/test_dep_tracking.py b/tests/units/vars/test_dep_tracking.py index 7081fe19f41..838b9593d70 100644 --- a/tests/units/vars/test_dep_tracking.py +++ b/tests/units/vars/test_dep_tracking.py @@ -327,7 +327,7 @@ def test_get_var_value_with_import_from(): async def get_state_import_from(self: DependencyTestState): from tests.units.states.mutation import MutableTestState - return await self.get_var_value(MutableTestState.hashmap) # pyright: ignore[reportArgumentType] + return await self.get_var_value(MutableTestState.hashmap) # ty:ignore[invalid-argument-type] from tests.units.states.mutation import MutableTestState diff --git a/tests/units/vars/test_object.py b/tests/units/vars/test_object.py index c2a479294c3..5545604dec9 100644 --- a/tests/units/vars/test_object.py +++ b/tests/units/vars/test_object.py @@ -133,13 +133,13 @@ def test_state_to_operation(type_: GenericType) -> None: def test_typing() -> None: # Bare var = ObjectState.bare.to(ObjectVar) - _ = assert_type(var, ObjectVar[Bare]) + _ = assert_type(var, ObjectVar[Bare]) # ty:ignore[type-assertion-failure] # Base var = ObjectState.base _ = assert_type(var, ObjectVar[Base]) optional_var = ObjectState.base_optional - _ = assert_type(optional_var, ObjectVar[Base]) + _ = assert_type(optional_var, ObjectVar[Base]) # ty:ignore[type-assertion-failure] list_var = ObjectState.base_list _ = assert_type(list_var, ArrayVar[Sequence[Base]]) list_var_0 = list_var[0] @@ -149,7 +149,7 @@ def test_typing() -> None: var = ObjectState.sqlamodel _ = assert_type(var, ObjectVar[SqlaModel]) optional_var = ObjectState.sqlamodel_optional - _ = assert_type(optional_var, ObjectVar[SqlaModel]) + _ = assert_type(optional_var, ObjectVar[SqlaModel]) # ty:ignore[type-assertion-failure] list_var = ObjectState.base_list _ = assert_type(list_var, ArrayVar[Sequence[Base]]) list_var_0 = list_var[0] @@ -159,7 +159,7 @@ def test_typing() -> None: var = ObjectState.dataclass _ = assert_type(var, ObjectVar[Dataclass]) optional_var = ObjectState.dataclass_optional - _ = assert_type(optional_var, ObjectVar[Dataclass]) + _ = assert_type(optional_var, ObjectVar[Dataclass]) # ty:ignore[type-assertion-failure] list_var = ObjectState.base_list _ = assert_type(list_var, ArrayVar[Sequence[Base]]) list_var_0 = list_var[0] diff --git a/uv.lock b/uv.lock index 83b6e3daede..63807704459 100644 --- a/uv.lock +++ b/uv.lock @@ -3032,19 +3032,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/10/bd/c038d7cc38edc1aa5bf91ab8068b63d4308c66c4c8bb3cbba7dfbc049f9c/pyparsing-3.3.2-py3-none-any.whl", hash = "sha256:850ba148bd908d7e2411587e247a1e4f0327839c40e2e5e6d05a007ecc69911d", size = 122781, upload-time = "2026-01-21T03:57:55.912Z" }, ] -[[package]] -name = "pyright" -version = "1.1.408" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "nodeenv" }, - { name = "typing-extensions" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/74/b2/5db700e52554b8f025faa9c3c624c59f1f6c8841ba81ab97641b54322f16/pyright-1.1.408.tar.gz", hash = "sha256:f28f2321f96852fa50b5829ea492f6adb0e6954568d1caa3f3af3a5f555eb684", size = 4400578, upload-time = "2026-01-08T08:07:38.795Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/0c/82/a2c93e32800940d9573fb28c346772a14778b84ba7524e691b324620ab89/pyright-1.1.408-py3-none-any.whl", hash = "sha256:090b32865f4fdb1e0e6cd82bf5618480d48eecd2eb2e70f960982a3d9a4c17c1", size = 6399144, upload-time = "2026-01-08T08:07:37.082Z" }, -] - [[package]] name = "pysocks" version = "1.7.1" @@ -3441,7 +3428,6 @@ dev = [ { name = "psutil" }, { name = "psycopg", extra = ["binary"] }, { name = "pydantic" }, - { name = "pyright" }, { name = "pytest" }, { name = "pytest-asyncio" }, { name = "pytest-benchmark" }, @@ -3459,6 +3445,7 @@ dev = [ { name = "sqlmodel" }, { name = "starlette-admin" }, { name = "toml" }, + { name = "ty" }, { name = "typer" }, { name = "uvicorn" }, ] @@ -3516,7 +3503,6 @@ dev = [ { name = "psutil" }, { name = "psycopg", extras = ["binary"] }, { name = "pydantic" }, - { name = "pyright" }, { name = "pytest" }, { name = "pytest-asyncio" }, { name = "pytest-benchmark" }, @@ -3534,6 +3520,7 @@ dev = [ { name = "sqlmodel" }, { name = "starlette-admin" }, { name = "toml" }, + { name = "ty" }, { name = "typer" }, { name = "uvicorn" }, ] @@ -4480,6 +4467,30 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/bb/4a/2e5583e544bc437d5e8e54b47db87430df9031b29b48d17f26d129fa60c0/trove_classifiers-2026.1.14.14-py3-none-any.whl", hash = "sha256:1f9553927f18d0513d8e5ff80ab8980b8202ce37ecae0e3274ed2ef11880e74d", size = 14197, upload-time = "2026-01-14T14:54:49.067Z" }, ] +[[package]] +name = "ty" +version = "0.0.33" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/84/44/9478c50c266826c1bf30d1692e589755bffa8f1c0a3eb7af8a346c255991/ty-0.0.33.tar.gz", hash = "sha256:46d63bda07403322cb6c28ccfdd5536be916e13df725c29f7ccd0a21f06bd9e8", size = 5559373, upload-time = "2026-04-28T10:45:13.18Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e9/24/e287388c63a19191be26b32ff4dbd06029834068150ebe2532939bc4c851/ty-0.0.33-py3-none-linux_armv6l.whl", hash = "sha256:94d0a9d2234261a8911396d59e506b5923fe0971dbda43b9dcea287936887fcc", size = 11021308, upload-time = "2026-04-28T10:45:43.34Z" }, + { url = "https://files.pythonhosted.org/packages/00/ca/ba1eed819895bd239fba8ee35dfcd5fcb266c203b0914a17a59579096bb5/ty-0.0.33-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:e4a2b5ba078f90de342f56b5f7979bb77c9b9b1d8625a041352ffc6ee93c4073", size = 10777272, upload-time = "2026-04-28T10:45:32.905Z" }, + { url = "https://files.pythonhosted.org/packages/25/a8/c3131d37b44b3fea1d6654a1c929a0cd0873822f77a90482b8ec28f6fbbd/ty-0.0.33-py3-none-macosx_11_0_arm64.whl", hash = "sha256:84ff5707825e9af9668d2bcf66975f93e520a63b524ab494e3a8265735be2563", size = 10201078, upload-time = "2026-04-28T10:45:23.374Z" }, + { url = "https://files.pythonhosted.org/packages/7b/db/d8e37ff0045810cc65e1ff36aa0da0a2253c05659787ac987df8a16c7897/ty-0.0.33-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e375285736f57886868e7af0b11c7b0ec5b6543fa15e7ad2a714fed9f077d4e0", size = 10732347, upload-time = "2026-04-28T10:45:21.444Z" }, + { url = "https://files.pythonhosted.org/packages/e0/1a/20e83a412506a918e4684fc67b567cf7cc13b105470b3428cb23c3d5aa13/ty-0.0.33-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:5680f6350c3b4e46b8bff6d7bb132366ea239463d6cad4892725d06046e65464", size = 10808238, upload-time = "2026-04-28T10:45:38.565Z" }, + { url = "https://files.pythonhosted.org/packages/5d/4b/d0a39f4464dc6cb4cc2c159473ce216bd1846bfb684c0323a3cb36dce5c6/ty-0.0.33-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c5535538bad8d0f7e62bcdff02197cdb30e41451d80b35d27e17d128f2e1dc5d", size = 11288348, upload-time = "2026-04-28T10:45:08.419Z" }, + { url = "https://files.pythonhosted.org/packages/35/7e/f1745e0f9583363d7a83d9a4990fc244f76ecc30840ddad83dc16a33c52d/ty-0.0.33-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:da196c42bbbc069e1e21e3e52107c061aa9660352dae57a41930690b56e2c02d", size = 11789907, upload-time = "2026-04-28T10:45:19.064Z" }, + { url = "https://files.pythonhosted.org/packages/a5/71/25f39f46a12d662859d45bc648555d0661044eb43db6b5648c9947487da9/ty-0.0.33-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9281672921ef6d4460e03146b5e6c18cb1a3e3a3b8a1a88f6f33226d05a469b7", size = 11500774, upload-time = "2026-04-28T10:45:48.012Z" }, + { url = "https://files.pythonhosted.org/packages/94/ec/136959ecbb7c71cb90537f5aea441c73f4ab24612868a6ecdc9d7444d32d/ty-0.0.33-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:82c1b8f303f82da64e878108e764be3ecbcd7c9903ac0a7f7031614ed00b97ab", size = 11360314, upload-time = "2026-04-28T10:45:05.402Z" }, + { url = "https://files.pythonhosted.org/packages/cf/95/32809575c222f00beed498cb728e9290a0f5009f930025381bb7253b2206/ty-0.0.33-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:efe3af412c9ff67bce5fa37d0a2b0d8555c24072b145a5bac6c79637f1c83abe", size = 10707785, upload-time = "2026-04-28T10:45:10.836Z" }, + { url = "https://files.pythonhosted.org/packages/13/89/c8e9531f7aa4a093359e15fa32c8e1277fbbe90d16894d7c6032d29f4b34/ty-0.0.33-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:aeec29c91ea768601747da546c3efc20b72c2fb1bd52bcc786a5c6eeff51d27b", size = 10834987, upload-time = "2026-04-28T10:45:40.738Z" }, + { url = "https://files.pythonhosted.org/packages/31/16/9835fbcf5338af1a1917bd28fdb8a7193c210b83f243aa286fa9f79cb3ad/ty-0.0.33-py3-none-musllinux_1_2_i686.whl", hash = "sha256:a535977c52bbb5f7e96b8b70a6ad375ad077f4a9ff2492508ea3816a2b403819", size = 10968968, upload-time = "2026-04-28T10:45:30.26Z" }, + { url = "https://files.pythonhosted.org/packages/36/69/64c76aabc1bc70c7f24b686cd93c3407f8ea430905e395f59bf9603ef571/ty-0.0.33-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:1d732facf39fcb221ba279d469c5040d37883e964f123b1563888efd34818180", size = 11458077, upload-time = "2026-04-28T10:45:45.971Z" }, + { url = "https://files.pythonhosted.org/packages/91/84/fae27b0c4718776a298690d31ca4cc1995f2e3e1c63a7b59e84c41498e9a/ty-0.0.33-py3-none-win32.whl", hash = "sha256:d90960b574428dc252f85e8598ec5fcb7f619794196b2fc95a90da075ed4681c", size = 10345364, upload-time = "2026-04-28T10:45:16.836Z" }, + { url = "https://files.pythonhosted.org/packages/3c/a0/a2938b23ae3e1a09a2d7c189e2ac5f7113676bae4e0e23948b568e18e5f8/ty-0.0.33-py3-none-win_amd64.whl", hash = "sha256:c1c3aec62c44de610c6e95f0a4e97ac3dbc07934bfdbf1fd90d758c9ff72f48e", size = 11342470, upload-time = "2026-04-28T10:45:26.455Z" }, + { url = "https://files.pythonhosted.org/packages/ab/62/7fb948aace38d2f6329261bb33c035a8484549c74f1db28649c7a4c6fed9/ty-0.0.33-py3-none-win_arm64.whl", hash = "sha256:0d44f99ba1b441e55e2aa301b2ac0a21112784931b46a5f66f4ea9efe5620d97", size = 10742673, upload-time = "2026-04-28T10:45:35.555Z" }, +] + [[package]] name = "typer" version = "0.24.2" From 394ead68071810cf2b408528e3d7f2bdcc3c2e7b Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Tue, 28 Apr 2026 22:47:49 +0200 Subject: [PATCH 02/57] improve typing --- .../reflex-base/src/reflex_base/vars/base.py | 5 ++ reflex/experimental/memo.py | 48 +++++++++--------- reflex/state.py | 50 ++++++++++--------- 3 files changed, 55 insertions(+), 48 deletions(-) diff --git a/packages/reflex-base/src/reflex_base/vars/base.py b/packages/reflex-base/src/reflex_base/vars/base.py index 8338de6a085..49ae537da9e 100644 --- a/packages/reflex-base/src/reflex_base/vars/base.py +++ b/packages/reflex-base/src/reflex_base/vars/base.py @@ -3629,6 +3629,11 @@ def __new__( class EvenMoreBasicBaseState(metaclass=BaseStateMeta): """A simplified base state class that provides basic functionality.""" + if TYPE_CHECKING: + # Whether this state class is a mixin and should not be instantiated. + # Set by ``BaseStateMeta.__new__`` as a class attribute. + _mixin: ClassVar[bool] = False + def __init__( self, **kwargs, diff --git a/reflex/experimental/memo.py b/reflex/experimental/memo.py index d5122357d29..0b135bab102 100644 --- a/reflex/experimental/memo.py +++ b/reflex/experimental/memo.py @@ -6,6 +6,7 @@ import inspect from collections.abc import Callable from functools import cache, update_wrapper +from types import FunctionType from typing import Any, get_args, get_origin, get_type_hints from reflex_base import constants @@ -50,7 +51,7 @@ class MemoParam: class ExperimentalMemoDefinition: """Base metadata for an experimental memo.""" - fn: Callable[..., Any] + fn: FunctionType python_name: str params: tuple[MemoParam, ...] @@ -172,7 +173,7 @@ def _is_memo_reregistration( type(existing) is type(definition) and existing.python_name == definition.python_name and existing.fn.__module__ == definition.fn.__module__ - and existing.fn.__qualname__ == definition.fn.__qualname__ # ty:ignore[unresolved-attribute] + and existing.fn.__qualname__ == definition.fn.__qualname__ ) @@ -409,7 +410,7 @@ def _placeholder_for_param(param: MemoParam) -> Var: def _evaluate_memo_function( - fn: Callable[..., Any], + fn: FunctionType, params: tuple[MemoParam, ...], ) -> Any: """Evaluate a memo function with placeholder vars. @@ -485,7 +486,7 @@ def _lift_rest_props(component: Component) -> Component: def _analyze_params( - fn: Callable[..., Any], + fn: FunctionType, *, for_component: bool, ) -> tuple[MemoParam, ...]: @@ -503,28 +504,29 @@ def _analyze_params( """ signature = inspect.signature(fn) hints = get_type_hints(fn) + fn_name = fn.__name__ params: list[MemoParam] = [] rest_count = 0 for parameter in signature.parameters.values(): if parameter.kind is inspect.Parameter.VAR_POSITIONAL: - msg = f"`@rx._x.memo` does not support `*args` in `{fn.__name__}`." # ty:ignore[unresolved-attribute] + msg = f"`@rx._x.memo` does not support `*args` in `{fn_name}`." raise TypeError(msg) if parameter.kind is inspect.Parameter.VAR_KEYWORD: - msg = f"`@rx._x.memo` does not support `**kwargs` in `{fn.__name__}`." # ty:ignore[unresolved-attribute] + msg = f"`@rx._x.memo` does not support `**kwargs` in `{fn_name}`." raise TypeError(msg) if parameter.kind is inspect.Parameter.POSITIONAL_ONLY: msg = ( f"`@rx._x.memo` does not support positional-only parameters in " - f"`{fn.__name__}`." # ty:ignore[unresolved-attribute] + f"`{fn_name}`." ) raise TypeError(msg) annotation = hints.get(parameter.name, parameter.annotation) if annotation is inspect.Parameter.empty: msg = ( - f"All parameters of `{fn.__name__}` must be annotated as `rx.Var[...]` " # ty:ignore[unresolved-attribute] + f"All parameters of `{fn_name}` must be annotated as `rx.Var[...]` " f"or `rx.RestProp`. Missing annotation for `{parameter.name}`." ) raise TypeError(msg) @@ -536,14 +538,14 @@ def _analyze_params( if parameter.name == "children" and not is_children: msg = ( - f"`children` in `{fn.__name__}` must be annotated as " # ty:ignore[unresolved-attribute] + f"`children` in `{fn_name}` must be annotated as " "`rx.Var[rx.Component]`." ) raise TypeError(msg) if not is_rest and not _is_var_annotation(annotation): msg = ( - f"All parameters of `{fn.__name__}` must be annotated as `rx.Var[...]` " # ty:ignore[unresolved-attribute] + f"All parameters of `{fn_name}` must be annotated as `rx.Var[...]` " f"or `rx.RestProp`, got `{annotation}` for `{parameter.name}`." ) raise TypeError(msg) @@ -551,9 +553,7 @@ def _analyze_params( if is_rest: rest_count += 1 if rest_count > 1: - msg = ( - f"`@rx._x.memo` only supports one `rx.RestProp` in `{fn.__name__}`." # ty:ignore[unresolved-attribute] - ) + msg = f"`@rx._x.memo` only supports one `rx.RestProp` in `{fn_name}`." raise TypeError(msg) js_prop_name = format.to_camel_case(parameter.name) @@ -580,7 +580,7 @@ def _analyze_params( def _create_function_definition( - fn: Callable[..., Any], + fn: FunctionType, return_annotation: Any, ) -> ExperimentalMemoFunctionDefinition: """Create a definition for a var-returning memo. @@ -594,7 +594,7 @@ def _create_function_definition( """ params = _analyze_params(fn, for_component=False) return_expr = Var.create(_evaluate_memo_function(fn, params)) - _validate_var_return_expr(return_expr, fn.__name__) # ty:ignore[unresolved-attribute] + _validate_var_return_expr(return_expr, fn.__name__) children_param = _get_children_param(params) rest_param = _get_rest_param(params) @@ -620,18 +620,18 @@ def _create_function_definition( return ExperimentalMemoFunctionDefinition( fn=fn, - python_name=fn.__name__, # ty:ignore[unresolved-attribute] + python_name=fn.__name__, params=params, function=function, imported_var=_imported_function_var( - fn.__name__, # ty:ignore[unresolved-attribute] + fn.__name__, _annotation_inner_type(return_annotation), ), ) def _create_component_definition( - fn: Callable[..., Any], + fn: FunctionType, return_annotation: Any, ) -> ExperimentalMemoComponentDefinition: """Create a definition for a component-returning memo. @@ -650,16 +650,16 @@ def _create_component_definition( component = _normalize_component_return(_evaluate_memo_function(fn, params)) if component is None: msg = ( - f"Component-returning `@rx._x.memo` `{fn.__name__}` must return an " # ty:ignore[unresolved-attribute] + f"Component-returning `@rx._x.memo` `{fn.__name__}` must return an " "`rx.Component` or `rx.Var[rx.Component]`." ) raise TypeError(msg) return ExperimentalMemoComponentDefinition( fn=fn, - python_name=fn.__name__, # ty:ignore[unresolved-attribute] + python_name=fn.__name__, params=params, - export_name=format.to_title_case(fn.__name__), # ty:ignore[unresolved-attribute] + export_name=format.to_title_case(fn.__name__), component=_lift_rest_props(component), ) @@ -951,7 +951,7 @@ def _create_component_wrapper( return _ExperimentalMemoComponentWrapper(definition) -def memo(fn: Callable[..., Any]) -> Callable[..., Any]: +def memo(fn: FunctionType) -> Callable[..., Any]: """Create an experimental memo from a function. Args: @@ -967,7 +967,7 @@ def memo(fn: Callable[..., Any]) -> Callable[..., Any]: return_annotation = hints.get("return", inspect.Signature.empty) if return_annotation is inspect.Signature.empty: msg = ( - f"`@rx._x.memo` requires a return annotation on `{fn.__name__}`. " # ty:ignore[unresolved-attribute] + f"`@rx._x.memo` requires a return annotation on `{fn.__name__}`. " "Use `-> rx.Component` or `-> rx.Var[...]`." ) raise TypeError(msg) @@ -983,7 +983,7 @@ def memo(fn: Callable[..., Any]) -> Callable[..., Any]: return _create_function_wrapper(definition) msg = ( - f"`@rx._x.memo` on `{fn.__name__}` must return `rx.Component` or `rx.Var[...]`, " # ty:ignore[unresolved-attribute] + f"`@rx._x.memo` on `{fn.__name__}` must return `rx.Component` or `rx.Var[...]`, " f"got `{return_annotation}`." ) raise TypeError(msg) diff --git a/reflex/state.py b/reflex/state.py index 3959b2f949c..59535dba533 100644 --- a/reflex/state.py +++ b/reflex/state.py @@ -59,6 +59,7 @@ ComputedVar, DynamicRouteVar, EvenMoreBasicBaseState, + LiteralVar, Var, computed_var, dispatch, @@ -418,7 +419,7 @@ def __init__( "See https://reflex.dev/docs/state/ for further information." ) raise ReflexRuntimeError(msg) - if self._mixin: # ty:ignore[unresolved-attribute] + if self._mixin: msg = f"{type(self).__name__} is a state mixin and cannot be instantiated directly." raise ReflexRuntimeError(msg) kwargs["parent_state"] = parent_state @@ -586,7 +587,10 @@ def __init_subclass__(cls, mixin: bool = False, **kwargs): if name in cls.inherited_vars: continue if is_computed_var(value): - fget = cls._copy_fn(value.fget) + fget = value.fget + if not isinstance(fget, FunctionType): + continue + fget = cls._copy_fn(fget) newcv = value._replace(fget=fget, _var_data=VarData.from_state(cls)) # cleanup refs to mixin cls in var_data setattr(cls, name, newcv) @@ -599,8 +603,10 @@ def __init_subclass__(cls, mixin: bool = False, **kwargs): continue if parent_state is not None and parent_state.event_handlers.get(name): continue + if not isinstance(value, FunctionType): + continue value = cls._copy_fn(value) - value.__qualname__ = f"{cls.__name__}.{name}" # ty:ignore[unresolved-attribute] + value.__qualname__ = f"{cls.__name__}.{name}" events[name] = value # Create the setvar event handler for this state @@ -636,7 +642,7 @@ def _add_event_handler( setattr(cls, name, handler) @staticmethod - def _copy_fn(fn: Callable) -> Callable: + def _copy_fn(fn: FunctionType) -> FunctionType: """Copy a function. Used to copy ComputedVars and EventHandlers from mixins. Args: @@ -646,11 +652,11 @@ def _copy_fn(fn: Callable) -> Callable: The copied function. """ newfn = FunctionType( - fn.__code__, # ty:ignore[unresolved-attribute] - fn.__globals__, # ty:ignore[unresolved-attribute] - name=fn.__name__, # ty:ignore[unresolved-attribute] - argdefs=fn.__defaults__, # ty:ignore[unresolved-attribute] - closure=fn.__closure__, # ty:ignore[unresolved-attribute] + fn.__code__, + fn.__globals__, + name=fn.__name__, + argdefs=fn.__defaults__, + closure=fn.__closure__, ) newfn.__annotations__ = fn.__annotations__ if mark := getattr(fn, BACKGROUND_TASK_MARKER, None): @@ -679,7 +685,7 @@ def _item_is_event_handler(name: str, value: Any) -> bool: ) @classmethod - def _evaluate(cls, f: Callable[[Self], Any], of_type: type | None = None) -> Var: + def _evaluate(cls, f: FunctionType, of_type: type | None = None) -> Var: """Evaluate a function to a ComputedVar. Experimental. Args: @@ -697,7 +703,7 @@ def _evaluate(cls, f: Callable[[Self], Any], of_type: type | None = None) -> Var of_type = of_type or Component unique_var_name = ( - ("dynamic_" + f.__module__ + "_" + f.__qualname__) # ty:ignore[unresolved-attribute] + ("dynamic_" + f.__module__ + "_" + f.__qualname__) .replace("<", "") .replace(">", "") .replace(".", "_") @@ -765,7 +771,7 @@ def _handle_local_def(cls): @classmethod @functools.cache - def _get_type_hints(cls) -> dict[str, Any]: # ty:ignore[invalid-type-form] + def _get_type_hints(cls) -> builtins.dict[str, Any]: """Get the type hints for this class. If the class is dynamic, evaluate the type hints with the original @@ -1210,7 +1216,7 @@ def _get_var_default(cls, name: str, annotation_value: Any) -> Any: return None @staticmethod - def _get_base_functions() -> dict[str, FunctionType]: # ty:ignore[invalid-type-form] + def _get_base_functions() -> builtins.dict[str, FunctionType]: """Get all functions of the state class excluding dunder methods. Returns: @@ -1223,7 +1229,7 @@ def _get_base_functions() -> dict[str, FunctionType]: # ty:ignore[invalid-type- } @classmethod - def _update_substate_inherited_vars(cls, vars_to_add: dict[str, Var]): # ty:ignore[invalid-type-form] + def _update_substate_inherited_vars(cls, vars_to_add: builtins.dict[str, Var]): """Update the inherited vars of substates recursively when new vars are added. Also updates the var dependency tracking dicts after adding vars. @@ -1244,7 +1250,7 @@ def _update_substate_inherited_vars(cls, vars_to_add: dict[str, Var]): # ty:ign cls._init_var_dependency_dicts() @classmethod - def setup_dynamic_args(cls, args: dict[str, str]): # ty:ignore[invalid-type-form] + def setup_dynamic_args(cls, args: builtins.dict[str, str]): """Set up args for easy access in renderer. Args: @@ -1655,13 +1661,9 @@ async def get_var_value(self, var: Var[VAR_TYPE]) -> VAR_TYPE: if not isinstance(var, Var): return var - unset = object() - # Fast case: this is a literal var and the value is known. - if ( - var_value := getattr(var, "_var_value", unset) - ) is not unset and not isinstance(var_value, Var): - return var_value # ty:ignore[invalid-return-type] + if isinstance(var, LiteralVar) and not isinstance(var._var_value, Var): + return var._var_value var_data = var._get_all_var_data() if var_data is None or not var_data.state: @@ -1858,7 +1860,7 @@ def get_value(self, key: str) -> Any: def dict( self, include_computed: bool = True, initial: bool = False, **kwargs - ) -> dict[str, Any]: # ty:ignore[invalid-type-form] + ) -> builtins.dict[str, Any]: """Convert the object to a dictionary. Args: @@ -1955,7 +1957,7 @@ def __getstate__(self): state.pop(inherited_var_name, None) return state - def __setstate__(self, state: dict[str, Any]): # ty:ignore[invalid-type-form] + def __setstate__(self, state: builtins.dict[str, Any]): """Set the state from redis deserialization. This method is called by pickle to deserialize the object. @@ -2415,7 +2417,7 @@ def __init__(self, *args, **kwargs): Raises: ReflexRuntimeError: If the ComponentState is initialized directly. """ - if self._mixin: # ty:ignore[unresolved-attribute] + if self._mixin: raise ReflexRuntimeError( f"{ComponentState.__name__} {type(self).__name__} is not meant to be initialized directly. " + "Use the `create` method to create a new instance and access the state via the `State` attribute." From 66d332658b4b732dc841b3208f1cb4fdd8c9960c Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Tue, 28 Apr 2026 22:48:47 +0200 Subject: [PATCH 03/57] update pyi --- pyi_hashes.json | 121 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 120 insertions(+), 1 deletion(-) diff --git a/pyi_hashes.json b/pyi_hashes.json index e4c8693d9c8..8b25cb23922 100644 --- a/pyi_hashes.json +++ b/pyi_hashes.json @@ -1,5 +1,124 @@ { + "packages/reflex-components-code/src/reflex_components_code/code.pyi": "a879ccd253e901964a7ab7ea7154f904", + "packages/reflex-components-code/src/reflex_components_code/shiki_code_block.pyi": "d3e0c33fdc34f5c154ac387d550c0d29", + "packages/reflex-components-core/src/reflex_components_core/__init__.pyi": "82b29d23f2490161d42fd21021bd39c3", + "packages/reflex-components-core/src/reflex_components_core/base/__init__.pyi": "7009187aaaf191814d031e5462c48318", + "packages/reflex-components-core/src/reflex_components_core/base/app_wrap.pyi": "ecccfd8a9b0e8b2f4128ff13ff27a9da", + "packages/reflex-components-core/src/reflex_components_core/base/body.pyi": "2535814d409e5feaf57da63dcf0abeaf", + "packages/reflex-components-core/src/reflex_components_core/base/document.pyi": "a2e67a9814dc61853ca2299d9d9c698d", + "packages/reflex-components-core/src/reflex_components_core/base/error_boundary.pyi": "59170074a1a228ce58685f3f207954f2", + "packages/reflex-components-core/src/reflex_components_core/base/fragment.pyi": "e4cbfc46eabb904596be4372392add35", + "packages/reflex-components-core/src/reflex_components_core/base/link.pyi": "629a483c570b04ca3d83ecdc53914770", + "packages/reflex-components-core/src/reflex_components_core/base/meta.pyi": "0cfa2d8c52321ce7440e887d03007d5b", + "packages/reflex-components-core/src/reflex_components_core/base/script.pyi": "bfc7fb609b822f597d1141595f8090fe", + "packages/reflex-components-core/src/reflex_components_core/base/strict_mode.pyi": "8ee129808abb4389cbd77a1736190eae", + "packages/reflex-components-core/src/reflex_components_core/core/__init__.pyi": "dd5142b3c9087bf2bf22651adf6f2724", + "packages/reflex-components-core/src/reflex_components_core/core/auto_scroll.pyi": "918dfad4d5925addd0f741e754b3b076", + "packages/reflex-components-core/src/reflex_components_core/core/banner.pyi": "6040fbada9b96c55637a9c8cc21a5e10", + "packages/reflex-components-core/src/reflex_components_core/core/clipboard.pyi": "e3950e0963a6d04299ff58294687e407", + "packages/reflex-components-core/src/reflex_components_core/core/debounce.pyi": "dd221754c5e076a3a833c8584da72dc5", + "packages/reflex-components-core/src/reflex_components_core/core/helmet.pyi": "7fd81a99bde5b0ff94bb52523597fd5c", + "packages/reflex-components-core/src/reflex_components_core/core/html.pyi": "753d6ae315369530dad450ed643f5be6", + "packages/reflex-components-core/src/reflex_components_core/core/sticky.pyi": "ba60a7d9cba75b27a1133bd63a9fbd59", + "packages/reflex-components-core/src/reflex_components_core/core/upload.pyi": "48bccd1cf1cedaf24503e7dbd2c0b02b", + "packages/reflex-components-core/src/reflex_components_core/core/window_events.pyi": "cab827931770be082cd1598a9908abbc", + "packages/reflex-components-core/src/reflex_components_core/datadisplay/__init__.pyi": "c96fed4da42a13576d64f84e3c7cb25c", + "packages/reflex-components-core/src/reflex_components_core/el/__init__.pyi": "f09129ddefb57ab4c7769c86dc9a3153", + "packages/reflex-components-core/src/reflex_components_core/el/element.pyi": "ff68d843c5987d3f0d773a6367eb9c63", + "packages/reflex-components-core/src/reflex_components_core/el/elements/__init__.pyi": "e6c845f2f29eb079697a2e31b0c2f23a", + "packages/reflex-components-core/src/reflex_components_core/el/elements/base.pyi": "d2500a39e6e532bb90c83438343905bf", + "packages/reflex-components-core/src/reflex_components_core/el/elements/forms.pyi": "ca840a20c8e1c1f5335fb815a25b6c32", + "packages/reflex-components-core/src/reflex_components_core/el/elements/inline.pyi": "c38a432d1fd0c3208c4fc3a546c67e4d", + "packages/reflex-components-core/src/reflex_components_core/el/elements/media.pyi": "b794f4f4f7ad17c6939d5526b9c63397", + "packages/reflex-components-core/src/reflex_components_core/el/elements/metadata.pyi": "f9e51feebda79fb063bc264a235df0c3", + "packages/reflex-components-core/src/reflex_components_core/el/elements/other.pyi": "c86abf00384b5f15725a0daf2533848d", + "packages/reflex-components-core/src/reflex_components_core/el/elements/scripts.pyi": "222176bffc14191018fd0e3af3741aff", + "packages/reflex-components-core/src/reflex_components_core/el/elements/sectioning.pyi": "fbbe0bf222d4196c32c88d05cb077997", + "packages/reflex-components-core/src/reflex_components_core/el/elements/tables.pyi": "cba93678248925c981935a251379aa7c", + "packages/reflex-components-core/src/reflex_components_core/el/elements/typography.pyi": "4abedc6f98f6d54194ff9e7f1f76314e", + "packages/reflex-components-core/src/reflex_components_core/react_router/dom.pyi": "1074a512195ae23d479c4a2d553954e1", + "packages/reflex-components-dataeditor/src/reflex_components_dataeditor/dataeditor.pyi": "8e379fa038c7c6c0672639eb5902934d", + "packages/reflex-components-gridjs/src/reflex_components_gridjs/datatable.pyi": "d2dc211d707c402eb24678a4cba945f7", + "packages/reflex-components-lucide/src/reflex_components_lucide/icon.pyi": "e3ec310276f9d091fbb0261e523ca9ed", + "packages/reflex-components-markdown/src/reflex_components_markdown/markdown.pyi": "da02f81678d920a68101c08fe64483a5", + "packages/reflex-components-moment/src/reflex_components_moment/moment.pyi": "d6a02e447dfd3c91bba84bcd02722aed", + "packages/reflex-components-plotly/src/reflex_components_plotly/plotly.pyi": "91e956633778c6992f04940c69ff7140", + "packages/reflex-components-radix/src/reflex_components_radix/__init__.pyi": "19216eb3618f68c8a76e5e43801cf4af", + "packages/reflex-components-radix/src/reflex_components_radix/primitives/__init__.pyi": "5404a8da97e8b5129133d7f300e3f642", + "packages/reflex-components-radix/src/reflex_components_radix/primitives/accordion.pyi": "e8ef2b44f2afe3e9b8d678d523673882", + "packages/reflex-components-radix/src/reflex_components_radix/primitives/base.pyi": "e779c6739baee98c8a588768a88de45a", + "packages/reflex-components-radix/src/reflex_components_radix/primitives/dialog.pyi": "ffb06f3aa8722c2345a952869118e224", + "packages/reflex-components-radix/src/reflex_components_radix/primitives/drawer.pyi": "cc724f697e62efba294e19b58c6f1bd8", + "packages/reflex-components-radix/src/reflex_components_radix/primitives/form.pyi": "4d6121ccc963c64e33c49acd4295eb7a", + "packages/reflex-components-radix/src/reflex_components_radix/primitives/progress.pyi": "b3b66ec57525c53ea741897e2bc8370e", + "packages/reflex-components-radix/src/reflex_components_radix/primitives/slider.pyi": "c86bc8d4604e3d8c8d40baad2ac6dc17", + "packages/reflex-components-radix/src/reflex_components_radix/themes/__init__.pyi": "b433b9a099dc5b0ab008d02c85d38059", + "packages/reflex-components-radix/src/reflex_components_radix/themes/base.pyi": "e75cbf2a34620721432b1556f3c875cd", + "packages/reflex-components-radix/src/reflex_components_radix/themes/color_mode.pyi": "ed020269e4728cc6abe72354193146b7", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/__init__.pyi": "f10f0169f81c78290333da831915762f", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/alert_dialog.pyi": "d5e0419729df4ddf2caf214f40ae7845", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/aspect_ratio.pyi": "613abb9870259547c99eb434a3a17512", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/avatar.pyi": "1671e796449b236386d8f53d33e42b2f", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/badge.pyi": "9fde9929ca5197e0e1880bce9a08e926", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/button.pyi": "e5d6387a93c74dafaa0d6f1719e08bac", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/callout.pyi": "31da62c4d8c1d459089aab32cd232feb", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/card.pyi": "76afb58340c6be1f26b7b110473efa55", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/checkbox.pyi": "6cbf013e21d7280118dfd7383998b3bf", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/checkbox_cards.pyi": "63b4134246f68f9f556896d6ce194462", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/checkbox_group.pyi": "ec3f89e7d187303344d4127a83522b22", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/context_menu.pyi": "99541ee46f112eb4096f903a99f5ffb8", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/data_list.pyi": "1dfd91741ff402b3ed93b6daca4939f3", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/dialog.pyi": "ed9198da4a7950a8579e50ad970c34ef", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/dropdown_menu.pyi": "15f9cee0584414f2d2e0fb82c167f216", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/hover_card.pyi": "3f328bb0ba5225e4478febf8c7623833", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/icon_button.pyi": "be8eed28e19221a406e554829809ff0d", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/inset.pyi": "9b2adf18f7d239b8e7431f39042ed301", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/popover.pyi": "4d5813a47b8f8b6ac317ca01d87d9afb", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/progress.pyi": "1ab01f45a4c5ef4211eacc00cc99e4a5", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/radio.pyi": "38a7412205a98617f98218a5b213ada1", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/radio_cards.pyi": "d84b16ac16083a534199fd23659aaa06", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/radio_group.pyi": "51fda6313f1ce86d5b1ffdfd68ae8b74", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/scroll_area.pyi": "bba40e5eae75314157378c9e8b0eea73", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/segmented_control.pyi": "bf9f751a701137bfedc254657d4c5be4", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/select.pyi": "605479e11d19dd7730c90125b198c9b6", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/separator.pyi": "519781d33b99c675a12014d400e54d08", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/skeleton.pyi": "f4848f7d89abb4c78f6db52c624cdabf", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/slider.pyi": "61a08374fa19a0bb3f52b8654effc0f2", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/spinner.pyi": "530c51742031389d4b2ae43548ff0f03", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/switch.pyi": "23b21bc11a0012e13ce9bb79b47ba146", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/table.pyi": "8364f40600870bafa585528d9cadedf8", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/tabs.pyi": "3a52910c327f55656eb59309f9362361", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/text_area.pyi": "fcf562b2f61ecdcc2de6f70d2ebf9907", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/text_field.pyi": "250b7e77b67e7d8cd3fff2b40526c04c", + "packages/reflex-components-radix/src/reflex_components_radix/themes/components/tooltip.pyi": "799acce0af81899a3a310bdcd43c403b", + "packages/reflex-components-radix/src/reflex_components_radix/themes/layout/__init__.pyi": "9e452af27229b676ad0146e40f75bed5", + "packages/reflex-components-radix/src/reflex_components_radix/themes/layout/base.pyi": "5b262189e235cac17182e79188b1681a", + "packages/reflex-components-radix/src/reflex_components_radix/themes/layout/box.pyi": "e06c8fd64132765d61b9edb87a48558b", + "packages/reflex-components-radix/src/reflex_components_radix/themes/layout/center.pyi": "5aa934d7c6ba3889fa943eabee7dc05f", + "packages/reflex-components-radix/src/reflex_components_radix/themes/layout/container.pyi": "c67fafd1aec105cb5a9927ff0e6d2071", + "packages/reflex-components-radix/src/reflex_components_radix/themes/layout/flex.pyi": "aa68061a8e5dfd4adf336d1d1cb000fb", + "packages/reflex-components-radix/src/reflex_components_radix/themes/layout/grid.pyi": "06b92d31331c6f08b5083fcc811b754a", + "packages/reflex-components-radix/src/reflex_components_radix/themes/layout/list.pyi": "e7cd3a9cea1c34e21f731f1bd05c1ceb", + "packages/reflex-components-radix/src/reflex_components_radix/themes/layout/section.pyi": "8c968fead3155b2d51c687459811b5df", + "packages/reflex-components-radix/src/reflex_components_radix/themes/layout/spacer.pyi": "cfc8a927642e5b68feabc80080aeb8dc", + "packages/reflex-components-radix/src/reflex_components_radix/themes/layout/stack.pyi": "cf88cf870eefaacaf765ead10fb4593b", + "packages/reflex-components-radix/src/reflex_components_radix/themes/typography/__init__.pyi": "de7ee994f66a4c1d1a6ac2ad3370c30e", + "packages/reflex-components-radix/src/reflex_components_radix/themes/typography/blockquote.pyi": "92d5a2df77a69a28a4d591000ee46bd1", + "packages/reflex-components-radix/src/reflex_components_radix/themes/typography/code.pyi": "8a1e4376cadf4961212d39a5128a0e4f", + "packages/reflex-components-radix/src/reflex_components_radix/themes/typography/heading.pyi": "34c7ed3fe1e5f702a98d72751b0052fa", + "packages/reflex-components-radix/src/reflex_components_radix/themes/typography/link.pyi": "619a9d8351748fffe76136002931e583", + "packages/reflex-components-radix/src/reflex_components_radix/themes/typography/text.pyi": "4919daa4483b7c12f6fafd02a2275e0f", + "packages/reflex-components-react-player/src/reflex_components_react_player/audio.pyi": "0817c9232a6e4790cff8ea8aa6001950", + "packages/reflex-components-react-player/src/reflex_components_react_player/react_player.pyi": "6c1c26149d57c708fab04b82de0eb515", + "packages/reflex-components-react-player/src/reflex_components_react_player/video.pyi": "75207a9fe4f37ec2a2f1becbbbd5237b", + "packages/reflex-components-recharts/src/reflex_components_recharts/__init__.pyi": "7b8b69840a3637c1f1cac45ba815cccf", + "packages/reflex-components-recharts/src/reflex_components_recharts/cartesian.pyi": "277bbf09d72e0c450241f0b7d39ebb60", + "packages/reflex-components-recharts/src/reflex_components_recharts/charts.pyi": "be20d1d71c3b16f7e973a0329c3d81d6", + "packages/reflex-components-recharts/src/reflex_components_recharts/general.pyi": "c051ab3a26c23107043e203b060e1412", + "packages/reflex-components-recharts/src/reflex_components_recharts/polar.pyi": "1979bb6c22bb7a0d3342b2d63fb19d74", + "packages/reflex-components-recharts/src/reflex_components_recharts/recharts.pyi": "234407dbd466bf9c87d75ce979ab0e2d", + "packages/reflex-components-sonner/src/reflex_components_sonner/toast.pyi": "2c5fadcc014056f041cd4d916137d9e7", "reflex/__init__.pyi": "3a9bb8544cbc338ffaf0a5927d9156df", "reflex/components/__init__.pyi": "f39a2af77f438fa243c58c965f19d42e", - "reflex/experimental/memo.pyi": "2c119a0dfea362dcd8193786363cbc02" + "reflex/experimental/memo.pyi": "9210fdd8cb53d286f7a95c91a7f39c3c" } From 08231d5e3be9678f9bfa59b70203633b7a29ec2f Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Tue, 28 Apr 2026 22:54:22 +0200 Subject: [PATCH 04/57] some typing stuff --- packages/reflex-base/src/reflex_base/components/component.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/reflex-base/src/reflex_base/components/component.py b/packages/reflex-base/src/reflex_base/components/component.py index 82ce57c0104..141fdac2914 100644 --- a/packages/reflex-base/src/reflex_base/components/component.py +++ b/packages/reflex-base/src/reflex_base/components/component.py @@ -2,6 +2,7 @@ from __future__ import annotations +import builtins import contextlib import copy import dataclasses @@ -385,7 +386,7 @@ def _get_all_imports(self) -> ParsedImportDict: """ @abstractmethod - def _get_all_dynamic_imports(self) -> set[str]: # ty:ignore[invalid-type-form] + def _get_all_dynamic_imports(self) -> builtins.set[str]: """Get dynamic imports for the component. Returns: @@ -2866,7 +2867,7 @@ def empty_component() -> Component: return Bare.create("") -def render_dict_to_var(tag: dict | Component | str) -> Var: +def render_dict_to_var(tag: dict[str, Any] | Component | str) -> Var: """Convert a render dict to a Var. Args: From b57afce1474751d66afb3e13a966b84f226d7c60 Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Tue, 28 Apr 2026 23:20:15 +0200 Subject: [PATCH 05/57] do it like stdlib does for dataclasses --- .../src/reflex_base/components/component.py | 4 +-- .../reflex-base/src/reflex_base/vars/base.py | 4 +-- .../src/reflex_components_code/code.py | 2 +- .../shiki_code_block.py | 8 +++--- .../src/reflex_components_core/base/meta.py | 4 +-- .../primitives/accordion.py | 4 +-- .../themes/components/radio_group.py | 12 ++++----- .../themes/components/separator.py | 2 +- .../themes/components/slider.py | 2 +- .../themes/layout/container.py | 2 +- .../themes/layout/list.py | 4 +-- .../themes/layout/section.py | 2 +- .../themes/layout/stack.py | 8 +++--- .../themes/typography/text.py | 2 +- .../reflex_components_recharts/cartesian.py | 26 +++++++++---------- .../src/reflex_components_recharts/general.py | 10 +++---- .../src/reflex_components_recharts/polar.py | 14 +++++----- .../src/reflex_components_sonner/toast.py | 2 +- .../pyi_generator/dataset/simple_component.py | 2 +- 19 files changed, 57 insertions(+), 57 deletions(-) diff --git a/packages/reflex-base/src/reflex_base/components/component.py b/packages/reflex-base/src/reflex_base/components/component.py index 141fdac2914..5d2851a1bc5 100644 --- a/packages/reflex-base/src/reflex_base/components/component.py +++ b/packages/reflex-base/src/reflex_base/components/component.py @@ -121,7 +121,7 @@ def field( default_factory: Callable[[], FIELD_TYPE] | None = None, is_javascript_property: bool | None = None, doc: str | None = None, -) -> FIELD_TYPE: +) -> Any: """Create a field for a component. Args: @@ -144,7 +144,7 @@ def field( default_factory=default_factory, is_javascript=is_javascript_property, doc=doc, - ) # ty:ignore[invalid-return-type] + ) @dataclass_transform(kw_only_default=True, field_specifiers=(field,)) diff --git a/packages/reflex-base/src/reflex_base/vars/base.py b/packages/reflex-base/src/reflex_base/vars/base.py index 49ae537da9e..8a367599e9e 100644 --- a/packages/reflex-base/src/reflex_base/vars/base.py +++ b/packages/reflex-base/src/reflex_base/vars/base.py @@ -3447,7 +3447,7 @@ def field( *, is_var: Literal[False], default_factory: Callable[[], FIELD_TYPE] | None = None, -) -> FIELD_TYPE: ... +) -> Any: ... @overload @@ -3456,7 +3456,7 @@ def field( *, default_factory: Callable[[], FIELD_TYPE] | None = None, is_var: Literal[True] = True, -) -> Field[FIELD_TYPE]: ... +) -> Any: ... def field( diff --git a/packages/reflex-components-code/src/reflex_components_code/code.py b/packages/reflex-components-code/src/reflex_components_code/code.py index 83f44c5c260..eb96cde27d6 100644 --- a/packages/reflex-components-code/src/reflex_components_code/code.py +++ b/packages/reflex-components-code/src/reflex_components_code/code.py @@ -393,7 +393,7 @@ class CodeBlock(Component, MarkdownComponentMap): language: Var[LiteralCodeLanguage] = field( default=Var.create("python"), doc="The language to use." - ) # ty:ignore[invalid-assignment] + ) code: Var[str] = field(doc="The code to display.") diff --git a/packages/reflex-components-code/src/reflex_components_code/shiki_code_block.py b/packages/reflex-components-code/src/reflex_components_code/shiki_code_block.py index 7b4d9869775..1a2149684ef 100644 --- a/packages/reflex-components-code/src/reflex_components_code/shiki_code_block.py +++ b/packages/reflex-components-code/src/reflex_components_code/shiki_code_block.py @@ -550,11 +550,11 @@ class ShikiCodeBlock(Component, MarkdownComponentMap): language: Var[LiteralCodeLanguage] = field( default=Var.create("python"), doc="The language to use." - ) # ty:ignore[invalid-assignment] + ) theme: Var[LiteralCodeTheme] = field( default=Var.create("one-light"), doc='The theme to use ("light" or "dark").' - ) # ty:ignore[invalid-assignment] + ) themes: Var[list[dict[str, Any]] | dict[str, str]] = field( doc="The set of themes to use for different modes." @@ -565,11 +565,11 @@ class ShikiCodeBlock(Component, MarkdownComponentMap): transformers: Var[list[ShikiBaseTransformers | dict[str, Any]]] = field( default=Var.create([]), doc="The transformers to use for the syntax highlighter.", - ) # ty:ignore[invalid-assignment] + ) decorations: Var[list[ShikiDecorations]] = field( default=Var.create([]), doc="The decorations to use for the syntax highlighter." - ) # ty:ignore[invalid-assignment] + ) @classmethod def create( diff --git a/packages/reflex-components-core/src/reflex_components_core/base/meta.py b/packages/reflex-components-core/src/reflex_components_core/base/meta.py index bec7edefb5a..a5485c96b0d 100644 --- a/packages/reflex-components-core/src/reflex_components_core/base/meta.py +++ b/packages/reflex-components-core/src/reflex_components_core/base/meta.py @@ -36,7 +36,7 @@ class Description(elements.Meta): name: Var[str] = field( default=Var.create("description"), doc="The type of the description." - ) # ty:ignore[invalid-assignment] + ) class Image(elements.Meta): @@ -44,4 +44,4 @@ class Image(elements.Meta): property: Var[str] = field( default=Var.create("og:image"), doc="The type of the image." - ) # ty:ignore[invalid-assignment] + ) diff --git a/packages/reflex-components-radix/src/reflex_components_radix/primitives/accordion.py b/packages/reflex-components-radix/src/reflex_components_radix/primitives/accordion.py index ff102609d40..1ed80f88831 100644 --- a/packages/reflex-components-radix/src/reflex_components_radix/primitives/accordion.py +++ b/packages/reflex-components-radix/src/reflex_components_radix/primitives/accordion.py @@ -123,7 +123,7 @@ class AccordionRoot(AccordionComponent): easing: Var[str] = field( default=LiteralVar.create(DEFAULT_ANIMATION_EASING), doc="The easing function to use for the animation.", - ) # ty:ignore[invalid-assignment] + ) show_dividers: Var[bool] = field(doc="Whether to show divider lines between items.") @@ -203,7 +203,7 @@ class AccordionItem(AccordionComponent): content: Var[Component | str | None] = field( default=Var.create(None), doc="The content of the accordion item." - ) # ty:ignore[invalid-assignment] + ) _valid_children: ClassVar[list[str]] = [ "AccordionHeader", diff --git a/packages/reflex-components-radix/src/reflex_components_radix/themes/components/radio_group.py b/packages/reflex-components-radix/src/reflex_components_radix/themes/components/radio_group.py index 466cff67e8f..bbe96e1a2cb 100644 --- a/packages/reflex-components-radix/src/reflex_components_radix/themes/components/radio_group.py +++ b/packages/reflex-components-radix/src/reflex_components_radix/themes/components/radio_group.py @@ -33,11 +33,11 @@ class RadioGroupRoot(RadixThemesComponent): size: Var[Responsive[Literal["1", "2", "3"]]] = field( default=LiteralVar.create("2"), doc='The size of the radio group: "1" | "2" | "3"', - ) # ty:ignore[invalid-assignment] + ) variant: Var[Literal["classic", "surface", "soft"]] = field( default=LiteralVar.create("classic"), doc="The variant of the radio group" - ) # ty:ignore[invalid-assignment] + ) color_scheme: Var[LiteralAccentColor] = field(doc="The color of the radio group") @@ -94,20 +94,20 @@ class HighLevelRadioGroup(RadixThemesComponent): direction: Var[LiteralFlexDirection] = field( default=LiteralVar.create("row"), doc="The direction of the radio group." - ) # ty:ignore[invalid-assignment] + ) spacing: Var[LiteralSpacing] = field( default=LiteralVar.create("2"), doc="The gap between the items of the radio group.", - ) # ty:ignore[invalid-assignment] + ) size: Var[Literal["1", "2", "3"]] = field( default=LiteralVar.create("2"), doc="The size of the radio group." - ) # ty:ignore[invalid-assignment] + ) variant: Var[Literal["classic", "surface", "soft"]] = field( default=LiteralVar.create("classic"), doc="The variant of the radio group" - ) # ty:ignore[invalid-assignment] + ) color_scheme: Var[LiteralAccentColor] = field(doc="The color of the radio group") diff --git a/packages/reflex-components-radix/src/reflex_components_radix/themes/components/separator.py b/packages/reflex-components-radix/src/reflex_components_radix/themes/components/separator.py index 95a408d7f61..a3e0100c936 100644 --- a/packages/reflex-components-radix/src/reflex_components_radix/themes/components/separator.py +++ b/packages/reflex-components-radix/src/reflex_components_radix/themes/components/separator.py @@ -19,7 +19,7 @@ class Separator(RadixThemesComponent): size: Var[Responsive[LiteralSeparatorSize]] = field( default=LiteralVar.create("4"), doc='The size of the separator: "1" | "2" | "3" | "4"', - ) # ty:ignore[invalid-assignment] + ) color_scheme: Var[LiteralAccentColor] = field(doc="The color of the separator") diff --git a/packages/reflex-components-radix/src/reflex_components_radix/themes/components/slider.py b/packages/reflex-components-radix/src/reflex_components_radix/themes/components/slider.py index b8ac00c1639..e96690d0bc5 100644 --- a/packages/reflex-components-radix/src/reflex_components_radix/themes/components/slider.py +++ b/packages/reflex-components-radix/src/reflex_components_radix/themes/components/slider.py @@ -56,7 +56,7 @@ class Slider(RadixThemesComponent): width: Var[str | None] = field( default=Var.create("100%"), doc="The width of the slider." - ) # ty:ignore[invalid-assignment] + ) min: Var[float | int] = field(doc="The minimum value of the slider.") diff --git a/packages/reflex-components-radix/src/reflex_components_radix/themes/layout/container.py b/packages/reflex-components-radix/src/reflex_components_radix/themes/layout/container.py index 5e592318960..d9ef24a186b 100644 --- a/packages/reflex-components-radix/src/reflex_components_radix/themes/layout/container.py +++ b/packages/reflex-components-radix/src/reflex_components_radix/themes/layout/container.py @@ -26,7 +26,7 @@ class Container(elements.Div, RadixThemesComponent): size: Var[Responsive[LiteralContainerSize]] = field( default=LiteralVar.create("3"), doc='The size of the container: "1" - "4" (default "3")', - ) # ty:ignore[invalid-assignment] + ) @classmethod def create( diff --git a/packages/reflex-components-radix/src/reflex_components_radix/themes/layout/list.py b/packages/reflex-components-radix/src/reflex_components_radix/themes/layout/list.py index 77442afb3e6..d0e3925912e 100644 --- a/packages/reflex-components-radix/src/reflex_components_radix/themes/layout/list.py +++ b/packages/reflex-components-radix/src/reflex_components_radix/themes/layout/list.py @@ -48,11 +48,11 @@ class BaseList(BaseHTML, MarkdownComponentMap): LiteralListStyleTypeUnordered | LiteralListStyleTypeOrdered ] = field( default=Var.create("none"), doc='The style of the list. Default to "none".' - ) # ty:ignore[invalid-assignment] + ) items: Var[Iterable] = field( default=Var.create([]), doc="A list of items to add to the list." - ) # ty:ignore[invalid-assignment] + ) @classmethod def create( diff --git a/packages/reflex-components-radix/src/reflex_components_radix/themes/layout/section.py b/packages/reflex-components-radix/src/reflex_components_radix/themes/layout/section.py index 0d9dbdc3eb3..76a9838a293 100644 --- a/packages/reflex-components-radix/src/reflex_components_radix/themes/layout/section.py +++ b/packages/reflex-components-radix/src/reflex_components_radix/themes/layout/section.py @@ -22,7 +22,7 @@ class Section(elements.Section, RadixThemesComponent): size: Var[Responsive[LiteralSectionSize]] = field( default=LiteralVar.create("2"), doc='The size of the section: "1" - "3" (default "2")', - ) # ty:ignore[invalid-assignment] + ) section = Section.create diff --git a/packages/reflex-components-radix/src/reflex_components_radix/themes/layout/stack.py b/packages/reflex-components-radix/src/reflex_components_radix/themes/layout/stack.py index f83839b3580..6773f2563eb 100644 --- a/packages/reflex-components-radix/src/reflex_components_radix/themes/layout/stack.py +++ b/packages/reflex-components-radix/src/reflex_components_radix/themes/layout/stack.py @@ -16,11 +16,11 @@ class Stack(Flex): spacing: Var[Responsive[LiteralSpacing]] = field( default=Var.create("3"), doc="The spacing between each stack item." - ) # ty:ignore[invalid-assignment] + ) align: Var[Responsive[LiteralAlign]] = field( default=Var.create("start"), doc="The alignment of the stack items." - ) # ty:ignore[invalid-assignment] + ) @classmethod def create( @@ -54,7 +54,7 @@ class VStack(Stack): direction: Var[Responsive[LiteralFlexDirection]] = field( default=Var.create("column"), doc="The direction of the stack." - ) # ty:ignore[invalid-assignment] + ) class HStack(Stack): @@ -62,7 +62,7 @@ class HStack(Stack): direction: Var[Responsive[LiteralFlexDirection]] = field( default=Var.create("row"), doc="The direction of the stack." - ) # ty:ignore[invalid-assignment] + ) stack = Stack.create diff --git a/packages/reflex-components-radix/src/reflex_components_radix/themes/typography/text.py b/packages/reflex-components-radix/src/reflex_components_radix/themes/typography/text.py index 12e1559967a..ff0def78aaf 100644 --- a/packages/reflex-components-radix/src/reflex_components_radix/themes/typography/text.py +++ b/packages/reflex-components-radix/src/reflex_components_radix/themes/typography/text.py @@ -51,7 +51,7 @@ class Text(elements.Span, RadixThemesComponent, MarkdownComponentMap): as_: Var[LiteralType] = field( default=Var.create("p"), doc="Change the default rendered element into a semantically appropriate alternative (cannot be used with asChild)", - ) # ty:ignore[invalid-assignment] + ) size: Var[Responsive[LiteralTextSize]] = field(doc='Text size: "1" - "9"') diff --git a/packages/reflex-components-recharts/src/reflex_components_recharts/cartesian.py b/packages/reflex-components-recharts/src/reflex_components_recharts/cartesian.py index d5cbc5830f5..712623b4d51 100644 --- a/packages/reflex-components-recharts/src/reflex_components_recharts/cartesian.py +++ b/packages/reflex-components-recharts/src/reflex_components_recharts/cartesian.py @@ -121,7 +121,7 @@ class Axis(Recharts): stroke: Var[str | Color] = field( default=LiteralVar.create(Color("gray", 9)), doc='The stroke color of axis. Default: rx.color("gray", 9)', - ) # ty:ignore[invalid-assignment] + ) text_anchor: Var[LiteralTextAnchor] = field( doc='The text anchor of axis. Default: "middle"' @@ -216,7 +216,7 @@ class ZAxis(Recharts): range: Var[Sequence[int]] = field( default=LiteralVar.create([60, 400]), doc="The range of axis. Default: [60, 400]", - ) # ty:ignore[invalid-assignment] + ) unit: Var[str | int] = field( doc="The unit of data displayed in the axis. This option will be used to represent an index unit in a scatter chart." @@ -241,12 +241,12 @@ class Brush(Recharts): stroke: Var[str | Color] = field( default=LiteralVar.create(Color("gray", 9)), doc='Stroke color. Default: rx.color("gray", 9)', - ) # ty:ignore[invalid-assignment] + ) fill: Var[str | Color] = field( default=LiteralVar.create(Color("gray", 2)), doc='The fill color of brush. Default: rx.color("gray", 2)', - ) # ty:ignore[invalid-assignment] + ) data_key: Var[str | int] = field(doc="The key of data displayed in the axis.") @@ -390,7 +390,7 @@ class Area(Cartesian): stroke: Var[str | Color] = field( default=LiteralVar.create(Color("accent", 9)), doc='The color of the line stroke. Default: rx.color("accent", 9)', - ) # ty:ignore[invalid-assignment] + ) stroke_width: Var[str | int | float] = field( doc="The width of the line stroke. Default: 1" @@ -399,12 +399,12 @@ class Area(Cartesian): fill: Var[str | Color] = field( default=LiteralVar.create(Color("accent", 5)), doc='The color of the area fill. Default: rx.color("accent", 5)', - ) # ty:ignore[invalid-assignment] + ) type_: Var[LiteralCurveType] = field( default=LiteralVar.create("monotone"), doc="The interpolation type of area. And customized interpolation function can be set to type. 'basis' | 'basisClosed' | 'basisOpen' | 'bumpX' | 'bumpY' | 'bump' | 'linear' | 'linearClosed' | 'natural' | 'monotoneX' | 'monotoneY' | 'monotone' | 'step' | 'stepBefore' | 'stepAfter'. Default: \"monotone\"", - ) # ty:ignore[invalid-assignment] + ) dot: Var[ACTIVE_DOT_TYPE] = field( doc="If false set, dots will not be drawn. If true set, dots will be drawn which have the props calculated internally. Default: False" @@ -452,7 +452,7 @@ class Bar(Cartesian): fill: Var[str | Color] = field( default=LiteralVar.create(Color("accent", 9)), doc='The width of the line stroke. Default: Color("accent", 9)', - ) # ty:ignore[invalid-assignment] + ) background: Var[bool] = field( doc="If false set, background of bars will not be drawn. If true set, background of bars will be drawn which have the props calculated internally. Default: False" @@ -505,7 +505,7 @@ class Line(Cartesian): stroke: Var[str | Color] = field( default=LiteralVar.create(Color("accent", 9)), doc='The color of the line stroke. Default: rx.color("accent", 9)', - ) # ty:ignore[invalid-assignment] + ) stroke_width: Var[str | int | float] = field( doc="The width of the line stroke. Default: 1" @@ -597,7 +597,7 @@ class Scatter(Recharts): fill: Var[str | Color] = field( default=LiteralVar.create(Color("accent", 9)), doc='The fill color of the scatter. Default: rx.color("accent", 9)', - ) # ty:ignore[invalid-assignment] + ) # Valid children components. _valid_children: ClassVar[list[str]] = ["LabelList", "ErrorBar"] @@ -691,7 +691,7 @@ class Funnel(Recharts): stroke: Var[str | Color] = field( default=LiteralVar.create(Color("gray", 3)), doc='Stroke color. Default: rx.color("gray", 3)', - ) # ty:ignore[invalid-assignment] + ) trapezoids: Var[Sequence[dict[str, Any]]] = field( doc="The coordinates of all the trapezoids in the funnel, usually calculated internally." @@ -761,7 +761,7 @@ class ErrorBar(Recharts): stroke: Var[str | Color] = field( default=LiteralVar.create(Color("gray", 8)), doc='The stroke color of error bar. Default: rx.color("gray", 8)', - ) # ty:ignore[invalid-assignment] + ) stroke_width: Var[str | int | float] = field( doc="The stroke width of error bar. Default: 1.5" @@ -972,7 +972,7 @@ class CartesianGrid(Grid): stroke: Var[str | Color] = field( default=LiteralVar.create(Color("gray", 7)), doc='the stroke color of grid. Default: rx.color("gray", 7)', - ) # ty:ignore[invalid-assignment] + ) class CartesianAxis(Grid): diff --git a/packages/reflex-components-recharts/src/reflex_components_recharts/general.py b/packages/reflex-components-recharts/src/reflex_components_recharts/general.py index ec118b091a3..d3dcaa97926 100644 --- a/packages/reflex-components-recharts/src/reflex_components_recharts/general.py +++ b/packages/reflex-components-recharts/src/reflex_components_recharts/general.py @@ -184,7 +184,7 @@ class GraphingTooltip(Recharts): "color": Color("gray", 12), }), doc='The style of default tooltip content item which is a li element. Default: {"color": rx.color("gray", 12)}', - ) # ty:ignore[invalid-assignment] + ) wrapper_style: Var[dict[str, Any]] = field( doc="The style of tooltip wrapper which is a dom element. Default: {}" @@ -197,12 +197,12 @@ class GraphingTooltip(Recharts): "borderRadius": "8px", }), doc='The style of tooltip content which is a dom element. Default: {"background": rx.color("gray", 1), "borderColor": rx.color("gray", 4), "borderRadius": "8px"}', - ) # ty:ignore[invalid-assignment] + ) label_style: Var[dict[str, Any]] = field( default=LiteralVar.create({"color": Color("gray", 11)}), doc='The style of default tooltip label which is a p element. Default: {"color": rx.color("gray", 11)}', - ) # ty:ignore[invalid-assignment] + ) allow_escape_view_box: Var[dict[str, bool]] = field( doc='This option allows the tooltip to extend beyond the viewBox of the chart itself. Default: {"x": False, "y": False}' @@ -275,12 +275,12 @@ class LabelList(Recharts): fill: Var[str | Color] = field( default=LiteralVar.create(Color("gray", 10)), doc='The fill color of each label. Default: rx.color("gray", 10)', - ) # ty:ignore[invalid-assignment] + ) stroke: Var[str | Color] = field( default=LiteralVar.create("none"), doc='The stroke color of each label. Default: "none"', - ) # ty:ignore[invalid-assignment] + ) class Cell(Recharts): diff --git a/packages/reflex-components-recharts/src/reflex_components_recharts/polar.py b/packages/reflex-components-recharts/src/reflex_components_recharts/polar.py index 6f5a9a355d0..d83d7e9a4f9 100644 --- a/packages/reflex-components-recharts/src/reflex_components_recharts/polar.py +++ b/packages/reflex-components-recharts/src/reflex_components_recharts/polar.py @@ -83,12 +83,12 @@ class Pie(Recharts): stroke: Var[str | Color] = field( default=LiteralVar.create(Color("accent", 9)), doc='Stoke color. Default: rx.color("accent", 9)', - ) # ty:ignore[invalid-assignment] + ) fill: Var[str | Color] = field( default=LiteralVar.create(Color("accent", 3)), doc='Fill color. Default: rx.color("accent", 3)', - ) # ty:ignore[invalid-assignment] + ) is_animation_active: Var[bool] = field( doc="If set false, animation of tooltip will be disabled. Default: true in CSR, and false in SSR" @@ -151,12 +151,12 @@ class Radar(Recharts): stroke: Var[str | Color] = field( default=LiteralVar.create(Color("accent", 9)), doc='Stoke color. Default: rx.color("accent", 9)', - ) # ty:ignore[invalid-assignment] + ) fill: Var[str | Color] = field( default=LiteralVar.create(Color("accent", 3)), doc='Fill color. Default: rx.color("accent", 3)', - ) # ty:ignore[invalid-assignment] + ) fill_opacity: Var[float] = field( default=LiteralVar.create(0.6), @@ -321,7 +321,7 @@ class PolarAngleAxis(Recharts): stroke: Var[str | Color] = field( default=LiteralVar.create(Color("gray", 10)), doc='The stroke color of axis. Default: rx.color("gray", 10)', - ) # ty:ignore[invalid-assignment] + ) allow_duplicated_category: Var[bool] = field( doc='Allow the axis has duplicated categorys or not when the type of axis is "category". Default: True' @@ -393,7 +393,7 @@ class PolarGrid(Recharts): stroke: Var[str | Color] = field( default=LiteralVar.create(Color("gray", 10)), doc='The stroke color of grid. Default: rx.color("gray", 10)', - ) # ty:ignore[invalid-assignment] + ) # Valid children components _valid_children: ClassVar[list[str]] = ["RadarChart", "RadiarBarChart"] @@ -456,7 +456,7 @@ class PolarRadiusAxis(Recharts): stroke: Var[str | Color] = field( default=LiteralVar.create(Color("gray", 10)), doc='The stroke color of axis. Default: rx.color("gray", 10)', - ) # ty:ignore[invalid-assignment] + ) @classmethod def get_event_triggers(cls) -> dict[str, Var | Any]: diff --git a/packages/reflex-components-sonner/src/reflex_components_sonner/toast.py b/packages/reflex-components-sonner/src/reflex_components_sonner/toast.py index 2e996934618..707fcb49dac 100644 --- a/packages/reflex-components-sonner/src/reflex_components_sonner/toast.py +++ b/packages/reflex-components-sonner/src/reflex_components_sonner/toast.py @@ -191,7 +191,7 @@ class Toaster(Component): position: Var[LiteralPosition] = field( default=LiteralVar.create("bottom-right"), doc="the position of the toast" - ) # ty:ignore[invalid-assignment] + ) close_button: Var[bool] = field( default=LiteralVar.create(False), doc="whether to show the close button" diff --git a/tests/units/reflex_base/utils/pyi_generator/dataset/simple_component.py b/tests/units/reflex_base/utils/pyi_generator/dataset/simple_component.py index 6ff58ad4d6b..4f18d8e6740 100644 --- a/tests/units/reflex_base/utils/pyi_generator/dataset/simple_component.py +++ b/tests/units/reflex_base/utils/pyi_generator/dataset/simple_component.py @@ -40,7 +40,7 @@ class SimpleComponent(Component): label: Var[str] = field( default=Var.create("default"), doc="An optional label with a default value.", - ) # ty:ignore[invalid-assignment] + ) description: Var[str] """A detailed description of the component.""" From 6f36c66d1f37f45be643773a5020971e80410a3f Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Tue, 28 Apr 2026 23:24:20 +0200 Subject: [PATCH 06/57] fix type confusion --- .../src/reflex_base/components/component.py | 5 ++--- .../src/reflex_base/event/__init__.py | 18 +++++++++--------- packages/reflex-base/src/reflex_base/style.py | 2 +- .../reflex-base/src/reflex_base/vars/base.py | 5 +++-- .../src/reflex_components_core/core/upload.py | 4 ++-- .../utils/twmerge.py | 2 +- .../react_player.py | 2 +- .../src/reflex_components_sonner/toast.py | 6 +++--- reflex/experimental/client_state.py | 8 ++++---- tests/integration/test_var_operations.py | 10 +++++----- tests/units/experimental/test_memo.py | 2 +- tests/units/test_event.py | 2 +- tests/units/test_var.py | 4 ++-- tests/units/vars/test_object.py | 2 +- 14 files changed, 36 insertions(+), 36 deletions(-) diff --git a/packages/reflex-base/src/reflex_base/components/component.py b/packages/reflex-base/src/reflex_base/components/component.py index 5d2851a1bc5..a8d19f9f688 100644 --- a/packages/reflex-base/src/reflex_base/components/component.py +++ b/packages/reflex-base/src/reflex_base/components/component.py @@ -2157,7 +2157,7 @@ def _get_event_spec_from_args_spec(name: str, event: EventChain) -> Callable: """ def fn(*args): - return run_script(Var(name).to(FunctionVar).call(*args)) # ty:ignore[unresolved-attribute] + return run_script(Var(name).to(FunctionVar).call(*args)) if event.args_spec: arg_spec = ( @@ -2886,8 +2886,7 @@ def render_dict_to_var(tag: dict[str, Any] | Component | str) -> Var: if "iterable" in tag: function_return = LiteralArrayVar.create([ - render_dict_to_var(child.render()) - for child in tag["children"] # ty:ignore[invalid-argument-type, not-iterable] + render_dict_to_var(child.render()) for child in tag["children"] # ty:ignore[invalid-argument-type, not-iterable] ]) func = ArgsFunctionOperation.create( diff --git a/packages/reflex-base/src/reflex_base/event/__init__.py b/packages/reflex-base/src/reflex_base/event/__init__.py index 7050fa42fe2..9d44a7f13b3 100644 --- a/packages/reflex-base/src/reflex_base/event/__init__.py +++ b/packages/reflex-base/src/reflex_base/event/__init__.py @@ -786,7 +786,7 @@ def int_input_event(e: ObjectVar[JavascriptInputEvent]) -> tuple[Var[int]]: Returns: The value from the input event as an int. """ - return (Var("Number").to(FunctionVar).call(e.target.value).to(int),) # ty:ignore[unresolved-attribute] + return (Var("Number").to(FunctionVar).call(e.target.value).to(int),) def float_input_event(e: ObjectVar[JavascriptInputEvent]) -> tuple[Var[float]]: @@ -798,7 +798,7 @@ def float_input_event(e: ObjectVar[JavascriptInputEvent]) -> tuple[Var[float]]: Returns: The value from the input event as a float. """ - return (Var("Number").to(FunctionVar).call(e.target.value).to(float),) # ty:ignore[unresolved-attribute] + return (Var("Number").to(FunctionVar).call(e.target.value).to(float),) def checked_input_event(e: ObjectVar[JavascriptInputEvent]) -> tuple[Var[bool]]: @@ -864,7 +864,7 @@ def key_event( "shift_key": e.shiftKey, }, ).to(KeyInputInfo), - ) # ty:ignore[invalid-return-type] + ) @dataclasses.dataclass( @@ -932,7 +932,7 @@ def pointer_event_spec( "shift_key": e.shiftKey, }, ).to(PointerEventInfo), - ) # ty:ignore[invalid-return-type] + ) def no_args_event_spec() -> tuple[()]: @@ -1063,7 +1063,7 @@ def _as_event_spec( _js_expr="filesById", _var_type=dict[str, Any], _var_data=VarData.merge(upload_files_context_var_data), - ).to(ObjectVar)[LiteralVar.create(upload_id)] # ty:ignore[not-subscriptable] + ).to(ObjectVar)[LiteralVar.create(upload_id)] spec_args = [ ( Var(_js_expr="files"), @@ -1271,7 +1271,7 @@ def console_log(message: str | Var[str]) -> EventSpec: Returns: An event to log the message. """ - return run_script(Var("console").to(dict).log.to(FunctionVar).call(message)) # ty:ignore[unresolved-attribute] + return run_script(Var("console").to(dict).log.to(FunctionVar).call(message)) @once @@ -1291,7 +1291,7 @@ def back() -> EventSpec: An event to go back one page. """ return run_script( - Var("window").to(dict).history.to(dict).back.to(FunctionVar).call() # ty:ignore[unresolved-attribute] + Var("window").to(dict).history.to(dict).back.to(FunctionVar).call() ) @@ -1304,7 +1304,7 @@ def window_alert(message: str | Var[str]) -> EventSpec: Returns: An event to alert the message. """ - return run_script(Var("window").to(dict).alert.to(FunctionVar).call(message)) # ty:ignore[unresolved-attribute] + return run_script(Var("window").to(dict).alert.to(FunctionVar).call(message)) def set_focus(ref: str) -> EventSpec: @@ -1466,7 +1466,7 @@ def set_clipboard(content: str | Var[str]) -> EventSpec: return run_script( Var("navigator") .to(dict) - .clipboard.to(dict) # ty:ignore[unresolved-attribute] + .clipboard.to(dict) .writeText.to(FunctionVar) .call(content) ) diff --git a/packages/reflex-base/src/reflex_base/style.py b/packages/reflex-base/src/reflex_base/style.py index c2ac51a28d0..0094e553cb8 100644 --- a/packages/reflex-base/src/reflex_base/style.py +++ b/packages/reflex-base/src/reflex_base/style.py @@ -68,7 +68,7 @@ def set_color_mode( ).to(FunctionVar) return run_script( - base_setter.call(new_color_mode), # ty:ignore[unresolved-attribute] + base_setter.call(new_color_mode), ) diff --git a/packages/reflex-base/src/reflex_base/vars/base.py b/packages/reflex-base/src/reflex_base/vars/base.py index 8a367599e9e..ee5550cb790 100644 --- a/packages/reflex-base/src/reflex_base/vars/base.py +++ b/packages/reflex-base/src/reflex_base/vars/base.py @@ -2,6 +2,7 @@ from __future__ import annotations +import builtins import contextlib import copy import dataclasses @@ -737,7 +738,7 @@ def __format__(self, format_spec: str) -> str: def to(self, output: type[str]) -> StringVar: ... @overload - def to(self, output: type[bool]) -> BooleanVar: ... # ty:ignore[invalid-type-form] + def to(self, output: type[builtins.bool]) -> BooleanVar: ... @overload def to(self, output: type[int]) -> NumberVar[int]: ... @@ -1124,7 +1125,7 @@ def to_string(self, use_json: bool = True) -> StringVar: # ty:ignore[invalid-ty return ( JSON_STRINGIFY.call(self).to(StringVar) if use_json - else PROTOTYPE_TO_STRING.call(self).to(StringVar) # ty:ignore[invalid-return-type] + else PROTOTYPE_TO_STRING.call(self).to(StringVar) ) def _as_ref(self) -> Var: diff --git a/packages/reflex-components-core/src/reflex_components_core/core/upload.py b/packages/reflex-components-core/src/reflex_components_core/core/upload.py index 4d2b59a2d16..d7829233973 100644 --- a/packages/reflex-components-core/src/reflex_components_core/core/upload.py +++ b/packages/reflex-components-core/src/reflex_components_core/core/upload.py @@ -118,7 +118,7 @@ def clear_selected_files(id_: str = DEFAULT_UPLOAD_ID) -> EventSpec: # UploadFilesProvider assigns a special function to clear selected files # into the shared global refs object to make it accessible outside a React # component via `run_script` (otherwise backend could never clear files). - return run_script(Var("__clear_selected_files")._as_ref().to(FunctionVar).call(id_)) # ty:ignore[unresolved-attribute] + return run_script(Var("__clear_selected_files")._as_ref().to(FunctionVar).call(id_)) def cancel_upload(upload_id: str) -> EventSpec: @@ -201,7 +201,7 @@ def _format_rejected_file_record(rf: ObjectVar[dict[str, Any]]) -> str: title="Files not Accepted", description=rejected_files .to(ArrayVar) - .foreach(_format_rejected_file_record) # ty:ignore[unresolved-attribute] + .foreach(_format_rejected_file_record) .join("\n\n"), close_button=True, style={"white_space": "pre-line"}, diff --git a/packages/reflex-components-internal/src/reflex_components_internal/utils/twmerge.py b/packages/reflex-components-internal/src/reflex_components_internal/utils/twmerge.py index 470f2fbd01e..d737a62ef5f 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/utils/twmerge.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/utils/twmerge.py @@ -22,4 +22,4 @@ def cn( Var: A Var representing the merged classes string. """ - return CN.call(*classes).to(str) # ty:ignore[unresolved-attribute] + return CN.call(*classes).to(str) diff --git a/packages/reflex-components-react-player/src/reflex_components_react_player/react_player.py b/packages/reflex-components-react-player/src/reflex_components_react_player/react_player.py index 6ce142ab21e..77a4cdea940 100644 --- a/packages/reflex-components-react-player/src/reflex_components_react_player/react_player.py +++ b/packages/reflex-components-react-player/src/reflex_components_react_player/react_player.py @@ -56,7 +56,7 @@ def _on_progress_signature(event: ReactPlayerEvent) -> list[Var[Progress]]: "duration": 0.0, }, ).to(Progress) - ] # ty:ignore[invalid-return-type] + ] def _player_info_key_or_zero(event: ReactPlayerEvent, key: str) -> Var[float]: diff --git a/packages/reflex-components-sonner/src/reflex_components_sonner/toast.py b/packages/reflex-components-sonner/src/reflex_components_sonner/toast.py index 707fcb49dac..9d80b10d4e6 100644 --- a/packages/reflex-components-sonner/src/reflex_components_sonner/toast.py +++ b/packages/reflex-components-sonner/src/reflex_components_sonner/toast.py @@ -260,7 +260,7 @@ def send_toast( ValueError: If the Toaster component is not created. """ toast_command = ( - ObjectVar.__getattr__(toast_ref.to(dict), level) if level else toast_ref # ty:ignore[no-matching-overload] + ObjectVar.__getattr__(toast_ref.to(dict), level) if level else toast_ref ).to(FunctionVar) if isinstance(message, Var): @@ -272,9 +272,9 @@ def send_toast( if props: args = LiteralVar.create(ToastProps(component_name="rx.toast", **props)) # ty:ignore[unknown-argument] - toast = toast_command.call(message, args) # ty:ignore[unresolved-attribute] + toast = toast_command.call(message, args) else: - toast = toast_command.call(message) # ty:ignore[unresolved-attribute] + toast = toast_command.call(message) if fallback_to_alert: toast = ternary_operation( diff --git a/reflex/experimental/client_state.py b/reflex/experimental/client_state.py index e937058a43f..95fdbf06885 100644 --- a/reflex/experimental/client_state.py +++ b/reflex/experimental/client_state.py @@ -136,11 +136,11 @@ def create( args_names=(arg_name,), return_expr=Var("Array.prototype.forEach.call") .to(FunctionVar) - .call( # ty:ignore[unresolved-attribute] + .call( ( Var("Object.values") .to(FunctionVar) - .call(Var(_client_state_ref_dict(setter_name))) # ty:ignore[unresolved-attribute] + .call(Var(_client_state_ref_dict(setter_name))) .to(list) .to(list) ) @@ -149,7 +149,7 @@ def create( ]).to(list), ArgsFunctionOperationBuilder.create( args_names=("setter",), - return_expr=Var("setter").to(FunctionVar).call(Var(arg_name)), # ty:ignore[unresolved-attribute] + return_expr=Var("setter").to(FunctionVar).call(Var(arg_name)), ), ), ) @@ -238,7 +238,7 @@ def set_value(self, value: Any = NoValue) -> Var: args_names=(re.sub(r"(\?\.)?\[\".*\"\]", "", value_str),) if value_str.startswith("_") else (), - return_expr=setter.call(value_var), # ty:ignore[unresolved-attribute] + return_expr=setter.call(value_var), ) return setter.to(FunctionVar, EventChain) diff --git a/tests/integration/test_var_operations.py b/tests/integration/test_var_operations.py index 1bd353d0ce2..26f80b23c95 100644 --- a/tests/integration/test_var_operations.py +++ b/tests/integration/test_var_operations.py @@ -581,23 +581,23 @@ def index(): rx.box( # Test that foreach works with various non-array inputs without throwing rx.foreach( - rx.Var("undefined").to(list), # ty:ignore[invalid-argument-type] + rx.Var("undefined").to(list), rx.text.span, ), rx.foreach( - rx.Var("null").to(list), # ty:ignore[invalid-argument-type] + rx.Var("null").to(list), rx.text.span, ), rx.foreach( - rx.Var("({})").to(list), # ty:ignore[invalid-argument-type] + rx.Var("({})").to(list), rx.text.span, ), rx.foreach( - rx.Var("2").to(list), # ty:ignore[invalid-argument-type] + rx.Var("2").to(list), rx.text.span, ), rx.foreach( - rx.Var("false").to(list), # ty:ignore[invalid-argument-type] + rx.Var("false").to(list), rx.text.span, ), ), diff --git a/tests/units/experimental/test_memo.py b/tests/units/experimental/test_memo.py index bce64382bb1..673513b69de 100644 --- a/tests/units/experimental/test_memo.py +++ b/tests/units/experimental/test_memo.py @@ -141,7 +141,7 @@ def merge_styles( base: rx.Var[dict[str, str]], overrides: rx.RestProp, ) -> rx.Var[Any]: - return base.to(dict).merge(overrides) # ty:ignore[unresolved-attribute] + return base.to(dict).merge(overrides) base = Var(_js_expr="base", _var_type=dict[str, str]) merged = merge_styles(base=base, color="red", class_name="primary") diff --git a/tests/units/test_event.py b/tests/units/test_event.py index 34c7ebcc917..10c3ab5c7cb 100644 --- a/tests/units/test_event.py +++ b/tests/units/test_event.py @@ -38,7 +38,7 @@ def make_var(value) -> Var: def make_timeout_logger() -> EventChainVar: return rx.vars.FunctionStringVar.create( "(...args) => { setTimeout(() => console.log('Timeout reached!', args), 1000); }" - ).to(EventChain) # ty:ignore[invalid-return-type] + ).to(EventChain) def test_create_event(): diff --git a/tests/units/test_var.py b/tests/units/test_var.py index 4d0d915dc53..c31fca099c1 100644 --- a/tests/units/test_var.py +++ b/tests/units/test_var.py @@ -358,10 +358,10 @@ def test_basic_operations(TestObj): == '["1", "2", "3"].slice().reverse()' ) assert ( - str(Var(_js_expr="foo")._var_set_state("state").to(list).reverse()) # ty:ignore[unresolved-attribute] + str(Var(_js_expr="foo")._var_set_state("state").to(list).reverse()) == "state.foo.slice().reverse()" ) - assert str(Var(_js_expr="foo").to(list).reverse()) == "foo.slice().reverse()" # ty:ignore[unresolved-attribute] + assert str(Var(_js_expr="foo").to(list).reverse()) == "foo.slice().reverse()" assert str(Var(_js_expr="foo", _var_type=str).js_type()) == "(typeof(foo))" diff --git a/tests/units/vars/test_object.py b/tests/units/vars/test_object.py index 5545604dec9..b61cb4eff9d 100644 --- a/tests/units/vars/test_object.py +++ b/tests/units/vars/test_object.py @@ -133,7 +133,7 @@ def test_state_to_operation(type_: GenericType) -> None: def test_typing() -> None: # Bare var = ObjectState.bare.to(ObjectVar) - _ = assert_type(var, ObjectVar[Bare]) # ty:ignore[type-assertion-failure] + _ = assert_type(var, ObjectVar[Bare]) # Base var = ObjectState.base From d16d0575c90e0ba2149d768af8d3ae7ae8fb0a30 Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Tue, 28 Apr 2026 23:36:33 +0200 Subject: [PATCH 07/57] fix some more type ignores --- .../src/reflex_base/components/component.py | 3 ++- .../src/reflex_base/components/props.py | 3 ++- .../src/reflex_base/event/__init__.py | 4 ++-- .../src/reflex_base/utils/pyi_generator.py | 3 ++- .../reflex-base/src/reflex_base/vars/base.py | 14 +++++++------- .../src/reflex_components_core/core/foreach.py | 6 +++--- .../src/reflex_components_core/core/upload.py | 2 +- .../reflex_components_internal/blocks/plain.py | 18 +++++++++--------- .../components/base/scroll_area.py | 4 ++-- .../components/base/select.py | 2 +- .../primitives/accordion.py | 4 ++-- .../themes/components/checkbox.py | 2 +- .../themes/typography/text.py | 2 +- .../src/reflex_components_sonner/toast.py | 3 ++- pyi_hashes.json | 2 +- tests/units/components/core/test_cond.py | 8 ++++---- tests/units/components/core/test_upload.py | 2 +- .../units/components/radix/test_icon_button.py | 2 +- tests/units/components/test_component.py | 10 +++++----- tests/units/experimental/test_memo.py | 10 +++++----- 20 files changed, 54 insertions(+), 50 deletions(-) diff --git a/packages/reflex-base/src/reflex_base/components/component.py b/packages/reflex-base/src/reflex_base/components/component.py index a8d19f9f688..6f8757665c2 100644 --- a/packages/reflex-base/src/reflex_base/components/component.py +++ b/packages/reflex-base/src/reflex_base/components/component.py @@ -2886,7 +2886,8 @@ def render_dict_to_var(tag: dict[str, Any] | Component | str) -> Var: if "iterable" in tag: function_return = LiteralArrayVar.create([ - render_dict_to_var(child.render()) for child in tag["children"] # ty:ignore[invalid-argument-type, not-iterable] + render_dict_to_var(child.render()) + for child in tag["children"] # ty:ignore[invalid-argument-type, not-iterable] ]) func = ArgsFunctionOperation.create( diff --git a/packages/reflex-base/src/reflex_base/components/props.py b/packages/reflex-base/src/reflex_base/components/props.py index d2646cac295..96371d90fbf 100644 --- a/packages/reflex-base/src/reflex_base/components/props.py +++ b/packages/reflex-base/src/reflex_base/components/props.py @@ -2,6 +2,7 @@ from __future__ import annotations +import builtins from collections.abc import Callable from dataclasses import _MISSING_TYPE, MISSING from typing import Any, TypeVar, get_args, get_origin @@ -283,7 +284,7 @@ def __init__(self, **kwargs): ) @classmethod - def get_fields(cls) -> dict[str, Any]: # ty:ignore[invalid-type-form] + def get_fields(cls) -> builtins.dict[str, Any]: """Get the fields of the object. Returns: diff --git a/packages/reflex-base/src/reflex_base/event/__init__.py b/packages/reflex-base/src/reflex_base/event/__init__.py index 9d44a7f13b3..994707a4b36 100644 --- a/packages/reflex-base/src/reflex_base/event/__init__.py +++ b/packages/reflex-base/src/reflex_base/event/__init__.py @@ -1580,8 +1580,8 @@ def call_script( javascript_code, original_code = ( LiteralVar.create(javascript_code), javascript_code, - ) # ty:ignore[invalid-assignment] - if not javascript_code._get_all_var_data(): # ty:ignore[unresolved-attribute] + ) + if not javascript_code._get_all_var_data(): # Without VarData, cast to string and eval the code in the event loop. javascript_code = str(Var(_js_expr=original_code)) diff --git a/packages/reflex-base/src/reflex_base/utils/pyi_generator.py b/packages/reflex-base/src/reflex_base/utils/pyi_generator.py index 63ccf75fe86..5d36f433ced 100644 --- a/packages/reflex-base/src/reflex_base/utils/pyi_generator.py +++ b/packages/reflex-base/src/reflex_base/utils/pyi_generator.py @@ -682,7 +682,8 @@ def _get_visible_type_name( type_name = getattr(typ, "__name__", None) if type_name is not None and ( - type_hint_globals.get(type_name) is typ + type_module in ("builtins", "__builtins__") + or type_hint_globals.get(type_name) is typ or type_name in DEFAULT_IMPORTS.get(str(type_module), set()) or type_name in EXCLUDED_IMPORTS.get(str(type_module), set()) ): diff --git a/packages/reflex-base/src/reflex_base/vars/base.py b/packages/reflex-base/src/reflex_base/vars/base.py index ee5550cb790..a22aed7096e 100644 --- a/packages/reflex-base/src/reflex_base/vars/base.py +++ b/packages/reflex-base/src/reflex_base/vars/base.py @@ -411,7 +411,7 @@ def __str__(self) -> str: return self._js_expr @property - def _var_is_local(self) -> bool: # ty:ignore[invalid-type-form] + def _var_is_local(self) -> builtins.bool: """Whether this is a local javascript variable. Returns: @@ -420,7 +420,7 @@ def _var_is_local(self) -> bool: # ty:ignore[invalid-type-form] return False @property - def _var_is_string(self) -> bool: # ty:ignore[invalid-type-form] + def _var_is_string(self) -> builtins.bool: """Whether the var is a string literal. Returns: @@ -526,7 +526,7 @@ def __deepcopy__(self, memo: dict[int, Any]) -> Self: """ return self - def equals(self, other: Var) -> bool: # ty:ignore[invalid-type-form] + def equals(self, other: Var) -> builtins.bool: """Check if two vars are equal. Args: @@ -613,7 +613,7 @@ def create( @classmethod def create( cls, - value: bool, # ty:ignore[invalid-type-form] + value: builtins.bool, _var_data: VarData | None = None, ) -> LiteralBooleanVar: ... @@ -716,7 +716,7 @@ def create( if isinstance(value, Var): return value # ty:ignore[invalid-return-type] - return LiteralVar.create(value, _var_data=_var_data) # ty:ignore[invalid-return-type] + return LiteralVar.create(value, _var_data=_var_data) def __format__(self, format_spec: str) -> str: """Format the var into a Javascript equivalent to an f-string. @@ -848,7 +848,7 @@ def guess_type(self: Var[NoReturn]) -> Var[Any]: ... def guess_type(self: Var[str]) -> StringVar: ... @overload - def guess_type(self: Var[bool]) -> BooleanVar: ... # ty:ignore[invalid-type-form] + def guess_type(self: Var[builtins.bool]) -> BooleanVar: ... @overload def guess_type(self: Var[int] | Var[float] | Var[int | float]) -> NumberVar: ... @@ -1110,7 +1110,7 @@ def __invert__(self) -> BooleanVar: """ return ~self.bool() - def to_string(self, use_json: bool = True) -> StringVar: # ty:ignore[invalid-type-form] + def to_string(self, use_json: builtins.bool = True) -> StringVar: """Convert the var to a string. Args: diff --git a/packages/reflex-components-core/src/reflex_components_core/core/foreach.py b/packages/reflex-components-core/src/reflex_components_core/core/foreach.py index 85d8136d1f5..891ac6c124c 100644 --- a/packages/reflex-components-core/src/reflex_components_core/core/foreach.py +++ b/packages/reflex-components-core/src/reflex_components_core/core/foreach.py @@ -72,9 +72,9 @@ def create( LiteralVar.create(iterable).guess_type() if not isinstance(iterable, Var) else iterable.guess_type() - ) # ty:ignore[invalid-assignment] + ) - if iterable._var_type == Any: # ty:ignore[unresolved-attribute] + if iterable._var_type == Any: msg = ( f"Could not foreach over var `{iterable!s}` of type Any. " "(If you are trying to foreach over a state var, add a type annotation to the var). " @@ -97,7 +97,7 @@ def create( if not isinstance(iterable, ArrayVar): msg = ( - f"Could not foreach over var `{iterable!s}` of type {iterable._var_type}. " # ty:ignore[unresolved-attribute] + f"Could not foreach over var `{iterable!s}` of type {iterable._var_type}. " "See https://reflex.dev/docs/library/dynamic-rendering/foreach/" ) raise ForeachVarError(msg) diff --git a/packages/reflex-components-core/src/reflex_components_core/core/upload.py b/packages/reflex-components-core/src/reflex_components_core/core/upload.py index d7829233973..642ef851749 100644 --- a/packages/reflex-components-core/src/reflex_components_core/core/upload.py +++ b/packages/reflex-components-core/src/reflex_components_core/core/upload.py @@ -169,7 +169,7 @@ def get_upload_url(file_path: str | Var[str]) -> Var[str]: """ Upload.is_used = True - return Var.create(f"{uploaded_files_url_prefix}/{file_path}") # ty:ignore[invalid-return-type] + return Var.create(f"{uploaded_files_url_prefix}/{file_path}") _on_drop_spec = passthrough_event_spec(list[UploadFile]) diff --git a/packages/reflex-components-internal/src/reflex_components_internal/blocks/plain.py b/packages/reflex-components-internal/src/reflex_components_internal/blocks/plain.py index 5a66c892fdf..c0e6134ff27 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/blocks/plain.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/blocks/plain.py @@ -18,27 +18,27 @@ class PlainChat(rx.Component): tag = "PlainChat" - full_name: rx.Var[str] = rx.Var.create("User") # ty:ignore[invalid-assignment] - short_name: rx.Var[str] = rx.Var.create("User") # ty:ignore[invalid-assignment] - chat_avatar_url: rx.Var[str] = rx.Var.create("") # ty:ignore[invalid-assignment] - external_id: rx.Var[str] = rx.Var.create("") # ty:ignore[invalid-assignment] + full_name: rx.Var[str] = rx.Var.create("User") + short_name: rx.Var[str] = rx.Var.create("User") + chat_avatar_url: rx.Var[str] = rx.Var.create("") + external_id: rx.Var[str] = rx.Var.create("") hide_launcher: rx.Var[bool] = rx.Var.create(True) # Optional email authentication - email: rx.Var[str] = rx.Var.create("") # ty:ignore[invalid-assignment] - email_hash: rx.Var[str] = rx.Var.create("") # ty:ignore[invalid-assignment] + email: rx.Var[str] = rx.Var.create("") + email_hash: rx.Var[str] = rx.Var.create("") # Optional built-in email verification require_authentication: rx.Var[bool] = rx.Var.create(False) # Optional tier ID for thread details - tier_id: rx.Var[str] = rx.Var.create("") # ty:ignore[invalid-assignment] + tier_id: rx.Var[str] = rx.Var.create("") # Entry point options # Type is either 'default' or 'chat'. 'default' opens intro screen, 'chat' opens straight into chat - entry_point_type: rx.Var[str] = rx.Var.create("") # ty:ignore[invalid-assignment] + entry_point_type: rx.Var[str] = rx.Var.create("") # The external ID of which chat to open. If not provided it defaults to the last conversation - entry_point_external_id: rx.Var[str] = rx.Var.create("") # ty:ignore[invalid-assignment] + entry_point_external_id: rx.Var[str] = rx.Var.create("") # Prevents the user from going back to the intro screen to start a new chat single_chat_mode: rx.Var[bool] = rx.Var.create(False) diff --git a/packages/reflex-components-internal/src/reflex_components_internal/components/base/scroll_area.py b/packages/reflex-components-internal/src/reflex_components_internal/components/base/scroll_area.py index 48baaccb8a4..00069d8664d 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/components/base/scroll_area.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/components/base/scroll_area.py @@ -103,7 +103,7 @@ class ScrollAreaScrollbar(ScrollAreaBaseComponent): tag = "ScrollArea.Scrollbar" # Orientation of the scrollbar - orientation: Var[LiteralOrientation] = Var.create("vertical") # ty:ignore[invalid-assignment] + orientation: Var[LiteralOrientation] = Var.create("vertical") # Whether to keep the HTML element in the DOM when the viewport isn't scrollable keep_mounted: Var[bool] = Var.create(False) @@ -178,7 +178,7 @@ class HighLevelScrollArea(ScrollAreaRoot): """High level wrapper for the Scroll Area component.""" # Orientation of the scroll area - orientation: Var[LiteralOrientation] = Var.create("vertical") # ty:ignore[invalid-assignment] + orientation: Var[LiteralOrientation] = Var.create("vertical") # Whether to keep the HTML element in the DOM when the viewport isn't scrollable keep_mounted: Var[bool] = Var.create(False) diff --git a/packages/reflex-components-internal/src/reflex_components_internal/components/base/select.py b/packages/reflex-components-internal/src/reflex_components_internal/components/base/select.py index fcffa267f85..ddde1a10dcc 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/components/base/select.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/components/base/select.py @@ -448,7 +448,7 @@ class SelectSeparator(SelectBaseComponent): tag = "Select.Separator" # The orientation of the separator. - orientation: Var[LiteralOrientation] = Var.create("horizontal") # ty:ignore[invalid-assignment] + orientation: Var[LiteralOrientation] = Var.create("horizontal") # The render prop render_: Var[Component] diff --git a/packages/reflex-components-radix/src/reflex_components_radix/primitives/accordion.py b/packages/reflex-components-radix/src/reflex_components_radix/primitives/accordion.py index 1ed80f88831..d95226a3bdc 100644 --- a/packages/reflex-components-radix/src/reflex_components_radix/primitives/accordion.py +++ b/packages/reflex-components-radix/src/reflex_components_radix/primitives/accordion.py @@ -483,11 +483,11 @@ def add_style(self) -> dict[str, Any] | None: """ slide_down = SLIDE_DOWN.to(str) + Var.create( " var(--animation-duration) var(--animation-easing)", - ) # ty:ignore[unsupported-operator] + ) slide_up = SLIDE_UP.to(str) + Var.create( " var(--animation-duration) var(--animation-easing)", - ) # ty:ignore[unsupported-operator] + ) return { "overflow": "hidden", diff --git a/packages/reflex-components-radix/src/reflex_components_radix/themes/components/checkbox.py b/packages/reflex-components-radix/src/reflex_components_radix/themes/components/checkbox.py index db116a187e5..bad90762fe4 100644 --- a/packages/reflex-components-radix/src/reflex_components_radix/themes/components/checkbox.py +++ b/packages/reflex-components-radix/src/reflex_components_radix/themes/components/checkbox.py @@ -119,7 +119,7 @@ class HighLevelCheckbox(RadixThemesComponent): ) @classmethod - def create(cls, text: Var[str] = Var.create(""), **props) -> Component: # ty:ignore[invalid-parameter-default] + def create(cls, text: Var[str] = Var.create(""), **props) -> Component: """Create a checkbox with a label. Args: diff --git a/packages/reflex-components-radix/src/reflex_components_radix/themes/typography/text.py b/packages/reflex-components-radix/src/reflex_components_radix/themes/typography/text.py index ff0def78aaf..b020987d728 100644 --- a/packages/reflex-components-radix/src/reflex_components_radix/themes/typography/text.py +++ b/packages/reflex-components-radix/src/reflex_components_radix/themes/typography/text.py @@ -79,7 +79,7 @@ class Text(elements.Span, RadixThemesComponent, MarkdownComponentMap): class Span(Text): """A variant of text rendering as element.""" - as_: Var[LiteralType] = Var.create("span") # ty:ignore[invalid-assignment] + as_: Var[LiteralType] = Var.create("span") class Em(elements.Em, RadixThemesComponent): diff --git a/packages/reflex-components-sonner/src/reflex_components_sonner/toast.py b/packages/reflex-components-sonner/src/reflex_components_sonner/toast.py index 9d80b10d4e6..c383e2efe14 100644 --- a/packages/reflex-components-sonner/src/reflex_components_sonner/toast.py +++ b/packages/reflex-components-sonner/src/reflex_components_sonner/toast.py @@ -2,6 +2,7 @@ from __future__ import annotations +import builtins import dataclasses from typing import Any, Literal @@ -137,7 +138,7 @@ class ToastProps(NoExtrasAllowedProps): # Function that gets called when the toast disappears automatically after it's timeout (duration` prop). on_auto_close: Any | None - def dict(self, *args: Any, **kwargs: Any) -> dict[str, Any]: # ty:ignore[invalid-type-form] + def dict(self, *args: Any, **kwargs: Any) -> builtins.dict[str, Any]: """Convert the object to a dictionary. Args: diff --git a/pyi_hashes.json b/pyi_hashes.json index 8b25cb23922..c99507c5d99 100644 --- a/pyi_hashes.json +++ b/pyi_hashes.json @@ -117,7 +117,7 @@ "packages/reflex-components-recharts/src/reflex_components_recharts/general.pyi": "c051ab3a26c23107043e203b060e1412", "packages/reflex-components-recharts/src/reflex_components_recharts/polar.pyi": "1979bb6c22bb7a0d3342b2d63fb19d74", "packages/reflex-components-recharts/src/reflex_components_recharts/recharts.pyi": "234407dbd466bf9c87d75ce979ab0e2d", - "packages/reflex-components-sonner/src/reflex_components_sonner/toast.pyi": "2c5fadcc014056f041cd4d916137d9e7", + "packages/reflex-components-sonner/src/reflex_components_sonner/toast.pyi": "ba6c853c503fd8ad6fe89350ef4df073", "reflex/__init__.pyi": "3a9bb8544cbc338ffaf0a5927d9156df", "reflex/components/__init__.pyi": "f39a2af77f438fa243c58c965f19d42e", "reflex/experimental/memo.pyi": "9210fdd8cb53d286f7a95c91a7f39c3c" diff --git a/tests/units/components/core/test_cond.py b/tests/units/components/core/test_cond.py index e1844ffe468..4d9bce59ed8 100644 --- a/tests/units/components/core/test_cond.py +++ b/tests/units/components/core/test_cond.py @@ -154,7 +154,7 @@ def test_cond_assert_types() -> None: text_comp = Text.create("hello") text_comp2 = Text.create("world") var_int: Var[int] = LiteralVar.create(1) - var_str: Var[str] = LiteralVar.create("a") # ty:ignore[invalid-assignment] + var_str: Var[str] = LiteralVar.create("a") # Component, Component -> Component _ = assert_type(cond(True, text_comp, text_comp2), Component) @@ -175,10 +175,10 @@ def test_cond_assert_types() -> None: _ = assert_type(cond(True, "hello", 3), Var[str | int]) # ty:ignore[type-assertion-failure] # T, Var[T] -> Var[T] - _ = assert_type(cond(True, "hello", var_str), Var[str]) + _ = assert_type(cond(True, "hello", var_str), Var[str]) # ty:ignore[type-assertion-failure] # Var[T], T -> Var[T] - _ = assert_type(cond(True, var_str, "world"), Var[str]) + _ = assert_type(cond(True, var_str, "world"), Var[str]) # ty:ignore[type-assertion-failure] # T, Var[U] -> Var[T | U] _ = assert_type(cond(True, "hello", var_int), Var[str | int]) # ty:ignore[type-assertion-failure] @@ -187,4 +187,4 @@ def test_cond_assert_types() -> None: _ = assert_type(cond(True, var_str, 3), Var[int | Literal["a"]]) # ty:ignore[type-assertion-failure] # Var[T], Var[U] -> Var[T | U] - _ = assert_type(cond(True, var_int, var_str), Var[int | Literal["a"]]) # ty:ignore[type-assertion-failure] + _ = assert_type(cond(True, var_int, var_str), Var[int | Literal["a"]]) diff --git a/tests/units/components/core/test_upload.py b/tests/units/components/core/test_upload.py index cfe875ee8f7..4c6e89823a8 100644 --- a/tests/units/components/core/test_upload.py +++ b/tests/units/components/core/test_upload.py @@ -74,7 +74,7 @@ def test_get_upload_url(): def test__on_drop_spec(): - assert isinstance(_on_drop_spec(LiteralVar.create([])), tuple) # ty:ignore[invalid-argument-type] + assert isinstance(_on_drop_spec(LiteralVar.create([])), tuple) @pytest.mark.parametrize("component", [Upload, GhostUpload]) diff --git a/tests/units/components/radix/test_icon_button.py b/tests/units/components/radix/test_icon_button.py index ee5ffe178a9..f8abcedebf8 100644 --- a/tests/units/components/radix/test_icon_button.py +++ b/tests/units/components/radix/test_icon_button.py @@ -25,5 +25,5 @@ def test_icon_button_size_prop(): ib1 = IconButton.create("activity", size="2") assert isinstance(ib1, IconButton) - ib2 = IconButton.create("activity", size=LiteralVar.create("2")) # ty:ignore[invalid-argument-type] + ib2 = IconButton.create("activity", size=LiteralVar.create("2")) assert isinstance(ib2, IconButton) diff --git a/tests/units/components/test_component.py b/tests/units/components/test_component.py index db68c9a8454..950635531e2 100644 --- a/tests/units/components/test_component.py +++ b/tests/units/components/test_component.py @@ -1313,7 +1313,7 @@ def handler2(self, arg): id="fstring-bare", ), pytest.param( - rx.text(as_=TEST_VAR), # ty:ignore[invalid-argument-type] + rx.text(as_=TEST_VAR), [TEST_VAR], id="direct-prop", ), @@ -1359,7 +1359,7 @@ def handler2(self, arg): ), pytest.param( rx.fragment(class_name=[TEST_VAR, "other-class"]), - [Var.create([TEST_VAR, "other-class"]).join(" ")], # ty:ignore[unresolved-attribute] + [Var.create([TEST_VAR, "other-class"]).join(" ")], id="fstring-dual-class_name", ), pytest.param( @@ -1584,7 +1584,7 @@ def test_validate_valid_children(): True, rx.fragment(valid_component2()), rx.fragment( - rx.foreach(LiteralVar.create([1, 2, 3]), lambda x: valid_component2(x)) # ty:ignore[invalid-argument-type] + rx.foreach(LiteralVar.create([1, 2, 3]), lambda x: valid_component2(x)) ), ) ) @@ -1644,7 +1644,7 @@ def test_validate_valid_parents(): rx.fragment(valid_component3()), rx.fragment( rx.foreach( - LiteralVar.create([1, 2, 3]), # ty:ignore[invalid-argument-type] + LiteralVar.create([1, 2, 3]), lambda x: valid_component2(valid_component3(x)), ) ), @@ -1730,7 +1730,7 @@ def test_validate_invalid_children(): rx.fragment(invalid_component()), rx.fragment( rx.foreach( - LiteralVar.create([1, 2, 3]), # ty:ignore[invalid-argument-type] + LiteralVar.create([1, 2, 3]), lambda x: invalid_component(x), ) ), diff --git a/tests/units/experimental/test_memo.py b/tests/units/experimental/test_memo.py index 673513b69de..f202ecf05d8 100644 --- a/tests/units/experimental/test_memo.py +++ b/tests/units/experimental/test_memo.py @@ -197,13 +197,13 @@ def test_memo_requires_var_annotations(): @rx._x.memo def bad_annotation(value: int) -> rx.Var[str]: - return rx.Var.create("x") # ty:ignore[invalid-return-type] + return rx.Var.create("x") with pytest.raises(TypeError, match="Missing annotation"): @rx._x.memo def missing_annotation(value) -> rx.Var[str]: - return rx.Var.create("x") # ty:ignore[invalid-return-type] + return rx.Var.create("x") def test_memo_rejects_invalid_children_annotation(): @@ -240,7 +240,7 @@ def foo_bar() -> rx.Component: @rx._x.memo def FooBar() -> rx.Var[str]: - return rx.Var.create("x") # ty:ignore[invalid-return-type] + return rx.Var.create("x") def test_memo_rejects_component_export_name_collision(): @@ -263,13 +263,13 @@ def test_memo_rejects_varargs(): @rx._x.memo def bad_args(*values: rx.Var[str]) -> rx.Var[str]: - return rx.Var.create("x") # ty:ignore[invalid-return-type] + return rx.Var.create("x") with pytest.raises(TypeError, match=r"\*\*kwargs"): @rx._x.memo def bad_kwargs(**values: rx.Var[str]) -> rx.Var[str]: - return rx.Var.create("x") # ty:ignore[invalid-return-type] + return rx.Var.create("x") def test_component_memo_rejects_invalid_positional_usage(): From 501b35156290d28b47d435d6b7cb62596c91ada8 Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Tue, 28 Apr 2026 23:53:33 +0200 Subject: [PATCH 08/57] even more typing fixes --- packages/reflex-base/src/reflex_base/vars/dep_tracking.py | 8 ++++---- packages/reflex-hosting-cli/src/reflex_cli/core/config.py | 2 +- .../reflex-hosting-cli/src/reflex_cli/utils/dependency.py | 2 +- pyproject.toml | 6 ++++++ reflex/compiler/utils.py | 2 +- reflex/istate/proxy.py | 5 +---- 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/packages/reflex-base/src/reflex_base/vars/dep_tracking.py b/packages/reflex-base/src/reflex_base/vars/dep_tracking.py index 577e8d7ca84..60ff649b5e1 100644 --- a/packages/reflex-base/src/reflex_base/vars/dep_tracking.py +++ b/packages/reflex-base/src/reflex_base/vars/dep_tracking.py @@ -96,7 +96,7 @@ class DependencyTracker: _getting_state_class: type[BaseState] | ModuleType | None = dataclasses.field( default=None ) - _get_var_value_positions: dis.Positions | None = dataclasses.field(default=None) # ty:ignore[unresolved-attribute] + _get_var_value_positions: dis.Positions | None = dataclasses.field(default=None) _last_import_name: str | None = dataclasses.field(default=None) INVALID_NAMES: ClassVar[list[str]] = ["parent_state", "substates", "get_substate"] @@ -311,7 +311,7 @@ def handle_getting_state_post_await(self, instruction: dis.Instruction) -> None: # Attribute access on an inline `get_state`, not assigned to a variable. self.load_attr_or_method(instruction) - def _eval_var(self, positions: dis.Positions) -> Var: # ty:ignore[unresolved-attribute] + def _eval_var(self, positions: dis.Positions) -> Var: """Evaluate instructions from the wrapped function to get the Var object. Args: @@ -372,10 +372,10 @@ def handle_getting_var(self, instruction: dis.Instruction) -> None: VarValueError: if the source code for the var cannot be determined. """ if instruction.opname == "CALL": - if instruction.positions is None: # ty:ignore[unresolved-attribute] + if instruction.positions is None: msg = f"Cannot determine the source code for the var in {self.func!r}." raise VarValueError(msg) - the_var = self._eval_var(instruction.positions) # ty:ignore[unresolved-attribute] + the_var = self._eval_var(instruction.positions) the_var_data = the_var._get_all_var_data() if the_var_data is None: msg = f"Cannot determine the source code for the var in {self.func!r}." diff --git a/packages/reflex-hosting-cli/src/reflex_cli/core/config.py b/packages/reflex-hosting-cli/src/reflex_cli/core/config.py index 1243e6b66db..f1cbb31b43c 100644 --- a/packages/reflex-hosting-cli/src/reflex_cli/core/config.py +++ b/packages/reflex-hosting-cli/src/reflex_cli/core/config.py @@ -241,7 +241,7 @@ def from_toml( raise ConfigError(f"Config file not found at {pyproject_path}.") try: - import tomllib # ty:ignore[unresolved-import] + import tomllib except ImportError as e: raise ConfigError( "TOML support is not available. Please use Python 3.11 or later." diff --git a/packages/reflex-hosting-cli/src/reflex_cli/utils/dependency.py b/packages/reflex-hosting-cli/src/reflex_cli/utils/dependency.py index 13499a9eb72..0709d123a4d 100644 --- a/packages/reflex-hosting-cli/src/reflex_cli/utils/dependency.py +++ b/packages/reflex-hosting-cli/src/reflex_cli/utils/dependency.py @@ -31,7 +31,7 @@ def detect_encoding(filename: Path) -> str | None: raise FileNotFoundError for encoding in [ - None if sys.version_info < (3, 10) else io.text_encoding(None), # ty:ignore[unresolved-attribute] + None if sys.version_info < (3, 10) else io.text_encoding(None), "utf-8", ]: try: diff --git a/pyproject.toml b/pyproject.toml index 2899761f5ce..29ed1369255 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -136,6 +136,12 @@ path = "scripts/hatch_build.py" dependencies = ["plotly", "ruff"] require-runtime-dependencies = true +[tool.ty.environment] +# Type-check against Python 3.11 stdlib so newer-Python-only features like +# `dis.Positions`, `tomllib`, and `ExceptionGroup` resolve. Reflex still +# supports Python 3.10 at runtime via `sys.version_info >= (3, 11)` guards. +python-version = "3.11" + [tool.ty.src] exclude = [ ".venv", diff --git a/reflex/compiler/utils.py b/reflex/compiler/utils.py index 45fd1b82a18..81c3baebdde 100644 --- a/reflex/compiler/utils.py +++ b/reflex/compiler/utils.py @@ -188,7 +188,7 @@ def save_error(error: Exception) -> str: timestamp = datetime.now().strftime("%Y-%m-%d__%H-%M-%S") constants.Reflex.LOGS_DIR.mkdir(parents=True, exist_ok=True) log_path = constants.Reflex.LOGS_DIR / f"error_{timestamp}.log" - traceback.TracebackException.from_exception(error).print(file=log_path.open("w+")) # ty:ignore[unresolved-attribute] + traceback.TracebackException.from_exception(error).print(file=log_path.open("w+")) return str(log_path) diff --git a/reflex/istate/proxy.py b/reflex/istate/proxy.py index 1db820f53f6..c2bb149088d 100644 --- a/reflex/istate/proxy.py +++ b/reflex/istate/proxy.py @@ -433,10 +433,7 @@ def __new__(cls, wrapped: Any, *args, **kwargs) -> MutableProxy: wrapper_cls_name, (cls,), { - dataclasses._FIELDS: getattr( # ty:ignore[unresolved-attribute] - wrapped_cls, - dataclasses._FIELDS, # ty:ignore[unresolved-attribute] - ), + "__dataclass_fields__": wrapped_cls.__dataclass_fields__, }, ) cls = cls.__dataclass_proxies__[wrapper_cls_name] From f7bfd25542fffe2c6951e622c647f2e7f387aec1 Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Wed, 6 May 2026 19:39:03 +0200 Subject: [PATCH 09/57] bump ty --- tests/units/test_state.py | 2 +- uv.lock | 40 +++++++++++++++++++-------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tests/units/test_state.py b/tests/units/test_state.py index 6b7eb3303f0..fd15046b403 100644 --- a/tests/units/test_state.py +++ b/tests/units/test_state.py @@ -1548,7 +1548,7 @@ def cached_x_side_effect(self) -> int: return counter if use_partial: - HandlerState.handler = functools.partial(HandlerState.handler.fn) # ty:ignore[invalid-assignment, unresolved-attribute] + HandlerState.handler = functools.partial(HandlerState.handler.fn) # ty:ignore[unresolved-attribute] assert isinstance(HandlerState.handler, functools.partial) else: assert isinstance(HandlerState.handler, EventHandler) diff --git a/uv.lock b/uv.lock index 63807704459..3b6f9301274 100644 --- a/uv.lock +++ b/uv.lock @@ -4469,26 +4469,26 @@ wheels = [ [[package]] name = "ty" -version = "0.0.33" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/84/44/9478c50c266826c1bf30d1692e589755bffa8f1c0a3eb7af8a346c255991/ty-0.0.33.tar.gz", hash = "sha256:46d63bda07403322cb6c28ccfdd5536be916e13df725c29f7ccd0a21f06bd9e8", size = 5559373, upload-time = "2026-04-28T10:45:13.18Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/e9/24/e287388c63a19191be26b32ff4dbd06029834068150ebe2532939bc4c851/ty-0.0.33-py3-none-linux_armv6l.whl", hash = "sha256:94d0a9d2234261a8911396d59e506b5923fe0971dbda43b9dcea287936887fcc", size = 11021308, upload-time = "2026-04-28T10:45:43.34Z" }, - { url = "https://files.pythonhosted.org/packages/00/ca/ba1eed819895bd239fba8ee35dfcd5fcb266c203b0914a17a59579096bb5/ty-0.0.33-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:e4a2b5ba078f90de342f56b5f7979bb77c9b9b1d8625a041352ffc6ee93c4073", size = 10777272, upload-time = "2026-04-28T10:45:32.905Z" }, - { url = "https://files.pythonhosted.org/packages/25/a8/c3131d37b44b3fea1d6654a1c929a0cd0873822f77a90482b8ec28f6fbbd/ty-0.0.33-py3-none-macosx_11_0_arm64.whl", hash = "sha256:84ff5707825e9af9668d2bcf66975f93e520a63b524ab494e3a8265735be2563", size = 10201078, upload-time = "2026-04-28T10:45:23.374Z" }, - { url = "https://files.pythonhosted.org/packages/7b/db/d8e37ff0045810cc65e1ff36aa0da0a2253c05659787ac987df8a16c7897/ty-0.0.33-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e375285736f57886868e7af0b11c7b0ec5b6543fa15e7ad2a714fed9f077d4e0", size = 10732347, upload-time = "2026-04-28T10:45:21.444Z" }, - { url = "https://files.pythonhosted.org/packages/e0/1a/20e83a412506a918e4684fc67b567cf7cc13b105470b3428cb23c3d5aa13/ty-0.0.33-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:5680f6350c3b4e46b8bff6d7bb132366ea239463d6cad4892725d06046e65464", size = 10808238, upload-time = "2026-04-28T10:45:38.565Z" }, - { url = "https://files.pythonhosted.org/packages/5d/4b/d0a39f4464dc6cb4cc2c159473ce216bd1846bfb684c0323a3cb36dce5c6/ty-0.0.33-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c5535538bad8d0f7e62bcdff02197cdb30e41451d80b35d27e17d128f2e1dc5d", size = 11288348, upload-time = "2026-04-28T10:45:08.419Z" }, - { url = "https://files.pythonhosted.org/packages/35/7e/f1745e0f9583363d7a83d9a4990fc244f76ecc30840ddad83dc16a33c52d/ty-0.0.33-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:da196c42bbbc069e1e21e3e52107c061aa9660352dae57a41930690b56e2c02d", size = 11789907, upload-time = "2026-04-28T10:45:19.064Z" }, - { url = "https://files.pythonhosted.org/packages/a5/71/25f39f46a12d662859d45bc648555d0661044eb43db6b5648c9947487da9/ty-0.0.33-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9281672921ef6d4460e03146b5e6c18cb1a3e3a3b8a1a88f6f33226d05a469b7", size = 11500774, upload-time = "2026-04-28T10:45:48.012Z" }, - { url = "https://files.pythonhosted.org/packages/94/ec/136959ecbb7c71cb90537f5aea441c73f4ab24612868a6ecdc9d7444d32d/ty-0.0.33-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:82c1b8f303f82da64e878108e764be3ecbcd7c9903ac0a7f7031614ed00b97ab", size = 11360314, upload-time = "2026-04-28T10:45:05.402Z" }, - { url = "https://files.pythonhosted.org/packages/cf/95/32809575c222f00beed498cb728e9290a0f5009f930025381bb7253b2206/ty-0.0.33-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:efe3af412c9ff67bce5fa37d0a2b0d8555c24072b145a5bac6c79637f1c83abe", size = 10707785, upload-time = "2026-04-28T10:45:10.836Z" }, - { url = "https://files.pythonhosted.org/packages/13/89/c8e9531f7aa4a093359e15fa32c8e1277fbbe90d16894d7c6032d29f4b34/ty-0.0.33-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:aeec29c91ea768601747da546c3efc20b72c2fb1bd52bcc786a5c6eeff51d27b", size = 10834987, upload-time = "2026-04-28T10:45:40.738Z" }, - { url = "https://files.pythonhosted.org/packages/31/16/9835fbcf5338af1a1917bd28fdb8a7193c210b83f243aa286fa9f79cb3ad/ty-0.0.33-py3-none-musllinux_1_2_i686.whl", hash = "sha256:a535977c52bbb5f7e96b8b70a6ad375ad077f4a9ff2492508ea3816a2b403819", size = 10968968, upload-time = "2026-04-28T10:45:30.26Z" }, - { url = "https://files.pythonhosted.org/packages/36/69/64c76aabc1bc70c7f24b686cd93c3407f8ea430905e395f59bf9603ef571/ty-0.0.33-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:1d732facf39fcb221ba279d469c5040d37883e964f123b1563888efd34818180", size = 11458077, upload-time = "2026-04-28T10:45:45.971Z" }, - { url = "https://files.pythonhosted.org/packages/91/84/fae27b0c4718776a298690d31ca4cc1995f2e3e1c63a7b59e84c41498e9a/ty-0.0.33-py3-none-win32.whl", hash = "sha256:d90960b574428dc252f85e8598ec5fcb7f619794196b2fc95a90da075ed4681c", size = 10345364, upload-time = "2026-04-28T10:45:16.836Z" }, - { url = "https://files.pythonhosted.org/packages/3c/a0/a2938b23ae3e1a09a2d7c189e2ac5f7113676bae4e0e23948b568e18e5f8/ty-0.0.33-py3-none-win_amd64.whl", hash = "sha256:c1c3aec62c44de610c6e95f0a4e97ac3dbc07934bfdbf1fd90d758c9ff72f48e", size = 11342470, upload-time = "2026-04-28T10:45:26.455Z" }, - { url = "https://files.pythonhosted.org/packages/ab/62/7fb948aace38d2f6329261bb33c035a8484549c74f1db28649c7a4c6fed9/ty-0.0.33-py3-none-win_arm64.whl", hash = "sha256:0d44f99ba1b441e55e2aa301b2ac0a21112784931b46a5f66f4ea9efe5620d97", size = 10742673, upload-time = "2026-04-28T10:45:35.555Z" }, +version = "0.0.34" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/c4/69/e24eefe2c35c0fdbdec9b60e162727af669bb76d64d993d982eb67b24c38/ty-0.0.34.tar.gz", hash = "sha256:a6efe66b0f13c03a65e6c72ec9abfe2792e2fd063c74fa67e2c4930e29d661be", size = 5585933, upload-time = "2026-05-01T23:06:46.388Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/83/7b/8b85003d6639ef17a97dcbb31f4511cfe78f1c81a964470db100c8c883e7/ty-0.0.34-py3-none-linux_armv6l.whl", hash = "sha256:9ecc3d14f07a95a6ceb88e07f8e62358dbd37325d3d5bd56da7217ff1fef7fb8", size = 11067094, upload-time = "2026-05-01T23:06:21.133Z" }, + { url = "https://files.pythonhosted.org/packages/d7/25/b0098f65b020b015c40567c763fc66fffbec88b2ba6f584bca1e92f05ebb/ty-0.0.34-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:0dccffd8a9d02321cd2dee3249df205e26d62694e741f4eeca36b157fd8b419f", size = 10840909, upload-time = "2026-05-01T23:06:18.409Z" }, + { url = "https://files.pythonhosted.org/packages/e4/55/5e4adcf7d2a1006b844903b27cb81244a9b748d850433a46a6c21776c401/ty-0.0.34-py3-none-macosx_11_0_arm64.whl", hash = "sha256:b0ea47a2998e167ab3b21d2f4b5309a9cf33c297809f6d7e3e753252223174d0", size = 10279378, upload-time = "2026-05-01T23:06:37.962Z" }, + { url = "https://files.pythonhosted.org/packages/4d/91/f537dca0db8fe2558e8ab04d8941d687b384fcc1df5eb9023b2db75ac26c/ty-0.0.34-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8b37da00b41a118a459ae56d8947e70651073fb33ebfbceb820e4a10b22d5023", size = 10817423, upload-time = "2026-05-01T23:06:26.247Z" }, + { url = "https://files.pythonhosted.org/packages/2c/c4/55a3ad1da2815af1009bdc1b8c90dc11a364cd314e4b48c5128ba9d38859/ty-0.0.34-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:81cbbb93c2342fe3de43e625d3a9eb149633e9f485e816ebf6395d08685355d8", size = 10851826, upload-time = "2026-05-01T23:06:24.198Z" }, + { url = "https://files.pythonhosted.org/packages/ce/8c/9c7606af22d73fb43ea4369472d9c66ece11231be73b0efe8e3c61655559/ty-0.0.34-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4c5b4dea1594a021289e172582df9cde7089dce14b276fc650e7b212b1772e12", size = 11356318, upload-time = "2026-05-01T23:06:51.139Z" }, + { url = "https://files.pythonhosted.org/packages/20/54/bb423f663721ab4138b216425c6b55eaefd3a068243b24d6d8fe988f4e13/ty-0.0.34-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:030fb00aa2d2a5b5ae9d9183d574e0c82dae80566700a7490c43669d8ece40cd", size = 11902968, upload-time = "2026-05-01T23:06:35.82Z" }, + { url = "https://files.pythonhosted.org/packages/b6/22/01122b21ab6b534a2f618c6bbe5f1f7f49fd56f4b2ec8887cd6d40d08fb3/ty-0.0.34-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5ae9555e24e36c63a8218e037a5a63f15579eb6aa94f41017e57cd41d335cfb5", size = 11548860, upload-time = "2026-05-01T23:06:42.155Z" }, + { url = "https://files.pythonhosted.org/packages/d1/50/86008b1392ec64bed1957bbcc7aaa43b466b50dfc91bb131841c21d7c5c3/ty-0.0.34-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:99eb23df9ed129fc26d1ab00d6f0b8dfe5253b09c2ac6abdb11523fa70d67f10", size = 11457097, upload-time = "2026-05-01T23:06:53.477Z" }, + { url = "https://files.pythonhosted.org/packages/92/3e/4558b2296963ba99c58d8409c57d7db4f3061b656c3613cb21c02c1ef4c2/ty-0.0.34-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:85de45382016eceae69e104815eb2cfa200787df104002e262a86cbd43ed2c02", size = 10798192, upload-time = "2026-05-01T23:06:40.004Z" }, + { url = "https://files.pythonhosted.org/packages/76/bf/650d24402be2ef678528d60caac1d9477a40fc37e3792ecef07834fd7a4a/ty-0.0.34-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:14cb575fb8fa5131f5129d100cfe23c1575d23faf5dfc5158432749a3e38c9b5", size = 10890390, upload-time = "2026-05-01T23:06:33.076Z" }, + { url = "https://files.pythonhosted.org/packages/5c/ef/ccd2ca13906079f7935fd7e067661b24233017f57d987d51d6a121d85bb5/ty-0.0.34-py3-none-musllinux_1_2_i686.whl", hash = "sha256:c6fc0b69d8450e6910ba9db34572b959b81329a97ae273c391f70e9fb6c1aade", size = 11031564, upload-time = "2026-05-01T23:06:55.812Z" }, + { url = "https://files.pythonhosted.org/packages/ba/2d/d27b72005b6f43599e3bcabab0d7135ac0c230b7a307bb99f9eea02c1cda/ty-0.0.34-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:30dfcec2f0fde3993f4f912ed0e057dcbebc8615299f610a4c2ddb7b5a3e1e06", size = 11553430, upload-time = "2026-05-01T23:06:31.096Z" }, + { url = "https://files.pythonhosted.org/packages/a7/12/20812e1ad930b8d4af70eebf19ad23cff6e31efcfa613ef884531fcdbaa1/ty-0.0.34-py3-none-win32.whl", hash = "sha256:97b77ddf007271b812a313a8f0a14929bc5590958433e1fb83ef585676f53342", size = 10436048, upload-time = "2026-05-01T23:06:49.108Z" }, + { url = "https://files.pythonhosted.org/packages/b0/6a/afa095c5987868fbda27c0f731146ac8e3d07b357adfa83daccaee5b1a16/ty-0.0.34-py3-none-win_amd64.whl", hash = "sha256:1f543968accb952705134028d1fda8656882787dbbc667ad4d6c3ba23791d604", size = 11462526, upload-time = "2026-05-01T23:06:28.514Z" }, + { url = "https://files.pythonhosted.org/packages/63/8f/bf041a06260d77662c0605e56dacfe90b786bf824cbe1aed238d15fe5e84/ty-0.0.34-py3-none-win_arm64.whl", hash = "sha256:ea09108cbcb16b6b06d7596312b433bf49681e78d30e4dc7fb3c1b248a95e09a", size = 10846945, upload-time = "2026-05-01T23:06:44.428Z" }, ] [[package]] From fabfba214346ccf76e291188f954f013088bf6c1 Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Wed, 6 May 2026 20:50:22 +0200 Subject: [PATCH 10/57] ruff format --- packages/reflex-base/src/reflex_base/components/component.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/reflex-base/src/reflex_base/components/component.py b/packages/reflex-base/src/reflex_base/components/component.py index af3216c5117..e1ba91c3777 100644 --- a/packages/reflex-base/src/reflex_base/components/component.py +++ b/packages/reflex-base/src/reflex_base/components/component.py @@ -2565,7 +2565,8 @@ def render_dict_to_var(tag: dict[str, Any] | Component | str) -> Var: if "iterable" in tag: function_return = LiteralArrayVar.create([ - render_dict_to_var(child.render()) for child in tag["children"] # ty:ignore[invalid-argument-type, not-iterable] + render_dict_to_var(child.render()) + for child in tag["children"] # ty:ignore[invalid-argument-type, not-iterable] ]) func = ArgsFunctionOperation.create( From c8c4dff0308b76ba20d1f804043f83640df67cf2 Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Sun, 24 May 2026 01:03:59 +0200 Subject: [PATCH 11/57] bump ty, adjust some typing --- .../src/reflex_base/components/component.py | 2 +- .../src/reflex_base/event/__init__.py | 6 +++ packages/reflex-base/src/reflex_base/style.py | 14 +++---- .../src/reflex_base/telemetry_context.py | 2 +- .../src/reflex_base/utils/types.py | 8 ++-- .../reflex-base/src/reflex_base/vars/base.py | 7 ++-- .../reflex_components_core/core/foreach.py | 2 +- .../src/reflex_components_core/core/match.py | 12 +++--- .../components/base/tabs.py | 2 +- pyi_hashes.json | 37 +++++++++++++++++ reflex/app.py | 2 +- reflex/istate/data.py | 2 +- reflex/state.py | 2 +- reflex/testing.py | 2 +- reflex/utils/path_ops.py | 3 +- reflex/utils/processes.py | 2 +- reflex/utils/telemetry.py | 2 +- reflex/utils/telemetry_accounting.py | 4 +- tests/integration/test_telemetry_compile.py | 11 ++++- .../tests_playwright/test_frontend_path.py | 2 +- tests/units/reflex_cli/v2/test_gcp.py | 4 +- tests/units/test_telemetry.py | 4 +- .../units/utils/test_telemetry_accounting.py | 34 +++++++-------- uv.lock | 41 ++++++++++--------- 24 files changed, 131 insertions(+), 76 deletions(-) diff --git a/packages/reflex-base/src/reflex_base/components/component.py b/packages/reflex-base/src/reflex_base/components/component.py index 250f3167688..467470dd408 100644 --- a/packages/reflex-base/src/reflex_base/components/component.py +++ b/packages/reflex-base/src/reflex_base/components/component.py @@ -363,7 +363,7 @@ def __copy__(self) -> BaseComponent: def _clear_compile_caches(self) -> None: """Clear cached render/compiler artifacts after compile-time mutation.""" - attrs = cast("dict[str, Any]", vars(self)) + attrs = vars(self) for attr in ( "_cached_render_result", "_vars_cache", diff --git a/packages/reflex-base/src/reflex_base/event/__init__.py b/packages/reflex-base/src/reflex_base/event/__init__.py index a369eca40b7..538005f4b25 100644 --- a/packages/reflex-base/src/reflex_base/event/__init__.py +++ b/packages/reflex-base/src/reflex_base/event/__init__.py @@ -1000,6 +1000,12 @@ def passthrough_event_spec( ) -> Callable[[Var[T], Var[U]], tuple[Var[T], Var[U]]]: ... +@overload +def passthrough_event_spec( + event_type: types.UnionType, / +) -> Callable[[Var[Any]], tuple[Var[Any]]]: ... + + @overload def passthrough_event_spec(*event_types: type[T]) -> IdentityEventReturn[T]: ... diff --git a/packages/reflex-base/src/reflex_base/style.py b/packages/reflex-base/src/reflex_base/style.py index 0094e553cb8..c1c04ce9f6b 100644 --- a/packages/reflex-base/src/reflex_base/style.py +++ b/packages/reflex-base/src/reflex_base/style.py @@ -140,7 +140,7 @@ def convert_item( def convert_list( responsive_list: list[str | dict | Var], -) -> tuple[list[str | dict[str, Var | list | dict]], VarData | None]: +) -> tuple[list[Var | str | dict[str, Var | str | list | dict]], VarData | None]: """Format a responsive value list. Args: @@ -149,12 +149,12 @@ def convert_list( Returns: The recursively converted responsive value list and any associated VarData. """ - converted_value = [] + converted_value: list[Var | str | dict[str, Var | str | list | dict]] = [] item_var_datas = [] for responsive_item in responsive_list: - if isinstance(responsive_item, dict): + if not isinstance(responsive_item, Var) and isinstance(responsive_item, dict): # Recursively format nested style dictionaries. - item, item_var_data = convert(responsive_item) # ty:ignore[invalid-argument-type] + item, item_var_data = convert(responsive_item) else: item, item_var_data = convert_item(responsive_item) converted_value.append(item) @@ -163,8 +163,8 @@ def convert_list( def convert( - style_dict: dict[str, Var | dict | list | str], -) -> tuple[dict[str, str | list | dict], VarData | None]: + style_dict: Mapping[str, Any], +) -> tuple[dict[str, Var | str | list | dict], VarData | None]: """Format a style dictionary. Args: @@ -174,7 +174,7 @@ def convert( The formatted style dictionary. """ var_data = None # Track import/hook data from any Vars in the style dict. - out = {} + out: dict[str, Var | str | list | dict] = {} def update_out_dict( return_value: Var | dict | list | str, keys_to_update: tuple[str, ...] diff --git a/packages/reflex-base/src/reflex_base/telemetry_context.py b/packages/reflex-base/src/reflex_base/telemetry_context.py index 739b2f7a372..7c3ff3363f4 100644 --- a/packages/reflex-base/src/reflex_base/telemetry_context.py +++ b/packages/reflex-base/src/reflex_base/telemetry_context.py @@ -77,7 +77,7 @@ def set_exception(self, exc: BaseException | None) -> None: object.__setattr__(self, "exception", exc) @classmethod - def get(cls) -> TelemetryContext | None: # pyright: ignore[reportIncompatibleMethodOverride] + def get(cls) -> TelemetryContext | None: """Return the active telemetry context, or None if none is attached. Returns: diff --git a/packages/reflex-base/src/reflex_base/utils/types.py b/packages/reflex-base/src/reflex_base/utils/types.py index fa5348186ac..c99b4f482eb 100644 --- a/packages/reflex-base/src/reflex_base/utils/types.py +++ b/packages/reflex-base/src/reflex_base/utils/types.py @@ -1104,7 +1104,7 @@ def typehint_issubclass( def resolve_annotations( raw_annotations: Mapping[str, type[Any]], module_name: str | None -) -> dict[str, type[Any]]: +) -> dict[str, type[Any] | ForwardRef]: """Partially taken from typing.get_type_hints. Resolve string or ForwardRef annotations into type objects if possible. @@ -1114,7 +1114,9 @@ def resolve_annotations( module_name: The name of the module. Returns: - The resolved annotations. + The resolved annotations. Entries that could not be resolved remain + as ``ForwardRef`` instances (callers can re-resolve them later via + ``update_forward_refs``). """ module = sys.modules.get(module_name, None) if module_name is not None else None @@ -1122,7 +1124,7 @@ def resolve_annotations( module.__dict__ if module is not None else None ) - annotations = {} + annotations: dict[str, type[Any] | ForwardRef] = {} for name, value in raw_annotations.items(): if isinstance(value, str): if sys.version_info == (3, 10, 0): diff --git a/packages/reflex-base/src/reflex_base/vars/base.py b/packages/reflex-base/src/reflex_base/vars/base.py index bacf6fd1f4c..1ff70e03b95 100644 --- a/packages/reflex-base/src/reflex_base/vars/base.py +++ b/packages/reflex-base/src/reflex_base/vars/base.py @@ -2433,12 +2433,11 @@ def _deps( """ from .dep_tracking import DependencyTracker - d = {} + d: dict[str, set[str]] = {} if self._static_deps: - d.update(self._static_deps) # None is a placeholder for the current state class. - if None in d: - d[objclass.get_full_name()] = d.pop(None) + for k, v in self._static_deps.items(): + d[k if k is not None else objclass.get_full_name()] = v if not self._auto_deps: return d diff --git a/packages/reflex-components-core/src/reflex_components_core/core/foreach.py b/packages/reflex-components-core/src/reflex_components_core/core/foreach.py index 891ac6c124c..7eee3be664c 100644 --- a/packages/reflex-components-core/src/reflex_components_core/core/foreach.py +++ b/packages/reflex-components-core/src/reflex_components_core/core/foreach.py @@ -122,7 +122,7 @@ def create( return component def _render(self) -> IterTag: - props = {} + props: dict[str, Any] = {} render_sig = inspect.signature(self.render_fn) params = list(render_sig.parameters.values()) diff --git a/packages/reflex-components-core/src/reflex_components_core/core/match.py b/packages/reflex-components-core/src/reflex_components_core/core/match.py index c2a756f9dd8..b45709b9fff 100644 --- a/packages/reflex-components-core/src/reflex_components_core/core/match.py +++ b/packages/reflex-components-core/src/reflex_components_core/core/match.py @@ -197,16 +197,17 @@ def _validate_return_types( MatchTypeError: If the return types of cases are different. """ first_case_return = match_cases[0][-1] - return_type = type(first_case_return) - + return_type: type[Var] | type[BaseComponent] if isinstance(first_case_return, BaseComponent): return_type = BaseComponent elif isinstance(first_case_return, Var): return_type = Var + else: + msg = "Return value must be a var or component" + raise MatchTypeError(msg) - cases = [] for index, case in enumerate(match_cases): - conditions, return_value = case + return_value = case[-1] if not isinstance(return_value, return_type): msg = ( f"Match cases should have the same return types. Case {index} with return " @@ -214,8 +215,7 @@ def _validate_return_types( f" of type {type(return_value)!r} is not {return_type}" ) raise MatchTypeError(msg) - cases.append((conditions, return_value)) - return cases + return match_cases # ty:ignore[invalid-return-type] @classmethod def _create_match_cond_var_or_component( diff --git a/packages/reflex-components-internal/src/reflex_components_internal/components/base/tabs.py b/packages/reflex-components-internal/src/reflex_components_internal/components/base/tabs.py index 0a3ef5ff0a4..4fe83c92479 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/components/base/tabs.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/components/base/tabs.py @@ -62,7 +62,7 @@ class TabsRoot(TabsBaseComponent): value: Var[str | int] # Callback invoked when new value is being set. - on_value_change: EventHandler[passthrough_event_spec(str | dict)] # ty:ignore[no-matching-overload] + on_value_change: EventHandler[passthrough_event_spec(str | dict)] # The component orientation (layout flow direction). Defaults to "horizontal". orientation: Var[LiteralOrientation] diff --git a/pyi_hashes.json b/pyi_hashes.json index 2b89b363ea6..94f15ee679c 100644 --- a/pyi_hashes.json +++ b/pyi_hashes.json @@ -39,6 +39,43 @@ "packages/reflex-components-core/src/reflex_components_core/react_router/dom.pyi": "1074a512195ae23d479c4a2d553954e1", "packages/reflex-components-dataeditor/src/reflex_components_dataeditor/dataeditor.pyi": "8e379fa038c7c6c0672639eb5902934d", "packages/reflex-components-gridjs/src/reflex_components_gridjs/datatable.pyi": "d2dc211d707c402eb24678a4cba945f7", + "packages/reflex-components-internal/src/reflex_components_internal/__init__.pyi": "68e6c11adb86b334994e344372b5de86", + "packages/reflex-components-internal/src/reflex_components_internal/blocks/calcom.pyi": "ee9f90b28fca6389551ae1f6a79166de", + "packages/reflex-components-internal/src/reflex_components_internal/blocks/plain.pyi": "6b9eb619dd1525ceb420666a592b6c7c", + "packages/reflex-components-internal/src/reflex_components_internal/components/__init__.pyi": "12a56da68a8cd02d030f2bc4371b912f", + "packages/reflex-components-internal/src/reflex_components_internal/components/base/__init__.pyi": "3b7d9ac32fa150bddb2c5668693c05f2", + "packages/reflex-components-internal/src/reflex_components_internal/components/base/accordion.pyi": "6af36d177f8227724bbf076056b630a8", + "packages/reflex-components-internal/src/reflex_components_internal/components/base/avatar.pyi": "997885494e0d79fb8288a8a0c00ebebb", + "packages/reflex-components-internal/src/reflex_components_internal/components/base/badge.pyi": "93acd8d72286962e554c5412c40f1f61", + "packages/reflex-components-internal/src/reflex_components_internal/components/base/button.pyi": "bc49660d2a483282629dd602e74b19a9", + "packages/reflex-components-internal/src/reflex_components_internal/components/base/card.pyi": "c94befb300814d5516524fc04ecfd847", + "packages/reflex-components-internal/src/reflex_components_internal/components/base/checkbox.pyi": "85c4822ce07e9ffb85efc1ff833cc287", + "packages/reflex-components-internal/src/reflex_components_internal/components/base/collapsible.pyi": "8c146c6f0cd476f0f44bf5ffe9e78ad1", + "packages/reflex-components-internal/src/reflex_components_internal/components/base/context_menu.pyi": "a24454b58cef9fb8eb74684913f8a119", + "packages/reflex-components-internal/src/reflex_components_internal/components/base/dialog.pyi": "e0640a8f267ee651f80873540a0a585d", + "packages/reflex-components-internal/src/reflex_components_internal/components/base/drawer.pyi": "c7e1fd15f2e79a913480b763710a1f03", + "packages/reflex-components-internal/src/reflex_components_internal/components/base/gradient_profile.pyi": "7cd4cb0967ffc0168ca53fad87417e05", + "packages/reflex-components-internal/src/reflex_components_internal/components/base/input.pyi": "871a7a6adf54b7d861972d27c85df0ee", + "packages/reflex-components-internal/src/reflex_components_internal/components/base/link.pyi": "e6a233240615b269a0787c92c7ab5a49", + "packages/reflex-components-internal/src/reflex_components_internal/components/base/menu.pyi": "4febf04210f2b5ebc810ab73c0ebd3e6", + "packages/reflex-components-internal/src/reflex_components_internal/components/base/navigation_menu.pyi": "ba36f42b7f0ea516f60f93f2cea628cb", + "packages/reflex-components-internal/src/reflex_components_internal/components/base/otp_field.pyi": "950a82a52072756fe132d1060e5e79d0", + "packages/reflex-components-internal/src/reflex_components_internal/components/base/popover.pyi": "994411bd94873fc5fde4830d35003a3e", + "packages/reflex-components-internal/src/reflex_components_internal/components/base/preview_card.pyi": "2e966f2d8c708bfdc92207730c51ccb6", + "packages/reflex-components-internal/src/reflex_components_internal/components/base/scroll_area.pyi": "8619d779ea26b33cf9ee0c2ff9c40abf", + "packages/reflex-components-internal/src/reflex_components_internal/components/base/select.pyi": "658c4955a959b704ca817eb308384000", + "packages/reflex-components-internal/src/reflex_components_internal/components/base/slider.pyi": "7fd79434ad40c52111a23c6b1800c591", + "packages/reflex-components-internal/src/reflex_components_internal/components/base/switch.pyi": "d4d5ac7cf96dc4c304aea95b86c18c3f", + "packages/reflex-components-internal/src/reflex_components_internal/components/base/tabs.pyi": "ed10dfc15c9ee5866a92e1bc4497c91e", + "packages/reflex-components-internal/src/reflex_components_internal/components/base/textarea.pyi": "891dba7cf500a4cc1ca6c704fed6056c", + "packages/reflex-components-internal/src/reflex_components_internal/components/base/toggle.pyi": "2dabedfa2aee3f05f2a0a50ab7e44864", + "packages/reflex-components-internal/src/reflex_components_internal/components/base/toggle_group.pyi": "11d9db2ad00042ed9c3a99a41f5ec3b9", + "packages/reflex-components-internal/src/reflex_components_internal/components/base/tooltip.pyi": "0ecb8bcafa7a5958cd8a5649e3eafb0e", + "packages/reflex-components-internal/src/reflex_components_internal/components/base_ui.pyi": "0e6651e563e62de3f0f77b796e3de1bb", + "packages/reflex-components-internal/src/reflex_components_internal/components/icons/__init__.pyi": "acc2a513209c74373cedc17a9fdb232b", + "packages/reflex-components-internal/src/reflex_components_internal/components/icons/hugeicon.pyi": "b82885f35d0fa394330c891234ef0a40", + "packages/reflex-components-internal/src/reflex_components_internal/components/icons/simple_icon.pyi": "7a0774976e45f967d1ee9840b6163f19", + "packages/reflex-components-internal/src/reflex_components_internal/utils/__init__.pyi": "9d029297b54797696c72c43342130222", "packages/reflex-components-lucide/src/reflex_components_lucide/icon.pyi": "b692058e40b15da293fbf463ad300a83", "packages/reflex-components-markdown/src/reflex_components_markdown/markdown.pyi": "27661fcc57f3aa6b22ebefbc1082350c", "packages/reflex-components-moment/src/reflex_components_moment/moment.pyi": "d6a02e447dfd3c91bba84bcd02722aed", diff --git a/reflex/app.py b/reflex/app.py index 33067c16dbe..8817e2eecba 100644 --- a/reflex/app.py +++ b/reflex/app.py @@ -1462,7 +1462,7 @@ async def health(_request: Request) -> JSONResponse: - "db" (bool or str): Database status - True, False, or "NA". - "redis" (bool or str): Redis status - True, False, or "NA". """ - health_status = {"status": True} + health_status: dict[str, bool | None] = {"status": True} status_code = 200 tasks = [] diff --git a/reflex/istate/data.py b/reflex/istate/data.py index ee99eab4952..0fa11ef1fe4 100644 --- a/reflex/istate/data.py +++ b/reflex/istate/data.py @@ -334,7 +334,7 @@ def create( # entry still accepts it because .to()/guess_type() only call .create(...), # which has a compatible signature. _var_subclasses.append( - VarSubclassEntry(ReflexURLVar, ReflexURLCastedVar, (ReflexURL,)) # pyright: ignore[reportArgumentType] + VarSubclassEntry(ReflexURLVar, ReflexURLCastedVar, (ReflexURL,)) # ty:ignore[invalid-argument-type] ) diff --git a/reflex/state.py b/reflex/state.py index 6dc5126fbe4..aca5f700182 100644 --- a/reflex/state.py +++ b/reflex/state.py @@ -1313,7 +1313,7 @@ def _get_base_functions() -> builtins.dict[str, FunctionType]: } @classmethod - def _update_substate_inherited_vars(cls, vars_to_add: builtins.dict[str, Var]): + def _update_substate_inherited_vars(cls, vars_to_add: Mapping[str, Var]): """Update the inherited vars of substates recursively when new vars are added. Also updates the var dependency tracking dicts after adding vars. diff --git a/reflex/testing.py b/reflex/testing.py index 1870c05f279..fda04e35bb2 100644 --- a/reflex/testing.py +++ b/reflex/testing.py @@ -62,7 +62,7 @@ # The timeout (minutes) to check for the port. DEFAULT_TIMEOUT = 15 POLL_INTERVAL = 0.25 -FRONTEND_POPEN_ARGS = {} +FRONTEND_POPEN_ARGS: dict[str, Any] = {} T = TypeVar("T") TimeoutType = int | float | None if platform.system() == "Windows": diff --git a/reflex/utils/path_ops.py b/reflex/utils/path_ops.py index 6e4da438e7d..17dfa69ee4a 100644 --- a/reflex/utils/path_ops.py +++ b/reflex/utils/path_ops.py @@ -7,6 +7,7 @@ import re import shutil import stat +from collections.abc import Mapping from pathlib import Path from reflex_base.config import get_config @@ -224,7 +225,7 @@ def get_bun_path() -> Path | None: return bun_path.absolute() if bun_path else None -def update_json_file(file_path: str | Path, update_dict: dict[str, object]): +def update_json_file(file_path: str | Path, update_dict: Mapping[str, object]): """Update the contents of a json file. Args: diff --git a/reflex/utils/processes.py b/reflex/utils/processes.py index 26618c49fc7..be5061239dd 100644 --- a/reflex/utils/processes.py +++ b/reflex/utils/processes.py @@ -260,7 +260,7 @@ def subprocess_p_open(args: subprocess._CMD, **kwargs): @contextlib.contextmanager def run_concurrently_context( - *fns: Callable[..., Any] | tuple[Callable[..., Any], ...], + *fns: Callable[..., Any] | tuple[Any, ...], ) -> Generator[list[futures.Future], None, None]: """Run functions concurrently in a thread pool. diff --git a/reflex/utils/telemetry.py b/reflex/utils/telemetry.py index c2866a127c0..ca1d42e85f9 100644 --- a/reflex/utils/telemetry.py +++ b/reflex/utils/telemetry.py @@ -60,7 +60,7 @@ def _retrieve_cpu_info() -> CpuInfo | None: The CPU info. """ platform_os = platform.system() - cpuinfo = {} + cpuinfo: dict[str, Any] = {} try: if platform_os == "Windows": cmd = 'powershell -Command "Get-CimInstance Win32_Processor | Select-Object -First 1 | Select-Object AddressWidth,Manufacturer,Name | ConvertTo-Json"' diff --git a/reflex/utils/telemetry_accounting.py b/reflex/utils/telemetry_accounting.py index bda3f068b10..badaa0860ac 100644 --- a/reflex/utils/telemetry_accounting.py +++ b/reflex/utils/telemetry_accounting.py @@ -316,7 +316,7 @@ def _storage_feature_for_field(field: Field) -> FeatureName | None: """ default = field.default if isinstance(default, ClientStorageBase): - cls: type = type(default) + cls: type[ClientStorageBase] = type(default) elif isinstance(field.type_, type) and issubclass(field.type_, ClientStorageBase): cls = field.type_ else: @@ -325,6 +325,8 @@ def _storage_feature_for_field(field: Field) -> FeatureName | None: if direct is not None: return direct for ancestor in cls.__mro__: + if not issubclass(ancestor, ClientStorageBase): + continue feature = _STORAGE_FEATURE.get(ancestor) if feature is not None: return feature diff --git a/tests/integration/test_telemetry_compile.py b/tests/integration/test_telemetry_compile.py index fd4069f9572..cb066287c90 100644 --- a/tests/integration/test_telemetry_compile.py +++ b/tests/integration/test_telemetry_compile.py @@ -13,6 +13,7 @@ import json from collections.abc import Generator from pathlib import Path +from typing import Any import pytest @@ -49,14 +50,20 @@ def TelemetryCompileApp(events_log_path: str = ""): sink = Path(events_log_path) sink.parent.mkdir(parents=True, exist_ok=True) - def _capture(event, properties=None, **_kwargs): + def _capture( + event: str, + telemetry_enabled: bool | None = None, + *, + properties: dict[str, Any] | None = None, + **_kwargs: Any, + ) -> bool: with sink.open("a") as fh: fh.write( json.dumps({"event": event, "properties": properties or {}}) + "\n" ) return True - telemetry.send = _capture + telemetry.send = _capture # ty:ignore[invalid-assignment] class StorageRoot(rx.State): token: str = Cookie() diff --git a/tests/integration/tests_playwright/test_frontend_path.py b/tests/integration/tests_playwright/test_frontend_path.py index ae70dbe5030..2b477361125 100644 --- a/tests/integration/tests_playwright/test_frontend_path.py +++ b/tests/integration/tests_playwright/test_frontend_path.py @@ -121,7 +121,7 @@ def _router_info(): id="router-url-path", ), rx.input( - value=FPState.router.page.raw_path, # pyright: ignore[reportDeprecated] + value=FPState.router.page.raw_path, read_only=True, id="router-page-raw-path", ), diff --git a/tests/units/reflex_cli/v2/test_gcp.py b/tests/units/reflex_cli/v2/test_gcp.py index 8109504133f..5bbf63986d4 100644 --- a/tests/units/reflex_cli/v2/test_gcp.py +++ b/tests/units/reflex_cli/v2/test_gcp.py @@ -9,11 +9,11 @@ from click.testing import CliRunner from pytest_mock import MockFixture from reflex_cli.utils import hosting -from reflex_cli.v2.deployments import hosting_cli +from reflex_cli.v2.deployments import hosting_cli as _hosting_cli from typer.main import Typer, get_command hosting_cli = ( - get_command(hosting_cli) if isinstance(hosting_cli, Typer) else hosting_cli + get_command(_hosting_cli) if isinstance(_hosting_cli, Typer) else _hosting_cli ) runner = CliRunner() diff --git a/tests/units/test_telemetry.py b/tests/units/test_telemetry.py index c43a285a192..a6c0447664f 100644 --- a/tests/units/test_telemetry.py +++ b/tests/units/test_telemetry.py @@ -177,7 +177,7 @@ def test_prepare_event_merges_properties(event_defaults): assert event is not None assert event["event"] == "compile" - props: dict = event["properties"] # pyright: ignore[reportAssignmentType] + props: dict = event["properties"] # ty:ignore[invalid-assignment] assert props["pages_count"] == 7 assert props["trigger"] == "initial" # Existing default keys are preserved. @@ -334,5 +334,5 @@ def test_prepare_event_properties_override_kwargs(event_defaults): ) assert event is not None - props: dict = event["properties"] # pyright: ignore[reportAssignmentType] + props: dict = event["properties"] # ty:ignore[invalid-assignment] assert props["template"] == "from-properties" diff --git a/tests/units/utils/test_telemetry_accounting.py b/tests/units/utils/test_telemetry_accounting.py index 83103d7f7fb..8f1c80bb0bf 100644 --- a/tests/units/utils/test_telemetry_accounting.py +++ b/tests/units/utils/test_telemetry_accounting.py @@ -162,7 +162,7 @@ def test_collect_compile_event_payload_shape(mocker: MockerFixture): ctx = TelemetryContext(trigger="cli_compile") payload = telemetry_accounting._collect_compile_event_payload( - app, # pyright: ignore[reportArgumentType] + app, ctx, ) @@ -188,7 +188,7 @@ def test_collect_compile_event_payload_with_exception(mocker: MockerFixture): ctx.set_exception(RuntimeError("oops")) payload = telemetry_accounting._collect_compile_event_payload( - app, # pyright: ignore[reportArgumentType] + app, ctx, ) assert payload["exception"] == {"type": "RuntimeError"} @@ -221,7 +221,7 @@ def test_memo_wrapper_class_records_wrapped_component_type(): memo_module = importlib.import_module("reflex.experimental.memo") - wrapper_cls = memo_module._get_experimental_memo_component_class( + wrapper_cls = memo_module._get_experimental_memo_component_class( # ty:ignore[unresolved-attribute] "Button_button_deadbeefcafebabe", Button, ) @@ -237,7 +237,7 @@ class StubMemoWrapper: children = () counts = telemetry_accounting._count_components( - [StubMemoWrapper()], # pyright: ignore[reportArgumentType] + [StubMemoWrapper()], # ty:ignore[invalid-argument-type] ) assert counts == {"Button": 1} @@ -246,7 +246,7 @@ class StubMemoWrapper: def test_collect_features_used_emits_every_known_key(): """All names in ``_KNOWN_FEATURES`` ship in the snapshot, defaulted to 0.""" features = telemetry_accounting._collect_features_used( - _fake_app(), # pyright: ignore[reportArgumentType] + _fake_app(), _fake_config(), [], ) @@ -265,7 +265,7 @@ class StorageState(BaseState): plain: int = 0 features = telemetry_accounting._collect_features_used( - _fake_app(), # pyright: ignore[reportArgumentType] + _fake_app(), _fake_config(), [StorageState], ) @@ -290,7 +290,7 @@ class StorageGrandchild(StorageChild): extra: str = Cookie() features = telemetry_accounting._collect_features_used( - _fake_app(), # pyright: ignore[reportArgumentType] + _fake_app(), _fake_config(), [StorageParent, StorageChild, StorageGrandchild], ) @@ -305,7 +305,7 @@ def test_collect_features_used_upload_reads_class_flag(mocker: MockerFixture): mocker.patch.object(Upload, "is_used", True) used = telemetry_accounting._collect_features_used( - _fake_app(), # pyright: ignore[reportArgumentType] + _fake_app(), _fake_config(), [], ) @@ -313,7 +313,7 @@ def test_collect_features_used_upload_reads_class_flag(mocker: MockerFixture): mocker.patch.object(Upload, "is_used", False) unused = telemetry_accounting._collect_features_used( - _fake_app(), # pyright: ignore[reportArgumentType] + _fake_app(), _fake_config(), [], ) @@ -330,7 +330,7 @@ class SharedTwo(rx.SharedState): y: int = 0 features = telemetry_accounting._collect_features_used( - _fake_app(), # pyright: ignore[reportArgumentType] + _fake_app(), _fake_config(), [SharedOne, SharedTwo], ) @@ -348,7 +348,7 @@ def test_collect_features_used_counts_dynamic_routes(): }, ) features = telemetry_accounting._collect_features_used( - app, # pyright: ignore[reportArgumentType] + app, _fake_config(), [], ) @@ -368,7 +368,7 @@ def reflex_internal_task(): app = _fake_app(_lifespan_tasks={user_task: None, reflex_internal_task: None}) features = telemetry_accounting._collect_features_used( - app, # pyright: ignore[reportArgumentType] + app, _fake_config(), [], ) @@ -384,7 +384,7 @@ def test_collect_features_used_counts_registered_db_models(mocker: MockerFixture mocker.patch.object(telemetry_accounting, "ModelRegistry", fake_registry) features = telemetry_accounting._collect_features_used( - _fake_app(), # pyright: ignore[reportArgumentType] + _fake_app(), _fake_config(), [], ) @@ -394,7 +394,7 @@ def test_collect_features_used_counts_registered_db_models(mocker: MockerFixture def test_collect_features_used_records_state_manager_mode(): """The configured state-manager mode lights up exactly one boolean key.""" features = telemetry_accounting._collect_features_used( - _fake_app(), # pyright: ignore[reportArgumentType] + _fake_app(), _fake_config(state_manager_mode=SimpleNamespace(value="redis")), [], ) @@ -406,7 +406,7 @@ def test_collect_features_used_records_state_manager_mode(): def test_collect_features_used_records_cors_customized(): """A non-default ``cors_allowed_origins`` sets the cors counter to 1.""" features = telemetry_accounting._collect_features_used( - _fake_app(), # pyright: ignore[reportArgumentType] + _fake_app(), _fake_config(cors_allowed_origins=("https://example.com",)), [], ) @@ -416,7 +416,7 @@ def test_collect_features_used_records_cors_customized(): def test_collect_features_used_default_cors_stays_zero(): """Default ``("*",)`` origins read as not customized.""" features = telemetry_accounting._collect_features_used( - _fake_app(), # pyright: ignore[reportArgumentType] + _fake_app(), _fake_config(), [], ) @@ -436,7 +436,7 @@ def fast(self): """Foreground handler that must not be miscounted.""" features = telemetry_accounting._collect_features_used( - _fake_app(), # pyright: ignore[reportArgumentType] + _fake_app(), _fake_config(), [BgState], ) diff --git a/uv.lock b/uv.lock index bd6f61d49e6..3de6fc42058 100644 --- a/uv.lock +++ b/uv.lock @@ -4477,26 +4477,27 @@ wheels = [ [[package]] name = "ty" -version = "0.0.34" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/c4/69/e24eefe2c35c0fdbdec9b60e162727af669bb76d64d993d982eb67b24c38/ty-0.0.34.tar.gz", hash = "sha256:a6efe66b0f13c03a65e6c72ec9abfe2792e2fd063c74fa67e2c4930e29d661be", size = 5585933, upload-time = "2026-05-01T23:06:46.388Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/83/7b/8b85003d6639ef17a97dcbb31f4511cfe78f1c81a964470db100c8c883e7/ty-0.0.34-py3-none-linux_armv6l.whl", hash = "sha256:9ecc3d14f07a95a6ceb88e07f8e62358dbd37325d3d5bd56da7217ff1fef7fb8", size = 11067094, upload-time = "2026-05-01T23:06:21.133Z" }, - { url = "https://files.pythonhosted.org/packages/d7/25/b0098f65b020b015c40567c763fc66fffbec88b2ba6f584bca1e92f05ebb/ty-0.0.34-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:0dccffd8a9d02321cd2dee3249df205e26d62694e741f4eeca36b157fd8b419f", size = 10840909, upload-time = "2026-05-01T23:06:18.409Z" }, - { url = "https://files.pythonhosted.org/packages/e4/55/5e4adcf7d2a1006b844903b27cb81244a9b748d850433a46a6c21776c401/ty-0.0.34-py3-none-macosx_11_0_arm64.whl", hash = "sha256:b0ea47a2998e167ab3b21d2f4b5309a9cf33c297809f6d7e3e753252223174d0", size = 10279378, upload-time = "2026-05-01T23:06:37.962Z" }, - { url = "https://files.pythonhosted.org/packages/4d/91/f537dca0db8fe2558e8ab04d8941d687b384fcc1df5eb9023b2db75ac26c/ty-0.0.34-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8b37da00b41a118a459ae56d8947e70651073fb33ebfbceb820e4a10b22d5023", size = 10817423, upload-time = "2026-05-01T23:06:26.247Z" }, - { url = "https://files.pythonhosted.org/packages/2c/c4/55a3ad1da2815af1009bdc1b8c90dc11a364cd314e4b48c5128ba9d38859/ty-0.0.34-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:81cbbb93c2342fe3de43e625d3a9eb149633e9f485e816ebf6395d08685355d8", size = 10851826, upload-time = "2026-05-01T23:06:24.198Z" }, - { url = "https://files.pythonhosted.org/packages/ce/8c/9c7606af22d73fb43ea4369472d9c66ece11231be73b0efe8e3c61655559/ty-0.0.34-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4c5b4dea1594a021289e172582df9cde7089dce14b276fc650e7b212b1772e12", size = 11356318, upload-time = "2026-05-01T23:06:51.139Z" }, - { url = "https://files.pythonhosted.org/packages/20/54/bb423f663721ab4138b216425c6b55eaefd3a068243b24d6d8fe988f4e13/ty-0.0.34-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:030fb00aa2d2a5b5ae9d9183d574e0c82dae80566700a7490c43669d8ece40cd", size = 11902968, upload-time = "2026-05-01T23:06:35.82Z" }, - { url = "https://files.pythonhosted.org/packages/b6/22/01122b21ab6b534a2f618c6bbe5f1f7f49fd56f4b2ec8887cd6d40d08fb3/ty-0.0.34-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5ae9555e24e36c63a8218e037a5a63f15579eb6aa94f41017e57cd41d335cfb5", size = 11548860, upload-time = "2026-05-01T23:06:42.155Z" }, - { url = "https://files.pythonhosted.org/packages/d1/50/86008b1392ec64bed1957bbcc7aaa43b466b50dfc91bb131841c21d7c5c3/ty-0.0.34-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:99eb23df9ed129fc26d1ab00d6f0b8dfe5253b09c2ac6abdb11523fa70d67f10", size = 11457097, upload-time = "2026-05-01T23:06:53.477Z" }, - { url = "https://files.pythonhosted.org/packages/92/3e/4558b2296963ba99c58d8409c57d7db4f3061b656c3613cb21c02c1ef4c2/ty-0.0.34-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:85de45382016eceae69e104815eb2cfa200787df104002e262a86cbd43ed2c02", size = 10798192, upload-time = "2026-05-01T23:06:40.004Z" }, - { url = "https://files.pythonhosted.org/packages/76/bf/650d24402be2ef678528d60caac1d9477a40fc37e3792ecef07834fd7a4a/ty-0.0.34-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:14cb575fb8fa5131f5129d100cfe23c1575d23faf5dfc5158432749a3e38c9b5", size = 10890390, upload-time = "2026-05-01T23:06:33.076Z" }, - { url = "https://files.pythonhosted.org/packages/5c/ef/ccd2ca13906079f7935fd7e067661b24233017f57d987d51d6a121d85bb5/ty-0.0.34-py3-none-musllinux_1_2_i686.whl", hash = "sha256:c6fc0b69d8450e6910ba9db34572b959b81329a97ae273c391f70e9fb6c1aade", size = 11031564, upload-time = "2026-05-01T23:06:55.812Z" }, - { url = "https://files.pythonhosted.org/packages/ba/2d/d27b72005b6f43599e3bcabab0d7135ac0c230b7a307bb99f9eea02c1cda/ty-0.0.34-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:30dfcec2f0fde3993f4f912ed0e057dcbebc8615299f610a4c2ddb7b5a3e1e06", size = 11553430, upload-time = "2026-05-01T23:06:31.096Z" }, - { url = "https://files.pythonhosted.org/packages/a7/12/20812e1ad930b8d4af70eebf19ad23cff6e31efcfa613ef884531fcdbaa1/ty-0.0.34-py3-none-win32.whl", hash = "sha256:97b77ddf007271b812a313a8f0a14929bc5590958433e1fb83ef585676f53342", size = 10436048, upload-time = "2026-05-01T23:06:49.108Z" }, - { url = "https://files.pythonhosted.org/packages/b0/6a/afa095c5987868fbda27c0f731146ac8e3d07b357adfa83daccaee5b1a16/ty-0.0.34-py3-none-win_amd64.whl", hash = "sha256:1f543968accb952705134028d1fda8656882787dbbc667ad4d6c3ba23791d604", size = 11462526, upload-time = "2026-05-01T23:06:28.514Z" }, - { url = "https://files.pythonhosted.org/packages/63/8f/bf041a06260d77662c0605e56dacfe90b786bf824cbe1aed238d15fe5e84/ty-0.0.34-py3-none-win_arm64.whl", hash = "sha256:ea09108cbcb16b6b06d7596312b433bf49681e78d30e4dc7fb3c1b248a95e09a", size = 10846945, upload-time = "2026-05-01T23:06:44.428Z" }, +version = "0.0.39" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d0/8d/7b5c74dc287fbcb37bae9853cec13bf44717c1735298500e4aeba31579a9/ty-0.0.39.tar.gz", hash = "sha256:f750277e76a01ecd86185960eca73823c26a53c51103568d56d4d904575159fd", size = 5702365, upload-time = "2026-05-22T21:09:56.403Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/08/17/9b89802c26d12d0f7a27bc25d4066d941d42891e8898f9f26499f0067e32/ty-0.0.39-py3-none-linux_armv6l.whl", hash = "sha256:c1bb7ac70f1f7d70cc6655fd96558039e4562b10f489fa49c7ebfd5fcee73ad1", size = 11360431, upload-time = "2026-05-22T21:09:18.689Z" }, + { url = "https://files.pythonhosted.org/packages/9c/c6/663ded50e823dbf9fb9d002eca46b7cb1fb2c72b744b84f22ce732a0ee0b/ty-0.0.39-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:3435b64c1e59c14c9aa39c20cc018823937cd38d55db853e74d95b8f420569b0", size = 11096281, upload-time = "2026-05-22T21:09:15.383Z" }, + { url = "https://files.pythonhosted.org/packages/8b/ae/5d38ba9a6456ff4c78d212cf464fd8b9a25d8118465197b0b2dc891c0b19/ty-0.0.39-py3-none-macosx_11_0_arm64.whl", hash = "sha256:5f136377ce46c73677701a9e1ad730bf72f699bcec046e422eb79d0886cac3ab", size = 10529674, upload-time = "2026-05-22T21:09:46.471Z" }, + { url = "https://files.pythonhosted.org/packages/be/6f/43638cb8106445d3c8817256a0731cde9dd7b6a53ae2e881294bc1930ca3/ty-0.0.39-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:36b65fb0cc17f03e851d40e210d420be94ab8bc52d041328ad1e45f616036a61", size = 11055561, upload-time = "2026-05-22T21:09:36.981Z" }, + { url = "https://files.pythonhosted.org/packages/91/17/95e62cf4458527ce78dc386eba18f8b10c3fb64cd8c9e7e59b262ff6029d/ty-0.0.39-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:4967967bfadf3860ff84c3fccdbaec8edf8aa20d0d727521084733d853de6657", size = 11127185, upload-time = "2026-05-22T21:09:31.395Z" }, + { url = "https://files.pythonhosted.org/packages/4e/c0/93666c213db5c71ab1b1f1a0db5f66bf8c7c0e0b0bf59859f5da8f0b3c36/ty-0.0.39-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9e10ecb1297099ddf9a1f054f8bd921d1863ce85fb819a3c96ed27865a1ba6ed", size = 11608459, upload-time = "2026-05-22T21:09:12.862Z" }, + { url = "https://files.pythonhosted.org/packages/79/85/3b26585afc8b50230d6464bb0642feef4fab3f847e38b1f0ffa971a81446/ty-0.0.39-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9b19cca70e465d71b0510656343883d62372bbe74b7845cae7c0e701d6d5264b", size = 12177101, upload-time = "2026-05-22T21:09:40.519Z" }, + { url = "https://files.pythonhosted.org/packages/49/4a/1039e4f6afc576dc1c3a4d22a6478904a1ad3766597cd0b93c077ab9dfce/ty-0.0.39-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:56c6704b01b9b3d80ff26b2918423b742516d1e469bef830e9254dcedc9185bf", size = 11827815, upload-time = "2026-05-22T21:09:49.89Z" }, + { url = "https://files.pythonhosted.org/packages/e2/c5/4688652870e350a76a8157f7ffb59ad54f37d5d10725aa7076f66ac94ec8/ty-0.0.39-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:40b7840ff46764b6a6757f4ade1cd0530fc3e8a0b435ca93e7602360e4cb90b6", size = 11694429, upload-time = "2026-05-22T21:09:21.568Z" }, + { url = "https://files.pythonhosted.org/packages/fc/72/8a1c4e823bb5bdc935a1c8140e100304e36a68a4139592f170aa9736fdb7/ty-0.0.39-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:1c62a3a87ce26b50819f0dbf03bd95f23f19eeb87bbc7aa732ec64277c77f1aa", size = 11869846, upload-time = "2026-05-22T21:09:28.053Z" }, + { url = "https://files.pythonhosted.org/packages/17/9f/cf982457b861ae22d657c5dcdbc631199f7f90264279db1d17230dfbc3ff/ty-0.0.39-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:f8c34bc81a9c3516e49904e9d8330aac385377cca98390193ea02b903a40fcf0", size = 11029763, upload-time = "2026-05-22T21:09:06.791Z" }, + { url = "https://files.pythonhosted.org/packages/46/c9/95b64f6d43ae6e8f0b7e13dacf9c196d35819af22b1924171fba31383156/ty-0.0.39-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:66f5ab11586a64e79cb692ad685ee5469325c31b5f30bd3554f52f36dbe28cc4", size = 11146761, upload-time = "2026-05-22T21:09:10.178Z" }, + { url = "https://files.pythonhosted.org/packages/52/69/0a89cfb06f7632a05bf56c78e0affb4a40f81759e275376cea75c9c5abe9/ty-0.0.39-py3-none-musllinux_1_2_i686.whl", hash = "sha256:e8d89732bcbbcb091f439e556dfc4932f198b118b47d5b85212c60662099670e", size = 11281843, upload-time = "2026-05-22T21:09:34.234Z" }, + { url = "https://files.pythonhosted.org/packages/0e/53/64c4a27067a46643fea2b3fcf21a8a2f838d91a65ffdd14f2e82945b9538/ty-0.0.39-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:eceb6c91dcd05a231119f82abdd9aa337513de23ca6ac990bc44f88791dc1799", size = 11792477, upload-time = "2026-05-22T21:09:24.923Z" }, + { url = "https://files.pythonhosted.org/packages/1a/e8/02f4dd4a12bcdbda0006f9c7ff3b99a4be06bd0d257d3bd4a5b66de074e6/ty-0.0.39-py3-none-win32.whl", hash = "sha256:891c3262314dbc80bf3e872634d23dd216306945daa9a9fcc206ce5ed21ac4c9", size = 10615377, upload-time = "2026-05-22T21:09:43.167Z" }, + { url = "https://files.pythonhosted.org/packages/b5/5a/aaeb22faa8d4dae90a287d4c3636c671edcff3b99be5f4fc8b79ad71eef6/ty-0.0.39-py3-none-win_amd64.whl", hash = "sha256:ba7f2d54452535419e90f6f03ff39282999e87b43c21c00559f6d7ad711a36d5", size = 11710711, upload-time = "2026-05-22T21:09:53.179Z" }, + { url = "https://files.pythonhosted.org/packages/a3/17/ae7339651bfcaa5f54698c8c70eaf5031baa400ecb67baec31d03a56cbd4/ty-0.0.39-py3-none-win_arm64.whl", hash = "sha256:eb4cf0fefbbfedf9a352597bb2431ebdcb7eb3a595c0f825f228e897a0ec285d", size = 11081409, upload-time = "2026-05-22T21:09:03.741Z" }, ] [[package]] From 6a4b3b7c3d8a8e321e0121e2945ab17420efa6ce Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Sun, 24 May 2026 01:27:42 +0200 Subject: [PATCH 12/57] pyi --- pyi_hashes.json | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/pyi_hashes.json b/pyi_hashes.json index 94f15ee679c..2b89b363ea6 100644 --- a/pyi_hashes.json +++ b/pyi_hashes.json @@ -39,43 +39,6 @@ "packages/reflex-components-core/src/reflex_components_core/react_router/dom.pyi": "1074a512195ae23d479c4a2d553954e1", "packages/reflex-components-dataeditor/src/reflex_components_dataeditor/dataeditor.pyi": "8e379fa038c7c6c0672639eb5902934d", "packages/reflex-components-gridjs/src/reflex_components_gridjs/datatable.pyi": "d2dc211d707c402eb24678a4cba945f7", - "packages/reflex-components-internal/src/reflex_components_internal/__init__.pyi": "68e6c11adb86b334994e344372b5de86", - "packages/reflex-components-internal/src/reflex_components_internal/blocks/calcom.pyi": "ee9f90b28fca6389551ae1f6a79166de", - "packages/reflex-components-internal/src/reflex_components_internal/blocks/plain.pyi": "6b9eb619dd1525ceb420666a592b6c7c", - "packages/reflex-components-internal/src/reflex_components_internal/components/__init__.pyi": "12a56da68a8cd02d030f2bc4371b912f", - "packages/reflex-components-internal/src/reflex_components_internal/components/base/__init__.pyi": "3b7d9ac32fa150bddb2c5668693c05f2", - "packages/reflex-components-internal/src/reflex_components_internal/components/base/accordion.pyi": "6af36d177f8227724bbf076056b630a8", - "packages/reflex-components-internal/src/reflex_components_internal/components/base/avatar.pyi": "997885494e0d79fb8288a8a0c00ebebb", - "packages/reflex-components-internal/src/reflex_components_internal/components/base/badge.pyi": "93acd8d72286962e554c5412c40f1f61", - "packages/reflex-components-internal/src/reflex_components_internal/components/base/button.pyi": "bc49660d2a483282629dd602e74b19a9", - "packages/reflex-components-internal/src/reflex_components_internal/components/base/card.pyi": "c94befb300814d5516524fc04ecfd847", - "packages/reflex-components-internal/src/reflex_components_internal/components/base/checkbox.pyi": "85c4822ce07e9ffb85efc1ff833cc287", - "packages/reflex-components-internal/src/reflex_components_internal/components/base/collapsible.pyi": "8c146c6f0cd476f0f44bf5ffe9e78ad1", - "packages/reflex-components-internal/src/reflex_components_internal/components/base/context_menu.pyi": "a24454b58cef9fb8eb74684913f8a119", - "packages/reflex-components-internal/src/reflex_components_internal/components/base/dialog.pyi": "e0640a8f267ee651f80873540a0a585d", - "packages/reflex-components-internal/src/reflex_components_internal/components/base/drawer.pyi": "c7e1fd15f2e79a913480b763710a1f03", - "packages/reflex-components-internal/src/reflex_components_internal/components/base/gradient_profile.pyi": "7cd4cb0967ffc0168ca53fad87417e05", - "packages/reflex-components-internal/src/reflex_components_internal/components/base/input.pyi": "871a7a6adf54b7d861972d27c85df0ee", - "packages/reflex-components-internal/src/reflex_components_internal/components/base/link.pyi": "e6a233240615b269a0787c92c7ab5a49", - "packages/reflex-components-internal/src/reflex_components_internal/components/base/menu.pyi": "4febf04210f2b5ebc810ab73c0ebd3e6", - "packages/reflex-components-internal/src/reflex_components_internal/components/base/navigation_menu.pyi": "ba36f42b7f0ea516f60f93f2cea628cb", - "packages/reflex-components-internal/src/reflex_components_internal/components/base/otp_field.pyi": "950a82a52072756fe132d1060e5e79d0", - "packages/reflex-components-internal/src/reflex_components_internal/components/base/popover.pyi": "994411bd94873fc5fde4830d35003a3e", - "packages/reflex-components-internal/src/reflex_components_internal/components/base/preview_card.pyi": "2e966f2d8c708bfdc92207730c51ccb6", - "packages/reflex-components-internal/src/reflex_components_internal/components/base/scroll_area.pyi": "8619d779ea26b33cf9ee0c2ff9c40abf", - "packages/reflex-components-internal/src/reflex_components_internal/components/base/select.pyi": "658c4955a959b704ca817eb308384000", - "packages/reflex-components-internal/src/reflex_components_internal/components/base/slider.pyi": "7fd79434ad40c52111a23c6b1800c591", - "packages/reflex-components-internal/src/reflex_components_internal/components/base/switch.pyi": "d4d5ac7cf96dc4c304aea95b86c18c3f", - "packages/reflex-components-internal/src/reflex_components_internal/components/base/tabs.pyi": "ed10dfc15c9ee5866a92e1bc4497c91e", - "packages/reflex-components-internal/src/reflex_components_internal/components/base/textarea.pyi": "891dba7cf500a4cc1ca6c704fed6056c", - "packages/reflex-components-internal/src/reflex_components_internal/components/base/toggle.pyi": "2dabedfa2aee3f05f2a0a50ab7e44864", - "packages/reflex-components-internal/src/reflex_components_internal/components/base/toggle_group.pyi": "11d9db2ad00042ed9c3a99a41f5ec3b9", - "packages/reflex-components-internal/src/reflex_components_internal/components/base/tooltip.pyi": "0ecb8bcafa7a5958cd8a5649e3eafb0e", - "packages/reflex-components-internal/src/reflex_components_internal/components/base_ui.pyi": "0e6651e563e62de3f0f77b796e3de1bb", - "packages/reflex-components-internal/src/reflex_components_internal/components/icons/__init__.pyi": "acc2a513209c74373cedc17a9fdb232b", - "packages/reflex-components-internal/src/reflex_components_internal/components/icons/hugeicon.pyi": "b82885f35d0fa394330c891234ef0a40", - "packages/reflex-components-internal/src/reflex_components_internal/components/icons/simple_icon.pyi": "7a0774976e45f967d1ee9840b6163f19", - "packages/reflex-components-internal/src/reflex_components_internal/utils/__init__.pyi": "9d029297b54797696c72c43342130222", "packages/reflex-components-lucide/src/reflex_components_lucide/icon.pyi": "b692058e40b15da293fbf463ad300a83", "packages/reflex-components-markdown/src/reflex_components_markdown/markdown.pyi": "27661fcc57f3aa6b22ebefbc1082350c", "packages/reflex-components-moment/src/reflex_components_moment/moment.pyi": "d6a02e447dfd3c91bba84bcd02722aed", From 7e6578f98e7a995d34f4f36c9b187bcd91bc8ea8 Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Sun, 24 May 2026 11:43:00 +0200 Subject: [PATCH 13/57] fix import --- tests/integration/test_telemetry_compile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/test_telemetry_compile.py b/tests/integration/test_telemetry_compile.py index cb066287c90..a669eb304aa 100644 --- a/tests/integration/test_telemetry_compile.py +++ b/tests/integration/test_telemetry_compile.py @@ -13,7 +13,6 @@ import json from collections.abc import Generator from pathlib import Path -from typing import Any import pytest @@ -36,6 +35,7 @@ def TelemetryCompileApp(events_log_path: str = ""): import json import os from pathlib import Path + from typing import Any import reflex as rx from reflex.istate.storage import Cookie, LocalStorage, SessionStorage From 3ce9c636652ce5d7e3881096a1990c7b0729bb9c Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Sun, 24 May 2026 12:10:08 +0200 Subject: [PATCH 14/57] less type ignores --- .../src/reflex_base/components/component.py | 54 ++++++++++--------- .../src/reflex_base/event/context.py | 4 +- .../src/reflex_base/plugins/compiler.py | 3 +- .../src/reflex_base/utils/decorator.py | 9 +++- .../src/reflex_base/utils/format.py | 15 ++++++ .../src/reflex_base/utils/pyi_generator.py | 4 +- .../reflex-base/src/reflex_base/vars/base.py | 25 +++++---- reflex/app.py | 4 +- reflex/app_mixins/lifespan.py | 23 ++++---- reflex/compiler/compiler.py | 7 +-- reflex/testing.py | 9 ++-- reflex/utils/tasks.py | 9 ++-- 12 files changed, 100 insertions(+), 66 deletions(-) diff --git a/packages/reflex-base/src/reflex_base/components/component.py b/packages/reflex-base/src/reflex_base/components/component.py index 467470dd408..1bfda6a815a 100644 --- a/packages/reflex-base/src/reflex_base/components/component.py +++ b/packages/reflex-base/src/reflex_base/components/component.py @@ -1326,9 +1326,11 @@ def _get_component_style(self, styles: ComponentStyle | Style) -> Style | None: The style of the component. """ component_style = None - if (style := styles.get(type(self))) is not None: # ty:ignore[invalid-argument-type] + if isinstance(styles, Style): + return component_style + if (style := styles.get(type(self))) is not None: component_style = Style(style) - if (style := styles.get(self.create)) is not None: # ty:ignore[invalid-argument-type] + if (style := styles.get(self.create)) is not None: component_style = Style(style) return component_style @@ -2257,7 +2259,7 @@ def get_args_spec(key: str) -> types.ArgsSpec | Sequence[types.ArgsSpec]: self.style = Style() # Set the tag to the name of the function. - self.tag = format.to_title_case(self.component_fn.__name__) # ty:ignore[unresolved-attribute] + self.tag = format.to_title_case(format.callable_name(self.component_fn)) for key, value in props.items(): # Skip kwargs that are not props. @@ -2617,38 +2619,38 @@ def render_dict_to_var(tag: dict[str, Any] | Component | str) -> Var: Returns: The Var. """ + if isinstance(tag, Component): + return render_dict_to_var(tag.render()) if not isinstance(tag, dict): - if isinstance(tag, Component): - return render_dict_to_var(tag.render()) return Var.create(tag) + render_dict: dict[str, Any] = tag - if "contents" in tag: - return Var(tag["contents"]) # ty:ignore[invalid-argument-type] + if "contents" in render_dict: + return Var(render_dict["contents"]) - if "iterable" in tag: + if "iterable" in render_dict: function_return = LiteralArrayVar.create([ - render_dict_to_var(child.render()) - for child in tag["children"] # ty:ignore[invalid-argument-type, not-iterable] + render_dict_to_var(child.render()) for child in render_dict["children"] ]) func = ArgsFunctionOperation.create( - (tag["arg_var_name"], tag["index_var_name"]), # ty:ignore[invalid-argument-type] + (render_dict["arg_var_name"], render_dict["index_var_name"]), function_return, ) return FunctionStringVar.create("Array.prototype.map.call").call( - tag["iterable"] # ty:ignore[invalid-argument-type] - if not isinstance(tag["iterable"], ObjectVar) # ty:ignore[invalid-argument-type] - else tag["iterable"].items(), # ty:ignore[invalid-argument-type] + render_dict["iterable"] + if not isinstance(render_dict["iterable"], ObjectVar) + else render_dict["iterable"].items(), func, ) - if "match_cases" in tag: - element = Var(tag["cond"]) # ty:ignore[invalid-argument-type] + if "match_cases" in render_dict: + element = Var(render_dict["cond"]) - conditionals = render_dict_to_var(tag["default"]) # ty:ignore[invalid-argument-type] + conditionals = render_dict_to_var(render_dict["default"]) - for case in tag["match_cases"][::-1]: # ty:ignore[invalid-argument-type, not-subscriptable] + for case in render_dict["match_cases"][::-1]: patterns, return_value = case condition = _format_patterns_into_condition(patterns, element) @@ -2660,18 +2662,18 @@ def render_dict_to_var(tag: dict[str, Any] | Component | str) -> Var: return conditionals - if "cond_state" in tag: + if "cond_state" in render_dict: return ternary_operation( - Var(tag["cond_state"]), # ty:ignore[invalid-argument-type] - render_dict_to_var(tag["true_value"]), # ty:ignore[invalid-argument-type] - render_dict_to_var(tag["false_value"]) # ty:ignore[invalid-argument-type] - if tag["false_value"] is not None # ty:ignore[invalid-argument-type] + Var(render_dict["cond_state"]), + render_dict_to_var(render_dict["true_value"]), + render_dict_to_var(render_dict["false_value"]) + if render_dict["false_value"] is not None else LiteralNoneVar.create(), ) - props = Var("({" + ",".join(tag["props"]) + "})") # ty:ignore[invalid-argument-type, no-matching-overload] + props = Var("({" + ",".join(render_dict["props"]) + "})") - raw_tag_name = tag.get("name") # ty:ignore[invalid-argument-type] + raw_tag_name = render_dict.get("name") tag_name = Var(raw_tag_name or "Fragment") return FunctionStringVar.create( @@ -2679,7 +2681,7 @@ def render_dict_to_var(tag: dict[str, Any] | Component | str) -> Var: ).call( tag_name, props, - *[render_dict_to_var(child) for child in tag["children"]], # ty:ignore[invalid-argument-type, not-iterable] + *[render_dict_to_var(child) for child in render_dict["children"]], ) diff --git a/packages/reflex-base/src/reflex_base/event/context.py b/packages/reflex-base/src/reflex_base/event/context.py index 88ee1dc8827..83ee400b5d9 100644 --- a/packages/reflex-base/src/reflex_base/event/context.py +++ b/packages/reflex-base/src/reflex_base/event/context.py @@ -9,7 +9,7 @@ from typing import TYPE_CHECKING, Any, Protocol from reflex_base.context.base import BaseContext -from reflex_base.utils.format import to_snake_case +from reflex_base.utils.format import callable_name, to_snake_case if TYPE_CHECKING: from reflex.istate.manager import StateManager @@ -24,7 +24,7 @@ def get_name(cls: type | Callable) -> str: The name of the state/func. """ module = cls.__module__.replace(".", "___") - qualname = getattr(cls, "__qualname__", cls.__name__).replace(".", "___") # ty:ignore[unresolved-attribute] + qualname = getattr(cls, "__qualname__", callable_name(cls)).replace(".", "___") return to_snake_case(f"{module}___{qualname}") diff --git a/packages/reflex-base/src/reflex_base/plugins/compiler.py b/packages/reflex-base/src/reflex_base/plugins/compiler.py index ccbe0584576..e94cdce7314 100644 --- a/packages/reflex-base/src/reflex_base/plugins/compiler.py +++ b/packages/reflex-base/src/reflex_base/plugins/compiler.py @@ -13,6 +13,7 @@ from typing_extensions import Self from reflex_base.components.component import BaseComponent, Component +from reflex_base.utils.format import callable_name from reflex_base.utils.imports import ParsedImportDict, collapse_imports, merge_imports from reflex_base.vars import VarData @@ -808,7 +809,7 @@ def compile( **kwargs, ) if page_ctx is None: - page_name = getattr(page_fn, "__name__", repr(page_fn)) + page_name = callable_name(page_fn) msg = ( f"No compiler plugin was able to evaluate page {page.route!r} " f"({page_name})." diff --git a/packages/reflex-base/src/reflex_base/utils/decorator.py b/packages/reflex-base/src/reflex_base/utils/decorator.py index f7f00371fca..8a99c6a68f0 100644 --- a/packages/reflex-base/src/reflex_base/utils/decorator.py +++ b/packages/reflex-base/src/reflex_base/utils/decorator.py @@ -5,6 +5,8 @@ from pathlib import Path from typing import ParamSpec, TypeVar, cast +from reflex_base.utils.format import callable_name + T = TypeVar("T") @@ -61,12 +63,13 @@ def debug(f: Callable[P, T]) -> Callable[P, T]: Returns: A function that prints the function name, arguments, and result. """ + fn_name = callable_name(f) @functools.wraps(f) def wrapper(*args: P.args, **kwargs: P.kwargs) -> T: result = f(*args, **kwargs) print( # noqa: T201 - f"Calling {f.__name__} with args: {args} and kwargs: {kwargs}, result: {result}" # ty:ignore[unresolved-attribute] + f"Calling {fn_name} with args: {args} and kwargs: {kwargs}, result: {result}" ) return result @@ -109,6 +112,8 @@ def cached_procedure( """ def _inner_decorator(func: Callable[P, Picklable]) -> Callable[P, Picklable]: # ty:ignore[invalid-type-form] + fn_name = callable_name(func) + def _inner(*args: P.args, **kwargs: P.kwargs) -> Picklable: cache_file = cache_file_path() @@ -123,7 +128,7 @@ def _inner(*args: P.args, **kwargs: P.kwargs) -> Picklable: from reflex_base.utils import console console.debug( - f"Using cached value for {func.__name__} with payload: {new_payload}" # ty:ignore[unresolved-attribute] + f"Using cached value for {fn_name} with payload: {new_payload}" ) return cast("Picklable", value) diff --git a/packages/reflex-base/src/reflex_base/utils/format.py b/packages/reflex-base/src/reflex_base/utils/format.py index 3736154c077..9ea5881d447 100644 --- a/packages/reflex-base/src/reflex_base/utils/format.py +++ b/packages/reflex-base/src/reflex_base/utils/format.py @@ -32,6 +32,21 @@ } +def callable_name(fn: object) -> str: + """Return ``fn.__name__`` when available, otherwise ``repr(fn)``. + + Args: + fn: The object whose display name is wanted. + + Returns: + The display name. + """ + name = getattr(fn, "__name__", None) + if isinstance(name, str): + return name + return repr(fn) + + def length_of_largest_common_substring(str1: str, str2: str) -> int: """Find the length of the largest common substring between two strings. diff --git a/packages/reflex-base/src/reflex_base/utils/pyi_generator.py b/packages/reflex-base/src/reflex_base/utils/pyi_generator.py index 5d36f433ced..6fb84465a4b 100644 --- a/packages/reflex-base/src/reflex_base/utils/pyi_generator.py +++ b/packages/reflex-base/src/reflex_base/utils/pyi_generator.py @@ -747,7 +747,9 @@ def type_to_ast( return ast.Name(id=str(typ)) # Get the base type name (List, Dict, Optional, etc.) - base_name = getattr(origin, "_name", origin.__name__) # ty:ignore[unresolved-attribute] + base_name = getattr(origin, "_name", None) or getattr( + origin, "__name__", repr(origin) + ) # Get type arguments args = get_args(typ) diff --git a/packages/reflex-base/src/reflex_base/vars/base.py b/packages/reflex-base/src/reflex_base/vars/base.py index 1ff70e03b95..9f15cca882f 100644 --- a/packages/reflex-base/src/reflex_base/vars/base.py +++ b/packages/reflex-base/src/reflex_base/vars/base.py @@ -53,7 +53,7 @@ VarDependencyError, VarTypeError, ) -from reflex_base.utils.format import format_state_name +from reflex_base.utils.format import callable_name, format_state_name from reflex_base.utils.imports import ( ImmutableImportDict, ImmutableParsedImportDict, @@ -2120,10 +2120,11 @@ def __init__( "return", Any ) + fget_name = callable_name(fget) if hint is Any: - raise UntypedComputedVarError(var_name=fget.__name__) # ty:ignore[unresolved-attribute] + raise UntypedComputedVarError(var_name=fget_name) is_using_fget_name = "_js_expr" not in kwargs - js_expr = kwargs.pop("_js_expr", fget.__name__ + FIELD_MARKER) # ty:ignore[unresolved-attribute] + js_expr = kwargs.pop("_js_expr", fget_name + FIELD_MARKER) kwargs.setdefault("_var_type", hint) Var.__init__( @@ -2132,7 +2133,7 @@ def __init__( _var_type=kwargs.pop("_var_type"), _var_data=kwargs.pop( "_var_data", - VarData(field_name=fget.__name__) if is_using_fget_name else None, # ty:ignore[unresolved-attribute] + VarData(field_name=fget_name) if is_using_fget_name else None, ), ) @@ -2141,12 +2142,12 @@ def __init__( raise TypeError(msg) if backend is None: - backend = fget.__name__.startswith("_") # ty:ignore[unresolved-attribute] + backend = fget_name.startswith("_") object.__setattr__(self, "_backend", backend) object.__setattr__(self, "_initial_value", initial_value) object.__setattr__(self, "_cache", cache) - object.__setattr__(self, "_name", fget.__name__) # ty:ignore[unresolved-attribute] + object.__setattr__(self, "_name", fget_name) if isinstance(interval, int): interval = datetime.timedelta(seconds=interval) @@ -2780,7 +2781,7 @@ def computed_var( if fget is not None: sign = inspect.signature(fget) if len(sign.parameters) != 1: - raise ComputedVarSignatureError(fget.__name__, signature=str(sign)) # ty:ignore[unresolved-attribute] + raise ComputedVarSignatureError(callable_name(fget), signature=str(sign)) if inspect.iscoroutinefunction(fget): computed_var_cls = AsyncComputedVar @@ -3149,15 +3150,16 @@ def transform(fn: Callable[[Var], Var]) -> Callable[[Var], Var]: return_type = types["return"] origin = get_origin(return_type) + fn_name = callable_name(fn) if origin is not Var: - msg = f"Expected return type of {fn.__name__} to be a Var, got {origin}." # ty:ignore[unresolved-attribute] + msg = f"Expected return type of {fn_name} to be a Var, got {origin}." raise TypeError(msg) generic_args = get_args(return_type) if not generic_args: - msg = f"Expected Var return type of {fn.__name__} to have a generic type." # ty:ignore[unresolved-attribute] + msg = f"Expected Var return type of {fn_name} to have a generic type." raise TypeError(msg) generic_type = get_origin(generic_args[0]) or generic_args[0] @@ -3198,6 +3200,7 @@ def dispatch( if result_origin_var_type in dispatchers: fn = dispatchers[result_origin_var_type] + fn_name = callable_name(fn) fn_types = get_type_hints(fn) fn_first_arg_type = fn_types.get( next(iter(inspect.signature(fn).parameters.values())).name, Any @@ -3208,7 +3211,7 @@ def dispatch( fn_return_origin = get_origin(fn_return) or fn_return if fn_return_origin is not Var: - msg = f"Expected return type of {fn.__name__} to be a Var, got {fn_return}." # ty:ignore[unresolved-attribute] + msg = f"Expected return type of {fn_name} to be a Var, got {fn_return}." raise TypeError(msg) fn_return_generic_args = get_args(fn_return) @@ -3220,7 +3223,7 @@ def dispatch( arg_origin = get_origin(fn_first_arg_type) or fn_first_arg_type if arg_origin is not Var: - msg = f"Expected first argument of {fn.__name__} to be a Var, got {fn_first_arg_type}." # ty:ignore[unresolved-attribute] + msg = f"Expected first argument of {fn_name} to be a Var, got {fn_first_arg_type}." raise TypeError(msg) arg_generic_args = get_args(fn_first_arg_type) diff --git a/reflex/app.py b/reflex/app.py index 8817e2eecba..d0c3fe60a2b 100644 --- a/reflex/app.py +++ b/reflex/app.py @@ -850,7 +850,9 @@ def add_page( msg = "Route must be set if component is not a callable." raise exceptions.RouteValueError(msg) # Format the route. - route = format.format_route(format.to_kebab_case(component.__name__)) # ty:ignore[unresolved-attribute] + route = format.format_route( + format.to_kebab_case(format.callable_name(component)) + ) else: route = format.format_route(route) diff --git a/reflex/app_mixins/lifespan.py b/reflex/app_mixins/lifespan.py index ba762bf4e06..3108650b1e5 100644 --- a/reflex/app_mixins/lifespan.py +++ b/reflex/app_mixins/lifespan.py @@ -13,6 +13,7 @@ from reflex_base.utils import console from reflex_base.utils.exceptions import InvalidLifespanTaskTypeError +from reflex_base.utils.format import callable_name from starlette.applications import Starlette from .mixin import AppMixin @@ -34,7 +35,7 @@ def _get_task_name(task: asyncio.Task | Callable) -> str: """ if isinstance(task, asyncio.Task): return task.get_name() - return task.__name__ # ty:ignore[unresolved-attribute] + return callable_name(task) @dataclasses.dataclass @@ -123,22 +124,18 @@ async def _run_lifespan_tasks(self, starlette_app: Starlette): console.debug(f"Canceling lifespan task: {task}") task.cancel(msg="lifespan_cleanup") # Disassociate sid / token pairings so they can be reconnected properly. - try: - event_namespace = self.event_namespace # ty:ignore[unresolved-attribute] - except AttributeError: - pass - else: + event_namespace = getattr(self, "event_namespace", None) + if event_namespace: try: - if event_namespace: - await event_namespace._token_manager.disconnect_all() + await event_namespace._token_manager.disconnect_all() except Exception as e: console.error(f"Error during lifespan cleanup: {e}") # Flush any pending writes from the state manager. try: - state_manager = self.state_manager # ty:ignore[unresolved-attribute] - except (AttributeError, ValueError): - pass - else: + state_manager = getattr(self, "state_manager", None) + except ValueError: + state_manager = None + if state_manager is not None: await state_manager.close() @overload @@ -185,7 +182,7 @@ def register_lifespan_task( ) raise RuntimeError(msg) if inspect.isgeneratorfunction(task) or inspect.isasyncgenfunction(task): - msg = f"Task {task.__name__} of type generator must be decorated with contextlib.asynccontextmanager." # ty:ignore[unresolved-attribute] + msg = f"Task {_get_task_name(task)} of type generator must be decorated with contextlib.asynccontextmanager." raise InvalidLifespanTaskTypeError(msg) task_name = _get_task_name(task) diff --git a/reflex/compiler/compiler.py b/reflex/compiler/compiler.py index 2e14faaf68e..d115d6e8d40 100644 --- a/reflex/compiler/compiler.py +++ b/reflex/compiler/compiler.py @@ -25,7 +25,7 @@ from reflex_base.plugins import CompileContext, CompilerHooks, PageContext, Plugin from reflex_base.style import SYSTEM_COLOR_MODE from reflex_base.utils.exceptions import ReflexError -from reflex_base.utils.format import to_title_case +from reflex_base.utils.format import callable_name, to_title_case from reflex_base.utils.imports import ImportVar from reflex_base.vars.base import LiteralVar, Var from reflex_components_core.base.app_wrap import AppWrap @@ -760,9 +760,10 @@ def readable_name_from_component( module = getmodule(component) if module is not None: module_name = module.__name__ + name = callable_name(component) if module_name is not None: - return f"{module_name}.{component.__name__}" # ty:ignore[unresolved-attribute] - return component.__name__ # ty:ignore[unresolved-attribute] + return f"{module_name}.{name}" + return name return None diff --git a/reflex/testing.py b/reflex/testing.py index fda04e35bb2..d9ce3541de1 100644 --- a/reflex/testing.py +++ b/reflex/testing.py @@ -30,6 +30,7 @@ from reflex_base.config import get_config from reflex_base.environment import environment from reflex_base.registry import RegistrationContext +from reflex_base.utils.format import callable_name from reflex_base.utils.types import ASGIApp from typing_extensions import Self @@ -151,14 +152,14 @@ def create( elif isinstance(app_source, functools.partial): keywords = app_source.keywords slug_suffix = "_".join([str(v) for v in keywords.values()]) - func_name = app_source.func.__name__ # ty:ignore[unresolved-attribute] + func_name = callable_name(app_source.func) app_name = f"{func_name}_{slug_suffix}" app_name = re.sub(r"[^a-zA-Z0-9_]", "_", app_name) elif isinstance(app_source, str): msg = "app_name must be provided when app_source is a string." raise ValueError(msg) else: - app_name = app_source.__name__ # ty:ignore[unresolved-attribute] + app_name = callable_name(app_source) app_name = app_name.lower() while "__" in app_name: @@ -402,10 +403,12 @@ def _wait_frontend(self): msg = "Frontend did not start" raise RuntimeError(msg) + stdout = self.frontend_process.stdout + def consume_frontend_output(): while True: try: - line = self.frontend_process.stdout.readline() # ty:ignore[unresolved-attribute] + line = stdout.readline() # catch I/O operation on closed file. except ValueError as e: console.error(str(e)) diff --git a/reflex/utils/tasks.py b/reflex/utils/tasks.py index 3c576d3e40a..e48a2d1d36d 100644 --- a/reflex/utils/tasks.py +++ b/reflex/utils/tasks.py @@ -7,6 +7,7 @@ from typing import Any from reflex_base.utils import console +from reflex_base.utils.format import callable_name async def _run_forever( @@ -31,6 +32,7 @@ async def _run_forever( """ last_regular_loop_start = 0 exception_count = 0 + fn_name = callable_name(coro_function) while True: # Reset the exception count when the limit window has elapsed since the last non-exception loop started. @@ -47,10 +49,10 @@ async def _run_forever( exception_count += 1 if exception_count >= exception_limit: console.error( - f"{coro_function.__name__}: task exceeded exception limit {exception_limit} within {exception_limit_window}s: {e}" # ty:ignore[unresolved-attribute] + f"{fn_name}: task exceeded exception limit {exception_limit} within {exception_limit_window}s: {e}" ) raise - console.error(f"{coro_function.__name__}: task error suppressed: {e}") # ty:ignore[unresolved-attribute] + console.error(f"{fn_name}: task error suppressed: {e}") await asyncio.sleep(exception_delay) continue raise @@ -105,7 +107,8 @@ def ensure_task( exception_limit_window=exception_limit_window, **kwargs, ) - task_name = f"reflex_ensure_task|{type(owner).__name__}.{task_attribute}={coro_function.__name__}|{time.time()}" # ty:ignore[unresolved-attribute] + fn_name = callable_name(coro_function) + task_name = f"reflex_ensure_task|{type(owner).__name__}.{task_attribute}={fn_name}|{time.time()}" if task_context is not None: # Run the task in the given context (not needed after Python 3.11+ which supports passing context to create_task directly). task = task_context.run(asyncio.create_task, rf_coro, name=task_name) From 64734b9458a78e8ad048bc6d7b1fc9e1a4a88427 Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Sun, 24 May 2026 12:22:26 +0200 Subject: [PATCH 15/57] some more typing stuff --- .../src/reflex_base/utils/types.py | 10 ++++--- .../reflex-base/src/reflex_base/vars/base.py | 15 ++++++----- reflex/compiler/compiler.py | 20 +++++--------- reflex/compiler/utils.py | 6 ++--- reflex/istate/manager/disk.py | 2 +- reflex/istate/proxy.py | 4 ++- tests/units/compiler/test_memoize_plugin.py | 26 +++++++------------ 7 files changed, 39 insertions(+), 44 deletions(-) diff --git a/packages/reflex-base/src/reflex_base/utils/types.py b/packages/reflex-base/src/reflex_base/utils/types.py index c99b4f482eb..e95037087e5 100644 --- a/packages/reflex-base/src/reflex_base/utils/types.py +++ b/packages/reflex-base/src/reflex_base/utils/types.py @@ -303,8 +303,9 @@ def has_args(cls: type) -> bool: return True # Check if the class inherits from a generic class (using __orig_bases__) - if hasattr(cls, "__orig_bases__"): - for base in cls.__orig_bases__: # ty:ignore[not-iterable] + orig_bases = getattr(cls, "__orig_bases__", None) + if orig_bases is not None: + for base in orig_bases: if get_args(base): return True @@ -929,13 +930,14 @@ def validate_literal(key: str, value: Any, expected_type: type, comp_name: str): """ from reflex_base.vars import Var + expected_args = get_args(expected_type) if ( is_literal(expected_type) and not isinstance(value, Var) # validating vars is not supported yet. and not is_encoded_fstring(value) # f-strings are not supported. - and value not in expected_type.__args__ # ty:ignore[unresolved-attribute] + and value not in expected_args ): - allowed_values = expected_type.__args__ # ty:ignore[unresolved-attribute] + allowed_values = expected_args if value not in allowed_values: allowed_value_str = ",".join([ str(v) if not isinstance(v, str) else f"'{v}'" for v in allowed_values diff --git a/packages/reflex-base/src/reflex_base/vars/base.py b/packages/reflex-base/src/reflex_base/vars/base.py index 9f15cca882f..67da89d497c 100644 --- a/packages/reflex-base/src/reflex_base/vars/base.py +++ b/packages/reflex-base/src/reflex_base/vars/base.py @@ -1744,7 +1744,7 @@ def wrapper(*args: P.args, **kwargs: P.kwargs) -> Var[T]: } return CustomVarOperation.create( - name=func.__name__, # ty:ignore[unresolved-attribute] + name=callable_name(func), args=tuple(list(args_vars.items()) + list(kwargs_vars.items())), return_var=func(*args_vars.values(), **kwargs_vars), # ty:ignore[invalid-argument-type] ).guess_type() @@ -2358,7 +2358,7 @@ def __get__(self, instance: None, owner: type) -> ComputedVar[RETURN_TYPE]: ... @overload def __get__(self, instance: BaseState, owner: type) -> RETURN_TYPE: ... - def __get__(self, instance: BaseState | None, owner: type): + def __get__(self, instance: BaseState | None, owner: type[BaseState]): """Get the ComputedVar value. If the value is already cached on the instance, return the cached value. @@ -2372,18 +2372,21 @@ def __get__(self, instance: BaseState | None, owner: type): """ if instance is None: state_where_defined = owner - while self._name in state_where_defined.inherited_vars: # ty:ignore[unresolved-attribute] - state_where_defined = state_where_defined.get_parent_state() # ty:ignore[unresolved-attribute] + while self._name in state_where_defined.inherited_vars: + parent = state_where_defined.get_parent_state() + if parent is None: + break + state_where_defined = parent field_name = ( - format_state_name(state_where_defined.get_full_name()) # ty:ignore[unresolved-attribute] + format_state_name(state_where_defined.get_full_name()) + "." + self._js_expr ) return dispatch( field_name, - var_data=VarData.from_state(state_where_defined, self._name), # ty:ignore[invalid-argument-type] + var_data=VarData.from_state(state_where_defined, self._name), result_var_type=self._var_type, existing_var=self, ) diff --git a/reflex/compiler/compiler.py b/reflex/compiler/compiler.py index d115d6e8d40..3ff22f4071f 100644 --- a/reflex/compiler/compiler.py +++ b/reflex/compiler/compiler.py @@ -892,23 +892,17 @@ def compile_unevaluated_page( component = Fragment.create(component) - meta_args = { - "title": ( + # Add meta information to the component. + utils.add_meta( + component, + title=( page.title if page.title is not None else make_default_page_title(get_config().app_name, route) ), - "image": page.image, - "meta": page.meta, - } - - if page.description is not None: - meta_args["description"] = page.description - - # Add meta information to the component. - utils.add_meta( - component, - **meta_args, # ty:ignore[invalid-argument-type] + image=page.image, + meta=page.meta, + description=page.description, ) except Exception as e: diff --git a/reflex/compiler/utils.py b/reflex/compiler/utils.py index e238c10219f..87e9b107d11 100644 --- a/reflex/compiler/utils.py +++ b/reflex/compiler/utils.py @@ -813,10 +813,10 @@ def get_memo_components_dir() -> str: def add_meta( page: Component, - title: str, - image: str, + title: str | Var, + image: str | Var, meta: Sequence[Mapping[str, Any] | Component], - description: str | None = None, + description: str | Var | None = None, ) -> Component: """Add metadata to a page. diff --git a/reflex/istate/manager/disk.py b/reflex/istate/manager/disk.py index d5f327c8969..ff8b6dc2b4e 100644 --- a/reflex/istate/manager/disk.py +++ b/reflex/istate/manager/disk.py @@ -198,7 +198,7 @@ async def get_state( if state is None: state = token.cls() self.states[token.cache_key] = state - return cast(TOKEN_TYPE, state) # ty:ignore[redundant-cast] + return state async def set_state_for_substate( self, token: StateToken[TOKEN_TYPE], substate: TOKEN_TYPE diff --git a/reflex/istate/proxy.py b/reflex/istate/proxy.py index c2bb149088d..f8f8ba5cf61 100644 --- a/reflex/istate/proxy.py +++ b/reflex/istate/proxy.py @@ -741,6 +741,8 @@ class ImmutableMutableProxy(MutableProxy): to modify the wrapped object when the StateProxy is immutable. """ + _self_state: StateProxy + # Ensure that recursively wrapped proxies use ImmutableMutableProxy as base. __base_proxy__ = "ImmutableMutableProxy" @@ -767,7 +769,7 @@ def _mark_dirty( Raises: ImmutableStateError: if the StateProxy is not mutable. """ - if not self._self_state._is_mutable(): # ty:ignore[unresolved-attribute] + if not self._self_state._is_mutable(): msg = ( "Background task StateProxy is immutable outside of a context " "manager. Use `async with self` to modify state." diff --git a/tests/units/compiler/test_memoize_plugin.py b/tests/units/compiler/test_memoize_plugin.py index 665b18e3579..96c6db42e63 100644 --- a/tests/units/compiler/test_memoize_plugin.py +++ b/tests/units/compiler/test_memoize_plugin.py @@ -307,14 +307,11 @@ def special_child() -> Component: lambda item: rx.text(item), ) if special_form == "cond": - return cast( - Component, - rx.cond( - SpecialFormMemoState.flag, - rx.text("yes"), - rx.text("no"), - ), - ) # ty:ignore[redundant-cast] + return rx.cond( + SpecialFormMemoState.flag, + rx.text("yes"), + rx.text("no"), + ) return cast( Component, rx.match( @@ -445,14 +442,11 @@ def test_common_memoization_snapshot_helper_classifies_snapshot_cases() -> None: lambda item: rx.text(item), ) ) - cond_fragment = cast( - Component, - rx.cond( - SpecialFormMemoState.flag, - rx.text("yes"), - rx.text("no"), - ), - ) # ty:ignore[redundant-cast] + cond_fragment = rx.cond( + SpecialFormMemoState.flag, + rx.text("yes"), + rx.text("no"), + ) match_fragment = cast( Component, rx.match( From d39f7c7dc89935df2804e996337bc59db2d4c343 Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Sun, 24 May 2026 12:37:25 +0200 Subject: [PATCH 16/57] eliminate more type ignores --- .../reflex-base/src/reflex_base/vars/base.py | 17 +++++++-- tests/integration/test_event_actions.py | 37 ++++++++++--------- tests/integration/test_exception_handlers.py | 3 +- tests/units/components/test_component.py | 9 +++-- 4 files changed, 40 insertions(+), 26 deletions(-) diff --git a/packages/reflex-base/src/reflex_base/vars/base.py b/packages/reflex-base/src/reflex_base/vars/base.py index 67da89d497c..7a46dc26c22 100644 --- a/packages/reflex-base/src/reflex_base/vars/base.py +++ b/packages/reflex-base/src/reflex_base/vars/base.py @@ -1327,9 +1327,18 @@ def __contains__(self, _: Any) -> Var: VAR_INSIDE = TypeVar("VAR_INSIDE") +@dataclasses.dataclass(eq=False, frozen=True) class ToOperation: """A var operation that converts a var to another type.""" + _js_expr: str = "" + _var_type: GenericType = Any + _var_data: VarData | None = None + _original: Var = dataclasses.field( + default_factory=lambda: Var(_js_expr="null", _var_type=None) + ) + _default_var_type: ClassVar[GenericType] = Any + def __getattr__(self, name: str) -> Any: """Get an attribute of the var. @@ -1386,10 +1395,10 @@ def create( The ToOperation. """ return cls( - _js_expr="", # ty:ignore[unknown-argument] - _var_data=_var_data, # ty:ignore[unknown-argument] - _var_type=_var_type or cls._default_var_type, # ty:ignore[unknown-argument, unresolved-attribute] - _original=value, # ty:ignore[unknown-argument] + _js_expr="", + _var_data=_var_data, + _var_type=_var_type or cls._default_var_type, + _original=value, ) diff --git a/tests/integration/test_event_actions.py b/tests/integration/test_event_actions.py index 6ab1720d9f7..cc72793801c 100644 --- a/tests/integration/test_event_actions.py +++ b/tests/integration/test_event_actions.py @@ -25,16 +25,19 @@ def TestEventAction(): class EventActionState(rx.State): order: list[str] - def on_click(self, ev): + @rx.event + def on_click(self, ev: str): self.order.append(f"on_click:{ev}") @rx.event def on_click2(self): self.order.append("on_click2") + @rx.event def on_click_throttle(self): self.order.append("on_click_throttle") + @rx.event def on_click_debounce(self): self.order.append("on_click_debounce") @@ -76,12 +79,12 @@ def index(): ), rx.button( "Click event", - on_click=EventActionState.on_click("no_event_actions"), # ty:ignore[invalid-argument-type, missing-argument] + on_click=EventActionState.on_click("no_event_actions"), id="btn-click-event", ), rx.button( "Click stop propagation", - on_click=EventActionState.on_click("stop_propagation").stop_propagation, # ty:ignore[invalid-argument-type, missing-argument] + on_click=EventActionState.on_click("stop_propagation").stop_propagation, id="btn-click-stop-propagation", ), rx.button( @@ -97,15 +100,15 @@ def index(): rx.link( "Link", href="?link", - on_click=EventActionState.on_click("link_no_event_actions"), # ty:ignore[invalid-argument-type, missing-argument] + on_click=EventActionState.on_click("link_no_event_actions"), id="link", ), rx.link( "Link Stop Propagation", href="?link-stop-propagation", on_click=EventActionState.on_click( - "link_stop_propagation" # ty:ignore[invalid-argument-type] - ).stop_propagation, # ty:ignore[missing-argument] + "link_stop_propagation" + ).stop_propagation, id="link-stop-propagation", ), rx.link( @@ -118,41 +121,41 @@ def index(): "Link Prevent Default", href="/invalid", on_click=EventActionState.on_click( - "link_prevent_default" # ty:ignore[invalid-argument-type] - ).prevent_default, # ty:ignore[missing-argument] + "link_prevent_default" + ).prevent_default, id="link-prevent-default", ), rx.link( "Link Both", href="/invalid", on_click=EventActionState.on_click( - "link_both" # ty:ignore[invalid-argument-type] - ).stop_propagation.prevent_default, # ty:ignore[missing-argument] + "link_both" + ).stop_propagation.prevent_default, id="link-stop-propagation-prevent-default", ), EventFiringComponent.create( id="custom-stop-propagation", on_click=EventActionState.on_click( - "custom-stop-propagation" # ty:ignore[invalid-argument-type] - ).stop_propagation, # ty:ignore[missing-argument] + "custom-stop-propagation" + ).stop_propagation, ), EventFiringComponent.create( id="custom-prevent-default", on_click=EventActionState.on_click( - "custom-prevent-default" # ty:ignore[invalid-argument-type] - ).prevent_default, # ty:ignore[missing-argument] + "custom-prevent-default" + ).prevent_default, ), rx.button( "Throttle", id="btn-throttle", on_click=lambda: ( - EventActionState.on_click_throttle.throttle(200).stop_propagation # ty:ignore[unresolved-attribute] + EventActionState.on_click_throttle.throttle(200).stop_propagation ), ), rx.button( "Debounce", id="btn-debounce", - on_click=EventActionState.on_click_debounce.debounce( # ty:ignore[unresolved-attribute] + on_click=EventActionState.on_click_debounce.debounce( 200 ).stop_propagation, ), @@ -163,7 +166,7 @@ def index(): ), id="event_order", ), - on_click=EventActionState.on_click("outer"), # ty:ignore[invalid-argument-type, missing-argument] + on_click=EventActionState.on_click("outer"), ), rx.form( rx.dialog.root( rx.dialog.trigger( diff --git a/tests/integration/test_exception_handlers.py b/tests/integration/test_exception_handlers.py index bdf956c7cf5..ce93196b1f4 100644 --- a/tests/integration/test_exception_handlers.py +++ b/tests/integration/test_exception_handlers.py @@ -32,6 +32,7 @@ class TestAppState(rx.State): def set_react_error(self, value: bool): self.react_error = value + @rx.event def divide_by_number(self, number: int): """Divide by number and print the result. @@ -53,7 +54,7 @@ def index(): ), rx.button( "induce_backend_error", - on_click=lambda: TestAppState.divide_by_number(0), # ty:ignore[invalid-argument-type, missing-argument] + on_click=lambda: TestAppState.divide_by_number(0), id="induce-backend-error-btn", ), rx.button( diff --git a/tests/units/components/test_component.py b/tests/units/components/test_component.py index 9074e8e91fc..b4964626e6f 100644 --- a/tests/units/components/test_component.py +++ b/tests/units/components/test_component.py @@ -1245,7 +1245,8 @@ class EventState(rx.State): def handler(self): """A handler that does nothing.""" - def handler2(self, arg): + @rx.event + def handler2(self, arg: int): """A handler that takes an arg. Args: @@ -1368,17 +1369,17 @@ def handler2(self, arg): id="direct-event-handler", ), pytest.param( - rx.fragment(on_blur=EventState.handler2(TEST_VAR)), # ty:ignore[invalid-argument-type, missing-argument] + rx.fragment(on_blur=EventState.handler2(TEST_VAR)), [ARG_VAR, TEST_VAR], id="direct-event-handler-arg", ), pytest.param( - rx.fragment(on_blur=EventState.handler2(EventState.v)), # ty:ignore[invalid-argument-type, missing-argument] + rx.fragment(on_blur=EventState.handler2(EventState.v)), [ARG_VAR, EventState.v], id="direct-event-handler-arg2", ), pytest.param( - rx.fragment(on_blur=lambda: EventState.handler2(TEST_VAR)), # ty:ignore[invalid-argument-type, missing-argument] + rx.fragment(on_blur=lambda: EventState.handler2(TEST_VAR)), [ARG_VAR, TEST_VAR], id="direct-event-handler-lambda", ), From 440e7b6bc7dbfc30e5f07176bed8e706e99d3c18 Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Sun, 24 May 2026 12:55:54 +0200 Subject: [PATCH 17/57] add passthrough_event_spec overload --- docs/app/reflex_docs/pages/docs/__init__.py | 1 + packages/reflex-base/src/reflex_base/event/__init__.py | 10 +++++++++- .../src/reflex_components_dataeditor/dataeditor.py | 2 +- .../components/base/context_menu.py | 2 +- .../reflex_components_internal/components/base/menu.py | 2 +- tests/units/istate/manager/test_expiration.py | 8 ++++---- 6 files changed, 17 insertions(+), 8 deletions(-) diff --git a/docs/app/reflex_docs/pages/docs/__init__.py b/docs/app/reflex_docs/pages/docs/__init__.py index 971ca615b7a..7884ab41225 100644 --- a/docs/app/reflex_docs/pages/docs/__init__.py +++ b/docs/app/reflex_docs/pages/docs/__init__.py @@ -328,5 +328,6 @@ def register_doc(virtual_doc: str, comp): get_component_docgen(_virtual, _actual, doc_title_from_path(_virtual)), ) + for name, ns in docs_ns.__dict__.items(): globals()[name] = ns diff --git a/packages/reflex-base/src/reflex_base/event/__init__.py b/packages/reflex-base/src/reflex_base/event/__init__.py index 538005f4b25..d4e8a4c0a06 100644 --- a/packages/reflex-base/src/reflex_base/event/__init__.py +++ b/packages/reflex-base/src/reflex_base/event/__init__.py @@ -1006,6 +1006,14 @@ def passthrough_event_spec( ) -> Callable[[Var[Any]], tuple[Var[Any]]]: ... +@overload +def passthrough_event_spec( + event_type_1: types.UnionType | type[T], + event_type2: types.UnionType | type[U], + /, +) -> Callable[[Var[Any], Var[Any]], tuple[Var[Any], Var[Any]]]: ... + + @overload def passthrough_event_spec(*event_types: type[T]) -> IdentityEventReturn[T]: ... @@ -2565,7 +2573,7 @@ def __get__( ) -> "EventCallback[Unpack[P]]": ... @overload - def __get__(self, instance: Any, owner: Any) -> "Callable[[Unpack[P]]]": ... # ty:ignore[invalid-type-form] + def __get__(self, instance: Any, owner: Any) -> "Callable[[Unpack[P]], Any]": ... def __get__(self, instance: Any, owner: Any) -> Callable: """Get the function with the instance bound to it. diff --git a/packages/reflex-components-dataeditor/src/reflex_components_dataeditor/dataeditor.py b/packages/reflex-components-dataeditor/src/reflex_components_dataeditor/dataeditor.py index b8f91d49f2a..b5399be80cc 100644 --- a/packages/reflex-components-dataeditor/src/reflex_components_dataeditor/dataeditor.py +++ b/packages/reflex-components-dataeditor/src/reflex_components_dataeditor/dataeditor.py @@ -364,7 +364,7 @@ class DataEditor(NoSSRComponent): ) on_finished_editing: EventHandler[ - passthrough_event_spec(GridCell | None, tuple[int, int]) # ty:ignore[no-matching-overload] + passthrough_event_spec(GridCell | None, tuple[int, int]) ] = field(doc="Fired when editing is finished.") on_row_appended: EventHandler[no_args_event_spec] = field( diff --git a/packages/reflex-components-internal/src/reflex_components_internal/components/base/context_menu.py b/packages/reflex-components-internal/src/reflex_components_internal/components/base/context_menu.py index 9b1ec268c98..2e69eba8c9b 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/components/base/context_menu.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/components/base/context_menu.py @@ -377,7 +377,7 @@ class ContextMenuRadioGroup(ContextMenuBaseComponent): value: Var[str | int] # Event handler called when the value changes. - on_value_change: EventHandler[passthrough_event_spec(str | int, dict)] # ty:ignore[no-matching-overload] + on_value_change: EventHandler[passthrough_event_spec(str | int, dict)] # Whether the component should ignore user interaction. Defaults to False. disabled: Var[bool] diff --git a/packages/reflex-components-internal/src/reflex_components_internal/components/base/menu.py b/packages/reflex-components-internal/src/reflex_components_internal/components/base/menu.py index dda6d6823fe..84429654c75 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/components/base/menu.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/components/base/menu.py @@ -461,7 +461,7 @@ class MenuRadioGroup(MenuBaseComponent): value: Var[str | int] # Function called when the selected value changes. - on_value_change: EventHandler[passthrough_event_spec(str | int, dict)] # ty:ignore[no-matching-overload] + on_value_change: EventHandler[passthrough_event_spec(str | int, dict)] # Whether the component should ignore user interaction. Defaults to False. disabled: Var[bool] diff --git a/tests/units/istate/manager/test_expiration.py b/tests/units/istate/manager/test_expiration.py index 3c14a600084..81462c868e2 100644 --- a/tests/units/istate/manager/test_expiration.py +++ b/tests/units/istate/manager/test_expiration.py @@ -91,7 +91,7 @@ async def test_memory_state_manager_get_state_refreshes_expiration( same_state = await state_manager_memory.get_state(state_token) assert same_state is state - assert state_manager_memory._token_expires_at[token] > expires_at # ty:ignore[unsupported-operator] + assert state_manager_memory._token_expires_at[token][0] > expires_at[0] await asyncio.sleep(0.6) @@ -116,7 +116,7 @@ async def test_memory_state_manager_set_state_refreshes_expiration( await state_manager_memory.set_state(state_token, state) - assert state_manager_memory._token_expires_at[token] > expires_at # ty:ignore[unsupported-operator] + assert state_manager_memory._token_expires_at[token][0] > expires_at[0] await asyncio.sleep(0.6) @@ -139,7 +139,7 @@ async def test_memory_state_manager_multiple_accesses_extend_expiration( for _ in range(3): await asyncio.sleep(0.25) assert await state_manager_memory.get_state(state_token) is state - assert state_manager_memory._token_expires_at[token] > expires_at # ty:ignore[unsupported-operator] + assert state_manager_memory._token_expires_at[token][0] > expires_at[0] expires_at = state_manager_memory._token_expires_at[token] await asyncio.sleep(0.6) @@ -202,7 +202,7 @@ async def test_memory_state_manager_refreshes_expiration_after_locked_access( await asyncio.sleep(1.2) assert token in state_manager_memory.states - assert state_manager_memory._token_expires_at[token] > expires_at # ty:ignore[unsupported-operator] + assert state_manager_memory._token_expires_at[token][0] > expires_at[0] await asyncio.sleep(0.6) From a10eff7fbccd5bb198b523943228cd80daee50f1 Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Sun, 24 May 2026 14:26:30 +0200 Subject: [PATCH 18/57] re-add docs --- docs/app/agent_files/_plugin.py | 9 +- docs/app/reflex_docs/components/hint.py | 6 +- docs/app/reflex_docs/pages/docs/__init__.py | 22 ++++- .../pages/docs/api_reference/plugins.py | 13 --- .../pages/docs/api_reference/utils.py | 13 --- .../reflex_docs/pages/docs/cloud_cliref.py | 13 +-- docs/app/reflex_docs/pages/docs/component.py | 35 ++++---- docs/app/reflex_docs/pages/docs/enterprise.py | 12 --- .../pages/docs/recipes_overview.py | 1 + docs/app/reflex_docs/pages/docs/source.py | 44 +++++----- .../pages/docs_landing/views/ai_builder.py | 8 +- .../pages/integrations/integration_gallery.py | 13 +-- .../pages/integrations/integration_list.py | 2 +- docs/app/reflex_docs/reflex_docs.py | 6 +- .../reflex_docs/templates/docpage/docpage.py | 86 +++++++++++-------- .../templates/docpage/feedback_state.py | 2 +- .../templates/docpage/sidebar/sidebar.py | 12 +-- .../sidebar/sidebar_items/component_lib.py | 5 +- .../docpage/sidebar/sidebar_items/item.py | 18 ++-- .../src/reflex_base/event/__init__.py | 15 +++- pyproject.toml | 1 - 21 files changed, 173 insertions(+), 163 deletions(-) delete mode 100644 docs/app/reflex_docs/pages/docs/api_reference/plugins.py delete mode 100644 docs/app/reflex_docs/pages/docs/api_reference/utils.py delete mode 100644 docs/app/reflex_docs/pages/docs/enterprise.py diff --git a/docs/app/agent_files/_plugin.py b/docs/app/agent_files/_plugin.py index c3e3aaba506..bfb40c90770 100644 --- a/docs/app/agent_files/_plugin.py +++ b/docs/app/agent_files/_plugin.py @@ -4,13 +4,16 @@ from dataclasses import dataclass from pathlib import Path from types import SimpleNamespace, UnionType -from typing import Any, Literal, Union, get_args, get_origin +from typing import TYPE_CHECKING, Any, Literal, Union, get_args, get_origin from reflex.constants import Dirs from reflex_base.config import get_config from reflex_base.plugins import CommonContext, Plugin from typing_extensions import Unpack +if TYPE_CHECKING: + from reflex_base.components.component import Component + MCP_DOC_PATHS = { "ai/integrations/mcp-installation.md", "ai/integrations/mcp-overview.md", @@ -373,7 +376,9 @@ def _component_from_frontmatter_ref(component_ref: str): raise ValueError(msg) -def _component_refs_from_source(source_path: Path) -> tuple[tuple[type, str], ...]: +def _component_refs_from_source( + source_path: Path, +) -> tuple[tuple[type["Component"], str], ...]: """Return component classes and display refs from a markdown source file.""" from reflex_docgen.markdown import parse_document diff --git a/docs/app/reflex_docs/components/hint.py b/docs/app/reflex_docs/components/hint.py index ac1e9817aa6..8a5d48ef42e 100644 --- a/docs/app/reflex_docs/components/hint.py +++ b/docs/app/reflex_docs/components/hint.py @@ -1,11 +1,13 @@ +from typing import Literal + import reflex as rx def hint( text: str, content: rx.Component, - side: str = "top", - align: str = "center", + side: Literal["bottom", "left", "right", "top"] = "top", + align: Literal["center", "end", "start"] = "center", active: bool = False, class_name: str = "", **props, diff --git a/docs/app/reflex_docs/pages/docs/__init__.py b/docs/app/reflex_docs/pages/docs/__init__.py index 7884ab41225..b86efb93bf3 100644 --- a/docs/app/reflex_docs/pages/docs/__init__.py +++ b/docs/app/reflex_docs/pages/docs/__init__.py @@ -2,8 +2,10 @@ from collections import defaultdict, namedtuple from pathlib import Path from types import SimpleNamespace +from typing import Any import reflex as rx +import reflex.utils.format from reflex_components_core.core.cond import Cond from reflex_docgen.markdown import parse_document @@ -304,7 +306,10 @@ def register_doc(virtual_doc: str, comp): route = doc_route_from_path(virtual_doc) build_nested_namespace( - docs_ns, path, title, Route(path=route, title=title2, component=lambda: "") + docs_ns, + path, + title, + Route(path=route, title=title2, component=rx.fragment), ) if comp is not None: @@ -329,5 +334,16 @@ def register_doc(virtual_doc: str, comp): ) -for name, ns in docs_ns.__dict__.items(): - globals()[name] = ns +def __getattr__(name: str) -> Any: + """Expose ``docs_ns`` sub-namespaces (``ai_builder``, ``enterprise``, ...). + + These names are populated lazily from the on-disk markdown layout, so + static analysers can't see them via the normal ``globals()`` write loop. + PEP 562 ``__getattr__`` lets ty resolve ``from reflex_docs.pages.docs import + ai_builder`` to ``Any`` instead of an unresolved-import error. + """ + try: + return docs_ns.__dict__[name] + except KeyError as exc: + msg = f"module {__name__!r} has no attribute {name!r}" + raise AttributeError(msg) from exc diff --git a/docs/app/reflex_docs/pages/docs/api_reference/plugins.py b/docs/app/reflex_docs/pages/docs/api_reference/plugins.py deleted file mode 100644 index 1e7da70536d..00000000000 --- a/docs/app/reflex_docs/pages/docs/api_reference/plugins.py +++ /dev/null @@ -1,13 +0,0 @@ -"""Plugins API reference page.""" - -import reflex as rx - -from reflex_docs.templates.docpage import docpage - - -@docpage("/api-reference/plugins/") -def plugins(): - """Plugins API reference page.""" - with open("docs/api-reference/plugins.md", encoding="utf-8") as f: - content = f.read() - return rx.markdown(content) diff --git a/docs/app/reflex_docs/pages/docs/api_reference/utils.py b/docs/app/reflex_docs/pages/docs/api_reference/utils.py deleted file mode 100644 index 21b9497e617..00000000000 --- a/docs/app/reflex_docs/pages/docs/api_reference/utils.py +++ /dev/null @@ -1,13 +0,0 @@ -"""Utils API reference page.""" - -import reflex as rx - -from reflex_docs.templates.docpage import docpage - - -@docpage("/api-reference/utils/") -def utils(): - """Utils API reference page.""" - with open("docs/api-reference/utils.md", encoding="utf-8") as f: - content = f.read() - return rx.markdown(content) diff --git a/docs/app/reflex_docs/pages/docs/cloud_cliref.py b/docs/app/reflex_docs/pages/docs/cloud_cliref.py index ee08864dcc8..ed569664336 100644 --- a/docs/app/reflex_docs/pages/docs/cloud_cliref.py +++ b/docs/app/reflex_docs/pages/docs/cloud_cliref.py @@ -173,8 +173,8 @@ def process( command: CommandInfoDict | MultiCommandInfoDict, prefix: str | None, override_name: str | None, -) -> Element: - """Convert a Click command to a Markdown element.""" +) -> None: + """Convert a Click command to a Markdown element and record it in ``cli_to_doc``.""" actual_name = override_name or command["name"] full_name = prefix + " " + actual_name if prefix and actual_name else actual_name cli_to_doc[full_name] = Section(( @@ -253,20 +253,21 @@ def process( ) -def process_command(command: click.Command, name: str) -> str: +def process_command(command: click.Command, name: str) -> None: """Convert a Click command to a Markdown text representation.""" with click.Context(command) as ctx: process(ctx.to_info_dict()["command"], None, name) +cli_command: click.Command = cli if find_spec("typer") is not None and find_spec("typer.main") is not None: - import typer # ty: ignore[unresolved-import] + import typer if isinstance(cli, typer.Typer): - cli = typer.main.get_command(cli) + cli_command = typer.main.get_command(cli) # Iterate over each command configuration -process_command(cli, "reflex") +process_command(cli_command, "reflex") REFLEX_PREFIX = "reflex" diff --git a/docs/app/reflex_docs/pages/docs/component.py b/docs/app/reflex_docs/pages/docs/component.py index 148216bfd46..82e46a29e8c 100644 --- a/docs/app/reflex_docs/pages/docs/component.py +++ b/docs/app/reflex_docs/pages/docs/component.py @@ -6,14 +6,21 @@ import textwrap from pathlib import Path from types import UnionType -from typing import Literal, Union, _GenericAlias, get_args, get_origin +from typing import ( + Any, + Literal, + Union, + _GenericAlias, # ty:ignore[unresolved-import] + get_args, + get_origin, +) import reflex as rx import reflex_components_internal as ui -from reflex.components.base.fragment import Fragment -from reflex.components.component import Component -from reflex.components.radix.primitives.base import RadixPrimitiveComponent -from reflex.components.radix.themes.base import RadixThemesComponent +from reflex_base.components.component import Component +from reflex_components_core.base.fragment import Fragment +from reflex_components_radix.primitives.base import RadixPrimitiveComponent +from reflex_components_radix.themes.base import RadixThemesComponent from reflex_docgen import ( EventHandlerDocumentation, PropDocumentation, @@ -28,16 +35,6 @@ ) from reflex_docs.templates.docpage import docpage, h1_comp, h2_comp - -def get_code_style(color: str): - return { - "color": rx.color(color, 11), - "border_radius": "0.25rem", - "border": f"1px solid {rx.color(color, 5)}", - "background": rx.color(color, 3), - } - - # Mapping from types to colors. TYPE_COLORS = { "int": "red", @@ -336,7 +333,7 @@ def prop_docs( color = TYPE_COLORS.get(short_type_name, "gray") description = prop.description or "" - is_long_row = len(description) > 160 or ( + is_long_row = len(description) > 160 or bool( literal_values and len(literal_values) > 8 and prop.name not in common_types ) @@ -389,7 +386,7 @@ def prop_docs( [ rx.code( f'"{v}"', - color_scheme=color, + color_scheme=color, # ty:ignore[invalid-argument-type] variant="soft", class_name="code-style leading-normal text-nowrap", ) @@ -399,7 +396,7 @@ def prop_docs( else [ rx.code( type_name, - color_scheme=color, + color_scheme=color, # ty:ignore[invalid-argument-type] variant="soft", class_name="code-style leading-normal whitespace-normal break-words", ) @@ -515,7 +512,7 @@ def generate_props( if prop.name.startswith("on_"): # ignore event trigger props continue cells, is_long_row, expanded_name, expanded = prop_docs(prop, component) - row_props = { + row_props: dict[str, Any] = { "class_name": ui.cn( "border-b border-slate-4 last:border-b-0 transition-colors hover:bg-slate-2", "group cursor-pointer" if is_long_row else "", diff --git a/docs/app/reflex_docs/pages/docs/enterprise.py b/docs/app/reflex_docs/pages/docs/enterprise.py deleted file mode 100644 index e78bebcb576..00000000000 --- a/docs/app/reflex_docs/pages/docs/enterprise.py +++ /dev/null @@ -1,12 +0,0 @@ -"""The enterprise documentation pages.""" - -from reflex_docs.templates.docpage import docpage - - -@docpage( - set_path="/enterprise/overview", - t="Overview | Enterprise", -) -def overview(): - """The enterprise overview page.""" - pass diff --git a/docs/app/reflex_docs/pages/docs/recipes_overview.py b/docs/app/reflex_docs/pages/docs/recipes_overview.py index bc51f72dea0..c8a337b2c22 100644 --- a/docs/app/reflex_docs/pages/docs/recipes_overview.py +++ b/docs/app/reflex_docs/pages/docs/recipes_overview.py @@ -1,4 +1,5 @@ import reflex as rx +import reflex.utils.format from reflex_docs.templates.docpage import docpage, h1_comp, h2_comp, text_comp_2 diff --git a/docs/app/reflex_docs/pages/docs/source.py b/docs/app/reflex_docs/pages/docs/source.py index fd15d5d82c0..f77649e1235 100644 --- a/docs/app/reflex_docs/pages/docs/source.py +++ b/docs/app/reflex_docs/pages/docs/source.py @@ -24,30 +24,26 @@ def format_fields( headers: list[str], fields: tuple[FieldDocumentation, ...], ) -> rx.Component: - return ( - rx.table.root( - rx.table.header( - rx.table.row(*[ - rx.table.column_header_cell( - header, class_name=table_header_class_name - ) - for header in headers - ]) - ), - rx.table.body( - *[ - rx.table.row( - rx.table.cell( - format_field(field), - ), - rx.table.cell( - render_markdown(field.description or ""), - class_name="font-small text-slate-11", - ), - ) - for field in fields - ], - ), + return rx.table.root( + rx.table.header( + rx.table.row(*[ + rx.table.column_header_cell(header, class_name=table_header_class_name) + for header in headers + ]) + ), + rx.table.body( + *[ + rx.table.row( + rx.table.cell( + format_field(field), + ), + rx.table.cell( + render_markdown(field.description or ""), + class_name="font-small text-slate-11", + ), + ) + for field in fields + ], ), ) diff --git a/docs/app/reflex_docs/pages/docs_landing/views/ai_builder.py b/docs/app/reflex_docs/pages/docs_landing/views/ai_builder.py index 52bb83c635e..9f9ab174d29 100644 --- a/docs/app/reflex_docs/pages/docs_landing/views/ai_builder.py +++ b/docs/app/reflex_docs/pages/docs_landing/views/ai_builder.py @@ -47,7 +47,7 @@ def get_integration_path() -> list: else: tag = "" - description = post.get("description", "").strip() + description = str(post.get("description") or "").strip() title = key.replace("_", " ").title() if title == "Open Ai": @@ -67,7 +67,11 @@ def get_integration_path() -> list: def card( - title: str, description: str, content: str, href: str, enteprise_only: bool = False + title: str, + description: str, + content: rx.Component, + href: str, + enteprise_only: bool = False, ) -> rx.Component: return rx.el.div( rx.el.span( diff --git a/docs/app/reflex_docs/pages/integrations/integration_gallery.py b/docs/app/reflex_docs/pages/integrations/integration_gallery.py index 6318a55c2d3..8e241384d9b 100644 --- a/docs/app/reflex_docs/pages/integrations/integration_gallery.py +++ b/docs/app/reflex_docs/pages/integrations/integration_gallery.py @@ -86,11 +86,14 @@ def integration_gallery_cards(data): class_name="flex flex-col gap-y-6 rounded-ui-xl border border-secondary-a4 bg-secondary-1 shadow-small p-6 h-[13rem] justify-between hover:bg-secondary-2", ), href=data["path"], - class_name="group text-inherit hover:!text-inherit decoration-none no-underline " - + rx.cond( - (selected_filter.value == data["tags"]) | (selected_filter.value == "All"), - "flex", - "hidden", + class_name=ui.cn( + "group text-inherit hover:!text-inherit decoration-none no-underline", + rx.cond( + (selected_filter.value == data["tags"]) + | (selected_filter.value == "All"), + "flex", + "hidden", + ), ), ) diff --git a/docs/app/reflex_docs/pages/integrations/integration_list.py b/docs/app/reflex_docs/pages/integrations/integration_list.py index 128dfc7297b..44ccb7d8a67 100644 --- a/docs/app/reflex_docs/pages/integrations/integration_list.py +++ b/docs/app/reflex_docs/pages/integrations/integration_list.py @@ -41,7 +41,7 @@ def get_integration_path() -> list: else: tag = "" - description = post.get("description", "").strip() + description = str(post.get("description") or "").strip() title = key.replace("_", " ").title() if title == "Open Ai": diff --git a/docs/app/reflex_docs/reflex_docs.py b/docs/app/reflex_docs/reflex_docs.py index d47d672b7bc..8f8d2de75ab 100644 --- a/docs/app/reflex_docs/reflex_docs.py +++ b/docs/app/reflex_docs/reflex_docs.py @@ -35,7 +35,7 @@ def _llms_txt_directive() -> rx.Component: # Create the app. app = rxe.App( - style=styles.BASE_STYLE, + style=styles.BASE_STYLE, # ty:ignore[invalid-argument-type] stylesheets=styles.STYLESHEETS, app_wraps={}, theme=rx.theme( @@ -44,7 +44,7 @@ def _llms_txt_directive() -> rx.Component: radius="large", accent_color="violet", ), - head_components=get_pixel_website_trackers() + head_components=get_pixel_website_trackers() # ty:ignore[invalid-argument-type] + favicons_links() + [ rx.el.link( @@ -106,7 +106,7 @@ def _llms_txt_directive() -> rx.Component: page_args["meta"].extend(route.meta) # Call add_page with the dynamically constructed arguments - app.add_page(**page_args) + app.add_page(**page_args) # ty:ignore[invalid-argument-type] # Add redirects. redirects = [ diff --git a/docs/app/reflex_docs/templates/docpage/docpage.py b/docs/app/reflex_docs/templates/docpage/docpage.py index 5ba080dcc8c..d33f55f8a92 100644 --- a/docs/app/reflex_docs/templates/docpage/docpage.py +++ b/docs/app/reflex_docs/templates/docpage/docpage.py @@ -6,10 +6,10 @@ import reflex as rx import reflex_components_internal as ui -from reflex.components.radix.themes.base import LiteralAccentColor from reflex.experimental.client_state import ClientStateVar from reflex.utils.format import to_snake_case, to_title_case from reflex_base.event import run_script +from reflex_components_radix.themes.base import LiteralAccentColor from reflex_site_shared.backend.status import StatusState from reflex_site_shared.components.blocks.code import * from reflex_site_shared.components.blocks.demo import * @@ -57,9 +57,11 @@ class FeedbackState(rx.State): score: int = -1 + @rx.event def set_score(self, score: int): self.score = score + @rx.event def handle_submit(self, form_data: dict): pass @@ -144,7 +146,7 @@ def thumbs_cards() -> rx.Component: ) -def feedback_choice_button(label: str, icon: str, score: int, class_name: str): +def feedback_choice_button(label: str, icon: str, score: int, class_name: str | rx.Var): active = FeedbackState.score == score return rx.el.button( ui.icon(icon), @@ -771,7 +773,11 @@ def docpage(contents: Callable[[], Route]) -> Route: path = get_path(contents, "reflex-docs/pages") if set_path is None else set_path _register_doc_route(path) - title = contents.__name__.replace("_", " ").title() if t is None else t + title = ( + getattr(contents, "__name__", "page").replace("_", " ").title() + if t is None + else t + ) @functools.wraps(contents) def wrapper(*args, **kwargs) -> rx.Component: @@ -842,8 +848,8 @@ def wrapper(*args, **kwargs) -> rx.Component: else: links.append(rx.fragment()) - toc = [] - doc_content = None + toc: list = [] + doc_content: str | None = None if not isinstance(contents, rx.Component): comp = contents(*args, **kwargs) else: @@ -853,11 +859,11 @@ def wrapper(*args, **kwargs) -> rx.Component: first, second = comp # Check if first is (toc, doc_content) from get_toc if isinstance(first, tuple) and len(first) == 2: - toc, doc_content = first + toc, doc_content = first # ty:ignore[invalid-assignment] comp = second else: # Legacy format: (toc, comp) - toc, comp = first, second + toc, comp = first, second # ty:ignore[invalid-assignment] show_right_sidebar = right_sidebar and len(toc) >= 2 return rx.box( @@ -865,14 +871,14 @@ def wrapper(*args, **kwargs) -> rx.Component: rx.el.main( rx.box( sidebar, - class_name=( - "w-[19.5rem] shrink-0 hidden lg:block z-10 border-r border-m-slate-4 dark:border-m-slate-10 sticky left-0 " - "before:content-[''] before:absolute before:top-0 before:bottom-0 before:right-0 before:w-[100vw] before:bg-white-1 dark:before:bg-secondary-2 before:-z-10 " - + rx.cond( + class_name=ui.cn( + "w-[19.5rem] shrink-0 hidden lg:block z-10 border-r border-m-slate-4 dark:border-m-slate-10 sticky left-0", + "before:content-[''] before:absolute before:top-0 before:bottom-0 before:right-0 before:w-[100vw] before:bg-white-1 dark:before:bg-secondary-2 before:-z-10", + rx.cond( HostingBannerState.is_banner_visible, - " top-[113px] h-[calc(100vh-113px)]", - " top-[77px] h-[calc(100vh-77px)]", - ) + "top-[113px] h-[calc(100vh-113px)]", + "top-[77px] h-[calc(100vh-77px)]", + ), ), ), rx.box( @@ -882,13 +888,13 @@ def wrapper(*args, **kwargs) -> rx.Component: nav_sidebar=nav_sidebar, doc_content=doc_content, ), - class_name=( - "px-0 pt-0 mb-[2rem]" - + rx.cond( + class_name=ui.cn( + "px-0 pt-0 mb-[2rem]", + rx.cond( HostingBannerState.is_banner_visible, - " mt-[90px]", + "mt-[90px]", "", - ) + ), ), ), rx.box( @@ -967,13 +973,13 @@ def wrapper(*args, **kwargs) -> rx.Component: ), class_name="flex flex-col justify-start gap-y-4 overflow-y-auto sticky top-4", ), - class_name=( - "w-full h-full" - + rx.cond( + class_name=ui.cn( + "w-full h-full", + rx.cond( HostingBannerState.is_banner_visible, - " mt-[146px]", - " mt-[90px]", - ) + "mt-[146px]", + "mt-[90px]", + ), ), ), class_name=( @@ -1060,7 +1066,7 @@ def dict_to_formatted_string(input_dict): def used_component( - component_used: rx.Component, + component_used: Callable[..., rx.Component], components_passed: rx.Component | str | None, color_scheme: str, variant: str, @@ -1106,7 +1112,7 @@ def used_component( def style_grid( - component_used: rx.Component, + component_used: Callable[..., rx.Component], component_used_str: str, variants: list, components_passed: rx.Component | str | None = None, @@ -1221,7 +1227,7 @@ def style_grid( rx.html( """""" ), - color_scheme=RadixDocState.color, + color_scheme=RadixDocState.color, # ty:ignore[invalid-argument-type] variant="surface", class_name="justify-between w-32", ), @@ -1234,20 +1240,24 @@ def style_grid( rx.icon( "check", size=15, - class_name="top-1/2 left-1/2 absolute text-gray-12 transform -translate-x-1/2 -translate-y-1/2" - + rx.cond( - RadixDocState.color == color, - " block", - " hidden", + class_name=ui.cn( + "top-1/2 left-1/2 absolute text-gray-12 transform -translate-x-1/2 -translate-y-1/2", + rx.cond( + RadixDocState.color == color, + "block", + "hidden", + ), ), ), on_click=RadixDocState.set_color(color), background_color=f"var(--{color}-9)", - class_name="relative rounded-md cursor-pointer shrink-0 size-[30px]" - + rx.cond( - RadixDocState.color == color, - " border-2 border-gray-12", - "", + class_name=ui.cn( + "relative rounded-md cursor-pointer shrink-0 size-[30px]", + rx.cond( + RadixDocState.color == color, + "border-2 border-gray-12", + "", + ), ), ) for color in list(map(str, LiteralAccentColor.__args__)) diff --git a/docs/app/reflex_docs/templates/docpage/feedback_state.py b/docs/app/reflex_docs/templates/docpage/feedback_state.py index 207172f5c8a..66716e7a1df 100644 --- a/docs/app/reflex_docs/templates/docpage/feedback_state.py +++ b/docs/app/reflex_docs/templates/docpage/feedback_state.py @@ -71,7 +71,7 @@ def handle_submit(self, form_data: dict): ) # Send to general webhook (suppressed errors) - with contextlib.suppress(httpx.HTTPError) and httpx.Client() as client: + with contextlib.suppress(httpx.HTTPError), httpx.Client() as client: client.post( REFLEX_DEV_WEB_GENERAL_FORM_FEEDBACK_WEBHOOK_URL, json=form_data, diff --git a/docs/app/reflex_docs/templates/docpage/sidebar/sidebar.py b/docs/app/reflex_docs/templates/docpage/sidebar/sidebar.py index b9d8ad16006..cee4929b866 100644 --- a/docs/app/reflex_docs/templates/docpage/sidebar/sidebar.py +++ b/docs/app/reflex_docs/templates/docpage/sidebar/sidebar.py @@ -622,17 +622,17 @@ def sidebar_comp( html_lib_index, url, ), - rx.link( # ty:ignore[missing-argument, unknown-argument, call-non-callable, too-many-positional-arguments, no-matching-overload] - rx.box( # ty:ignore[missing-argument, unknown-argument, call-non-callable, too-many-positional-arguments, no-matching-overload] - rx.box( # ty:ignore[missing-argument, unknown-argument, call-non-callable, too-many-positional-arguments, no-matching-overload] - rx.icon("atom", size=16), # ty:ignore[missing-argument, unknown-argument, call-non-callable, too-many-positional-arguments, no-matching-overload] + rx.link( + rx.box( + rx.box( + rx.icon("atom", size=16), rx.el.h5( "Custom Components", class_name="font-smbold text-[0.875rem] text-slate-12 leading-5 tracking-[-0.01313rem] transition-color", ), class_name="flex flex-row items-center gap-3 text-slate-12", ), - rx.text( # ty:ignore[missing-argument, unknown-argument, call-non-callable, too-many-positional-arguments, no-matching-overload] + rx.text( "See what components people have made with Reflex!", class_name="font-small text-slate-9", ), @@ -727,7 +727,7 @@ def sidebar_comp( rx.cond(is_docs_ai_builder, ai_builder_content, docs_content), ) - return rx.box( # ty:ignore[missing-argument, unknown-argument, call-non-callable, too-many-positional-arguments, no-matching-overload] + return rx.box( categories, content, style={ diff --git a/docs/app/reflex_docs/templates/docpage/sidebar/sidebar_items/component_lib.py b/docs/app/reflex_docs/templates/docpage/sidebar/sidebar_items/component_lib.py index 10260aaa5f0..18805c11a38 100644 --- a/docs/app/reflex_docs/templates/docpage/sidebar/sidebar_items/component_lib.py +++ b/docs/app/reflex_docs/templates/docpage/sidebar/sidebar_items/component_lib.py @@ -1,5 +1,4 @@ -import reflex as rx -from reflex.utils.format import to_snake_case, to_title_case +from reflex.utils.format import to_kebab_case, to_snake_case, to_title_case from ..state import SideBarItem @@ -38,7 +37,7 @@ def sort_html_components(components: list) -> list: def get_component_link(category, clist, prefix="") -> str: - component_name = rx.utils.format.to_kebab_case(clist[0]) + component_name = to_kebab_case(clist[0]) # construct the component link. The component name points to the name of the md file. return f"/library/{prefix.strip('/') + '/' if prefix.strip('/') else ''}{category.lower().replace(' ', '-')}/{component_name.lower()}" diff --git a/docs/app/reflex_docs/templates/docpage/sidebar/sidebar_items/item.py b/docs/app/reflex_docs/templates/docpage/sidebar/sidebar_items/item.py index 4c70332b5e3..1035936f9e5 100644 --- a/docs/app/reflex_docs/templates/docpage/sidebar/sidebar_items/item.py +++ b/docs/app/reflex_docs/templates/docpage/sidebar/sidebar_items/item.py @@ -1,14 +1,22 @@ import re +from typing import overload from reflex_site_shared.route import Route from ..state import SideBarItem -def create_item(route: Route, children=None): - """Create a sidebar item from a route.""" - if children is None: - name = route.title +@overload +def create_item(route: Route, children: None = None) -> SideBarItem: ... +@overload +def create_item(route: str, children: list[Route]) -> SideBarItem: ... +def create_item(route: Route | str, children: list[Route] | None = None) -> SideBarItem: + """Create a sidebar item from a route, or a parent item with children.""" + if isinstance(route, Route): + # Sidebar routes always set ``title`` to a plain string at construction + # time; the ``Route.title: str | Var | None`` field permits reactive + # titles in the general framework but they are never used here. + name = route.title if isinstance(route.title, str) else "" url = route.path # For "Overview", we want to keep the qualifier prefix ("Components overview") alt_name_for_next_prev = name if name.endswith("Overview") else "" @@ -31,5 +39,5 @@ def create_item(route: Route, children=None): ) return SideBarItem( names=route, - children=list(map(create_item, children)), + children=list(map(create_item, children or [])), ) diff --git a/packages/reflex-base/src/reflex_base/event/__init__.py b/packages/reflex-base/src/reflex_base/event/__init__.py index d4e8a4c0a06..06b97e2bb8b 100644 --- a/packages/reflex-base/src/reflex_base/event/__init__.py +++ b/packages/reflex-base/src/reflex_base/event/__init__.py @@ -13,6 +13,7 @@ TYPE_CHECKING, Annotated, Any, + ClassVar, Generic, Literal, NoReturn, @@ -2663,6 +2664,12 @@ def __call__(self, *args: Var) -> Any: class EventNamespace: """A namespace for event related classes.""" + if TYPE_CHECKING: + event: ClassVar["type[EventNamespace]"] + __path__: ClassVar[Any] + __spec__: ClassVar[Any] + __package__: ClassVar[str | None] + # Core Event Classes Event = Event EventActionsMixin = EventActionsMixin @@ -2929,9 +2936,9 @@ def BaseState(self) -> "type[BaseState]": # noqa: N802 # ty:ignore[invalid-typ event = EventNamespace -event.event = event # ty:ignore[unresolved-attribute] +event.event = event _this = sys.modules[__name__] -event.__path__ = _this.__path__ # ty:ignore[unresolved-attribute] -event.__spec__ = _this.__spec__ # ty:ignore[unresolved-attribute] -event.__package__ = _this.__package__ # ty:ignore[unresolved-attribute] +event.__path__ = _this.__path__ +event.__spec__ = _this.__spec__ +event.__package__ = _this.__package__ sys.modules[__name__] = event # ty:ignore[invalid-assignment] diff --git a/pyproject.toml b/pyproject.toml index 4d083b7a0a3..2168bcd6983 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -149,7 +149,6 @@ exclude = [ "**/.*", "**/.templates", "**/node_modules", - "docs", "packages/reflex-site-shared", "packages/integrations-docs", ] From 114e076b3032c8250f91b18a7ca1740f4ad2d1ce Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Mon, 25 May 2026 10:28:46 +0200 Subject: [PATCH 19/57] fix docs --- docs/app/reflex_docs/pages/docs/__init__.py | 28 ++++++++++++------- .../docpage/sidebar/sidebar_items/learn.py | 6 ++-- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/docs/app/reflex_docs/pages/docs/__init__.py b/docs/app/reflex_docs/pages/docs/__init__.py index b86efb93bf3..216160d6e89 100644 --- a/docs/app/reflex_docs/pages/docs/__init__.py +++ b/docs/app/reflex_docs/pages/docs/__init__.py @@ -22,8 +22,8 @@ from .apiref import pages as apiref_pages from .cloud import pages as cloud_pages from .cloud_cliref import pages as cloud_cliref_pages -from .custom_components import custom_components -from .library import library +from .custom_components import custom_components as _custom_components_route +from .library import library as _library_route from .recipes_overview import overview SPECIAL_COMPONENT_DOCS = { @@ -275,8 +275,8 @@ def comp(_actual=actual_path, _virtual=virtual_doc): doc_markdown_sources[_route] = _actual doc_routes = [ - library, - custom_components, + _library_route, + _custom_components_route, overview, *components_previews_pages, *apiref_pages, @@ -323,7 +323,7 @@ def register_doc(virtual_doc: str, comp): # Alias needed by sidebar — the library page route object. -library_: Route = library # type: ignore[assignment] +library_: Route = _library_route # Process all docs via reflex_docgen pipeline. @@ -334,13 +334,21 @@ def register_doc(virtual_doc: str, comp): ) +for _name, _ns in docs_ns.__dict__.items(): + globals()[_name] = _ns + + def __getattr__(name: str) -> Any: - """Expose ``docs_ns`` sub-namespaces (``ai_builder``, ``enterprise``, ...). + """Resolve ``docs_ns`` sub-namespaces for static analysers. + + Args: + name: The attribute name being looked up. + + Returns: + The matching ``docs_ns`` sub-namespace. - These names are populated lazily from the on-disk markdown layout, so - static analysers can't see them via the normal ``globals()`` write loop. - PEP 562 ``__getattr__`` lets ty resolve ``from reflex_docs.pages.docs import - ai_builder`` to ``Any`` instead of an unresolved-import error. + Raises: + AttributeError: If ``name`` is not a known sub-namespace. """ try: return docs_ns.__dict__[name] diff --git a/docs/app/reflex_docs/templates/docpage/sidebar/sidebar_items/learn.py b/docs/app/reflex_docs/templates/docpage/sidebar/sidebar_items/learn.py index c879c0e84a6..51786a41acb 100644 --- a/docs/app/reflex_docs/templates/docpage/sidebar/sidebar_items/learn.py +++ b/docs/app/reflex_docs/templates/docpage/sidebar/sidebar_items/learn.py @@ -108,9 +108,9 @@ def get_sidebar_items_frontend(): create_item( "Custom Components", children=[ - custom_components.overview, - custom_components.prerequisites_for_publishing, - custom_components.command_reference, + custom_components.overview, # ty:ignore[unresolved-attribute] + custom_components.prerequisites_for_publishing, # ty:ignore[unresolved-attribute] + custom_components.command_reference, # ty:ignore[unresolved-attribute] ], ), ] From 0e31f36cc1ee2105835549bd7110f74e8cfd82d9 Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Mon, 25 May 2026 12:51:10 +0200 Subject: [PATCH 20/57] revert docs --- docs/app/agent_files/_plugin.py | 9 +- docs/app/reflex_docs/components/hint.py | 6 +- docs/app/reflex_docs/pages/docs/__init__.py | 41 ++------- .../pages/docs/api_reference/plugins.py | 13 +++ .../pages/docs/api_reference/utils.py | 13 +++ .../reflex_docs/pages/docs/cloud_cliref.py | 13 ++- docs/app/reflex_docs/pages/docs/component.py | 35 ++++---- docs/app/reflex_docs/pages/docs/enterprise.py | 12 +++ .../pages/docs/recipes_overview.py | 1 - docs/app/reflex_docs/pages/docs/source.py | 44 +++++----- .../pages/docs_landing/views/ai_builder.py | 8 +- .../pages/integrations/integration_gallery.py | 13 ++- .../pages/integrations/integration_list.py | 2 +- docs/app/reflex_docs/reflex_docs.py | 6 +- .../reflex_docs/templates/docpage/docpage.py | 86 ++++++++----------- .../templates/docpage/feedback_state.py | 2 +- .../templates/docpage/sidebar/sidebar.py | 12 +-- .../sidebar/sidebar_items/component_lib.py | 5 +- .../docpage/sidebar/sidebar_items/item.py | 18 ++-- .../docpage/sidebar/sidebar_items/learn.py | 6 +- docs/app/reflex_docs/utils/http.py | 2 +- pyproject.toml | 1 + 22 files changed, 168 insertions(+), 180 deletions(-) create mode 100644 docs/app/reflex_docs/pages/docs/api_reference/plugins.py create mode 100644 docs/app/reflex_docs/pages/docs/api_reference/utils.py create mode 100644 docs/app/reflex_docs/pages/docs/enterprise.py diff --git a/docs/app/agent_files/_plugin.py b/docs/app/agent_files/_plugin.py index bfb40c90770..c3e3aaba506 100644 --- a/docs/app/agent_files/_plugin.py +++ b/docs/app/agent_files/_plugin.py @@ -4,16 +4,13 @@ from dataclasses import dataclass from pathlib import Path from types import SimpleNamespace, UnionType -from typing import TYPE_CHECKING, Any, Literal, Union, get_args, get_origin +from typing import Any, Literal, Union, get_args, get_origin from reflex.constants import Dirs from reflex_base.config import get_config from reflex_base.plugins import CommonContext, Plugin from typing_extensions import Unpack -if TYPE_CHECKING: - from reflex_base.components.component import Component - MCP_DOC_PATHS = { "ai/integrations/mcp-installation.md", "ai/integrations/mcp-overview.md", @@ -376,9 +373,7 @@ def _component_from_frontmatter_ref(component_ref: str): raise ValueError(msg) -def _component_refs_from_source( - source_path: Path, -) -> tuple[tuple[type["Component"], str], ...]: +def _component_refs_from_source(source_path: Path) -> tuple[tuple[type, str], ...]: """Return component classes and display refs from a markdown source file.""" from reflex_docgen.markdown import parse_document diff --git a/docs/app/reflex_docs/components/hint.py b/docs/app/reflex_docs/components/hint.py index 8a5d48ef42e..ac1e9817aa6 100644 --- a/docs/app/reflex_docs/components/hint.py +++ b/docs/app/reflex_docs/components/hint.py @@ -1,13 +1,11 @@ -from typing import Literal - import reflex as rx def hint( text: str, content: rx.Component, - side: Literal["bottom", "left", "right", "top"] = "top", - align: Literal["center", "end", "start"] = "center", + side: str = "top", + align: str = "center", active: bool = False, class_name: str = "", **props, diff --git a/docs/app/reflex_docs/pages/docs/__init__.py b/docs/app/reflex_docs/pages/docs/__init__.py index 216160d6e89..971ca615b7a 100644 --- a/docs/app/reflex_docs/pages/docs/__init__.py +++ b/docs/app/reflex_docs/pages/docs/__init__.py @@ -2,10 +2,8 @@ from collections import defaultdict, namedtuple from pathlib import Path from types import SimpleNamespace -from typing import Any import reflex as rx -import reflex.utils.format from reflex_components_core.core.cond import Cond from reflex_docgen.markdown import parse_document @@ -22,8 +20,8 @@ from .apiref import pages as apiref_pages from .cloud import pages as cloud_pages from .cloud_cliref import pages as cloud_cliref_pages -from .custom_components import custom_components as _custom_components_route -from .library import library as _library_route +from .custom_components import custom_components +from .library import library from .recipes_overview import overview SPECIAL_COMPONENT_DOCS = { @@ -275,8 +273,8 @@ def comp(_actual=actual_path, _virtual=virtual_doc): doc_markdown_sources[_route] = _actual doc_routes = [ - _library_route, - _custom_components_route, + library, + custom_components, overview, *components_previews_pages, *apiref_pages, @@ -306,10 +304,7 @@ def register_doc(virtual_doc: str, comp): route = doc_route_from_path(virtual_doc) build_nested_namespace( - docs_ns, - path, - title, - Route(path=route, title=title2, component=rx.fragment), + docs_ns, path, title, Route(path=route, title=title2, component=lambda: "") ) if comp is not None: @@ -323,7 +318,7 @@ def register_doc(virtual_doc: str, comp): # Alias needed by sidebar — the library page route object. -library_: Route = _library_route +library_: Route = library # type: ignore[assignment] # Process all docs via reflex_docgen pipeline. @@ -333,25 +328,5 @@ def register_doc(virtual_doc: str, comp): get_component_docgen(_virtual, _actual, doc_title_from_path(_virtual)), ) - -for _name, _ns in docs_ns.__dict__.items(): - globals()[_name] = _ns - - -def __getattr__(name: str) -> Any: - """Resolve ``docs_ns`` sub-namespaces for static analysers. - - Args: - name: The attribute name being looked up. - - Returns: - The matching ``docs_ns`` sub-namespace. - - Raises: - AttributeError: If ``name`` is not a known sub-namespace. - """ - try: - return docs_ns.__dict__[name] - except KeyError as exc: - msg = f"module {__name__!r} has no attribute {name!r}" - raise AttributeError(msg) from exc +for name, ns in docs_ns.__dict__.items(): + globals()[name] = ns diff --git a/docs/app/reflex_docs/pages/docs/api_reference/plugins.py b/docs/app/reflex_docs/pages/docs/api_reference/plugins.py new file mode 100644 index 00000000000..1e7da70536d --- /dev/null +++ b/docs/app/reflex_docs/pages/docs/api_reference/plugins.py @@ -0,0 +1,13 @@ +"""Plugins API reference page.""" + +import reflex as rx + +from reflex_docs.templates.docpage import docpage + + +@docpage("/api-reference/plugins/") +def plugins(): + """Plugins API reference page.""" + with open("docs/api-reference/plugins.md", encoding="utf-8") as f: + content = f.read() + return rx.markdown(content) diff --git a/docs/app/reflex_docs/pages/docs/api_reference/utils.py b/docs/app/reflex_docs/pages/docs/api_reference/utils.py new file mode 100644 index 00000000000..21b9497e617 --- /dev/null +++ b/docs/app/reflex_docs/pages/docs/api_reference/utils.py @@ -0,0 +1,13 @@ +"""Utils API reference page.""" + +import reflex as rx + +from reflex_docs.templates.docpage import docpage + + +@docpage("/api-reference/utils/") +def utils(): + """Utils API reference page.""" + with open("docs/api-reference/utils.md", encoding="utf-8") as f: + content = f.read() + return rx.markdown(content) diff --git a/docs/app/reflex_docs/pages/docs/cloud_cliref.py b/docs/app/reflex_docs/pages/docs/cloud_cliref.py index ed569664336..b8051fba339 100644 --- a/docs/app/reflex_docs/pages/docs/cloud_cliref.py +++ b/docs/app/reflex_docs/pages/docs/cloud_cliref.py @@ -173,8 +173,8 @@ def process( command: CommandInfoDict | MultiCommandInfoDict, prefix: str | None, override_name: str | None, -) -> None: - """Convert a Click command to a Markdown element and record it in ``cli_to_doc``.""" +) -> Element: + """Convert a Click command to a Markdown element.""" actual_name = override_name or command["name"] full_name = prefix + " " + actual_name if prefix and actual_name else actual_name cli_to_doc[full_name] = Section(( @@ -253,21 +253,20 @@ def process( ) -def process_command(command: click.Command, name: str) -> None: +def process_command(command: click.Command, name: str) -> str: """Convert a Click command to a Markdown text representation.""" with click.Context(command) as ctx: process(ctx.to_info_dict()["command"], None, name) -cli_command: click.Command = cli if find_spec("typer") is not None and find_spec("typer.main") is not None: - import typer + import typer # pyright: ignore[reportMissingImports] if isinstance(cli, typer.Typer): - cli_command = typer.main.get_command(cli) + cli = typer.main.get_command(cli) # Iterate over each command configuration -process_command(cli_command, "reflex") +process_command(cli, "reflex") REFLEX_PREFIX = "reflex" diff --git a/docs/app/reflex_docs/pages/docs/component.py b/docs/app/reflex_docs/pages/docs/component.py index 82e46a29e8c..148216bfd46 100644 --- a/docs/app/reflex_docs/pages/docs/component.py +++ b/docs/app/reflex_docs/pages/docs/component.py @@ -6,21 +6,14 @@ import textwrap from pathlib import Path from types import UnionType -from typing import ( - Any, - Literal, - Union, - _GenericAlias, # ty:ignore[unresolved-import] - get_args, - get_origin, -) +from typing import Literal, Union, _GenericAlias, get_args, get_origin import reflex as rx import reflex_components_internal as ui -from reflex_base.components.component import Component -from reflex_components_core.base.fragment import Fragment -from reflex_components_radix.primitives.base import RadixPrimitiveComponent -from reflex_components_radix.themes.base import RadixThemesComponent +from reflex.components.base.fragment import Fragment +from reflex.components.component import Component +from reflex.components.radix.primitives.base import RadixPrimitiveComponent +from reflex.components.radix.themes.base import RadixThemesComponent from reflex_docgen import ( EventHandlerDocumentation, PropDocumentation, @@ -35,6 +28,16 @@ ) from reflex_docs.templates.docpage import docpage, h1_comp, h2_comp + +def get_code_style(color: str): + return { + "color": rx.color(color, 11), + "border_radius": "0.25rem", + "border": f"1px solid {rx.color(color, 5)}", + "background": rx.color(color, 3), + } + + # Mapping from types to colors. TYPE_COLORS = { "int": "red", @@ -333,7 +336,7 @@ def prop_docs( color = TYPE_COLORS.get(short_type_name, "gray") description = prop.description or "" - is_long_row = len(description) > 160 or bool( + is_long_row = len(description) > 160 or ( literal_values and len(literal_values) > 8 and prop.name not in common_types ) @@ -386,7 +389,7 @@ def prop_docs( [ rx.code( f'"{v}"', - color_scheme=color, # ty:ignore[invalid-argument-type] + color_scheme=color, variant="soft", class_name="code-style leading-normal text-nowrap", ) @@ -396,7 +399,7 @@ def prop_docs( else [ rx.code( type_name, - color_scheme=color, # ty:ignore[invalid-argument-type] + color_scheme=color, variant="soft", class_name="code-style leading-normal whitespace-normal break-words", ) @@ -512,7 +515,7 @@ def generate_props( if prop.name.startswith("on_"): # ignore event trigger props continue cells, is_long_row, expanded_name, expanded = prop_docs(prop, component) - row_props: dict[str, Any] = { + row_props = { "class_name": ui.cn( "border-b border-slate-4 last:border-b-0 transition-colors hover:bg-slate-2", "group cursor-pointer" if is_long_row else "", diff --git a/docs/app/reflex_docs/pages/docs/enterprise.py b/docs/app/reflex_docs/pages/docs/enterprise.py new file mode 100644 index 00000000000..e78bebcb576 --- /dev/null +++ b/docs/app/reflex_docs/pages/docs/enterprise.py @@ -0,0 +1,12 @@ +"""The enterprise documentation pages.""" + +from reflex_docs.templates.docpage import docpage + + +@docpage( + set_path="/enterprise/overview", + t="Overview | Enterprise", +) +def overview(): + """The enterprise overview page.""" + pass diff --git a/docs/app/reflex_docs/pages/docs/recipes_overview.py b/docs/app/reflex_docs/pages/docs/recipes_overview.py index c8a337b2c22..bc51f72dea0 100644 --- a/docs/app/reflex_docs/pages/docs/recipes_overview.py +++ b/docs/app/reflex_docs/pages/docs/recipes_overview.py @@ -1,5 +1,4 @@ import reflex as rx -import reflex.utils.format from reflex_docs.templates.docpage import docpage, h1_comp, h2_comp, text_comp_2 diff --git a/docs/app/reflex_docs/pages/docs/source.py b/docs/app/reflex_docs/pages/docs/source.py index f77649e1235..fd15d5d82c0 100644 --- a/docs/app/reflex_docs/pages/docs/source.py +++ b/docs/app/reflex_docs/pages/docs/source.py @@ -24,26 +24,30 @@ def format_fields( headers: list[str], fields: tuple[FieldDocumentation, ...], ) -> rx.Component: - return rx.table.root( - rx.table.header( - rx.table.row(*[ - rx.table.column_header_cell(header, class_name=table_header_class_name) - for header in headers - ]) - ), - rx.table.body( - *[ - rx.table.row( - rx.table.cell( - format_field(field), - ), - rx.table.cell( - render_markdown(field.description or ""), - class_name="font-small text-slate-11", - ), - ) - for field in fields - ], + return ( + rx.table.root( + rx.table.header( + rx.table.row(*[ + rx.table.column_header_cell( + header, class_name=table_header_class_name + ) + for header in headers + ]) + ), + rx.table.body( + *[ + rx.table.row( + rx.table.cell( + format_field(field), + ), + rx.table.cell( + render_markdown(field.description or ""), + class_name="font-small text-slate-11", + ), + ) + for field in fields + ], + ), ), ) diff --git a/docs/app/reflex_docs/pages/docs_landing/views/ai_builder.py b/docs/app/reflex_docs/pages/docs_landing/views/ai_builder.py index 9f9ab174d29..52bb83c635e 100644 --- a/docs/app/reflex_docs/pages/docs_landing/views/ai_builder.py +++ b/docs/app/reflex_docs/pages/docs_landing/views/ai_builder.py @@ -47,7 +47,7 @@ def get_integration_path() -> list: else: tag = "" - description = str(post.get("description") or "").strip() + description = post.get("description", "").strip() title = key.replace("_", " ").title() if title == "Open Ai": @@ -67,11 +67,7 @@ def get_integration_path() -> list: def card( - title: str, - description: str, - content: rx.Component, - href: str, - enteprise_only: bool = False, + title: str, description: str, content: str, href: str, enteprise_only: bool = False ) -> rx.Component: return rx.el.div( rx.el.span( diff --git a/docs/app/reflex_docs/pages/integrations/integration_gallery.py b/docs/app/reflex_docs/pages/integrations/integration_gallery.py index 8e241384d9b..6318a55c2d3 100644 --- a/docs/app/reflex_docs/pages/integrations/integration_gallery.py +++ b/docs/app/reflex_docs/pages/integrations/integration_gallery.py @@ -86,14 +86,11 @@ def integration_gallery_cards(data): class_name="flex flex-col gap-y-6 rounded-ui-xl border border-secondary-a4 bg-secondary-1 shadow-small p-6 h-[13rem] justify-between hover:bg-secondary-2", ), href=data["path"], - class_name=ui.cn( - "group text-inherit hover:!text-inherit decoration-none no-underline", - rx.cond( - (selected_filter.value == data["tags"]) - | (selected_filter.value == "All"), - "flex", - "hidden", - ), + class_name="group text-inherit hover:!text-inherit decoration-none no-underline " + + rx.cond( + (selected_filter.value == data["tags"]) | (selected_filter.value == "All"), + "flex", + "hidden", ), ) diff --git a/docs/app/reflex_docs/pages/integrations/integration_list.py b/docs/app/reflex_docs/pages/integrations/integration_list.py index 44ccb7d8a67..128dfc7297b 100644 --- a/docs/app/reflex_docs/pages/integrations/integration_list.py +++ b/docs/app/reflex_docs/pages/integrations/integration_list.py @@ -41,7 +41,7 @@ def get_integration_path() -> list: else: tag = "" - description = str(post.get("description") or "").strip() + description = post.get("description", "").strip() title = key.replace("_", " ").title() if title == "Open Ai": diff --git a/docs/app/reflex_docs/reflex_docs.py b/docs/app/reflex_docs/reflex_docs.py index 8f8d2de75ab..d47d672b7bc 100644 --- a/docs/app/reflex_docs/reflex_docs.py +++ b/docs/app/reflex_docs/reflex_docs.py @@ -35,7 +35,7 @@ def _llms_txt_directive() -> rx.Component: # Create the app. app = rxe.App( - style=styles.BASE_STYLE, # ty:ignore[invalid-argument-type] + style=styles.BASE_STYLE, stylesheets=styles.STYLESHEETS, app_wraps={}, theme=rx.theme( @@ -44,7 +44,7 @@ def _llms_txt_directive() -> rx.Component: radius="large", accent_color="violet", ), - head_components=get_pixel_website_trackers() # ty:ignore[invalid-argument-type] + head_components=get_pixel_website_trackers() + favicons_links() + [ rx.el.link( @@ -106,7 +106,7 @@ def _llms_txt_directive() -> rx.Component: page_args["meta"].extend(route.meta) # Call add_page with the dynamically constructed arguments - app.add_page(**page_args) # ty:ignore[invalid-argument-type] + app.add_page(**page_args) # Add redirects. redirects = [ diff --git a/docs/app/reflex_docs/templates/docpage/docpage.py b/docs/app/reflex_docs/templates/docpage/docpage.py index d33f55f8a92..5ba080dcc8c 100644 --- a/docs/app/reflex_docs/templates/docpage/docpage.py +++ b/docs/app/reflex_docs/templates/docpage/docpage.py @@ -6,10 +6,10 @@ import reflex as rx import reflex_components_internal as ui +from reflex.components.radix.themes.base import LiteralAccentColor from reflex.experimental.client_state import ClientStateVar from reflex.utils.format import to_snake_case, to_title_case from reflex_base.event import run_script -from reflex_components_radix.themes.base import LiteralAccentColor from reflex_site_shared.backend.status import StatusState from reflex_site_shared.components.blocks.code import * from reflex_site_shared.components.blocks.demo import * @@ -57,11 +57,9 @@ class FeedbackState(rx.State): score: int = -1 - @rx.event def set_score(self, score: int): self.score = score - @rx.event def handle_submit(self, form_data: dict): pass @@ -146,7 +144,7 @@ def thumbs_cards() -> rx.Component: ) -def feedback_choice_button(label: str, icon: str, score: int, class_name: str | rx.Var): +def feedback_choice_button(label: str, icon: str, score: int, class_name: str): active = FeedbackState.score == score return rx.el.button( ui.icon(icon), @@ -773,11 +771,7 @@ def docpage(contents: Callable[[], Route]) -> Route: path = get_path(contents, "reflex-docs/pages") if set_path is None else set_path _register_doc_route(path) - title = ( - getattr(contents, "__name__", "page").replace("_", " ").title() - if t is None - else t - ) + title = contents.__name__.replace("_", " ").title() if t is None else t @functools.wraps(contents) def wrapper(*args, **kwargs) -> rx.Component: @@ -848,8 +842,8 @@ def wrapper(*args, **kwargs) -> rx.Component: else: links.append(rx.fragment()) - toc: list = [] - doc_content: str | None = None + toc = [] + doc_content = None if not isinstance(contents, rx.Component): comp = contents(*args, **kwargs) else: @@ -859,11 +853,11 @@ def wrapper(*args, **kwargs) -> rx.Component: first, second = comp # Check if first is (toc, doc_content) from get_toc if isinstance(first, tuple) and len(first) == 2: - toc, doc_content = first # ty:ignore[invalid-assignment] + toc, doc_content = first comp = second else: # Legacy format: (toc, comp) - toc, comp = first, second # ty:ignore[invalid-assignment] + toc, comp = first, second show_right_sidebar = right_sidebar and len(toc) >= 2 return rx.box( @@ -871,14 +865,14 @@ def wrapper(*args, **kwargs) -> rx.Component: rx.el.main( rx.box( sidebar, - class_name=ui.cn( - "w-[19.5rem] shrink-0 hidden lg:block z-10 border-r border-m-slate-4 dark:border-m-slate-10 sticky left-0", - "before:content-[''] before:absolute before:top-0 before:bottom-0 before:right-0 before:w-[100vw] before:bg-white-1 dark:before:bg-secondary-2 before:-z-10", - rx.cond( + class_name=( + "w-[19.5rem] shrink-0 hidden lg:block z-10 border-r border-m-slate-4 dark:border-m-slate-10 sticky left-0 " + "before:content-[''] before:absolute before:top-0 before:bottom-0 before:right-0 before:w-[100vw] before:bg-white-1 dark:before:bg-secondary-2 before:-z-10 " + + rx.cond( HostingBannerState.is_banner_visible, - "top-[113px] h-[calc(100vh-113px)]", - "top-[77px] h-[calc(100vh-77px)]", - ), + " top-[113px] h-[calc(100vh-113px)]", + " top-[77px] h-[calc(100vh-77px)]", + ) ), ), rx.box( @@ -888,13 +882,13 @@ def wrapper(*args, **kwargs) -> rx.Component: nav_sidebar=nav_sidebar, doc_content=doc_content, ), - class_name=ui.cn( - "px-0 pt-0 mb-[2rem]", - rx.cond( + class_name=( + "px-0 pt-0 mb-[2rem]" + + rx.cond( HostingBannerState.is_banner_visible, - "mt-[90px]", + " mt-[90px]", "", - ), + ) ), ), rx.box( @@ -973,13 +967,13 @@ def wrapper(*args, **kwargs) -> rx.Component: ), class_name="flex flex-col justify-start gap-y-4 overflow-y-auto sticky top-4", ), - class_name=ui.cn( - "w-full h-full", - rx.cond( + class_name=( + "w-full h-full" + + rx.cond( HostingBannerState.is_banner_visible, - "mt-[146px]", - "mt-[90px]", - ), + " mt-[146px]", + " mt-[90px]", + ) ), ), class_name=( @@ -1066,7 +1060,7 @@ def dict_to_formatted_string(input_dict): def used_component( - component_used: Callable[..., rx.Component], + component_used: rx.Component, components_passed: rx.Component | str | None, color_scheme: str, variant: str, @@ -1112,7 +1106,7 @@ def used_component( def style_grid( - component_used: Callable[..., rx.Component], + component_used: rx.Component, component_used_str: str, variants: list, components_passed: rx.Component | str | None = None, @@ -1227,7 +1221,7 @@ def style_grid( rx.html( """""" ), - color_scheme=RadixDocState.color, # ty:ignore[invalid-argument-type] + color_scheme=RadixDocState.color, variant="surface", class_name="justify-between w-32", ), @@ -1240,24 +1234,20 @@ def style_grid( rx.icon( "check", size=15, - class_name=ui.cn( - "top-1/2 left-1/2 absolute text-gray-12 transform -translate-x-1/2 -translate-y-1/2", - rx.cond( - RadixDocState.color == color, - "block", - "hidden", - ), + class_name="top-1/2 left-1/2 absolute text-gray-12 transform -translate-x-1/2 -translate-y-1/2" + + rx.cond( + RadixDocState.color == color, + " block", + " hidden", ), ), on_click=RadixDocState.set_color(color), background_color=f"var(--{color}-9)", - class_name=ui.cn( - "relative rounded-md cursor-pointer shrink-0 size-[30px]", - rx.cond( - RadixDocState.color == color, - "border-2 border-gray-12", - "", - ), + class_name="relative rounded-md cursor-pointer shrink-0 size-[30px]" + + rx.cond( + RadixDocState.color == color, + " border-2 border-gray-12", + "", ), ) for color in list(map(str, LiteralAccentColor.__args__)) diff --git a/docs/app/reflex_docs/templates/docpage/feedback_state.py b/docs/app/reflex_docs/templates/docpage/feedback_state.py index 66716e7a1df..207172f5c8a 100644 --- a/docs/app/reflex_docs/templates/docpage/feedback_state.py +++ b/docs/app/reflex_docs/templates/docpage/feedback_state.py @@ -71,7 +71,7 @@ def handle_submit(self, form_data: dict): ) # Send to general webhook (suppressed errors) - with contextlib.suppress(httpx.HTTPError), httpx.Client() as client: + with contextlib.suppress(httpx.HTTPError) and httpx.Client() as client: client.post( REFLEX_DEV_WEB_GENERAL_FORM_FEEDBACK_WEBHOOK_URL, json=form_data, diff --git a/docs/app/reflex_docs/templates/docpage/sidebar/sidebar.py b/docs/app/reflex_docs/templates/docpage/sidebar/sidebar.py index cee4929b866..53ba88f6b7f 100644 --- a/docs/app/reflex_docs/templates/docpage/sidebar/sidebar.py +++ b/docs/app/reflex_docs/templates/docpage/sidebar/sidebar.py @@ -622,17 +622,17 @@ def sidebar_comp( html_lib_index, url, ), - rx.link( - rx.box( - rx.box( - rx.icon("atom", size=16), + rx.link( # pyright: ignore [reportCallIssue] + rx.box( # pyright: ignore [reportCallIssue] + rx.box( # pyright: ignore [reportCallIssue] + rx.icon("atom", size=16), # pyright: ignore [reportCallIssue] rx.el.h5( "Custom Components", class_name="font-smbold text-[0.875rem] text-slate-12 leading-5 tracking-[-0.01313rem] transition-color", ), class_name="flex flex-row items-center gap-3 text-slate-12", ), - rx.text( + rx.text( # pyright: ignore [reportCallIssue] "See what components people have made with Reflex!", class_name="font-small text-slate-9", ), @@ -727,7 +727,7 @@ def sidebar_comp( rx.cond(is_docs_ai_builder, ai_builder_content, docs_content), ) - return rx.box( + return rx.box( # pyright: ignore [reportCallIssue] categories, content, style={ diff --git a/docs/app/reflex_docs/templates/docpage/sidebar/sidebar_items/component_lib.py b/docs/app/reflex_docs/templates/docpage/sidebar/sidebar_items/component_lib.py index 18805c11a38..10260aaa5f0 100644 --- a/docs/app/reflex_docs/templates/docpage/sidebar/sidebar_items/component_lib.py +++ b/docs/app/reflex_docs/templates/docpage/sidebar/sidebar_items/component_lib.py @@ -1,4 +1,5 @@ -from reflex.utils.format import to_kebab_case, to_snake_case, to_title_case +import reflex as rx +from reflex.utils.format import to_snake_case, to_title_case from ..state import SideBarItem @@ -37,7 +38,7 @@ def sort_html_components(components: list) -> list: def get_component_link(category, clist, prefix="") -> str: - component_name = to_kebab_case(clist[0]) + component_name = rx.utils.format.to_kebab_case(clist[0]) # construct the component link. The component name points to the name of the md file. return f"/library/{prefix.strip('/') + '/' if prefix.strip('/') else ''}{category.lower().replace(' ', '-')}/{component_name.lower()}" diff --git a/docs/app/reflex_docs/templates/docpage/sidebar/sidebar_items/item.py b/docs/app/reflex_docs/templates/docpage/sidebar/sidebar_items/item.py index 1035936f9e5..4c70332b5e3 100644 --- a/docs/app/reflex_docs/templates/docpage/sidebar/sidebar_items/item.py +++ b/docs/app/reflex_docs/templates/docpage/sidebar/sidebar_items/item.py @@ -1,22 +1,14 @@ import re -from typing import overload from reflex_site_shared.route import Route from ..state import SideBarItem -@overload -def create_item(route: Route, children: None = None) -> SideBarItem: ... -@overload -def create_item(route: str, children: list[Route]) -> SideBarItem: ... -def create_item(route: Route | str, children: list[Route] | None = None) -> SideBarItem: - """Create a sidebar item from a route, or a parent item with children.""" - if isinstance(route, Route): - # Sidebar routes always set ``title`` to a plain string at construction - # time; the ``Route.title: str | Var | None`` field permits reactive - # titles in the general framework but they are never used here. - name = route.title if isinstance(route.title, str) else "" +def create_item(route: Route, children=None): + """Create a sidebar item from a route.""" + if children is None: + name = route.title url = route.path # For "Overview", we want to keep the qualifier prefix ("Components overview") alt_name_for_next_prev = name if name.endswith("Overview") else "" @@ -39,5 +31,5 @@ def create_item(route: Route | str, children: list[Route] | None = None) -> Side ) return SideBarItem( names=route, - children=list(map(create_item, children or [])), + children=list(map(create_item, children)), ) diff --git a/docs/app/reflex_docs/templates/docpage/sidebar/sidebar_items/learn.py b/docs/app/reflex_docs/templates/docpage/sidebar/sidebar_items/learn.py index 51786a41acb..c879c0e84a6 100644 --- a/docs/app/reflex_docs/templates/docpage/sidebar/sidebar_items/learn.py +++ b/docs/app/reflex_docs/templates/docpage/sidebar/sidebar_items/learn.py @@ -108,9 +108,9 @@ def get_sidebar_items_frontend(): create_item( "Custom Components", children=[ - custom_components.overview, # ty:ignore[unresolved-attribute] - custom_components.prerequisites_for_publishing, # ty:ignore[unresolved-attribute] - custom_components.command_reference, # ty:ignore[unresolved-attribute] + custom_components.overview, + custom_components.prerequisites_for_publishing, + custom_components.command_reference, ], ), ] diff --git a/docs/app/reflex_docs/utils/http.py b/docs/app/reflex_docs/utils/http.py index f8ee50e985f..5ee033d5a82 100644 --- a/docs/app/reflex_docs/utils/http.py +++ b/docs/app/reflex_docs/utils/http.py @@ -26,7 +26,7 @@ def once(f: Callable[[], T]) -> Callable[[], T]: def wrapper() -> T: nonlocal value value = f() if value is unset else value - return value # ty: ignore[invalid-return-type] + return value # pyright: ignore[reportReturnType] return wrapper diff --git a/pyproject.toml b/pyproject.toml index 2168bcd6983..4d083b7a0a3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -149,6 +149,7 @@ exclude = [ "**/.*", "**/.templates", "**/node_modules", + "docs", "packages/reflex-site-shared", "packages/integrations-docs", ] From 7db7e003d2620318abcaf9ab077d702636625a86 Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Fri, 29 May 2026 23:57:50 +0200 Subject: [PATCH 21/57] less type ignores --- .../reflex-base/src/reflex_base/event/__init__.py | 5 +++-- reflex/model.py | 11 ++++++----- tests/units/components/test_memo.py | 6 +++--- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/packages/reflex-base/src/reflex_base/event/__init__.py b/packages/reflex-base/src/reflex_base/event/__init__.py index 06b97e2bb8b..308f296c44a 100644 --- a/packages/reflex-base/src/reflex_base/event/__init__.py +++ b/packages/reflex-base/src/reflex_base/event/__init__.py @@ -407,11 +407,12 @@ def _parameters(self) -> Mapping[str, inspect.Parameter]: return parameters @classmethod - def __class_getitem__(cls, args_spec: str) -> Annotated: # ty:ignore[invalid-type-form] + def __class_getitem__(cls, args_spec: Callable | Sequence[Callable]) -> Annotated: # ty:ignore[invalid-type-form] """Get a typed EventHandler. Args: - args_spec: The args_spec of the EventHandler. + args_spec: The args spec of the EventHandler: a single spec callable + or a sequence of them, attached to the resulting ``Annotated``. Returns: The EventHandler class item. diff --git a/reflex/model.py b/reflex/model.py index 648e433b112..944080fcf05 100644 --- a/reflex/model.py +++ b/reflex/model.py @@ -509,6 +509,7 @@ def migrate(autogenerate: bool = False) -> bool | None: if find_spec("sqlmodel") and find_spec("sqlalchemy") and find_spec("pydantic"): import sqlmodel from sqlmodel.ext.asyncio.session import AsyncSession + from sqlmodel.main import SQLModelConfig _AsyncSessionLocal: dict[str | None, sqlalchemy.ext.asyncio.async_sessionmaker] = {} @@ -574,11 +575,11 @@ class Model(sqlmodel.SQLModel): id: int | None = sqlmodel.Field(default=None, primary_key=True) - model_config = { - "arbitrary_types_allowed": True, - "use_enum_values": True, - "extra": "allow", - } + model_config = SQLModelConfig( + arbitrary_types_allowed=True, + use_enum_values=True, + extra="allow", + ) def __init_subclass__(cls, **kwargs): """Automatically register subclasses as models.""" diff --git a/tests/units/components/test_memo.py b/tests/units/components/test_memo.py index cb4e7509679..81a4e4d0501 100644 --- a/tests/units/components/test_memo.py +++ b/tests/units/components/test_memo.py @@ -798,7 +798,7 @@ def test_classify_routes_each_annotation_to_the_expected_kind(): ("rest", rx.RestProp, "rest", MemoParamKind.REST), ( "event_with_spec", - rx.EventHandler[rx.event.passthrough_event_spec(str)], # ty:ignore[invalid-argument-type] + rx.EventHandler[rx.event.passthrough_event_spec(str)], "event", MemoParamKind.EVENT_TRIGGER, ), @@ -855,7 +855,7 @@ def test_event_trigger_make_placeholder_returns_plain_callable(): param = _make_param( name="event", kind=MemoParamKind.EVENT_TRIGGER, - annotation=rx.EventHandler[spec], # ty:ignore[invalid-argument-type] + annotation=rx.EventHandler[spec], kind_data=spec, placeholder_name="eventRxMemo", js_prop_name="event", @@ -957,7 +957,7 @@ def test_event_trigger_validate_rejects_default_directly(): name="event", kind=inspect.Parameter.KEYWORD_ONLY, default=None, - annotation=rx.EventHandler[rx.event.passthrough_event_spec(str)], # ty:ignore[invalid-argument-type] + annotation=rx.EventHandler[rx.event.passthrough_event_spec(str)], ) with pytest.raises(TypeError, match="default"): _SPECS[MemoParamKind.EVENT_TRIGGER].validate(parameter, "fn", True) From d6713faf7666e57244a814ea10bb36819000eb85 Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Fri, 29 May 2026 23:58:35 +0200 Subject: [PATCH 22/57] pre-commit --- pyi_hashes.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyi_hashes.json b/pyi_hashes.json index f949a53417c..83a029e3c72 100644 --- a/pyi_hashes.json +++ b/pyi_hashes.json @@ -120,5 +120,5 @@ "packages/reflex-components-sonner/src/reflex_components_sonner/toast.pyi": "ba6c853c503fd8ad6fe89350ef4df073", "reflex/__init__.pyi": "12a863ddbcac050c702a3ec6092ae17c", "reflex/components/__init__.pyi": "f39a2af77f438fa243c58c965f19d42e", - "reflex/experimental/memo.pyi": "5bfbbd60585132d7a76840a0dbacbdd2" + "reflex/experimental/memo.pyi": "72001108420e10165405aad1425bd01d" } From 3d4589f1e5fedb25e6fc6e9b55fbe7dbb484613e Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Sat, 30 May 2026 00:08:06 +0200 Subject: [PATCH 23/57] more typing --- .../reflex-base/src/reflex_base/plugins/base.py | 13 +++++++++---- .../src/reflex_base/utils/pyi_generator.py | 8 ++++---- packages/reflex-base/src/reflex_base/vars/base.py | 4 ++-- reflex/compiler/plugins/builtin.py | 11 +++++++---- reflex/compiler/plugins/memoize.py | 9 ++++----- reflex/istate/wrappers.py | 8 ++++---- reflex/testing.py | 2 +- tests/units/compiler/test_memoize_plugin.py | 8 ++++++-- 8 files changed, 37 insertions(+), 26 deletions(-) diff --git a/packages/reflex-base/src/reflex_base/plugins/base.py b/packages/reflex-base/src/reflex_base/plugins/base.py index 6673309840b..48e8fd61a41 100644 --- a/packages/reflex-base/src/reflex_base/plugins/base.py +++ b/packages/reflex-base/src/reflex_base/plugins/base.py @@ -19,7 +19,12 @@ class HookOrder(str, Enum): if TYPE_CHECKING: from reflex.app import App, UnevaluatedPage from reflex_base.components.component import BaseComponent - from reflex_base.plugins.compiler import ComponentAndChildren, PageContext + from reflex_base.plugins.compiler import ( + CompileContext, + ComponentAndChildren, + PageComponent, + PageContext, + ) class CommonContext(TypedDict): @@ -186,7 +191,7 @@ def update_env_json( def eval_page( self, - page_fn: Any, + page_fn: "PageComponent", /, **kwargs: Any, ) -> "PageContext | None": @@ -216,7 +221,7 @@ def enter_component( /, *, page_context: "PageContext", - compile_context: Any, + compile_context: "CompileContext", in_prop_tree: bool = False, ) -> "BaseComponent | ComponentAndChildren | None": """Inspect or transform a component before visiting its descendants. @@ -239,7 +244,7 @@ def leave_component( /, *, page_context: "PageContext", - compile_context: Any, + compile_context: "CompileContext", in_prop_tree: bool = False, ) -> "BaseComponent | ComponentAndChildren | None": """Inspect or transform a component after visiting its descendants. diff --git a/packages/reflex-base/src/reflex_base/utils/pyi_generator.py b/packages/reflex-base/src/reflex_base/utils/pyi_generator.py index 6fb84465a4b..229df4a5521 100644 --- a/packages/reflex-base/src/reflex_base/utils/pyi_generator.py +++ b/packages/reflex-base/src/reflex_base/utils/pyi_generator.py @@ -481,7 +481,7 @@ def _get_class_annotation_globals(target_class: type) -> Mapping[str, Any]: @cache -def _get_class_event_triggers(target_class: type) -> frozenset[str]: +def _get_class_event_triggers(target_class: type[Component]) -> frozenset[str]: """Get and cache event trigger names for a class. Args: @@ -490,7 +490,7 @@ def _get_class_event_triggers(target_class: type) -> frozenset[str]: Returns: The event trigger names defined on the class. """ - return frozenset(target_class.get_event_triggers()) # ty:ignore[unresolved-attribute] + return frozenset(target_class.get_event_triggers()) def _generate_imports( @@ -593,7 +593,7 @@ def _extract_func_kwargs_as_ast_nodes( def _extract_class_props_as_ast_nodes( func: Callable, - clzs: list[type], + clzs: list[type[Component]], type_hint_globals: dict[str, Any], extract_real_default: bool = False, ) -> Sequence[tuple[ast.arg, ast.Constant | None]]: @@ -841,7 +841,7 @@ def _generate_component_create_functiondef( all_classes = [c for c in clz.__mro__ if issubclass(c, Component)] prop_kwargs = _extract_class_props_as_ast_nodes( clz.create, - all_classes, # ty:ignore[invalid-argument-type] + all_classes, type_hint_globals, ) all_props = [arg[0].arg for arg in prop_kwargs] diff --git a/packages/reflex-base/src/reflex_base/vars/base.py b/packages/reflex-base/src/reflex_base/vars/base.py index 49872b6937c..01d5d10a2a3 100644 --- a/packages/reflex-base/src/reflex_base/vars/base.py +++ b/packages/reflex-base/src/reflex_base/vars/base.py @@ -3319,13 +3319,13 @@ def __init__( if type_origin is Field and ( args := getattr(annotated_type, "__args__", None) ): - annotated_type: GenericType = args[0] + annotated_type = args[0] type_origin = get_origin(annotated_type) or annotated_type if self.default is MISSING and self.default_factory is None: default_value = types.get_default_value_for_type(annotated_type) if default_value is None and not types.is_optional(annotated_type): - annotated_type = annotated_type | None # ty:ignore[conflicting-declarations] + annotated_type = annotated_type | None if types.is_immutable(default_value): self.default = default_value else: diff --git a/reflex/compiler/plugins/builtin.py b/reflex/compiler/plugins/builtin.py index bf00c3ce5cc..db125af84b7 100644 --- a/reflex/compiler/plugins/builtin.py +++ b/reflex/compiler/plugins/builtin.py @@ -4,7 +4,7 @@ import dataclasses from collections.abc import Callable, Sequence -from typing import Any +from typing import TYPE_CHECKING, Any from reflex_base.components.component import BaseComponent, Component, ComponentStyle from reflex_base.config import get_config @@ -17,6 +17,9 @@ from reflex.compiler import utils +if TYPE_CHECKING: + from reflex_base.plugins.compiler import PageComponent + @dataclasses.dataclass(frozen=True, slots=True) class DefaultPagePlugin(Plugin): @@ -24,7 +27,7 @@ class DefaultPagePlugin(Plugin): def eval_page( self, - page_fn: Any, + page_fn: PageComponent, /, *, page: PageDefinition, @@ -116,7 +119,7 @@ def enter_component( /, *, page_context: PageContext, - compile_context: Any, + compile_context: CompileContext, in_prop_tree: bool = False, ) -> BaseComponent | None: """Apply the non-recursive portion of ``_add_style_recursive``. @@ -179,7 +182,7 @@ def leave_component( /, *, page_context: PageContext, - compile_context: Any, + compile_context: CompileContext, in_prop_tree: bool = False, ) -> None: """Collect imports and page artifacts for the active component node.""" diff --git a/reflex/compiler/plugins/memoize.py b/reflex/compiler/plugins/memoize.py index 62878ef222a..8cc90ecfbe0 100644 --- a/reflex/compiler/plugins/memoize.py +++ b/reflex/compiler/plugins/memoize.py @@ -20,7 +20,6 @@ from __future__ import annotations import dataclasses -from typing import Any from reflex_base.components.component import BaseComponent, Component from reflex_base.components.memo import create_passthrough_component_memo @@ -32,7 +31,7 @@ is_snapshot_boundary, ) from reflex_base.constants.compiler import MemoizationDisposition -from reflex_base.plugins import ComponentAndChildren, PageContext +from reflex_base.plugins import CompileContext, ComponentAndChildren, PageContext from reflex_base.plugins.base import Plugin @@ -219,7 +218,7 @@ def enter_component( /, *, page_context: PageContext, - compile_context: Any, + compile_context: CompileContext, in_prop_tree: bool = False, ) -> BaseComponent | ComponentAndChildren | None: """Memoize snapshot-boundary subtrees before descent. @@ -279,7 +278,7 @@ def leave_component( /, *, page_context: PageContext, - compile_context: Any, + compile_context: CompileContext, in_prop_tree: bool = False, ) -> BaseComponent | ComponentAndChildren | None: """Wrap non-boundary memoizables and pop any suppression this component pushed. @@ -329,7 +328,7 @@ def leave_component( def _build_wrapper( comp: Component, page_context: PageContext, - compile_context: Any, + compile_context: CompileContext, ) -> BaseComponent | None: """Return the memo wrapper component for ``comp``, or ``None`` if untagged. diff --git a/reflex/istate/wrappers.py b/reflex/istate/wrappers.py index 09e0a4fa3a7..6601171b8eb 100644 --- a/reflex/istate/wrappers.py +++ b/reflex/istate/wrappers.py @@ -1,14 +1,14 @@ """Wrappers for the state manager.""" -from typing import Any - from reflex.istate.manager import get_state_manager from reflex.istate.manager.token import BaseStateToken from reflex.istate.proxy import ReadOnlyStateProxy -from reflex.state import State, _split_substate_key +from reflex.state import BaseState, State, _split_substate_key -async def get_state(token: str, state_cls: Any | None = None) -> ReadOnlyStateProxy: +async def get_state( + token: str, state_cls: type[BaseState] | None = None +) -> ReadOnlyStateProxy: """Get the instance of a state for a token. Args: diff --git a/reflex/testing.py b/reflex/testing.py index 0f6dbce9416..09e3e15c724 100644 --- a/reflex/testing.py +++ b/reflex/testing.py @@ -119,7 +119,7 @@ class AppHarness: backend: uvicorn.Server | None = None _frontends: list[WebDriver] = dataclasses.field(default_factory=list) _registry_token: contextvars.Token[RegistrationContext] | None = None - _base_registration_context: ClassVar[RegistrationContext] | None = None # ty:ignore[invalid-type-form] + _base_registration_context: ClassVar[RegistrationContext | None] = None @classmethod def create( diff --git a/tests/units/compiler/test_memoize_plugin.py b/tests/units/compiler/test_memoize_plugin.py index cfdf836cdbc..abbb5e47da9 100644 --- a/tests/units/compiler/test_memoize_plugin.py +++ b/tests/units/compiler/test_memoize_plugin.py @@ -572,8 +572,12 @@ def fake_create_passthrough_component_memo(component: Component): fake_create_passthrough_component_memo, ) - first_compile = SimpleNamespace(memoize_wrappers={}, auto_memo_components={}) - second_compile = SimpleNamespace(memoize_wrappers={}, auto_memo_components={}) + first_compile = cast( + CompileContext, SimpleNamespace(memoize_wrappers={}, auto_memo_components={}) + ) + second_compile = cast( + CompileContext, SimpleNamespace(memoize_wrappers={}, auto_memo_components={}) + ) page_context = cast(PageContext, SimpleNamespace()) MemoizeStatefulPlugin._build_wrapper( From b2867cc22d40dd120f3ba2e031337a3ca1cb36cc Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Sat, 30 May 2026 00:10:32 +0200 Subject: [PATCH 24/57] use future annotations --- .../src/reflex_base/plugins/base.py | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/packages/reflex-base/src/reflex_base/plugins/base.py b/packages/reflex-base/src/reflex_base/plugins/base.py index 48e8fd61a41..c448050530d 100644 --- a/packages/reflex-base/src/reflex_base/plugins/base.py +++ b/packages/reflex-base/src/reflex_base/plugins/base.py @@ -1,5 +1,7 @@ """Base class for all plugins.""" +from __future__ import annotations + from collections.abc import Callable, Sequence from enum import Enum from pathlib import Path @@ -59,13 +61,13 @@ class PreCompileContext(CommonContext): add_save_task: AddTaskProtocol add_modify_task: Callable[[str, Callable[[str], str]], None] radix_themes_plugin: Any - unevaluated_pages: Sequence["UnevaluatedPage"] + unevaluated_pages: Sequence[UnevaluatedPage] class PostCompileContext(CommonContext): """Context for post-compile hooks.""" - app: "App" + app: App class PostBuildContext(CommonContext): @@ -191,10 +193,10 @@ def update_env_json( def eval_page( self, - page_fn: "PageComponent", + page_fn: PageComponent, /, **kwargs: Any, - ) -> "PageContext | None": + ) -> PageContext | None: """Evaluate a page-like object into a page context. Args: @@ -208,7 +210,7 @@ def eval_page( def compile_page( self, - page_ctx: "PageContext", + page_ctx: PageContext, /, **kwargs: Any, ) -> None: @@ -217,13 +219,13 @@ def compile_page( def enter_component( self, - comp: "BaseComponent", + comp: BaseComponent, /, *, - page_context: "PageContext", - compile_context: "CompileContext", + page_context: PageContext, + compile_context: CompileContext, in_prop_tree: bool = False, - ) -> "BaseComponent | ComponentAndChildren | None": + ) -> BaseComponent | ComponentAndChildren | None: """Inspect or transform a component before visiting its descendants. Args: @@ -239,14 +241,14 @@ def enter_component( def leave_component( self, - comp: "BaseComponent", - children: tuple["BaseComponent", ...], + comp: BaseComponent, + children: tuple[BaseComponent, ...], /, *, - page_context: "PageContext", - compile_context: "CompileContext", + page_context: PageContext, + compile_context: CompileContext, in_prop_tree: bool = False, - ) -> "BaseComponent | ComponentAndChildren | None": + ) -> BaseComponent | ComponentAndChildren | None: """Inspect or transform a component after visiting its descendants. Args: From 3ac514725ef8aacdce7ca6a8b8425889e20ebcfb Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Sat, 30 May 2026 00:21:21 +0200 Subject: [PATCH 25/57] drop pyright ignores, use final --- docs/app/reflex_docs/pages/docs/cloud_cliref.py | 2 +- .../reflex_docs/templates/docpage/sidebar/sidebar.py | 12 ++++++------ docs/app/reflex_docs/utils/http.py | 2 +- .../reflex-base/src/reflex_base/components/memo.py | 2 +- .../reflex-base/src/reflex_base/utils/imports.py | 4 +++- reflex/components/memo.py | 1 - reflex/experimental/memo.py | 2 +- tests/units/components/test_memo.py | 4 ++-- 8 files changed, 15 insertions(+), 14 deletions(-) diff --git a/docs/app/reflex_docs/pages/docs/cloud_cliref.py b/docs/app/reflex_docs/pages/docs/cloud_cliref.py index b8051fba339..7fb8160de46 100644 --- a/docs/app/reflex_docs/pages/docs/cloud_cliref.py +++ b/docs/app/reflex_docs/pages/docs/cloud_cliref.py @@ -260,7 +260,7 @@ def process_command(command: click.Command, name: str) -> str: if find_spec("typer") is not None and find_spec("typer.main") is not None: - import typer # pyright: ignore[reportMissingImports] + import typer if isinstance(cli, typer.Typer): cli = typer.main.get_command(cli) diff --git a/docs/app/reflex_docs/templates/docpage/sidebar/sidebar.py b/docs/app/reflex_docs/templates/docpage/sidebar/sidebar.py index 53ba88f6b7f..cee4929b866 100644 --- a/docs/app/reflex_docs/templates/docpage/sidebar/sidebar.py +++ b/docs/app/reflex_docs/templates/docpage/sidebar/sidebar.py @@ -622,17 +622,17 @@ def sidebar_comp( html_lib_index, url, ), - rx.link( # pyright: ignore [reportCallIssue] - rx.box( # pyright: ignore [reportCallIssue] - rx.box( # pyright: ignore [reportCallIssue] - rx.icon("atom", size=16), # pyright: ignore [reportCallIssue] + rx.link( + rx.box( + rx.box( + rx.icon("atom", size=16), rx.el.h5( "Custom Components", class_name="font-smbold text-[0.875rem] text-slate-12 leading-5 tracking-[-0.01313rem] transition-color", ), class_name="flex flex-row items-center gap-3 text-slate-12", ), - rx.text( # pyright: ignore [reportCallIssue] + rx.text( "See what components people have made with Reflex!", class_name="font-small text-slate-9", ), @@ -727,7 +727,7 @@ def sidebar_comp( rx.cond(is_docs_ai_builder, ai_builder_content, docs_content), ) - return rx.box( # pyright: ignore [reportCallIssue] + return rx.box( categories, content, style={ diff --git a/docs/app/reflex_docs/utils/http.py b/docs/app/reflex_docs/utils/http.py index 5ee033d5a82..1cef1fb4a03 100644 --- a/docs/app/reflex_docs/utils/http.py +++ b/docs/app/reflex_docs/utils/http.py @@ -26,7 +26,7 @@ def once(f: Callable[[], T]) -> Callable[[], T]: def wrapper() -> T: nonlocal value value = f() if value is unset else value - return value # pyright: ignore[reportReturnType] + return value return wrapper diff --git a/packages/reflex-base/src/reflex_base/components/memo.py b/packages/reflex-base/src/reflex_base/components/memo.py index d1ceb66d3b0..590f2090c75 100644 --- a/packages/reflex-base/src/reflex_base/components/memo.py +++ b/packages/reflex-base/src/reflex_base/components/memo.py @@ -592,7 +592,7 @@ def _event_handler_placeholder(placeholder_name: str, args_spec: Any) -> Callabl def _placeholder(*args: Any) -> Any: return run_script(prop_callback.call(*args)) - _placeholder.__signature__ = inspect.signature(primary_spec) # pyright: ignore[reportFunctionMemberAccess] # ty:ignore[unresolved-attribute] + _placeholder.__signature__ = inspect.signature(primary_spec) # ty:ignore[unresolved-attribute] return _placeholder diff --git a/packages/reflex-base/src/reflex_base/utils/imports.py b/packages/reflex-base/src/reflex_base/utils/imports.py index d48646b514d..e5839692f01 100644 --- a/packages/reflex-base/src/reflex_base/utils/imports.py +++ b/packages/reflex-base/src/reflex_base/utils/imports.py @@ -5,6 +5,7 @@ import dataclasses from collections import defaultdict from collections.abc import Mapping, Sequence +from typing import final def merge_parsed_imports( @@ -50,7 +51,7 @@ def merge_imports( if isinstance(fields, (list, tuple, set)): all_imports[lib].extend( ImportVar(field) if isinstance(field, str) else field - for field in fields # ty:ignore[invalid-argument-type] + for field in fields ) else: all_imports[lib].append( @@ -103,6 +104,7 @@ def collapse_imports( } +@final @dataclasses.dataclass(frozen=True) class ImportVar: """An import var.""" diff --git a/reflex/components/memo.py b/reflex/components/memo.py index 4de9661b2e8..e2907a0ce6a 100644 --- a/reflex/components/memo.py +++ b/reflex/components/memo.py @@ -1,4 +1,3 @@ -# pyright: reportWildcardImportFromLibrary=false """Re-export from reflex_base.""" from reflex_base.components.memo import * # pragma: no cover diff --git a/reflex/experimental/memo.py b/reflex/experimental/memo.py index ea01542314d..90ae66bde3e 100644 --- a/reflex/experimental/memo.py +++ b/reflex/experimental/memo.py @@ -8,4 +8,4 @@ ExperimentalNamespace.register_component_warning("memo") -sys.modules[__name__] = memo # pyright: ignore[reportArgumentType] +sys.modules[__name__] = memo diff --git a/tests/units/components/test_memo.py b/tests/units/components/test_memo.py index 81a4e4d0501..95f1cbd5be2 100644 --- a/tests/units/components/test_memo.py +++ b/tests/units/components/test_memo.py @@ -703,7 +703,7 @@ def eh_compile_memo( def test_component_memo_event_handler_wires_event_chain_at_call_site(): """Instantiating an EH memo should wrap the handler in an EventChain trigger.""" - def _handler_fn(value: str): # pyright: ignore[reportUnusedFunction] + def _handler_fn(value: str): pass raw_handler = EventHandler(fn=_handler_fn) @@ -740,7 +740,7 @@ def test_component_memo_rejects_event_handler_with_default(): @rx.memo def bad_eh_default( - event: rx.EventHandler[rx.event.passthrough_event_spec(str)] = None, # pyright: ignore[reportArgumentType] + event: rx.EventHandler[rx.event.passthrough_event_spec(str)] = None, ) -> rx.Component: return rx.button("hi") From 1c52796fd365ba8764c052e1379f9dec8e702280 Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Sat, 30 May 2026 00:27:49 +0200 Subject: [PATCH 26/57] more final, less ignore --- .../src/reflex_components_sonner/toast.py | 7 ++++--- pyi_hashes.json | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/reflex-components-sonner/src/reflex_components_sonner/toast.py b/packages/reflex-components-sonner/src/reflex_components_sonner/toast.py index c383e2efe14..29302688c4a 100644 --- a/packages/reflex-components-sonner/src/reflex_components_sonner/toast.py +++ b/packages/reflex-components-sonner/src/reflex_components_sonner/toast.py @@ -4,7 +4,7 @@ import builtins import dataclasses -from typing import Any, Literal +from typing import Any, Literal, final from reflex_base.components.component import Component, ComponentNamespace, field from reflex_base.components.props import NoExtrasAllowedProps @@ -36,6 +36,7 @@ ) +@final @dataclasses.dataclass class ToastAction: """A toast action that render a button in the toast.""" @@ -153,11 +154,11 @@ def dict(self, *args: Any, **kwargs: Any) -> builtins.dict[str, Any]: if "action" in d: d["action"] = self.action if isinstance(self.action, dict): - d["action"] = ToastAction(**self.action) # ty:ignore[invalid-argument-type] + d["action"] = ToastAction(**self.action) if "cancel" in d: d["cancel"] = self.cancel if isinstance(self.cancel, dict): - d["cancel"] = ToastAction(**self.cancel) # ty:ignore[invalid-argument-type] + d["cancel"] = ToastAction(**self.cancel) if "onDismiss" in d: d["onDismiss"] = format.format_queue_events( self.on_dismiss, _toast_callback_signature diff --git a/pyi_hashes.json b/pyi_hashes.json index 83a029e3c72..a788d4811b2 100644 --- a/pyi_hashes.json +++ b/pyi_hashes.json @@ -117,7 +117,7 @@ "packages/reflex-components-recharts/src/reflex_components_recharts/general.pyi": "5a1a479924ad6184abafe4d796cb04c5", "packages/reflex-components-recharts/src/reflex_components_recharts/polar.pyi": "1979bb6c22bb7a0d3342b2d63fb19d74", "packages/reflex-components-recharts/src/reflex_components_recharts/recharts.pyi": "c5288f311fe37b23539518ba2a3d4482", - "packages/reflex-components-sonner/src/reflex_components_sonner/toast.pyi": "ba6c853c503fd8ad6fe89350ef4df073", + "packages/reflex-components-sonner/src/reflex_components_sonner/toast.pyi": "7aa0047e5a61719415fb82e63b64d524", "reflex/__init__.pyi": "12a863ddbcac050c702a3ec6092ae17c", "reflex/components/__init__.pyi": "f39a2af77f438fa243c58c965f19d42e", "reflex/experimental/memo.pyi": "72001108420e10165405aad1425bd01d" From bc89a87850ee55633d69c2e3d722285fdcd4df43 Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Sat, 30 May 2026 00:38:02 +0200 Subject: [PATCH 27/57] drop type ignores --- docs/app/reflex_docs/pages/docs/__init__.py | 2 +- .../reflex_base/event/processor/event_processor.py | 6 +++--- .../reflex_components_react_player/react_player.py | 2 +- .../src/reflex_site_shared/components/patterns.py | 4 ++-- .../src/reflex_site_shared/styles/styles.py | 14 +++++++------- .../src/reflex_site_shared/views/footer.py | 2 +- reflex/istate/manager/token.py | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/app/reflex_docs/pages/docs/__init__.py b/docs/app/reflex_docs/pages/docs/__init__.py index 971ca615b7a..2b70c5b2d9c 100644 --- a/docs/app/reflex_docs/pages/docs/__init__.py +++ b/docs/app/reflex_docs/pages/docs/__init__.py @@ -318,7 +318,7 @@ def register_doc(virtual_doc: str, comp): # Alias needed by sidebar — the library page route object. -library_: Route = library # type: ignore[assignment] +library_: Route = library # Process all docs via reflex_docgen pipeline. diff --git a/packages/reflex-base/src/reflex_base/event/processor/event_processor.py b/packages/reflex-base/src/reflex_base/event/processor/event_processor.py index 5555848fdc4..0a232260453 100644 --- a/packages/reflex-base/src/reflex_base/event/processor/event_processor.py +++ b/packages/reflex-base/src/reflex_base/event/processor/event_processor.py @@ -477,7 +477,7 @@ async def _emit_delta_impl( # Raise any exceptions for the caller, waiting for all chained events. await task_future.wait_all() - def _try_clean_future(self, future: EventFuture) -> None: # type: ignore[override] + def _try_clean_future(self, future: EventFuture) -> None: """Pop a future from _futures when it and all immediate children are done. After popping, cascade the check upward: if the parent future is also @@ -499,7 +499,7 @@ def _try_clean_future(self, future: EventFuture) -> None: # type: ignore[overri if parent is not None and parent.txid: self._try_clean_future(parent) - def _on_future_done(self, future: EventFuture) -> None: # type: ignore[override] + def _on_future_done(self, future: EventFuture) -> None: """Callback invoked when an enqueued future completes. If the future was cancelled externally, cancel the running task @@ -710,7 +710,7 @@ def _finish_task(self, task: asyncio.Task): if sys.version_info < (3, 12): # py3.11 compat - task_ctx = task._event_ctx # type: ignore[attr-defined] # ty:ignore[unresolved-attribute] + task_ctx = task._event_ctx # ty:ignore[unresolved-attribute] else: task_ctx = task.get_context().run(EventContext.get) self._tasks.pop(task_ctx.txid, None) diff --git a/packages/reflex-components-react-player/src/reflex_components_react_player/react_player.py b/packages/reflex-components-react-player/src/reflex_components_react_player/react_player.py index 77a4cdea940..a21fb95c9cb 100644 --- a/packages/reflex-components-react-player/src/reflex_components_react_player/react_player.py +++ b/packages/reflex-components-react-player/src/reflex_components_react_player/react_player.py @@ -256,7 +256,7 @@ def create(cls, *children, **props) -> ReactPlayer: f"The prop {prop!r} has been replaced by {new_prop!r}, please update your code.", ) props[new_prop] = props.pop(prop) - return super().create(*children, **props) # type: ignore[return-value] + return super().create(*children, **props) def _render(self, props: dict[str, Any] | None = None): """Render the component. Adds width and height set to None because diff --git a/packages/reflex-site-shared/src/reflex_site_shared/components/patterns.py b/packages/reflex-site-shared/src/reflex_site_shared/components/patterns.py index 8ff734f0732..a095e946194 100644 --- a/packages/reflex-site-shared/src/reflex_site_shared/components/patterns.py +++ b/packages/reflex-site-shared/src/reflex_site_shared/components/patterns.py @@ -107,7 +107,7 @@ def hosting_patterns() -> list[rx.Component]: rx.image( src=f"{REFLEX_ASSETS_CDN}hosting/light/hosting_patterns.svg", alt="Reflex Hosting Patterns", - class_name=rx.cond( # type: ignore[arg-type] + class_name=rx.cond( HostingBannerState.is_banner_visible, "dark:hidden lg:flex hidden absolute top-0 z-[-1] w-[1028px] h-[478px] pointer-events-none shrink-0 left-1/2 transform -translate-x-1/2 -translate-y-1/2 lg:mt-[24rem] mt-[3.5rem]", "dark:hidden lg:flex hidden absolute top-0 z-[-1] w-[1028px] h-[478px] pointer-events-none shrink-0 left-1/2 transform -translate-x-1/2 -translate-y-1/2 lg:mt-[19rem] mt-[8.5rem]", @@ -116,7 +116,7 @@ def hosting_patterns() -> list[rx.Component]: rx.image( src=f"{REFLEX_ASSETS_CDN}hosting/dark/hosting_patterns.svg", alt="Reflex Hosting Patterns", - class_name=rx.cond( # type: ignore[arg-type] + class_name=rx.cond( HostingBannerState.is_banner_visible, "hidden dark:flex lg:dark:flex absolute top-0 z-[-1] w-[1028px] h-[478px] pointer-events-none shrink-0 left-1/2 transform -translate-x-1/2 -translate-y-1/2 lg:mt-[24rem] mt-[3.5rem]", "hidden dark:flex lg:dark:flex absolute top-0 z-[-1] w-[1028px] h-[478px] pointer-events-none shrink-0 left-1/2 transform -translate-x-1/2 -translate-y-1/2 lg:mt-[19rem] mt-[8.5rem]", diff --git a/packages/reflex-site-shared/src/reflex_site_shared/styles/styles.py b/packages/reflex-site-shared/src/reflex_site_shared/styles/styles.py index e50ab3286dd..e5ae9fe5979 100644 --- a/packages/reflex-site-shared/src/reflex_site_shared/styles/styles.py +++ b/packages/reflex-site-shared/src/reflex_site_shared/styles/styles.py @@ -19,26 +19,26 @@ def get_code_style(color: str): The component. """ return { - "color": c_color(color, 9), # type: ignore[arg-type] + "color": c_color(color, 9), "border_radius": "4px", - "border": f"1px solid {c_color(color, 4)}", # type: ignore[arg-type] - "background": c_color(color, 3), # type: ignore[arg-type] + "border": f"1px solid {c_color(color, 4)}", + "background": c_color(color, 3), **fonts.code, "line_height": "1.5", } -def get_code_style_rdx(color: str): # type: ignore[reportArgumentType] +def get_code_style_rdx(color: str): """Get code style rdx. Returns: The component. """ return { - "color": rx.color(color, 11), # type: ignore[reportArgumentType] + "color": rx.color(color, 11), "border_radius": "0.25rem", - "border": f"1px solid {rx.color(color, 5)}", # type: ignore[reportArgumentType] - "background": rx.color(color, 3), # type: ignore[reportArgumentType] + "border": f"1px solid {rx.color(color, 5)}", + "background": rx.color(color, 3), } diff --git a/packages/reflex-site-shared/src/reflex_site_shared/views/footer.py b/packages/reflex-site-shared/src/reflex_site_shared/views/footer.py index 69d80a90d4b..ddd6f63841e 100644 --- a/packages/reflex-site-shared/src/reflex_site_shared/views/footer.py +++ b/packages/reflex-site-shared/src/reflex_site_shared/views/footer.py @@ -55,7 +55,7 @@ def tab_item(mode: str, icon: str) -> rx.Component: unactive_cn = " hover:text-secondary-12 text-secondary-11" return rx.el.button( get_icon(icon, class_name="shrink-0"), - on_click=set_color_mode(mode), # type: ignore[reportArgumentType] + on_click=set_color_mode(mode), class_name=ui.cn( "flex items-center cursor-pointer justify-center rounded-lg transition-colors size-7 outline-none focus:outline-none ", rx.cond(mode == color_mode, active_cn, unactive_cn), diff --git a/reflex/istate/manager/token.py b/reflex/istate/manager/token.py index b376f76e6d9..7e5ca111ec0 100644 --- a/reflex/istate/manager/token.py +++ b/reflex/istate/manager/token.py @@ -240,5 +240,5 @@ def from_legacy_token( ) client_token, state_path = _split_substate_key(legacy_token) - state_cls = root_state.get_class_substate(tuple(state_path.split("."))) # type: ignore[union-attr] + state_cls = root_state.get_class_substate(tuple(state_path.split("."))) return cls(ident=client_token, cls=state_cls) From 15d26b48a41da981fe1ced5c000ebb69936394ce Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Sat, 30 May 2026 00:47:56 +0200 Subject: [PATCH 28/57] streamline signature assignment --- .../src/reflex_base/components/memo.py | 4 ++-- .../src/reflex_base/event/__init__.py | 6 ++++-- .../reflex-base/src/reflex_base/utils/types.py | 16 ++++++++++++++++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/packages/reflex-base/src/reflex_base/components/memo.py b/packages/reflex-base/src/reflex_base/components/memo.py index 590f2090c75..880905bd847 100644 --- a/packages/reflex-base/src/reflex_base/components/memo.py +++ b/packages/reflex-base/src/reflex_base/components/memo.py @@ -40,7 +40,7 @@ from reflex_base.event import EventChain, EventHandler, no_args_event_spec, run_script from reflex_base.utils import console, format from reflex_base.utils.imports import ImportVar -from reflex_base.utils.types import safe_issubclass, typehint_issubclass +from reflex_base.utils.types import safe_issubclass, set_signature, typehint_issubclass from reflex_base.vars import VarData from reflex_base.vars.base import LiteralVar, Var from reflex_base.vars.function import ( @@ -592,7 +592,7 @@ def _event_handler_placeholder(placeholder_name: str, args_spec: Any) -> Callabl def _placeholder(*args: Any) -> Any: return run_script(prop_callback.call(*args)) - _placeholder.__signature__ = inspect.signature(primary_spec) # ty:ignore[unresolved-attribute] + set_signature(_placeholder, inspect.signature(primary_spec)) return _placeholder diff --git a/packages/reflex-base/src/reflex_base/event/__init__.py b/packages/reflex-base/src/reflex_base/event/__init__.py index 308f296c44a..47f2157f278 100644 --- a/packages/reflex-base/src/reflex_base/event/__init__.py +++ b/packages/reflex-base/src/reflex_base/event/__init__.py @@ -43,6 +43,7 @@ GenericType, Unset, safe_issubclass, + set_signature, typehint_issubclass, ) from reflex_base.vars import VarData @@ -1036,7 +1037,7 @@ def inner(*values: Var[T]) -> tuple[Var[T], ...]: inner_type = tuple(Var[event_type] for event_type in event_types) # ty:ignore[invalid-type-form] return_annotation = tuple[inner_type] # ty:ignore[invalid-type-form] - inner.__signature__ = inspect.signature(inner).replace( # ty:ignore[unresolved-attribute] + new_signature = inspect.signature(inner).replace( parameters=[ inspect.Parameter( f"ev_{i}", @@ -1047,6 +1048,7 @@ def inner(*values: Var[T]) -> tuple[Var[T], ...]: ], return_annotation=return_annotation, ) + set_signature(inner, new_signature) for i, event_type in enumerate(event_types): inner.__annotations__[f"ev_{i}"] = Var[event_type] # ty:ignore[invalid-type-form] inner.__annotations__["return"] = return_annotation @@ -1244,7 +1246,7 @@ def fn(): return None fn.__qualname__ = name - fn.__signature__ = sig # ty:ignore[unresolved-attribute] + set_signature(fn, sig) return EventSpec( handler=EventHandler(fn=fn), args=tuple( diff --git a/packages/reflex-base/src/reflex_base/utils/types.py b/packages/reflex-base/src/reflex_base/utils/types.py index e95037087e5..94479a73444 100644 --- a/packages/reflex-base/src/reflex_base/utils/types.py +++ b/packages/reflex-base/src/reflex_base/utils/types.py @@ -3,6 +3,7 @@ from __future__ import annotations import dataclasses +import inspect import sys import types from collections.abc import Callable, Iterable, Mapping, Sequence @@ -40,6 +41,21 @@ from reflex_base import constants from reflex_base.utils import console + +def set_signature(fn: Any, signature: inspect.Signature) -> None: + """Attach an explicit ``__signature__`` to a callable. + + ``__signature__`` is an optional attribute that ``inspect.signature`` reads + when present, but it is not part of a function's static type, so it is set + here through an ``Any``-typed handle rather than direct attribute access. + + Args: + fn: The callable to annotate. + signature: The signature to expose for ``fn``. + """ + fn.__signature__ = signature + + # Potential GenericAlias types for isinstance checks. GenericAliasTypes = (_GenericAlias, GenericAlias, _SpecialGenericAlias) From 2510a90b037ab92a43cb189f3fa17fa4ed74563c Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Sat, 30 May 2026 00:53:51 +0200 Subject: [PATCH 29/57] add callable_qualname --- .../src/reflex_base/event/__init__.py | 3 ++- .../src/reflex_base/event/context.py | 4 ++-- .../event/processor/base_state_processor.py | 4 ++-- .../src/reflex_base/utils/format.py | 19 +++++++++++++++++++ 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/packages/reflex-base/src/reflex_base/event/__init__.py b/packages/reflex-base/src/reflex_base/event/__init__.py index 47f2157f278..1649c8f122b 100644 --- a/packages/reflex-base/src/reflex_base/event/__init__.py +++ b/packages/reflex-base/src/reflex_base/event/__init__.py @@ -2332,6 +2332,7 @@ def create( EventFnArgMismatchError: If the event handler takes arguments. """ if isinstance(value, EventHandler): + handler = value def no_args(): return () @@ -2339,7 +2340,7 @@ def no_args(): try: value = call_event_handler(value, no_args) except EventFnArgMismatchError: - msg = f"Event handler {value.fn.__qualname__} used inside of a rx.cond() must not take any arguments." # ty:ignore[unresolved-attribute] + msg = f"Event handler {format.callable_qualname(handler.fn)} used inside of a rx.cond() must not take any arguments." raise EventFnArgMismatchError(msg) from None return cls( diff --git a/packages/reflex-base/src/reflex_base/event/context.py b/packages/reflex-base/src/reflex_base/event/context.py index 83ee400b5d9..cf1141d6130 100644 --- a/packages/reflex-base/src/reflex_base/event/context.py +++ b/packages/reflex-base/src/reflex_base/event/context.py @@ -9,7 +9,7 @@ from typing import TYPE_CHECKING, Any, Protocol from reflex_base.context.base import BaseContext -from reflex_base.utils.format import callable_name, to_snake_case +from reflex_base.utils.format import callable_qualname, to_snake_case if TYPE_CHECKING: from reflex.istate.manager import StateManager @@ -24,7 +24,7 @@ def get_name(cls: type | Callable) -> str: The name of the state/func. """ module = cls.__module__.replace(".", "___") - qualname = getattr(cls, "__qualname__", callable_name(cls)).replace(".", "___") + qualname = callable_qualname(cls).replace(".", "___") return to_snake_case(f"{module}___{qualname}") diff --git a/packages/reflex-base/src/reflex_base/event/processor/base_state_processor.py b/packages/reflex-base/src/reflex_base/event/processor/base_state_processor.py index 1f7134d76ef..429883f8589 100644 --- a/packages/reflex-base/src/reflex_base/event/processor/base_state_processor.py +++ b/packages/reflex-base/src/reflex_base/event/processor/base_state_processor.py @@ -18,7 +18,7 @@ from reflex_base.event.context import EventContext from reflex_base.event.processor.event_processor import EventProcessor, EventQueueEntry from reflex_base.registry import RegisteredEventHandler -from reflex_base.utils.format import format_event_handler +from reflex_base.utils.format import callable_qualname, format_event_handler if TYPE_CHECKING: from reflex.event import EventHandler, EventSpec @@ -393,7 +393,7 @@ async def _handle_backend_exception( if events := self.backend_exception_handler(ex): await chain_updates( events=events, - handler_name=self.backend_exception_handler.__qualname__, # ty:ignore[unresolved-attribute] + handler_name=callable_qualname(self.backend_exception_handler), ) diff --git a/packages/reflex-base/src/reflex_base/utils/format.py b/packages/reflex-base/src/reflex_base/utils/format.py index 9ea5881d447..a8e36199506 100644 --- a/packages/reflex-base/src/reflex_base/utils/format.py +++ b/packages/reflex-base/src/reflex_base/utils/format.py @@ -47,6 +47,25 @@ def callable_name(fn: object) -> str: return repr(fn) +def callable_qualname(fn: object) -> str: + """Return ``fn.__qualname__`` when available, otherwise the display name. + + Like :func:`callable_name` but keeps the qualifying path (e.g. + ``MyState.handler``) for callables that expose ``__qualname__``, falling + back to :func:`callable_name` for those that don't (e.g. ``partial``). + + Args: + fn: The object whose qualified name is wanted. + + Returns: + The qualified display name. + """ + qualname = getattr(fn, "__qualname__", None) + if isinstance(qualname, str): + return qualname + return callable_name(fn) + + def length_of_largest_common_substring(str1: str, str2: str) -> int: """Find the length of the largest common substring between two strings. From 16a3c8d8feba398432fea8a41a9b16f23563ae6e Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Sat, 30 May 2026 00:55:47 +0200 Subject: [PATCH 30/57] remove double ignores --- pyi_hashes.json | 2 +- reflex/istate/manager/__init__.py | 2 +- reflex/state.py | 2 +- tests/units/components/test_memo.py | 2 +- .../reflex_base/event/processor/test_event_processor.py | 2 +- .../utils/pyi_generator/dataset/staticmethod_namespace.py | 2 +- tests/units/test_environment.py | 6 +++--- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pyi_hashes.json b/pyi_hashes.json index a788d4811b2..2a077a15a48 100644 --- a/pyi_hashes.json +++ b/pyi_hashes.json @@ -120,5 +120,5 @@ "packages/reflex-components-sonner/src/reflex_components_sonner/toast.pyi": "7aa0047e5a61719415fb82e63b64d524", "reflex/__init__.pyi": "12a863ddbcac050c702a3ec6092ae17c", "reflex/components/__init__.pyi": "f39a2af77f438fa243c58c965f19d42e", - "reflex/experimental/memo.pyi": "72001108420e10165405aad1425bd01d" + "reflex/experimental/memo.pyi": "2a2ee4fc2b2d27352e3343dee827f005" } diff --git a/reflex/istate/manager/__init__.py b/reflex/istate/manager/__init__.py index 84eae3a0241..b852c9d049a 100644 --- a/reflex/istate/manager/__init__.py +++ b/reflex/istate/manager/__init__.py @@ -105,7 +105,7 @@ def _coerce_token(token: StateToken[TOKEN_TYPE] | str) -> StateToken[TOKEN_TYPE] from reflex.istate.manager.token import BaseStateToken from reflex.state import State - return BaseStateToken.from_legacy_token(token, root_state=State) # type: ignore[return-value] # ty:ignore[invalid-return-type] + return BaseStateToken.from_legacy_token(token, root_state=State) # ty:ignore[invalid-return-type] return token @overload diff --git a/reflex/state.py b/reflex/state.py index aca5f700182..9d06bdba7f1 100644 --- a/reflex/state.py +++ b/reflex/state.py @@ -2257,7 +2257,7 @@ async def _get_state_from_redis(self, state_cls: type[T_STATE]) -> T_STATE: from reflex.istate.shared import SharedStateBaseInternal shared_base = await self.get_state(SharedStateBaseInternal) - return await shared_base._resolve_linked_state(state_cls, linked_token) # type: ignore[return-value] # ty:ignore[invalid-return-type] + return await shared_base._resolve_linked_state(state_cls, linked_token) # ty:ignore[invalid-return-type] return await super()._get_state_from_redis(state_cls) @event diff --git a/tests/units/components/test_memo.py b/tests/units/components/test_memo.py index 95f1cbd5be2..04206910824 100644 --- a/tests/units/components/test_memo.py +++ b/tests/units/components/test_memo.py @@ -611,7 +611,7 @@ class RestrictedChild(Component): @rx.memo def transparent(children: rx.Var[rx.Component]) -> rx.Component: - return children # type: ignore[return-value] # ty:ignore[invalid-return-type] + return children # ty:ignore[invalid-return-type] wrapped_child = transparent(RestrictedChild.create()) parent = ValidParent.create(wrapped_child) diff --git a/tests/units/reflex_base/event/processor/test_event_processor.py b/tests/units/reflex_base/event/processor/test_event_processor.py index 5029f1fb6ce..f3a3c0e9c8e 100644 --- a/tests/units/reflex_base/event/processor/test_event_processor.py +++ b/tests/units/reflex_base/event/processor/test_event_processor.py @@ -124,7 +124,7 @@ async def _background_slow_logging_handler(value: str = "default"): _CALL_LOG.append({"value": value}) -_background_slow_logging_handler._reflex_background_task = True # type: ignore[attr-defined] # ty:ignore[unresolved-attribute] +_background_slow_logging_handler._reflex_background_task = True # ty:ignore[unresolved-attribute] noop_event = EventHandler(fn=_noop_handler) diff --git a/tests/units/reflex_base/utils/pyi_generator/dataset/staticmethod_namespace.py b/tests/units/reflex_base/utils/pyi_generator/dataset/staticmethod_namespace.py index 380b534009c..12a9e0b8dc7 100644 --- a/tests/units/reflex_base/utils/pyi_generator/dataset/staticmethod_namespace.py +++ b/tests/units/reflex_base/utils/pyi_generator/dataset/staticmethod_namespace.py @@ -29,7 +29,7 @@ def send_notification(message: str, level: str = "info") -> EventSpec: Returns: The event spec. """ - return EventSpec() # type: ignore[call-arg] # ty:ignore[missing-argument] + return EventSpec() # ty:ignore[missing-argument] class Notify(ComponentNamespace): diff --git a/tests/units/test_environment.py b/tests/units/test_environment.py index d8f2c50e758..c5aa60e8972 100644 --- a/tests/units/test_environment.py +++ b/tests/units/test_environment.py @@ -348,7 +348,7 @@ def test_get_with_default(self): def test_set_string_value(self): """Test setting a string value.""" env_var_instance = EnvVar("TEST_VAR", "default", str) - env_var_instance.set("new_value") # type: ignore[arg-type] # ty:ignore[invalid-argument-type] + env_var_instance.set("new_value") # ty:ignore[invalid-argument-type] assert os.environ.get("TEST_VAR") == "new_value" # Clean up del os.environ["TEST_VAR"] @@ -367,7 +367,7 @@ def test_set_none_value(self, monkeypatch): def test_set_enum_value(self): """Test setting an enum value.""" env_var_instance = EnvVar("TEST_VAR", _TestEnum.VALUE1, _TestEnum) - env_var_instance.set(_TestEnum.VALUE2) # type: ignore[arg-type] # ty:ignore[invalid-argument-type] + env_var_instance.set(_TestEnum.VALUE2) # ty:ignore[invalid-argument-type] assert os.environ.get("TEST_VAR") == "value2" # Clean up del os.environ["TEST_VAR"] @@ -375,7 +375,7 @@ def test_set_enum_value(self): def test_set_list_value(self): """Test setting a list value.""" env_var_instance = EnvVar("TEST_VAR", [], list[int]) - env_var_instance.set([1, 2, 3]) # type: ignore[arg-type] # ty:ignore[invalid-argument-type] + env_var_instance.set([1, 2, 3]) # ty:ignore[invalid-argument-type] assert os.environ.get("TEST_VAR") == "1:2:3" # Clean up del os.environ["TEST_VAR"] From 582bf98053073b9940e673ed6e02511d17c72692 Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Tue, 7 Jul 2026 23:48:53 +0200 Subject: [PATCH 31/57] bump ty --- uv.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/uv.lock b/uv.lock index 8467b00269c..04f03fef3c6 100644 --- a/uv.lock +++ b/uv.lock @@ -4755,27 +4755,27 @@ wheels = [ [[package]] name = "ty" -version = "0.0.39" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/d0/8d/7b5c74dc287fbcb37bae9853cec13bf44717c1735298500e4aeba31579a9/ty-0.0.39.tar.gz", hash = "sha256:f750277e76a01ecd86185960eca73823c26a53c51103568d56d4d904575159fd", size = 5702365, upload-time = "2026-05-22T21:09:56.403Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/08/17/9b89802c26d12d0f7a27bc25d4066d941d42891e8898f9f26499f0067e32/ty-0.0.39-py3-none-linux_armv6l.whl", hash = "sha256:c1bb7ac70f1f7d70cc6655fd96558039e4562b10f489fa49c7ebfd5fcee73ad1", size = 11360431, upload-time = "2026-05-22T21:09:18.689Z" }, - { url = "https://files.pythonhosted.org/packages/9c/c6/663ded50e823dbf9fb9d002eca46b7cb1fb2c72b744b84f22ce732a0ee0b/ty-0.0.39-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:3435b64c1e59c14c9aa39c20cc018823937cd38d55db853e74d95b8f420569b0", size = 11096281, upload-time = "2026-05-22T21:09:15.383Z" }, - { url = "https://files.pythonhosted.org/packages/8b/ae/5d38ba9a6456ff4c78d212cf464fd8b9a25d8118465197b0b2dc891c0b19/ty-0.0.39-py3-none-macosx_11_0_arm64.whl", hash = "sha256:5f136377ce46c73677701a9e1ad730bf72f699bcec046e422eb79d0886cac3ab", size = 10529674, upload-time = "2026-05-22T21:09:46.471Z" }, - { url = "https://files.pythonhosted.org/packages/be/6f/43638cb8106445d3c8817256a0731cde9dd7b6a53ae2e881294bc1930ca3/ty-0.0.39-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:36b65fb0cc17f03e851d40e210d420be94ab8bc52d041328ad1e45f616036a61", size = 11055561, upload-time = "2026-05-22T21:09:36.981Z" }, - { url = "https://files.pythonhosted.org/packages/91/17/95e62cf4458527ce78dc386eba18f8b10c3fb64cd8c9e7e59b262ff6029d/ty-0.0.39-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:4967967bfadf3860ff84c3fccdbaec8edf8aa20d0d727521084733d853de6657", size = 11127185, upload-time = "2026-05-22T21:09:31.395Z" }, - { url = "https://files.pythonhosted.org/packages/4e/c0/93666c213db5c71ab1b1f1a0db5f66bf8c7c0e0b0bf59859f5da8f0b3c36/ty-0.0.39-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9e10ecb1297099ddf9a1f054f8bd921d1863ce85fb819a3c96ed27865a1ba6ed", size = 11608459, upload-time = "2026-05-22T21:09:12.862Z" }, - { url = "https://files.pythonhosted.org/packages/79/85/3b26585afc8b50230d6464bb0642feef4fab3f847e38b1f0ffa971a81446/ty-0.0.39-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9b19cca70e465d71b0510656343883d62372bbe74b7845cae7c0e701d6d5264b", size = 12177101, upload-time = "2026-05-22T21:09:40.519Z" }, - { url = "https://files.pythonhosted.org/packages/49/4a/1039e4f6afc576dc1c3a4d22a6478904a1ad3766597cd0b93c077ab9dfce/ty-0.0.39-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:56c6704b01b9b3d80ff26b2918423b742516d1e469bef830e9254dcedc9185bf", size = 11827815, upload-time = "2026-05-22T21:09:49.89Z" }, - { url = "https://files.pythonhosted.org/packages/e2/c5/4688652870e350a76a8157f7ffb59ad54f37d5d10725aa7076f66ac94ec8/ty-0.0.39-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:40b7840ff46764b6a6757f4ade1cd0530fc3e8a0b435ca93e7602360e4cb90b6", size = 11694429, upload-time = "2026-05-22T21:09:21.568Z" }, - { url = "https://files.pythonhosted.org/packages/fc/72/8a1c4e823bb5bdc935a1c8140e100304e36a68a4139592f170aa9736fdb7/ty-0.0.39-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:1c62a3a87ce26b50819f0dbf03bd95f23f19eeb87bbc7aa732ec64277c77f1aa", size = 11869846, upload-time = "2026-05-22T21:09:28.053Z" }, - { url = "https://files.pythonhosted.org/packages/17/9f/cf982457b861ae22d657c5dcdbc631199f7f90264279db1d17230dfbc3ff/ty-0.0.39-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:f8c34bc81a9c3516e49904e9d8330aac385377cca98390193ea02b903a40fcf0", size = 11029763, upload-time = "2026-05-22T21:09:06.791Z" }, - { url = "https://files.pythonhosted.org/packages/46/c9/95b64f6d43ae6e8f0b7e13dacf9c196d35819af22b1924171fba31383156/ty-0.0.39-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:66f5ab11586a64e79cb692ad685ee5469325c31b5f30bd3554f52f36dbe28cc4", size = 11146761, upload-time = "2026-05-22T21:09:10.178Z" }, - { url = "https://files.pythonhosted.org/packages/52/69/0a89cfb06f7632a05bf56c78e0affb4a40f81759e275376cea75c9c5abe9/ty-0.0.39-py3-none-musllinux_1_2_i686.whl", hash = "sha256:e8d89732bcbbcb091f439e556dfc4932f198b118b47d5b85212c60662099670e", size = 11281843, upload-time = "2026-05-22T21:09:34.234Z" }, - { url = "https://files.pythonhosted.org/packages/0e/53/64c4a27067a46643fea2b3fcf21a8a2f838d91a65ffdd14f2e82945b9538/ty-0.0.39-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:eceb6c91dcd05a231119f82abdd9aa337513de23ca6ac990bc44f88791dc1799", size = 11792477, upload-time = "2026-05-22T21:09:24.923Z" }, - { url = "https://files.pythonhosted.org/packages/1a/e8/02f4dd4a12bcdbda0006f9c7ff3b99a4be06bd0d257d3bd4a5b66de074e6/ty-0.0.39-py3-none-win32.whl", hash = "sha256:891c3262314dbc80bf3e872634d23dd216306945daa9a9fcc206ce5ed21ac4c9", size = 10615377, upload-time = "2026-05-22T21:09:43.167Z" }, - { url = "https://files.pythonhosted.org/packages/b5/5a/aaeb22faa8d4dae90a287d4c3636c671edcff3b99be5f4fc8b79ad71eef6/ty-0.0.39-py3-none-win_amd64.whl", hash = "sha256:ba7f2d54452535419e90f6f03ff39282999e87b43c21c00559f6d7ad711a36d5", size = 11710711, upload-time = "2026-05-22T21:09:53.179Z" }, - { url = "https://files.pythonhosted.org/packages/a3/17/ae7339651bfcaa5f54698c8c70eaf5031baa400ecb67baec31d03a56cbd4/ty-0.0.39-py3-none-win_arm64.whl", hash = "sha256:eb4cf0fefbbfedf9a352597bb2431ebdcb7eb3a595c0f825f228e897a0ec285d", size = 11081409, upload-time = "2026-05-22T21:09:03.741Z" }, +version = "0.0.55" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/08/48/f687c8d268e3581f2f104d1f2ac5944d5b5e841b3695c613b3f263e5bbf7/ty-0.0.55.tar.gz", hash = "sha256:88ca87073825a79a8327c550efcc86cec94344890244c5946f84c9e44a969f31", size = 6040230, upload-time = "2026-06-27T00:27:29.385Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/87/a3/1a90ba7e5a61c6d09adb92346ddba97668095fc257b577af433e5ac4f404/ty-0.0.55-py3-none-linux_armv6l.whl", hash = "sha256:31e83eef512d066542fe990fe1a3b814423abd1616376c54e48af7045b3e1749", size = 11677249, upload-time = "2026-06-27T00:26:52.18Z" }, + { url = "https://files.pythonhosted.org/packages/82/3a/669f9aa478c38243e213a2684db1502086026cfadc15bb1b29b7cbde030d/ty-0.0.55-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:ab4bca857950608fea73e269e2da369d43e6467131de85160d68e2fa466fa248", size = 11444180, upload-time = "2026-06-27T00:26:54.576Z" }, + { url = "https://files.pythonhosted.org/packages/15/a4/6a4b2507a53ce6530c66c5b4fe0d58551eb1748ffa9e0696c32fdd55bbd4/ty-0.0.55-py3-none-macosx_11_0_arm64.whl", hash = "sha256:55032bfd31bf2c5355ee81bdc6407b144a1cc7ee41e5681dd1368e4cef2ba327", size = 10963134, upload-time = "2026-06-27T00:26:57.348Z" }, + { url = "https://files.pythonhosted.org/packages/ce/ae/a3b1a0f1cc83b7d258662cb98aa80a720c2e671d0e8fa0d17a4d5d057a7a/ty-0.0.55-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ef1e049f69ce65b3c269af67624607f435e1c32319786c1e453ef9611502f295", size = 11493517, upload-time = "2026-06-27T00:26:59.26Z" }, + { url = "https://files.pythonhosted.org/packages/0d/9f/311ce39065a979ef40a9b847f685c8e02464e53adf1671e081eea90640ca/ty-0.0.55-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:631409975c681d5a280fc5a99b7b32e9e801f33be7567c6b42ec331362f59d7d", size = 11460590, upload-time = "2026-06-27T00:27:01.425Z" }, + { url = "https://files.pythonhosted.org/packages/cd/8f/3bf29aa77bd78aae48275153135a2052fa7d3ccdf1ecabeb99c8773abd66/ty-0.0.55-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e08cb0436e68b9351555ae8f2697138c9009b4d5b4ae4272232988b2a431a98f", size = 12098430, upload-time = "2026-06-27T00:27:03.596Z" }, + { url = "https://files.pythonhosted.org/packages/bc/6e/e88411a88240b94640bba06fb6d0d92b247fbeef47ee2bc71f39e58c2558/ty-0.0.55-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:16c215ad9f823829409b94ee188cfaa4563f6e1384f6ce3fecb1db75f6c7cf7c", size = 12673086, upload-time = "2026-06-27T00:27:05.589Z" }, + { url = "https://files.pythonhosted.org/packages/6c/7e/8f1762fb7f9245a68ba5ae338d73c59403ce57554e5d311b8bb55027b0ec/ty-0.0.55-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b510eb8f4032baf11b7aee2f1d53babc3b4ca03939b9cdcf6a9d15761d575188", size = 12242559, upload-time = "2026-06-27T00:27:07.714Z" }, + { url = "https://files.pythonhosted.org/packages/72/1f/143657daf2670d977dac83435f1fe03d4843efb798d8e1e75950e541aadd/ty-0.0.55-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0ddc05e7959709c3b9b83aa627128a80446865e3c1a4882638dcff6d776dc34a", size = 12021409, upload-time = "2026-06-27T00:27:09.881Z" }, + { url = "https://files.pythonhosted.org/packages/6d/30/69487c439dd1fad3a4a3d96f0a472193de297eaba6fc4b8ea687ce434ac2/ty-0.0.55-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:636e8e5078787b8c6916c94e1406719f10189a4ca6b37b813a5922ce5857a8c7", size = 12303807, upload-time = "2026-06-27T00:27:11.986Z" }, + { url = "https://files.pythonhosted.org/packages/e8/ca/cd88b6493dafc7db077f5e17c0438eb3af6e2d6d08f616dbb52a8ddfd567/ty-0.0.55-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:ef7d6deaacb73fec603666b5471f1dc5a5699aa84e11a6d4d644dd07ca72121e", size = 11441263, upload-time = "2026-06-27T00:27:14.087Z" }, + { url = "https://files.pythonhosted.org/packages/aa/fe/66b6915671653ab739f71e4f1b0528e69da64429b7ebf3840c625b6e43f2/ty-0.0.55-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:9aeea0fe5875d3cf37faf0e44d0fdf9669335467749741b8fc0103916fb5cd32", size = 11484584, upload-time = "2026-06-27T00:27:16.311Z" }, + { url = "https://files.pythonhosted.org/packages/4a/4f/7a9c0bbac8b899e9f6c0ec110c6612f52e4db35f6bb17ddc0ef60384fa3e/ty-0.0.55-py3-none-musllinux_1_2_i686.whl", hash = "sha256:0b699c01310dbd2705a07c97c5f4aaeedef61bd9adeea2e7c46aed32401d3576", size = 11759309, upload-time = "2026-06-27T00:27:18.471Z" }, + { url = "https://files.pythonhosted.org/packages/ca/de/b6f8b1b69aa631b5716ef3f985c3b56de0e46c2499cc00d30c402b41f714/ty-0.0.55-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:32cbeba543e46de2a983ec6d525d8b56514f7422bd1e1b57c44ccf7bfa72c38a", size = 12128755, upload-time = "2026-06-27T00:27:20.55Z" }, + { url = "https://files.pythonhosted.org/packages/7d/90/a912531e51ee7e076b42972479290fa687c0f5e747b7e773f3033164acaa/ty-0.0.55-py3-none-win32.whl", hash = "sha256:52b968e24eb4f7a5c3bd251db1f99f60dd385890356d38fc619d84f1b423446a", size = 11117501, upload-time = "2026-06-27T00:27:22.714Z" }, + { url = "https://files.pythonhosted.org/packages/4c/7a/99d59843bf8908a7f9f4d13fda107dbad07b7faa28ecd7860eacf363fb1c/ty-0.0.55-py3-none-win_amd64.whl", hash = "sha256:bf39cbfdc0add44d94bd3fff1f53c351418d134b6a66b87efdb7876d7b7a2224", size = 12150106, upload-time = "2026-06-27T00:27:24.881Z" }, + { url = "https://files.pythonhosted.org/packages/b3/44/20987505cedf2a865b08482f0eabc181fd9599b062964057ec8a128a4296/ty-0.0.55-py3-none-win_arm64.whl", hash = "sha256:f7f3700a9a060e8f1af11e4fb63fafcaf272b041781f4ccdfda2b3b5c6c1e439", size = 11560157, upload-time = "2026-06-27T00:27:27.332Z" }, ] [[package]] From b5ba90ce5f445b78f4a93a0c875955bd02d840e2 Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Wed, 8 Jul 2026 01:00:05 +0200 Subject: [PATCH 32/57] fix some typing --- .../src/reflex_base/components/field.py | 8 +-- .../src/reflex_base/event/__init__.py | 8 +-- .../reflex_base/plugins/shared_tailwind.py | 19 +++--- .../reflex-base/src/reflex_base/vars/base.py | 30 ++++++---- .../components/base/__init__.py | 2 +- reflex/compiler/compiler.py | 4 +- reflex/istate/manager/disk.py | 4 +- reflex/istate/manager/redis.py | 8 +-- reflex/istate/proxy.py | 2 +- tests/integration/test_lifespan.py | 2 +- tests/units/istate/manager/test_expiration.py | 8 +-- tests/units/istate/manager/test_redis.py | 58 +++++++++---------- tests/units/test_app.py | 16 ++--- tests/units/test_prerequisites.py | 15 +++-- tests/units/test_state.py | 30 +++++----- tests/units/utils/test_token_manager.py | 2 +- 16 files changed, 115 insertions(+), 101 deletions(-) diff --git a/packages/reflex-base/src/reflex_base/components/field.py b/packages/reflex-base/src/reflex_base/components/field.py index 1271eac43bd..4c9cb8ae0d5 100644 --- a/packages/reflex-base/src/reflex_base/components/field.py +++ b/packages/reflex-base/src/reflex_base/components/field.py @@ -110,11 +110,11 @@ def _collect_inherited_fields(cls, bases: tuple[type, ...]) -> dict[str, Any]: # Collect inherited fields from base classes for base in bases[::-1]: - if hasattr(base, "_inherited_fields"): - inherited_fields.update(base._inherited_fields) + if (fields := getattr(base, "_inherited_fields", None)) is not None: + inherited_fields.update(fields) for base in bases[::-1]: - if hasattr(base, "_own_fields"): - inherited_fields.update(base._own_fields) + if (fields := getattr(base, "_own_fields", None)) is not None: + inherited_fields.update(fields) return inherited_fields diff --git a/packages/reflex-base/src/reflex_base/event/__init__.py b/packages/reflex-base/src/reflex_base/event/__init__.py index 67e1ee78e7f..cddcd684ad9 100644 --- a/packages/reflex-base/src/reflex_base/event/__init__.py +++ b/packages/reflex-base/src/reflex_base/event/__init__.py @@ -708,7 +708,7 @@ class EventChain(EventActionsMixin): args_spec: Callable | Sequence[Callable] | None = dataclasses.field(default=None) - invocation: Var | None = dataclasses.field(default=None) + invocation: FunctionVar | None = dataclasses.field(default=None) @classmethod def create( @@ -2546,13 +2546,13 @@ def create( call_args = arg_vars if sig.parameters else (Var(_js_expr="...args"),) statements = [ ( - event.call(*call_args) + event.call(*call_args) # ty:ignore[no-matching-overload] https://github.com/astral-sh/ty/issues/1824 if isinstance(event, FunctionVar) else invocation.call( LiteralVar.create([LiteralVar.create(event)]), arg_def_expr, _EMPTY_EVENT_ACTIONS, - ) # ty:ignore[no-matching-overload] + ) ) for event in value.events ] @@ -2563,7 +2563,7 @@ def create( _EMPTY_EVENTS, arg_def_expr, _EMPTY_EVENT_ACTIONS, - ) # ty:ignore[no-matching-overload] + ) ) if len(statements) == 1 and not value.event_actions: diff --git a/packages/reflex-base/src/reflex_base/plugins/shared_tailwind.py b/packages/reflex-base/src/reflex_base/plugins/shared_tailwind.py index e32ddcacc89..e1318ff5e62 100644 --- a/packages/reflex-base/src/reflex_base/plugins/shared_tailwind.py +++ b/packages/reflex-base/src/reflex_base/plugins/shared_tailwind.py @@ -1,7 +1,6 @@ """Tailwind CSS configuration types for Reflex plugins.""" import dataclasses -from collections.abc import Mapping from copy import deepcopy from typing import Any, Literal, TypedDict @@ -106,9 +105,9 @@ def tailwind_config_js_template( # Extract destructured imports from plugin dicts only imports = [ - plugin["import"] # ty:ignore[invalid-argument-type] + plugin["import"] for plugin in plugins - if isinstance(plugin, Mapping) and "import" in plugin + if not isinstance(plugin, str) and "import" in plugin ] # Generate import statements for destructured imports @@ -119,12 +118,12 @@ def tailwind_config_js_template( # Generate plugin imports plugin_imports = [] for i, plugin in enumerate(plugins, 1): - if isinstance(plugin, Mapping) and "call" not in plugin: + if isinstance(plugin, str): + plugin_imports.append(f"import plugin{i} from {json.dumps(plugin)};") + elif "call" not in plugin: plugin_imports.append( - f"import plugin{i} from {json.dumps(plugin['name'])};" # ty:ignore[invalid-argument-type] + f"import plugin{i} from {json.dumps(plugin['name'])};" ) - elif not isinstance(plugin, Mapping): - plugin_imports.append(f"import plugin{i} from {json.dumps(plugin)};") plugin_imports_lines = "\n".join(plugin_imports) @@ -136,11 +135,11 @@ def tailwind_config_js_template( # Generate plugin array plugin_list = [] for i, plugin in enumerate(plugins, 1): - if isinstance(plugin, Mapping) and "call" in plugin: + if not isinstance(plugin, str) and "call" in plugin: args_part = "" if "args" in plugin: - args_part = json.dumps(plugin["args"]) # ty:ignore[invalid-argument-type, invalid-key] - plugin_list.append(f"{plugin['call']}({args_part})") # ty:ignore[invalid-argument-type, invalid-key] + args_part = json.dumps(plugin["args"]) + plugin_list.append(f"{plugin['call']}({args_part})") else: plugin_list.append(f"plugin{i}") diff --git a/packages/reflex-base/src/reflex_base/vars/base.py b/packages/reflex-base/src/reflex_base/vars/base.py index aabf2bccaf1..97f67b58105 100644 --- a/packages/reflex-base/src/reflex_base/vars/base.py +++ b/packages/reflex-base/src/reflex_base/vars/base.py @@ -3530,12 +3530,22 @@ def __get__( @overload def __get__( - self: Field[list[V]] - | Field[set[V]] - | Field[list[V] | None] - | Field[set[V] | None], - instance: None, - owner: Any, + self: Field[list[V]], instance: None, owner: Any + ) -> ArrayVar[Sequence[V]]: ... + + @overload + def __get__( + self: Field[set[V]], instance: None, owner: Any + ) -> ArrayVar[Sequence[V]]: ... + + @overload + def __get__( + self: Field[list[V] | None], instance: None, owner: Any + ) -> ArrayVar[Sequence[V]]: ... + + @overload + def __get__( + self: Field[set[V] | None], instance: None, owner: Any ) -> ArrayVar[Sequence[V]]: ... @overload @@ -3681,11 +3691,11 @@ def __new__( ) for base in bases[::-1]: - if hasattr(base, "__inherited_fields__"): - inherited_fields.update(base.__inherited_fields__) + if (fields := getattr(base, "__inherited_fields__", None)) is not None: + inherited_fields.update(fields) for base in bases[::-1]: - if hasattr(base, "__own_fields__"): - inherited_fields.update(base.__own_fields__) + if (fields := getattr(base, "__own_fields__", None)) is not None: + inherited_fields.update(fields) for key, value in [ (key, value) diff --git a/packages/reflex-components-internal/src/reflex_components_internal/components/base/__init__.py b/packages/reflex-components-internal/src/reflex_components_internal/components/base/__init__.py index a8d118dd3d2..a1097feeba0 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/components/base/__init__.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/components/base/__init__.py @@ -11,5 +11,5 @@ __getattr__, __dir__, __all__ = lazy_loader.attach( __name__, submodules=_SUBMODULES, - submod_attrs=_SUBMOD_ATTRS, # ty:ignore[invalid-argument-type] + submod_attrs=_SUBMOD_ATTRS, ) diff --git a/reflex/compiler/compiler.py b/reflex/compiler/compiler.py index 9dc0eb11285..6d3ca5bb60e 100644 --- a/reflex/compiler/compiler.py +++ b/reflex/compiler/compiler.py @@ -856,6 +856,8 @@ def into_component(component: Component | ComponentCallable) -> Component: # noqa: DAR401 """ + if isinstance(component, Component): + return component if (converted := _into_component_once(component)) is not None: return converted if not callable(component): @@ -863,7 +865,7 @@ def into_component(component: Component | ComponentCallable) -> Component: raise TypeError(msg) try: - component_called = component() # ty:ignore[call-top-callable] + component_called = component() except KeyError as e: if isinstance(e, ReflexError): _modify_exception(e) diff --git a/reflex/istate/manager/disk.py b/reflex/istate/manager/disk.py index ff8b6dc2b4e..414932cc7cc 100644 --- a/reflex/istate/manager/disk.py +++ b/reflex/istate/manager/disk.py @@ -179,7 +179,7 @@ async def get_state( if isinstance(token, BaseStateToken): # Find the root state root_state_cls = token.cls.get_root_state() - root_state = await self.load_state(token.with_cls(root_state_cls)) + root_state = await self.load_state(token.with_cls(root_state_cls)) # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/1824 # Create a new root state tree with all substates instantiated. fresh_root_state = root_state_cls(_reflex_internal_init=True) if root_state is None: @@ -222,7 +222,7 @@ async def set_state_for_substate( if isinstance(token, BaseStateToken) and isinstance(substate, BaseState): for substate_substate in substate.substates.values(): - await self.set_state_for_substate(token, substate_substate) + await self.set_state_for_substate(token, substate_substate) # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/1824 async def _process_write_queue_delay(self): """Wait for the debounce period before processing the write queue again.""" diff --git a/reflex/istate/manager/redis.py b/reflex/istate/manager/redis.py index f8d2fdf70ae..b77b462f89a 100644 --- a/reflex/istate/manager/redis.py +++ b/reflex/istate/manager/redis.py @@ -421,7 +421,7 @@ async def set_state( tasks = [ asyncio.create_task( self.set_state( - token, + token, # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/1824 substate, lock_id=lock_id, **context, @@ -467,9 +467,9 @@ async def _try_modify_state( return # Opportunistically reuse existing lock. - async with self._get_state_cached(token) as cached_state: # ty:ignore[invalid-argument-type] + async with self._get_state_cached(token) as cached_state: if cached_state is not None: - yield cached_state # ty:ignore[invalid-yield] + yield cached_state self._notify_next_waiter(self._lock_key(token)) return @@ -547,7 +547,7 @@ async def modify_state( """ token = self._coerce_token(token) while True: - async with self._try_modify_state(token, **context) as state_instance: # ty:ignore[invalid-argument-type] + async with self._try_modify_state(token, **context) as state_instance: if state_instance is not None: yield cast(TOKEN_TYPE, state_instance) return diff --git a/reflex/istate/proxy.py b/reflex/istate/proxy.py index d3e42d5cbe9..aa658ddb383 100644 --- a/reflex/istate/proxy.py +++ b/reflex/istate/proxy.py @@ -737,7 +737,7 @@ def _json_encoder_default_wrapper(self: json.JSONEncoder, o: Any) -> Any: return _orig_json_encoder_default(self, o) -json.JSONEncoder.default = _json_encoder_default_wrapper # ty:ignore[invalid-assignment] +json.JSONEncoder.default = _json_encoder_default_wrapper class ImmutableMutableProxy(MutableProxy): diff --git a/tests/integration/test_lifespan.py b/tests/integration/test_lifespan.py index 9938eda856e..59acb3397c0 100644 --- a/tests/integration/test_lifespan.py +++ b/tests/integration/test_lifespan.py @@ -37,7 +37,7 @@ def LifespanApp( async def lifespan_context(app, inc: int = 1): global lifespan_context_global # ty:ignore[unresolved-global] print(f"Lifespan context entered: {app}.") - lifespan_context_global += inc # ty:ignore[unresolved-reference] + lifespan_context_global += inc try: yield finally: diff --git a/tests/units/istate/manager/test_expiration.py b/tests/units/istate/manager/test_expiration.py index 81462c868e2..459764beb80 100644 --- a/tests/units/istate/manager/test_expiration.py +++ b/tests/units/istate/manager/test_expiration.py @@ -59,8 +59,8 @@ async def test_memory_state_manager_evicts_expired_state( """Expired states should be removed from the in-memory cache and locks.""" state_token = BaseStateToken(ident=token, cls=ExpiringState) - async with state_manager_memory.modify_state(state_token) as state: # ty:ignore[invalid-argument-type] - state.value = 42 # ty:ignore[unresolved-attribute] + async with state_manager_memory.modify_state(state_token) as state: + state.value = 42 assert token in state_manager_memory.states assert token in state_manager_memory._states_locks @@ -196,8 +196,8 @@ async def test_memory_state_manager_refreshes_expiration_after_locked_access( """Releasing a long-held state should start a fresh expiration window.""" state_token = BaseStateToken(ident=token, cls=ExpiringState) - async with state_manager_memory.modify_state(state_token) as state: # ty:ignore[invalid-argument-type] - state.value = 5 # ty:ignore[unresolved-attribute] + async with state_manager_memory.modify_state(state_token) as state: + state.value = 5 expires_at = state_manager_memory._token_expires_at[token] await asyncio.sleep(1.2) assert token in state_manager_memory.states diff --git a/tests/units/istate/manager/test_redis.py b/tests/units/istate/manager/test_redis.py index bca09046aea..41e9097677e 100644 --- a/tests/units/istate/manager/test_redis.py +++ b/tests/units/istate/manager/test_redis.py @@ -131,13 +131,13 @@ async def test_modify( # Initial modify should set count to 1 async with state_manager_redis.modify_state( - BaseStateToken(ident=token, cls=root_state) # ty:ignore[invalid-argument-type] + BaseStateToken(ident=token, cls=root_state) ) as new_state: - new_state.count = 1 # ty:ignore[unresolved-attribute] + new_state.count = 1 # Subsequent modify should set count to 2 async with state_manager_redis.modify_state( - BaseStateToken(ident=token, cls=root_state) # ty:ignore[invalid-argument-type] + BaseStateToken(ident=token, cls=root_state) ) as new_state: assert isinstance(new_state, root_state) assert new_state.count == 1 @@ -178,9 +178,9 @@ async def test_modify_oplock( # Initial modify should set count to 1 async with state_manager_redis.modify_state( - BaseStateToken(ident=token, cls=root_state), # ty:ignore[invalid-argument-type] + BaseStateToken(ident=token, cls=root_state), ) as new_state: - new_state.count = 1 # ty:ignore[unresolved-attribute] + new_state.count = 1 # Initial state manager should be holding a lease lease_task_1 = state_manager_redis._local_leases.get(token) @@ -202,9 +202,9 @@ async def test_modify_oplock( # The second modify should NOT trigger another redis lock async with state_manager_redis.modify_state( - BaseStateToken(ident=token, cls=root_state), # ty:ignore[invalid-argument-type] + BaseStateToken(ident=token, cls=root_state), ) as new_state: - new_state.count = 2 # ty:ignore[unresolved-attribute] + new_state.count = 2 assert state_lock_1.locked() lock_events_after = len([ @@ -218,9 +218,9 @@ async def test_modify_oplock( # Contend the lock from another state manager event_log_on_update.clear() async with state_manager_2.modify_state( - BaseStateToken(ident=token, cls=root_state), # ty:ignore[invalid-argument-type] + BaseStateToken(ident=token, cls=root_state), ) as new_state: - new_state.count = 3 # ty:ignore[unresolved-attribute] + new_state.count = 3 state_lock_2 = state_manager_2._cached_states_locks.get(token) assert state_lock_2 is not None assert state_lock_2.locked() @@ -315,7 +315,7 @@ async def test_oplock_contention_queue( async def modify_1(): async with state_manager_redis.modify_state( - BaseStateToken(ident=token, cls=root_state), # ty:ignore[invalid-argument-type] + BaseStateToken(ident=token, cls=root_state), ) as new_state: assert isinstance(new_state, root_state) new_state.count += 1 @@ -326,7 +326,7 @@ async def modify_2(): await modify_started.wait() modify_2_started.set() async with state_manager_2.modify_state( - BaseStateToken(ident=token, cls=root_state), # ty:ignore[invalid-argument-type] + BaseStateToken(ident=token, cls=root_state), ) as new_state: assert isinstance(new_state, root_state) new_state.count += 1 @@ -336,7 +336,7 @@ async def modify_3(): await modify_started.wait() modify_2_started.set() async with state_manager_2.modify_state( - BaseStateToken(ident=token, cls=root_state), # ty:ignore[invalid-argument-type] + BaseStateToken(ident=token, cls=root_state), ) as new_state: assert isinstance(new_state, root_state) new_state.count += 1 @@ -414,7 +414,7 @@ async def test_oplock_contention_no_lease( async def modify_1(): async with state_manager_redis.modify_state( - BaseStateToken(ident=token, cls=root_state), # ty:ignore[invalid-argument-type] + BaseStateToken(ident=token, cls=root_state), ) as new_state: assert isinstance(new_state, root_state) new_state.count += 1 @@ -425,7 +425,7 @@ async def modify_2(): await modify_started.wait() modify_2_started.set() async with state_manager_2.modify_state( - BaseStateToken(ident=token, cls=root_state), # ty:ignore[invalid-argument-type] + BaseStateToken(ident=token, cls=root_state), ) as new_state: assert isinstance(new_state, root_state) new_state.count += 1 @@ -435,7 +435,7 @@ async def modify_3(): await modify_started.wait() modify_2_started.set() async with state_manager_3.modify_state( - BaseStateToken(ident=token, cls=root_state), # ty:ignore[invalid-argument-type] + BaseStateToken(ident=token, cls=root_state), ) as new_state: assert isinstance(new_state, root_state) new_state.count += 1 @@ -514,7 +514,7 @@ async def test_oplock_contention_racers( async def modify_1(): nonlocal lease_1 async with state_manager_redis.modify_state( - BaseStateToken(ident=token, cls=root_state), # ty:ignore[invalid-argument-type] + BaseStateToken(ident=token, cls=root_state), ) as new_state: lease_1 = await state_manager_redis._get_local_lease(token) assert isinstance(new_state, root_state) @@ -525,7 +525,7 @@ async def modify_2(): await asyncio.sleep(racer_delay) nonlocal lease_2 async with state_manager_2.modify_state( - BaseStateToken(ident=token, cls=root_state), # ty:ignore[invalid-argument-type] + BaseStateToken(ident=token, cls=root_state), ) as new_state: lease_2 = await state_manager_2._get_local_lease(token) assert isinstance(new_state, root_state) @@ -574,7 +574,7 @@ async def canceller(): task = asyncio.create_task(canceller()) async with state_manager_redis.modify_state( - BaseStateToken(ident=token, cls=root_state), # ty:ignore[invalid-argument-type] + BaseStateToken(ident=token, cls=root_state), ) as new_state: assert await state_manager_redis._get_local_lease(token) is None assert isinstance(new_state, root_state) @@ -602,24 +602,24 @@ async def test_oplock_fetch_substate( state_manager_redis._oplock_enabled = True async with state_manager_redis.modify_state( - BaseStateToken(ident=token, cls=SubState1), # ty:ignore[invalid-argument-type] + BaseStateToken(ident=token, cls=SubState1), ) as new_state: - assert SubState1.get_name() in new_state.substates # ty:ignore[unresolved-attribute] - assert SubState2.get_name() not in new_state.substates # ty:ignore[unresolved-attribute] + assert SubState1.get_name() in new_state.substates + assert SubState2.get_name() not in new_state.substates async with state_manager_redis.modify_state( - BaseStateToken(ident=token, cls=SubState2), # ty:ignore[invalid-argument-type] + BaseStateToken(ident=token, cls=SubState2), ) as new_state: # Both substates should be fetched and cached. - assert SubState1.get_name() in new_state.substates # ty:ignore[unresolved-attribute] - assert SubState2.get_name() in new_state.substates # ty:ignore[unresolved-attribute] + assert SubState1.get_name() in new_state.substates + assert SubState2.get_name() in new_state.substates async with state_manager_redis.modify_state( - BaseStateToken(ident=token, cls=SubState1), # ty:ignore[invalid-argument-type] + BaseStateToken(ident=token, cls=SubState1), ) as new_state: # Both substates should be fetched and cached now. - assert SubState1.get_name() in new_state.substates # ty:ignore[unresolved-attribute] - assert SubState2.get_name() in new_state.substates # ty:ignore[unresolved-attribute] + assert SubState1.get_name() in new_state.substates + assert SubState2.get_name() in new_state.substates # Should have still only been one lock acquisition. lock_events = len([ @@ -677,7 +677,7 @@ async def test_oplock_hold_oplock_after_cancel( async def modify(): async with state_manager_redis.modify_state( - BaseStateToken(ident=token, cls=root_state), # ty:ignore[invalid-argument-type] + BaseStateToken(ident=token, cls=root_state), ) as new_state: modify_started.set() assert isinstance(new_state, root_state) @@ -714,7 +714,7 @@ async def modify(): # Modify the state again, this should get a new lock and lease event_log_on_update.clear() async with state_manager_redis.modify_state( - BaseStateToken(ident=token, cls=root_state), # ty:ignore[invalid-argument-type] + BaseStateToken(ident=token, cls=root_state), ) as new_state: assert isinstance(new_state, root_state) new_state.count += 1 diff --git a/tests/units/test_app.py b/tests/units/test_app.py index 509950fef6b..bc5910c16aa 100644 --- a/tests/units/test_app.py +++ b/tests/units/test_app.py @@ -1097,7 +1097,7 @@ async def test_upload_file_keeps_form_open_until_stream_completes( form_data = FormData([("files", file1), ("files", file2)]) original_close = form_data.close form_close = AsyncMock(side_effect=original_close) - form_data.close = form_close # ty:ignore[invalid-assignment] + form_data.close = form_close async def form(): # noqa: RUF029 return form_data @@ -1207,7 +1207,7 @@ async def test_upload_file_closes_form_on_form_error( form_data = FormData([("files", file1)]) original_close = form_data.close form_close = AsyncMock(side_effect=original_close) - form_data.close = form_close # ty:ignore[invalid-assignment] + form_data.close = form_close async def cancelled_form(): await asyncio.sleep(0) @@ -1243,7 +1243,7 @@ async def test_upload_file_closes_form_on_event_creation_cancellation( form_data = FormData([("files", file1)]) original_close = form_data.close form_close = AsyncMock(side_effect=original_close) - form_data.close = form_close # ty:ignore[invalid-assignment] + form_data.close = form_close async def form(): # noqa: RUF029 return form_data @@ -1252,7 +1252,7 @@ async def form(): # noqa: RUF029 # Patch getlist on the form_data to raise CancelledError during event # creation (after form is parsed, before streaming begins). - form_data.getlist = Mock(side_effect=asyncio.CancelledError) # ty:ignore[invalid-assignment] + form_data.getlist = Mock(side_effect=asyncio.CancelledError) upload_fn = upload(app) with pytest.raises(asyncio.CancelledError): @@ -1290,7 +1290,7 @@ async def test_upload_file_closes_form_if_response_cancelled_before_stream_start form_data = FormData([("files", file1)]) original_close = form_data.close form_close = AsyncMock(side_effect=original_close) - form_data.close = form_close # ty:ignore[invalid-assignment] + form_data.close = form_close async def form(): # noqa: RUF029 return form_data @@ -1343,7 +1343,7 @@ async def test_upload_file_raises_client_disconnect_when_stream_send_fails( form_data = FormData([("files", file1)]) original_close = form_data.close form_close = AsyncMock(side_effect=original_close) - form_data.close = form_close # ty:ignore[invalid-assignment] + form_data.close = form_close async def form(): # noqa: RUF029 return form_data @@ -2058,7 +2058,7 @@ def compilable_app( ) reload_state_module(__name__) app = App(theme=None) - app._get_frontend_packages = unittest.mock.Mock() # ty:ignore[invalid-assignment] + app._get_frontend_packages = unittest.mock.Mock() with chdir(app_path): yield app, web_dir @@ -3059,7 +3059,7 @@ def test_raise_on_state(): def test_call_app(): """Test that the app can be called.""" app = App() - app._compile = unittest.mock.Mock() # ty:ignore[invalid-assignment] + app._compile = unittest.mock.Mock() api = app() assert isinstance(api, Starlette) diff --git a/tests/units/test_prerequisites.py b/tests/units/test_prerequisites.py index da692871331..cf8854b80f4 100644 --- a/tests/units/test_prerequisites.py +++ b/tests/units/test_prerequisites.py @@ -1339,14 +1339,12 @@ def test_extract_package_name(): assert js_runtimes._extract_package_name("@scope/pkg@1.2.3") == "@scope/pkg" -def test_cached_procedure(): +def test_cached_procedure(tmp_path: Path): call_count = 0 - temp_file = tempfile.mktemp() # ty:ignore[deprecated] + temp_file = tmp_path / "no_args_cache" - @cached_procedure( - cache_file_path=lambda: Path(temp_file), payload_fn=lambda: "constant" - ) + @cached_procedure(cache_file_path=lambda: temp_file, payload_fn=lambda: "constant") def _function_with_no_args(): nonlocal call_count call_count += 1 @@ -1358,10 +1356,10 @@ def _function_with_no_args(): call_count = 0 - another_temp_file = tempfile.mktemp() + another_temp_file = tmp_path / "some_args_cache" @cached_procedure( - cache_file_path=lambda: Path(another_temp_file), + cache_file_path=lambda: another_temp_file, payload_fn=lambda *args, **kwargs: f"{repr(args), repr(kwargs)}", ) def _function_with_some_args(*args, **kwargs): @@ -1380,7 +1378,8 @@ def _function_with_some_args(*args, **kwargs): call_count = 0 @cached_procedure( - cache_file_path=lambda: Path(tempfile.mktemp()), payload_fn=lambda: "constant" + cache_file_path=lambda: tmp_path / f"fresh_{uuid.uuid4().hex}", + payload_fn=lambda: "constant", ) def _function_with_no_args_fn(): nonlocal call_count diff --git a/tests/units/test_state.py b/tests/units/test_state.py index f20134e446c..1ff4f84d71a 100644 --- a/tests/units/test_state.py +++ b/tests/units/test_state.py @@ -1535,11 +1535,14 @@ def dep_v(self) -> int: @pytest.mark.parametrize("use_partial", [True, False]) -def test_cached_var_depends_on_event_handler(use_partial: bool): +def test_cached_var_depends_on_event_handler( + use_partial: bool, monkeypatch: pytest.MonkeyPatch +): """A cached var that calls an event handler calculates deps correctly. Args: use_partial: if true, replace the EventHandler with functools.partial + monkeypatch: The pytest monkeypatch fixture. """ counter = 0 @@ -1557,7 +1560,8 @@ def cached_x_side_effect(self) -> int: return counter if use_partial: - HandlerState.handler = functools.partial(HandlerState.handler.fn) # ty:ignore[unresolved-attribute] + handler_fn = HandlerState.event_handlers["handler"].fn + monkeypatch.setattr(HandlerState, "handler", functools.partial(handler_fn)) assert isinstance(HandlerState.handler, functools.partial) else: assert isinstance(HandlerState.handler, EventHandler) @@ -2045,11 +2049,11 @@ def loop_exception_handler(loop, context): asyncio.get_event_loop().set_exception_handler(loop_exception_handler) - async with state_manager_redis.modify_state(substate_token_redis): # ty:ignore[invalid-argument-type] + async with state_manager_redis.modify_state(substate_token_redis): await asyncio.sleep(0.01) if environment.REFLEX_OPLOCK_ENABLED.get(): - async with state_manager_redis.modify_state(substate_token_redis): # ty:ignore[invalid-argument-type] + async with state_manager_redis.modify_state(substate_token_redis): await asyncio.sleep(LOCK_EXPIRE_SLEEP) await asyncio.sleep(LOCK_EXPIRE_SLEEP) assert loop_exception is not None @@ -2057,7 +2061,7 @@ def loop_exception_handler(loop, context): raise loop_exception else: with pytest.raises(LockExpiredError): - async with state_manager_redis.modify_state(substate_token_redis): # ty:ignore[invalid-argument-type] + async with state_manager_redis.modify_state(substate_token_redis): await asyncio.sleep(LOCK_EXPIRE_SLEEP) assert loop_exception is None @@ -2100,17 +2104,17 @@ def loop_exception_handler(loop, context): waiter_event = asyncio.Event() async def _coro_blocker(): - async with state_manager_redis.modify_state(substate_token_redis) as state: # ty:ignore[invalid-argument-type] + async with state_manager_redis.modify_state(substate_token_redis) as state: order.append("blocker") waiter_event.set() await asyncio.sleep(LOCK_EXPIRE_SLEEP) - state.num1 = unexp_num1 # ty:ignore[unresolved-attribute] + state.num1 = unexp_num1 async def _coro_waiter(): await waiter_event.wait() - async with state_manager_redis.modify_state(substate_token_redis) as state: # ty:ignore[invalid-argument-type] + async with state_manager_redis.modify_state(substate_token_redis) as state: order.append("waiter") - state.num1 = exp_num1 # ty:ignore[unresolved-attribute] + state.num1 = exp_num1 tasks = [ asyncio.create_task(_coro_blocker()), @@ -2162,7 +2166,7 @@ async def test_state_manager_lock_warning_threshold_contend( order = [] async def _coro_blocker(): - async with state_manager_redis.modify_state(substate_token_redis): # ty:ignore[invalid-argument-type] + async with state_manager_redis.modify_state(substate_token_redis): order.append("blocker") await asyncio.sleep(LOCK_WARN_SLEEP) @@ -4318,10 +4322,10 @@ class Child(State): bs_token = BaseStateToken(ident=token, cls=Root) dsm = StateManagerDisk() - async with dsm.modify_state(bs_token) as root: # ty:ignore[invalid-argument-type] - s = await root.get_state(State) # ty:ignore[unresolved-attribute] + async with dsm.modify_state(bs_token) as root: + s = await root.get_state(State) s.num += 1 - c = await root.get_state(Child) # ty:ignore[unresolved-attribute] + c = await root.get_state(Child) assert s._get_was_touched() assert not c._get_was_touched() await dsm.close() diff --git a/tests/units/utils/test_token_manager.py b/tests/units/utils/test_token_manager.py index b73cc0946df..9ab6c97d93b 100644 --- a/tests/units/utils/test_token_manager.py +++ b/tests/units/utils/test_token_manager.py @@ -525,7 +525,7 @@ def new_event_namespace() -> EventNamespace: ) event_namespace = EventNamespace(namespace=namespace, app=mock_app) - event_namespace.emit = AsyncMock() # ty:ignore[invalid-assignment] + event_namespace.emit = AsyncMock() created_objs.append(event_namespace) return event_namespace From d696a651d44710c841a85d8a2e512674fa2f01ea Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Sat, 18 Jul 2026 15:04:12 +0200 Subject: [PATCH 33/57] ty adjustments for new code from main --- tests/integration/test_var_operations.py | 2 +- tests/units/components/test_memo.py | 2 +- tests/units/reflex_base/vars/test_base.py | 6 +++--- tests/units/reflex_site_shared/docs/test_site.py | 2 +- tests/units/test_state.py | 8 ++++---- tests/units/test_var.py | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/integration/test_var_operations.py b/tests/integration/test_var_operations.py index be813cd9fc0..6570f3b0765 100644 --- a/tests/integration/test_var_operations.py +++ b/tests/integration/test_var_operations.py @@ -607,7 +607,7 @@ def index(): id="list_map", ), rx.text( - ArrayVar.range(1, 5).foreach(lambda x: x * 2).to_string(), + ArrayVar.range(1, 5).foreach(lambda x: x * 2).to_string(), # ty:ignore[deprecated] id="list_foreach_alias", ), rx.text( diff --git a/tests/units/components/test_memo.py b/tests/units/components/test_memo.py index 3b3354deefc..97a0635b53b 100644 --- a/tests/units/components/test_memo.py +++ b/tests/units/components/test_memo.py @@ -1118,7 +1118,7 @@ def test_var_returning_memo_rejects_wrapper(): """``wrapper=`` is only supported on component-returning memos.""" with pytest.raises(TypeError, match="only supports `wrapper=`"): - @rx.memo(wrapper=None) # pyright: ignore[reportArgumentType] + @rx.memo(wrapper=None) # ty:ignore[invalid-argument-type] def format_id(value: rx.Var[int]) -> rx.Var[str]: return value.to(str) diff --git a/tests/units/reflex_base/vars/test_base.py b/tests/units/reflex_base/vars/test_base.py index 7776409511b..c25aa023240 100644 --- a/tests/units/reflex_base/vars/test_base.py +++ b/tests/units/reflex_base/vars/test_base.py @@ -74,7 +74,7 @@ class MyState(EvenMoreBasicBaseState): name: str = f # pyright: ignore[reportAssignmentType] rebuilt = MyState.get_fields()["name"] - assert rebuilt._opts == {"a": [1]} # pyright: ignore[reportAttributeAccessIssue] - assert rebuilt._opts is not opts # pyright: ignore[reportAttributeAccessIssue] + assert rebuilt._opts == {"a": [1]} # ty:ignore[unresolved-attribute] + assert rebuilt._opts is not opts # ty:ignore[unresolved-attribute] opts["a"].append(2) - assert rebuilt._opts == {"a": [1]} # pyright: ignore[reportAttributeAccessIssue] + assert rebuilt._opts == {"a": [1]} # ty:ignore[unresolved-attribute] diff --git a/tests/units/reflex_site_shared/docs/test_site.py b/tests/units/reflex_site_shared/docs/test_site.py index 42e9b130602..1daedaedb3b 100644 --- a/tests/units/reflex_site_shared/docs/test_site.py +++ b/tests/units/reflex_site_shared/docs/test_site.py @@ -69,7 +69,7 @@ def add_page(self, **kwargs: object) -> None: app = AppRecorder() routes = register_docs( - app, # type: ignore[arg-type] + app, # ty:ignore[invalid-argument-type] DocsSiteConfig( content_dir=tmp_path, sitemap_base_url="https://example.com/docs/product/", diff --git a/tests/units/test_state.py b/tests/units/test_state.py index feab16a1b8d..6f43ab02ac3 100644 --- a/tests/units/test_state.py +++ b/tests/units/test_state.py @@ -4257,12 +4257,12 @@ def marked_computed(self) -> str: """ return "marked" - marked_computed.fget._custom_marker = object() # pyright: ignore [reportFunctionMemberAccess] + marked_computed.fget._custom_marker = object() # ty:ignore[unresolved-attribute] def marked_handler(self): """An event handler tagged with a custom attribute.""" - marked_handler._custom_marker = object() # pyright: ignore [reportFunctionMemberAccess] + marked_handler._custom_marker = object() # ty:ignore[unresolved-attribute] def kwonly_default_handler(self, *, count: int = 1) -> int: """An event handler with a keyword-only default argument. @@ -4286,8 +4286,8 @@ def test_copy_fn_preserves_custom_function_attributes() -> None: copied_computed_fget = UsesMarkerMixin.computed_vars["marked_computed"].fget assert copied_computed_fget is not orig_computed_fget assert ( - copied_computed_fget._custom_marker # pyright: ignore [reportFunctionMemberAccess] - is orig_computed_fget._custom_marker # pyright: ignore [reportFunctionMemberAccess] + copied_computed_fget._custom_marker # ty:ignore[unresolved-attribute] + is orig_computed_fget._custom_marker ) orig_handler_fn = MarkerMixin.__dict__["marked_handler"] diff --git a/tests/units/test_var.py b/tests/units/test_var.py index cdbd89671f2..39135a85b90 100644 --- a/tests/units/test_var.py +++ b/tests/units/test_var.py @@ -1151,7 +1151,7 @@ def test_array_map(mocker: MockerFixture): mock_deprecate = mocker.patch("reflex_base.utils.console.deprecate") assert re.fullmatch( r"\[1, 2, 3\]\.map\(\(\((\w+)\) => \(\1 \* 2\)\)\)", - str(array_var.foreach(lambda x: x * 2)), # pyright: ignore[reportDeprecated] + str(array_var.foreach(lambda x: x * 2)), # ty:ignore[deprecated] ) mock_deprecate.assert_called_once() assert mock_deprecate.call_args.kwargs["feature_name"] == "ArrayVar.foreach" From e7475eb87ea31e5f65f6c0b4a589e4ad4ac2c4c7 Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Sat, 8 Aug 2026 10:25:07 +0200 Subject: [PATCH 34/57] typing wip --- .../src/reflex_base/components/component.py | 6 ++- .../src/reflex_base/event/__init__.py | 14 +++--- .../src/reflex_base/plugins/compiler.py | 4 +- .../src/reflex_base/utils/types.py | 20 ++++----- .../reflex-base/src/reflex_base/vars/base.py | 29 ++++++++++++- .../src/reflex_base/vars/sequence.py | 8 +++- .../blocks/demo_form.py | 4 +- .../blocks/intro_form.py | 2 +- .../reflex-docgen/src/reflex_docgen/_class.py | 9 +++- .../src/reflex_cli/utils/hosting.py | 4 +- pyproject.toml | 8 ++++ reflex/app.py | 8 ++-- reflex/experimental/client_state.py | 5 +-- reflex/istate/manager/__init__.py | 4 +- reflex/istate/proxy.py | 4 +- reflex/testing.py | 2 +- reflex/utils/processes.py | 2 +- tests/integration/test_call_script.py | 4 +- tests/integration/test_component_state.py | 2 +- tests/integration/test_event_actions.py | 2 +- tests/integration/test_event_chain.py | 10 ++--- tests/integration/test_exception_handlers.py | 2 +- tests/integration/test_form_submit.py | 4 +- tests/integration/test_lifespan.py | 2 +- tests/integration/test_upload.py | 14 +++--- .../tests_playwright/test_appearance.py | 2 +- tests/units/components/core/test_upload.py | 6 +-- tests/units/components/test_component.py | 6 +-- tests/units/test_event.py | 18 ++++---- tests/units/test_page.py | 2 +- tests/units/test_state.py | 2 +- tests/units/vars/test_object.py | 22 ++++++++++ uv.lock | 43 ++++++++++--------- 33 files changed, 172 insertions(+), 102 deletions(-) diff --git a/packages/reflex-base/src/reflex_base/components/component.py b/packages/reflex-base/src/reflex_base/components/component.py index 9616346c45c..9862302c672 100644 --- a/packages/reflex-base/src/reflex_base/components/component.py +++ b/packages/reflex-base/src/reflex_base/components/component.py @@ -1659,12 +1659,14 @@ def _get_vars_from_event_triggers( if isinstance(event, Var): yield event_trigger, [event] elif isinstance(event, EventChain): - event_args = [] + event_args: list[Var] = [] for spec in event.events: if isinstance(spec, EventSpec): for args in spec.args: event_args.extend(args) - else: + elif isinstance(spec, Var): + # EventCallback is only in the declared type of + # EventChain.events; calling one yields an EventSpec. event_args.append(spec) yield event_trigger, event_args diff --git a/packages/reflex-base/src/reflex_base/event/__init__.py b/packages/reflex-base/src/reflex_base/event/__init__.py index b24b096afa8..2188b3d1e09 100644 --- a/packages/reflex-base/src/reflex_base/event/__init__.py +++ b/packages/reflex-base/src/reflex_base/event/__init__.py @@ -883,7 +883,7 @@ def create( events.append(v) elif isinstance(v, FunctionVar): # Apply the args_spec transformations as partial arguments to the function. - events.append(v.partial(*parse_args_spec(args_spec)[0])) # ty:ignore[no-matching-overload] + events.append(v.partial(*parse_args_spec(args_spec)[0])) elif isinstance(v, Callable): # Call the lambda to get the event chain. events.extend(call_event_fn(v, args_spec, key=key)) @@ -2156,7 +2156,7 @@ def parse_args_spec(arg_spec: ArgsSpec | Sequence[ArgsSpec]): # if there's multiple, the first is the default if isinstance(arg_spec, Sequence): annotations = [get_type_hints(one_arg_spec) for one_arg_spec in arg_spec] - arg_spec = arg_spec[0] # ty:ignore[invalid-assignment] + arg_spec = arg_spec[0] else: annotations = [get_type_hints(arg_spec)] @@ -2166,11 +2166,11 @@ def parse_args_spec(arg_spec: ArgsSpec | Sequence[ArgsSpec]): arg_spec(*[ Var(f"_{l_arg}").to( unwrap_var_annotation( - resolve_annotation(annotations[0], l_arg, spec=arg_spec) # ty:ignore[invalid-argument-type] + resolve_annotation(annotations[0], l_arg, spec=arg_spec) ) ) for l_arg in spec.args - ]) # ty:ignore[call-non-callable] + ]) ), annotations @@ -2652,7 +2652,7 @@ def create( call_args = arg_vars if sig.parameters else (Var(_js_expr="...args"),) statements = [ ( - event.call(*call_args) # ty:ignore[no-matching-overload] https://github.com/astral-sh/ty/issues/1824 + event.call(*call_args) if isinstance(event, FunctionVar) else invocation.call( LiteralVar.create([LiteralVar.create(event)]), @@ -3064,7 +3064,9 @@ def wrapper( event_actions = _build_event_actions() if event_actions: setattr(func, EVENT_ACTIONS_MARKER, event_actions) - return func + # Handlers defined in a state class body stay plain functions here; + # BaseStateMeta turns them into EventCallback descriptors. + return func # ty:ignore[invalid-return-type] if func is not None: return wrapper(func) diff --git a/packages/reflex-base/src/reflex_base/plugins/compiler.py b/packages/reflex-base/src/reflex_base/plugins/compiler.py index 78204f9d517..cafae999ee5 100644 --- a/packages/reflex-base/src/reflex_base/plugins/compiler.py +++ b/packages/reflex-base/src/reflex_base/plugins/compiler.py @@ -491,7 +491,7 @@ def visit_children( updated_children = list(children[:index]) updated_children.append(compiled_child) if updated_children is None: - return children if isinstance(children, tuple) else tuple(children) # ty:ignore[invalid-return-type] + return children if isinstance(children, tuple) else tuple(children) return tuple(updated_children) def visit( @@ -578,7 +578,7 @@ def _apply_replacement( if replacement is None: return comp, children if isinstance(replacement, tuple): - return replacement # ty:ignore[invalid-return-type] + return replacement return replacement, children diff --git a/packages/reflex-base/src/reflex_base/utils/types.py b/packages/reflex-base/src/reflex_base/utils/types.py index abf64de823d..c478ecc2ac6 100644 --- a/packages/reflex-base/src/reflex_base/utils/types.py +++ b/packages/reflex-base/src/reflex_base/utils/types.py @@ -6,7 +6,7 @@ import inspect import sys import types -from collections.abc import Callable, Iterable, Mapping, Sequence +from collections.abc import Callable, Hashable, Iterable, Mapping, Sequence from enum import Enum from functools import cached_property, lru_cache from importlib.util import find_spec @@ -83,23 +83,23 @@ def set_signature(fn: Any, signature: inspect.Signature) -> None: VAR7 = TypeVar("VAR7", bound="Var") -class _ArgsSpec0(Protocol): +class _ArgsSpec0(Hashable, Protocol): def __call__(self) -> Sequence[Var]: ... -class _ArgsSpec1(Protocol): +class _ArgsSpec1(Hashable, Protocol): def __call__(self, var1: VAR1, /) -> Sequence[Var]: ... -class _ArgsSpec2(Protocol): +class _ArgsSpec2(Hashable, Protocol): def __call__(self, var1: VAR1, var2: VAR2, /) -> Sequence[Var]: ... -class _ArgsSpec3(Protocol): +class _ArgsSpec3(Hashable, Protocol): def __call__(self, var1: VAR1, var2: VAR2, var3: VAR3, /) -> Sequence[Var]: ... -class _ArgsSpec4(Protocol): +class _ArgsSpec4(Hashable, Protocol): def __call__( self, var1: VAR1, @@ -110,7 +110,7 @@ def __call__( ) -> Sequence[Var]: ... -class _ArgsSpec5(Protocol): +class _ArgsSpec5(Hashable, Protocol): def __call__( self, var1: VAR1, @@ -122,7 +122,7 @@ def __call__( ) -> Sequence[Var]: ... -class _ArgsSpec6(Protocol): +class _ArgsSpec6(Hashable, Protocol): def __call__( self, var1: VAR1, @@ -135,7 +135,7 @@ def __call__( ) -> Sequence[Var]: ... -class _ArgsSpec7(Protocol): +class _ArgsSpec7(Hashable, Protocol): def __call__( self, var1: VAR1, @@ -508,7 +508,7 @@ def get_attribute_access_type( except NotImplementedError: type_ = None if type_ is not None: - if hasattr(column_type, "item_type"): + if isinstance(column_type, sqlalchemy.ARRAY): try: item_type = column_type.item_type.python_type except NotImplementedError: diff --git a/packages/reflex-base/src/reflex_base/vars/base.py b/packages/reflex-base/src/reflex_base/vars/base.py index 4d3e0e07bdb..e8e0ed57696 100644 --- a/packages/reflex-base/src/reflex_base/vars/base.py +++ b/packages/reflex-base/src/reflex_base/vars/base.py @@ -318,7 +318,7 @@ def __init__( if hooks and any(hooks.values()): # Merge our dependencies first, so they can be referenced. - merged_var_data = VarData.merge(*hooks.values(), self) # ty:ignore[invalid-argument-type] + merged_var_data = VarData.merge(*hooks.values(), self) if merged_var_data is not None: object.__setattr__(self, "state", merged_var_data.state) object.__setattr__(self, "field_name", merged_var_data.field_name) @@ -917,7 +917,7 @@ def create( """ # If the value is already a var, do nothing. if isinstance(value, Var): - return value # ty:ignore[invalid-return-type] + return value return LiteralVar.create(value, _var_data=_var_data) @@ -2552,6 +2552,13 @@ def __get__( owner: type, ) -> ObjectVar[SQLA_TYPE]: ... + @overload + def __get__( + self: ComputedVar[BASE_MODEL_TYPE], + instance: None, + owner: type, + ) -> ObjectVar[BASE_MODEL_TYPE]: ... + if TYPE_CHECKING: @overload @@ -2820,6 +2827,13 @@ def __get__( owner: type, ) -> ObjectVar[SQLA_TYPE]: ... + @overload + def __get__( + self: AsyncComputedVar[BASE_MODEL_TYPE], + instance: None, + owner: type, + ) -> ObjectVar[BASE_MODEL_TYPE]: ... + if TYPE_CHECKING: @overload @@ -3475,10 +3489,14 @@ def dispatch( if TYPE_CHECKING: from _typeshed import DataclassInstance + from pydantic import BaseModel from sqlalchemy.orm import DeclarativeBase SQLA_TYPE = TypeVar("SQLA_TYPE", bound=DeclarativeBase | None) DATACLASS_TYPE = TypeVar("DATACLASS_TYPE", bound=DataclassInstance | None) + # Pydantic models are not dataclasses (no `__dataclass_fields__` at runtime), so + # they need their own overloads to resolve to ObjectVar. + BASE_MODEL_TYPE = TypeVar("BASE_MODEL_TYPE", bound=BaseModel | None) MAPPING_TYPE = TypeVar("MAPPING_TYPE", bound=Mapping | None) V = TypeVar("V") @@ -3663,6 +3681,13 @@ def __get__( self: Field[SQLA_TYPE] | Field[SQLA_TYPE | None], instance: None, owner: Any ) -> ObjectVar[SQLA_TYPE]: ... + @overload + def __get__( + self: Field[BASE_MODEL_TYPE] | Field[BASE_MODEL_TYPE | None], + instance: None, + owner: Any, + ) -> ObjectVar[BASE_MODEL_TYPE]: ... + if TYPE_CHECKING: @overload diff --git a/packages/reflex-base/src/reflex_base/vars/sequence.py b/packages/reflex-base/src/reflex_base/vars/sequence.py index b3ed6f44eab..32b74b44216 100644 --- a/packages/reflex-base/src/reflex_base/vars/sequence.py +++ b/packages/reflex-base/src/reflex_base/vars/sequence.py @@ -45,7 +45,7 @@ if TYPE_CHECKING: from typing_extensions import deprecated - from .base import DATACLASS_TYPE, SQLA_TYPE + from .base import BASE_MODEL_TYPE, DATACLASS_TYPE, SQLA_TYPE from .function import FunctionVar from .object import ObjectVar @@ -205,6 +205,12 @@ def __getitem__( i: int | NumberVar, ) -> ObjectVar[DATACLASS_TYPE]: ... + @overload + def __getitem__( + self: ArrayVar[Sequence[BASE_MODEL_TYPE]], + i: int | NumberVar, + ) -> ObjectVar[BASE_MODEL_TYPE]: ... + @overload def __getitem__(self, i: int | NumberVar) -> Var: ... diff --git a/packages/reflex-components-internal/src/reflex_components_internal/blocks/demo_form.py b/packages/reflex-components-internal/src/reflex_components_internal/blocks/demo_form.py index cae1362ac7e..c3161b07bd1 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/blocks/demo_form.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/blocks/demo_form.py @@ -310,7 +310,7 @@ def demo_form( True, PERSONAL_EMAIL_PROVIDERS, id=email_id, - on_blur=DemoFormStateUI.validate_email(rx.Var(get_element_value(email_id))), + on_blur=DemoFormStateUI.validate_email(rx.Var(get_element_value(email_id))), # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/2870 ), rx.el.div( input_field("Job title", "CTO", "job_title", "text", True), @@ -439,7 +439,7 @@ def demo_form_dialog( ), ), open=demo_form_open_cs.value, - on_open_change=demo_form_open_cs.set_value, + on_open_change=demo_form_open_cs.set_value, # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/4098 on_open_change_complete=[ rx.call_function(demo_form_error_message.set_value("")) ], diff --git a/packages/reflex-components-internal/src/reflex_components_internal/blocks/intro_form.py b/packages/reflex-components-internal/src/reflex_components_internal/blocks/intro_form.py index a5028c5296b..5deafb3e047 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/blocks/intro_form.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/blocks/intro_form.py @@ -310,7 +310,7 @@ def intro_form( True, PERSONAL_EMAIL_PROVIDERS, id=email_id, - on_blur=IntroFormStateUI.validate_email( + on_blur=IntroFormStateUI.validate_email( # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/2870 rx.Var(get_element_value(email_id)) ), ), diff --git a/packages/reflex-docgen/src/reflex_docgen/_class.py b/packages/reflex-docgen/src/reflex_docgen/_class.py index ae3bba1ac94..e5ff3ba26ab 100644 --- a/packages/reflex-docgen/src/reflex_docgen/_class.py +++ b/packages/reflex-docgen/src/reflex_docgen/_class.py @@ -1,17 +1,22 @@ """Generate documentation for arbitrary Python classes.""" +from __future__ import annotations + import collections.abc import dataclasses import inspect import re from dataclasses import dataclass -from typing import Any, Literal, get_args, get_origin, get_type_hints +from typing import TYPE_CHECKING, Any, Literal, get_args, get_origin, get_type_hints from reflex_base.utils.types import is_union from reflex_base.vars.base import BaseStateMeta from typing_extensions import TypeAliasType from typing_inspection.introspection import AnnotationSource, inspect_annotation +if TYPE_CHECKING: + from _typeshed import DataclassInstance + @dataclass(frozen=True, slots=True, kw_only=True) class FieldDocumentation: @@ -273,7 +278,7 @@ def _build_field_documentation( def _get_dataclass_fields( - cls: type, docstring_attrs: dict[str, str] + cls: type[DataclassInstance], docstring_attrs: dict[str, str] ) -> tuple[FieldDocumentation, ...]: """Extract fields from a dataclass. diff --git a/packages/reflex-hosting-cli/src/reflex_cli/utils/hosting.py b/packages/reflex-hosting-cli/src/reflex_cli/utils/hosting.py index 42555f06d34..d36d75bb502 100644 --- a/packages/reflex-hosting-cli/src/reflex_cli/utils/hosting.py +++ b/packages/reflex-hosting-cli/src/reflex_cli/utils/hosting.py @@ -123,13 +123,13 @@ def create( """ if isinstance(regions, list): - regions = dict.fromkeys(regions, 1) # ty:ignore[invalid-assignment] + regions = dict.fromkeys(regions, 1) return cls( scale_type, vm_type, tuple( Region(name=name, number_of_machines=number) - for name, number in regions.items() # ty:ignore[unresolved-attribute] + for name, number in regions.items() ) if regions else (), diff --git a/pyproject.toml b/pyproject.toml index 41b833d0677..a28002c96ef 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -159,6 +159,13 @@ exclude = [ [tool.ty.rules] invalid-method-override = "ignore" unsupported-base = "ignore" +# `EventHandler[some_arg_spec]` is the public spelling for declaring an event +# trigger; `EventHandler.__class_getitem__` turns it into `Annotated[EventHandler, +# some_arg_spec]`. The subscript argument is a function, not a type, so ty rejects +# it in a type expression (intentionally, see astral-sh/ty#3388). Component authors +# outside this repo hit the same thing, so ignore the rule rather than rewriting +# every annotation to the `Annotated[...]` form. +not-subscriptable = "ignore" [tool.ruff] target-version = "py310" @@ -388,6 +395,7 @@ reflex-hosting-cli = false # Security fix (CVE-2026-54283 form() DoS) shipped in starlette 1.3.1; exempt so the # pinned floor resolves before it ages out of the exclude-newer window. starlette = false +ty = false [tool.uv.sources] hatch-reflex-pyi.workspace = true diff --git a/reflex/app.py b/reflex/app.py index 70f01372726..0a41da77216 100644 --- a/reflex/app.py +++ b/reflex/app.py @@ -749,7 +749,7 @@ def __call__(self) -> ASGIApp: [self.api_transformer] if not isinstance(self.api_transformer, Sequence) else self.api_transformer - ) # ty:ignore[invalid-assignment] + ) for api_transformer in api_transformers: if isinstance(api_transformer, Starlette): @@ -1385,7 +1385,7 @@ def all_routes(_request: Request) -> Response: @overload @deprecated("pass token as rx.BaseStateToken instead of str") - def modify_state( + def modify_state( # ty:ignore[invalid-overload] https://github.com/astral-sh/ty/issues/2057 self, token: str, background: bool = False, @@ -1393,14 +1393,14 @@ def modify_state( ) -> contextlib.AbstractAsyncContextManager[BaseState]: ... @overload - def modify_state( + def modify_state( # ty:ignore[invalid-overload] https://github.com/astral-sh/ty/issues/2057 self, token: BaseStateToken, background: bool = False, previous_dirty_vars: dict[str, set[str]] | None = None, ) -> contextlib.AbstractAsyncContextManager[BaseState]: ... - @contextlib.asynccontextmanager # ty:ignore[no-matching-overload] + @contextlib.asynccontextmanager async def modify_state( self, token: BaseStateToken | str, diff --git a/reflex/experimental/client_state.py b/reflex/experimental/client_state.py index e24315b4734..5318869d627 100644 --- a/reflex/experimental/client_state.py +++ b/reflex/experimental/client_state.py @@ -4,11 +4,10 @@ import dataclasses import re -from collections.abc import Callable from typing import Any from reflex_base import constants -from reflex_base.event import EventChain, EventHandler, EventSpec, run_script +from reflex_base.event import EventChain, EventSpec, EventType, run_script from reflex_base.utils.imports import ImportVar from reflex_base.vars import VarData, get_unique_variable_name from reflex_base.vars.base import LiteralVar, Var @@ -257,7 +256,7 @@ def set(self) -> Var: """ return self.set_value() - def retrieve(self, callback: EventHandler | Callable | None = None) -> EventSpec: + def retrieve(self, callback: EventType[Any] | None = None) -> EventSpec: """Pass the value of the client state variable to a backend EventHandler. The event handler must `yield` or `return` the EventSpec to trigger the event. diff --git a/reflex/istate/manager/__init__.py b/reflex/istate/manager/__init__.py index b852c9d049a..288ed99c9ba 100644 --- a/reflex/istate/manager/__init__.py +++ b/reflex/istate/manager/__init__.py @@ -189,7 +189,7 @@ async def set_state( """ @abstractmethod - @contextlib.asynccontextmanager # ty:ignore[no-matching-overload] + @contextlib.asynccontextmanager async def modify_state( self, token: StateToken[TOKEN_TYPE] | str, @@ -206,7 +206,7 @@ async def modify_state( """ yield # ty:ignore[invalid-yield] - @contextlib.asynccontextmanager # ty:ignore[no-matching-overload] + @contextlib.asynccontextmanager async def modify_state_with_links( self, token: StateToken[TOKEN_TYPE] | str, diff --git a/reflex/istate/proxy.py b/reflex/istate/proxy.py index aa658ddb383..0e8d83d19bc 100644 --- a/reflex/istate/proxy.py +++ b/reflex/istate/proxy.py @@ -12,7 +12,7 @@ from collections.abc import Callable, Sequence from importlib.util import find_spec from types import MethodType -from typing import TYPE_CHECKING, Any, SupportsIndex, TypeVar +from typing import TYPE_CHECKING, Any, ClassVar, SupportsIndex, TypeVar import wrapt from reflex_base.event import Event @@ -414,7 +414,7 @@ class MutableProxy(wrapt.ObjectProxy): } # Dynamically generated classes for tracking dataclass mutations. - __dataclass_proxies__: dict[str, type] = {} + __dataclass_proxies__: ClassVar[dict[str, type[MutableProxy]]] = {} def __new__(cls, wrapped: Any, *args, **kwargs) -> MutableProxy: """Create a proxy instance for a mutable object that tracks changes. diff --git a/reflex/testing.py b/reflex/testing.py index 09e3e15c724..51907c5874a 100644 --- a/reflex/testing.py +++ b/reflex/testing.py @@ -246,7 +246,7 @@ def _initialize_app(self): if self.app_source is not None: app_globals = self._get_globals_from_signature(self.app_source) if isinstance(self.app_source, functools.partial): - self.app_source = self.app_source.func # ty:ignore[invalid-assignment] + self.app_source = self.app_source.func # get the source from a function or module object source_code = "\n".join([ "\n".join([ diff --git a/reflex/utils/processes.py b/reflex/utils/processes.py index be5061239dd..96874de750e 100644 --- a/reflex/utils/processes.py +++ b/reflex/utils/processes.py @@ -283,7 +283,7 @@ def run_concurrently_context( try: executor = futures.ThreadPoolExecutor(max_workers=len(fns)) # Submit the tasks. - tasks = [executor.submit(*fn) for fn in fns] # ty:ignore[invalid-argument-type] + tasks = [executor.submit(*fn) for fn in fns] # Yield control back to the main thread while tasks are running. yield tasks diff --git a/tests/integration/test_call_script.py b/tests/integration/test_call_script.py index f7643202f35..4681b00356c 100644 --- a/tests/integration/test_call_script.py +++ b/tests/integration/test_call_script.py @@ -92,7 +92,7 @@ def call_script_inline_return_callback(self): def call_script_inline_return_lambda(self): return rx.call_script( "inline2()", - callback=lambda result: CallScriptState.call_script_callback_other_arg( + callback=lambda result: CallScriptState.call_script_callback_other_arg( # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/4098 result, "lambda" ), ) @@ -140,7 +140,7 @@ def call_script_external_return_callback(self): def call_script_external_return_lambda(self): return rx.call_script( "external2()", - callback=lambda result: CallScriptState.call_script_callback_other_arg( + callback=lambda result: CallScriptState.call_script_callback_other_arg( # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/4098 result, "lambda" ), ) diff --git a/tests/integration/test_component_state.py b/tests/integration/test_component_state.py index 94a122b1839..017a3efff26 100644 --- a/tests/integration/test_component_state.py +++ b/tests/integration/test_component_state.py @@ -70,7 +70,7 @@ def get_component(cls, *children, **props): "Assert _be", id=f"{eid}-assert-be", ), - on_submit=lambda fd: cls.assert_be(fd.to(dict)["be_value"]), + on_submit=lambda fd: cls.assert_be(fd.to(dict)["be_value"]), # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/4098 reset_on_submit=True, ), rx.button( diff --git a/tests/integration/test_event_actions.py b/tests/integration/test_event_actions.py index cc72793801c..d219ea9e832 100644 --- a/tests/integration/test_event_actions.py +++ b/tests/integration/test_event_actions.py @@ -148,7 +148,7 @@ def index(): rx.button( "Throttle", id="btn-throttle", - on_click=lambda: ( + on_click=lambda: ( # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/4098 EventActionState.on_click_throttle.throttle(200).stop_propagation ), ), diff --git a/tests/integration/test_event_chain.py b/tests/integration/test_event_chain.py index 3e19e20895e..207672e7489 100644 --- a/tests/integration/test_event_chain.py +++ b/tests/integration/test_event_chain.py @@ -216,12 +216,12 @@ def index(): rx.button( "Click Int Type", id="click_int_type", - on_click=lambda: State.event_arg_repr_type(1), + on_click=lambda: State.event_arg_repr_type(1), # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/4098 ), rx.button( "Click Dict Type", id="click_dict_type", - on_click=lambda: State.event_arg_repr_type({"a": 1}), + on_click=lambda: State.event_arg_repr_type({"a": 1}), # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/4098 ), rx.button( "Return Chain Int Type", @@ -256,7 +256,7 @@ def index(): rx.button( "Mixed Cond", id="mixed_cond_btn", - on_click=lambda: rx.cond( + on_click=lambda: rx.cond( # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/4098 State.cond_input == "fn", mark_dom_fn.partial("fn_branch"), State.event_arg("ev_branch"), @@ -281,7 +281,7 @@ def on_mount_return_chain(): rx.text( "return", on_mount=State.on_load_return_chain, - on_unmount=lambda: State.event_arg("unmount"), + on_unmount=lambda: State.event_arg("unmount"), # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/4098 ), common_elements, rx.button("Unmount", on_click=rx.redirect("/"), id="unmount"), @@ -291,7 +291,7 @@ def on_mount_yield_chain(): return rx.fragment( rx.text( "yield", - on_mount=[ + on_mount=[ # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/4098 State.on_load_yield_chain, lambda: State.event_arg("mount"), ], diff --git a/tests/integration/test_exception_handlers.py b/tests/integration/test_exception_handlers.py index ce93196b1f4..bcb4310c730 100644 --- a/tests/integration/test_exception_handlers.py +++ b/tests/integration/test_exception_handlers.py @@ -54,7 +54,7 @@ def index(): ), rx.button( "induce_backend_error", - on_click=lambda: TestAppState.divide_by_number(0), + on_click=lambda: TestAppState.divide_by_number(0), # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/4098 id="induce-backend-error-btn", ), rx.button( diff --git a/tests/integration/test_form_submit.py b/tests/integration/test_form_submit.py index bee75664ea3..9c3fdeaa670 100644 --- a/tests/integration/test_form_submit.py +++ b/tests/integration/test_form_submit.py @@ -59,7 +59,7 @@ def index(): rx.input( id="debounce_input", debounce_timeout=0, - on_change=rx.console_log, + on_change=rx.console_log, # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/4098 ), rx.button("Submit", type_="submit"), ), @@ -116,7 +116,7 @@ def index(): rx.input( name="debounce_input", debounce_timeout=0, - on_change=rx.console_log, + on_change=rx.console_log, # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/4098 ), rx.button("Submit", type_="submit"), rx.icon_button(rx.icon(tag="plus")), diff --git a/tests/integration/test_lifespan.py b/tests/integration/test_lifespan.py index 59acb3397c0..90856400c07 100644 --- a/tests/integration/test_lifespan.py +++ b/tests/integration/test_lifespan.py @@ -138,7 +138,7 @@ def index(): rx.moment( interval=LifespanState.interval, on_change=LifespanState.tick ), - on_click=LifespanState.set_interval( + on_click=LifespanState.set_interval( # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/2870 rx.cond(LifespanState.interval, 0, 100) ), id="toggle-tick", diff --git a/tests/integration/test_upload.py b/tests/integration/test_upload.py index b7f5939c720..f6f4c16ca37 100644 --- a/tests/integration/test_upload.py +++ b/tests/integration/test_upload.py @@ -175,7 +175,7 @@ def index(): ), rx.button( "Upload", - on_click=lambda: UploadState.handle_upload(rx.upload_files()), + on_click=lambda: UploadState.handle_upload(rx.upload_files()), # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/2870 https://github.com/astral-sh/ty/issues/4098 id="upload_button", ), rx.box( @@ -200,10 +200,10 @@ def index(): ), rx.button( "Upload", - on_click=UploadState.handle_upload_secondary( + on_click=UploadState.handle_upload_secondary( # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/2870 rx.upload_files( upload_id="secondary", - on_upload_progress=UploadState.upload_progress, + on_upload_progress=UploadState.upload_progress, # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/4098 ), ), id="upload_button_secondary", @@ -242,7 +242,7 @@ def index(): ), rx.button( "Upload", - on_click=UploadState.handle_upload_tertiary( + on_click=UploadState.handle_upload_tertiary( # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/2870 rx.upload_files( upload_id="tertiary", ), @@ -264,7 +264,7 @@ def index(): rx.button("Select File"), rx.text("Drag and drop files here or click to select files"), ), - on_drop=UploadState.handle_upload_quaternary( + on_drop=UploadState.handle_upload_quaternary( # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/2870 rx.upload_files( upload_id="quaternary", ), @@ -291,10 +291,10 @@ def index(): ), rx.button( "Upload", - on_click=UploadState.handle_upload_stream( + on_click=UploadState.handle_upload_stream( # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/2870 rx.upload_files_chunk( upload_id="streaming", - on_upload_progress=UploadState.stream_upload_progress, + on_upload_progress=UploadState.stream_upload_progress, # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/4098 ), "stream-field", ), diff --git a/tests/integration/tests_playwright/test_appearance.py b/tests/integration/tests_playwright/test_appearance.py index 45138c91f69..c8084f26388 100644 --- a/tests/integration/tests_playwright/test_appearance.py +++ b/tests/integration/tests_playwright/test_appearance.py @@ -65,7 +65,7 @@ def index(): rx.icon(tag="moon", size=20), value="dark", ), - on_change=set_color_mode, + on_change=set_color_mode, # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/4098 variant="classic", radius="large", value=color_mode, diff --git a/tests/units/components/core/test_upload.py b/tests/units/components/core/test_upload.py index a6f588dc3db..0441b33f3ba 100644 --- a/tests/units/components/core/test_upload.py +++ b/tests/units/components/core/test_upload.py @@ -181,7 +181,7 @@ def test_upload_create(): up_comp_5 = Upload.create( id="foo_id", - on_drop=StreamingUploadStateTest.chunk_drop_handler( + on_drop=StreamingUploadStateTest.chunk_drop_handler( # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/2870 rx.upload_files_chunk(upload_id="foo_id") ), ) @@ -190,7 +190,7 @@ def test_upload_create(): up_comp_6 = Upload.create( id="foo_id", - on_drop=StreamingUploadStateTest.chunk_upload_alias_handler( + on_drop=StreamingUploadStateTest.chunk_upload_alias_handler( # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/2870 rx.upload_files_chunk(upload_id="foo_id") ), ) @@ -213,7 +213,7 @@ def test_upload_button_handlers_allow_custom_param_names(): chunk_button = rx.button( "Upload", - on_click=StreamingUploadStateTest.chunk_upload_alias_handler( + on_click=StreamingUploadStateTest.chunk_upload_alias_handler( # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/2870 rx.upload_files_chunk(upload_id="foo_id") ), ) diff --git a/tests/units/components/test_component.py b/tests/units/components/test_component.py index bba36aeae68..65325367a82 100644 --- a/tests/units/components/test_component.py +++ b/tests/units/components/test_component.py @@ -1331,7 +1331,7 @@ def handler2(self, arg: int): id="direct-event-handler", ), pytest.param( - rx.fragment(on_blur=EventState.handler2(TEST_VAR)), + rx.fragment(on_blur=EventState.handler2(TEST_VAR)), # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/2870 [ARG_VAR, TEST_VAR], id="direct-event-handler-arg", ), @@ -1341,7 +1341,7 @@ def handler2(self, arg: int): id="direct-event-handler-arg2", ), pytest.param( - rx.fragment(on_blur=lambda: EventState.handler2(TEST_VAR)), + rx.fragment(on_blur=lambda: EventState.handler2(TEST_VAR)), # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/2870 https://github.com/astral-sh/ty/issues/4098 [ARG_VAR, TEST_VAR], id="direct-event-handler-lambda", ), @@ -2154,7 +2154,7 @@ def do_something(self): rx.box( rx.text( "random text", - on_blur=lambda: TriggerState.do_something, + on_blur=lambda: TriggerState.do_something, # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/4098 ), ), True, diff --git a/tests/units/test_event.py b/tests/units/test_event.py index e18897065e1..cc2e2630b94 100644 --- a/tests/units/test_event.py +++ b/tests/units/test_event.py @@ -580,7 +580,7 @@ def s2(self): assert handler_var._get_all_var_data() is None # Ensure spec carries _var_data - spec_var = Var.create(S.s(S.x)) + spec_var = Var.create(S.s(S.x)) # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/2870 assert spec_var._get_all_var_data() == S.x._get_all_var_data() # Needed to instantiate the EventChain @@ -590,7 +590,7 @@ def _args_spec(value: Var[int]) -> tuple[Var[int]]: # Ensure chain carries _var_data chain_var = Var.create( EventChain( - events=[S.s(S.x)], + events=[S.s(S.x)], # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/2870 args_spec=_args_spec, invocation=rx.vars.FunctionStringVar.create(""), ) @@ -632,7 +632,7 @@ def s(self, value: int): chain_var_data = Var.create( EventChain( - events=[S.s(S.x), make_timeout_logger()], + events=[S.s(S.x), make_timeout_logger()], # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/2870 args_spec=lambda: (), ) )._get_all_var_data() @@ -660,10 +660,10 @@ def e(self, arg: str): class Wrapper: def get_handler(self, arg: Var[str]): - return S.e(arg) + return S.e(arg) # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/2870 w = Wrapper() - _ = rx.input(on_change=w.get_handler) + _ = rx.input(on_change=w.get_handler) # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/4098 def test_event_decorator_with_event_actions(): @@ -734,7 +734,7 @@ def handle_no_actions(self): # Test background + event actions work together bg_temporal_handler = MyTestState.handle_background_temporal assert bg_temporal_handler.event_actions == {"temporal": True} - assert hasattr(bg_temporal_handler.fn, BACKGROUND_TASK_MARKER) + assert hasattr(bg_temporal_handler.fn, BACKGROUND_TASK_MARKER) # ty:ignore[unresolved-attribute] # Test no event actions (existing behavior preserved) no_actions_handler = MyTestState.handle_no_actions @@ -814,7 +814,7 @@ async def handle_old_background(self): # Old background parameter should work unchanged bg_handler = MyTestState.handle_old_background assert bg_handler.event_actions == {} - assert hasattr(bg_handler.fn, BACKGROUND_TASK_MARKER) + assert hasattr(bg_handler.fn, BACKGROUND_TASK_MARKER) # ty:ignore[unresolved-attribute] def test_event_var_in_rx_cond(): @@ -958,7 +958,7 @@ def return_conditional_mixed(v: Var[Any]) -> Any: return rx.cond( v == "foo", log_after_timeout.partial("Input was foo!"), - MixedState.do_a_thing(v.to(str)), + MixedState.do_a_thing(v.to(str)), # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/2870 ) chain = EventChain.create( @@ -994,7 +994,7 @@ def return_conditional_mixed(v: Var[Any]) -> Any: return rx.cond( v == "foo", log_after_timeout.partial("Input was foo!"), - MixedState.do_a_thing(v.to(str)), + MixedState.do_a_thing(v.to(str)), # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/2870 ) chain = EventChain.create( diff --git a/tests/units/test_page.py b/tests/units/test_page.py index 07cb5c4e2a4..fc5aa5d5543 100644 --- a/tests/units/test_page.py +++ b/tests/units/test_page.py @@ -34,7 +34,7 @@ def load_foo(): description="Foo description", meta=[{"name": "keywords", "content": "foo, test"}], script_tags=["foo-script"], - on_load=load_foo, + on_load=load_foo, # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/4098 )(foo_) assert decorated_foo_ == foo_ assert len(DECORATED_PAGES) == 1 diff --git a/tests/units/test_state.py b/tests/units/test_state.py index 6f43ab02ac3..79777d48008 100644 --- a/tests/units/test_state.py +++ b/tests/units/test_state.py @@ -4339,7 +4339,7 @@ class UsesBackgroundTaskMixin(BackgroundTaskMixin, State): pass handler = UsesBackgroundTaskMixin.handle_in_background - assert handler.is_background # pyright: ignore [reportAttributeAccessIssue] + assert handler.is_background # pyright: ignore [reportAttributeAccessIssue] # ty:ignore[unresolved-attribute] def test_assignment_to_undeclared_vars(): diff --git a/tests/units/vars/test_object.py b/tests/units/vars/test_object.py index de391f984f4..c7175540b6e 100644 --- a/tests/units/vars/test_object.py +++ b/tests/units/vars/test_object.py @@ -121,6 +121,24 @@ class ObjectState(rx.State): base_list: rx.Field[list[Base]] = rx.field([Base()]) + @rx.var + def base_computed(self) -> Base: + """A computed var returning a pydantic model. + + Returns: + The pydantic model. + """ + return self.base + + @rx.var + async def base_computed_async(self) -> Base: + """An async computed var returning a pydantic model. + + Returns: + The pydantic model. + """ + return self.base + @pytest.mark.parametrize("type_", [Base, Bare, SqlaModel, Dataclass]) def test_var_create(type_: type[Base | Bare | SqlaModel | Dataclass]) -> None: @@ -273,6 +291,10 @@ def test_typing() -> None: _ = assert_type(list_var, ArrayVar[Sequence[Base]]) list_var_0 = list_var[0] _ = assert_type(list_var_0, ObjectVar[Base]) + computed_var = ObjectState.base_computed + _ = assert_type(computed_var, ObjectVar[Base]) + computed_var = ObjectState.base_computed_async + _ = assert_type(computed_var, ObjectVar[Base]) # Sqla var = ObjectState.sqlamodel diff --git a/uv.lock b/uv.lock index 3de9e456c9e..a953eab9157 100644 --- a/uv.lock +++ b/uv.lock @@ -32,6 +32,7 @@ reflex-components-code = false reflex-components-recharts = false reflex-components-core = false reflex-components-dataeditor = false +ty = false reflex-base = false reflex-components-markdown = false reflex-components-internal = false @@ -4759,27 +4760,27 @@ wheels = [ [[package]] name = "ty" -version = "0.0.55" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/08/48/f687c8d268e3581f2f104d1f2ac5944d5b5e841b3695c613b3f263e5bbf7/ty-0.0.55.tar.gz", hash = "sha256:88ca87073825a79a8327c550efcc86cec94344890244c5946f84c9e44a969f31", size = 6040230, upload-time = "2026-06-27T00:27:29.385Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/87/a3/1a90ba7e5a61c6d09adb92346ddba97668095fc257b577af433e5ac4f404/ty-0.0.55-py3-none-linux_armv6l.whl", hash = "sha256:31e83eef512d066542fe990fe1a3b814423abd1616376c54e48af7045b3e1749", size = 11677249, upload-time = "2026-06-27T00:26:52.18Z" }, - { url = "https://files.pythonhosted.org/packages/82/3a/669f9aa478c38243e213a2684db1502086026cfadc15bb1b29b7cbde030d/ty-0.0.55-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:ab4bca857950608fea73e269e2da369d43e6467131de85160d68e2fa466fa248", size = 11444180, upload-time = "2026-06-27T00:26:54.576Z" }, - { url = "https://files.pythonhosted.org/packages/15/a4/6a4b2507a53ce6530c66c5b4fe0d58551eb1748ffa9e0696c32fdd55bbd4/ty-0.0.55-py3-none-macosx_11_0_arm64.whl", hash = "sha256:55032bfd31bf2c5355ee81bdc6407b144a1cc7ee41e5681dd1368e4cef2ba327", size = 10963134, upload-time = "2026-06-27T00:26:57.348Z" }, - { url = "https://files.pythonhosted.org/packages/ce/ae/a3b1a0f1cc83b7d258662cb98aa80a720c2e671d0e8fa0d17a4d5d057a7a/ty-0.0.55-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ef1e049f69ce65b3c269af67624607f435e1c32319786c1e453ef9611502f295", size = 11493517, upload-time = "2026-06-27T00:26:59.26Z" }, - { url = "https://files.pythonhosted.org/packages/0d/9f/311ce39065a979ef40a9b847f685c8e02464e53adf1671e081eea90640ca/ty-0.0.55-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:631409975c681d5a280fc5a99b7b32e9e801f33be7567c6b42ec331362f59d7d", size = 11460590, upload-time = "2026-06-27T00:27:01.425Z" }, - { url = "https://files.pythonhosted.org/packages/cd/8f/3bf29aa77bd78aae48275153135a2052fa7d3ccdf1ecabeb99c8773abd66/ty-0.0.55-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e08cb0436e68b9351555ae8f2697138c9009b4d5b4ae4272232988b2a431a98f", size = 12098430, upload-time = "2026-06-27T00:27:03.596Z" }, - { url = "https://files.pythonhosted.org/packages/bc/6e/e88411a88240b94640bba06fb6d0d92b247fbeef47ee2bc71f39e58c2558/ty-0.0.55-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:16c215ad9f823829409b94ee188cfaa4563f6e1384f6ce3fecb1db75f6c7cf7c", size = 12673086, upload-time = "2026-06-27T00:27:05.589Z" }, - { url = "https://files.pythonhosted.org/packages/6c/7e/8f1762fb7f9245a68ba5ae338d73c59403ce57554e5d311b8bb55027b0ec/ty-0.0.55-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b510eb8f4032baf11b7aee2f1d53babc3b4ca03939b9cdcf6a9d15761d575188", size = 12242559, upload-time = "2026-06-27T00:27:07.714Z" }, - { url = "https://files.pythonhosted.org/packages/72/1f/143657daf2670d977dac83435f1fe03d4843efb798d8e1e75950e541aadd/ty-0.0.55-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0ddc05e7959709c3b9b83aa627128a80446865e3c1a4882638dcff6d776dc34a", size = 12021409, upload-time = "2026-06-27T00:27:09.881Z" }, - { url = "https://files.pythonhosted.org/packages/6d/30/69487c439dd1fad3a4a3d96f0a472193de297eaba6fc4b8ea687ce434ac2/ty-0.0.55-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:636e8e5078787b8c6916c94e1406719f10189a4ca6b37b813a5922ce5857a8c7", size = 12303807, upload-time = "2026-06-27T00:27:11.986Z" }, - { url = "https://files.pythonhosted.org/packages/e8/ca/cd88b6493dafc7db077f5e17c0438eb3af6e2d6d08f616dbb52a8ddfd567/ty-0.0.55-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:ef7d6deaacb73fec603666b5471f1dc5a5699aa84e11a6d4d644dd07ca72121e", size = 11441263, upload-time = "2026-06-27T00:27:14.087Z" }, - { url = "https://files.pythonhosted.org/packages/aa/fe/66b6915671653ab739f71e4f1b0528e69da64429b7ebf3840c625b6e43f2/ty-0.0.55-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:9aeea0fe5875d3cf37faf0e44d0fdf9669335467749741b8fc0103916fb5cd32", size = 11484584, upload-time = "2026-06-27T00:27:16.311Z" }, - { url = "https://files.pythonhosted.org/packages/4a/4f/7a9c0bbac8b899e9f6c0ec110c6612f52e4db35f6bb17ddc0ef60384fa3e/ty-0.0.55-py3-none-musllinux_1_2_i686.whl", hash = "sha256:0b699c01310dbd2705a07c97c5f4aaeedef61bd9adeea2e7c46aed32401d3576", size = 11759309, upload-time = "2026-06-27T00:27:18.471Z" }, - { url = "https://files.pythonhosted.org/packages/ca/de/b6f8b1b69aa631b5716ef3f985c3b56de0e46c2499cc00d30c402b41f714/ty-0.0.55-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:32cbeba543e46de2a983ec6d525d8b56514f7422bd1e1b57c44ccf7bfa72c38a", size = 12128755, upload-time = "2026-06-27T00:27:20.55Z" }, - { url = "https://files.pythonhosted.org/packages/7d/90/a912531e51ee7e076b42972479290fa687c0f5e747b7e773f3033164acaa/ty-0.0.55-py3-none-win32.whl", hash = "sha256:52b968e24eb4f7a5c3bd251db1f99f60dd385890356d38fc619d84f1b423446a", size = 11117501, upload-time = "2026-06-27T00:27:22.714Z" }, - { url = "https://files.pythonhosted.org/packages/4c/7a/99d59843bf8908a7f9f4d13fda107dbad07b7faa28ecd7860eacf363fb1c/ty-0.0.55-py3-none-win_amd64.whl", hash = "sha256:bf39cbfdc0add44d94bd3fff1f53c351418d134b6a66b87efdb7876d7b7a2224", size = 12150106, upload-time = "2026-06-27T00:27:24.881Z" }, - { url = "https://files.pythonhosted.org/packages/b3/44/20987505cedf2a865b08482f0eabc181fd9599b062964057ec8a128a4296/ty-0.0.55-py3-none-win_arm64.whl", hash = "sha256:f7f3700a9a060e8f1af11e4fb63fafcaf272b041781f4ccdfda2b3b5c6c1e439", size = 11560157, upload-time = "2026-06-27T00:27:27.332Z" }, +version = "0.0.69" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/8e/5b/7a618632dfe9373b7df572ecd7a08c8f799d772fbc317da82dd3aa363207/ty-0.0.69.tar.gz", hash = "sha256:b65106e9ff24fa76e25e1142fb09c85244e815c40450e3021d2bf652c231bb43", size = 6565094, upload-time = "2026-08-06T10:04:25.667Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/06/60/6534092f4d2c15e2491807edd609c2e50d527c1fed957acf40b9f110b64a/ty-0.0.69-py3-none-linux_armv6l.whl", hash = "sha256:98bfd383b273540829af673e7f98b9c1c4bcc8547d12a1a3806cd0bec7f0e087", size = 12364185, upload-time = "2026-08-06T10:03:47.137Z" }, + { url = "https://files.pythonhosted.org/packages/34/2b/5c29689bd4f74c2e3394d983d85e4011b629f2ce3730c9442553b8554bf8/ty-0.0.69-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:964621ddd05771660017c51b4e74078d861d9fc863c21ef2a500db1ab62c9ccf", size = 12042510, upload-time = "2026-08-06T10:03:49.481Z" }, + { url = "https://files.pythonhosted.org/packages/09/46/fa085bde4d23516d7ef14b24736fc5dd7dc498f60f52b3d077e59ffdea20/ty-0.0.69-py3-none-macosx_11_0_arm64.whl", hash = "sha256:3ffea4048dd0da4c9c97393b4be0901098a9065b06fa81be2477cbde65d8a151", size = 11549397, upload-time = "2026-08-06T10:03:51.747Z" }, + { url = "https://files.pythonhosted.org/packages/25/cc/97b9efb2061dcab6fef1e94a4ad99df0bb45bd2cc15d4f5794c787ee0552/ty-0.0.69-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a8684d4a70aadd1eab0f41bdba835e3288ef49db8402a8e6ca81bab52ed5d610", size = 12115567, upload-time = "2026-08-06T10:03:53.79Z" }, + { url = "https://files.pythonhosted.org/packages/e0/c1/a5e0404965093835f3e62544e661784ec0aa8ef0b006ed50af50b19c107e/ty-0.0.69-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:afaaba240ab4122e2069a796836d10be81b4ddb053ae268b3dff962a0b4ca5c7", size = 12149770, upload-time = "2026-08-06T10:03:55.993Z" }, + { url = "https://files.pythonhosted.org/packages/e2/39/8cad6b205a4abe8a044ca0c84aea71e8ccda29b07a75a5f090e310605580/ty-0.0.69-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:11ea63ef07d4e33aeb1a775cf5f2c736b3ed22fa6f8b1b608591612c36795044", size = 12941278, upload-time = "2026-08-06T10:03:58.324Z" }, + { url = "https://files.pythonhosted.org/packages/d6/8b/8766d96b732c2a060d70dc8ccafcc4d6a54109a2a95f1deb0705de88892b/ty-0.0.69-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:cb3730b1268e92a2907d7aea3afe8dd1b360ae65862f0557080cf479d481b424", size = 13426509, upload-time = "2026-08-06T10:04:00.621Z" }, + { url = "https://files.pythonhosted.org/packages/02/1f/e991b2cde953ea5b94d6a9a4c45c87937bd916bc09235f764407bf471c0a/ty-0.0.69-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a544ff57a752ef186ed40b5a2f44c17402af4cdefeb74a311ca02ebd57c4fca0", size = 13106582, upload-time = "2026-08-06T10:04:02.818Z" }, + { url = "https://files.pythonhosted.org/packages/ea/bb/73538f1b99e3558fd9db87b98698426f0f60fc8666da0b1efd0e70e275eb/ty-0.0.69-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:87ed2cbca20caddfdf8e3e14d213ce91b67e75feed78900f4aaf3ef884954028", size = 12708931, upload-time = "2026-08-06T10:04:05.233Z" }, + { url = "https://files.pythonhosted.org/packages/87/cd/484a5208d74c4ad1155933906295ccdce9aa81a257d8df2ab9e41bd60133/ty-0.0.69-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:2684efcbce5b6fe45045faf610b377b50781b6d2aa7e61ea23ecf5b3d2bce421", size = 12985322, upload-time = "2026-08-06T10:04:07.587Z" }, + { url = "https://files.pythonhosted.org/packages/6e/81/b75003f0d4da9ab3bc8fd4f4802f836cb9921ff7e70f460604f7b769a0b5/ty-0.0.69-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:da9aeb26fdac1d2214937542b59e0d4d1ba94ec7a3f45444f33c846de1eb1d63", size = 12063910, upload-time = "2026-08-06T10:04:09.835Z" }, + { url = "https://files.pythonhosted.org/packages/8a/76/088469f547ef63dceefc4a75826aedee5014f9371dc5171cde931896a82c/ty-0.0.69-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:00e7677cd14ede381f705f71104ea7b8ea0ce217a8634e19a89781953de0e9ad", size = 12166823, upload-time = "2026-08-06T10:04:12.114Z" }, + { url = "https://files.pythonhosted.org/packages/0a/c9/ce88a0bec0d46d8ae180b99c6ec014866fecc4cba1727b5feec8877b2765/ty-0.0.69-py3-none-musllinux_1_2_i686.whl", hash = "sha256:d91965eb799649833d0d6042db09cd03d15289125245337cc46a2606effb7bda", size = 12483136, upload-time = "2026-08-06T10:04:14.33Z" }, + { url = "https://files.pythonhosted.org/packages/63/9e/6fae0ff225a0012642cf72c077e20f8f448c0a80771bc3360e8178fe2f32/ty-0.0.69-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:1f03359cd8e5c412aa0c181118fa9b9061a4dddaedbb61bac0a424fb0814d402", size = 12799025, upload-time = "2026-08-06T10:04:16.445Z" }, + { url = "https://files.pythonhosted.org/packages/e4/43/78a658d18b2a4ccf35b053392f2213bf12e3c63b2abea512d3b6751d1f4c/ty-0.0.69-py3-none-win32.whl", hash = "sha256:ec460e01586b1eb91894c4a8403bee3e045a47e7a4ada943cc27ce8e348e88cf", size = 11787774, upload-time = "2026-08-06T10:04:18.622Z" }, + { url = "https://files.pythonhosted.org/packages/3a/5e/88db1f674403f2b81316a853a44a81ed220621fa96f8f7ae586fb6ca7513/ty-0.0.69-py3-none-win_amd64.whl", hash = "sha256:18976ca26a4e28fc3249477f79a695d5502e670803f2e080d89ac905baef3c6e", size = 12864038, upload-time = "2026-08-06T10:04:20.748Z" }, + { url = "https://files.pythonhosted.org/packages/4d/7b/6fc6efd00c69103d70f2bdbe824343089cd70b17b3079170057d3e5a3ac0/ty-0.0.69-py3-none-win_arm64.whl", hash = "sha256:7d4ca3bb74d91cb9947ba3f3b4cb131ad6a2b3ecc76d34040c4ec6092d2e411d", size = 12196693, upload-time = "2026-08-06T10:04:22.902Z" }, ] [[package]] From 34751854e2239e245e4c7d4e26559d6e29800243 Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Thu, 20 Aug 2026 20:00:25 +0200 Subject: [PATCH 35/57] wip --- .../src/reflex_base/environment.py | 2 +- .../src/reflex_base/utils/console.py | 2 +- .../src/reflex_base/utils/pyi_generator.py | 9 +++- .../src/reflex_components_sonner/toast.py | 36 ++++++++-------- pyi_hashes.json | 2 +- reflex/app.py | 2 +- scripts/check_min_deps.py | 2 +- scripts/release.py | 2 +- .../utils/pyi_generator/test_unit.py | 15 +++++++ uv.lock | 42 +++++++++---------- 10 files changed, 67 insertions(+), 47 deletions(-) diff --git a/packages/reflex-base/src/reflex_base/environment.py b/packages/reflex-base/src/reflex_base/environment.py index e66e6a7b173..39bbf2c805c 100644 --- a/packages/reflex-base/src/reflex_base/environment.py +++ b/packages/reflex-base/src/reflex_base/environment.py @@ -753,7 +753,7 @@ class EnvironmentVariables: try: from dotenv import load_dotenv except ImportError: - load_dotenv = None # ty:ignore[invalid-assignment] + load_dotenv = None def _paths_from_env_files(env_files: str) -> list[Path]: diff --git a/packages/reflex-base/src/reflex_base/utils/console.py b/packages/reflex-base/src/reflex_base/utils/console.py index 03c7910ad7d..6d4d3bf16d8 100644 --- a/packages/reflex-base/src/reflex_base/utils/console.py +++ b/packages/reflex-base/src/reflex_base/utils/console.py @@ -276,7 +276,7 @@ def _exclude_paths_from_frame_info() -> list[Path]: try: import reflex as rx except ImportError: - rx = None # ty:ignore[invalid-assignment] + rx = None # Exclude utility modules that should never be the source of deprecated reflex usage. exclude_modules: list[ModuleType | None] = [ diff --git a/packages/reflex-base/src/reflex_base/utils/pyi_generator.py b/packages/reflex-base/src/reflex_base/utils/pyi_generator.py index 60208d64030..d2b84c7a9ee 100644 --- a/packages/reflex-base/src/reflex_base/utils/pyi_generator.py +++ b/packages/reflex-base/src/reflex_base/utils/pyi_generator.py @@ -1388,8 +1388,13 @@ def visit_AnnAssign(self, node: ast.AnnAssign) -> ast.AnnAssign | None: if self._current_class_is_component(): # Remove annotated assignments in Component classes (props) return None - # Blank out assignments in type stubs. - node.value = None + # Blank out assignments in type stubs. In a class body keep `...` when there + # was one: for dataclass-like classes (e.g. PropsBase) a default is what + # makes the field optional in the synthesized __init__. + if self.current_class is not None and node.value is not None: + node.value = ast.Constant(value=...) + else: + node.value = None return node diff --git a/packages/reflex-components-sonner/src/reflex_components_sonner/toast.py b/packages/reflex-components-sonner/src/reflex_components_sonner/toast.py index 29302688c4a..395efeaa0e3 100644 --- a/packages/reflex-components-sonner/src/reflex_components_sonner/toast.py +++ b/packages/reflex-components-sonner/src/reflex_components_sonner/toast.py @@ -81,28 +81,28 @@ class ToastProps(NoExtrasAllowedProps): """Props for the toast component.""" # Toast's title, renders above the description. - title: str | Var | None + title: str | Var | None = None # Toast's description, renders underneath the title. - description: str | Var | None + description: str | Var | None = None # Whether to show the close button. - close_button: bool | None + close_button: bool | None = None # Dark toast in light mode and vice versa. - invert: bool | None + invert: bool | None = None # Control the sensitivity of the toast for screen readers - important: bool | None + important: bool | None = None # Time in milliseconds that should elapse before automatically closing the toast. - duration: int | None + duration: int | None = None # Position of the toast. - position: LiteralPosition | None + position: LiteralPosition | None = None # If false, it'll prevent the user from dismissing the toast. - dismissible: bool | None + dismissible: bool | None = None # TODO: fix serialization of icons for toast? (might not be possible yet) # Icon displayed in front of toast's text, aligned vertically. @@ -110,34 +110,34 @@ class ToastProps(NoExtrasAllowedProps): # TODO: fix implementation for action / cancel buttons # Renders a primary button, clicking it will close the toast. - action: ToastAction | None + action: ToastAction | None = None # Renders a secondary button, clicking it will close the toast. - cancel: ToastAction | None + cancel: ToastAction | None = None # Custom id for the toast. - id: str | Var | None + id: str | Var | None = None # Removes the default styling, which allows for easier customization. - unstyled: bool | None + unstyled: bool | None = None # Custom style for the toast. - style: Style | None + style: Style | None = None # Class name for the toast. - class_name: str | None + class_name: str | None = None # XXX: These still do not seem to work Custom style for the toast primary button. - action_button_styles: Style | None + action_button_styles: Style | None = None # Custom style for the toast secondary button. - cancel_button_styles: Style | None + cancel_button_styles: Style | None = None # The function gets called when either the close button is clicked, or the toast is swiped. - on_dismiss: Any | None + on_dismiss: Any | None = None # Function that gets called when the toast disappears automatically after it's timeout (duration` prop). - on_auto_close: Any | None + on_auto_close: Any | None = None def dict(self, *args: Any, **kwargs: Any) -> builtins.dict[str, Any]: """Convert the object to a dictionary. diff --git a/pyi_hashes.json b/pyi_hashes.json index 90fb2f5d0fd..d646a0eed0f 100644 --- a/pyi_hashes.json +++ b/pyi_hashes.json @@ -117,7 +117,7 @@ "packages/reflex-components-recharts/src/reflex_components_recharts/general.pyi": "45fa9c7a3da5614dfe5bd7e7c62aaa92", "packages/reflex-components-recharts/src/reflex_components_recharts/polar.pyi": "99ebcfc07868061bdc3c2010d85a153f", "packages/reflex-components-recharts/src/reflex_components_recharts/recharts.pyi": "4f6c26f8c76543cc41e2b9dc400ece8a", - "packages/reflex-components-sonner/src/reflex_components_sonner/toast.pyi": "8f503364645148d66bfe78a87bfeb5a9", + "packages/reflex-components-sonner/src/reflex_components_sonner/toast.pyi": "829911e2f365d91727d967c0f353762a", "reflex/__init__.pyi": "56385a4f0d9431eb0056dbc5553a58f9", "reflex/components/__init__.pyi": "9facd05a776d0641432696bbf8e34388", "reflex/experimental/memo.pyi": "6c91fcb40d6cc536255a4e1f6769ec75" diff --git a/reflex/app.py b/reflex/app.py index 5316586f43e..2e88539a033 100644 --- a/reflex/app.py +++ b/reflex/app.py @@ -1111,7 +1111,7 @@ def _commit_page( state = self._state or State state.setup_dynamic_args(prepared.route_args) - self._load_events[page.route] = ( + self._load_events[page.route] = ( # ty:ignore[invalid-assignment] https://github.com/astral-sh/ty/issues/1824 (page.on_load if isinstance(page.on_load, list) else [page.on_load]) if page.on_load is not None else [] diff --git a/scripts/check_min_deps.py b/scripts/check_min_deps.py index 23fbe2918d7..65c16497109 100644 --- a/scripts/check_min_deps.py +++ b/scripts/check_min_deps.py @@ -55,7 +55,7 @@ if sys.version_info >= (3, 11): import tomllib else: - import tomli as tomllib + import tomli as tomllib # ty:ignore[unresolved-import] REPO_ROOT = Path(__file__).resolve().parent.parent diff --git a/scripts/release.py b/scripts/release.py index d787437ba0c..5330a33f6cf 100644 --- a/scripts/release.py +++ b/scripts/release.py @@ -69,7 +69,7 @@ from packaging.version import InvalidVersion, Version try: - import tomllib + import tomllib # ty:ignore[unresolved-import] except ImportError: import tomli as tomllib # ty:ignore[unresolved-import] diff --git a/tests/units/reflex_base/utils/pyi_generator/test_unit.py b/tests/units/reflex_base/utils/pyi_generator/test_unit.py index 4bbf5107b8a..c606200a778 100644 --- a/tests/units/reflex_base/utils/pyi_generator/test_unit.py +++ b/tests/units/reflex_base/utils/pyi_generator/test_unit.py @@ -393,6 +393,21 @@ class ModeComp(Component): assert "mode: str =" not in result +def test_stub_class_field_default_kept_as_ellipsis(): + source = """ +from reflex_base.components.props import NoExtrasAllowedProps + +class SomeProps(NoExtrasAllowedProps): + required: str + optional: str | None = None +""" + result = _generate_stub_from_source(source) + # A class field's default decides whether it is required in the synthesized + # __init__, so its presence has to survive into the stub as `...`. + assert "required: str\n" in result + assert "optional: str | None = ..." in result + + def test_stub_classvar_preserved(): source = """ from typing import ClassVar diff --git a/uv.lock b/uv.lock index 4fa719d3048..aa06085f67a 100644 --- a/uv.lock +++ b/uv.lock @@ -4829,27 +4829,27 @@ wheels = [ [[package]] name = "ty" -version = "0.0.69" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/8e/5b/7a618632dfe9373b7df572ecd7a08c8f799d772fbc317da82dd3aa363207/ty-0.0.69.tar.gz", hash = "sha256:b65106e9ff24fa76e25e1142fb09c85244e815c40450e3021d2bf652c231bb43", size = 6565094, upload-time = "2026-08-06T10:04:25.667Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/06/60/6534092f4d2c15e2491807edd609c2e50d527c1fed957acf40b9f110b64a/ty-0.0.69-py3-none-linux_armv6l.whl", hash = "sha256:98bfd383b273540829af673e7f98b9c1c4bcc8547d12a1a3806cd0bec7f0e087", size = 12364185, upload-time = "2026-08-06T10:03:47.137Z" }, - { url = "https://files.pythonhosted.org/packages/34/2b/5c29689bd4f74c2e3394d983d85e4011b629f2ce3730c9442553b8554bf8/ty-0.0.69-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:964621ddd05771660017c51b4e74078d861d9fc863c21ef2a500db1ab62c9ccf", size = 12042510, upload-time = "2026-08-06T10:03:49.481Z" }, - { url = "https://files.pythonhosted.org/packages/09/46/fa085bde4d23516d7ef14b24736fc5dd7dc498f60f52b3d077e59ffdea20/ty-0.0.69-py3-none-macosx_11_0_arm64.whl", hash = "sha256:3ffea4048dd0da4c9c97393b4be0901098a9065b06fa81be2477cbde65d8a151", size = 11549397, upload-time = "2026-08-06T10:03:51.747Z" }, - { url = "https://files.pythonhosted.org/packages/25/cc/97b9efb2061dcab6fef1e94a4ad99df0bb45bd2cc15d4f5794c787ee0552/ty-0.0.69-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a8684d4a70aadd1eab0f41bdba835e3288ef49db8402a8e6ca81bab52ed5d610", size = 12115567, upload-time = "2026-08-06T10:03:53.79Z" }, - { url = "https://files.pythonhosted.org/packages/e0/c1/a5e0404965093835f3e62544e661784ec0aa8ef0b006ed50af50b19c107e/ty-0.0.69-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:afaaba240ab4122e2069a796836d10be81b4ddb053ae268b3dff962a0b4ca5c7", size = 12149770, upload-time = "2026-08-06T10:03:55.993Z" }, - { url = "https://files.pythonhosted.org/packages/e2/39/8cad6b205a4abe8a044ca0c84aea71e8ccda29b07a75a5f090e310605580/ty-0.0.69-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:11ea63ef07d4e33aeb1a775cf5f2c736b3ed22fa6f8b1b608591612c36795044", size = 12941278, upload-time = "2026-08-06T10:03:58.324Z" }, - { url = "https://files.pythonhosted.org/packages/d6/8b/8766d96b732c2a060d70dc8ccafcc4d6a54109a2a95f1deb0705de88892b/ty-0.0.69-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:cb3730b1268e92a2907d7aea3afe8dd1b360ae65862f0557080cf479d481b424", size = 13426509, upload-time = "2026-08-06T10:04:00.621Z" }, - { url = "https://files.pythonhosted.org/packages/02/1f/e991b2cde953ea5b94d6a9a4c45c87937bd916bc09235f764407bf471c0a/ty-0.0.69-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a544ff57a752ef186ed40b5a2f44c17402af4cdefeb74a311ca02ebd57c4fca0", size = 13106582, upload-time = "2026-08-06T10:04:02.818Z" }, - { url = "https://files.pythonhosted.org/packages/ea/bb/73538f1b99e3558fd9db87b98698426f0f60fc8666da0b1efd0e70e275eb/ty-0.0.69-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:87ed2cbca20caddfdf8e3e14d213ce91b67e75feed78900f4aaf3ef884954028", size = 12708931, upload-time = "2026-08-06T10:04:05.233Z" }, - { url = "https://files.pythonhosted.org/packages/87/cd/484a5208d74c4ad1155933906295ccdce9aa81a257d8df2ab9e41bd60133/ty-0.0.69-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:2684efcbce5b6fe45045faf610b377b50781b6d2aa7e61ea23ecf5b3d2bce421", size = 12985322, upload-time = "2026-08-06T10:04:07.587Z" }, - { url = "https://files.pythonhosted.org/packages/6e/81/b75003f0d4da9ab3bc8fd4f4802f836cb9921ff7e70f460604f7b769a0b5/ty-0.0.69-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:da9aeb26fdac1d2214937542b59e0d4d1ba94ec7a3f45444f33c846de1eb1d63", size = 12063910, upload-time = "2026-08-06T10:04:09.835Z" }, - { url = "https://files.pythonhosted.org/packages/8a/76/088469f547ef63dceefc4a75826aedee5014f9371dc5171cde931896a82c/ty-0.0.69-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:00e7677cd14ede381f705f71104ea7b8ea0ce217a8634e19a89781953de0e9ad", size = 12166823, upload-time = "2026-08-06T10:04:12.114Z" }, - { url = "https://files.pythonhosted.org/packages/0a/c9/ce88a0bec0d46d8ae180b99c6ec014866fecc4cba1727b5feec8877b2765/ty-0.0.69-py3-none-musllinux_1_2_i686.whl", hash = "sha256:d91965eb799649833d0d6042db09cd03d15289125245337cc46a2606effb7bda", size = 12483136, upload-time = "2026-08-06T10:04:14.33Z" }, - { url = "https://files.pythonhosted.org/packages/63/9e/6fae0ff225a0012642cf72c077e20f8f448c0a80771bc3360e8178fe2f32/ty-0.0.69-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:1f03359cd8e5c412aa0c181118fa9b9061a4dddaedbb61bac0a424fb0814d402", size = 12799025, upload-time = "2026-08-06T10:04:16.445Z" }, - { url = "https://files.pythonhosted.org/packages/e4/43/78a658d18b2a4ccf35b053392f2213bf12e3c63b2abea512d3b6751d1f4c/ty-0.0.69-py3-none-win32.whl", hash = "sha256:ec460e01586b1eb91894c4a8403bee3e045a47e7a4ada943cc27ce8e348e88cf", size = 11787774, upload-time = "2026-08-06T10:04:18.622Z" }, - { url = "https://files.pythonhosted.org/packages/3a/5e/88db1f674403f2b81316a853a44a81ed220621fa96f8f7ae586fb6ca7513/ty-0.0.69-py3-none-win_amd64.whl", hash = "sha256:18976ca26a4e28fc3249477f79a695d5502e670803f2e080d89ac905baef3c6e", size = 12864038, upload-time = "2026-08-06T10:04:20.748Z" }, - { url = "https://files.pythonhosted.org/packages/4d/7b/6fc6efd00c69103d70f2bdbe824343089cd70b17b3079170057d3e5a3ac0/ty-0.0.69-py3-none-win_arm64.whl", hash = "sha256:7d4ca3bb74d91cb9947ba3f3b4cb131ad6a2b3ecc76d34040c4ec6092d2e411d", size = 12196693, upload-time = "2026-08-06T10:04:22.902Z" }, +version = "0.0.73" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/e5/90/c4e1bb4cead3b644c3e258a27f9b05c7dc5eb0ec96a4f5282194edae9e0d/ty-0.0.73.tar.gz", hash = "sha256:823d4ce0d237bfc7eb6bcee70842f2c0706113813a16951077840743712f4b74", size = 6712739, upload-time = "2026-08-19T03:12:43.381Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e4/0f/f5e1801e55cc631f2db193276675b30561b963a2403da832bffb5d100267/ty-0.0.73-py3-none-linux_armv6l.whl", hash = "sha256:90a946082bf9bc446b5e72973d9f4ff1222a240b2ca4c9e6eed61eb913e30810", size = 12715452, upload-time = "2026-08-19T03:12:06.673Z" }, + { url = "https://files.pythonhosted.org/packages/54/32/515dd05074c213b433524ab97eb003b0132ae7e358e0d75633ba7a314ed8/ty-0.0.73-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:b7d6b5c6a6db7ea95fbbc16af514ef44a27a29a2fe1dc798900790364d170209", size = 12301870, upload-time = "2026-08-19T03:12:08.924Z" }, + { url = "https://files.pythonhosted.org/packages/50/4d/085b4889f0d4bbe4af8b96242d4a1cb209fff95967cfa239ea141983719b/ty-0.0.73-py3-none-macosx_11_0_arm64.whl", hash = "sha256:dd6f657f463e01372d8688f235be164750c8db722c97da27fa4903aa8d40b203", size = 12111741, upload-time = "2026-08-19T03:12:11.067Z" }, + { url = "https://files.pythonhosted.org/packages/95/f6/d6ec277cadfecf03ad4c18551b67c4c6eb7807a0560d801db14be99d7a89/ty-0.0.73-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fc2de468e33fd44c9ff1c43473a7316f4289480f5cba8995a67b6d22aee39ca9", size = 12196124, upload-time = "2026-08-19T03:12:13.14Z" }, + { url = "https://files.pythonhosted.org/packages/75/b7/ce78d8707563af9cae9bbd25328bfbc4931035085bd20089adf0c418f70e/ty-0.0.73-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:2942fa0ef795a66034cdc8d75a72f453442f3b58ff2f69b4da05b7b954765b55", size = 12488557, upload-time = "2026-08-19T03:12:15.252Z" }, + { url = "https://files.pythonhosted.org/packages/d8/e8/329b9851b23502758c5c98e8cc875ea2a1b4c9674b4ca3a86da56a5063d3/ty-0.0.73-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1e0f1ef14f642e18ac4e7a616a2796dcf7a5d82e28cd17f9796494acc7c4aabb", size = 13215606, upload-time = "2026-08-19T03:12:17.225Z" }, + { url = "https://files.pythonhosted.org/packages/36/38/67fedfd2cb77516ef0066b1642f487dba0eb3006493cf3475b15f5b8b228/ty-0.0.73-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:16981e15fdceedb37d0aff76c5ac25914595dfee2675af95335550064251ad22", size = 13665497, upload-time = "2026-08-19T03:12:19.286Z" }, + { url = "https://files.pythonhosted.org/packages/8e/b3/154f4dd48ec5eebc186ab4b822c6e62f982fc5ddfd262d6e3903c2acba44/ty-0.0.73-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:644b2bec8a2e2e4957a942ae81d6cff5571c489bb5a8675e4d3886de537a694d", size = 13351231, upload-time = "2026-08-19T03:12:21.353Z" }, + { url = "https://files.pythonhosted.org/packages/35/5f/d462496903fbe453fb76363f8478be929c8e6ff21e6928c57dcd7e5fa21f/ty-0.0.73-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:338d565be3186f50ff8e9d10483685549c2d23f0754485d5ede3b54f4319188a", size = 12782586, upload-time = "2026-08-19T03:12:23.667Z" }, + { url = "https://files.pythonhosted.org/packages/87/52/ec6d24b74abe3ec324204c1c71e6d0c6c76a17ffc15fd51d603b0a302abe/ty-0.0.73-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:11c7b6d839309d2c102cb3a4c03d817176bbfab5b2fccc95a75ec5c9597421c9", size = 13247134, upload-time = "2026-08-19T03:12:25.956Z" }, + { url = "https://files.pythonhosted.org/packages/26/20/cc74650fec56a54786c6d7c89e09576fcad3092be34cf21715d39a406a9b/ty-0.0.73-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:488572db7ff97fb50ea36a76250f2d617c9727d143da6c7bf0623276eb0fc507", size = 12309344, upload-time = "2026-08-19T03:12:28.122Z" }, + { url = "https://files.pythonhosted.org/packages/89/bd/4b0a9087f4315d7fbadf77a3ce44c816cc9ffabed1ced06cc5be81fbc414/ty-0.0.73-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:1b958ebceefbbf594e59eb8d3d55bbd033ce634026fcba3e4bc3179e78e45bb7", size = 12502319, upload-time = "2026-08-19T03:12:30.128Z" }, + { url = "https://files.pythonhosted.org/packages/11/80/0a925074911fe111912ea29d9eed309bcc183f43d2fb3eef07db056a0beb/ty-0.0.73-py3-none-musllinux_1_2_i686.whl", hash = "sha256:91a32993b3c34e42c3f323ad6c0399cb596bd1c27e9b7f20db7cd64c1067b68e", size = 12753688, upload-time = "2026-08-19T03:12:32.433Z" }, + { url = "https://files.pythonhosted.org/packages/24/6b/aeccaf89efbc2e112bd415340a22e2669ec998aa397242503e747b712ca4/ty-0.0.73-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:bab8a19fbf51f479bddb2a12c5fabfe52f918a5590362321ed5d89b44eb62c15", size = 13069050, upload-time = "2026-08-19T03:12:35.398Z" }, + { url = "https://files.pythonhosted.org/packages/d7/3e/eae485fd86c1585943fd4e1746b0757b2da01e2c43136ebe8c686fe1c7f1/ty-0.0.73-py3-none-win32.whl", hash = "sha256:03347a612f0fa020b19bfd8dbd521db6ecc75d377a3e4d4f6e6c2e62871da4cc", size = 12053187, upload-time = "2026-08-19T03:12:37.565Z" }, + { url = "https://files.pythonhosted.org/packages/a7/01/9b8b983786e3ce34924e372e8b76b92b508273ab65c589fc7e88cc03ee17/ty-0.0.73-py3-none-win_amd64.whl", hash = "sha256:cedd05122ded0b5dcc55431a370e974b747f99c41c290a3d2ab8c1867f197519", size = 12693838, upload-time = "2026-08-19T03:12:39.483Z" }, + { url = "https://files.pythonhosted.org/packages/ea/88/25333bbfea6a5dc064371d2002d3d4807db90b84d5448f9106b2712b0fbc/ty-0.0.73-py3-none-win_arm64.whl", hash = "sha256:e47068f8369dea5d641a26a2ad0a947a320b02ff87099b07e95de0323245a4dc", size = 12443573, upload-time = "2026-08-19T03:12:41.449Z" }, ] [[package]] From d83b1302d512398822b7467f34b49d46519d6267 Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Tue, 22 Sep 2026 01:08:03 +0200 Subject: [PATCH 36/57] Run the minimum-dependency check with ty `scripts/check_min_deps.py` still shelled out to `pyright`, which this branch removed from the dev dependencies, so every `check-min-deps` job died with `FileNotFoundError: 'pyright'` before checking anything. It now runs `ty check --python --output-format concise` and diffs the parsed error lines, with the rule severities copied out of the root `[tool.ty.rules]` into the `ty.toml` that `--config-file` supplies, so the isolated runs stay comparable to the repo-wide check. ty resolves more of the older releases than pyright did, so several packages now report deltas against their declared `reflex-base` floors. Those floors are genuinely behind the `field()` signature the components use; raising them is left to a separate change. --- scripts/check_min_deps.py | 96 +++++++++++++++++------------- tests/units/test_check_min_deps.py | 72 ++++++++++------------ 2 files changed, 87 insertions(+), 81 deletions(-) diff --git a/scripts/check_min_deps.py b/scripts/check_min_deps.py index 42366e548c4..7204ab51789 100644 --- a/scripts/check_min_deps.py +++ b/scripts/check_min_deps.py @@ -4,7 +4,7 @@ ``packages/*``), this installs the package editable into two isolated virtualenvs (deps from PyPI, never the local workspace, via ``--no-sources``): one with dependencies resolved to their *declared minimums* (``--resolution lowest-direct``) and one with the latest -compatible versions. Pyright runs against the package's own source in each, and the check +compatible versions. ty runs against the package's own source in each, and the check fails only on errors that are *new* at the minimum versions. The delta is what matters, not the absolute error count: a package's source legitimately @@ -47,6 +47,7 @@ import argparse import json import os +import re import subprocess import sys import tempfile @@ -73,7 +74,7 @@ # Packages that are intentionally not validated: # hatch-reflex-pyi - build-backend plugin, only depends on hatchling # integrations-docs - has no declared dependencies -# reflex-site-shared - excluded from the root pyright config +# reflex-site-shared - excluded from the root ty config SKIP_PACKAGES = frozenset({ "hatch-reflex-pyi", "integrations-docs", @@ -132,7 +133,7 @@ class Package: """Directory containing the package's ``pyproject.toml`` (the editable install target).""" source_dir: Path - """Directory of importable source that pyright should type-check.""" + """Directory of importable source that ty should type-check.""" extras: tuple[str, ...] """Names of optional-dependency groups to install alongside the package.""" @@ -342,32 +343,46 @@ def _run(cmd: list[str], **kwargs) -> subprocess.CompletedProcess[str]: ) -def _pyright_errors(report: dict) -> dict[tuple[str, int, int, str], str]: - """Extract error diagnostics from a pyright JSON report. +def _ty_config() -> str: + """Build the ``ty.toml`` the isolated checks run under. + + ``--config-file`` replaces every discovered config, so the root project's rule + severities are copied over to keep the isolated runs comparable to the repo-wide + check. The interpreter comes from ``--python``, so no environment is declared. + + Returns: + The ``ty.toml`` contents. + """ + rules = _load_pyproject(REPO_ROOT / "pyproject.toml")["tool"]["ty"]["rules"] + body = "".join(f'{rule} = "{level}"\n' for rule, level in rules.items()) + return f"[rules]\n{body}" + + +_TY_DIAGNOSTIC = re.compile( + r"^(?P.+?):(?P\d+):(?P\d+): " + r"(?P\w+)\[(?P[\w-]+)\] (?P.*)$" +) + + +def _ty_errors(output: str) -> dict[tuple[str, int, int, str], str]: + """Extract error diagnostics from ty's concise output. Args: - report: The parsed ``--outputjson`` document. + output: The captured ``--output-format concise`` text. Returns: - A mapping from a stable diagnostic key (file, line, character, message) to a + A mapping from a stable diagnostic key (file, line, column, message) to a formatted, human-readable display line. """ errors: dict[tuple[str, int, int, str], str] = {} - for diagnostic in report.get("generalDiagnostics", []): - if diagnostic.get("severity") != "error": - continue - start = diagnostic.get("range", {}).get("start", {}) - if "line" not in start or "character" not in start: + for line in output.splitlines(): + match = _TY_DIAGNOSTIC.match(line) + if match is None or match["severity"] != "error": continue - key = ( - diagnostic["file"], - start["line"], - start["character"], - diagnostic["message"], - ) + message = f"[{match['rule']}] {match['message']}" + key = (match["file"], int(match["line"]), int(match["column"]), message) errors[key] = ( - f"{diagnostic['file']}:{start['line'] + 1}:{start['character'] + 1}" - f" - error: {diagnostic['message']}" + f"{match['file']}:{match['line']}:{match['column']} - error: {message}" ) return errors @@ -456,21 +471,21 @@ def _resolve_and_check( wheelhouse: Path | None, lowest: bool, ) -> tuple[dict[tuple[str, int, int, str], str] | None, str]: - """Install a package into an isolated venv and run pyright against its source. + """Install a package into an isolated venv and run ty against its source. Args: package: The package to install and check. python_version: The interpreter version for the venv. venv: Directory in which to create the virtualenv. - config: Path to the pyright options config. + config: Path to the ty options config. wheelhouse: Local index holding wheels for the package's unpublished ``*.dev`` siblings, or ``None`` when the package has no such pins. lowest: Whether to pin direct dependencies to their declared minimums. Returns: - A ``(errors, detail)`` tuple. ``errors`` is the pyright error map, or ``None`` if - the environment could not be built or pyright produced no parseable output, in - which case ``detail`` carries the captured output. + A ``(errors, detail)`` tuple. ``errors`` is the ty error map, or ``None`` if the + environment could not be built or ty failed outright, in which case ``detail`` + carries the captured output. """ venv_proc = _run(["uv", "venv", "--python", python_version, str(venv)]) if venv_proc.returncode != 0: @@ -499,32 +514,33 @@ def _resolve_and_check( if install.returncode != 0: return None, install.stdout - pyright = _run( + ty = _run( [ - "pyright", - "--outputjson", - "--pythonpath", + "ty", + "check", + "--python", venv_python, - "--project", + "--config-file", str(config), + "--output-format", + "concise", + "--exit-zero", str(package.source_dir), ], cwd=REPO_ROOT, ) - try: - report = json.loads(pyright.stdout) - except json.JSONDecodeError: - return None, pyright.stdout or "(pyright produced no output)" - return _pyright_errors(report), "" + if ty.returncode != 0: + return None, ty.stdout or "(ty produced no output)" + return _ty_errors(ty.stdout), "" def check_package(package: Package, python_version: str) -> Result: """Check that a package type-checks no worse at its declared minimums than at latest. Installs the package twice in isolated environments — once with dependencies at their - latest compatible versions, once pinned to their declared minimums — and compares - pyright errors. Errors present only at the minimum versions indicate the code depends - on a newer dependency than its declared lower bound allows. + latest compatible versions, once pinned to their declared minimums — and compares ty + errors. Errors present only at the minimum versions indicate the code depends on a + newer dependency than its declared lower bound allows. Args: package: The package to validate. @@ -535,8 +551,8 @@ def check_package(package: Package, python_version: str) -> Result: """ with tempfile.TemporaryDirectory(prefix=f"min-deps-{package.name}-") as tmp: tmp_path = Path(tmp) - config = tmp_path / "pyrightconfig.json" - config.write_text(json.dumps({"reportIncompatibleMethodOverride": False})) + config = tmp_path / "ty.toml" + config.write_text(_ty_config()) wheelhouse = None if package.local_dev_sources: diff --git a/tests/units/test_check_min_deps.py b/tests/units/test_check_min_deps.py index 6841a814a44..76329029357 100644 --- a/tests/units/test_check_min_deps.py +++ b/tests/units/test_check_min_deps.py @@ -66,53 +66,43 @@ def test_discover_packages_records_optional_extras(): assert "db" in by_name["reflex"].extras -def test_pyright_errors_keys_and_filters_severity(): - report = { - "generalDiagnostics": [ - { - "file": "/abs/foo.py", - "severity": "error", - "message": "boom", - "range": {"start": {"line": 9, "character": 4}}, - }, - { - "file": "/abs/foo.py", - "severity": "warning", - "message": "ignore me", - "range": {"start": {"line": 1, "character": 0}}, - }, - ] - } - errors = check_min_deps._pyright_errors(report) - - assert list(errors) == [("/abs/foo.py", 9, 4, "boom")] - # Line/character are converted to 1-based in the display string. - assert errors["/abs/foo.py", 9, 4, "boom"] == "/abs/foo.py:10:5 - error: boom" - - -def test_pyright_errors_delta_cancels_shared_noise(): - def report(messages: list[tuple[str, int]]) -> dict: - return { - "generalDiagnostics": [ - { - "file": "/abs/foo.py", - "severity": "error", - "message": msg, - "range": {"start": {"line": line, "character": 0}}, - } - for msg, line in messages - ] - } +def test_ty_errors_keys_and_filters_severity(): + output = ( + "/abs/foo.py:10:5: error[unresolved-attribute] boom\n" + "/abs/foo.py:2:1: warning[unused-ignore-comment] ignore me\n" + "Found 2 diagnostics\n" + ) + errors = check_min_deps._ty_errors(output) + + assert list(errors) == [("/abs/foo.py", 10, 5, "[unresolved-attribute] boom")] + assert errors["/abs/foo.py", 10, 5, "[unresolved-attribute] boom"] == ( + "/abs/foo.py:10:5 - error: [unresolved-attribute] boom" + ) + + +def test_ty_errors_delta_cancels_shared_noise(): + def output(messages: list[tuple[str, int]]) -> str: + return "".join( + f"/abs/foo.py:{line}:1: error[unresolved-import] {msg}\n" + for msg, line in messages + ) # A shared, undeclared-import error appears in both resolutions; only the # minimum-version-specific error should remain in the delta. - baseline = check_min_deps._pyright_errors(report([("missing optional import", 1)])) - minimum = check_min_deps._pyright_errors( - report([("missing optional import", 1), ("model_dump is unknown", 50)]) + baseline = check_min_deps._ty_errors(output([("missing optional import", 1)])) + minimum = check_min_deps._ty_errors( + output([("missing optional import", 1), ("model_dump is unknown", 50)]) ) new = minimum.keys() - baseline.keys() - assert new == {("/abs/foo.py", 50, 0, "model_dump is unknown")} + assert new == {("/abs/foo.py", 50, 1, "[unresolved-import] model_dump is unknown")} + + +def test_ty_config_mirrors_root_rule_severities(): + config = check_min_deps._ty_config() + + assert config.startswith("[rules]\n") + assert 'invalid-method-override = "ignore"' in config @pytest.mark.parametrize( From eeec9cc58b6895969c55534d5cddb330c9c62bc1 Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Wed, 21 Oct 2026 09:09:41 +0200 Subject: [PATCH 37/57] Read literal values through cast wrappers in get_var_value rx.Var.create(1).to(int) is a ToOperation, so the LiteralVar check missed it and get_var_value raised instead of returning 1. --- reflex/state.py | 11 +++++++---- tests/units/test_state.py | 3 +++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/reflex/state.py b/reflex/state.py index 18238e33c91..5f6aba6a194 100644 --- a/reflex/state.py +++ b/reflex/state.py @@ -1828,10 +1828,6 @@ async def get_var_value(self, var: Var[VAR_TYPE]) -> VAR_TYPE: if not isinstance(var, Var): return var - # Fast case: this is a literal var and the value is known. - if isinstance(var, LiteralVar) and not isinstance(var._var_value, Var): - return var._var_value - # Unwrap any cast wrappers and resolve via the underlying var's *own* # var data, not the recursive _get_all_var_data(). For an operation or # derived var (e.g. State.a + State.b or State.items[0]), the recursive @@ -1842,6 +1838,13 @@ async def get_var_value(self, var: Var[VAR_TYPE]) -> VAR_TYPE: inner_var = var while isinstance(inner_var, ToOperation): inner_var = inner_var._original + + # Fast case: this is a literal var and the value is known. + if isinstance(inner_var, LiteralVar) and not isinstance( + inner_var._var_value, Var + ): + return inner_var._var_value + var_data = inner_var._var_data if var_data is None or not var_data.state or not var_data.field_name: msg = f"Unable to retrieve value for {var._js_expr}: not associated with any state." diff --git a/tests/units/test_state.py b/tests/units/test_state.py index 73382e73280..17c3cece7ad 100644 --- a/tests/units/test_state.py +++ b/tests/units/test_state.py @@ -6344,6 +6344,9 @@ async def test_get_var_value( # LiteralVar with known value assert await state.get_var_value(rx.Var.create([1, 2, 3])) == [1, 2, 3] + # Cast LiteralVar resolves to the original literal value + assert await state.get_var_value(rx.Var.create(1).to(int)) == 1 + # Generic Var with no state with pytest.raises(UnretrievableVarValueError): await state.get_var_value(rx.Var("undefined")) From bbd2deb3ab0c59e5fdb2a342ac4599ca06fff8ca Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Wed, 21 Oct 2026 22:17:43 +0200 Subject: [PATCH 38/57] Regenerate pyi hashes after the upstream merge --- pyi_hashes.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyi_hashes.json b/pyi_hashes.json index 2b8a9b5bd27..edb781cfc0c 100644 --- a/pyi_hashes.json +++ b/pyi_hashes.json @@ -117,8 +117,8 @@ "packages/reflex-components-recharts/src/reflex_components_recharts/general.pyi": "fe22b3cf69e9ae3d425cc88c3511525b", "packages/reflex-components-recharts/src/reflex_components_recharts/polar.pyi": "99ebcfc07868061bdc3c2010d85a153f", "packages/reflex-components-recharts/src/reflex_components_recharts/recharts.pyi": "f2a9cf6db58d169289fbc76de6813300", - "packages/reflex-components-sonner/src/reflex_components_sonner/toast.pyi": "f170ac685b6ba5892370166c80684db3", + "packages/reflex-components-sonner/src/reflex_components_sonner/toast.pyi": "829911e2f365d91727d967c0f353762a", "reflex/__init__.pyi": "1c841ad90d789507cd56d966b474d11c", "reflex/components/__init__.pyi": "9facd05a776d0641432696bbf8e34388", - "reflex/experimental/memo.pyi": "87e485038dc79f66b2ab15144845ef1e" + "reflex/experimental/memo.pyi": "7a0856a828747dbbf85aefe048d8136c" } From be98d4aeac1f79aa9745552c171853960d365f18 Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Sun, 25 Oct 2026 14:21:11 +0100 Subject: [PATCH 39/57] Raise the recharts reflex-base floor and drop the duplicate component check Charts now import callable_name, which reflex-base 0.10.0 lacks. The Var/primitive wrapping moved into _wrap_in_fragment so each path checks Component once. --- .../reflex-components-recharts/pyproject.toml | 2 +- reflex/compiler/compiler.py | 26 +++++++--- tests/units/compiler/test_compiler.py | 48 +++++++++++++++++++ 3 files changed, 69 insertions(+), 7 deletions(-) diff --git a/packages/reflex-components-recharts/pyproject.toml b/packages/reflex-components-recharts/pyproject.toml index 7facf482f6c..ec7af560a71 100644 --- a/packages/reflex-components-recharts/pyproject.toml +++ b/packages/reflex-components-recharts/pyproject.toml @@ -16,7 +16,7 @@ classifiers = [ "Programming Language :: Python :: 3.15", ] dependencies = [ - "reflex-base >= 0.10.0", + "reflex-base >= 0.10.1.dev0", "reflex-components-core >= 0.10.0", ] diff --git a/reflex/compiler/compiler.py b/reflex/compiler/compiler.py index 3ca67304481..421c8ea2718 100644 --- a/reflex/compiler/compiler.py +++ b/reflex/compiler/compiler.py @@ -864,6 +864,24 @@ def purge_web_pages_dir(): from reflex.app import App, ComponentCallable, UnevaluatedPage +def _wrap_in_fragment( + component: ComponentCallable | tuple[Component, ...] | str | Var | int | float, +) -> Component | None: + """Wrap a Var, primitive or sequence of components in a Fragment. + + Args: + component: The value to wrap. + + Returns: + The Fragment, or None if the value cannot be wrapped. + """ + if isinstance(component, (Var, int, float, str)): + return Fragment.create(component) + if isinstance(component, Sequence): + return Fragment.create(*component) + return None + + def _into_component_once( component: Component | ComponentCallable @@ -883,11 +901,7 @@ def _into_component_once( """ if isinstance(component, Component): return component - if isinstance(component, (Var, int, float, str)): - return Fragment.create(component) - if isinstance(component, Sequence): - return Fragment.create(*component) - return None + return _wrap_in_fragment(component) def readable_name_from_component( @@ -962,7 +976,7 @@ def into_component(component: Component | ComponentCallable) -> Component: """ if isinstance(component, Component): return component - if (converted := _into_component_once(component)) is not None: + if (converted := _wrap_in_fragment(component)) is not None: return converted if not callable(component): msg = f"Expected a Component or callable, got {component!r} of type {type(component)}" diff --git a/tests/units/compiler/test_compiler.py b/tests/units/compiler/test_compiler.py index d61f730c7ab..1fbd1cdad50 100644 --- a/tests/units/compiler/test_compiler.py +++ b/tests/units/compiler/test_compiler.py @@ -23,6 +23,7 @@ from reflex_base.vars.sequence import LiteralStringVar from reflex_components_core.base import Description, document from reflex_components_core.base.document import Links, Scripts +from reflex_components_core.base.fragment import Fragment from reflex_components_core.el.elements.metadata import Head, Link, Meta from reflex_components_core.el.elements.other import Html @@ -1954,3 +1955,50 @@ def test_compile_app_resolves_show_built_with_reflex( assert get_user_tier.called is ( compile_context == constants.CompileContext.DEPLOY and configured is None ) + + +@pytest.mark.parametrize( + ("component", "children"), + [ + ("text", 1), + (Var.create("var"), 1), + ((rx.el.div(), rx.el.span()), 2), + (lambda: "text", 1), + (lambda: (rx.el.div(), rx.el.span()), 2), + ], +) +def test_into_component_wraps_renderables_in_a_fragment(component, children: int): + """Strings, Vars and sequences, returned directly or by a callable, become a Fragment. + + Args: + component: The value to convert. + children: The number of children the Fragment should have. + """ + converted = compiler.into_component(component) + assert isinstance(converted, Fragment) + assert len(converted.children) == children + + +def test_into_component_returns_components_as_is(): + """A Component, or the one a callable returns, is used unchanged.""" + div = rx.el.div() + assert compiler.into_component(div) is div + assert compiler.into_component(lambda: div) is div + + +@pytest.mark.parametrize( + ("component", "message"), + [ + (None, "Expected a Component or callable"), + (lambda: None, "Expected a Component, got None"), + ], +) +def test_into_component_rejects_non_renderables(component, message: str): + """A value that is neither renderable nor callable, or a callable returning one, raises. + + Args: + component: The value to convert. + message: The expected start of the error message. + """ + with pytest.raises(TypeError, match=message): + compiler.into_component(component) From 270d08f208f587d5a5588524b5eeaf02d2ab4a14 Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Sun, 25 Oct 2026 14:21:14 +0100 Subject: [PATCH 40/57] Type the SQLModel config as a ClassVar dict Older sqlmodel defines SQLModelConfig twice behind IS_PYDANTIC_V2, so calling it fails ty at the minimum versions although it works at runtime. --- reflex/model.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/reflex/model.py b/reflex/model.py index 25a389e8131..d94a12635c3 100644 --- a/reflex/model.py +++ b/reflex/model.py @@ -574,11 +574,11 @@ class Model(sqlmodel.SQLModel): id: int | None = sqlmodel.Field(default=None, primary_key=True) - model_config = SQLModelConfig( - arbitrary_types_allowed=True, - use_enum_values=True, - extra="allow", - ) + model_config: ClassVar[SQLModelConfig] = { + "arbitrary_types_allowed": True, + "use_enum_values": True, + "extra": "allow", + } def __init_subclass__(cls, **kwargs): """Automatically register subclasses as models.""" From 3c6f4b96129748a5dab3b8b6631371e8581fa394 Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Sun, 25 Oct 2026 15:20:13 +0100 Subject: [PATCH 41/57] Floor reflex-components-internal on the reflex-base it type-checks against The published reflex-base 0.10.1a1 alpha, from a release branch not merged here, lacks this PR's UnionType overloads of passthrough_event_spec, so the min-deps check resolved to it. --- packages/reflex-components-internal/pyproject.toml | 1 + uv.lock | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/reflex-components-internal/pyproject.toml b/packages/reflex-components-internal/pyproject.toml index 900e055e89c..4b32d32632c 100644 --- a/packages/reflex-components-internal/pyproject.toml +++ b/packages/reflex-components-internal/pyproject.toml @@ -17,6 +17,7 @@ classifiers = [ ] dependencies = [ "reflex >= 0.10.1.dev0", + "reflex-base >= 0.10.1.dev0", ] [tool.hatch.version] diff --git a/uv.lock b/uv.lock index 137e2183915..1f6db2fb04c 100644 --- a/uv.lock +++ b/uv.lock @@ -4333,10 +4333,14 @@ name = "reflex-components-internal" source = { editable = "packages/reflex-components-internal" } dependencies = [ { name = "reflex" }, + { name = "reflex-base" }, ] [package.metadata] -requires-dist = [{ name = "reflex", editable = "." }] +requires-dist = [ + { name = "reflex", editable = "." }, + { name = "reflex-base", editable = "packages/reflex-base" }, +] [[package]] name = "reflex-components-lucide" From 7f8a74cb5cf67c1e54d956dd47a6eef28a905f24 Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Sun, 25 Oct 2026 15:20:16 +0100 Subject: [PATCH 42/57] Drop the type-only issubclass check in telemetry accounting _STORAGE_FEATURE is typed dict[type, FeatureName], so the lookup needs no runtime narrowing. --- reflex/utils/telemetry_accounting.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/reflex/utils/telemetry_accounting.py b/reflex/utils/telemetry_accounting.py index 6616122b7c1..617d5ecdcab 100644 --- a/reflex/utils/telemetry_accounting.py +++ b/reflex/utils/telemetry_accounting.py @@ -255,7 +255,7 @@ def _get_db_model_count() -> int: "redis": "state_manager_redis", } -_STORAGE_FEATURE: dict[type[ClientStorageBase], FeatureName] = { +_STORAGE_FEATURE: dict[type, FeatureName] = { Cookie: "cookie_count", LocalStorage: "local_storage_count", SessionStorage: "session_storage_count", @@ -337,7 +337,7 @@ def _storage_feature_for_field(field: Field) -> FeatureName | None: """ default = field.default if isinstance(default, ClientStorageBase): - cls: type[ClientStorageBase] = type(default) + cls: type = type(default) elif isinstance(field.type_, type) and issubclass(field.type_, ClientStorageBase): cls = field.type_ else: @@ -346,8 +346,6 @@ def _storage_feature_for_field(field: Field) -> FeatureName | None: if direct is not None: return direct for ancestor in cls.__mro__: - if not issubclass(ancestor, ClientStorageBase): - continue feature = _STORAGE_FEATURE.get(ancestor) if feature is not None: return feature From 7f246fcfc50f40bc239daf6b3ab7ef3e0f48ba18 Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Sun, 25 Oct 2026 15:29:19 +0100 Subject: [PATCH 43/57] Merge static dependencies that resolve to the same state A computed var whose deps hold both the current-state placeholder and its explicit full name, as add_dependency on its own state produces, kept only one of the two sets, so a dependency map rebuilt on reload stopped refreshing on the other. --- .../reflex-base/src/reflex_base/vars/base.py | 7 +++-- tests/units/test_state.py | 29 +++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/packages/reflex-base/src/reflex_base/vars/base.py b/packages/reflex-base/src/reflex_base/vars/base.py index df33d4f6720..78cebf6031b 100644 --- a/packages/reflex-base/src/reflex_base/vars/base.py +++ b/packages/reflex-base/src/reflex_base/vars/base.py @@ -3050,9 +3050,12 @@ def _deps( d: dict[str, set[str]] = {} if self._static_deps: - # None is a placeholder for the current state class. + # None is a placeholder for the current state class, which may + # also be named explicitly; merge both into one entry. for k, v in self._static_deps.items(): - d[k if k is not None else objclass.get_full_name()] = v + d.setdefault( + k if k is not None else objclass.get_full_name(), set() + ).update(v) if not self._auto_deps: return d diff --git a/tests/units/test_state.py b/tests/units/test_state.py index 15bcdd81c26..fe4ca48f6fb 100644 --- a/tests/units/test_state.py +++ b/tests/units/test_state.py @@ -6683,6 +6683,35 @@ async def fetch_data_state(self) -> None: await other_state.fetch_data_state() # Should not raise exception. +def test_add_dependency_on_own_state_keeps_declared_deps() -> None: + """A dependency added on the var's own state joins its declared deps.""" + + class OwnStateDepState(BaseState): + a: Field[int] = field(0) + b: Field[int] = field(0) + + @rx.var(deps=["a"], auto_deps=False) + def total(self) -> int: + return self.a + self.b + + cvar = OwnStateDepState.computed_vars["total"] + cvar.add_dependency(OwnStateDepState, OwnStateDepState.b) + assert cvar._deps(objclass=OwnStateDepState) == { + OwnStateDepState.get_full_name(): {"a", "b"} + } + + # A reload rebuilds the dependency map from _deps. + OwnStateDepState._var_dependencies = {} + OwnStateDepState._init_var_dependency_dicts() + state = OwnStateDepState() + assert state.total == 0 + state.dirty_vars.clear() + state.a = 1 + state._mark_dirty_computed_vars() + assert "total" in state.dirty_vars + assert state.total == 1 + + def test_override_base_method_skips_event_handler_wrapping(): """A method marked with __override_base_method__ should not be wrapped as an EventHandler.""" from reflex.state import _override_base_method From b2f584b0b76c9426c888d57cb00b617e18405ccf Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Sun, 25 Oct 2026 16:22:13 +0100 Subject: [PATCH 44/57] Floor reflex-components-core on the sonner with ToastProps defaults The connection toaster builds ToastProps with only some fields, which type-checks only against the sonner that gives the rest None defaults. --- packages/reflex-components-core/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/reflex-components-core/pyproject.toml b/packages/reflex-components-core/pyproject.toml index e2564258405..df934c0ffed 100644 --- a/packages/reflex-components-core/pyproject.toml +++ b/packages/reflex-components-core/pyproject.toml @@ -18,7 +18,7 @@ classifiers = [ dependencies = [ "reflex-base >= 0.10.1.dev0", "reflex-components-lucide >= 1.1.0", - "reflex-components-sonner >= 0.10.0", + "reflex-components-sonner >= 0.10.1.dev0", "python_multipart >= 0.0.21", "starlette >= 0.47.0", "typing_extensions >= 4.0.0", From 1c7f50153e7bd29f6513fd38b0fcb36ea0402cd9 Mon Sep 17 00:00:00 2001 From: Farhan Date: Thu, 19 Nov 2026 22:36:57 +0500 Subject: [PATCH 45/57] Fix min-deps failures, restore typed component fields, add news fragments - Cast redis srem the way the other redis calls in the file are cast, so the lock cleanup type-checks against the declared redis floor as well. - Type the alembic configure kwargs as Any; ty ignores the pyright comment. - Floor reflex-components-dataeditor on the reflex-base with the union passthrough_event_spec overloads. - Return FIELD_TYPE from the component field() again, so a default of the wrong type for a prop is a type error. - Declare ToOperation's fields and constructor for type checkers only instead of making the mixin a runtime dataclass. - Copy a mixin's computed var with a cast instead of skipping a non-function fget, and drop the unreachable branch in Match._validate_return_types. - Add news fragments for every package the migration touches. --- news/+ty-type-checker.misc.md | 1 + .../+own-state-added-dependency.bugfix.md | 1 + packages/reflex-base/news/+ty-typing.misc.md | 1 + .../src/reflex_base/components/component.py | 4 +-- .../reflex-base/src/reflex_base/vars/base.py | 32 ++++++++++++++----- .../news/+ty-type-checker.misc.md | 1 + .../news/+ty-type-checker.misc.md | 1 + .../news/+ty-type-checker.misc.md | 1 + .../src/reflex_components_core/core/match.py | 11 ++----- .../pyproject.toml | 2 +- .../news/+ty-type-checker.misc.md | 1 + .../news/+ty-type-checker.misc.md | 1 + .../news/+ty-type-checker.misc.md | 1 + .../news/+toast-props-defaults.bugfix.md | 1 + .../news/+ty-type-checker.misc.md | 1 + .../news/+ty-type-checker.misc.md | 1 + .../news/+ty-type-checker.misc.md | 1 + reflex/.templates/alembic/env.py | 4 +-- reflex/istate/manager/redis.py | 3 +- reflex/state.py | 6 ++-- tests/units/reflex_base/vars/test_base.py | 2 +- 21 files changed, 50 insertions(+), 27 deletions(-) create mode 100644 news/+ty-type-checker.misc.md create mode 100644 packages/reflex-base/news/+own-state-added-dependency.bugfix.md create mode 100644 packages/reflex-base/news/+ty-typing.misc.md create mode 100644 packages/reflex-build-sdk/news/+ty-type-checker.misc.md create mode 100644 packages/reflex-components-code/news/+ty-type-checker.misc.md create mode 100644 packages/reflex-components-core/news/+ty-type-checker.misc.md create mode 100644 packages/reflex-components-radix/news/+ty-type-checker.misc.md create mode 100644 packages/reflex-components-react-player/news/+ty-type-checker.misc.md create mode 100644 packages/reflex-components-recharts/news/+ty-type-checker.misc.md create mode 100644 packages/reflex-components-sonner/news/+toast-props-defaults.bugfix.md create mode 100644 packages/reflex-docgen/news/+ty-type-checker.misc.md create mode 100644 packages/reflex-hosting-cli/news/+ty-type-checker.misc.md create mode 100644 packages/reflex-workflow/news/+ty-type-checker.misc.md diff --git a/news/+ty-type-checker.misc.md b/news/+ty-type-checker.misc.md new file mode 100644 index 00000000000..ed2555e680c --- /dev/null +++ b/news/+ty-type-checker.misc.md @@ -0,0 +1 @@ +Check Reflex's type annotations with ty instead of pyright. No behavior change. diff --git a/packages/reflex-base/news/+own-state-added-dependency.bugfix.md b/packages/reflex-base/news/+own-state-added-dependency.bugfix.md new file mode 100644 index 00000000000..bdf1d429a71 --- /dev/null +++ b/packages/reflex-base/news/+own-state-added-dependency.bugfix.md @@ -0,0 +1 @@ +A computed var whose `deps` are declared keeps them when `add_dependency` adds a var of its own state, so it still recomputes on the declared vars after a hot reload. diff --git a/packages/reflex-base/news/+ty-typing.misc.md b/packages/reflex-base/news/+ty-typing.misc.md new file mode 100644 index 00000000000..d621f33ce78 --- /dev/null +++ b/packages/reflex-base/news/+ty-typing.misc.md @@ -0,0 +1 @@ +Under ty, a pydantic model field of a state, or a computed var that returns a model, now reads as `ObjectVar`, as it already did under pyright, and `passthrough_event_spec` accepts a union type such as `int | None`. Generated `.pyi` stubs keep the defaults of fields in dataclass-like classes such as `PropsBase`, so type checkers no longer treat those fields as required. diff --git a/packages/reflex-base/src/reflex_base/components/component.py b/packages/reflex-base/src/reflex_base/components/component.py index c2f68a9b5d0..54d48dbd68c 100644 --- a/packages/reflex-base/src/reflex_base/components/component.py +++ b/packages/reflex-base/src/reflex_base/components/component.py @@ -136,7 +136,7 @@ def field( default_factory: Callable[[], FIELD_TYPE] | None = None, is_javascript_property: bool | None = None, doc: str | None = None, -) -> Any: +) -> FIELD_TYPE: """Create a field for a component. Args: @@ -159,7 +159,7 @@ def field( default_factory=default_factory, is_javascript=is_javascript_property, doc=doc, - ) + ) # ty:ignore[invalid-return-type] def _field_values_equal(a: Any, b: Any) -> bool: diff --git a/packages/reflex-base/src/reflex_base/vars/base.py b/packages/reflex-base/src/reflex_base/vars/base.py index 3142cbb0f25..f6b63717e67 100644 --- a/packages/reflex-base/src/reflex_base/vars/base.py +++ b/packages/reflex-base/src/reflex_base/vars/base.py @@ -1746,17 +1746,33 @@ def __contains__(self, _: Any) -> Var: VAR_INSIDE = TypeVar("VAR_INSIDE") -@dataclasses.dataclass(eq=False, frozen=True) class ToOperation: """A var operation that converts a var to another type.""" - _js_expr: str = "" - _var_type: GenericType = Any - _var_data: VarData | None = None - _original: Var = dataclasses.field( - default_factory=lambda: Var(_js_expr="null", _var_type=None) - ) - _default_var_type: ClassVar[GenericType] = Any + if TYPE_CHECKING: + # The fields of the Var dataclass this mixin is combined with. + _js_expr: str + _var_type: GenericType + _var_data: VarData | None + _original: Var + _default_var_type: ClassVar[GenericType] + + def __init__( + self, + *, + _js_expr: str, + _var_type: GenericType, + _var_data: VarData | None, + _original: Var, + ) -> None: + """Initialize the cast var. + + Args: + _js_expr: The JavaScript expression, read from ``_original`` instead. + _var_type: The type the var is cast to. + _var_data: The var data added by the cast. + _original: The var being cast. + """ def __getattr__(self, name: str) -> Any: """Get an attribute of the var. diff --git a/packages/reflex-build-sdk/news/+ty-type-checker.misc.md b/packages/reflex-build-sdk/news/+ty-type-checker.misc.md new file mode 100644 index 00000000000..77765b9c7ee --- /dev/null +++ b/packages/reflex-build-sdk/news/+ty-type-checker.misc.md @@ -0,0 +1 @@ +Check the package's type annotations with ty instead of pyright. No behavior change. diff --git a/packages/reflex-components-code/news/+ty-type-checker.misc.md b/packages/reflex-components-code/news/+ty-type-checker.misc.md new file mode 100644 index 00000000000..77765b9c7ee --- /dev/null +++ b/packages/reflex-components-code/news/+ty-type-checker.misc.md @@ -0,0 +1 @@ +Check the package's type annotations with ty instead of pyright. No behavior change. diff --git a/packages/reflex-components-core/news/+ty-type-checker.misc.md b/packages/reflex-components-core/news/+ty-type-checker.misc.md new file mode 100644 index 00000000000..77765b9c7ee --- /dev/null +++ b/packages/reflex-components-core/news/+ty-type-checker.misc.md @@ -0,0 +1 @@ +Check the package's type annotations with ty instead of pyright. No behavior change. diff --git a/packages/reflex-components-core/src/reflex_components_core/core/match.py b/packages/reflex-components-core/src/reflex_components_core/core/match.py index 9f738865394..98c1dd8a097 100644 --- a/packages/reflex-components-core/src/reflex_components_core/core/match.py +++ b/packages/reflex-components-core/src/reflex_components_core/core/match.py @@ -212,14 +212,9 @@ def _validate_return_types( MatchTypeError: If the return types of cases are different. """ first_case_return = match_cases[0][-1] - return_type: type[Var] | type[BaseComponent] - if isinstance(first_case_return, BaseComponent): - return_type = BaseComponent - elif isinstance(first_case_return, Var): - return_type = Var - else: - msg = "Return value must be a var or component" - raise MatchTypeError(msg) + return_type = ( + BaseComponent if isinstance(first_case_return, BaseComponent) else Var + ) for index, case in enumerate(match_cases): return_value = case[-1] diff --git a/packages/reflex-components-dataeditor/pyproject.toml b/packages/reflex-components-dataeditor/pyproject.toml index 6239c6c4ea0..240f0adcf47 100644 --- a/packages/reflex-components-dataeditor/pyproject.toml +++ b/packages/reflex-components-dataeditor/pyproject.toml @@ -16,7 +16,7 @@ classifiers = [ "Programming Language :: Python :: 3.15", ] dependencies = [ - "reflex-base >= 0.10.1", + "reflex-base >= 0.11.1.dev0", "reflex-components-core >= 0.10.0", ] diff --git a/packages/reflex-components-radix/news/+ty-type-checker.misc.md b/packages/reflex-components-radix/news/+ty-type-checker.misc.md new file mode 100644 index 00000000000..77765b9c7ee --- /dev/null +++ b/packages/reflex-components-radix/news/+ty-type-checker.misc.md @@ -0,0 +1 @@ +Check the package's type annotations with ty instead of pyright. No behavior change. diff --git a/packages/reflex-components-react-player/news/+ty-type-checker.misc.md b/packages/reflex-components-react-player/news/+ty-type-checker.misc.md new file mode 100644 index 00000000000..77765b9c7ee --- /dev/null +++ b/packages/reflex-components-react-player/news/+ty-type-checker.misc.md @@ -0,0 +1 @@ +Check the package's type annotations with ty instead of pyright. No behavior change. diff --git a/packages/reflex-components-recharts/news/+ty-type-checker.misc.md b/packages/reflex-components-recharts/news/+ty-type-checker.misc.md new file mode 100644 index 00000000000..77765b9c7ee --- /dev/null +++ b/packages/reflex-components-recharts/news/+ty-type-checker.misc.md @@ -0,0 +1 @@ +Check the package's type annotations with ty instead of pyright. No behavior change. diff --git a/packages/reflex-components-sonner/news/+toast-props-defaults.bugfix.md b/packages/reflex-components-sonner/news/+toast-props-defaults.bugfix.md new file mode 100644 index 00000000000..057ad7118e2 --- /dev/null +++ b/packages/reflex-components-sonner/news/+toast-props-defaults.bugfix.md @@ -0,0 +1 @@ +Type checkers accept a `ToastProps` built with only some of its fields. diff --git a/packages/reflex-docgen/news/+ty-type-checker.misc.md b/packages/reflex-docgen/news/+ty-type-checker.misc.md new file mode 100644 index 00000000000..77765b9c7ee --- /dev/null +++ b/packages/reflex-docgen/news/+ty-type-checker.misc.md @@ -0,0 +1 @@ +Check the package's type annotations with ty instead of pyright. No behavior change. diff --git a/packages/reflex-hosting-cli/news/+ty-type-checker.misc.md b/packages/reflex-hosting-cli/news/+ty-type-checker.misc.md new file mode 100644 index 00000000000..77765b9c7ee --- /dev/null +++ b/packages/reflex-hosting-cli/news/+ty-type-checker.misc.md @@ -0,0 +1 @@ +Check the package's type annotations with ty instead of pyright. No behavior change. diff --git a/packages/reflex-workflow/news/+ty-type-checker.misc.md b/packages/reflex-workflow/news/+ty-type-checker.misc.md new file mode 100644 index 00000000000..77765b9c7ee --- /dev/null +++ b/packages/reflex-workflow/news/+ty-type-checker.misc.md @@ -0,0 +1 @@ +Check the package's type annotations with ty instead of pyright. No behavior change. diff --git a/reflex/.templates/alembic/env.py b/reflex/.templates/alembic/env.py index ec724b24437..646356f70de 100644 --- a/reflex/.templates/alembic/env.py +++ b/reflex/.templates/alembic/env.py @@ -12,7 +12,7 @@ import dataclasses import logging from logging.config import fileConfig -from typing import TYPE_CHECKING, Literal +from typing import TYPE_CHECKING, Any, Literal import sqlalchemy from alembic import command, context, util @@ -196,7 +196,7 @@ def render_item( return False -def configure(**kwargs: object) -> None: +def configure(**kwargs: Any) -> None: """Configure the migration context with the app's models and settings. Args: diff --git a/reflex/istate/manager/redis.py b/reflex/istate/manager/redis.py index bacaf945316..6528abf761a 100644 --- a/reflex/istate/manager/redis.py +++ b/reflex/istate/manager/redis.py @@ -1171,8 +1171,9 @@ async def _request_lock_release( # Waiters that leave while this one awaits count it as staying, so # deregister again once they are gone. A cancellation of this # cleanup leaves the registration to expire with its pexpire. + srem = cast("Callable[..., Awaitable[int]]", self.redis.srem) while self._n_lock_waiters(lock_key) <= 1: - await self.redis.srem(lock_key + b"_waiters", self._instance_id) + await srem(lock_key + b"_waiters", self._instance_id) if self._n_lock_waiters(lock_key) <= 1: break # A waiter that queued meanwhile may have registered before the SREM. diff --git a/reflex/state.py b/reflex/state.py index ba66eacb288..5844afb5791 100644 --- a/reflex/state.py +++ b/reflex/state.py @@ -972,14 +972,12 @@ def _bind_mixin_members(cls, explicit: bool) -> set[str]: if _inherited_value(cls.__mro__, name) is not value: continue if is_computed_var(value): - fget = value.fget - if not isinstance(fget, FunctionType): - continue _bind_attr( cls, name, value._replace( - fget=cls._copy_fn(fget), + # A computed var's fget is the decorated function. + fget=cls._copy_fn(cast("FunctionType", value.fget)), _var_data=VarData.from_state(cls), ), ) diff --git a/tests/units/reflex_base/vars/test_base.py b/tests/units/reflex_base/vars/test_base.py index 8d8b6a9a6f1..7bfdfe81f06 100644 --- a/tests/units/reflex_base/vars/test_base.py +++ b/tests/units/reflex_base/vars/test_base.py @@ -1083,7 +1083,7 @@ class AnnotatedState(AnnotatingMixin, OtherAnnotatingMixin, State): with pytest.raises(MixinVarNameConflictError) as err: class ClassVarState(AnnotatingMixin, OtherAnnotatingMixin, State): - shared: ClassVar[int] = 1 # ty:ignore[invalid-attribute-override] + shared: ClassVar[int] = 1 # pyright: ignore[reportIncompatibleVariableOverride] # ty:ignore[invalid-attribute-override] assert str(err.value) == _mixin_conflict_message( "shared", "ClassVarState", "AnnotatingMixin", "OtherAnnotatingMixin" From 60f96e0acc3bd2c5139bfffb24f86389cff78185 Mon Sep 17 00:00:00 2001 From: Farhan Date: Thu, 19 Nov 2026 22:42:30 +0500 Subject: [PATCH 46/57] Keep the workflow model's must-fail type checks enforced The calls in test_model.py that must fail type checking were held to that by pyright's unnecessary-ignore report, which no longer ran. ty catches only some of them: it does not compare an attribute retyped in a subclass, binds an unannotated self in a step to Unknown, and solves wait_for's contravariant workflow to an intersection. Report unused ty ignores in that file, put the pyright ignores back beside the ty ones, and run pyright over the file in pre-commit for the calls only it catches. --- .pre-commit-config.yaml | 10 ++++ pyproject.toml | 10 ++++ tests/units/reflex_workflow/test_model.py | 38 +++++++------- uv.lock | 61 ++++++++++++++--------- 4 files changed, 78 insertions(+), 41 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1fe5249378e..1763028b5a5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -84,6 +84,16 @@ repos: always_run: true pass_filenames: false require_serial: true + # The workflow calls that must fail type checking. ty misses some of them (an + # attribute retyped in a subclass, a step of another workflow), so pyright + # checks the file too and fails on an ignore that stops being used. + - id: pyright-workflow-model + name: pyright (workflow model typing) + entry: uv run --no-sync pyright tests/units/reflex_workflow/test_model.py + language: system + always_run: true + pass_filenames: false + require_serial: true - repo: https://github.com/biomejs/pre-commit rev: 19865851e014cbe6138e295365f95ca51bf953f8 # v0.6.1 hooks: diff --git a/pyproject.toml b/pyproject.toml index 9c3847c7f91..4f4ed86f9b8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -108,6 +108,7 @@ dev = [ "psutil", "psycopg[binary]", "pydantic", + "pyright", "pytest-asyncio", "pytest-benchmark", "pytest-codspeed", @@ -196,6 +197,14 @@ unsupported-base = "ignore" # every annotation to the `Annotated[...]` form. not-subscriptable = "ignore" +# The calls in this file must fail type checking; an ignore that stops being used +# means one of them type-checks now. +[[tool.ty.overrides]] +include = ["tests/units/reflex_workflow/test_model.py"] + +[tool.ty.overrides.rules] +unused-ignore-comment = "error" + [tool.ruff] target-version = "py311" output-format = "concise" @@ -483,6 +492,7 @@ backend_held = [ ] backend_pinned = [ # Linters are pinned deliberately and bumped on their own cadence. + "pyright", "ty", "ruff", ] diff --git a/tests/units/reflex_workflow/test_model.py b/tests/units/reflex_workflow/test_model.py index 7de0c25e07b..78470c12075 100644 --- a/tests/units/reflex_workflow/test_model.py +++ b/tests/units/reflex_workflow/test_model.py @@ -1,7 +1,9 @@ """Tests for reflex_workflow.model: typed steps and their runtime guards. -The ``pyright: ignore`` comments below mark calls that must fail type checking; with -unnecessary ignores reported, pyright fails if one of them stops being an error. +The ``pyright: ignore`` and ``ty: ignore`` comments below mark calls that must fail +type checking. Both checkers report an ignore that is no longer needed, so each fails +if one of those calls stops being an error. ty misses some of them, which carry only a +pyright ignore. """ # pyright: reportUnnecessaryTypeIgnoreComment=true @@ -192,18 +194,18 @@ def test_steps_defined_on_a_shared_base_belong_to_each_table(): def test_step_arguments_are_checked(): - Expense.decide("maybe") # ty:ignore[invalid-argument-type] - Expense.decide("approve", by=1) # ty:ignore[invalid-argument-type] - Expense.decide() # ty:ignore[missing-argument] - Expense.escalate("now") # ty:ignore[too-many-positional-arguments] + Expense.decide("maybe") # pyright: ignore[reportArgumentType] # ty:ignore[invalid-argument-type] + Expense.decide("approve", by=1) # pyright: ignore[reportArgumentType] # ty:ignore[invalid-argument-type] + Expense.decide() # pyright: ignore[reportCallIssue] # ty:ignore[missing-argument] + Expense.escalate("now") # pyright: ignore[reportCallIssue] # ty:ignore[too-many-positional-arguments] async def _never_called() -> None: """Hold calls that must not type-check; never run.""" - await Expense().start(Other.go()) # ty:ignore[invalid-argument-type] - await Expense().start(Expense.decide) # ty:ignore[invalid-argument-type] - await Expense.by(Expense.id == 1).run(Other.go()) # ty:ignore[invalid-argument-type] - await Expense.by(Expense.id == 1).deliver(Other.go()) # ty:ignore[invalid-argument-type] + await Expense().start(Other.go()) # pyright: ignore[reportArgumentType] # ty:ignore[invalid-argument-type] + await Expense().start(Expense.decide) # pyright: ignore[reportArgumentType] # ty:ignore[invalid-argument-type] + await Expense.by(Expense.id == 1).run(Other.go()) # pyright: ignore[reportArgumentType] # ty:ignore[invalid-argument-type] + await Expense.by(Expense.id == 1).deliver(Other.go()) # pyright: ignore[reportArgumentType] # ty:ignore[invalid-argument-type] # A step of a shared base is a step of every table that inherits it. await First().start(Shared.begin) await Second.by(Second.id == 1).run(Shared.begin()) @@ -221,7 +223,7 @@ def test_a_call_keeps_its_arguments_as_json(): def test_arguments_that_are_not_json_are_rejected(): - call = Expense.decide(datetime.date(2026, 1, 1)) # ty:ignore[invalid-argument-type] + call = Expense.decide(datetime.date(2026, 1, 1)) # pyright: ignore[reportArgumentType] # ty:ignore[invalid-argument-type] with pytest.raises(TypeError, match="JSON-serializable"): call.encode() @@ -231,7 +233,7 @@ def test_arguments_json_cannot_hold_are_rejected(value: object): if value == "circular": value = [] value.append(value) - call = Expense.decide(value) # ty:ignore[invalid-argument-type] + call = Expense.decide(value) # pyright: ignore[reportArgumentType] # ty:ignore[invalid-argument-type] with pytest.raises(TypeError, match="JSON-serializable"): call.encode() @@ -248,7 +250,7 @@ def test_a_bare_step_is_a_call_without_arguments(): def test_a_bare_step_that_needs_arguments_is_rejected(): with pytest.raises(TypeError, match="takes arguments"): - wake_in(Expense.decide, datetime.timedelta(days=1)) # ty:ignore[invalid-argument-type] + wake_in(Expense.decide, datetime.timedelta(days=1)) # pyright: ignore[reportArgumentType] # ty:ignore[invalid-argument-type] def test_another_workflows_step_is_rejected_at_runtime(): @@ -303,7 +305,7 @@ def test_a_limit_has_to_cap_something(): ) def test_a_limit_has_to_be_positive(caps: dict[str, object]): with pytest.raises(ValueError, match="must be positive"): - Limit(by="customer", **caps) # ty:ignore[invalid-argument-type] + Limit(by="customer", **caps) # pyright: ignore[reportArgumentType] # ty:ignore[invalid-argument-type] def test_a_rate_needs_the_period_it_is_counted_over(): @@ -319,7 +321,7 @@ async def test_a_rate_without_a_bucket_table_says_so(monkeypatch): spec = Metered.__workflow_limit__ assert spec is not None with pytest.raises(TypeError, match="rate bucket table must be mapped"): - await claim.take_tokens(None, Metered, spec, "stripe", 1) # ty:ignore[invalid-argument-type] + await claim.take_tokens(None, Metered, spec, "stripe", 1) # pyright: ignore[reportArgumentType] # ty:ignore[invalid-argument-type] def test_only_one_bucket_table_may_be_mapped(monkeypatch): @@ -340,9 +342,9 @@ def test_arguments_a_step_cannot_take_are_rejected_where_the_call_is_made(): # A webhook body that does not fit the step it addresses is refused while # there is still a caller to tell. with pytest.raises(TypeError, match="cannot take those arguments"): - check_call(Expense, Expense.decide(verdikt="approve")) # ty:ignore[missing-argument, unknown-argument] + check_call(Expense, Expense.decide(verdikt="approve")) # pyright: ignore[reportCallIssue] # ty:ignore[missing-argument, unknown-argument] with pytest.raises(TypeError, match="cannot take those arguments"): - check_call(Expense, Expense.decide("approve", "again")) # ty:ignore[too-many-positional-arguments] + check_call(Expense, Expense.decide("approve", "again")) # pyright: ignore[reportCallIssue] # ty:ignore[too-many-positional-arguments] check_call(Expense, Expense.decide("approve")) @@ -357,7 +359,7 @@ def engine_index(cls: type[Workflow], suffix: str) -> Index | None: The index, or None. """ name = f"ix_{cls.__tablename__}_{suffix}" - table = cls.__table__ # ty:ignore[unresolved-attribute] + table = cls.__table__ # pyright: ignore[reportAttributeAccessIssue] # ty:ignore[unresolved-attribute] return next((index for index in table.indexes if index.name == name), None) diff --git a/uv.lock b/uv.lock index 3b5ca276cb5..b204604c319 100644 --- a/uv.lock +++ b/uv.lock @@ -1,5 +1,5 @@ version = 1 -revision = 5 +revision = 3 requires-python = ">=3.11, <4.0" resolution-markers = [ "python_full_version >= '3.15' and sys_platform == 'win32'", @@ -24,29 +24,29 @@ exclude-newer = "0001-01-01T00:00:00Z" # This has no effect and is included for exclude-newer-span = "P7D" [options.exclude-newer-package] -certifi = "2026-10-21T00:00:00Z" +reflex-components-plotly = false +reflex-components-react-player = false +reflex-components-moment = false +reflex-components-sonner = false hatch-reflex-pyi = false pillow = "2026-10-21T00:00:00Z" +reflex-components-gridjs = false reflex = false -reflex-base = false -reflex-build-sdk = false +reflex-enterprise = false reflex-components-code = false +reflex-components-recharts = false reflex-components-core = false reflex-components-dataeditor = false -reflex-components-gridjs = false +ty = false +reflex-base = false +reflex-components-markdown = false +virtualenv = "2026-10-23T00:00:00Z" +reflex-build-sdk = false +certifi = "2026-10-21T00:00:00Z" reflex-components-internal = false reflex-components-lucide = false -reflex-components-markdown = false -reflex-components-moment = false -reflex-components-plotly = false reflex-components-radix = false -reflex-components-react-player = false -reflex-components-recharts = false -reflex-components-sonner = false -reflex-enterprise = false reflex-hosting-cli = false -ty = false -virtualenv = "2026-10-23T00:00:00Z" [manifest] members = [ @@ -791,7 +791,7 @@ resolution-markers = [ "python_full_version < '3.12' and sys_platform != 'emscripten' and sys_platform != 'win32'", ] dependencies = [ - { name = "numpy", version = "2.4.6", source = { registry = "https://pypi.org/simple" } }, + { name = "numpy", version = "2.4.6", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.12'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/58/01/1253e6698a07380cd31a736d248a3f2a50a7c88779a1813da27503cadc2a/contourpy-1.3.3.tar.gz", hash = "sha256:083e12155b210502d0bca491432bb04d56dc3432f95a979b429f2848c3dbe880", size = 13466174, upload-time = "2025-07-26T12:03:12.549Z" } wheels = [ @@ -887,7 +887,7 @@ resolution-markers = [ "python_full_version == '3.12.*' and sys_platform != 'emscripten' and sys_platform != 'win32'", ] dependencies = [ - { name = "numpy", version = "2.5.4", source = { registry = "https://pypi.org/simple" } }, + { name = "numpy", version = "2.5.4", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.12'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/83/5a/a55177dd22553a277388e8a1b3220e92de91bacb28356cdc73caa240121d/contourpy-1.4.0.tar.gz", hash = "sha256:20156f5a1ac4f8ce02656e39a61e82164a3d359796dc8026f75b062783d500e1", size = 13323726, upload-time = "2026-09-11T19:05:05.808Z" } wheels = [ @@ -1686,8 +1686,8 @@ name = "httpcore2" version = "2.13.1" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "h11" }, - { name = "truststore" }, + { name = "h11", marker = "sys_platform != 'emscripten'" }, + { name = "truststore", marker = "sys_platform != 'emscripten'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/cb/f3/1db7aa2bc2524062192bb0e0323969492d1883152a232fe36eea65f4e35c/httpcore2-2.13.1.tar.gz", hash = "sha256:e0aa977abe17e69a3b820a24542a6fa88702676d83880b8d194dcd18408e5103", size = 68071, upload-time = "2026-09-23T07:47:22.372Z" } wheels = [ @@ -3007,7 +3007,7 @@ name = "pexpect" version = "4.9.0" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "ptyprocess" }, + { name = "ptyprocess", marker = "sys_platform != 'emscripten' and sys_platform != 'win32'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/42/92/cc564bf6381ff43ce1f4d06852fc19a2f11d180f23dc32d9588bee2f149d/pexpect-4.9.0.tar.gz", hash = "sha256:ee7d41123f3c9911050ea2c2dac107568dc43b2d3b0c7557a33212c398ead30f", size = 166450, upload-time = "2023-11-25T09:07:26.339Z" } wheels = [ @@ -3666,7 +3666,7 @@ resolution-markers = [ "python_full_version < '3.12' and sys_platform != 'emscripten' and sys_platform != 'win32'", ] dependencies = [ - { name = "typing-extensions" }, + { name = "typing-extensions", marker = "python_full_version < '3.12'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/8b/04/e7c1fe4dc78a6fdbfd6c337b1c3732ff543b8a397683ab38378447baa331/pyee-13.0.1.tar.gz", hash = "sha256:0b931f7c14535667ed4c7e0d531716368715e860b988770fc7eb8578d1f67fc8", size = 31655, upload-time = "2026-02-14T21:12:28.044Z" } wheels = [ @@ -3692,7 +3692,7 @@ resolution-markers = [ "python_full_version == '3.12.*' and sys_platform != 'emscripten' and sys_platform != 'win32'", ] dependencies = [ - { name = "typing-extensions" }, + { name = "typing-extensions", marker = "python_full_version >= '3.12'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/1d/f1/fdedc2c75c3e31a330659c85e5793bb18b3397981fbf0844c6dee5b18926/pyee-14.0.0.tar.gz", hash = "sha256:76dd0f4314ecd27f02dc73589dea7fd3853f9b6176d8ef9b122860657e3602de", size = 98760, upload-time = "2026-08-13T04:26:11.021Z" } wheels = [ @@ -3717,6 +3717,19 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/38/bb/d215ee7c73b61497b28a5503f9f53523f294fcc936762b7caf90e0c1c2b5/pyparsing-3.3.3-py3-none-any.whl", hash = "sha256:ece8c00a69cf01b45d0b1dedabb469c90d8caf996d4fda40f147627a122849a4", size = 126420, upload-time = "2026-09-20T20:59:04.025Z" }, ] +[[package]] +name = "pyright" +version = "1.1.414" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "nodeenv" }, + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/e1/1b/244c7b710031ada80f27e579ec20d28a2285dfc318fed0339866b1047f12/pyright-1.1.414.tar.gz", hash = "sha256:523c0a97c60da6333234955c277730c9cf4f5bd6d5399e7b7d2b0fc5d3599524", size = 4154638, upload-time = "2026-09-10T12:26:53.181Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d7/ba/18b6e682ead424ad24bcc134339ae5d1b931cd9ae260540592a058a91279/pyright-1.1.414-py3-none-any.whl", hash = "sha256:2a6b4b3298c9eec174c5ed83bd338de6eee82df2992f3e1930e6199d381be36f", size = 6225049, upload-time = "2026-09-10T12:26:51.427Z" }, +] + [[package]] name = "pysocks" version = "1.7.1" @@ -4102,6 +4115,7 @@ dev = [ { name = "psutil" }, { name = "psycopg", extra = ["binary"] }, { name = "pydantic" }, + { name = "pyright" }, { name = "pytest" }, { name = "pytest-asyncio" }, { name = "pytest-benchmark" }, @@ -4198,6 +4212,7 @@ dev = [ { name = "psutil" }, { name = "psycopg", extras = ["binary"] }, { name = "pydantic" }, + { name = "pyright" }, { name = "pytest" }, { name = "pytest-asyncio" }, { name = "pytest-benchmark" }, @@ -4818,7 +4833,7 @@ resolution-markers = [ "python_full_version < '3.12' and sys_platform != 'emscripten' and sys_platform != 'win32'", ] dependencies = [ - { name = "numpy", version = "2.4.6", source = { registry = "https://pypi.org/simple" } }, + { name = "numpy", version = "2.4.6", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.12'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/7a/97/5a3609c4f8d58b039179648e62dd220f89864f56f7357f5d4f45c29eb2cc/scipy-1.17.1.tar.gz", hash = "sha256:95d8e012d8cb8816c226aef832200b1d45109ed4464303e997c5b13122b297c0", size = 30573822, upload-time = "2026-02-23T00:26:24.851Z" } wheels = [ @@ -4903,7 +4918,7 @@ resolution-markers = [ "python_full_version == '3.12.*' and sys_platform != 'emscripten' and sys_platform != 'win32'", ] dependencies = [ - { name = "numpy", version = "2.5.4", source = { registry = "https://pypi.org/simple" } }, + { name = "numpy", version = "2.5.4", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.12'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/7e/74/66de6258867beb2ef08f35f9f2ac017a52cacd5081714d239ff1a442d458/scipy-1.18.1.tar.gz", hash = "sha256:52c4b7422442aba924d03ad4019852b08a92e64ea187b933135687bfe2747307", size = 30781235, upload-time = "2026-08-21T23:28:50.599Z" } wheels = [ From 35a435a785af1b2667cc08f4122995c959bfcc02 Mon Sep 17 00:00:00 2001 From: Farhan Date: Thu, 19 Nov 2026 22:50:15 +0500 Subject: [PATCH 47/57] Drop the pyright hook for the workflow model's must-fail calls ty keeps the calls it catches failing through the unused-ignore rule on this file. The ones it misses (a column retyped in a subclass, astral-sh/ty#2158; a step or wait of another workflow) are rejected by the engine at runtime and covered by the tests of resolve and of the engine's columns, so no second type checker runs in CI. Their pyright ignores stay for anyone who runs pyright. --- .pre-commit-config.yaml | 10 ---- pyproject.toml | 2 - tests/units/reflex_workflow/test_model.py | 7 +-- uv.lock | 61 +++++++++-------------- 4 files changed, 27 insertions(+), 53 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1763028b5a5..1fe5249378e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -84,16 +84,6 @@ repos: always_run: true pass_filenames: false require_serial: true - # The workflow calls that must fail type checking. ty misses some of them (an - # attribute retyped in a subclass, a step of another workflow), so pyright - # checks the file too and fails on an ignore that stops being used. - - id: pyright-workflow-model - name: pyright (workflow model typing) - entry: uv run --no-sync pyright tests/units/reflex_workflow/test_model.py - language: system - always_run: true - pass_filenames: false - require_serial: true - repo: https://github.com/biomejs/pre-commit rev: 19865851e014cbe6138e295365f95ca51bf953f8 # v0.6.1 hooks: diff --git a/pyproject.toml b/pyproject.toml index 4f4ed86f9b8..e241a07b410 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -108,7 +108,6 @@ dev = [ "psutil", "psycopg[binary]", "pydantic", - "pyright", "pytest-asyncio", "pytest-benchmark", "pytest-codspeed", @@ -492,7 +491,6 @@ backend_held = [ ] backend_pinned = [ # Linters are pinned deliberately and bumped on their own cadence. - "pyright", "ty", "ruff", ] diff --git a/tests/units/reflex_workflow/test_model.py b/tests/units/reflex_workflow/test_model.py index 78470c12075..82abcf45459 100644 --- a/tests/units/reflex_workflow/test_model.py +++ b/tests/units/reflex_workflow/test_model.py @@ -1,9 +1,10 @@ """Tests for reflex_workflow.model: typed steps and their runtime guards. -The ``pyright: ignore`` and ``ty: ignore`` comments below mark calls that must fail +The ``ty: ignore`` and ``pyright: ignore`` comments below mark calls that must fail type checking. Both checkers report an ignore that is no longer needed, so each fails -if one of those calls stops being an error. ty misses some of them, which carry only a -pyright ignore. +if one of those calls stops being an error. A call with only a pyright ignore is one +ty does not catch yet; the engine rejects each of them at runtime, which the tests of +``resolve`` and of the engine's columns cover. """ # pyright: reportUnnecessaryTypeIgnoreComment=true diff --git a/uv.lock b/uv.lock index b204604c319..3b5ca276cb5 100644 --- a/uv.lock +++ b/uv.lock @@ -1,5 +1,5 @@ version = 1 -revision = 3 +revision = 5 requires-python = ">=3.11, <4.0" resolution-markers = [ "python_full_version >= '3.15' and sys_platform == 'win32'", @@ -24,29 +24,29 @@ exclude-newer = "0001-01-01T00:00:00Z" # This has no effect and is included for exclude-newer-span = "P7D" [options.exclude-newer-package] -reflex-components-plotly = false -reflex-components-react-player = false -reflex-components-moment = false -reflex-components-sonner = false +certifi = "2026-10-21T00:00:00Z" hatch-reflex-pyi = false pillow = "2026-10-21T00:00:00Z" -reflex-components-gridjs = false reflex = false -reflex-enterprise = false +reflex-base = false +reflex-build-sdk = false reflex-components-code = false -reflex-components-recharts = false reflex-components-core = false reflex-components-dataeditor = false -ty = false -reflex-base = false -reflex-components-markdown = false -virtualenv = "2026-10-23T00:00:00Z" -reflex-build-sdk = false -certifi = "2026-10-21T00:00:00Z" +reflex-components-gridjs = false reflex-components-internal = false reflex-components-lucide = false +reflex-components-markdown = false +reflex-components-moment = false +reflex-components-plotly = false reflex-components-radix = false +reflex-components-react-player = false +reflex-components-recharts = false +reflex-components-sonner = false +reflex-enterprise = false reflex-hosting-cli = false +ty = false +virtualenv = "2026-10-23T00:00:00Z" [manifest] members = [ @@ -791,7 +791,7 @@ resolution-markers = [ "python_full_version < '3.12' and sys_platform != 'emscripten' and sys_platform != 'win32'", ] dependencies = [ - { name = "numpy", version = "2.4.6", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.12'" }, + { name = "numpy", version = "2.4.6", source = { registry = "https://pypi.org/simple" } }, ] sdist = { url = "https://files.pythonhosted.org/packages/58/01/1253e6698a07380cd31a736d248a3f2a50a7c88779a1813da27503cadc2a/contourpy-1.3.3.tar.gz", hash = "sha256:083e12155b210502d0bca491432bb04d56dc3432f95a979b429f2848c3dbe880", size = 13466174, upload-time = "2025-07-26T12:03:12.549Z" } wheels = [ @@ -887,7 +887,7 @@ resolution-markers = [ "python_full_version == '3.12.*' and sys_platform != 'emscripten' and sys_platform != 'win32'", ] dependencies = [ - { name = "numpy", version = "2.5.4", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.12'" }, + { name = "numpy", version = "2.5.4", source = { registry = "https://pypi.org/simple" } }, ] sdist = { url = "https://files.pythonhosted.org/packages/83/5a/a55177dd22553a277388e8a1b3220e92de91bacb28356cdc73caa240121d/contourpy-1.4.0.tar.gz", hash = "sha256:20156f5a1ac4f8ce02656e39a61e82164a3d359796dc8026f75b062783d500e1", size = 13323726, upload-time = "2026-09-11T19:05:05.808Z" } wheels = [ @@ -1686,8 +1686,8 @@ name = "httpcore2" version = "2.13.1" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "h11", marker = "sys_platform != 'emscripten'" }, - { name = "truststore", marker = "sys_platform != 'emscripten'" }, + { name = "h11" }, + { name = "truststore" }, ] sdist = { url = "https://files.pythonhosted.org/packages/cb/f3/1db7aa2bc2524062192bb0e0323969492d1883152a232fe36eea65f4e35c/httpcore2-2.13.1.tar.gz", hash = "sha256:e0aa977abe17e69a3b820a24542a6fa88702676d83880b8d194dcd18408e5103", size = 68071, upload-time = "2026-09-23T07:47:22.372Z" } wheels = [ @@ -3007,7 +3007,7 @@ name = "pexpect" version = "4.9.0" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "ptyprocess", marker = "sys_platform != 'emscripten' and sys_platform != 'win32'" }, + { name = "ptyprocess" }, ] sdist = { url = "https://files.pythonhosted.org/packages/42/92/cc564bf6381ff43ce1f4d06852fc19a2f11d180f23dc32d9588bee2f149d/pexpect-4.9.0.tar.gz", hash = "sha256:ee7d41123f3c9911050ea2c2dac107568dc43b2d3b0c7557a33212c398ead30f", size = 166450, upload-time = "2023-11-25T09:07:26.339Z" } wheels = [ @@ -3666,7 +3666,7 @@ resolution-markers = [ "python_full_version < '3.12' and sys_platform != 'emscripten' and sys_platform != 'win32'", ] dependencies = [ - { name = "typing-extensions", marker = "python_full_version < '3.12'" }, + { name = "typing-extensions" }, ] sdist = { url = "https://files.pythonhosted.org/packages/8b/04/e7c1fe4dc78a6fdbfd6c337b1c3732ff543b8a397683ab38378447baa331/pyee-13.0.1.tar.gz", hash = "sha256:0b931f7c14535667ed4c7e0d531716368715e860b988770fc7eb8578d1f67fc8", size = 31655, upload-time = "2026-02-14T21:12:28.044Z" } wheels = [ @@ -3692,7 +3692,7 @@ resolution-markers = [ "python_full_version == '3.12.*' and sys_platform != 'emscripten' and sys_platform != 'win32'", ] dependencies = [ - { name = "typing-extensions", marker = "python_full_version >= '3.12'" }, + { name = "typing-extensions" }, ] sdist = { url = "https://files.pythonhosted.org/packages/1d/f1/fdedc2c75c3e31a330659c85e5793bb18b3397981fbf0844c6dee5b18926/pyee-14.0.0.tar.gz", hash = "sha256:76dd0f4314ecd27f02dc73589dea7fd3853f9b6176d8ef9b122860657e3602de", size = 98760, upload-time = "2026-08-13T04:26:11.021Z" } wheels = [ @@ -3717,19 +3717,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/38/bb/d215ee7c73b61497b28a5503f9f53523f294fcc936762b7caf90e0c1c2b5/pyparsing-3.3.3-py3-none-any.whl", hash = "sha256:ece8c00a69cf01b45d0b1dedabb469c90d8caf996d4fda40f147627a122849a4", size = 126420, upload-time = "2026-09-20T20:59:04.025Z" }, ] -[[package]] -name = "pyright" -version = "1.1.414" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "nodeenv" }, - { name = "typing-extensions" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/e1/1b/244c7b710031ada80f27e579ec20d28a2285dfc318fed0339866b1047f12/pyright-1.1.414.tar.gz", hash = "sha256:523c0a97c60da6333234955c277730c9cf4f5bd6d5399e7b7d2b0fc5d3599524", size = 4154638, upload-time = "2026-09-10T12:26:53.181Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/d7/ba/18b6e682ead424ad24bcc134339ae5d1b931cd9ae260540592a058a91279/pyright-1.1.414-py3-none-any.whl", hash = "sha256:2a6b4b3298c9eec174c5ed83bd338de6eee82df2992f3e1930e6199d381be36f", size = 6225049, upload-time = "2026-09-10T12:26:51.427Z" }, -] - [[package]] name = "pysocks" version = "1.7.1" @@ -4115,7 +4102,6 @@ dev = [ { name = "psutil" }, { name = "psycopg", extra = ["binary"] }, { name = "pydantic" }, - { name = "pyright" }, { name = "pytest" }, { name = "pytest-asyncio" }, { name = "pytest-benchmark" }, @@ -4212,7 +4198,6 @@ dev = [ { name = "psutil" }, { name = "psycopg", extras = ["binary"] }, { name = "pydantic" }, - { name = "pyright" }, { name = "pytest" }, { name = "pytest-asyncio" }, { name = "pytest-benchmark" }, @@ -4833,7 +4818,7 @@ resolution-markers = [ "python_full_version < '3.12' and sys_platform != 'emscripten' and sys_platform != 'win32'", ] dependencies = [ - { name = "numpy", version = "2.4.6", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.12'" }, + { name = "numpy", version = "2.4.6", source = { registry = "https://pypi.org/simple" } }, ] sdist = { url = "https://files.pythonhosted.org/packages/7a/97/5a3609c4f8d58b039179648e62dd220f89864f56f7357f5d4f45c29eb2cc/scipy-1.17.1.tar.gz", hash = "sha256:95d8e012d8cb8816c226aef832200b1d45109ed4464303e997c5b13122b297c0", size = 30573822, upload-time = "2026-02-23T00:26:24.851Z" } wheels = [ @@ -4918,7 +4903,7 @@ resolution-markers = [ "python_full_version == '3.12.*' and sys_platform != 'emscripten' and sys_platform != 'win32'", ] dependencies = [ - { name = "numpy", version = "2.5.4", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.12'" }, + { name = "numpy", version = "2.5.4", source = { registry = "https://pypi.org/simple" } }, ] sdist = { url = "https://files.pythonhosted.org/packages/7e/74/66de6258867beb2ef08f35f9f2ac017a52cacd5081714d239ff1a442d458/scipy-1.18.1.tar.gz", hash = "sha256:52c4b7422442aba924d03ad4019852b08a92e64ea187b933135687bfe2747307", size = 30781235, upload-time = "2026-08-21T23:28:50.599Z" } wheels = [ From 0b07e098afb963ae79ea8def0089d9c6c328dcae Mon Sep 17 00:00:00 2001 From: Farhan Date: Thu, 19 Nov 2026 22:58:03 +0500 Subject: [PATCH 48/57] Check the step that returns a number with ty too ty infers no return type for an unannotated function, so the step returning a number was a check of pyright's inference only. Annotated, it checks the type of step itself, and both checkers reject it. Say why the remaining pyright-only calls are: a step or wait mixing two workflows is well-typed under the contravariant workflow parameter, and the redeclared columns need a ty with attribute override checks. --- tests/units/reflex_workflow/test_model.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tests/units/reflex_workflow/test_model.py b/tests/units/reflex_workflow/test_model.py index 82abcf45459..7008b1bff31 100644 --- a/tests/units/reflex_workflow/test_model.py +++ b/tests/units/reflex_workflow/test_model.py @@ -2,9 +2,14 @@ The ``ty: ignore`` and ``pyright: ignore`` comments below mark calls that must fail type checking. Both checkers report an ignore that is no longer needed, so each fails -if one of those calls stops being an error. A call with only a pyright ignore is one -ty does not catch yet; the engine rejects each of them at runtime, which the tests of -``resolve`` and of the engine's columns cover. +if one of those calls stops being an error. + +A few carry only a pyright ignore. A step or wait that mixes two workflows is +well-typed for a class inheriting both, since a workflow's type parameter is +contravariant so that steps of a shared base serve every table; ty accepts it, and +the tests of ``resolve`` reject it at runtime. The redeclared engine columns need a +ty with attribute override checks (0.0.90 or later); the tests of the engine's +columns reject them at runtime. """ # pyright: reportUnnecessaryTypeIgnoreComment=true @@ -111,8 +116,8 @@ class Mistaken(Base, Workflow): id: Mapped[int] = mapped_column(primary_key=True) - @step # pyright: ignore[reportArgumentType] - async def returns_a_number(self): + @step # pyright: ignore[reportArgumentType] # ty:ignore[invalid-argument-type] + async def returns_a_number(self) -> int: """Return a value that is not a transition. Returns: From 6a8ba658c06a596ef9464f2d462394dde772bd9c Mon Sep 17 00:00:00 2001 From: Farhan Date: Thu, 19 Nov 2026 23:45:37 +0500 Subject: [PATCH 49/57] Upgrade ty to 0.0.107 - Rename the rules ty renamed, in the config and in ignore comments, and drop the ignores ty no longer needs. - Spell the event triggers of the bundled components Annotated[EventHandler, spec], the object EventHandler[spec] already evaluates to: ty rejects subscripting a class that is not generic in a type expression (astral-sh/ty#3388). Tests keep the public EventHandler[spec] spelling, with an ignore, as do the pyi generator's fixtures. This lets the repo drop its global not-subscriptable and unsupported-base ignores. - Put HybridProperty.var's callable overload first: ty reads a @classmethod in a class body as a function, and solved the classmethod overload to Unknown. The staticmethod overload is covered by the callable one. - Annotate generator-based context managers as Generator/AsyncGenerator, which typeshed now asks for. - Fix the overrides ty now checks where the fix is local: plotly tags assigned like every other component's, Element.__eq__ named like its base, the model config built as SQLModelConfig. Ignore the rest precisely. - ty now checks attribute overrides, so the workflow model's redeclared engine columns are ty ignores too, kept failing by the unused-ignore rule. - ty fails on warnings now; drop a hosting CLI guard that was always true. --- examples/playground/.content-hash | 2 +- examples/playground/playground/models.py | 2 +- examples/playground/playground/pages/item.py | 2 +- examples/playground/playground/states/data.py | 2 +- .../src/reflex_base/client_state.py | 4 +- .../src/reflex_base/components/component.py | 4 +- .../src/reflex_base/components/field.py | 2 +- .../src/reflex_base/components/props.py | 2 +- .../reflex-base/src/reflex_base/config.py | 4 +- .../src/reflex_base/event/__init__.py | 8 +- .../event/processor/event_processor.py | 6 +- packages/reflex-base/src/reflex_base/otel.py | 4 +- .../src/reflex_base/utils/decorator.py | 2 +- .../reflex-base/src/reflex_base/utils/form.py | 4 +- .../src/reflex_base/utils/format.py | 4 +- .../reflex-base/src/reflex_base/utils/log.py | 4 +- .../src/reflex_base/utils/pyi_generator.py | 4 +- .../src/reflex_base/utils/serializers.py | 4 +- .../src/reflex_base/utils/types.py | 19 ++-- .../reflex-base/src/reflex_base/vars/base.py | 18 ++-- .../reflex-base/src/reflex_base/vars/color.py | 2 +- .../src/reflex_base/vars/dep_tracking.py | 4 +- .../src/reflex_base/vars/function.py | 4 +- .../src/reflex_base/vars/hybrid_property.py | 11 +- .../src/reflex_base/vars/number.py | 2 +- .../src/reflex_base/vars/object.py | 4 +- .../src/reflex_base/vars/sequence.py | 20 ++-- .../reflex-base/src/reflex_base/vars/set.py | 10 +- .../src/reflex_bench/drivers/browser.py | 2 +- .../src/reflex_bench/drivers/echo_server.py | 4 +- .../src/reflex_bench/drivers/events.py | 4 +- .../src/reflex_bench/scheduler.py | 4 +- .../reflex-bench/src/reflex_bench/subjects.py | 6 +- .../shiki_code_block.py | 2 +- .../base/error_boundary.py | 4 +- .../reflex_components_core/core/clipboard.py | 7 +- .../reflex_components_core/core/debounce.py | 8 +- .../reflex_components_core/core/foreach.py | 2 +- .../src/reflex_components_core/core/match.py | 2 +- .../src/reflex_components_core/core/upload.py | 10 +- .../core/window_events.py | 20 ++-- .../src/reflex_components_core/el/element.py | 6 +- .../el/elements/forms.py | 74 ++++++++----- .../dataeditor.py | 90 ++++++++-------- .../components/base/accordion.py | 6 +- .../components/base/avatar.py | 4 +- .../components/base/checkbox.py | 6 +- .../components/base/collapsible.py | 4 +- .../components/base/context_menu.py | 14 +-- .../components/base/dialog.py | 6 +- .../components/base/drawer.py | 10 +- .../components/base/input.py | 8 +- .../components/base/menu.py | 20 ++-- .../components/base/navigation_menu.py | 6 +- .../components/base/number_field.py | 10 +- .../components/base/otp_field.py | 8 +- .../components/base/popover.py | 6 +- .../components/base/preview_card.py | 6 +- .../components/base/select.py | 8 +- .../components/base/slider.py | 6 +- .../components/base/switch.py | 4 +- .../components/base/tabs.py | 4 +- .../components/base/toggle.py | 4 +- .../components/base/toggle_group.py | 6 +- .../components/base/tooltip.py | 6 +- .../src/reflex_components_moment/moment.py | 4 +- .../src/reflex_components_plotly/plotly.py | 74 ++++++------- .../primitives/accordion.py | 4 +- .../primitives/dialog.py | 14 +-- .../primitives/drawer.py | 16 +-- .../primitives/form.py | 4 +- .../primitives/slider.py | 10 +- .../themes/components/alert_dialog.py | 10 +- .../themes/components/checkbox.py | 6 +- .../themes/components/checkbox_cards.py | 4 +- .../themes/components/checkbox_group.py | 4 +- .../themes/components/context_menu.py | 30 +++--- .../themes/components/dialog.py | 14 +-- .../themes/components/dropdown_menu.py | 26 ++--- .../themes/components/hover_card.py | 4 +- .../themes/components/popover.py | 16 +-- .../themes/components/radio_cards.py | 4 +- .../themes/components/radio_group.py | 4 +- .../themes/components/segmented_control.py | 4 +- .../themes/components/select.py | 12 +-- .../themes/components/slider.py | 6 +- .../themes/components/switch.py | 4 +- .../themes/components/tabs.py | 4 +- .../themes/components/text_field.py | 14 +-- .../themes/components/tooltip.py | 8 +- .../react_player.py | 36 +++---- .../reflex_components_recharts/cartesian.py | 88 +++++++-------- .../src/reflex_components_recharts/charts.py | 21 ++-- .../src/reflex_components_recharts/general.py | 20 ++-- .../src/reflex_components_recharts/polar.py | 18 ++-- .../src/reflex_cli/utils/hosting.py | 6 +- .../src/reflex_cli/v2/cli.py | 13 +-- packages/reflex-workflow/benchmarks/bench.py | 7 +- .../src/reflex_workflow/engine/runner.py | 6 +- .../src/reflex_workflow/model.py | 2 +- pyproject.toml | 10 +- reflex/app.py | 12 +-- reflex/compiler/utils.py | 4 +- reflex/istate/delta.py | 4 +- reflex/istate/manager/__init__.py | 6 +- reflex/istate/manager/disk.py | 8 +- reflex/istate/manager/redis.py | 20 ++-- reflex/istate/proxy.py | 10 +- reflex/istate/shared.py | 4 +- reflex/model.py | 10 +- reflex/state.py | 4 +- reflex/testing.py | 2 +- reflex/utils/exec.py | 4 +- reflex/utils/export.py | 4 +- reflex/utils/path_ops.py | 4 +- tests/benchmarks/support/redis.py | 4 +- tests/benchmarks/support/states.py | 10 +- tests/benchmarks/test_event_processing.py | 4 +- tests/benchmarks/test_routes.py | 2 +- tests/benchmarks/test_shared_state.py | 4 +- tests/benchmarks/test_state_manager.py | 4 +- .../tests_playwright/test_background_task.py | 2 +- .../tests_playwright/test_component_state.py | 2 +- .../test_connection_banner.py | 4 +- .../tests_playwright/test_dynamic_routes.py | 16 +-- .../tests_playwright/test_frontend_path.py | 4 +- .../tests_playwright/test_linked_state.py | 6 +- .../integration/tests_playwright/test_memo.py | 6 +- .../test_unicode_string_operations.py | 10 +- tests/performance/test_event_loop.py | 4 +- tests/performance/test_session_memory.py | 4 +- tests/units/compiler/test_compiler.py | 20 ++-- tests/units/compiler/test_memoize_plugin.py | 2 +- tests/units/components/core/test_colors.py | 2 +- tests/units/components/core/test_cond.py | 4 +- tests/units/components/core/test_html.py | 4 +- .../units/components/datadisplay/test_code.py | 6 +- .../components/datadisplay/test_datatable.py | 8 +- .../components/datadisplay/test_shiki_code.py | 10 +- tests/units/components/forms/test_form.py | 4 +- tests/units/components/media/test_image.py | 2 +- tests/units/components/test_component.py | 10 +- .../test_component_future_annotations.py | 8 +- tests/units/components/test_memo.py | 16 +-- tests/units/components/test_props.py | 4 +- .../components/typography/test_markdown.py | 2 +- tests/units/conftest.py | 6 +- .../units/docgen/test_class_and_component.py | 2 +- tests/units/istate/manager/test_redis.py | 8 +- tests/units/istate/test_proxy.py | 10 +- tests/units/istate/test_shared.py | 4 +- .../processor/test_base_state_processor.py | 10 +- .../event/processor/test_event_processor.py | 22 ++-- tests/units/reflex_base/event/test_init.py | 4 +- tests/units/reflex_base/test_client_state.py | 6 +- .../dataset/classvar_and_private.py | 2 +- .../pyi_generator/dataset/inheritance.py | 2 +- .../dataset/string_event_annotations.py | 6 +- .../dataset/typed_event_handlers.py | 10 +- .../utils/pyi_generator/dataset/var_types.py | 2 +- tests/units/reflex_base/utils/test_log.py | 12 +-- tests/units/reflex_base/vars/test_base.py | 64 +++++------ tests/units/reflex_base/vars/test_set.py | 24 ++--- .../reflex_bench/drivers/test_app_process.py | 2 +- .../units/reflex_bench/drivers/test_events.py | 4 +- .../reflex_bench/fixtures/test_generate.py | 6 +- .../fixtures/test_playground_app.py | 4 +- tests/units/reflex_bench/suites/test_wire.py | 8 +- tests/units/reflex_bench/test_registry.py | 2 +- tests/units/reflex_bench/test_schema.py | 6 +- tests/units/reflex_bench/test_stats.py | 2 +- tests/units/reflex_build_sdk/test_types.py | 2 +- tests/units/reflex_cli/utils/test_log.py | 16 +-- tests/units/reflex_cli/v2/test_apps.py | 2 +- tests/units/reflex_cli/v2/test_auth.py | 2 +- tests/units/reflex_cli/v2/test_gcp.py | 2 +- tests/units/reflex_cli/v2/test_project.py | 2 +- tests/units/reflex_cli/v2/test_scan.py | 2 +- tests/units/reflex_cli/v2/test_secrets.py | 2 +- .../reflex_cli/v2/test_vmtypes_regions.py | 2 +- .../reflex_workflow/engine/test_runner.py | 4 +- tests/units/reflex_workflow/test_dataclass.py | 2 +- tests/units/reflex_workflow/test_model.py | 16 ++- tests/units/test_app.py | 10 +- tests/units/test_config.py | 2 +- tests/units/test_event.py | 4 +- tests/units/test_mock_redis.py | 2 +- tests/units/test_page.py | 2 +- tests/units/test_state.py | 100 +++++++++--------- tests/units/test_var.py | 2 +- tests/units/utils/test_exec.py | 6 +- tests/units/utils/test_token_manager.py | 4 +- tests/units/vars/test_dep_tracking.py | 2 +- tests/units/vars/test_hybrid_property.py | 16 +-- uv.lock | 88 +++++++-------- 195 files changed, 965 insertions(+), 921 deletions(-) diff --git a/examples/playground/.content-hash b/examples/playground/.content-hash index f1d72ed8042..34288619bc8 100644 --- a/examples/playground/.content-hash +++ b/examples/playground/.content-hash @@ -1 +1 @@ -sha256:651c89480e23f669f2388196cf4bac2397fff2e8363a1cd1544e25e07a53a030 +sha256:9218b355ed14e126a15d4b9cb3d4c1c0e79195d39463b72a7c970f43af6f7731 diff --git a/examples/playground/playground/models.py b/examples/playground/playground/models.py index 5906059eaf0..aa7aa9960e0 100644 --- a/examples/playground/playground/models.py +++ b/examples/playground/playground/models.py @@ -31,7 +31,7 @@ def seed_database(): """ with rx.session() as session: connection = session.connection() - product_table = Product.__table__ # ty:ignore[unresolved-attribute] + product_table = Product.__table__ # ty:ignore[missing-attribute] connection.execute(CreateTable(product_table, if_not_exists=True)) table = Product.__tablename__ if connection.exec_driver_sql(f"SELECT 1 FROM {table} LIMIT 1").first(): diff --git a/examples/playground/playground/pages/item.py b/examples/playground/playground/pages/item.py index 5ad74e8689c..a141727ab67 100644 --- a/examples/playground/playground/pages/item.py +++ b/examples/playground/playground/pages/item.py @@ -15,6 +15,6 @@ def item() -> rx.Component: rx.vstack( rx.heading("Item"), # Dynamic route arguments are vars of the root state. - rx.text("item_id: ", rx.code(rx.State.item_id, id="item-id")), # ty:ignore[unresolved-attribute] + rx.text("item_id: ", rx.code(rx.State.item_id, id="item-id")), # ty:ignore[missing-attribute] ) ) diff --git a/examples/playground/playground/states/data.py b/examples/playground/playground/states/data.py index 086baee56ec..14156daaa63 100644 --- a/examples/playground/playground/states/data.py +++ b/examples/playground/playground/states/data.py @@ -60,7 +60,7 @@ def _query(self): """Query the current page of the filtered, sorted products.""" statement = Product.select() if self.query: - statement = statement.where(Product.name.contains(self.query)) # ty:ignore[unresolved-attribute] + statement = statement.where(Product.name.contains(self.query)) # ty:ignore[missing-attribute] if self.category != "all": statement = statement.where(Product.category == self.category) column = getattr(Product, self.sort_by) diff --git a/packages/reflex-base/src/reflex_base/client_state.py b/packages/reflex-base/src/reflex_base/client_state.py index bca406a6e9f..be2717b023d 100644 --- a/packages/reflex-base/src/reflex_base/client_state.py +++ b/packages/reflex-base/src/reflex_base/client_state.py @@ -9,7 +9,7 @@ import json import re import sys -from collections.abc import Callable, Iterable, Iterator +from collections.abc import Callable, Generator, Iterable from contextvars import ContextVar from typing import TYPE_CHECKING, Any @@ -222,7 +222,7 @@ def _check_declarations(hooks: Iterable[str]) -> None: @contextlib.contextmanager -def _collect_declarations() -> Iterator[None]: +def _collect_declarations() -> Generator[None, None, None]: """Compare client state declarations across every body rendered inside. A fresh record per compile, so a declaration edited before a hot reload diff --git a/packages/reflex-base/src/reflex_base/components/component.py b/packages/reflex-base/src/reflex_base/components/component.py index 54d48dbd68c..f0714fa532e 100644 --- a/packages/reflex-base/src/reflex_base/components/component.py +++ b/packages/reflex-base/src/reflex_base/components/component.py @@ -159,7 +159,7 @@ def field( default_factory=default_factory, is_javascript=is_javascript_property, doc=doc, - ) # ty:ignore[invalid-return-type] + ) # ty:ignore[invalid-explicit-return] def _field_values_equal(a: Any, b: Any) -> bool: @@ -2441,7 +2441,7 @@ def _cached_var_name(self) -> str: return str(render_dict_to_var(self._var_value.render())) @cached_property_no_lock - def _cached_get_all_var_data(self) -> VarData | None: + def _cached_get_all_var_data(self) -> VarData | None: # ty:ignore[incompatible-attribute-override] """Get the VarData for the var. Returns: diff --git a/packages/reflex-base/src/reflex_base/components/field.py b/packages/reflex-base/src/reflex_base/components/field.py index 7069c4db8f3..02e8f026ecd 100644 --- a/packages/reflex-base/src/reflex_base/components/field.py +++ b/packages/reflex-base/src/reflex_base/components/field.py @@ -38,7 +38,7 @@ def __init__( # Process type annotation type_origin = get_origin(annotated_type) or annotated_type if type_origin is Annotated: - type_origin = annotated_type.__origin__ # ty:ignore[unresolved-attribute] + type_origin = annotated_type.__origin__ # ty:ignore[missing-union-attribute] # For Annotated types, use the actual type inside the annotation self.type_ = annotated_type else: diff --git a/packages/reflex-base/src/reflex_base/components/props.py b/packages/reflex-base/src/reflex_base/components/props.py index 13b33bc84e9..051cb747278 100644 --- a/packages/reflex-base/src/reflex_base/components/props.py +++ b/packages/reflex-base/src/reflex_base/components/props.py @@ -164,7 +164,7 @@ def props_field( default=default, default_factory=default_factory, annotated_type=MISSING, - ) # ty:ignore[invalid-return-type] + ) # ty:ignore[invalid-explicit-return] @dataclass_transform(field_specifiers=(props_field,)) diff --git a/packages/reflex-base/src/reflex_base/config.py b/packages/reflex-base/src/reflex_base/config.py index bdd66072f6d..3ad0c1b3f9d 100644 --- a/packages/reflex-base/src/reflex_base/config.py +++ b/packages/reflex-base/src/reflex_base/config.py @@ -8,7 +8,7 @@ import sys import threading import urllib.parse -from collections.abc import Iterable, Iterator, Sequence +from collections.abc import Generator, Iterable, Sequence from contextlib import contextmanager from contextvars import ContextVar from importlib.machinery import PathFinder @@ -976,7 +976,7 @@ def _project_local_modules(names: Iterable[str], project_root: Path) -> set[str] @contextmanager -def _record_imports() -> Iterator[_ImportRecorder]: +def _record_imports() -> Generator[_ImportRecorder, None, None]: """Record imports made on the current thread while rxconfig loads. Yields: diff --git a/packages/reflex-base/src/reflex_base/event/__init__.py b/packages/reflex-base/src/reflex_base/event/__init__.py index f10385da92c..8f57ebd4286 100644 --- a/packages/reflex-base/src/reflex_base/event/__init__.py +++ b/packages/reflex-base/src/reflex_base/event/__init__.py @@ -3739,7 +3739,7 @@ def wrapper(func: Callable[..., Any]) -> EventCallback: deprecation_version="0.11.0", removal_version="1.0", ) - return func # ty:ignore[invalid-return-type] + return func # ty:ignore[invalid-explicit-return] # A repeated @rx.event decorates the same function again: the # markers accumulate on it and these options win where both set one. inner_actions: Mapping[str, Any] = {} @@ -3808,7 +3808,7 @@ def wrapper(func: Callable[..., Any]) -> EventCallback: deprecation_version="0.11.0", removal_version="1.0", ) - return func # ty:ignore[invalid-return-type] + return func # ty:ignore[invalid-explicit-return] if registered: # Already renamed: re-register it under the same name. name = qualname @@ -3826,11 +3826,11 @@ def wrapper(func: Callable[..., Any]) -> EventCallback: # A method: bound to its state class by __set_name__ when the # class body is executed. - return EventHandler(fn=func, event_actions=event_actions) # ty:ignore[invalid-return-type] + return EventHandler(fn=func, event_actions=event_actions) # ty:ignore[invalid-explicit-return] if func is not None: return wrapper(func) - return wrapper # ty:ignore[invalid-return-type] + return wrapper get_event = staticmethod(get_event) get_hydrate_event = staticmethod(get_hydrate_event) diff --git a/packages/reflex-base/src/reflex_base/event/processor/event_processor.py b/packages/reflex-base/src/reflex_base/event/processor/event_processor.py index 69d5fd10862..21504472bc4 100644 --- a/packages/reflex-base/src/reflex_base/event/processor/event_processor.py +++ b/packages/reflex-base/src/reflex_base/event/processor/event_processor.py @@ -827,7 +827,7 @@ def _create_event_task( else: task = asyncio.create_task(coro, name=name) if sys.version_info < (3, 12): - task._event_ctx = entry.ctx # ty:ignore[unresolved-attribute] + task._event_ctx = entry.ctx # ty:ignore[missing-attribute] self._tasks[entry.ctx.txid] = task task.add_done_callback(self._finish_task) return task @@ -966,7 +966,7 @@ def _finish_task(self, task: asyncio.Task): """ if sys.version_info < (3, 12): # py3.11 compat - task_ctx = task._event_ctx # ty:ignore[unresolved-attribute] + task_ctx = task._event_ctx # ty:ignore[missing-attribute] else: task_ctx = task.get_context().run(EventContext.get) self._tasks.pop(task_ctx.txid, None) @@ -1025,7 +1025,7 @@ def _resolve_future( name=f"reflex_backend_exception_handler|task=[{task.get_name()}]|{time.time()}", ) if sys.version_info < (3, 12): - t._event_ctx = task_ctx # ty:ignore[unresolved-attribute] + t._event_ctx = task_ctx # ty:ignore[missing-attribute] t.add_done_callback(self._finish_task) return True logger.exception(f"Error in {task.get_name()} [txid={task_ctx.txid}]:") diff --git a/packages/reflex-base/src/reflex_base/otel.py b/packages/reflex-base/src/reflex_base/otel.py index e44e48b1785..bf7c2c48c12 100644 --- a/packages/reflex-base/src/reflex_base/otel.py +++ b/packages/reflex-base/src/reflex_base/otel.py @@ -17,7 +17,7 @@ import hashlib import logging -from collections.abc import Awaitable, Callable, Iterator, Mapping +from collections.abc import Awaitable, Callable, Generator, Mapping from contextlib import contextmanager, nullcontext from time import perf_counter from typing import TYPE_CHECKING, Any @@ -426,7 +426,7 @@ def compile_span( @contextmanager def event_span( event: Event, ctx: EventContext, registered_handler: RegisteredEventHandler -) -> Iterator[trace.Span]: +) -> Generator[trace.Span, None, None]: """Open the span for one event handler execution and record its duration. Chained events are INTERNAL children of the span that enqueued them; diff --git a/packages/reflex-base/src/reflex_base/utils/decorator.py b/packages/reflex-base/src/reflex_base/utils/decorator.py index 043f0e63a88..827eea88268 100644 --- a/packages/reflex-base/src/reflex_base/utils/decorator.py +++ b/packages/reflex-base/src/reflex_base/utils/decorator.py @@ -27,7 +27,7 @@ def once(f: Callable[[], T]) -> Callable[[], T]: def wrapper() -> T: nonlocal value value = f() if value is unset else value - return value # ty:ignore[invalid-return-type] + return value # ty:ignore[invalid-explicit-return] return wrapper diff --git a/packages/reflex-base/src/reflex_base/utils/form.py b/packages/reflex-base/src/reflex_base/utils/form.py index 145acb01d59..bc386320927 100644 --- a/packages/reflex-base/src/reflex_base/utils/form.py +++ b/packages/reflex-base/src/reflex_base/utils/form.py @@ -173,7 +173,7 @@ def __reduce__(self) -> tuple[type[FormData[_K, _V_co]], tuple[list]]: """ return type(self), (list(self._items),) - def getlist(self, key: _K) -> list[_V_co]: + def getlist(self, key: _K) -> list[_V_co]: # ty:ignore[invalid-generic-class] """Get every value of a key. Args: @@ -186,7 +186,7 @@ def getlist(self, key: _K) -> list[_V_co]: getAll = getlist # noqa: N815 - def multi_items(self) -> list[tuple[_K, _V_co]]: + def multi_items(self) -> list[tuple[_K, _V_co]]: # ty:ignore[invalid-generic-class] """Get every ``(key, value)`` item, repeated keys included. Returns: diff --git a/packages/reflex-base/src/reflex_base/utils/format.py b/packages/reflex-base/src/reflex_base/utils/format.py index 2f5737a5ac7..3ae19fc7a60 100644 --- a/packages/reflex-base/src/reflex_base/utils/format.py +++ b/packages/reflex-base/src/reflex_base/utils/format.py @@ -596,10 +596,10 @@ def _default_args_spec(): payloads = [] if not is_non_string_sequence(events): - events = [events] # ty:ignore[invalid-assignment] https://github.com/astral-sh/ty/issues/4394 + events = [events] # Process each event/spec/lambda (similar to Component._create_event_chain). - for spec in events: # ty:ignore[not-iterable] https://github.com/astral-sh/ty/issues/4394 + for spec in events: specs: list[EventSpec] = [] if isinstance(spec, (EventHandler, EventSpec)): specs = [call_event_handler(spec, args_spec or _default_args_spec)] diff --git a/packages/reflex-base/src/reflex_base/utils/log.py b/packages/reflex-base/src/reflex_base/utils/log.py index 44df7f2a1a3..677cfdb1e1f 100644 --- a/packages/reflex-base/src/reflex_base/utils/log.py +++ b/packages/reflex-base/src/reflex_base/utils/log.py @@ -44,7 +44,7 @@ from reflex_base.utils.decorator import once if TYPE_CHECKING: - from collections.abc import Hashable, Iterator + from collections.abc import Hashable from typing import TextIO # Level between INFO and WARNING for user-facing success messages. @@ -766,7 +766,7 @@ def is_debug() -> bool: @contextlib.contextmanager -def timing(logger: logging.Logger, msg: str) -> Iterator[None]: +def timing(logger: logging.Logger, msg: str) -> Generator[None, None, None]: """Time a block of code and log the duration at debug level. Args: diff --git a/packages/reflex-base/src/reflex_base/utils/pyi_generator.py b/packages/reflex-base/src/reflex_base/utils/pyi_generator.py index 4924093ce9c..8b0fc9a6bd4 100644 --- a/packages/reflex-base/src/reflex_base/utils/pyi_generator.py +++ b/packages/reflex-base/src/reflex_base/utils/pyi_generator.py @@ -649,7 +649,7 @@ def _extract_class_props_as_ast_nodes( # with the annotation in some cases. with contextlib.suppress(AttributeError, KeyError): # Try to get default from pydantic field definition. - default = target_class.__fields__[name].default # ty:ignore[unresolved-attribute] + default = target_class.__fields__[name].default # ty:ignore[missing-attribute] if isinstance(default, Var): default = default._decode() @@ -1195,7 +1195,7 @@ def visit_Module(self, node: ast.Module) -> ast.Module: The modified Module node. """ self.generic_visit(node) - return self._remove_docstring(node) # ty:ignore[invalid-return-type] + return self._remove_docstring(node) # ty:ignore[invalid-explicit-return] def visit_Import( self, node: ast.Import | ast.ImportFrom diff --git a/packages/reflex-base/src/reflex_base/utils/serializers.py b/packages/reflex-base/src/reflex_base/utils/serializers.py index dd2e1072666..9fd77caa72a 100644 --- a/packages/reflex-base/src/reflex_base/utils/serializers.py +++ b/packages/reflex-base/src/reflex_base/utils/serializers.py @@ -125,7 +125,7 @@ def wrapper(fn: SERIALIZED_FUNCTION) -> SERIALIZED_FUNCTION: if registered_fn is None and (name := _get_optional_type_name(type_)): registered_fn = _OPTIONAL_SERIALIZERS[name] if registered_fn is not None and registered_fn != fn and overwrite is not True: - message = f"Overwriting serializer for type {type_} from {registered_fn.__module__}:{registered_fn.__qualname__} to {fn.__module__}:{fn.__qualname__}." # ty:ignore[unresolved-attribute] + message = f"Overwriting serializer for type {type_} from {registered_fn.__module__}:{registered_fn.__qualname__} to {fn.__module__}:{fn.__qualname__}." # ty:ignore[missing-attribute] if overwrite is False: raise ValueError(message) caller_frame = next( @@ -608,7 +608,7 @@ def serialize_image(image: _serializer_types.Image) -> str: base64_image = base64.b64encode(image_bytes).decode("utf-8") try: # Newer method to get the mime type, but does not always work. - mime_type = image.get_format_mimetype() # ty:ignore[unresolved-attribute] + mime_type = image.get_format_mimetype() # ty:ignore[missing-attribute] except AttributeError: try: # Fallback method diff --git a/packages/reflex-base/src/reflex_base/utils/types.py b/packages/reflex-base/src/reflex_base/utils/types.py index b63014b75e6..f08afe670a8 100644 --- a/packages/reflex-base/src/reflex_base/utils/types.py +++ b/packages/reflex-base/src/reflex_base/utils/types.py @@ -30,9 +30,9 @@ Tuple, TypeVar, Union, - _eval_type, # ty:ignore[unresolved-import] - _GenericAlias, # ty:ignore[unresolved-import] - _SpecialGenericAlias, # ty:ignore[unresolved-import] + _eval_type, # ty:ignore[missing-module-member] + _GenericAlias, # ty:ignore[missing-module-member] + _SpecialGenericAlias, # ty:ignore[missing-module-member] cast, get_args, is_typeddict, @@ -788,7 +788,7 @@ def _apply_type_params( else: flattened.append(substitution.get(param, param)) try: - return value[tuple(flattened)] # pyright: ignore[reportIndexIssue] + return value[tuple(flattened)] # pyright: ignore[reportIndexIssue] # ty:ignore[not-subscriptable] except TypeError: # Python 3.11 rejects a ParamSpec next to an unpacked TypeVarTuple, so # substitute by hand instead. @@ -839,7 +839,7 @@ def resolve_type_alias(cls: GenericType) -> GenericType: ) return resolve_type_alias(value) if isinstance(cls, TypeAliasTypes): - return resolve_type_alias(cls.__value__) + return resolve_type_alias(cls.__value__) # ty:ignore[missing-union-attribute] if is_union(cls): # Rebuild the union only when a member actually resolved, so the # common alias-free case allocates nothing. @@ -1027,11 +1027,12 @@ def is_unserialized_property( if serializer is serializers.serialize_sqlalchemy_base: import sqlalchemy - return name not in sqlalchemy.inspect(cls).attrs + return name not in sqlalchemy.inspect(cls).attrs # ty:ignore[missing-union-attribute] if dataclasses.is_dataclass(cls): return serializer is None and name not in { - field.name for field in dataclasses.fields(cls) + field.name + for field in dataclasses.fields(cls) # ty:ignore[invalid-argument-type] } decorators = getattr(cls, "__pydantic_decorators__", None) if decorators is None or decorators.model_serializers: @@ -1273,9 +1274,9 @@ def get_base_class(cls: GenericType) -> type: return type(get_args(cls)[0]) if is_union(cls): - return tuple(get_base_class(arg) for arg in get_args(cls)) # ty:ignore[invalid-return-type] + return tuple(get_base_class(arg) for arg in get_args(cls)) # ty:ignore[invalid-explicit-return] - return get_base_class(cls.__origin__) if is_generic_alias(cls) else cls + return get_base_class(cls.__origin__) if is_generic_alias(cls) else cls # ty:ignore[missing-union-attribute] # "No extra items" sentinels of PEP 728 TypedDicts (typing on Python 3.15+, diff --git a/packages/reflex-base/src/reflex_base/vars/base.py b/packages/reflex-base/src/reflex_base/vars/base.py index f6b63717e67..ce475d4cd24 100644 --- a/packages/reflex-base/src/reflex_base/vars/base.py +++ b/packages/reflex-base/src/reflex_base/vars/base.py @@ -791,7 +791,7 @@ def __init_subclass__( frozen=True, slots=True, ) - class ToVarOperation(ToOperation, cls): # ty:ignore[shadowed-type-variable] + class ToVarOperation(ToOperation, cls): # ty:ignore[shadowed-type-variable, unsupported-base] """Base class of converting a var to another var type.""" _original: Var = dataclasses.field( @@ -1397,7 +1397,7 @@ def _var_set_state(self, state: type[BaseState] | str) -> Self: _var_data=VarData.merge( VarData.from_state(state, self._js_expr), self._var_data ), - ).guess_type() # ty:ignore[invalid-return-type] + ).guess_type() # ty:ignore[invalid-explicit-return] def __eq__(self, other: Var | Any) -> BooleanVar: """Check if the current variable is equal to the given variable. @@ -2342,8 +2342,8 @@ def delete_properties(this: Any): if original_del is not None: original_del(this) - delete_properties.cached_field_names = cached_field_names # ty:ignore[unresolved-attribute] - delete_properties.original_del = original_del # ty:ignore[unresolved-attribute] + delete_properties.cached_field_names = cached_field_names # ty:ignore[missing-attribute] + delete_properties.original_del = original_del # ty:ignore[missing-attribute] owner.__del__ = delete_properties elif name != self._attrname: @@ -2430,7 +2430,7 @@ def __getattr__(self, name: str) -> Any: next_class = parent_classes[parent_classes.index(CachedVarOperation) + 1] - return next_class.__getattr__(self, name) # ty:ignore[unresolved-attribute] + return next_class.__getattr__(self, name) # ty:ignore[missing-attribute] def _get_all_var_data(self) -> VarData | None: """Get all VarData associated with the Var. @@ -3275,7 +3275,7 @@ async def _default_async_computed_var(_self: BaseState) -> Any: # noqa: RUF029 class AsyncComputedVar(ComputedVar[RETURN_TYPE]): """A computed var that wraps a coroutinefunction.""" - _fget: Callable[[BaseState], Coroutine[None, None, RETURN_TYPE]] = ( + _fget: Callable[[BaseState], Coroutine[None, None, RETURN_TYPE]] = ( # ty:ignore[incompatible-attribute-override] dataclasses.field(default=_default_async_computed_var) ) @@ -3416,7 +3416,7 @@ async def _awaitable_result(instance: Any = instance) -> RETURN_TYPE: return _awaitable_result() @property - def fget(self) -> Callable[[BaseState], Coroutine[None, None, RETURN_TYPE]]: + def fget(self) -> Callable[[BaseState], Coroutine[None, None, RETURN_TYPE]]: # ty:ignore[incompatible-property-override] """The getter function. Returns: @@ -3644,7 +3644,7 @@ def _cached_var_name(self) -> str: return str(self._return) @cached_property_no_lock - def _cached_get_all_var_data(self) -> VarData | None: + def _cached_get_all_var_data(self) -> VarData | None: # ty:ignore[incompatible-attribute-override] """Get the cached VarData. Returns: @@ -4349,7 +4349,7 @@ def __init__( self.outer_type_ = self.annotated_type = annotated_type if type_origin is Annotated: - type_origin = annotated_type.__origin__ + type_origin = annotated_type.__origin__ # ty:ignore[missing-union-attribute] self.type_ = self.type_origin = type_origin else: diff --git a/packages/reflex-base/src/reflex_base/vars/color.py b/packages/reflex-base/src/reflex_base/vars/color.py index 0c443a3bbd9..8f85073fc08 100644 --- a/packages/reflex-base/src/reflex_base/vars/color.py +++ b/packages/reflex-base/src/reflex_base/vars/color.py @@ -123,7 +123,7 @@ def _cached_var_name(self) -> str: ) @cached_property_no_lock - def _cached_get_all_var_data(self) -> VarData | None: + def _cached_get_all_var_data(self) -> VarData | None: # ty:ignore[incompatible-attribute-override] """Get all the var data. Returns: diff --git a/packages/reflex-base/src/reflex_base/vars/dep_tracking.py b/packages/reflex-base/src/reflex_base/vars/dep_tracking.py index 3d57ac410fc..3b1d001570e 100644 --- a/packages/reflex-base/src/reflex_base/vars/dep_tracking.py +++ b/packages/reflex-base/src/reflex_base/vars/dep_tracking.py @@ -124,10 +124,10 @@ def __post_init__(self): """After initializing, populate the dependencies dict.""" with contextlib.suppress(AttributeError): # unbox functools.partial - self.func = cast(FunctionType, self.func.func) # ty:ignore[unresolved-attribute] + self.func = cast(FunctionType, self.func.func) # ty:ignore[missing-union-attribute] with contextlib.suppress(AttributeError): # unbox EventHandler - self.func = cast(FunctionType, self.func.fn) # ty:ignore[unresolved-attribute] + self.func = cast(FunctionType, self.func.fn) # ty:ignore[missing-union-attribute] if isinstance(self.func, FunctionType): with contextlib.suppress(AttributeError, IndexError): diff --git a/packages/reflex-base/src/reflex_base/vars/function.py b/packages/reflex-base/src/reflex_base/vars/function.py index 41cec12f398..9f30f95307d 100644 --- a/packages/reflex-base/src/reflex_base/vars/function.py +++ b/packages/reflex-base/src/reflex_base/vars/function.py @@ -364,7 +364,7 @@ def _cached_var_name(self) -> str: return f"({func_expr}{call}{', '.join([str(LiteralVar.create(arg)) for arg in self._args])}))" @cached_property_no_lock - def _cached_get_all_var_data(self) -> VarData | None: + def _cached_get_all_var_data(self) -> VarData | None: # ty:ignore[incompatible-attribute-override] """Get all the var data associated with the var. Returns: @@ -397,7 +397,7 @@ def create( """ func_type = value_inside_optional(func._var_type) function_return_type = ( - func_type.__args__[-1] if getattr(func_type, "__args__", None) else Any + func_type.__args__[-1] if getattr(func_type, "__args__", None) else Any # ty:ignore[missing-union-attribute] ) if ( function_return_type is not Any diff --git a/packages/reflex-base/src/reflex_base/vars/hybrid_property.py b/packages/reflex-base/src/reflex_base/vars/hybrid_property.py index aa0c58cec17..984ba5b7825 100644 --- a/packages/reflex-base/src/reflex_base/vars/hybrid_property.py +++ b/packages/reflex-base/src/reflex_base/vars/hybrid_property.py @@ -507,17 +507,16 @@ def deleter(self, fdel: Callable[[_O], None]) -> HybridProperty[_T, _O, _V]: """ return self._derive(fdel, fdel=fdel) + # The callable form comes first: ty reads a `@classmethod` in a class body as a + # plain function, and a staticmethod is callable. + @overload + def var(self, func: Callable[[Any], _V2], /) -> HybridProperty[_T, _O, _V2]: ... + @overload def var( self, func: classmethod[_O, ..., _V2], / ) -> HybridProperty[_T, _O, _V2]: ... - @overload - def var(self, func: staticmethod[[Any], _V2], /) -> HybridProperty[_T, _O, _V2]: ... - - @overload - def var(self, func: Callable[[Any], _V2], /) -> HybridProperty[_T, _O, _V2]: ... - def var(self, func: Any, /) -> Any: """Set the (optional) var function for the property. diff --git a/packages/reflex-base/src/reflex_base/vars/number.py b/packages/reflex-base/src/reflex_base/vars/number.py index de6daac668c..b64b4e5e34f 100644 --- a/packages/reflex-base/src/reflex_base/vars/number.py +++ b/packages/reflex-base/src/reflex_base/vars/number.py @@ -303,7 +303,7 @@ def __neg__(self) -> NumberVar: Returns: The number negation operation. """ - return number_negate_operation(self) + return number_negate_operation(self) # ty:ignore[invalid-explicit-return] def __invert__(self): """Boolean NOT the number. diff --git a/packages/reflex-base/src/reflex_base/vars/object.py b/packages/reflex-base/src/reflex_base/vars/object.py index 2fb18a76fe0..bd70af24d33 100644 --- a/packages/reflex-base/src/reflex_base/vars/object.py +++ b/packages/reflex-base/src/reflex_base/vars/object.py @@ -517,7 +517,7 @@ def _get_all_var_data_without_creating_var( ) @cached_property_no_lock - def _cached_get_all_var_data(self) -> VarData | None: + def _cached_get_all_var_data(self) -> VarData | None: # ty:ignore[incompatible-attribute-override] """Get all the var data. Returns: @@ -535,7 +535,7 @@ def _cached_get_all_var_data(self) -> VarData | None: def create( cls, _var_value: object, - _var_type: type[OBJECT_TYPE] | None = None, + _var_type: type[OBJECT_TYPE] | None = None, # ty:ignore[invalid-generic-class] _var_data: VarData | None = None, ) -> LiteralObjectVar[OBJECT_TYPE]: """Create the literal object var. diff --git a/packages/reflex-base/src/reflex_base/vars/sequence.py b/packages/reflex-base/src/reflex_base/vars/sequence.py index 47d505ed5c3..eb2c467a4b1 100644 --- a/packages/reflex-base/src/reflex_base/vars/sequence.py +++ b/packages/reflex-base/src/reflex_base/vars/sequence.py @@ -75,7 +75,7 @@ def _or_empty(self) -> ArrayVar: The array, guarded against None if its type allows None. """ if types.is_optional(self._var_type): - return array_or_empty_operation(self) # ty:ignore[invalid-return-type] + return array_or_empty_operation(self) return self def join(self, sep: StringVar | str = "") -> StringVar: @@ -117,9 +117,9 @@ def reverse(self) -> ArrayVar[ARRAY_VAR_TYPE]: Returns: The reversed array. """ - return array_reverse_operation(self._or_empty()) # ty:ignore[invalid-return-type] + return array_reverse_operation(self._or_empty()) # ty:ignore[invalid-explicit-return] - def __add__(self, other: ArrayVar[ARRAY_VAR_TYPE]) -> ArrayVar[ARRAY_VAR_TYPE]: + def __add__(self, other: ArrayVar[ARRAY_VAR_TYPE]) -> ArrayVar[ARRAY_VAR_TYPE]: # ty:ignore[invalid-generic-class] """Concatenate two arrays. Parameters: @@ -135,7 +135,7 @@ def __add__(self, other: ArrayVar[ARRAY_VAR_TYPE]) -> ArrayVar[ARRAY_VAR_TYPE]: return other.__radd__(self) raise_unsupported_operand_types("+", (type(self), type(other))) - return array_concat_operation(self._or_empty(), other._or_empty()) # ty:ignore[invalid-return-type] + return array_concat_operation(self._or_empty(), other._or_empty()) # ty:ignore[invalid-explicit-return] @overload def __getitem__(self, i: slice) -> ArrayVar[ARRAY_VAR_TYPE]: ... @@ -344,7 +344,7 @@ def pluck(self, field: StringVar | str) -> ArrayVar: Returns: The array pluck operation. """ - return array_pluck_operation(self._or_empty(), field) # ty:ignore[invalid-return-type] + return array_pluck_operation(self._or_empty(), field) # ty:ignore[invalid-explicit-return] def __mul__(self, other: NumberVar | int) -> ArrayVar[ARRAY_VAR_TYPE]: """Multiply the sequence by a number or integer. @@ -360,7 +360,7 @@ def __mul__(self, other: NumberVar | int) -> ArrayVar[ARRAY_VAR_TYPE]: ): raise_unsupported_operand_types("*", (type(self), type(other))) - return repeat_array_operation(self._or_empty(), other) # ty:ignore[invalid-return-type] + return repeat_array_operation(self._or_empty(), other) # ty:ignore[invalid-explicit-return] __rmul__ = __mul__ @@ -612,7 +612,7 @@ def reduce(self, fn: Any, initial: Any = types.Unset()): (accumulator._js_expr, element._js_expr), return_expr, _var_type=Callable[ - [accumulator_type, element._var_type], return_expr._var_type + [accumulator_type, element._var_type], return_expr._var_type # ty:ignore[invalid-type-form] ], ) if initial_var is None: @@ -742,7 +742,7 @@ def _get_all_var_data_without_creating_var(cls, value: Iterable) -> VarData | No return _literal_elements_var_data(value) @cached_property_no_lock - def _cached_get_all_var_data(self) -> VarData | None: + def _cached_get_all_var_data(self) -> VarData | None: # ty:ignore[incompatible-attribute-override] """Get all the VarData associated with the Var. Returns: @@ -1729,7 +1729,7 @@ def _cached_var_name(self) -> str: return "(" + "+".join(list_of_strs_filtered) + ")" @cached_property_no_lock - def _cached_get_all_var_data(self) -> VarData | None: + def _cached_get_all_var_data(self) -> VarData | None: # ty:ignore[incompatible-attribute-override] """Get all the VarData asVarDatae Var. Returns: @@ -2402,7 +2402,7 @@ def _cached_var_name(self) -> str: return f"Array.from({{ length: Math.ceil(({self._var_value.stop!s} - {self._var_value.start!s}) / {self._var_value.step!s}) }}, (_, i) => {self._var_value.start!s} + i * {self._var_value.step!s})" @cached_property_no_lock - def _cached_get_all_var_data(self) -> VarData | None: + def _cached_get_all_var_data(self) -> VarData | None: # ty:ignore[incompatible-attribute-override] """Get all the var data. Returns: diff --git a/packages/reflex-base/src/reflex_base/vars/set.py b/packages/reflex-base/src/reflex_base/vars/set.py index 644fe09e1e4..dc5184b8c0f 100644 --- a/packages/reflex-base/src/reflex_base/vars/set.py +++ b/packages/reflex-base/src/reflex_base/vars/set.py @@ -239,7 +239,7 @@ def union(self, other: Any) -> SetVar[SET_VAR_TYPE]: The union of the two sets. """ _check_other("union", self, other) - return set_union_operation(self, other) # ty:ignore[invalid-return-type] + return set_union_operation(self, other) # ty:ignore[invalid-explicit-return] def intersection(self, other: Any) -> SetVar[SET_VAR_TYPE]: """Get the elements in both this set and the other. @@ -251,7 +251,7 @@ def intersection(self, other: Any) -> SetVar[SET_VAR_TYPE]: The intersection of the two sets. """ _check_other("intersection", self, other) - return set_intersection_operation(self, other) # ty:ignore[invalid-return-type] + return set_intersection_operation(self, other) # ty:ignore[invalid-explicit-return] def difference(self, other: Any) -> SetVar[SET_VAR_TYPE]: """Get the elements in this set but not in the other. @@ -263,7 +263,7 @@ def difference(self, other: Any) -> SetVar[SET_VAR_TYPE]: The difference of the two sets. """ _check_other("difference", self, other) - return set_difference_operation(self, other) # ty:ignore[invalid-return-type] + return set_difference_operation(self, other) # ty:ignore[invalid-explicit-return] def symmetric_difference(self, other: Any) -> SetVar[SET_VAR_TYPE]: """Get the elements in exactly one of this set and the other. @@ -275,7 +275,7 @@ def symmetric_difference(self, other: Any) -> SetVar[SET_VAR_TYPE]: The symmetric difference of the two sets. """ _check_other("symmetric_difference", self, other) - return set_symmetric_difference_operation(self, other) # ty:ignore[invalid-return-type] + return set_symmetric_difference_operation(self, other) # ty:ignore[invalid-explicit-return] def issubset(self, other: Any) -> BooleanVar: """Check if every element of this set is in the other. @@ -783,7 +783,7 @@ def _get_all_var_data_without_creating_var( return _literal_elements_var_data(value) @cached_property_no_lock - def _cached_get_all_var_data(self) -> VarData | None: + def _cached_get_all_var_data(self) -> VarData | None: # ty:ignore[incompatible-attribute-override] """Get all the VarData associated with the Var. Returns: diff --git a/packages/reflex-bench/src/reflex_bench/drivers/browser.py b/packages/reflex-bench/src/reflex_bench/drivers/browser.py index da6e3eab2e5..e1e455b6725 100644 --- a/packages/reflex-bench/src/reflex_bench/drivers/browser.py +++ b/packages/reflex-bench/src/reflex_bench/drivers/browser.py @@ -507,7 +507,7 @@ def start(self) -> None: # The driver is the node process behind Playwright's pipe transport, a # child of the harness; Chromium's root is the driver's child. driver = psutil.Process( - playwright._impl_obj._connection._transport._proc.pid # ty:ignore[unresolved-attribute] + playwright._impl_obj._connection._transport._proc.pid # ty:ignore[missing-attribute] ) self._processes = (*driver.children(), driver) self.anchor = Anchor.take() diff --git a/packages/reflex-bench/src/reflex_bench/drivers/echo_server.py b/packages/reflex-bench/src/reflex_bench/drivers/echo_server.py index 0752c581f76..4122ac43449 100644 --- a/packages/reflex-bench/src/reflex_bench/drivers/echo_server.py +++ b/packages/reflex-bench/src/reflex_bench/drivers/echo_server.py @@ -16,7 +16,7 @@ import multiprocessing import os import uuid -from collections.abc import AsyncIterator, Sequence +from collections.abc import AsyncGenerator, Sequence from multiprocessing.connection import Connection from multiprocessing.process import BaseProcess from typing import Any @@ -65,7 +65,7 @@ def __init__( self.ping_timeout_s = ping_timeout_s @contextlib.asynccontextmanager - async def serve(self, host: str, port: int) -> AsyncIterator[int]: + async def serve(self, host: str, port: int) -> AsyncGenerator[int, None]: """Listen for connections while the context is open. Args: diff --git a/packages/reflex-bench/src/reflex_bench/drivers/events.py b/packages/reflex-bench/src/reflex_bench/drivers/events.py index 3ca1670373b..c969276b2ce 100644 --- a/packages/reflex-bench/src/reflex_bench/drivers/events.py +++ b/packages/reflex-bench/src/reflex_bench/drivers/events.py @@ -69,7 +69,7 @@ import urllib.parse import uuid from collections.abc import ( - AsyncIterator, + AsyncGenerator, Awaitable, Callable, Iterable, @@ -983,7 +983,7 @@ async def close(self) -> None: @contextlib.asynccontextmanager async def open_sessions( endpoint: Endpoint, count: int, shape: EventShape | None = None -) -> AsyncIterator[SessionPool]: +) -> AsyncGenerator[SessionPool, None]: """Prime sessions on the running loop and close them when the context ends. Args: diff --git a/packages/reflex-bench/src/reflex_bench/scheduler.py b/packages/reflex-bench/src/reflex_bench/scheduler.py index 839396b1c14..9d083b9d8f4 100644 --- a/packages/reflex-bench/src/reflex_bench/scheduler.py +++ b/packages/reflex-bench/src/reflex_bench/scheduler.py @@ -32,7 +32,7 @@ import threading import time import traceback -from collections.abc import Callable, Iterator, Mapping, Sequence +from collections.abc import Callable, Generator, Mapping, Sequence from concurrent.futures import Future from dataclasses import dataclass from datetime import UTC, datetime @@ -906,7 +906,7 @@ def skip_reason(self, planned: Planned) -> tuple[Status, str] | None: @contextlib.contextmanager def open( self, planned: Planned, entry: BenchmarkDoc, *, arm: str = "A" - ) -> Iterator[Session]: + ) -> Generator[Session, None, None]: """Set up an instance and hold it open for :meth:`Session.sample_once`. Several sessions can be open at once, e.g. one per arm to interleave diff --git a/packages/reflex-bench/src/reflex_bench/subjects.py b/packages/reflex-bench/src/reflex_bench/subjects.py index cf8d670da3d..c5b29cd4975 100644 --- a/packages/reflex-bench/src/reflex_bench/subjects.py +++ b/packages/reflex-bench/src/reflex_bench/subjects.py @@ -38,7 +38,7 @@ import subprocess import sys import time -from collections.abc import Callable, Iterator, Mapping, Sequence +from collections.abc import Callable, Generator, Mapping, Sequence from dataclasses import dataclass from datetime import timedelta from pathlib import Path @@ -382,7 +382,9 @@ def _lock(handle: IO[bytes], *, wait: bool) -> bool: @contextlib.contextmanager -def _locked(path: Path, on_wait: Callable[[], None] | None = None) -> Iterator[bool]: +def _locked( + path: Path, on_wait: Callable[[], None] | None = None +) -> Generator[bool, None, None]: """Hold an exclusive lock file, which also works between threads. Args: diff --git a/packages/reflex-components-code/src/reflex_components_code/shiki_code_block.py b/packages/reflex-components-code/src/reflex_components_code/shiki_code_block.py index 7cd579db6b9..d6a892fd1f0 100644 --- a/packages/reflex-components-code/src/reflex_components_code/shiki_code_block.py +++ b/packages/reflex-components-code/src/reflex_components_code/shiki_code_block.py @@ -590,7 +590,7 @@ def create( transformer_styles = {} # Collect styles from transformers and wrapper - for transformer in code_block.transformers._var_value: # ty:ignore[unresolved-attribute] + for transformer in code_block.transformers._var_value: # ty:ignore[missing-attribute] if isinstance(transformer, ShikiBaseTransformers) and transformer.style: transformer_styles.update(transformer.style) transformer_styles.update(code_wrapper_props.pop("style", {})) diff --git a/packages/reflex-components-core/src/reflex_components_core/base/error_boundary.py b/packages/reflex-components-core/src/reflex_components_core/base/error_boundary.py index 18650dee4c9..c6556ea38af 100644 --- a/packages/reflex-components-core/src/reflex_components_core/base/error_boundary.py +++ b/packages/reflex-components-core/src/reflex_components_core/base/error_boundary.py @@ -2,6 +2,8 @@ from __future__ import annotations +from typing import Annotated + from reflex_base.components.component import Component, field from reflex_base.event import EventHandler, set_clipboard from reflex_base.vars.base import Var @@ -39,7 +41,7 @@ class ErrorBoundary(Component): library = "react-error-boundary@6.1.6" tag = "ErrorBoundary" - on_error: EventHandler[on_error_spec] = field( + on_error: Annotated[EventHandler, on_error_spec] = field( doc="Fired when the boundary catches an error." ) diff --git a/packages/reflex-components-core/src/reflex_components_core/core/clipboard.py b/packages/reflex-components-core/src/reflex_components_core/core/clipboard.py index 0d1859d9052..d0b644a5f76 100644 --- a/packages/reflex-components-core/src/reflex_components_core/core/clipboard.py +++ b/packages/reflex-components-core/src/reflex_components_core/core/clipboard.py @@ -3,6 +3,7 @@ from __future__ import annotations from collections.abc import Sequence +from typing import Annotated from reflex_base.components.component import field from reflex_base.components.tags.tag import CommonTag @@ -22,8 +23,10 @@ class Clipboard(Fragment): doc="The element ids to attach the event listener to. Defaults to all child components or the document." ) - on_paste: EventHandler[passthrough_event_spec(list[tuple[str, str]])] = field( - doc="Called when the user pastes data into the document. Data is a list of tuples of (mime_type, data). Binary types will be base64 encoded as a data uri." + on_paste: Annotated[EventHandler, passthrough_event_spec(list[tuple[str, str]])] = ( + field( + doc="Called when the user pastes data into the document. Data is a list of tuples of (mime_type, data). Binary types will be base64 encoded as a data uri." + ) ) on_paste_event_actions: Var[dict[str, bool | int]] = field( diff --git a/packages/reflex-components-core/src/reflex_components_core/core/debounce.py b/packages/reflex-components-core/src/reflex_components_core/core/debounce.py index c812b14c930..855761eb6a4 100644 --- a/packages/reflex-components-core/src/reflex_components_core/core/debounce.py +++ b/packages/reflex-components-core/src/reflex_components_core/core/debounce.py @@ -2,7 +2,7 @@ from __future__ import annotations -from typing import Any, ClassVar +from typing import Annotated, Any, ClassVar from reflex_base.components.component import Component, field from reflex_base.constants import EventTriggers @@ -57,7 +57,7 @@ class DebounceInput(Component): element: Var[type[Component]] = field(doc="The element to wrap") - on_change: EventHandler[no_args_event_spec] = field( + on_change: Annotated[EventHandler, no_args_event_spec] = field( doc="Fired when the input value changes" ) @@ -148,12 +148,12 @@ def create(cls, *children: Component, **props: Any) -> Component: ) component = super().create(**props) - component._get_style = child._get_style # ty:ignore[invalid-assignment] + component._get_style = child._get_style component.event_triggers.update(child.event_triggers) component.children = child.children component._rename_props = child._rename_props # ty:ignore[invalid-attribute-access] outer_get_all_custom_code = component._get_all_custom_code - component._get_all_custom_code = lambda: ( # ty:ignore[invalid-assignment] + component._get_all_custom_code = lambda: ( outer_get_all_custom_code() | (child._get_all_custom_code()) ) return component diff --git a/packages/reflex-components-core/src/reflex_components_core/core/foreach.py b/packages/reflex-components-core/src/reflex_components_core/core/foreach.py index 24d08a62d17..f7696b72871 100644 --- a/packages/reflex-components-core/src/reflex_components_core/core/foreach.py +++ b/packages/reflex-components-core/src/reflex_components_core/core/foreach.py @@ -168,7 +168,7 @@ def _render(self) -> IterTag: if (render_fn_code := getattr(render_fn, "__code__", None)) is not None: code_hash = md5(render_fn_code.co_code).hexdigest() elif isinstance(render_fn, functools.partial): - code_hash = md5(render_fn.func.__code__.co_code).hexdigest() # ty:ignore[unresolved-attribute] + code_hash = md5(render_fn.func.__code__.co_code).hexdigest() # ty:ignore[missing-attribute] else: code_hash = md5(repr(render_fn).encode()).hexdigest() props["index_var_name"] = f"index_{code_hash}" diff --git a/packages/reflex-components-core/src/reflex_components_core/core/match.py b/packages/reflex-components-core/src/reflex_components_core/core/match.py index 98c1dd8a097..1eecddfe8e4 100644 --- a/packages/reflex-components-core/src/reflex_components_core/core/match.py +++ b/packages/reflex-components-core/src/reflex_components_core/core/match.py @@ -225,7 +225,7 @@ def _validate_return_types( f" of type {type(return_value)!r} is not {return_type}" ) raise MatchTypeError(msg) - return match_cases # ty:ignore[invalid-return-type] + return match_cases # ty:ignore[invalid-explicit-return] @classmethod def _create_match_cond_var_or_component( diff --git a/packages/reflex-components-core/src/reflex_components_core/core/upload.py b/packages/reflex-components-core/src/reflex_components_core/core/upload.py index bd0db8fbbc0..df1de343699 100644 --- a/packages/reflex-components-core/src/reflex_components_core/core/upload.py +++ b/packages/reflex-components-core/src/reflex_components_core/core/upload.py @@ -4,7 +4,7 @@ from collections.abc import Callable, Sequence from pathlib import Path -from typing import Any, ClassVar +from typing import Annotated, Any, ClassVar from reflex_base.components.component import ( Component, @@ -234,9 +234,9 @@ class GhostUpload(Fragment): """A ghost upload component.""" # Fired when files are dropped. - on_drop: EventHandler[_on_drop_args_spec] + on_drop: Annotated[EventHandler, _on_drop_args_spec] - on_drop_rejected: EventHandler[_on_drop_rejected_spec] = field( + on_drop_rejected: Annotated[EventHandler, _on_drop_rejected_spec] = field( doc="Fired when dropped files do not meet the specified criteria." ) @@ -278,9 +278,9 @@ class Upload(MemoizationLeaf): is_used: ClassVar[bool] = False # Fired when files are dropped. - on_drop: EventHandler[_on_drop_args_spec] + on_drop: Annotated[EventHandler, _on_drop_args_spec] - on_drop_rejected: EventHandler[_on_drop_rejected_spec] = field( + on_drop_rejected: Annotated[EventHandler, _on_drop_rejected_spec] = field( doc="Fired when dropped files do not meet the specified criteria." ) diff --git a/packages/reflex-components-core/src/reflex_components_core/core/window_events.py b/packages/reflex-components-core/src/reflex_components_core/core/window_events.py index 20880622e66..59dc1530aee 100644 --- a/packages/reflex-components-core/src/reflex_components_core/core/window_events.py +++ b/packages/reflex-components-core/src/reflex_components_core/core/window_events.py @@ -2,7 +2,7 @@ from __future__ import annotations -from typing import Any, cast +from typing import Annotated, Any, cast from reflex_base.components.component import field from reflex_base.event import EventHandler, key_event, no_args_event_spec @@ -54,31 +54,31 @@ def _on_storage_spec(e: ObjectVar) -> tuple[Var[str], Var[str], Var[str], Var[st class WindowEventListener(Fragment): """A component that listens for window events.""" - on_resize: EventHandler[_on_resize_spec] = field( + on_resize: Annotated[EventHandler, _on_resize_spec] = field( doc="Triggered when the browser window is resized. Receives the new width and height in pixels." ) - on_scroll: EventHandler[_on_scroll_spec] = field( + on_scroll: Annotated[EventHandler, _on_scroll_spec] = field( doc="Triggered when the user scrolls the page. Receives the current horizontal and vertical scroll positions." ) - on_focus: EventHandler[no_args_event_spec] = field( + on_focus: Annotated[EventHandler, no_args_event_spec] = field( doc="Triggered when the browser tab or window gains focus (e.g. user switches back to the tab)." ) - on_blur: EventHandler[no_args_event_spec] = field( + on_blur: Annotated[EventHandler, no_args_event_spec] = field( doc="Triggered when the browser tab or window loses focus (e.g. user switches to another tab)." ) - on_visibility_change: EventHandler[_on_visibility_change_spec] = field( + on_visibility_change: Annotated[EventHandler, _on_visibility_change_spec] = field( doc="Triggered when the page becomes visible or hidden (e.g. tab switch or minimize). Receives a boolean indicating whether the document is hidden." ) - on_before_unload: EventHandler[no_args_event_spec] = field( + on_before_unload: Annotated[EventHandler, no_args_event_spec] = field( doc="Triggered just before the user navigates away from or closes the page. Useful for cleanup or prompting unsaved-changes warnings." ) - on_key_down: EventHandler[key_event] = field( + on_key_down: Annotated[EventHandler, key_event] = field( doc="Triggered when a key is pressed anywhere on the page. Receives the key name and active modifier keys (shift, ctrl, alt, meta)." ) - on_popstate: EventHandler[no_args_event_spec] = field( + on_popstate: Annotated[EventHandler, no_args_event_spec] = field( doc="Triggered when the user navigates back or forward via the browser history buttons." ) - on_storage: EventHandler[_on_storage_spec] = field( + on_storage: Annotated[EventHandler, _on_storage_spec] = field( doc="Triggered when localStorage or sessionStorage is modified in another tab. Receives the key, old value, new value, and the URL of the document that changed the storage." ) diff --git a/packages/reflex-components-core/src/reflex_components_core/el/element.py b/packages/reflex-components-core/src/reflex_components_core/el/element.py index 670b86d81e1..1eeca168ffd 100644 --- a/packages/reflex-components-core/src/reflex_components_core/el/element.py +++ b/packages/reflex-components-core/src/reflex_components_core/el/element.py @@ -10,13 +10,13 @@ class Element(Component): _is_tag_in_global_scope: ClassVar[bool] = True - def __eq__(self, other: object): + def __eq__(self, value: object): """Two elements are equal if they have the same tag. Args: - other: The other element. + value: The other element. Returns: True if the elements have the same tag, False otherwise. """ - return isinstance(other, Element) and self.tag == other.tag + return isinstance(value, Element) and self.tag == value.tag diff --git a/packages/reflex-components-core/src/reflex_components_core/el/elements/forms.py b/packages/reflex-components-core/src/reflex_components_core/el/elements/forms.py index c913cd0f2bf..152c593ca6e 100644 --- a/packages/reflex-components-core/src/reflex_components_core/el/elements/forms.py +++ b/packages/reflex-components-core/src/reflex_components_core/el/elements/forms.py @@ -5,7 +5,7 @@ from collections.abc import Iterator from functools import partial from hashlib import md5 -from typing import Any, ClassVar, Literal, get_origin, get_type_hints +from typing import Annotated, Any, ClassVar, Literal, get_origin, get_type_hints from reflex_base.components.component import BaseComponent, Component, field from reflex_base.components.tags.tag import CommonTag @@ -417,8 +417,8 @@ class Form(BaseHTML): doc="The name used to make this form's submit handler function unique." ) - on_submit: EventHandler[ - on_submit_event, on_submit_mapping_event, on_submit_string_event + on_submit: Annotated[ + EventHandler, (on_submit_event, on_submit_mapping_event, on_submit_string_event) ] = field(doc="Fired when the form is submitted") @classmethod @@ -441,9 +441,9 @@ def create(cls, *children, **props): # Render the form hooks and use the hash of the resulting code to create a unique name. props["handle_submit_unique_name"] = "" form = super().create(*children, **props) - form._validate_on_submit_typed_dict_fields() # ty:ignore[unresolved-attribute] - form._deprecate_id_only_form_controls() # ty:ignore[unresolved-attribute] - form.handle_submit_unique_name = md5( # ty:ignore[unresolved-attribute] + form._validate_on_submit_typed_dict_fields() # ty:ignore[missing-attribute] + form._deprecate_id_only_form_controls() # ty:ignore[missing-attribute] + form.handle_submit_unique_name = md5( # ty:ignore[missing-attribute] str(form._get_all_hooks()).encode("utf-8") ).hexdigest() return form @@ -819,23 +819,27 @@ class BaseInput(VoidBaseHTML): value: Var[str | int | float] = field(doc="Value of the input") - on_key_down: EventHandler[key_event] = field(doc="Fired when a key is pressed down") + on_key_down: Annotated[EventHandler, key_event] = field( + doc="Fired when a key is pressed down" + ) - on_key_up: EventHandler[key_event] = field(doc="Fired when a key is released") + on_key_up: Annotated[EventHandler, key_event] = field( + doc="Fired when a key is released" + ) class CheckboxInput(BaseInput): """Display the input element.""" - on_change: EventHandler[checked_input_event] = field( + on_change: Annotated[EventHandler, checked_input_event] = field( doc="Fired when the input value changes" ) - on_focus: EventHandler[checked_input_event] = field( + on_focus: Annotated[EventHandler, checked_input_event] = field( doc="Fired when the input gains focus" ) - on_blur: EventHandler[checked_input_event] = field( + on_blur: Annotated[EventHandler, checked_input_event] = field( doc="Fired when the input loses focus" ) @@ -843,29 +847,33 @@ class CheckboxInput(BaseInput): class ValueNumberInput(BaseInput): """Display the input element.""" - on_change: EventHandler[float_input_event, int_input_event, input_event] = field( - doc="Fired when the input value changes" - ) + on_change: Annotated[ + EventHandler, (float_input_event, int_input_event, input_event) + ] = field(doc="Fired when the input value changes") - on_focus: EventHandler[float_input_event, int_input_event, input_event] = field( - doc="Fired when the input gains focus" - ) + on_focus: Annotated[ + EventHandler, (float_input_event, int_input_event, input_event) + ] = field(doc="Fired when the input gains focus") - on_blur: EventHandler[float_input_event, int_input_event, input_event] = field( - doc="Fired when the input loses focus" - ) + on_blur: Annotated[ + EventHandler, (float_input_event, int_input_event, input_event) + ] = field(doc="Fired when the input loses focus") class Input(BaseInput): """Display the input element.""" - on_change: EventHandler[input_event] = field( + on_change: Annotated[EventHandler, input_event] = field( doc="Fired when the input value changes" ) - on_focus: EventHandler[input_event] = field(doc="Fired when the input gains focus") + on_focus: Annotated[EventHandler, input_event] = field( + doc="Fired when the input gains focus" + ) - on_blur: EventHandler[input_event] = field(doc="Fired when the input loses focus") + on_blur: Annotated[EventHandler, input_event] = field( + doc="Fired when the input loses focus" + ) @classmethod def create(cls, *children, **props): @@ -1023,7 +1031,7 @@ class Select(BaseHTML): size: Var[str | int] = field(doc="Number of visible options in a drop-down list") - on_change: EventHandler[input_event] = field( + on_change: Annotated[EventHandler, input_event] = field( doc="Fired when the select value changes" ) @@ -1130,17 +1138,25 @@ class Textarea(RawTextBaseHTML): doc="How the text in the textarea is to be wrapped when submitting the form" ) - on_change: EventHandler[input_event] = field( + on_change: Annotated[EventHandler, input_event] = field( doc="Fired when the input value changes" ) - on_focus: EventHandler[input_event] = field(doc="Fired when the input gains focus") + on_focus: Annotated[EventHandler, input_event] = field( + doc="Fired when the input gains focus" + ) - on_blur: EventHandler[input_event] = field(doc="Fired when the input loses focus") + on_blur: Annotated[EventHandler, input_event] = field( + doc="Fired when the input loses focus" + ) - on_key_down: EventHandler[key_event] = field(doc="Fired when a key is pressed down") + on_key_down: Annotated[EventHandler, key_event] = field( + doc="Fired when a key is pressed down" + ) - on_key_up: EventHandler[key_event] = field(doc="Fired when a key is released") + on_key_up: Annotated[EventHandler, key_event] = field( + doc="Fired when a key is released" + ) @classmethod def create(cls, *children, **props): diff --git a/packages/reflex-components-dataeditor/src/reflex_components_dataeditor/dataeditor.py b/packages/reflex-components-dataeditor/src/reflex_components_dataeditor/dataeditor.py index 1dbd3ef37fa..49e4758edfb 100644 --- a/packages/reflex-components-dataeditor/src/reflex_components_dataeditor/dataeditor.py +++ b/packages/reflex-components-dataeditor/src/reflex_components_dataeditor/dataeditor.py @@ -6,7 +6,7 @@ import logging from collections.abc import Mapping, Sequence from enum import Enum -from typing import Any, Literal, TypedDict +from typing import Annotated, Any, Literal, TypedDict from reflex_base.components.component import Component, NoSSRComponent, field from reflex_base.components.literals import LiteralRowMarker @@ -400,59 +400,59 @@ class DataEditor(NoSSRComponent): theme: Var[DataEditorTheme | dict] = field(doc="global theme") - on_cell_activated: EventHandler[passthrough_event_spec(tuple[int, int])] = field( - doc="Fired when a cell is activated." - ) + on_cell_activated: Annotated[ + EventHandler, passthrough_event_spec(tuple[int, int]) + ] = field(doc="Fired when a cell is activated.") - on_cell_clicked: EventHandler[passthrough_event_spec(tuple[int, int])] = field( - doc="Fired when a cell is clicked." - ) + on_cell_clicked: Annotated[ + EventHandler, passthrough_event_spec(tuple[int, int]) + ] = field(doc="Fired when a cell is clicked.") - on_cell_context_menu: EventHandler[passthrough_event_spec(tuple[int, int])] = field( - doc="Fired when a cell is right-clicked." - ) + on_cell_context_menu: Annotated[ + EventHandler, passthrough_event_spec(tuple[int, int]) + ] = field(doc="Fired when a cell is right-clicked.") - on_cell_edited: EventHandler[passthrough_event_spec(tuple[int, int], GridCell)] = ( - field(doc="Fired when a cell is edited.") - ) + on_cell_edited: Annotated[ + EventHandler, passthrough_event_spec(tuple[int, int], GridCell) + ] = field(doc="Fired when a cell is edited.") - on_group_header_clicked: EventHandler[ - passthrough_event_spec(tuple[int, int], GridCell) + on_group_header_clicked: Annotated[ + EventHandler, passthrough_event_spec(tuple[int, int], GridCell) ] = field(doc="Fired when a group header is clicked.") - on_group_header_context_menu: EventHandler[ - passthrough_event_spec(int, GroupHeaderClickedEventArgs) + on_group_header_context_menu: Annotated[ + EventHandler, passthrough_event_spec(int, GroupHeaderClickedEventArgs) ] = field(doc="Fired when a group header is right-clicked.") - on_group_header_renamed: EventHandler[passthrough_event_spec(str, str)] = field( - doc="Fired when a group header is renamed." - ) + on_group_header_renamed: Annotated[ + EventHandler, passthrough_event_spec(str, str) + ] = field(doc="Fired when a group header is renamed.") - on_header_clicked: EventHandler[passthrough_event_spec(tuple[int, int])] = field( - doc="Fired when a header is clicked." - ) + on_header_clicked: Annotated[ + EventHandler, passthrough_event_spec(tuple[int, int]) + ] = field(doc="Fired when a header is clicked.") - on_header_context_menu: EventHandler[passthrough_event_spec(tuple[int, int])] = ( - field(doc="Fired when a header is right-clicked.") - ) + on_header_context_menu: Annotated[ + EventHandler, passthrough_event_spec(tuple[int, int]) + ] = field(doc="Fired when a header is right-clicked.") - on_header_menu_click: EventHandler[passthrough_event_spec(int, Rectangle)] = field( - doc="Fired when a header menu item is clicked." - ) + on_header_menu_click: Annotated[ + EventHandler, passthrough_event_spec(int, Rectangle) + ] = field(doc="Fired when a header menu item is clicked.") - on_item_hovered: EventHandler[passthrough_event_spec(tuple[int, int])] = field( - doc="Fired when an item is hovered." - ) + on_item_hovered: Annotated[ + EventHandler, passthrough_event_spec(tuple[int, int]) + ] = field(doc="Fired when an item is hovered.") - on_delete: EventHandler[passthrough_event_spec(GridSelection)] = field( + on_delete: Annotated[EventHandler, passthrough_event_spec(GridSelection)] = field( doc="Fired when a selection is deleted." ) - on_finished_editing: EventHandler[ - passthrough_event_spec(GridCell | None, tuple[int, int]) + on_finished_editing: Annotated[ + EventHandler, passthrough_event_spec(GridCell | None, tuple[int, int]) ] = field(doc="Fired when editing is finished.") - on_row_appended: EventHandler[no_args_event_spec] = field( + on_row_appended: Annotated[EventHandler, no_args_event_spec] = field( doc="Fired when a row is appended." ) @@ -460,23 +460,23 @@ class DataEditor(NoSSRComponent): doc="The current grid selection state (columns, rows, and current cell/range). Must be used when on_grid_selection_change is used otherwise updates will not be reflected in the grid." ) - on_grid_selection_change: EventHandler[passthrough_event_spec(GridSelection)] = ( - field( - doc="Fired when the grid selection changes. Will pass the current selection, the selected columns and the selected rows." - ) + on_grid_selection_change: Annotated[ + EventHandler, passthrough_event_spec(GridSelection) + ] = field( + doc="Fired when the grid selection changes. Will pass the current selection, the selected columns and the selected rows." ) - on_selection_cleared: EventHandler[no_args_event_spec] = field( + on_selection_cleared: Annotated[EventHandler, no_args_event_spec] = field( doc="Fired when the selection is cleared." ) - on_column_resize: EventHandler[passthrough_event_spec(GridColumn, int)] = field( - doc="Fired when a column is resized." - ) + on_column_resize: Annotated[ + EventHandler, passthrough_event_spec(GridColumn, int) + ] = field(doc="Fired when a column is resized.") show_search: Var[bool] = field(doc="Shows search bar.") - on_search_close: EventHandler[no_args_event_spec] = field( + on_search_close: Annotated[EventHandler, no_args_event_spec] = field( doc="Fired when the search close button is clicked." ) diff --git a/packages/reflex-components-internal/src/reflex_components_internal/components/base/accordion.py b/packages/reflex-components-internal/src/reflex_components_internal/components/base/accordion.py index c29bc33b42a..bdf82507406 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/components/base/accordion.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/components/base/accordion.py @@ -1,6 +1,6 @@ """Custom Accordion component.""" -from typing import Any, Literal +from typing import Annotated, Any, Literal from reflex_components_core.core.foreach import foreach from reflex_components_core.el.elements.typography import Div @@ -53,7 +53,7 @@ class AccordionRoot(AccordionBaseComponent): value: Var[list[Any]] # Event handler called when an accordion item is expanded or collapsed. Provides the new value as an argument. - on_value_change: EventHandler[passthrough_event_spec(list[str])] + on_value_change: Annotated[EventHandler, passthrough_event_spec(list[str])] # Allows the browser's built-in page search to find and expand the panel contents. Overrides the `keep_mounted` prop and uses `hidden="until-found"` to hide the element without removing it from the DOM. Defaults to False. hidden_until_found: Var[bool] @@ -97,7 +97,7 @@ class AccordionItem(AccordionBaseComponent): value: Var[str] # Event handler called when the panel is opened or closed. - on_open_change: EventHandler[passthrough_event_spec(bool)] + on_open_change: Annotated[EventHandler, passthrough_event_spec(bool)] # Whether the component should ignore user interaction. Defaults to False. disabled: Var[bool] diff --git a/packages/reflex-components-internal/src/reflex_components_internal/components/base/avatar.py b/packages/reflex-components-internal/src/reflex_components_internal/components/base/avatar.py index fca0c799b45..501a8cf0c18 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/components/base/avatar.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/components/base/avatar.py @@ -1,5 +1,7 @@ """Custom avatar component.""" +from typing import Annotated + from reflex.components.component import Component, ComponentNamespace from reflex.event import EventHandler, passthrough_event_spec from reflex.utils.imports import ImportVar @@ -55,7 +57,7 @@ class AvatarImage(AvatarBaseComponent): src: Var[str] # Callback when loading status changes - on_loading_status_change: EventHandler[passthrough_event_spec(str)] + on_loading_status_change: Annotated[EventHandler, passthrough_event_spec(str)] # The component to render render_: Var[Component] diff --git a/packages/reflex-components-internal/src/reflex_components_internal/components/base/checkbox.py b/packages/reflex-components-internal/src/reflex_components_internal/components/base/checkbox.py index 98396362202..d348db2ac0f 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/components/base/checkbox.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/components/base/checkbox.py @@ -1,5 +1,7 @@ """Checkbox component from base-ui components.""" +from typing import Annotated + from reflex_components_core.el.elements.forms import Label from reflex.components.component import ComponentNamespace @@ -43,7 +45,7 @@ class CheckboxRoot(CheckboxBaseComponent): checked: Var[bool] # Event handler called when the checkbox is ticked or unticked. - on_checked_change: EventHandler[passthrough_event_spec(bool, dict)] + on_checked_change: Annotated[EventHandler, passthrough_event_spec(bool, dict)] # Whether the checkbox is in a mixed state: neither ticked, nor unticked. Defaults to False. indeterminate: Var[bool] @@ -131,7 +133,7 @@ def create(cls, *children, **props) -> BaseUIComponent: ), label, class_name=cn(ClassNames.LABEL, class_name), - ) # ty:ignore[invalid-return-type] + ) # ty:ignore[invalid-explicit-return] return CheckboxRoot.create( CheckboxIndicator.create(), *children, diff --git a/packages/reflex-components-internal/src/reflex_components_internal/components/base/collapsible.py b/packages/reflex-components-internal/src/reflex_components_internal/components/base/collapsible.py index 5fa807b67d1..a6837bd825d 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/components/base/collapsible.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/components/base/collapsible.py @@ -1,5 +1,7 @@ """Custom collapsible component.""" +from typing import Annotated + from reflex.components.component import Component, ComponentNamespace from reflex.event import EventHandler, passthrough_event_spec from reflex.utils.imports import ImportVar @@ -38,7 +40,7 @@ class CollapsibleRoot(CollapsibleBaseComponent): open: Var[bool] # Event handler called when the panel is opened or closed. - on_open_change: EventHandler[passthrough_event_spec(bool)] + on_open_change: Annotated[EventHandler, passthrough_event_spec(bool)] # Whether the component should ignore user interaction. Defaults to False. disabled: Var[bool] diff --git a/packages/reflex-components-internal/src/reflex_components_internal/components/base/context_menu.py b/packages/reflex-components-internal/src/reflex_components_internal/components/base/context_menu.py index d4a11a5dbae..f08b186ca91 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/components/base/context_menu.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/components/base/context_menu.py @@ -1,6 +1,6 @@ """Custom context menu component.""" -from typing import Literal +from typing import Annotated, Literal from reflex_components_core.core.foreach import foreach @@ -77,7 +77,7 @@ class ContextMenuRoot(ContextMenuBaseComponent): open: Var[bool] # Event handler called when the context menu is opened or closed. - on_open_change: EventHandler[passthrough_event_spec(bool, dict)] + on_open_change: Annotated[EventHandler, passthrough_event_spec(bool, dict)] # A ref to imperative actions. When specified, the context menu will not be unmounted when closed. Instead, the unmount function must be called to unmount the context menu manually. Useful when the context menu's animation is controlled by an external library. actions_ref: Var[str] @@ -86,7 +86,7 @@ class ContextMenuRoot(ContextMenuBaseComponent): close_parent_on_esc: Var[bool] # Event handler called after any animations complete when the context menu is closed. - on_open_change_complete: EventHandler[passthrough_event_spec(bool)] + on_open_change_complete: Annotated[EventHandler, passthrough_event_spec(bool)] # Whether the component should ignore user interaction. Defaults to False. disabled: Var[bool] @@ -377,7 +377,7 @@ class ContextMenuRadioGroup(ContextMenuBaseComponent): value: Var[str | int] # Event handler called when the value changes. - on_value_change: EventHandler[passthrough_event_spec(str | int, dict)] + on_value_change: Annotated[EventHandler, passthrough_event_spec(str | int, dict)] # Whether the component should ignore user interaction. Defaults to False. disabled: Var[bool] @@ -469,7 +469,7 @@ class ContextMenuCheckboxItem(ContextMenuBaseComponent): checked: Var[bool] # Event handler called when the checkbox item is ticked or unticked. - on_checked_change: EventHandler[passthrough_event_spec(bool, dict)] + on_checked_change: Annotated[EventHandler, passthrough_event_spec(bool, dict)] # Whether to close the context menu when the item is clicked. Defaults to False. close_on_click: Var[bool] @@ -530,13 +530,13 @@ class ContextMenuSubmenuRoot(ContextMenuBaseComponent): open: Var[bool] # Event handler called when the submenu is opened or closed. - on_open_change: EventHandler[passthrough_event_spec(bool, dict)] + on_open_change: Annotated[EventHandler, passthrough_event_spec(bool, dict)] # When in a submenu, determines whether pressing the Escape key closes the entire menu, or only the current child menu. Defaults to True. close_parent_on_esc: Var[bool] # Event handler called after any animations complete when the submenu is closed. - on_open_change_complete: EventHandler[passthrough_event_spec(bool)] + on_open_change_complete: Annotated[EventHandler, passthrough_event_spec(bool)] # Whether the component should ignore user interaction. Defaults to False. disabled: Var[bool] diff --git a/packages/reflex-components-internal/src/reflex_components_internal/components/base/dialog.py b/packages/reflex-components-internal/src/reflex_components_internal/components/base/dialog.py index b4e185db5e1..f5e041698c0 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/components/base/dialog.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/components/base/dialog.py @@ -1,6 +1,6 @@ """Custom dialog component.""" -from typing import Literal +from typing import Annotated, Literal from reflex_components_core.el.elements.typography import Div @@ -49,7 +49,7 @@ class DialogRoot(DialogBaseComponent): open: Var[bool] # Event handler called when the dialog is opened or closed - on_open_change: EventHandler[passthrough_event_spec(bool, dict)] + on_open_change: Annotated[EventHandler, passthrough_event_spec(bool, dict)] # Determines whether pointer dismissal (clicking outside) is disabled. Defaults to False. disable_pointer_dismissal: Var[bool] @@ -61,7 +61,7 @@ class DialogRoot(DialogBaseComponent): modal: Var[bool | Literal["trap-focus"]] # Event handler called after any animations complete when the dialog is opened or closed. - on_open_change_complete: EventHandler[passthrough_event_spec(bool)] + on_open_change_complete: Annotated[EventHandler, passthrough_event_spec(bool)] @classmethod def create(cls, *children, **props) -> BaseUIComponent: diff --git a/packages/reflex-components-internal/src/reflex_components_internal/components/base/drawer.py b/packages/reflex-components-internal/src/reflex_components_internal/components/base/drawer.py index 46e0dddd7f4..fdbc9be54a6 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/components/base/drawer.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/components/base/drawer.py @@ -1,7 +1,7 @@ """Custom drawer component.""" from collections.abc import Sequence -from typing import Literal +from typing import Annotated, Literal from reflex_components_core.el.elements.typography import Div @@ -60,7 +60,7 @@ class DrawerRoot(DrawerBaseComponent): open: Var[bool] # Event handler called when the drawer is opened or closed. - on_open_change: EventHandler[passthrough_event_spec(bool, dict)] + on_open_change: Annotated[EventHandler, passthrough_event_spec(bool, dict)] # Direction of the swipe gesture to dismiss. Defaults to 'down'. swipe_direction: Var[LiteralSwipeDirectionType] @@ -72,7 +72,7 @@ class DrawerRoot(DrawerBaseComponent): disable_pointer_dismissal: Var[bool] # Event handler called after any animations complete when the drawer is opened or closed. - on_open_change_complete: EventHandler[passthrough_event_spec(bool)] + on_open_change_complete: Annotated[EventHandler, passthrough_event_spec(bool)] # Array of snap points. Numbers between 0 and 1 represent fractions of the viewport height, and numbers greater than 1 are treated as pixel values. String values support `px` and `rem` units. snap_points: Sequence[str | float] | None @@ -81,7 +81,9 @@ class DrawerRoot(DrawerBaseComponent): snap_point: Var[str | float | None] # Event handler called when the snap point changes. - on_snap_point_change: EventHandler[passthrough_event_spec(str | float | None)] + on_snap_point_change: Annotated[ + EventHandler, passthrough_event_spec(str | float | None) + ] @classmethod def create(cls, *children, **props) -> BaseUIComponent: diff --git a/packages/reflex-components-internal/src/reflex_components_internal/components/base/input.py b/packages/reflex-components-internal/src/reflex_components_internal/components/base/input.py index b7ae2f33dfc..77242392e69 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/components/base/input.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/components/base/input.py @@ -1,6 +1,6 @@ """Custom input component.""" -from typing import ClassVar, Literal +from typing import Annotated, ClassVar, Literal from reflex_components_core.el.elements.forms import Button from reflex_components_core.el.elements.forms import Input as ReflexInput @@ -61,7 +61,7 @@ class InputRoot(InputBaseComponent, ReflexInput): """Root component for an input.""" tag = "Input" - on_value_change: EventHandler[passthrough_event_spec(str, dict)] + on_value_change: Annotated[EventHandler, passthrough_event_spec(str, dict)] render_: Var[Component] @classmethod @@ -73,7 +73,7 @@ def create(cls, *children, **props) -> "InputRoot": """ props["data-slot"] = "input" cls.set_class_name(ClassNames.INPUT, props) - return super().create(*children, **props) # ty:ignore[invalid-return-type] + return super().create(*children, **props) # ty:ignore[invalid-explicit-return] class HighLevelInput(InputBaseComponent): @@ -172,7 +172,7 @@ def create(cls, *children, **props) -> BaseUIComponent: on_click=set_focus(id), class_name=cn(f"{ClassNames.DIV} {INPUT_SIZE_VARIANTS[size]}", class_name), **props, - ) # ty:ignore[invalid-return-type] + ) # ty:ignore[invalid-explicit-return] @staticmethod def _create_clear_button( diff --git a/packages/reflex-components-internal/src/reflex_components_internal/components/base/menu.py b/packages/reflex-components-internal/src/reflex_components_internal/components/base/menu.py index 98f63492f6c..2cfa82b0766 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/components/base/menu.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/components/base/menu.py @@ -1,6 +1,6 @@ """Custom menu component.""" -from typing import Literal +from typing import Annotated, Literal from reflex_components_core.core.foreach import foreach from reflex_components_core.el.elements.forms import Input as ReflexInput @@ -100,7 +100,7 @@ class MenuFilterProvider(MenuBaseComponent): value: Var[str] # Called with the new query when it changes. - on_value_change: EventHandler[passthrough_event_spec(str)] + on_value_change: Annotated[EventHandler, passthrough_event_spec(str)] # Highlight the first match while filtering, or always when set to "always". auto_highlight: Var[bool | Literal["always"]] @@ -139,13 +139,13 @@ class MenuRoot(MenuBaseComponent): open: Var[bool] # Event handler called when the menu is opened or closed. - on_open_change: EventHandler[passthrough_event_spec(bool, dict)] + on_open_change: Annotated[EventHandler, passthrough_event_spec(bool, dict)] # Event handler called after any animations complete when the menu is closed. - on_open_change_complete: EventHandler[passthrough_event_spec(bool)] + on_open_change_complete: Annotated[EventHandler, passthrough_event_spec(bool)] # Called with the item label (or None) and reason: "keyboard", "pointer", or "none". - on_item_highlighted: EventHandler[_on_item_highlighted_spec] + on_item_highlighted: Annotated[EventHandler, _on_item_highlighted_spec] # When in a submenu, determines whether pressing the Escape key closes the entire menu, or only the current child menu. Defaults to True. close_parent_on_esc: Var[bool] @@ -453,16 +453,16 @@ class MenuSubMenuRoot(MenuBaseComponent): open: Var[bool] # Event handler called when the menu is opened or closed. - on_open_change: EventHandler[passthrough_event_spec(bool, dict)] + on_open_change: Annotated[EventHandler, passthrough_event_spec(bool, dict)] # When in a submenu, determines whether pressing the Escape key closes the entire menu, or only the current child menu. Defaults to True. close_parent_on_esc: Var[bool] # Event handler called after any animations complete when the menu is closed. - on_open_change_complete: EventHandler[passthrough_event_spec(bool)] + on_open_change_complete: Annotated[EventHandler, passthrough_event_spec(bool)] # Called with the item label (or None) and reason: "keyboard", "pointer", or "none". - on_item_highlighted: EventHandler[_on_item_highlighted_spec] + on_item_highlighted: Annotated[EventHandler, _on_item_highlighted_spec] # Whether the component should ignore user interaction. Defaults to False. disabled: Var[bool] @@ -575,7 +575,7 @@ class MenuRadioGroup(MenuBaseComponent): value: Var[str | int] # Function called when the selected value changes. - on_value_change: EventHandler[passthrough_event_spec(str | int, dict)] + on_value_change: Annotated[EventHandler, passthrough_event_spec(str | int, dict)] # Whether the component should ignore user interaction. Defaults to False. disabled: Var[bool] @@ -668,7 +668,7 @@ class MenuCheckboxItem(MenuBaseComponent): checked: Var[bool] # Event handler called when the checkbox item is ticked or unticked. - on_checked_change: EventHandler[passthrough_event_spec(bool, dict)] + on_checked_change: Annotated[EventHandler, passthrough_event_spec(bool, dict)] # Whether to close the menu when the item is clicked. Defaults to False. close_on_click: Var[bool] diff --git a/packages/reflex-components-internal/src/reflex_components_internal/components/base/navigation_menu.py b/packages/reflex-components-internal/src/reflex_components_internal/components/base/navigation_menu.py index 809196ffa74..2732764b854 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/components/base/navigation_menu.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/components/base/navigation_menu.py @@ -1,6 +1,6 @@ """Custom navigation menu component.""" -from typing import Literal +from typing import Annotated, Literal from reflex.components.component import Component, ComponentNamespace from reflex.event import EventHandler, passthrough_event_spec @@ -56,7 +56,7 @@ class NavigationMenuRoot(NavigationMenuBaseComponent): default_value: Var[str] # Callback fired when the value changes. - on_value_change: EventHandler[passthrough_event_spec(str, dict)] + on_value_change: Annotated[EventHandler, passthrough_event_spec(str, dict)] # The orientation of the navigation menu. orientation: Var[LiteralNavigationMenuOrientation] @@ -68,7 +68,7 @@ class NavigationMenuRoot(NavigationMenuBaseComponent): close_delay: Var[int] # Event handler called after any animations complete when the navigation menu is closed. - on_open_change_complete: EventHandler[passthrough_event_spec(bool)] + on_open_change_complete: Annotated[EventHandler, passthrough_event_spec(bool)] # The render prop. render_: Var[Component] diff --git a/packages/reflex-components-internal/src/reflex_components_internal/components/base/number_field.py b/packages/reflex-components-internal/src/reflex_components_internal/components/base/number_field.py index a87d4732554..173cce94d8a 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/components/base/number_field.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/components/base/number_field.py @@ -1,6 +1,6 @@ """Custom number field component.""" -from typing import Any, Literal +from typing import Annotated, Any, Literal from reflex.components.component import Component, ComponentNamespace from reflex.event import EventHandler, passthrough_event_spec @@ -99,10 +99,14 @@ class NumberFieldRoot(NumberFieldBaseComponent): format: Var[dict[str, Any]] # Event handler called when the numeric value changes. - on_value_change: EventHandler[passthrough_event_spec(int | float | None, dict)] + on_value_change: Annotated[ + EventHandler, passthrough_event_spec(int | float | None, dict) + ] # Event handler called when the numeric value is committed. - on_value_committed: EventHandler[passthrough_event_spec(int | float | None, dict)] + on_value_committed: Annotated[ + EventHandler, passthrough_event_spec(int | float | None, dict) + ] # The locale used to format the input value. locale: Var[str | list[str]] diff --git a/packages/reflex-components-internal/src/reflex_components_internal/components/base/otp_field.py b/packages/reflex-components-internal/src/reflex_components_internal/components/base/otp_field.py index f9ad8c9ee04..5d44bf8a487 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/components/base/otp_field.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/components/base/otp_field.py @@ -1,6 +1,6 @@ """Custom OTP field component.""" -from typing import Literal +from typing import Annotated, Literal from reflex.components.component import Component, ComponentNamespace from reflex.event import EventHandler, passthrough_event_spec @@ -81,13 +81,13 @@ class OTPFieldRoot(OTPFieldBaseComponent): required: Var[bool] # Event handler called on input, paste, or keyboard changes. - on_value_change: EventHandler[on_value_event_spec] + on_value_change: Annotated[EventHandler, on_value_event_spec] # Event handler called when characters are rejected by sanitization. - on_value_invalid: EventHandler[on_value_event_spec] + on_value_invalid: Annotated[EventHandler, on_value_event_spec] # Event handler called when all slots fill. - on_value_complete: EventHandler[on_value_event_spec] + on_value_complete: Annotated[EventHandler, on_value_event_spec] # The render prop render_: Var[Component] diff --git a/packages/reflex-components-internal/src/reflex_components_internal/components/base/popover.py b/packages/reflex-components-internal/src/reflex_components_internal/components/base/popover.py index 9bef5235974..7ac6267475f 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/components/base/popover.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/components/base/popover.py @@ -1,6 +1,6 @@ """Custom popover component.""" -from typing import Literal +from typing import Annotated, Literal from reflex.components.component import Component, ComponentNamespace from reflex.event import EventHandler, passthrough_event_spec @@ -52,10 +52,10 @@ class PopoverRoot(PopoverBaseComponent): open: Var[bool] # Event handler called when the popover is opened or closed - on_open_change: EventHandler[passthrough_event_spec(bool, dict)] + on_open_change: Annotated[EventHandler, passthrough_event_spec(bool, dict)] # Event handler called after any animations complete when the popover is opened or closed. - on_open_change_complete: EventHandler[passthrough_event_spec(bool)] + on_open_change_complete: Annotated[EventHandler, passthrough_event_spec(bool)] # Determines if the popover enters a modal state when open. # - True: user interaction is limited to just the popover: focus is trapped, document page scroll is locked, and pointer interactions on outside elements are disabled. diff --git a/packages/reflex-components-internal/src/reflex_components_internal/components/base/preview_card.py b/packages/reflex-components-internal/src/reflex_components_internal/components/base/preview_card.py index 32f4fae3aa9..6aef0175ef4 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/components/base/preview_card.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/components/base/preview_card.py @@ -1,6 +1,6 @@ """Custom preview card component.""" -from typing import Literal +from typing import Annotated, Literal from reflex.components.component import Component, ComponentNamespace from reflex.event import EventHandler, passthrough_event_spec @@ -49,10 +49,10 @@ class PreviewCardRoot(PreviewCardBaseComponent): open: Var[bool] # Event handler called when the preview card is opened or closed. - on_open_change: EventHandler[passthrough_event_spec(bool, dict)] + on_open_change: Annotated[EventHandler, passthrough_event_spec(bool, dict)] # Event handler called after any animations complete when the preview card is opened or closed. - on_open_change_complete: EventHandler[passthrough_event_spec(bool)] + on_open_change_complete: Annotated[EventHandler, passthrough_event_spec(bool)] # How long to wait before the preview card opens. Specified in milliseconds. Defaults to 600. delay: Var[int] diff --git a/packages/reflex-components-internal/src/reflex_components_internal/components/base/select.py b/packages/reflex-components-internal/src/reflex_components_internal/components/base/select.py index 05d66ea3ddf..f051c802fb7 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/components/base/select.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/components/base/select.py @@ -1,6 +1,6 @@ """Custom select component.""" -from typing import Any, Literal +from typing import Annotated, Any, Literal from reflex_components_core.core.foreach import foreach @@ -71,7 +71,7 @@ class SelectRoot(SelectBaseComponent): value: Var[Any] # Callback fired when the value of the select changes. Use when controlled. - on_value_change: EventHandler[passthrough_event_spec(str)] + on_value_change: Annotated[EventHandler, passthrough_event_spec(str)] # Whether the select popup is initially open. # To render a controlled select popup, use the `open` prop instead. @@ -81,7 +81,7 @@ class SelectRoot(SelectBaseComponent): open: Var[bool] # Event handler called when the select popup is opened or closed - on_open_change: EventHandler[passthrough_event_spec(bool)] + on_open_change: Annotated[EventHandler, passthrough_event_spec(bool)] # A ref to the imperative `close` and `unmount` actions. # Supplying this ref does not disable automatic unmounting. @@ -115,7 +115,7 @@ class SelectRoot(SelectBaseComponent): multiple: Var[bool] # Event handler called after any animations complete when the select popup is opened or closed - on_open_change_complete: EventHandler[passthrough_event_spec(bool)] + on_open_change_complete: Annotated[EventHandler, passthrough_event_spec(bool)] # Whether the component should ignore user interaction. Defaults to False. disabled: Var[bool] diff --git a/packages/reflex-components-internal/src/reflex_components_internal/components/base/slider.py b/packages/reflex-components-internal/src/reflex_components_internal/components/base/slider.py index 7424b0a2b66..85c10b4ce1a 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/components/base/slider.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/components/base/slider.py @@ -1,6 +1,6 @@ """Custom Slider component.""" -from typing import Literal +from typing import Annotated, Literal from reflex.components.component import Component, ComponentNamespace from reflex.event import EventHandler, passthrough_event_spec @@ -79,10 +79,10 @@ class SliderRoot(SliderBaseComponent): value: Var[int | float | list[int | float]] # Callback function that is fired when the slider's value changed. - on_value_change: EventHandler[on_value_event_spec] + on_value_change: Annotated[EventHandler, on_value_event_spec] # Callback function that is fired when the pointerup is triggered. - on_value_committed: EventHandler[on_value_event_spec] + on_value_committed: Annotated[EventHandler, on_value_event_spec] # Locale information for formatting. locale: Var[str] diff --git a/packages/reflex-components-internal/src/reflex_components_internal/components/base/switch.py b/packages/reflex-components-internal/src/reflex_components_internal/components/base/switch.py index 184c7315b2c..6d437761df1 100644 --- a/packages/reflex-components-internal/src/reflex_components_internal/components/base/switch.py +++ b/packages/reflex-components-internal/src/reflex_components_internal/components/base/switch.py @@ -1,5 +1,7 @@ """Custom switch component.""" +from typing import Annotated + from reflex.components.component import Component, ComponentNamespace from reflex.event import EventHandler, passthrough_event_spec from reflex.utils.imports import ImportVar @@ -43,7 +45,7 @@ class SwitchRoot(SwitchBaseComponent): checked: Var[bool] # Event handler called when the switch is activated or deactivated. - on_checked_change: EventHandler[passthrough_event_spec(bool)] + on_checked_change: Annotated[EventHandler, passthrough_event_spec(bool)] # Whether the component renders a native