Get rid of reflex_base._internal namespace

masenf · masenf · commit 0fa3f7e61156 · 2026-04-06T09:41:39.000-07:00
diff --git a/packages/reflex-base/src/reflex_base/_internal/__init__.py b/packages/reflex-base/src/reflex_base/_internal/__init__.py
diff --git a/packages/reflex-base/src/reflex_base/_internal/event/__init__.py b/packages/reflex-base/src/reflex_base/_internal/event/__init__.py
diff --git a/packages/reflex-base/src/reflex_base/_internal/event/processor/__init__.py b/packages/reflex-base/src/reflex_base/_internal/event/processor/__init__.py
diff --git a/packages/reflex-base/src/reflex_base/components/component.py b/packages/reflex-base/src/reflex_base/components/component.py
@@ -2419,7 +2419,7 @@ def create(cls, component: Component) -> StatefulComponent | None:
         """
         from reflex_components_core.core.foreach import Foreach
 
-        from reflex_base._internal.registry import RegistrationContext
+        from reflex_base.registry import RegistrationContext
 
         if component._memoization_mode.disposition == MemoizationDisposition.NEVER:
             # Never memoize this component.
diff --git a/packages/reflex-base/src/reflex_base/context/__init__.py b/packages/reflex-base/src/reflex_base/context/__init__.py
diff --git a/packages/reflex-base/src/reflex_base/context/base.py b/packages/reflex-base/src/reflex_base/context/base.py
@@ -1,3 +1,5 @@
+"""Shared contextvars wrapper for contextual globals."""
+
 from __future__ import annotations
 
 import dataclasses
diff --git a/packages/reflex-base/src/reflex_base/event/__init__.py b/packages/reflex-base/src/reflex_base/event/__init__.py
@@ -81,7 +81,7 @@ class Event:
     @property
     def state_cls(self) -> "type[BaseState]":
         """The state class for the event."""
-        from reflex_base._internal.registry import RegistrationContext
+        from reflex_base.registry import RegistrationContext
 
         substate_name = self.name.rpartition(".")[0]
         return RegistrationContext.get().base_states[substate_name]
@@ -2830,4 +2830,8 @@ def BaseState(self) -> "type[BaseState]":  # noqa: N802
 
 event = EventNamespace
 event.event = event  # pyright: ignore[reportAttributeAccessIssue]
+_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]
diff --git a/packages/reflex-base/src/reflex_base/event/context.py b/packages/reflex-base/src/reflex_base/event/context.py
@@ -8,7 +8,7 @@
 from collections.abc import Callable, Mapping
 from typing import TYPE_CHECKING, Any, Protocol
 
-from reflex_base._internal.context.base import BaseContext
+from reflex_base.context.base import BaseContext
 from reflex_base.utils.format import to_snake_case
 
 if TYPE_CHECKING:
diff --git a/packages/reflex-base/src/reflex_base/event/processor/__init__.py b/packages/reflex-base/src/reflex_base/event/processor/__init__.py
@@ -0,0 +1,14 @@
+"""Procedures for handling events."""
+
+from reflex_base.event.processor.base_state_processor import BaseStateEventProcessor
+from reflex_base.event.processor.event_processor import EventProcessor, EventQueueEntry
+from reflex_base.event.processor.future import EventFuture
+from reflex_base.event.processor.timeout import DrainTimeoutManager
+
+__all__ = [
+    "BaseStateEventProcessor",
+    "DrainTimeoutManager",
+    "EventFuture",
+    "EventProcessor",
+    "EventQueueEntry",
+]
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
@@ -15,12 +15,9 @@
 from reflex.istate.manager.token import BaseStateToken
 from reflex.istate.proxy import StateProxy
 from reflex.utils import console, types
-from reflex_base._internal.event.context import EventContext
-from reflex_base._internal.event.processor.event_processor import (
-    EventProcessor,
-    EventQueueEntry,
-)
-from reflex_base._internal.registry import RegisteredEventHandler
+from reflex_base.event.context import EventContext
+from reflex_base.event.processor.event_processor import EventProcessor, EventQueueEntry
+from reflex_base.registry import RegisteredEventHandler
 from reflex_base.utils.format import format_event_handler
 
 if TYPE_CHECKING:
diff --git a/packages/reflex-base/src/reflex_base/event/processor/compat.py b/packages/reflex-base/src/reflex_base/event/processor/compat.py
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
@@ -20,11 +20,11 @@
 from reflex.app_mixins.middleware import MiddlewareMixin
 from reflex.istate.manager import StateManager
 from reflex.utils import console
-from reflex_base._internal.event.context import EventContext
-from reflex_base._internal.event.processor.compat import as_completed
-from reflex_base._internal.event.processor.future import EventFuture
-from reflex_base._internal.event.processor.timeout import DrainTimeoutManager
-from reflex_base._internal.registry import RegisteredEventHandler, RegistrationContext
+from reflex_base.event.context import EventContext
+from reflex_base.event.processor.compat import as_completed
+from reflex_base.event.processor.future import EventFuture
+from reflex_base.event.processor.timeout import DrainTimeoutManager
+from reflex_base.registry import RegisteredEventHandler, RegistrationContext
 
 if TYPE_CHECKING:
     from reflex.app import EventNamespace
diff --git a/packages/reflex-base/src/reflex_base/event/processor/future.py b/packages/reflex-base/src/reflex_base/event/processor/future.py
@@ -32,6 +32,7 @@ class EventFuture(asyncio.Future):
     )
 
     def __post_init__(self) -> None:
+        """Call Future.__init__ for the EventFuture."""
         super(EventFuture, self).__init__(loop=self.loop)
 
     def add_child(self, child: EventFuture) -> None:
diff --git a/packages/reflex-base/src/reflex_base/event/processor/timeout.py b/packages/reflex-base/src/reflex_base/event/processor/timeout.py
diff --git a/packages/reflex-base/src/reflex_base/registry.py b/packages/reflex-base/src/reflex_base/registry.py
@@ -7,7 +7,7 @@
 
 from typing_extensions import Self
 
-from reflex_base._internal.context.base import BaseContext
+from reflex_base.context.base import BaseContext
 from reflex_base.utils.exceptions import StateValueError
 
 if TYPE_CHECKING:
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
@@ -621,11 +621,11 @@ async def upload_file(request: Request):
             UploadTypeError: If a non-streaming upload is wired to a background task.
             HTTPException: when the request does not include token / handler headers.
         """
