reflex 0.8.0a5__py3-none-any.whl → 0.8.0a7__py3-none-any.whl

reflex/plugins/shared_tailwind.py

@@ -1,6 +1,7 @@
 """Tailwind CSS configuration types for Reflex plugins."""
 
 import dataclasses
+from copy import deepcopy
 from typing import Any, Literal, TypedDict
 
 from typing_extensions import NotRequired
@@ -40,6 +41,28 @@ TailwindPluginConfig = (
 )
 
 
+def remove_version_from_plugin(plugin: TailwindPluginConfig) -> TailwindPluginConfig:
+    """Remove the version from a plugin name.
+
+    Args:
+        plugin: The plugin to remove the version from.
+
+    Returns:
+        The plugin without the version.
+    """
+    from reflex.utils.format import format_library_name
+
+    if isinstance(plugin, str):
+        return format_library_name(plugin)
+
+    if plugin_import := plugin.get("import"):
+        plugin_import["from"] = format_library_name(plugin_import["from"])
+
+    plugin["name"] = format_library_name(plugin["name"])
+
+    return plugin
+
+
 class TailwindConfig(TypedDict):
     """Tailwind CSS configuration options.
 
@@ -131,11 +154,27 @@ class TailwindPlugin(PluginBase):
     config: TailwindConfig = dataclasses.field(
         default_factory=lambda: TailwindConfig(
             plugins=[
-                "@tailwindcss/typography",
+                "@tailwindcss/typography@0.5.16",
             ],
         )
     )
 
+    def get_frontend_development_dependencies(self, **context) -> list[str]:
+        """Get the packages required by the plugin.
+
+        Args:
+            **context: The context for the plugin.
+
+        Returns:
+            A list of packages required by the plugin.
+        """
+        config = self.get_config()
+
+        return [
+            plugin if isinstance(plugin, str) else plugin.get("name")
+            for plugin in config.get("plugins", [])
+        ] + config.get("presets", [])
+
     def get_config(self) -> TailwindConfig:
         """Get the Tailwind CSS configuration.
 
@@ -156,3 +195,21 @@ class TailwindPlugin(PluginBase):
             return rxconfig_config
 
         return self.config
+
+    def get_unversioned_config(self) -> TailwindConfig:
+        """Get the Tailwind CSS configuration without version-specific adjustments.
+
+        Returns:
+            The Tailwind CSS configuration without version-specific adjustments.
+        """
+        from reflex.utils.format import format_library_name
+
+        config = deepcopy(self.get_config())
+        if presets := config.get("presets"):
+            # Somehow, having an empty list of presets breaks Tailwind.
+            # So we only set the presets if there are any.
+            config["presets"] = [format_library_name(preset) for preset in presets]
+        config["plugins"] = [
+            remove_version_from_plugin(plugin) for plugin in config.get("plugins", [])
+        ]
+        return config

reflex/plugins/tailwind_v3.py

@@ -151,9 +151,9 @@ class TailwindV3Plugin(TailwindPlugin):
             A list of packages required by the plugin.
         """
         return [
-            plugin if isinstance(plugin, str) else plugin.get("name")
-            for plugin in self.get_config().get("plugins", [])
-        ] + [Constants.VERSION]
+            *super().get_frontend_development_dependencies(**context),
+            Constants.VERSION,
+        ]
 
     def pre_compile(self, **context):
         """Pre-compile the plugin.
@@ -161,7 +161,7 @@ class TailwindV3Plugin(TailwindPlugin):
         Args:
             context: The context for the plugin.
         """
-        context["add_save_task"](compile_config, self.get_config())
+        context["add_save_task"](compile_config, self.get_unversioned_config())
         context["add_save_task"](compile_root_style)
         context["add_modify_task"](Dirs.POSTCSS_JS, add_tailwind_to_postcss_config)
         context["add_modify_task"](

reflex/plugins/tailwind_v4.py

@@ -17,7 +17,7 @@ class Constants(SimpleNamespace):
     """Tailwind constants."""
 
     # The Tailwindcss version
-    VERSION = "tailwindcss@4.1.8"
+    VERSION = "tailwindcss@4.1.10"
     # The Tailwind config.
     CONFIG = "tailwind.config.js"
     # Default Tailwind content paths
@@ -154,9 +154,10 @@ class TailwindV4Plugin(TailwindPlugin):
             A list of packages required by the plugin.
         """
         return [
-            plugin if isinstance(plugin, str) else plugin.get("name")
-            for plugin in self.get_config().get("plugins", [])
-        ] + [Constants.VERSION, "@tailwindcss/postcss@4.1.7"]
+            *super().get_frontend_development_dependencies(**context),
+            Constants.VERSION,
+            "@tailwindcss/postcss@4.1.10",
+        ]
 
     def pre_compile(self, **context):
         """Pre-compile the plugin.
@@ -164,7 +165,7 @@ class TailwindV4Plugin(TailwindPlugin):
         Args:
             context: The context for the plugin.
         """
-        context["add_save_task"](compile_config, self.get_config())
+        context["add_save_task"](compile_config, self.get_unversioned_config())
         context["add_save_task"](compile_root_style)
         context["add_modify_task"](Dirs.POSTCSS_JS, add_tailwind_to_postcss_config)
         context["add_modify_task"](

reflex/state.py

@@ -37,6 +37,7 @@ from reflex.event import (
     EventSpec,
     fix_events,
 )
+from reflex.istate import HANDLED_PICKLE_ERRORS, debug_failed_pickles
 from reflex.istate.data import RouterData
 from reflex.istate.proxy import ImmutableMutableProxy as ImmutableMutableProxy
 from reflex.istate.proxy import MutableProxy, StateProxy
@@ -85,14 +86,6 @@ if environment.REFLEX_PERF_MODE.get() != PerformanceMode.OFF:
     # Only warn about each state class size once.
     _WARNED_ABOUT_STATE_SIZE: set[str] = set()
 
-# Errors caught during pickling of state
-HANDLED_PICKLE_ERRORS = (
-    pickle.PicklingError,
-    AttributeError,
-    IndexError,
-    TypeError,
-    ValueError,
-)
 
 # For BaseState.get_var_value
 VAR_TYPE = TypeVar("VAR_TYPE")
@@ -2251,11 +2244,16 @@ class BaseState(EvenMoreBasicBaseState):
 
         Raises:
             StateSerializationError: If the state cannot be serialized.
+
+        # noqa: DAR401: e
+        # noqa: DAR402: StateSerializationError
         """
         payload = b""
         error = ""
+        self_schema = self._to_schema()
+        pickle_function = pickle.dumps
         try:
-            payload = pickle.dumps((self._to_schema(), self))
+            payload = pickle.dumps((self_schema, self))
         except HANDLED_PICKLE_ERRORS as og_pickle_error:
             error = (
                 f"Failed to serialize state {self.get_full_name()} due to unpicklable object. "
@@ -2264,7 +2262,8 @@ class BaseState(EvenMoreBasicBaseState):
             try:
                 import dill
 
-                payload = dill.dumps((self._to_schema(), self))
+                pickle_function = dill.dumps
+                payload = dill.dumps((self_schema, self))
             except ImportError:
                 error += (
                     f"Pickle error: {og_pickle_error}. "
@@ -2272,13 +2271,19 @@ class BaseState(EvenMoreBasicBaseState):
                 )
             except HANDLED_PICKLE_ERRORS as ex:
                 error += f"Dill was also unable to pickle the state: {ex}"
-            console.warn(error)
 
         if environment.REFLEX_PERF_MODE.get() != PerformanceMode.OFF:
             self._check_state_size(len(payload))
 
         if not payload:
-            raise StateSerializationError(error)
+            e = StateSerializationError(error)
+            if sys.version_info >= (3, 11):
+                try:
+                    debug_failed_pickles(self, pickle_function)
+                except HANDLED_PICKLE_ERRORS as ex:
+                    for note in ex.__notes__:
+                        e.add_note(note)
+            raise e
 
         return payload
 

reflex/testing.py

@@ -24,7 +24,6 @@ from http.server import SimpleHTTPRequestHandler
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Literal, TypeVar
 
-import psutil
 import uvicorn
 
 import reflex
@@ -478,6 +477,8 @@ class AppHarness:
 
     def stop(self) -> None:
         """Stop the frontend and backend servers."""
+        import psutil
+
         # Quit browsers first to avoid any lingering events being sent during shutdown.
         for driver in self._frontends:
             driver.quit()

reflex/utils/exec.py

@@ -15,8 +15,6 @@ from pathlib import Path
 from typing import Any, NamedTuple, TypedDict
 from urllib.parse import urljoin
 
-import psutil
-
 from reflex import constants
 from reflex.config import get_config
 from reflex.constants.base import LogLevel
@@ -131,12 +129,16 @@ def get_different_packages(
 def kill(proc_pid: int):
     """Kills a process and all its child processes.
 
+    Requires the `psutil` library to be installed.
+
     Args:
-        proc_pid (int): The process ID of the process to be killed.
+        proc_pid: The process ID of the process to be killed.
 
     Example:
         >>> kill(1234)
     """
+    import psutil
+
     process = psutil.Process(proc_pid)
     for proc in process.children(recursive=True):
         proc.kill()
@@ -365,6 +367,9 @@ def run_backend(
 
     # Run the backend in development mode.
     if should_use_granian():
+        # We import reflex app because this lets granian cache the module
+        import reflex.app  # noqa: F401
+
         run_granian_backend(host, port, loglevel)
     else:
         run_uvicorn_backend(host, port, loglevel)
@@ -514,9 +519,11 @@ def run_granian_backend(host: str, port: int, loglevel: LogLevel):
 
     from granian.constants import Interfaces
     from granian.log import LogLevels
-    from granian.server import MPServer as Granian
+    from granian.server import Server as Granian
 
-    Granian(
+    from reflex.environment import _paths_from_environment
+
+    granian_app = Granian(
         target=get_app_instance_from_file(),
         factory=True,
         address=host,
@@ -528,8 +535,11 @@ def run_granian_backend(host: str, port: int, loglevel: LogLevel):
         reload_ignore_worker_failure=True,
         reload_ignore_patterns=HOTRELOAD_IGNORE_PATTERNS,
         reload_tick=100,
+        env_files=_paths_from_environment() or None,
         workers_kill_timeout=2,
-    ).serve()
+    )
+
+    granian_app.serve()
 
 
 def run_backend_prod(

reflex/utils/imports.py

@@ -52,19 +52,12 @@ def parse_imports(
     Returns:
         The parsed import dict.
     """
-
-    def _make_list(
-        value: ImmutableImportTypes,
-    ) -> list[str | ImportVar] | list[ImportVar]:
-        if isinstance(value, (str, ImportVar)):
-            return [value]
-        return list(value)
-
     return {
-        package: [
-            ImportVar(tag=tag) if isinstance(tag, str) else tag
-            for tag in _make_list(maybe_tags)
-        ]
+        package: [maybe_tags]
+        if isinstance(maybe_tags, ImportVar)
+        else [ImportVar(tag=maybe_tags)]
+        if isinstance(maybe_tags, str)
+        else [ImportVar(tag=tag) if isinstance(tag, str) else tag for tag in maybe_tags]
         for package, maybe_tags in imports.items()
     }
 

reflex/utils/misc.py

@@ -31,14 +31,13 @@ def get_module_path(module_name: str) -> Path | None:
         for i, part in enumerate(parts):
             potential_file = current_path / (part + ".py")
             potential_dir = current_path / part
-            potential_init = current_path / part / "__init__.py"
 
             if potential_file.is_file():
                 # We encountered a file, but we can't continue deeper
                 if i == len(parts) - 1:
                     return potential_file
                 return None  # Can't continue deeper
-            if potential_dir.is_dir() and potential_init.is_file():
+            if potential_dir.is_dir():
                 # It's a package, so we can continue deeper
                 current_path = potential_dir
             else:

reflex/utils/prerequisites.py

@@ -116,7 +116,7 @@ def check_latest_package_version(package_name: str):
         # Get the latest version from PyPI
         current_version = importlib.metadata.version(package_name)
         url = f"https://pypi.org/pypi/{package_name}/json"
-        response = net.get(url)
+        response = net.get(url, timeout=2)
         latest_version = response.json()["info"]["version"]
         console.debug(f"Latest version of {package_name}: {latest_version}")
         if get_or_set_last_reflex_version_check_datetime():

reflex/utils/processes.py

@@ -4,17 +4,17 @@ from __future__ import annotations
 
 import collections
 import contextlib
-import importlib.metadata
 import os
 import signal
+import socket
 import subprocess
 from collections.abc import Callable, Generator, Sequence
 from concurrent import futures
+from contextlib import closing
 from pathlib import Path
 from typing import Any, Literal, overload
 
 import click
-import psutil
 from redis.exceptions import RedisError
 from rich.progress import Progress
 
@@ -52,29 +52,6 @@ def get_num_workers() -> int:
     return (os.cpu_count() or 1) * 2 + 1
 
 
-def get_process_on_port(port: int) -> psutil.Process | None:
-    """Get the process on the given port.
-
-    Args:
-        port: The port.
-
-    Returns:
-        The process on the given port.
-    """
-    for proc in psutil.process_iter(["pid", "name", "cmdline"]):
-        with contextlib.suppress(
-            psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess
-        ):
-            if importlib.metadata.version("psutil") >= "6.0.0":
-                conns = proc.net_connections(kind="inet")
-            else:
-                conns = proc.connections(kind="inet")
-            for conn in conns:
-                if conn.laddr.port == int(port):
-                    return proc
-    return None
-
-
 def is_process_on_port(port: int) -> bool:
     """Check if a process is running on the given port.
 
@@ -84,18 +61,16 @@ def is_process_on_port(port: int) -> bool:
     Returns:
         Whether a process is running on the given port.
     """
-    return get_process_on_port(port) is not None
+    # Test IPv4 localhost (127.0.0.1)
+    with closing(socket.socket(socket.AF_INET, socket.SOCK_STREAM)) as sock:
+        ipv4_result = sock.connect_ex(("127.0.0.1", port)) == 0
 
+    # Test IPv6 localhost (::1)
+    with closing(socket.socket(socket.AF_INET6, socket.SOCK_STREAM)) as sock:
+        ipv6_result = sock.connect_ex(("::1", port)) == 0
 
-def kill_process_on_port(port: int):
-    """Kill the process on the given port.
-
-    Args:
-        port: The port.
-    """
-    if get_process_on_port(port) is not None:
-        with contextlib.suppress(psutil.AccessDenied):
-            get_process_on_port(port).kill()  # pyright: ignore [reportOptionalMemberAccess]
+    # Port is in use if either IPv4 or IPv6 is listening
+    return ipv4_result or ipv6_result
 
 
 def change_port(port: int, _type: str) -> int:
@@ -133,13 +108,13 @@ def handle_port(service_name: str, port: int, auto_increment: bool) -> int:
     Raises:
         Exit:when the port is in use.
     """
-    if (process := get_process_on_port(port)) is None:
+    console.debug(f"Checking if {service_name.capitalize()} port: {port} is in use.")
+    if not is_process_on_port(port):
+        console.debug(f"{service_name.capitalize()} port: {port} is not in use.")
         return port
     if auto_increment:
         return change_port(port, service_name)
-    console.error(
-        f"{service_name.capitalize()} port: {port} is already in use by PID: {process.pid}."
-    )
+    console.error(f"{service_name.capitalize()} port: {port} is already in use.")
     raise click.exceptions.Exit
 
 

reflex/utils/telemetry.py

@@ -13,7 +13,6 @@ from datetime import datetime, timezone
 from typing import TypedDict
 
 import httpx
-import psutil
 
 from reflex import constants
 from reflex.environment import environment
@@ -89,18 +88,6 @@ def get_reflex_enterprise_version() -> str | None:
         return None
 
 
-def get_memory() -> int:
-    """Get the total memory in MB.
-
-    Returns:
-        The total memory in MB.
-    """
-    try:
-        return psutil.virtual_memory().total >> 20
-    except ValueError:  # needed to pass ubuntu test
-        return 0
-
-
 def _raise_on_missing_project_hash() -> bool:
     """Check if an error should be raised when project hash is missing.
 
@@ -128,7 +115,6 @@ class _Properties(TypedDict):
     bun_version: str | None
     reflex_enterprise_version: str | None
     cpu_count: int
-    memory: int
     cpu_info: dict
 
 
@@ -182,7 +168,6 @@ def _get_event_defaults() -> _DefaultEvent | None:
             ),
             "reflex_enterprise_version": get_reflex_enterprise_version(),
             "cpu_count": get_cpu_count(),
