post merge issues

Author: adhami3310

pyi_hashes.json

@@ -1,5 +1,5 @@
 {
-  "reflex/__init__.pyi": "19f58e6bbb6846d14ccdd4364afb957c",
+  "reflex/__init__.pyi": "e9f08e115b1e1dd89beabacade84a589",
   "reflex/components/__init__.pyi": "ac05995852baa81062ba3d18fbc489fb",
   "reflex/components/base/__init__.pyi": "16e47bf19e0d62835a605baa3d039c5a",
   "reflex/components/base/app_wrap.pyi": "ae600e2cc9d70f2ce613bdd6c1da3b16",

reflex/event.py

@@ -2202,7 +2202,7 @@ class EventNamespace:
     # Javascript Event Classes
     JavascriptHTMLInputElement = JavascriptHTMLInputElement
     JavascriptInputEvent = JavascriptInputEvent
-    JavasciptKeyboardEvent = JavasciptKeyboardEvent
+    JavascriptKeyboardEvent = JavascriptKeyboardEvent
     JavascriptMouseEvent = JavascriptMouseEvent
     JavascriptPointerEvent = JavascriptPointerEvent
 

reflex/model.py

@@ -140,7 +140,7 @@ def get_metadata(cls) -> sqlalchemy.MetaData:
     import sqlalchemy.ext.asyncio
     import sqlalchemy.orm
     from alembic.runtime.migration import MigrationContext
-from alembic.script.base import Script
+    from alembic.script.base import Script
 
     from reflex.utils.compat import sqlmodel, sqlmodel_field_has_primary_key
 
@@ -151,40 +151,39 @@ def get_metadata(cls) -> sqlalchemy.MetaData:
     # Import AsyncSession _after_ reflex.utils.compat
     from sqlmodel.ext.asyncio.session import AsyncSession
 
-def format_revision(
-    rev: Script,
-    current_rev: str | None,
-    current_reached_ref: list[bool],
-) -> str:
-    """Format a single revision for display.
-
-    Args:
-        rev: The alembic script object
-        current_rev: The currently applied revision ID
-        current_reached_ref: Mutable reference to track if we've reached current revision
-
-    Returns:
-        Formatted string for display
-    """
-    current = rev.revision
-    message = rev.doc
-
-    # Determine if this migration is applied
-    if current_rev is None:
-        is_applied = False
-    elif current == current_rev:
-        is_applied = True
-        current_reached_ref[0] = True
-    else:
-        is_applied = not current_reached_ref[0]
-
-    # Show checkmark or X with colors
-    status_icon = "[green]✓[/green]" if is_applied else "[red]✗[/red]"
-    head_marker = " (head)" if rev.is_head else ""
-
-    # Format output with message
-    return f"  [{status_icon}] {current}{head_marker}, {message}"
+    def format_revision(
+        rev: Script,
+        current_rev: str | None,
+        current_reached_ref: list[bool],
+    ) -> str:
+        """Format a single revision for display.
 
+        Args:
+            rev: The alembic script object
+            current_rev: The currently applied revision ID
+            current_reached_ref: Mutable reference to track if we've reached current revision
+
+        Returns:
+            Formatted string for display
+        """
+        current = rev.revision
+        message = rev.doc
+
+        # Determine if this migration is applied
+        if current_rev is None:
+            is_applied = False
+        elif current == current_rev:
+            is_applied = True
+            current_reached_ref[0] = True
+        else:
+            is_applied = not current_reached_ref[0]
+
+        # Show checkmark or X with colors
+        status_icon = "[green]✓[/green]" if is_applied else "[red]✗[/red]"
+        head_marker = " (head)" if rev.is_head else ""
+
+        # Format output with message
+        return f"  [{status_icon}] {current}{head_marker}, {message}"
 
     def _safe_db_url_for_logging(url: str) -> str:
         """Remove username and password from the database URL for logging.
@@ -429,25 +428,25 @@ def alembic_init(cls):
             )
 
         @classmethod
-    def get_migration_history(cls):
-        """Get migration history with current database state.
+        def get_migration_history(cls):
+            """Get migration history with current database state.
 
-        Returns:
-            tuple: (current_revision, revisions_list) where revisions_list is in chronological order
-        """
-        # Get current revision from database
-        with cls.get_db_engine().connect() as connection:
-            context = MigrationContext.configure(connection)
-            current_rev = context.get_current_revision()
+            Returns:
+                tuple: (current_revision, revisions_list) where revisions_list is in chronological order
+            """
+            # Get current revision from database
+            with cls.get_db_engine().connect() as connection:
+                context = MigrationContext.configure(connection)
+                current_rev = context.get_current_revision()
 
-        # Get all revisions from base to head
-        _, script_dir = cls._alembic_config()
-        revisions = list(script_dir.walk_revisions())
-        revisions.reverse()  # Reverse to get chronological order (base first)
+            # Get all revisions from base to head
+            _, script_dir = cls._alembic_config()
+            revisions = list(script_dir.walk_revisions())
+            revisions.reverse()  # Reverse to get chronological order (base first)
 
-        return current_rev, revisions
+            return current_rev, revisions
 
-    @classmethod
+        @classmethod
         def alembic_autogenerate(
             cls,
             connection: sqlalchemy.engine.Connection,

tests/units/test_app.py

@@ -16,7 +16,6 @@
 from starlette.applications import Starlette
 from starlette.datastructures import UploadFile
 from starlette.responses import StreamingResponse
-from starlette.responses import StreamingResponse
 
 import reflex as rx
 from reflex import AdminDash, constants