-        from reflex_base._internal.registry import RegistrationContext
         from reflex_base.event import (
             resolve_upload_chunk_handler_param,
             resolve_upload_handler_param,
         )
+        from reflex_base.registry import RegistrationContext
 
         token, handler_name = _require_upload_headers(request)
         registered_event_handler = RegistrationContext.get().event_handlers[
diff --git a/reflex/app.py b/reflex/app.py
@@ -24,11 +24,6 @@
 from typing import TYPE_CHECKING, Any, ParamSpec, overload
 
 from reflex_base import constants
-from reflex_base._internal.event.processor import (
-    BaseStateEventProcessor,
-    EventProcessor,
-)
-from reflex_base._internal.registry import RegistrationContext
 from reflex_base.components.component import (
     CUSTOM_COMPONENTS,
     Component,
@@ -45,6 +40,8 @@
     IndividualEventType,
     noop,
 )
+from reflex_base.event.processor import BaseStateEventProcessor, EventProcessor
+from reflex_base.registry import RegistrationContext
 from reflex_base.utils import console
 from reflex_base.utils.imports import ImportVar
 from reflex_base.utils.types import ASGIApp, Message, Receive, Scope, Send
diff --git a/reflex/istate/manager/__init__.py b/reflex/istate/manager/__init__.py
@@ -176,6 +176,6 @@ def get_state_manager() -> StateManager:
     Returns:
         The state manager.
     """
-    from reflex_base._internal.event.context import EventContext
+    from reflex_base.event.context import EventContext
 
     return EventContext.get().state_manager
diff --git a/reflex/istate/proxy.py b/reflex/istate/proxy.py
@@ -15,8 +15,8 @@
 from typing import TYPE_CHECKING, Any, SupportsIndex, TypeVar
 
 import wrapt
-from reflex_base._internal.event.context import EventContext
 from reflex_base.event import Event
+from reflex_base.event.context import EventContext
 from reflex_base.utils.exceptions import ImmutableStateError
 from reflex_base.utils.serializers import can_serialize, serialize, serializer
 from reflex_base.vars.base import Var
diff --git a/reflex/state.py b/reflex/state.py
@@ -496,7 +496,7 @@ def __init_subclass__(cls, mixin: bool = False, **kwargs):
         Raises:
             StateValueError: If a substate class shadows another.
         """
-        from reflex_base._internal.registry import RegistrationContext
+        from reflex_base.registry import RegistrationContext
         from reflex_base.utils.exceptions import StateValueError
 
         super().__init_subclass__(**kwargs)
@@ -960,7 +960,7 @@ def get_substates(cls) -> set[type[BaseState]]:
         Returns:
             The substates of the state.
         """
-        from reflex_base._internal.registry import RegistrationContext
+        from reflex_base.registry import RegistrationContext
 
         return RegistrationContext.get().get_substates(cls)
 
@@ -1145,7 +1145,7 @@ def _create_event_handler(
         Returns:
             The event handler.
         """
-        from reflex_base._internal.registry import RegistrationContext
+        from reflex_base.registry import RegistrationContext
 
         # Check if function has stored event_actions from decorator
         event_actions = getattr(fn, EVENT_ACTIONS_MARKER, {})
@@ -2214,7 +2214,7 @@ async def _get_state_from_redis(self, state_cls: type[T_STATE]) -> T_STATE:
     @event
     async def hydrate(self) -> None:
         """Send the full state to the frontend to synchronize it with the backend."""
-        from reflex_base._internal.event.context import EventContext
+        from reflex_base.event.context import EventContext
 
         # Clear client storage, to respect clearing cookies
         self._reset_client_storage()
@@ -2569,7 +2569,7 @@ def reload_state_module(
         state: Recursive argument for the state class to reload.
 
     """
-    from reflex_base._internal.registry import RegistrationContext
+    from reflex_base.registry import RegistrationContext
 
     # Reset the _app_ref of OnLoadInternalState to avoid stale references.
     if state is OnLoadInternalState:
diff --git a/reflex/testing.py b/reflex/testing.py
@@ -28,10 +28,10 @@
 from typing import TYPE_CHECKING, Any, ClassVar, Literal, TypeVar
 
 import uvicorn
-from reflex_base._internal.registry import RegistrationContext
 from reflex_base.components.component import CUSTOM_COMPONENTS, CustomComponent
 from reflex_base.config import get_config
 from reflex_base.environment import environment
+from reflex_base.registry import RegistrationContext
 from reflex_base.utils.types import ASGIApp
 from typing_extensions import Self
 
diff --git a/tests/benchmarks/test_event_processing.py b/tests/benchmarks/test_event_processing.py
@@ -14,9 +14,9 @@
 import pytest
 import pytest_asyncio
 from pytest_codspeed import BenchmarkFixture
-from reflex_base._internal.event.context import EventContext
-from reflex_base._internal.event.processor import BaseStateEventProcessor
 from reflex_base.event import Event
+from reflex_base.event.context import EventContext
+from reflex_base.event.processor import BaseStateEventProcessor
 from reflex_base.utils.format import format_event_handler
 
 from reflex.istate.manager.memory import StateManagerMemory
diff --git a/tests/units/conftest.py b/tests/units/conftest.py
@@ -10,14 +10,11 @@
 
 import pytest
 import pytest_asyncio
-from reflex_base._internal.event.context import EventContext
-from reflex_base._internal.event.processor import (
-    BaseStateEventProcessor,
-    EventProcessor,
-)
-from reflex_base._internal.registry import RegistrationContext
 from reflex_base.components.component import CUSTOM_COMPONENTS
 from reflex_base.event import Event, EventSpec
+from reflex_base.event.context import EventContext
+from reflex_base.event.processor import BaseStateEventProcessor, EventProcessor
+from reflex_base.registry import RegistrationContext
 
 from reflex.app import App
 from reflex.experimental.memo import EXPERIMENTAL_MEMOS
diff --git a/tests/units/istate/test_proxy.py b/tests/units/istate/test_proxy.py
@@ -6,7 +6,7 @@
 from contextlib import asynccontextmanager
 
 import pytest
-from reflex_base._internal.event.context import EventContext
+from reflex_base.event.context import EventContext
 
 import reflex as rx
 from reflex.istate.proxy import MutableProxy, StateProxy
diff --git a/tests/units/middleware/test_hydrate_middleware.py b/tests/units/middleware/test_hydrate_middleware.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import pytest
-from reflex_base._internal.registry import RegistrationContext
+from reflex_base.registry import RegistrationContext
 
 from reflex.app import App
 from reflex.middleware.hydrate_middleware import HydrateMiddleware
diff --git a/tests/units/reflex_base/context/__init__.py b/tests/units/reflex_base/context/__init__.py
diff --git a/tests/units/reflex_base/context/test_base.py b/tests/units/reflex_base/context/test_base.py
@@ -3,7 +3,7 @@
 import dataclasses
 
 import pytest
-from reflex_base._internal.context.base import BaseContext
+from reflex_base.context.base import BaseContext
 
 
 @dataclasses.dataclass(frozen=True, kw_only=True, slots=True)
diff --git a/tests/units/reflex_base/event/__init__.py b/tests/units/reflex_base/event/__init__.py
diff --git a/tests/units/reflex_base/event/processor/test_base_state_processor.py b/tests/units/reflex_base/event/processor/test_base_state_processor.py
@@ -6,11 +6,11 @@
 
 import pytest
 import pytest_asyncio
-from reflex_base._internal.event.context import EventContext
-from reflex_base._internal.event.processor import BaseStateEventProcessor
-from reflex_base._internal.registry import RegistrationContext
 from reflex_base.constants import CompileVars
 from reflex_base.constants.state import FIELD_MARKER
+from reflex_base.event.context import EventContext
+from reflex_base.event.processor import BaseStateEventProcessor
+from reflex_base.registry import RegistrationContext
 
 from reflex import event
 from reflex.app import App
diff --git a/tests/units/reflex_base/event/processor/test_event_processor.py b/tests/units/reflex_base/event/processor/test_event_processor.py
@@ -5,12 +5,9 @@
 from typing import Any
 
 import pytest
-from reflex_base._internal.event.context import EventContext
-from reflex_base._internal.event.processor.event_processor import (
-    EventProcessor,
-    QueueShutDown,
-)
-from reflex_base._internal.registry import RegistrationContext
+from reflex_base.event.context import EventContext
+from reflex_base.event.processor.event_processor import EventProcessor, QueueShutDown
+from reflex_base.registry import RegistrationContext
 
 from reflex.event import Event, EventHandler
 
diff --git a/tests/units/reflex_base/event/processor/test_future.py b/tests/units/reflex_base/event/processor/test_future.py
@@ -3,7 +3,7 @@
 import asyncio
 
 import pytest
-from reflex_base._internal.event.processor.future import EventFuture
+from reflex_base.event.processor.future import EventFuture
 
 
 @pytest.mark.asyncio
diff --git a/tests/units/reflex_base/event/processor/test_timeout.py b/tests/units/reflex_base/event/processor/test_timeout.py
@@ -2,7 +2,7 @@
 
 import time
 
-from reflex_base._internal.event.processor.timeout import DrainTimeoutManager
+from reflex_base.event.processor.timeout import DrainTimeoutManager
 
 
 def test_drain_timeout_no_timeout():
diff --git a/tests/units/reflex_base/event/test_context.py b/tests/units/reflex_base/event/test_context.py
@@ -2,7 +2,7 @@
 
 from unittest import mock
 
-from reflex_base._internal.event.context import EventContext
+from reflex_base.event.context import EventContext
 
 
 def test_fork_creates_child(mock_root_event_context: EventContext):
diff --git a/tests/units/reflex_base/test_registry.py b/tests/units/reflex_base/test_registry.py
@@ -1,7 +1,7 @@
 """Tests for RegistrationContext."""
 
 import pytest
-from reflex_base._internal.registry import RegisteredEventHandler, RegistrationContext
+from reflex_base.registry import RegisteredEventHandler, RegistrationContext
 from reflex_base.utils.exceptions import StateValueError
 
 
diff --git a/tests/units/test_app.py b/tests/units/test_app.py
@@ -16,12 +16,12 @@
 
 import pytest
 from pytest_mock import MockerFixture
-from reflex_base._internal.event.context import EventContext
-from reflex_base._internal.event.processor import BaseStateEventProcessor
-from reflex_base._internal.registry import RegistrationContext
 from reflex_base.components.component import Component
 from reflex_base.constants.state import FIELD_MARKER
 from reflex_base.event import Event
+from reflex_base.event.context import EventContext
+from reflex_base.event.processor import BaseStateEventProcessor
+from reflex_base.registry import RegistrationContext
 from reflex_base.style import Style
 from reflex_base.utils import console, exceptions, format
 from reflex_base.vars.base import computed_var
diff --git a/tests/units/test_state.py b/tests/units/test_state.py
@@ -22,11 +22,11 @@
 from pydantic import BaseModel as Base
 from pytest_mock import MockerFixture
 from reflex_base import constants
-from reflex_base._internal.event.context import EventContext
-from reflex_base._internal.event.processor import BaseStateEventProcessor
 from reflex_base.constants import CompileVars, RouteVar
 from reflex_base.constants.state import FIELD_MARKER
 from reflex_base.event import Event, EventHandler
+from reflex_base.event.context import EventContext
+from reflex_base.event.processor import BaseStateEventProcessor
 from reflex_base.utils import format, types
 from reflex_base.utils.exceptions import (
     InvalidLockWarningThresholdError,

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+"""Shared contextvars wrapper for contextual globals."""`
	`2`	`+`
`1`	`3`	`from __future__ import annotations`
`2`	`4`
`3`	`5`	`import dataclasses`