Merge remote-tracking branch 'upstream' into explicit-event-id-minification

Author: benedikt-bartscher

pyi_hashes.json

@@ -23,7 +23,7 @@
   "reflex/components/core/window_events.pyi": "af33ccec866b9540ee7fbec6dbfbd151",
   "reflex/components/datadisplay/__init__.pyi": "52755871369acbfd3a96b46b9a11d32e",
   "reflex/components/datadisplay/code.pyi": "b86769987ef4d1cbdddb461be88539fd",
-  "reflex/components/datadisplay/dataeditor.pyi": "fb26f3e702fcb885539d1cf82a854be3",
+  "reflex/components/datadisplay/dataeditor.pyi": "d2a749db7e279972d4bc1f4de63a7c41",
   "reflex/components/datadisplay/shiki_code_block.pyi": "1d53e75b6be0d3385a342e7b3011babd",
   "reflex/components/el/__init__.pyi": "0adfd001a926a2a40aee94f6fa725ecc",
   "reflex/components/el/element.pyi": "c5974a92fbc310e42d0f6cfdd13472f4",

reflex/components/datadisplay/dataeditor.py

@@ -240,7 +240,7 @@ class DataEditor(NoSSRComponent):
     # Determines the height of each row.
     row_height: Var[int]
 
-    # Kind of row markers.
+    # Kind of row markers. Options are: "none", "number", "checkbox", "both", "checkbox-visible", "clickable-number".
     row_markers: Var[LiteralRowMarker]
 
     # Changes the starting index for row markers.

reflex/components/field.py

@@ -67,7 +67,9 @@ class FieldBasedMeta(type):
     PropsBaseMeta and BaseComponentMeta.
     """
 
-    def __new__(cls, name: str, bases: tuple[type], namespace: dict[str, Any]) -> type:
+    def __new__(
+        cls, name: str, bases: tuple[type, ...], namespace: dict[str, Any]
+    ) -> type:
         """Create a new field-based class.
 
         Args:
@@ -100,7 +102,7 @@ def __new__(cls, name: str, bases: tuple[type], namespace: dict[str, Any]) -> ty
         return super().__new__(cls, name, bases, namespace)
 
     @classmethod
-    def _collect_inherited_fields(cls, bases: tuple[type]) -> dict[str, Any]:
+    def _collect_inherited_fields(cls, bases: tuple[type, ...]) -> dict[str, Any]:
         inherited_fields: dict[str, Any] = {}
 
         # Collect inherited fields from base classes

reflex/components/literals.py

@@ -29,4 +29,6 @@
 ]
 
 
-LiteralRowMarker = Literal["none", "number", "checkbox", "both", "clickable-number"]
+LiteralRowMarker = Literal[
+    "none", "number", "checkbox", "both", "checkbox-visible", "clickable-number"
+]

reflex/model.py

@@ -111,7 +111,8 @@ def get_engine(url: str | None = None) -> sqlalchemy.engine.Engine:
 
         if not environment.ALEMBIC_CONFIG.get().exists():
             console.warn(
-                "Database is not initialized, run [bold]reflex db init[/bold] first."
+                "Database is not initialized, run [bold]reflex db init[/bold] first.",
+                dedupe=True,
             )
         _ENGINE[url] = sqlalchemy.engine.create_engine(
             url,
@@ -153,7 +154,8 @@ def get_async_engine(url: str | None) -> sqlalchemy.ext.asyncio.AsyncEngine:
 
         if not environment.ALEMBIC_CONFIG.get().exists():
             console.warn(
-                "Database is not initialized, run [bold]reflex db init[/bold] first."
+                "Database is not initialized, run [bold]reflex db init[/bold] first.",
+                dedupe=True,
             )
         _ASYNC_ENGINE[url] = sqlalchemy.ext.asyncio.create_async_engine(
             url,
@@ -316,8 +318,12 @@ def get_db_status() -> dict[str, bool]:
             engine = get_engine()
             with engine.connect() as connection:
                 connection.execute(sqlalchemy.text("SELECT 1"))
-        except sqlalchemy.exc.OperationalError:
+        except Exception as exc:
             status = False
+            console.error(
+                f"Database health check failed: {exc} (subsequent errors will not be logged)",
+                dedupe=True,
+            )
 
         return {"db": status}
 

reflex/utils/exec.py

@@ -612,6 +612,8 @@ def run_uvicorn_backend_prod(host: str, port: int, loglevel: LogLevel):
 
     if constants.IS_WINDOWS:
         command = [
+            sys.executable,
+            "-m",
             "uvicorn",
             *("--host", host),
             *("--port", str(port)),
@@ -627,6 +629,8 @@ def run_uvicorn_backend_prod(host: str, port: int, loglevel: LogLevel):
 
         # Our default args, then env args (env args win on conflicts)
         command = [
+            sys.executable,
+            "-m",
             "gunicorn",
             "--preload",
             *("--worker-class", "uvicorn.workers.UvicornH11Worker"),
@@ -663,6 +667,8 @@ def run_granian_backend_prod(host: str, port: int, loglevel: LogLevel):
     from reflex.utils import processes
 
     command = [
+        sys.executable,
+        "-m",
         "granian",
         *("--log-level", "critical"),
         *("--host", host),

reflex/utils/prerequisites.py

@@ -431,8 +431,6 @@ async def get_redis_status() -> dict[str, bool | None]:
     Returns:
         The status of the Redis connection.
     """
-    from redis.exceptions import RedisError
-
     try:
         status = True
         redis_client = get_redis()
@@ -442,8 +440,12 @@ async def get_redis_status() -> dict[str, bool | None]:
                 await ping_command
         else:
             status = None
-    except RedisError:
+    except Exception as exc:
         status = False
+        console.error(
+            f"Redis health check failed: {exc} (subsequent errors will not be logged)",
+            dedupe=True,
+        )
 
     return {"redis": status}
 
@@ -645,7 +647,8 @@ def check_db_initialized() -> bool:
         and not environment.ALEMBIC_CONFIG.get().exists()
     ):
         console.error(
-            "Database is not initialized. Run [bold]reflex db init[/bold] first."
+            "Database is not initialized. Run [bold]reflex db init[/bold] first.",
+            dedupe=True,
         )
         return False
     return True

reflex/vars/base.py

@@ -3537,7 +3537,7 @@ class BaseStateMeta(ABCMeta):
     def __new__(
         cls,
         name: str,
-        bases: tuple[type],
+        bases: tuple[type, ...],
         namespace: dict[str, Any],
         mixin: bool = False,
     ) -> type: