diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 16a30bc9b1b..0173d9e43cf 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -54,38 +54,23 @@ repos: require_serial: true - repo: local hooks: - - id: pyright - name: pyright - entry: uv run --no-sync pyright - language: system - types: [python] - require_serial: true -- repo: local - hooks: - # The second opinion the assert_type examples exist for. Always runs: what - # these examples catch is a source change altering an inferred type, so - # scoping the hook to the examples themselves would never fire on the edit - # that broke them. + # Always runs: a dependency bump changes no .py file but can change what ty infers. - id: ty name: ty - entry: uv run --no-sync ty check --python-version 3.14 tests/type_checking - language: system - always_run: true - pass_filenames: false - require_serial: true - # pyright over the examples under pinned Python versions, whatever the - # running interpreter: an annotation in a class body resolves differently - # before 3.14's deferred annotations. - - id: pyright-type-checking-3.11 - name: pyright type_checking (Python 3.11) - entry: uv run --no-sync pyright --pythonversion 3.11 tests/type_checking + entry: uv run --no-sync ty check language: system always_run: true pass_filenames: false require_serial: true - - id: pyright-type-checking-3.14 - name: pyright type_checking (Python 3.14) - entry: uv run --no-sync pyright --pythonversion 3.14 tests/type_checking +- repo: local + hooks: + # The assert_type examples, which the ty hook checks under the oldest Python + # the project supports, re-checked against the newest. Always runs: what these + # examples catch is a source change altering an inferred type, so scoping the + # hook to the examples themselves would never fire on the edit that broke them. + - id: ty-type-checking + name: ty-type-checking + entry: uv run --no-sync ty check --python-version 3.14 tests/type_checking language: system always_run: true pass_filenames: false diff --git a/AGENTS.md b/AGENTS.md index 9bc22def8d8..0dd75f6bf5c 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -18,8 +18,8 @@ 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 python scripts/check_min_deps.py # validate each package's declared minimum dep versions (pyright in isolated min-version envs; workspace siblings resolve from locally built wheels, all other deps from PyPI). CI passes --wheelhouse instead, reusing the build jobs' artifacts +uv run ty check # type check +uv run python scripts/check_min_deps.py # validate each package's declared minimum dep versions (ty in isolated min-version envs; workspace siblings resolve from locally built wheels, all other deps from PyPI). CI passes --wheelhouse instead, reusing the build jobs' artifacts uv run python scripts/check_min_deps.py --check-dev-pins [pkg] # fail if pkg (default: all) declares an unpublishable *.dev dependency pin (the publish workflow runs the same gate via `reflex-release check-dev-pins`) uv run reflex-release sync # regenerate the release workflows after editing [tool.reflex-release] or the reflex-release templates uv run python scripts/make_pyi.py # regenerate .pyi stubs @@ -255,7 +255,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. News fragment added for user-facing changes diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 477ebcdaef3..f75b1280c00 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -175,7 +175,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. @@ -184,7 +184,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/__init__.py b/docs/app/reflex_docs/pages/docs/__init__.py index 8f716489682..f0cc3edd2f0 100644 --- a/docs/app/reflex_docs/pages/docs/__init__.py +++ b/docs/app/reflex_docs/pages/docs/__init__.py @@ -603,7 +603,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/docs/app/reflex_docs/pages/docs/cloud_cliref.py b/docs/app/reflex_docs/pages/docs/cloud_cliref.py index 404e2acc36e..b3155921457 100644 --- a/docs/app/reflex_docs/pages/docs/cloud_cliref.py +++ b/docs/app/reflex_docs/pages/docs/cloud_cliref.py @@ -261,7 +261,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 2e87017c85e..3ffddeae291 100644 --- a/docs/app/reflex_docs/templates/docpage/sidebar/sidebar.py +++ b/docs/app/reflex_docs/templates/docpage/sidebar/sidebar.py @@ -598,7 +598,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/examples/playground/.content-hash b/examples/playground/.content-hash index baa0334b36f..e960ae14262 100644 --- a/examples/playground/.content-hash +++ b/examples/playground/.content-hash @@ -1 +1 @@ -sha256:4e394b7fae5105fdd5820509cefc0ee7bd5d4e05714a89cfb8d1478568123ef5 +sha256:f50e05a55356fb4b42fd96381c6566bfc6c7ca6ac146bc98ae038a3dc7cd6877 diff --git a/examples/playground/playground/models.py b/examples/playground/playground/models.py index ffc732ef005..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__ # pyright: ignore[reportAttributeAccessIssue] + 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/charts.py b/examples/playground/playground/pages/charts.py index c08e2d6ab87..ae3fa209139 100644 --- a/examples/playground/playground/pages/charts.py +++ b/examples/playground/playground/pages/charts.py @@ -7,7 +7,7 @@ from playground.layout import layout from playground.states.charts import KINDS, MAX_POINTS, MIN_POINTS, ChartsState -CHART_SIZE = {"width": "100%", "height": 280} +CHART_SIZE: dict[str, Any] = {"width": "100%", "height": 280} def waves_chart() -> rx.Component | rx.Var: diff --git a/examples/playground/playground/pages/grids.py b/examples/playground/playground/pages/grids.py index fcf341a96af..1bb50f01074 100644 --- a/examples/playground/playground/pages/grids.py +++ b/examples/playground/playground/pages/grids.py @@ -31,7 +31,7 @@ def grids() -> rx.Component: rx.data_editor( columns=EDITOR_COLUMNS, data=GridState.rows, - on_cell_edited=GridState.edit_cell, # pyright: ignore[reportArgumentType] + on_cell_edited=GridState.edit_cell, # ty:ignore[invalid-argument-type] height="20rem", ), id="grids-editor", diff --git a/examples/playground/playground/pages/item.py b/examples/playground/playground/pages/item.py index 7651b1acbfa..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")), # pyright: ignore[reportAttributeAccessIssue] + rx.text("item_id: ", rx.code(rx.State.item_id, id="item-id")), # ty:ignore[missing-attribute] ) ) diff --git a/examples/playground/playground/pages/settings.py b/examples/playground/playground/pages/settings.py index 769c211954d..157889737f5 100644 --- a/examples/playground/playground/pages/settings.py +++ b/examples/playground/playground/pages/settings.py @@ -75,7 +75,7 @@ def settings() -> rx.Component: name.capitalize(), rx.switch( checked=SettingsState.switches[name], - on_change=lambda _, name=name: SettingsState.flip( + on_change=lambda _, name=name: SettingsState.flip( # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/4098 name ), id=f"settings-switch-{name}", @@ -123,7 +123,7 @@ def settings() -> rx.Component: rx.callout( "The accent previews here; the app theme stays violet.", icon="info", - color_scheme=SettingsState.accent, # pyright: ignore[reportArgumentType] + color_scheme=SettingsState.accent, # ty:ignore[invalid-argument-type] size=rx.cond(SettingsState.compact, "1", "2"), id="settings-preview", ), diff --git a/examples/playground/playground/pages/tasks.py b/examples/playground/playground/pages/tasks.py index d21811610fd..eba1b90cdfe 100644 --- a/examples/playground/playground/pages/tasks.py +++ b/examples/playground/playground/pages/tasks.py @@ -32,7 +32,7 @@ def task_row(task: rx.vars.ObjectVar[Task]) -> rx.Component: return rx.hstack( rx.checkbox( checked=task.done, - on_change=lambda _: TasksState.toggle(task.id), + on_change=lambda _: TasksState.toggle(task.id), # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/4098 ), rx.text( task.title, @@ -123,7 +123,7 @@ def tasks() -> rx.Component: *[ rx.input( placeholder=f"note on {tag}", - on_blur=lambda value, tag=tag: TasksState.set_note(tag, value), + on_blur=lambda value, tag=tag: TasksState.set_note(tag, value), # ty:ignore[invalid-argument-type] https://github.com/astral-sh/ty/issues/4098 id=f"tasks-note-{tag}", ) for tag in TAG_CHOICES diff --git a/examples/playground/playground/states/data.py b/examples/playground/playground/states/data.py index 247f056d02f..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)) # pyright: ignore[reportAttributeAccessIssue] + 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/examples/playground/playground/states/editor.py b/examples/playground/playground/states/editor.py index 40992ec0faf..321b485db8d 100644 --- a/examples/playground/playground/states/editor.py +++ b/examples/playground/playground/states/editor.py @@ -117,7 +117,7 @@ def save(self, form_data: dict[str, Any]): return rx.toast.error("Fix the highlighted fields.") with rx.session() as session: if self.product is None: - product = Product(listed_day=0, **values) # pyright: ignore[reportArgumentType] + product = Product(listed_day=0, **values) # ty:ignore[invalid-argument-type] else: product = session.get(Product, self.product.id) if product is None: diff --git a/examples/playground/playground/states/tasks.py b/examples/playground/playground/states/tasks.py index 5a595f0eb81..83d6ebdff00 100644 --- a/examples/playground/playground/states/tasks.py +++ b/examples/playground/playground/states/tasks.py @@ -168,7 +168,7 @@ def set_filter(self, value: str | list[str]): value: One of ``all``, ``open`` and ``done``. """ if value in FILTERS: - self.filter = value + self.filter = value # ty:ignore[invalid-assignment] https://github.com/astral-sh/ty/issues/5082 @rx.event def set_note(self, tag: str, text: str): diff --git a/examples/playground/playground/states/widgets.py b/examples/playground/playground/states/widgets.py index b3d1c90f237..6334c911622 100644 --- a/examples/playground/playground/states/widgets.py +++ b/examples/playground/playground/states/widgets.py @@ -24,7 +24,7 @@ def set_layout(self, value: str | list[str]): value: One of ``cards``, ``list`` and ``table``. """ if value in LAYOUTS: - self.layout = value + self.layout = value # ty:ignore[invalid-assignment] https://github.com/astral-sh/ty/issues/5082 @rx.event def next_shape(self): 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..65210b4bc9e --- /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, `passthrough_event_spec` accepts a union type such as `int | None`, and a `hybrid_property` whose frontend var is a `@classmethod` reads as that var instead of `Unknown`. 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/client_state.py b/packages/reflex-base/src/reflex_base/client_state.py index 923a2d3d6e6..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 @@ -18,8 +18,8 @@ from reflex_base.constants.state import CAMEL_CASE_CLIENT_STATE_MARKER, CLIENT_STATE_REF from reflex_base.event import ( EventChain, - EventHandler, EventSpec, + EventType, event_args_signature, run_script, server_side, @@ -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 @@ -281,7 +281,7 @@ class ClientStateSetter(FunctionVar[Any]): # The type of the value being set, used to type lambda updater placeholders. _value_type: Any = dataclasses.field(default=Any) - def __call__(self, value: Any = NoValue) -> Var: # pyright: ignore [reportIncompatibleMethodOverride] + def __call__(self, value: Any = NoValue) -> Var: """Bind a value to this setter. Args: @@ -640,7 +640,7 @@ def global_set(self) -> Var: _var_data=self._escape_var_data, ).to(FunctionVar) - 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/packages/reflex-base/src/reflex_base/components/component.py b/packages/reflex-base/src/reflex_base/components/component.py index 8cbc6993e53..250e5460060 100644 --- a/packages/reflex-base/src/reflex_base/components/component.py +++ b/packages/reflex-base/src/reflex_base/components/component.py @@ -154,12 +154,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-explicit-return] def _field_values_equal(a: Any, b: Any) -> bool: @@ -430,7 +430,7 @@ def __deepcopy__(self, memo: dict[int, Any]) -> 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 _COMPILE_CACHE_ATTRS: attrs.pop(attr, None) @@ -530,7 +530,7 @@ class ComponentNamespace(SimpleNamespace): # expressions can reach its attributes (e.g. ``rx.form.FormData``). _stub_as_class: ClassVar[bool] = False - def __hash__(self) -> int: # pyright: ignore [reportIncompatibleVariableOverride] + def __hash__(self) -> int: """Get the hash of the namespace. Returns: @@ -670,15 +670,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( @@ -1118,7 +1118,7 @@ def get_event_triggers(cls) -> dict[str, types.ArgsSpec | Sequence[types.ArgsSpe cached = cls.__dict__.get("_event_triggers_cache") if cached is not None: return cached - result = DEFAULT_TRIGGERS | args_specs_from_fields(cls.get_fields()) # pyright: ignore [reportOperatorIssue] + result = DEFAULT_TRIGGERS | args_specs_from_fields(cls.get_fields()) cls._event_triggers_cache = result return result @@ -1410,9 +1410,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: 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: component_style = Style(style) return component_style @@ -1600,12 +1600,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 @@ -2342,7 +2344,7 @@ def _format_patterns_into_condition(patterns: list, element: Var) -> Var: ) -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: @@ -2351,37 +2353,38 @@ def render_dict_to_var(tag: dict | 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"]) + 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"] + render_dict_to_var(child.render()) for child in render_dict["children"] ]) func = ArgsFunctionOperation.create( - (tag["arg_var_name"], tag["index_var_name"]), + (render_dict["arg_var_name"], render_dict["index_var_name"]), function_return, ) return FunctionStringVar.create("Array.prototype.map.call").call( - tag["iterable"] - if not isinstance(tag["iterable"], ObjectVar) - else tag["iterable"].items(), + 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"]) + if "match_cases" in render_dict: + element = Var(render_dict["cond"]) - conditionals = render_dict_to_var(tag["default"]) + conditionals = render_dict_to_var(render_dict["default"]) - for case in tag["match_cases"][::-1]: + for case in render_dict["match_cases"][::-1]: patterns, return_value = case condition = _format_patterns_into_condition(patterns, element) @@ -2393,18 +2396,18 @@ def render_dict_to_var(tag: dict | Component | str) -> Var: return conditionals - if "cond_state" in tag: + if "cond_state" in render_dict: 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(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"]) + "})") + props = Var("({" + ",".join(render_dict["props"]) + "})") - raw_tag_name = tag.get("name") + raw_tag_name = render_dict.get("name") tag_name = Var(raw_tag_name or "Fragment") return FunctionStringVar.create( @@ -2412,7 +2415,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 render_dict["children"]], ) diff --git a/packages/reflex-base/src/reflex_base/components/field.py b/packages/reflex-base/src/reflex_base/components/field.py index bcf054c6a32..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__ # pyright: ignore [reportAttributeAccessIssue] + 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: @@ -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/components/memo.py b/packages/reflex-base/src/reflex_base/components/memo.py index fdfb151db80..2b7873f8060 100644 --- a/packages/reflex-base/src/reflex_base/components/memo.py +++ b/packages/reflex-base/src/reflex_base/components/memo.py @@ -8,7 +8,7 @@ from copy import copy from enum import Enum from functools import cache, partial, update_wrapper -from types import UnionType +from types import FunctionType, UnionType from typing import ( Annotated, Any, @@ -49,7 +49,7 @@ from reflex_base.utils import console, format, memo_paths from reflex_base.utils.deterministic_hash import deterministic_hash from reflex_base.utils.imports import ImportVar, ParsedImportDict -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, scoped_var_data from reflex_base.vars.base import LiteralVar, Var from reflex_base.vars.function import ( @@ -280,7 +280,7 @@ def get(self, thunk: Callable[[], _BodyT] | None = None) -> _BodyT: class MemoDefinition: """Base metadata for a memo.""" - fn: Callable[..., Any] + fn: FunctionType python_name: str params: tuple[MemoParam, ...] # The Python module that defined this memo. When set, the memo's compiled @@ -977,7 +977,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] + set_signature(_placeholder, inspect.signature(primary_spec)) return _placeholder @@ -1226,7 +1226,7 @@ def finalize( def _evaluate_memo_function( - fn: Callable[..., Any], + fn: FunctionType, params: tuple[MemoParam, ...], runtime_values: Mapping[str, Any] | None = None, ) -> Any: @@ -1317,7 +1317,7 @@ def _lift_rest_props(component: Component, rest_target_fields: set[str]) -> Comp def _analyze_params( - fn: Callable[..., Any], + fn: FunctionType, *, for_component: bool, hints: dict[str, Any] | None = None, @@ -1511,7 +1511,7 @@ def _build_args_function( def _evaluate_component_body( - fn: Callable[..., Any], + fn: FunctionType, params: tuple[MemoParam, ...], rest_target_fields: set[str], runtime_values: Mapping[str, Any] | None = None, @@ -1544,7 +1544,7 @@ def _evaluate_component_body( def _evaluate_function_body( - fn: Callable[..., Any], params: tuple[MemoParam, ...] + fn: FunctionType, params: tuple[MemoParam, ...] ) -> ArgsFunctionOperation: """Run a var memo's body and build its compiled function. @@ -1561,7 +1561,7 @@ def _evaluate_function_body( def _create_component_definition( - fn: Callable[..., Any], + fn: FunctionType, return_annotation: Any, source_module: str | None = None, ) -> MemoComponentDefinition: @@ -2352,7 +2352,7 @@ def _warn_legacy_base_props(fn_name: str, prop_names: Sequence[str]) -> None: def _memo_impl( - fn: Callable[..., Any], + fn: FunctionType, wrapper: Var | None, ) -> _MemoComponentWrapper | _MemoFunctionWrapper: """Analyze and register a memo definition for a decorated function. @@ -2470,7 +2470,7 @@ def memo( *, wrapper: Var | None ) -> Callable[[Callable[..., Component]], _MemoComponentWrapper]: ... def memo( - fn: Callable[..., Any] | None = None, + fn: FunctionType | None = None, *, wrapper: Var | None = DEFAULT_MEMO_WRAPPER, ) -> ( diff --git a/packages/reflex-base/src/reflex_base/components/props.py b/packages/reflex-base/src/reflex_base/components/props.py index 1d69df4aee7..051cb747278 100644 --- a/packages/reflex-base/src/reflex_base/components/props.py +++ b/packages/reflex-base/src/reflex_base/components/props.py @@ -160,11 +160,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-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/environment.py b/packages/reflex-base/src/reflex_base/environment.py index 0d5bf09d6b5..cb5d8e0f8c9 100644 --- a/packages/reflex-base/src/reflex_base/environment.py +++ b/packages/reflex-base/src/reflex_base/environment.py @@ -646,7 +646,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 diff --git a/packages/reflex-base/src/reflex_base/event/__init__.py b/packages/reflex-base/src/reflex_base/event/__init__.py index 63844816912..8f57ebd4286 100644 --- a/packages/reflex-base/src/reflex_base/event/__init__.py +++ b/packages/reflex-base/src/reflex_base/event/__init__.py @@ -14,6 +14,7 @@ TYPE_CHECKING, Annotated, Any, + ClassVar, Generic, Literal, NoReturn, @@ -54,6 +55,7 @@ is_non_string_sequence, is_optional, safe_issubclass, + set_signature, typehint_issubclass, value_inside_optional, ) @@ -492,7 +494,7 @@ def _no_chain_background_task(state: "BaseState", fn: Callable) -> Callable: Raises: TypeError: If the background task is not async. """ - name = fn.__name__ + name = format.callable_name(fn) call = f"{type(state).__name__}.{name}" message = ( f"Cannot directly call background task {name!r}, use " @@ -645,16 +647,17 @@ def _parameters(self) -> Mapping[str, inspect.Parameter]: return parameters @classmethod - def __class_getitem__(cls, args_spec: str) -> Annotated: + 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. """ - return Annotated[cls, args_spec] + return Annotated[cls, args_spec] # ty:ignore[invalid-type-form] @cached_property def is_background(self) -> bool: @@ -928,7 +931,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="") @@ -1128,7 +1131,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( @@ -1483,7 +1486,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]]]: ... @@ -1494,11 +1497,25 @@ 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_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]: ... -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: @@ -1511,22 +1528,23 @@ 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] + new_signature = inspect.signature(inner).replace( 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, ) + set_signature(inner, new_signature) 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 @@ -1731,7 +1749,7 @@ def fn(): return None fn.__qualname__ = name - fn.__signature__ = sig # pyright: ignore [reportFunctionMemberAccess] + set_signature(fn, sig) return EventSpec( handler=EventHandler(fn=fn), args=tuple( @@ -2960,7 +2978,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. @@ -2989,6 +3007,7 @@ def create( EventFnArgMismatchError: If the event handler takes arguments. """ if isinstance(value, EventHandler): + handler = value def no_args(): return () @@ -2996,7 +3015,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 {format.callable_qualname(handler.fn)} used inside of a rx.cond() must not take any arguments." raise EventFnArgMismatchError(msg) from None return cls( @@ -3047,7 +3066,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. @@ -3080,7 +3099,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) @@ -3215,7 +3234,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__( @@ -3423,7 +3442,7 @@ def __call__( value8: V8 | Var[V8], ) -> "EventCallback[V9, *Q]": ... - def __call__(self, *values) -> "EventCallback": # pyright: ignore [reportInconsistentOverload] + def __call__(self, *values) -> "EventCallback": """Call the function with the values. Args: @@ -3432,7 +3451,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__( @@ -3552,6 +3571,12 @@ def __call__( 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] + # The re-exports are explicit aliases, so mypy reads `rx.event.EventSpec` as # a type. A generic one is re-imported instead, so `rx.event.EventCallback[int]` # is valid for every checker: pyright reads an explicit alias of a generic as @@ -3714,7 +3739,7 @@ def wrapper(func: Callable[..., Any]) -> EventCallback: deprecation_version="0.11.0", removal_version="1.0", ) - return func # pyright: ignore [reportReturnType] + 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] = {} @@ -3783,7 +3808,7 @@ def wrapper(func: Callable[..., Any]) -> EventCallback: deprecation_version="0.11.0", removal_version="1.0", ) - return func # pyright: ignore [reportReturnType] + return func # ty:ignore[invalid-explicit-return] if registered: # Already renamed: re-register it under the same name. name = qualname @@ -3801,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) # pyright: ignore [reportReturnType] + return EventHandler(fn=func, event_actions=event_actions) # ty:ignore[invalid-explicit-return] if func is not None: return wrapper(func) - return wrapper # pyright: ignore [reportReturnType] + return wrapper get_event = staticmethod(get_event) get_hydrate_event = staticmethod(get_hydrate_event) @@ -3858,7 +3883,7 @@ def wrapper(func: Callable[..., Any]) -> EventCallback: __file__ = __file__ @property - def BaseState(self) -> "type[BaseState]": # noqa: N802 + def BaseState(self) -> "type[BaseState]": # noqa: N802 # ty:ignore[invalid-type-form] """The BaseState class. A reference to BaseState is needed for doc generation when resolving @@ -3874,9 +3899,9 @@ def BaseState(self) -> "type[BaseState]": # noqa: N802 event = EventNamespace -event.event = event # pyright: ignore[reportAttributeAccessIssue] +event.event = event _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__ +event.__spec__ = _this.__spec__ +event.__package__ = _this.__package__ +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 6cb4624dd51..3f80238bd5a 100644 --- a/packages/reflex-base/src/reflex_base/event/context.py +++ b/packages/reflex-base/src/reflex_base/event/context.py @@ -12,7 +12,7 @@ from reflex_base import otel from reflex_base.context.base import BaseContext -from reflex_base.utils.format import to_snake_case +from reflex_base.utils.format import callable_qualname, to_snake_case if TYPE_CHECKING: from opentelemetry.context import Context @@ -35,7 +35,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 = 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 8af90e5b769..6443881a05e 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 @@ -34,7 +34,7 @@ from reflex_base.event.processor.future import EventFuture from reflex_base.registry import RegisteredEventHandler from reflex_base.utils.form import form_data_as_dict, transform_form_data -from reflex_base.utils.format import format_event_handler +from reflex_base.utils.format import callable_qualname, format_event_handler from reflex_base.utils.serializers import deserializers from reflex_base.utils.types import is_non_string_sequence @@ -1055,7 +1055,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=callable_qualname(self.backend_exception_handler), ) 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 915c0e05bcd..0742d72410d 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 @@ -38,7 +38,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.""" _QUEUE_SHUTDOWN_ERRORS: tuple[type[BaseException], ...] = (asyncio.QueueShutDown,) @@ -592,7 +592,7 @@ async def _wait_for_chain() -> None: # 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 @@ -715,7 +715,7 @@ def _cancel_older_chains(self, key: tuple[str, str], root_gen: int) -> None: previous.cancel() slot.clear() - 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 @@ -835,7 +835,7 @@ def _create_event_task( else: task = asyncio.create_task(coro, name=name) if sys.version_info < (3, 12): - task._event_ctx = entry.ctx # pyright: ignore[reportAttributeAccessIssue] + task._event_ctx = entry.ctx # ty:ignore[missing-attribute] self._tasks[entry.ctx.txid] = task task.add_done_callback(self._finish_task) return task @@ -974,7 +974,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 # ty:ignore[missing-attribute] else: task_ctx = task.get_context().run(EventContext.get) self._tasks.pop(task_ctx.txid, None) @@ -1042,7 +1042,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 # pyright: ignore[reportAttributeAccessIssue] + 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/plugins/base.py b/packages/reflex-base/src/reflex_base/plugins/base.py index 3f52afe48ee..c52d7f00e67 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, Mapping, Sequence from enum import Enum from pathlib import Path @@ -22,7 +24,12 @@ class HookOrder(str, Enum): from reflex.app import App, UnevaluatedPage from reflex_base.components.component import BaseComponent, Component from reflex_base.event import EventType - from reflex_base.plugins.compiler import ComponentAndChildren, PageContext + from reflex_base.plugins.compiler import ( + CompileContext, + ComponentAndChildren, + PageComponent, + PageContext, + ) from reflex_base.vars.base import Var @@ -58,7 +65,7 @@ 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 AddPageProtocol(Protocol): @@ -71,14 +78,14 @@ class AddPageProtocol(Protocol): def __call__( self, - component: "Component | Callable[[], Any] | None" = None, + component: Component | Callable[[], Any] | None = None, route: str | None = None, *, - title: "str | Var | None" = None, - description: "str | Var | None" = None, + title: str | Var | None = None, + description: str | Var | None = None, image: str = ..., - on_load: "EventType[()] | None" = None, - meta: Sequence["Mapping[str, Any] | Component"] = ..., + on_load: EventType[()] | None = None, + meta: Sequence[Mapping[str, Any] | Component] = ..., context: dict[str, Any] | None = None, **extra_page_args: Any, ) -> None: @@ -101,7 +108,7 @@ def __call__( class RegisterRouteContext(CommonContext): """Context for the ``register_route`` hook.""" - app_type: type["App"] + app_type: type[App] add_page: AddPageProtocol has_app_page: Callable[[str], bool] @@ -109,7 +116,7 @@ class RegisterRouteContext(CommonContext): class PostCompileContext(CommonContext): """Context for post-compile hooks.""" - app: "App" + app: App class PostBuildContext(CommonContext): @@ -251,10 +258,10 @@ def update_env_json( def eval_page( self, - page_fn: Any, + page_fn: PageComponent, /, **kwargs: Any, - ) -> "PageContext | None": + ) -> PageContext | None: """Evaluate a page-like object into a page context. Args: @@ -268,7 +275,7 @@ def eval_page( def compile_page( self, - page_ctx: "PageContext", + page_ctx: PageContext, /, **kwargs: Any, ) -> None: @@ -277,13 +284,13 @@ def compile_page( def enter_component( self, - comp: "BaseComponent", + comp: BaseComponent, /, *, - page_context: "PageContext", - compile_context: Any, + 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: @@ -299,14 +306,14 @@ def enter_component( def leave_component( self, - comp: "BaseComponent", - children: tuple["BaseComponent", ...], + comp: BaseComponent, + children: tuple[BaseComponent, ...], /, *, - page_context: "PageContext", - compile_context: Any, + 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: diff --git a/packages/reflex-base/src/reflex_base/plugins/compiler.py b/packages/reflex-base/src/reflex_base/plugins/compiler.py index a30aa95fd39..14b58e9064d 100644 --- a/packages/reflex-base/src/reflex_base/plugins/compiler.py +++ b/packages/reflex-base/src/reflex_base/plugins/compiler.py @@ -10,6 +10,7 @@ from reflex_base.components.component import BaseComponent, Component from reflex_base.context.base import BaseContext +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 @@ -728,7 +729,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/plugins/shared_tailwind.py b/packages/reflex-base/src/reflex_base/plugins/shared_tailwind.py index 3908d56fc19..530ba92432b 100644 --- a/packages/reflex-base/src/reflex_base/plugins/shared_tailwind.py +++ b/packages/reflex-base/src/reflex_base/plugins/shared_tailwind.py @@ -2,7 +2,6 @@ import dataclasses import logging -from collections.abc import Mapping from copy import deepcopy from typing import Any, Literal, NotRequired, TypedDict @@ -111,7 +110,7 @@ def tailwind_config_js_template( imports = [ 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 @@ -122,12 +121,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'])};" ) - elif not isinstance(plugin, Mapping): - plugin_imports.append(f"import plugin{i} from {json.dumps(plugin)};") plugin_imports_lines = "\n".join(plugin_imports) @@ -139,7 +138,7 @@ 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"]) diff --git a/packages/reflex-base/src/reflex_base/style.py b/packages/reflex-base/src/reflex_base/style.py index 78eb046e7f3..9db60b30881 100644 --- a/packages/reflex-base/src/reflex_base/style.py +++ b/packages/reflex-base/src/reflex_base/style.py @@ -139,7 +139,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: @@ -148,7 +148,7 @@ 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): @@ -162,8 +162,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: @@ -173,7 +173,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, ...] @@ -364,7 +364,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/telemetry_context.py b/packages/reflex-base/src/reflex_base/telemetry_context.py index 6219a767f6c..72488951b6b 100644 --- a/packages/reflex-base/src/reflex_base/telemetry_context.py +++ b/packages/reflex-base/src/reflex_base/telemetry_context.py @@ -55,7 +55,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/decorator.py b/packages/reflex-base/src/reflex_base/utils/decorator.py index e2b27ee1f01..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 # pyright: ignore[reportReturnType] + return value # ty:ignore[invalid-explicit-return] return wrapper @@ -64,12 +64,16 @@ def debug(f: Callable[P, T]) -> Callable[P, T]: Returns: A function that prints the function name, arguments, and result. """ + # Import here to avoid circular imports. + from reflex_base.utils.format import callable_name + + 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}" + f"Calling {fn_name} with args: {args} and kwargs: {kwargs}, result: {result}" ) return result @@ -111,7 +115,12 @@ 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] + # Import here to avoid circular imports. + from reflex_base.utils.format import callable_name + + fn_name = callable_name(func) + def _inner(*args: P.args, **kwargs: P.kwargs) -> Picklable: cache_file = cache_file_path() @@ -124,7 +133,7 @@ def _inner(*args: P.args, **kwargs: P.kwargs) -> Picklable: return new_value logger.debug( - f"Using cached value for {func.__name__} with payload: {new_payload}" + 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/deterministic_hash.py b/packages/reflex-base/src/reflex_base/utils/deterministic_hash.py index 39611c0de8d..0f08a70cfe2 100644 --- a/packages/reflex-base/src/reflex_base/utils/deterministic_hash.py +++ b/packages/reflex-base/src/reflex_base/utils/deterministic_hash.py @@ -65,7 +65,7 @@ def _hash_dataclass_layout(cls: type) -> tuple[bytes, tuple[tuple[bytes, str], . """ layout = _hash_dataclass_layouts.get(cls) if layout is None: - fields = dataclasses.fields(cls) # pyright: ignore [reportArgumentType] + fields = dataclasses.fields(cls) # ty:ignore[invalid-argument-type] # The defining class is part of the header: two dataclasses with the # same field names and values are different values. layout = ( 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 bf31c0d5ee4..3ae19fc7a60 100644 --- a/packages/reflex-base/src/reflex_base/utils/format.py +++ b/packages/reflex-base/src/reflex_base/utils/format.py @@ -35,6 +35,40 @@ } +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 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. @@ -570,7 +604,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 f82fd8d0090..f774c837e07 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 Iterable, Mapping, Sequence +from typing import final # Absolute import paths beginning with one of these reserved ``.web`` # subdirectories are rewritten to ``$``-prefixed module specifiers. @@ -204,6 +205,7 @@ def collapse_imports( } +@final @dataclasses.dataclass(frozen=True) class ImportVar: """An import var.""" diff --git a/packages/reflex-base/src/reflex_base/utils/log.py b/packages/reflex-base/src/reflex_base/utils/log.py index 101e5345ab0..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. @@ -224,7 +224,7 @@ def emit(self, record: logging.LogRecord): "markup": markup, **getattr(record, _RICH_KWARGS_FIELD, {}), } - console.print(f"{prefix}{record.getMessage()}", **print_kwargs) + console.print(f"{prefix}{record.getMessage()}", **print_kwargs) # ty:ignore[invalid-argument-type] if record.exc_info and record.exc_info[0] is not None: # Tracebacks may contain user data; never parse them as markup. # Never word-wrap them either: wrapping breaks file paths. @@ -246,7 +246,7 @@ def format_exception(self, record: logging.LogRecord) -> str: Returns: The formatted traceback. """ - return _EXC_FORMATTER.formatException(record.exc_info) # pyright: ignore[reportArgumentType] + return _EXC_FORMATTER.formatException(record.exc_info) # ty:ignore[invalid-argument-type] def _write_json(payload: dict, *, stderr: bool): @@ -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 06280c42e84..8b0fc9a6bd4 100644 --- a/packages/reflex-base/src/reflex_base/utils/pyi_generator.py +++ b/packages/reflex-base/src/reflex_base/utils/pyi_generator.py @@ -488,7 +488,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: @@ -513,7 +513,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")]), @@ -600,7 +600,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]]: @@ -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 + default = target_class.__fields__[name].default # ty:ignore[missing-attribute] if isinstance(default, Var): default = default._decode() @@ -666,7 +666,7 @@ def _extract_class_props_as_ast_nodes( ) ), ), - ast.Constant(value=default), # pyright: ignore [reportArgumentType] + ast.Constant(value=default), )) return kwargs @@ -690,7 +690,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()) ): @@ -754,7 +755,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__) + base_name = getattr(origin, "_name", None) or getattr( + origin, "__name__", repr(origin) + ) # Get type arguments args = get_args(typ) @@ -845,7 +848,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, + type_hint_globals, ) all_props = [arg[0].arg for arg in prop_kwargs] kwargs.extend(prop_kwargs) @@ -972,7 +977,7 @@ def figure_out_return_type(annotation: Any): defaults=[], ) - return ast.FunctionDef( # pyright: ignore [reportCallIssue] + return ast.FunctionDef( name="create", args=create_args, body=[ @@ -1024,7 +1029,7 @@ def _generate_staticmethod_call_functiondef( else [] ), ) - return ast.FunctionDef( # pyright: ignore [reportCallIssue] + return ast.FunctionDef( name="__call__", args=call_args, body=[ @@ -1082,7 +1087,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): @@ -1190,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) # pyright: ignore [reportReturnType] + return self._remove_docstring(node) # ty:ignore[invalid-explicit-return] def visit_Import( self, node: ast.Import | ast.ImportFrom @@ -1420,8 +1425,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-base/src/reflex_base/utils/serializers.py b/packages/reflex-base/src/reflex_base/utils/serializers.py index a98f9b15f44..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__}." + 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() # pyright: ignore [reportAttributeAccessIssue] + mime_type = image.get_format_mimetype() # ty:ignore[missing-attribute] except AttributeError: try: # Fallback method @@ -676,7 +676,7 @@ def _get_sqlalchemy_layout(cls: type) -> _SQLAlchemyLayout: return layout import sqlalchemy - mapper = sqlalchemy.inspect(cls) + mapper = sqlalchemy.inspect(cls, raiseerr=True) manager = mapper.class_manager relationships = mapper.relationships synonyms = mapper.synonyms diff --git a/packages/reflex-base/src/reflex_base/utils/types.py b/packages/reflex-base/src/reflex_base/utils/types.py index f169140fa07..f08afe670a8 100644 --- a/packages/reflex-base/src/reflex_base/utils/types.py +++ b/packages/reflex-base/src/reflex_base/utils/types.py @@ -5,11 +5,12 @@ import ast import builtins import dataclasses +import inspect import logging import sys import types import typing -from collections.abc import Callable, Iterable, Mapping, Sequence +from collections.abc import Callable, Hashable, Iterable, Mapping, Sequence from enum import Enum from functools import lru_cache from importlib.util import find_spec @@ -29,9 +30,9 @@ Tuple, TypeVar, Union, - _eval_type, # pyright: ignore [reportAttributeAccessIssue] - _GenericAlias, # pyright: ignore [reportAttributeAccessIssue] - _SpecialGenericAlias, # pyright: ignore [reportAttributeAccessIssue] + _eval_type, # ty:ignore[missing-module-member] + _GenericAlias, # ty:ignore[missing-module-member] + _SpecialGenericAlias, # ty:ignore[missing-module-member] cast, get_args, is_typeddict, @@ -52,6 +53,21 @@ if TYPE_CHECKING: PROPERTY_CLASSES: tuple[type, ...] + +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) @@ -98,68 +114,68 @@ VAR7 = TypeVar("VAR7", bound="Var") -class _ArgsSpec0(Protocol): +class _ArgsSpec0(Hashable, Protocol): def __call__(self) -> Sequence[Var]: ... -class _ArgsSpec1(Protocol): - def __call__(self, var1: VAR1, /) -> Sequence[Var]: ... # pyright: ignore [reportInvalidTypeVarUse] +class _ArgsSpec1(Hashable, Protocol): + def __call__(self, var1: VAR1, /) -> Sequence[Var]: ... -class _ArgsSpec2(Protocol): - def __call__(self, var1: VAR1, var2: VAR2, /) -> Sequence[Var]: ... # pyright: ignore [reportInvalidTypeVarUse] +class _ArgsSpec2(Hashable, Protocol): + 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] +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, # 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]: ... -class _ArgsSpec5(Protocol): +class _ArgsSpec5(Hashable, 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]: ... -class _ArgsSpec6(Protocol): +class _ArgsSpec6(Hashable, 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]: ... -class _ArgsSpec7(Protocol): +class _ArgsSpec7(Hashable, 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]: ... @@ -545,7 +561,7 @@ def get_typed_dict_field_types(typed_dict: 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 @@ -635,8 +651,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__: + orig_bases = getattr(cls, "__orig_bases__", None) + if orig_bases is not None: + for base in orig_bases: if get_args(base): return True @@ -771,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. @@ -822,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. @@ -1010,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: @@ -1105,7 +1123,7 @@ def _get_column_access_type(cls: type, name: str) -> GenericType | None: """ import sqlalchemy - column = sqlalchemy.inspect(cls).columns[name] + column = sqlalchemy.inspect(cls, raiseerr=True).columns[name] type_ = _get_column_python_type(column.type) if type_ is None or type_ is object: type_ = _get_mapped_annotation(cls, name) or type_ @@ -1195,8 +1213,8 @@ def get_attribute_access_type( 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 ( sqlmodel_type is not None @@ -1207,7 +1225,7 @@ def get_attribute_access_type( and declares_annotation(cls, name) ): # 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_) @@ -1226,7 +1244,7 @@ def get_attribute_access_type( # ForwardRef resolution of unrelated annotations. try: if declares_annotation(cls, name): - hints = get_type_hints(cls) # pyright: ignore [reportArgumentType] + hints = get_type_hints(cls) if name in hints: return hints[name] except NameError as e: @@ -1256,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)) # pyright: ignore [reportReturnType] + 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+, @@ -1686,13 +1704,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__ + and value not in expected_args ): - allowed_values = expected_type.__args__ + 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 @@ -1955,7 +1974,7 @@ def _resolve_annotation( 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. @@ -1965,7 +1984,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 diff --git a/packages/reflex-base/src/reflex_base/vars/base.py b/packages/reflex-base/src/reflex_base/vars/base.py index 1e82c09d127..99b9158db82 100644 --- a/packages/reflex-base/src/reflex_base/vars/base.py +++ b/packages/reflex-base/src/reflex_base/vars/base.py @@ -65,7 +65,7 @@ VarDependencyError, VarTypeError, ) -from reflex_base.utils.format import format_state_name, json_dumps +from reflex_base.utils.format import callable_name, format_state_name, json_dumps from reflex_base.utils.imports import ( ImmutableImportDict, ImmutableParsedImportDict, @@ -792,7 +792,7 @@ def __init_subclass__( frozen=True, slots=True, ) - class ToVarOperation(ToOperation, cls): + 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( @@ -967,7 +967,7 @@ def _replace( @overload @classmethod - def create( # pyright: ignore[reportOverlappingOverload] + def create( cls, value: NoReturn, _var_data: VarData | None = None, @@ -975,7 +975,7 @@ def create( # pyright: ignore[reportOverlappingOverload] @overload @classmethod - def create( # pyright: ignore[reportOverlappingOverload] + def create( cls, value: builtins.bool, _var_data: VarData | None = None, @@ -1007,7 +1007,7 @@ def create( @overload @classmethod - def create( # pyright: ignore [reportOverlappingOverload] + def create( cls, value: Color, _var_data: VarData | None = None, @@ -1015,7 +1015,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, @@ -1023,7 +1023,7 @@ def create( # pyright: ignore [reportOverlappingOverload] @overload @classmethod - def create( # pyright: ignore [reportOverlappingOverload] + def create( cls, value: STRING_T, _var_data: VarData | None = None, @@ -1031,7 +1031,7 @@ def create( # pyright: ignore [reportOverlappingOverload] @overload @classmethod - def create( # pyright: ignore[reportOverlappingOverload] + def create( cls, value: None, _var_data: VarData | None = None, @@ -1107,7 +1107,7 @@ 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[builtins.bool]) -> BooleanVar: ... @@ -1181,7 +1181,7 @@ def to( return self.to(conversion_entry.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) is_class = isinstance(output, type) if ( @@ -1193,7 +1193,7 @@ def to( new_var_type = var_type else: new_var_type = var_type or current_var_type - return output_entry.to_var_subclass.create( # pyright: ignore [reportReturnType] + return output_entry.to_var_subclass.create( value=self, _var_type=new_var_type ) @@ -1220,7 +1220,7 @@ 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: ... @@ -1392,7 +1392,7 @@ 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, # The expression can read any key of the substate, so its hook @@ -1405,7 +1405,7 @@ def _var_set_state(self, state: type[BaseState] | str) -> Self: ), self._var_data, ), - ).guess_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. @@ -1757,6 +1757,31 @@ def __contains__(self, _: Any) -> Var: class ToOperation: """A var operation that converts a var to another type.""" + 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. @@ -1820,10 +1845,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="", + _var_data=_var_data, + _var_type=_var_type or cls._default_var_type, + _original=value, ) @@ -2104,7 +2129,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]: ... @@ -2116,7 +2141,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]: ... @@ -2173,7 +2198,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. @@ -2192,6 +2217,7 @@ def add(a: NumberVar, b: NumberVar): The decorated function. """ func_args = list(inspect.signature(func).parameters) + func_name = callable_name(func) @functools.wraps(func) def wrapper(*args: P.args, **kwargs: P.kwargs) -> Var[T]: @@ -2208,9 +2234,9 @@ def wrapper(*args: P.args, **kwargs: P.kwargs) -> Var[T]: op_args += tuple(kwargs_vars.items()) return CustomVarOperation.create( - name=func.__name__, + name=func_name, args=op_args, - return_var=func(*args_vars, **kwargs_vars), # pyright: ignore [reportCallIssue, reportReturnType] + return_var=func(*args_vars, **kwargs_vars), # ty:ignore[invalid-argument-type] ).guess_type() return wrapper @@ -2233,24 +2259,24 @@ 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, frozenset)): element_type = unionize(*{figure_out_type(v) for v in value}) if isinstance(value, frozenset): - return frozenset[element_type] - return set[element_type] + return frozenset[element_type] # ty:ignore[invalid-type-form] + return set[element_type] # 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 islice(value.keys(), 100)}), - unionize(*{figure_out_type(v) for v in islice(value.values(), 100)}), + unionize(*{figure_out_type(k) for k in islice(value.keys(), 100)}), # ty:ignore[invalid-type-form] + unionize(*{figure_out_type(v) for v in islice(value.values(), 100)}), # ty:ignore[invalid-type-form] ] return type(value) @@ -2325,8 +2351,8 @@ def delete_properties(this: Any): if original_del is not None: original_del(this) - delete_properties.cached_field_names = cached_field_names # pyright: ignore [reportFunctionMemberAccess] - delete_properties.original_del = original_del # pyright: ignore [reportFunctionMemberAccess] + 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: @@ -2413,7 +2439,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[missing-attribute] def _get_all_var_data(self) -> VarData | None: """Get all VarData associated with the Var. @@ -2440,6 +2466,11 @@ def _cached_get_all_var_data(self: VarProtocol) -> VarData | None: self._var_data, ) + if TYPE_CHECKING: + # Read-only, as on the frozen var dataclasses this mixin is combined with. + @property + def _cached_get_all_var_data(self) -> VarData | None: ... + _DEEP_EQUAL_IMPORT: ImportDict = { "lodash.isequal@4.5.0": [ImportVar(tag="isEqual", is_default=True)], @@ -2656,7 +2687,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="") @@ -2694,10 +2725,11 @@ def __init__( "return", Any ) + fget_name = callable_name(fget) if hint is Any: - raise UntypedComputedVarError(var_name=fget.__name__) + 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) + js_expr = kwargs.pop("_js_expr", fget_name + FIELD_MARKER) kwargs.setdefault("_var_type", hint) Var.__init__( @@ -2706,7 +2738,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, ), ) @@ -2715,12 +2747,12 @@ def __init__( raise TypeError(msg) if backend is None: - backend = fget.__name__.startswith("_") + 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__) + object.__setattr__(self, "_name", fget_name) if isinstance(interval, int): interval = datetime.timedelta(seconds=interval) @@ -2984,6 +3016,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 @@ -2997,7 +3036,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: Any, owner: type): + def __get__(self, instance: Any, owner: type[BaseState]): """Get the ComputedVar value. If the value is already cached on the instance, return the cached value. @@ -3119,12 +3158,14 @@ 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) + # 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.setdefault( + k if k is not None else objclass.get_full_name(), set() + ).update(v) if not self._auto_deps: return d @@ -3210,7 +3251,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: @@ -3248,7 +3289,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) ) @@ -3319,6 +3360,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 @@ -3382,7 +3430,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: @@ -3496,7 +3544,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(callable_name(fget), signature=str(sign)) if inspect.iscoroutinefunction(fget): computed_var_cls = AsyncComputedVar @@ -4065,15 +4113,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}." + 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." + 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] @@ -4114,6 +4163,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 @@ -4124,7 +4174,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}." raise TypeError(msg) fn_return_generic_args = get_args(fn_return) @@ -4136,7 +4186,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}." raise TypeError(msg) arg_generic_args = get_args(fn_first_arg_type) @@ -4178,10 +4228,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") @@ -4281,8 +4335,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, source_field: Field | None = None, ) -> None: """Initialize the field. @@ -4306,7 +4359,7 @@ def __init__( and issubclass(type_origin, 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: @@ -4327,7 +4380,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__ # ty:ignore[missing-union-attribute] self.type_ = self.type_origin = type_origin else: @@ -4369,14 +4422,15 @@ def _replace(self, **kwargs: Any) -> Self: """ # A default from the type is derived again, from the new type if any. from_type = self._default_from_type - return type(self)(**{ + arguments: dict[str, Any] = { "default": MISSING if from_type else self.default, "default_factory": None if from_type else self.default_factory, "is_var": self.is_var, "annotated_type": self.annotated_type, "source_field": self, **kwargs, - }) + } + return type(self)(**arguments) @classmethod def _with_default(cls, value: Any, annotated_type: Any = MISSING) -> Self: @@ -4526,7 +4580,7 @@ def _get_raw(self, instance: Any) -> FIELD_TYPE | None: state = ( instance if type(instance) is self._owner - else _owner_state(instance, self._owner) # pyright: ignore[reportArgumentType] + else _owner_state(instance, self._owner) # ty:ignore[invalid-argument-type] ) try: return state.__dict__[self._name] @@ -4544,7 +4598,7 @@ def __set__(self, instance: Any, value: FIELD_TYPE): state = ( instance if type(instance) is self._owner - else _owner_state(instance, self._owner) # pyright: ignore[reportArgumentType] + else _owner_state(instance, self._owner) # ty:ignore[invalid-argument-type] ) if isinstance(value, self._proxy): value = value.__wrapped__ # pyright: ignore[reportAttributeAccessIssue] @@ -4611,23 +4665,32 @@ def __get__( @overload def __get__( - self: Field[list[V]] | Field[list[V] | None], - instance: None, - owner: Any, + self: Field[list[V]], instance: None, owner: Any ) -> ArrayVar[Sequence[V]]: ... @overload def __get__( - self: Field[SEQUENCE_TYPE] | Field[SEQUENCE_TYPE | None], - instance: None, - owner: Any, + self: Field[list[V] | None], instance: None, owner: Any + ) -> ArrayVar[Sequence[V]]: ... + + @overload + def __get__( + self: Field[SEQUENCE_TYPE], instance: None, owner: Any ) -> ArrayVar[SEQUENCE_TYPE]: ... @overload def __get__( - self: Field[SET_TYPE] | Field[SET_TYPE | None], - instance: None, - owner: Any, + self: Field[SEQUENCE_TYPE | None], instance: None, owner: Any + ) -> ArrayVar[SEQUENCE_TYPE]: ... + + @overload + def __get__( + self: Field[SET_TYPE], instance: None, owner: Any + ) -> SetVar[SET_TYPE]: ... + + @overload + def __get__( + self: Field[SET_TYPE | None], instance: None, owner: Any ) -> SetVar[SET_TYPE]: ... # The bounds of these type variables admit `None` (for computed vars of an @@ -4654,6 +4717,16 @@ def __get__( self: Field[SQLA_TYPE], instance: None, owner: Any ) -> ObjectVar[SQLA_TYPE]: ... + @overload + def __get__( + self: Field[BASE_MODEL_TYPE | None], instance: None, owner: Any + ) -> ObjectVar[BASE_MODEL_TYPE]: ... + + @overload + def __get__( + self: Field[BASE_MODEL_TYPE], instance: None, owner: Any + ) -> ObjectVar[BASE_MODEL_TYPE]: ... + if TYPE_CHECKING: @overload @@ -4672,7 +4745,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 on class access, or the value on instance access. Args: @@ -4689,7 +4762,7 @@ def __get__(self, instance: Any, owner: Any): # pyright: ignore [reportInconsis state = ( instance if type(instance) is self._owner - else _owner_state(instance, self._owner) # pyright: ignore[reportArgumentType] + else _owner_state(instance, self._owner) # ty:ignore[invalid-argument-type] ) try: value = state.__dict__[self._name] @@ -5047,7 +5120,7 @@ def _validate_mixin_vars( parent = next((base for base in lookup_order if _is_tree_state(base)), None) declared_by: dict[str, type] = {} for base in lookup_order: - if not getattr(base, "_mixin", False) or ( + if not (isinstance(base, BaseStateMeta) and base._mixin) or ( parent is not None and issubclass(parent, base) ): continue @@ -5441,6 +5514,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/packages/reflex-base/src/reflex_base/vars/dep_tracking.py b/packages/reflex-base/src/reflex_base/vars/dep_tracking.py index 733b5274820..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) # pyright: ignore[reportAttributeAccessIssue] + 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) # pyright: ignore[reportAttributeAccessIssue,reportFunctionMemberAccess] + self.func = cast(FunctionType, self.func.fn) # ty:ignore[missing-union-attribute] if isinstance(self.func, FunctionType): with contextlib.suppress(AttributeError, IndexError): @@ -238,7 +238,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. @@ -251,7 +251,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, ) diff --git a/packages/reflex-base/src/reflex_base/vars/function.py b/packages/reflex-base/src/reflex_base/vars/function.py index e944b2f79d1..2f41753766f 100644 --- a/packages/reflex-base/src/reflex_base/vars/function.py +++ b/packages/reflex-base/src/reflex_base/vars/function.py @@ -188,7 +188,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: @@ -262,7 +262,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: @@ -292,7 +292,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]: ... @@ -311,7 +311,7 @@ def create( func: str, _var_type: type[OTHER_CALLABLE_TYPE] | type[EventChain] = ReflexCallable[ Any, Any - ], + ], # ty:ignore[invalid-parameter-default] _var_data: VarData | None = None, ) -> FunctionStringVar: """Create a new function var from a string. @@ -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 9b546995bb3..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) # pyright: ignore [reportReturnType] + return number_negate_operation(self) # ty:ignore[invalid-explicit-return] def __invert__(self): """Boolean NOT the number. @@ -532,7 +532,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 @@ -682,7 +682,7 @@ def number_modulo_operation(lhs: number_types, rhs: number_types) -> NumberVar: Returns: The number modulo operation. """ - return _number_modulo_operation(lhs, rhs) # pyright: ignore [reportReturnType, reportArgumentType] + return _number_modulo_operation(lhs, rhs) _STARTS_WITH_UNARY_OPERATOR = re.compile(r"[-+!~]|(?:typeof|void|delete|await)\b") @@ -1174,7 +1174,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!s} ? {if_true!s} : {if_false!s})", 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 a223d4131a4..0032cdf7f95 100644 --- a/packages/reflex-base/src/reflex_base/vars/object.py +++ b/packages/reflex-base/src/reflex_base/vars/object.py @@ -196,7 +196,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: ... @@ -281,9 +281,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, @@ -291,7 +291,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: ... @@ -452,7 +452,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. @@ -461,7 +461,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: @@ -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. @@ -603,7 +603,7 @@ def object_values_operation(value: ObjectVar): """ return var_operation_return( js_expression=f"Object.values({value!s} ?? {{}})", - var_type=list[value._value_type()], + var_type=list[value._value_type()], # ty:ignore[invalid-type-form] ) @@ -619,7 +619,7 @@ def object_entries_operation(value: ObjectVar): """ return var_operation_return( js_expression=f"Object.entries({value!s} ?? {{}})", - var_type=list[tuple[str, value._value_type()]], + var_type=list[tuple[str, value._value_type()]], # ty:ignore[invalid-type-form] ) @@ -637,8 +637,8 @@ def object_merge_operation(lhs: ObjectVar, rhs: ObjectVar): return var_operation_return( js_expression=f"({{...{lhs!s}, ...{rhs!s}}})", 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 5c29967d40c..97e2e8fdddf 100644 --- a/packages/reflex-base/src/reflex_base/vars/sequence.py +++ b/packages/reflex-base/src/reflex_base/vars/sequence.py @@ -48,7 +48,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 @@ -117,9 +117,9 @@ def reverse(self) -> ArrayVar[ARRAY_VAR_TYPE]: Returns: The reversed array. """ - return array_reverse_operation(self._or_empty()) + 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()) + 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]: ... @@ -166,7 +166,7 @@ def __getitem__( ) -> NumberVar: ... @overload - def __getitem__( # pyright: ignore [reportOverlappingOverload] + def __getitem__( self: ArrayVar[tuple[str, Any]], i: Literal[0, -2] ) -> StringVar: ... @@ -222,6 +222,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: ... @@ -338,7 +344,7 @@ def pluck(self, field: StringVar | str) -> ArrayVar: Returns: The array pluck operation. """ - return array_pluck_operation(self._or_empty(), field) + 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. @@ -354,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) + return repeat_array_operation(self._or_empty(), other) # ty:ignore[invalid-explicit-return] __rmul__ = __mul__ @@ -606,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: @@ -1076,7 +1082,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: ... @@ -1085,7 +1091,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-base/src/reflex_base/vars/set.py b/packages/reflex-base/src/reflex_base/vars/set.py index 8702689197b..7b192f618db 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) + 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) + 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) + 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) + 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. @@ -338,7 +338,8 @@ def to_array(self) -> ArrayVar: else self ) return array.to( - ArrayVar, Sequence[_determine_value_of_array_index(self._var_type)] + ArrayVar, + Sequence[_determine_value_of_array_index(self._var_type)], # ty:ignore[invalid-type-form] ) if TYPE_CHECKING: diff --git a/packages/reflex-bench/src/reflex_bench/drivers/browser.py b/packages/reflex-bench/src/reflex_bench/drivers/browser.py index 877b691416d..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 # pyright: ignore[reportAttributeAccessIssue] + 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-bench/src/reflex_bench/suites/events.py b/packages/reflex-bench/src/reflex_bench/suites/events.py index bcb6de15e0b..169c95334f9 100644 --- a/packages/reflex-bench/src/reflex_bench/suites/events.py +++ b/packages/reflex-bench/src/reflex_bench/suites/events.py @@ -322,7 +322,7 @@ def server_env( with redis), and ``REFLEX_REDIS_URL`` only for redis, since reflex uses redis whenever a URL is configured. """ - result = { + result: dict[str, str] = { **env, **cache_env(states_dir=states_dir), "REFLEX_STATE_MANAGER_MODE": manager, 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-build-sdk/src/reflex_build_sdk/_async/_client.py b/packages/reflex-build-sdk/src/reflex_build_sdk/_async/_client.py index 3efaf9195e6..e6cd3a2b581 100644 --- a/packages/reflex-build-sdk/src/reflex_build_sdk/_async/_client.py +++ b/packages/reflex-build-sdk/src/reflex_build_sdk/_async/_client.py @@ -5,7 +5,7 @@ import asyncio from collections.abc import Mapping from types import TracebackType -from typing import Any, TypeVar, overload +from typing import TYPE_CHECKING, Any, TypeVar, overload from reflex_build_sdk._async.resources.apps import AsyncApps from reflex_build_sdk._async.resources.auth import AsyncAuth @@ -25,6 +25,9 @@ from reflex_build_sdk.transports._base import AsyncTransport, TransportError from reflex_build_sdk.transports._defaults import async_default_transport +if TYPE_CHECKING: + from typing_extensions import TypeForm + T = TypeVar("T") @@ -127,7 +130,7 @@ async def _request( self, method: str, path: str, - cast: type[T], + cast: TypeForm[T], *, params: dict[str, Any] | None = None, json: Any = None, diff --git a/packages/reflex-build-sdk/src/reflex_build_sdk/_decode.py b/packages/reflex-build-sdk/src/reflex_build_sdk/_decode.py index 8192e5079d1..c8353bfa631 100644 --- a/packages/reflex-build-sdk/src/reflex_build_sdk/_decode.py +++ b/packages/reflex-build-sdk/src/reflex_build_sdk/_decode.py @@ -366,7 +366,7 @@ def resolve_fields() -> list[tuple[str, str, Decoder, bool]]: field.default is dataclasses.MISSING and field.default_factory is dataclasses.MISSING, ) - for field in dataclasses.fields(tp) + for field in dataclasses.fields(tp) # ty:ignore[invalid-argument-type] if field.init ] diff --git a/packages/reflex-build-sdk/src/reflex_build_sdk/_sync/_client.py b/packages/reflex-build-sdk/src/reflex_build_sdk/_sync/_client.py index 1207b17a711..e23b8f05c51 100644 --- a/packages/reflex-build-sdk/src/reflex_build_sdk/_sync/_client.py +++ b/packages/reflex-build-sdk/src/reflex_build_sdk/_sync/_client.py @@ -6,7 +6,7 @@ import time from collections.abc import Mapping from types import TracebackType -from typing import Any, TypeVar, overload +from typing import TYPE_CHECKING, Any, TypeVar, overload from reflex_build_sdk._base import ( DEFAULT_MAX_RETRIES, @@ -26,6 +26,9 @@ from reflex_build_sdk.transports._base import Transport, TransportError from reflex_build_sdk.transports._defaults import default_transport +if TYPE_CHECKING: + from typing_extensions import TypeForm + T = TypeVar("T") @@ -128,7 +131,7 @@ def _request( self, method: str, path: str, - cast: type[T], + cast: TypeForm[T], *, params: dict[str, Any] | None = None, json: Any = None, 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-code/src/reflex_components_code/shiki_code_block.py b/packages/reflex-components-code/src/reflex_components_code/shiki_code_block.py index 0bb18b22b07..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: # pyright: ignore [reportAttributeAccessIssue] + 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", {})) @@ -645,7 +645,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/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/pyproject.toml b/packages/reflex-components-core/pyproject.toml index 16100a576f4..c727cc84f7c 100644 --- a/packages/reflex-components-core/pyproject.toml +++ b/packages/reflex-components-core/pyproject.toml @@ -18,7 +18,7 @@ classifiers = [ dependencies = [ "reflex-base >= 0.11.0", "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", 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/banner.py b/packages/reflex-components-core/src/reflex_components_core/core/banner.py index 6cf4e97a58b..0be1d86208a 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 @@ -111,7 +111,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/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/cond.py b/packages/reflex-components-core/src/reflex_components_core/core/cond.py index 9b8540e2556..2474d334605 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 @@ -118,7 +118,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 @@ -126,7 +126,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) @@ -137,31 +137,31 @@ def cond(condition: Any, c1: Any, c2: Component, /) -> Component: ... # pyright @overload def cond( condition: Any, c1: LITERAL_STRING_S, c2: LITERAL_STRING_S, / -) -> Var[LITERAL_STRING_S]: ... # pyright: ignore [reportOverlappingOverload] +) -> Var[LITERAL_STRING_S]: ... @overload def cond( condition: Any, c1: LITERAL_STRING_S, c2: Var[U], / -) -> Var[LITERAL_STRING_S | U]: ... # pyright: ignore [reportOverlappingOverload] +) -> Var[LITERAL_STRING_S | U]: ... @overload def cond( condition: Any, c1: Var[T], c2: LITERAL_STRING_S, / -) -> Var[T | LITERAL_STRING_S]: ... # pyright: ignore [reportOverlappingOverload] +) -> Var[T | LITERAL_STRING_S]: ... @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 @@ -218,7 +218,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 c53bf956668..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" ) @@ -151,7 +151,7 @@ def create(cls, *children: Component, **props: Any) -> Component: component._get_style = child._get_style 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: ( outer_get_all_custom_code() | (child._get_all_custom_code()) 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 0000a14c457..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 @@ -141,7 +141,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()) @@ -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() + 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 c3554172291..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 @@ -37,7 +37,7 @@ class Match(Component): @overload @classmethod - def create( # pyright: ignore [reportOverlappingOverload] + def create( cls, cond: Any, case: tuple[Any, *tuple[Any, ...], BaseComponent], @@ -212,16 +212,12 @@ 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) - - if isinstance(first_case_return, BaseComponent): - return_type = BaseComponent - elif isinstance(first_case_return, Var): - return_type = Var + return_type = ( + BaseComponent if isinstance(first_case_return, BaseComponent) else Var + ) - 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 " @@ -229,8 +225,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-explicit-return] @classmethod def _create_match_cond_var_or_component( @@ -259,7 +254,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 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 802ab948fb6..3ebebd2281b 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 1afc7b892a5..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() # pyright: ignore[reportAttributeAccessIssue] - form._deprecate_id_only_form_controls() # pyright: ignore[reportAttributeAccessIssue] - form.handle_submit_unique_name = md5( # pyright: ignore[reportAttributeAccessIssue] + 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/news/+ty-type-checker.misc.md b/packages/reflex-components-dataeditor/news/+ty-type-checker.misc.md new file mode 100644 index 00000000000..77765b9c7ee --- /dev/null +++ b/packages/reflex-components-dataeditor/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-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-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/pyproject.toml b/packages/reflex-components-internal/pyproject.toml index c81361961c1..8669db7c9a3 100644 --- a/packages/reflex-components-internal/pyproject.toml +++ b/packages/reflex-components-internal/pyproject.toml @@ -17,6 +17,7 @@ classifiers = [ ] dependencies = [ "reflex >= 0.11.0", + "reflex-base >= 0.11.1.dev0", ] [tool.hatch.version] 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 a3f955bffd2..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] @@ -123,7 +125,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 +133,7 @@ def create(cls, *children, **props) -> BaseUIComponent: ), label, class_name=cn(ClassNames.LABEL, class_name), - ) + ) # 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 732902ff08f..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,11 +61,11 @@ 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 - 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: @@ -73,7 +73,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-explicit-return] class HighLevelInput(InputBaseComponent): @@ -157,7 +157,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"), @@ -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-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