-            "memory": get_memory(),
             "cpu_info": dataclasses.asdict(cpuinfo) if cpuinfo else {},
         },
     }

{reflex-0.8.0a5.dist-info → reflex-0.8.0a7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reflex
-Version: 0.8.0a5
+Version: 0.8.0a7
 Summary: Web apps in pure Python.
 Project-URL: homepage, https://reflex.dev
 Project-URL: repository, https://github.com/reflex-dev/reflex
@@ -21,12 +21,12 @@ Requires-Python: <4.0,>=3.10
 Requires-Dist: alembic<2.0,>=1.15.2
 Requires-Dist: click>=8.2
 Requires-Dist: fastapi>=0.115.0
-Requires-Dist: granian[reload]>=2.2.5
+Requires-Dist: granian[reload]>=2.4.0
 Requires-Dist: httpx<1.0,>=0.28.0
 Requires-Dist: jinja2<4.0,>=3.1.2
 Requires-Dist: packaging<26,>=24.2
 Requires-Dist: platformdirs<5.0,>=4.3.7
-Requires-Dist: psutil<8.0,>=7.0.0
+Requires-Dist: psutil<8.0,>=7.0.0; sys_platform == 'win32'
 Requires-Dist: pydantic<3.0,>=1.10.21
 Requires-Dist: python-multipart<1.0,>=0.0.20
 Requires-Dist: python-socketio<6.0,>=5.12.0