reflex 0.8.0a6__tar.gz → 0.8.0a7__tar.gz

{reflex-0.8.0a6 → reflex-0.8.0a7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reflex
-Version: 0.8.0a6
+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,7 +21,7 @@ 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

{reflex-0.8.0a6 → reflex-0.8.0a7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "reflex"
-version = "0.8.0a6"
+version = "0.8.0a7"
 description = "Web apps in pure Python."
 license.text = "Apache-2.0"
 authors = [
@@ -22,7 +22,7 @@ requires-python = ">=3.10,<4.0"
 dependencies = [
   "alembic >=1.15.2,<2.0",
   "fastapi >=0.115.0",
-  "granian[reload] >=2.2.5",
+  "granian[reload] >=2.4.0",
   "httpx >=0.28.0,<1.0",
   "jinja2 >=3.1.2,<4.0",
   "packaging >=24.2,<26",

{reflex-0.8.0a6 → reflex-0.8.0a7}/reflex/config.py

@@ -19,7 +19,12 @@ from reflex.base import Base
 from reflex.constants.base import LogLevel
 from reflex.environment import EnvironmentVariables as EnvironmentVariables
 from reflex.environment import EnvVar as EnvVar
-from reflex.environment import ExistingPath, interpret_env_var_value
+from reflex.environment import (
+    ExistingPath,
+    _load_dotenv_from_files,
+    _paths_from_env_files,
+    interpret_env_var_value,
+)
 from reflex.environment import env_var as env_var
 from reflex.environment import environment as environment
 from reflex.plugins import Plugin
@@ -27,40 +32,6 @@ from reflex.utils import console
 from reflex.utils.exceptions import ConfigError
 from reflex.utils.types import true_type_for_pydantic_field
 
-try:
-    from dotenv import load_dotenv
-except ImportError:
-    load_dotenv = None
-
-
-def _load_dotenv_from_str(env_files: str) -> None:
-    if not env_files:
-        return
-
-    if load_dotenv is None:
-        console.error(
-            """The `python-dotenv` package is required to load environment variables from a file. Run `pip install "python-dotenv>=1.1.0"`."""
-        )
-        return
-
-    # load env files in reverse order if they exist
-    for env_file_path in [
-        Path(p) for s in reversed(env_files.split(os.pathsep)) if (p := s.strip())
-    ]:
-        if env_file_path.exists():
-            load_dotenv(env_file_path, override=True)
-
-
-def _load_dotenv_from_env():
-    """Load environment variables from paths specified in REFLEX_ENV_FILE."""
-    env_env_file = os.environ.get("REFLEX_ENV_FILE")
-    if env_env_file:
-        _load_dotenv_from_str(env_env_file)
-
-
-# Load the env files at import time if they are set in the ENV_FILE environment variable.
-_load_dotenv_from_env()
-
 
 class DBConfig(Base):
     """Database config."""
@@ -358,7 +329,7 @@ class Config(Base):
             The updated config values.
         """
         if self.env_file:
-            _load_dotenv_from_str(self.env_file)
+            _load_dotenv_from_files(_paths_from_env_files(self.env_file))
 
         updated_values = {}
         # Iterate over the fields.

{reflex-0.8.0a6 → reflex-0.8.0a7}/reflex/environment.py

@@ -606,3 +606,73 @@ class EnvironmentVariables:
 
 
 environment = EnvironmentVariables()
+
+try:
+    from dotenv import load_dotenv
+except ImportError:
+    load_dotenv = None
+
+
+def _paths_from_env_files(env_files: str) -> list[Path]:
+    """Convert a string of paths separated by os.pathsep into a list of Path objects.
+
+    Args:
+        env_files: The string of paths.
+
+    Returns:
+        A list of Path objects.
+    """
+    # load env files in reverse order
+    return list(
+        reversed(
+            [
+                Path(path)
+                for path_element in env_files.split(os.pathsep)
+                if (path := path_element.strip())
+            ]
+        )
+    )
+
+
+def _load_dotenv_from_files(files: list[Path]):
+    """Load environment variables from a list of files.
+
+    Args:
+        files: A list of Path objects representing the environment variable files.
+    """
+    from reflex.utils import console
+
+    if not files:
+        return
+
+    if load_dotenv is None:
+        console.error(
+            """The `python-dotenv` package is required to load environment variables from a file. Run `pip install "python-dotenv>=1.1.0"`."""
+        )
+        return
+
+    for env_file in files:
+        if env_file.exists():
+            load_dotenv(env_file, override=True)
+
+
+def _paths_from_environment() -> list[Path]:
+    """Get the paths from the REFLEX_ENV_FILE environment variable.
+
+    Returns:
+        A list of Path objects.
+    """
+    env_files = os.environ.get("REFLEX_ENV_FILE")
+    if not env_files:
+        return []
+
+    return _paths_from_env_files(env_files)
+
+
+def _load_dotenv_from_env():
+    """Load environment variables from paths specified in REFLEX_ENV_FILE."""
+    _load_dotenv_from_files(_paths_from_environment())
+
+
+# Load the env files at import time if they are set in the ENV_FILE environment variable.
+_load_dotenv_from_env()

{reflex-0.8.0a6 → reflex-0.8.0a7}/reflex/utils/exec.py

@@ -519,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,
@@ -533,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-0.8.0a6 → reflex-0.8.0a7}/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-0.8.0a6 → reflex-0.8.0a7}/reflex/utils/processes.py

@@ -61,8 +61,16 @@ def is_process_on_port(port: int) -> bool:
     Returns:
         Whether a process is running on the given port.
     """
+    # Test IPv4 localhost (127.0.0.1)
     with closing(socket.socket(socket.AF_INET, socket.SOCK_STREAM)) as sock:
-        return sock.connect_ex(("127.0.0.1", port)) == 0
+        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
+
+    # 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: