reflex 0.5.4a3__py3-none-any.whl → 0.5.5a1__py3-none-any.whl

reflex/utils/prerequisites.py

@@ -58,6 +58,18 @@ class CpuInfo(Base):
     address_width: Optional[int]
 
 
+def get_web_dir() -> Path:
+    """Get the working directory for the next.js commands.
+
+    Can be overriden with REFLEX_WEB_WORKDIR.
+
+    Returns:
+        The working directory.
+    """
+    workdir = Path(os.getenv("REFLEX_WEB_WORKDIR", constants.Dirs.WEB))
+    return workdir
+
+
 def check_latest_package_version(package_name: str):
     """Check if the latest version of the package is installed.
 
@@ -91,15 +103,15 @@ def get_or_set_last_reflex_version_check_datetime():
     Returns:
         The last version check datetime.
     """
-    if not os.path.exists(constants.Reflex.JSON):
+    reflex_json_file = get_web_dir() / constants.Reflex.JSON
+    if not reflex_json_file.exists():
         return None
     # Open and read the file
-    with open(constants.Reflex.JSON, "r") as file:
-        data: dict = json.load(file)
+    data = json.loads(reflex_json_file.read_text())
     last_version_check_datetime = data.get("last_version_check_datetime")
     if not last_version_check_datetime:
         data.update({"last_version_check_datetime": str(datetime.now())})
-        path_ops.update_json_file(constants.Reflex.JSON, data)
+        path_ops.update_json_file(reflex_json_file, data)
     return last_version_check_datetime
 
 
@@ -513,12 +525,11 @@ def get_project_hash(raise_on_fail: bool = False) -> int | None:
     Returns:
         project_hash: The app hash.
     """
-    if not os.path.exists(constants.Reflex.JSON) and not raise_on_fail:
+    json_file = get_web_dir() / constants.Reflex.JSON
+    if not json_file.exists() and not raise_on_fail:
         return None
-    # Open and read the file
-    with open(constants.Reflex.JSON, "r") as file:
-        data = json.load(file)
-        return data.get("project_hash")
+    data = json.loads(json_file.read_text())
+    return data.get("project_hash")
 
 
 def initialize_web_directory():
@@ -528,11 +539,11 @@ def initialize_web_directory():
     # Re-use the hash if one is already created, so we don't over-write it when running reflex init
     project_hash = get_project_hash()
 
-    path_ops.cp(constants.Templates.Dirs.WEB_TEMPLATE, constants.Dirs.WEB)
+    path_ops.cp(constants.Templates.Dirs.WEB_TEMPLATE, str(get_web_dir()))
 
     initialize_package_json()
 
-    path_ops.mkdir(constants.Dirs.WEB_ASSETS)
+    path_ops.mkdir(get_web_dir() / constants.Dirs.PUBLIC)
 
     update_next_config()
 
@@ -555,10 +566,9 @@ def _compile_package_json():
 
 def initialize_package_json():
     """Render and write in .web the package.json file."""
-    output_path = constants.PackageJson.PATH
+    output_path = get_web_dir() / constants.PackageJson.PATH
     code = _compile_package_json()
-    with open(output_path, "w") as file:
-        file.write(code)
+    output_path.write_text(code)
 
 
 def init_reflex_json(project_hash: int | None):
@@ -583,7 +593,7 @@ def init_reflex_json(project_hash: int | None):
         "version": constants.Reflex.VERSION,
         "project_hash": project_hash,
     }
-    path_ops.update_json_file(constants.Reflex.JSON, reflex_json)
+    path_ops.update_json_file(get_web_dir() / constants.Reflex.JSON, reflex_json)
 
 
 def update_next_config(export=False, transpile_packages: Optional[List[str]] = None):
@@ -593,7 +603,7 @@ def update_next_config(export=False, transpile_packages: Optional[List[str]] = N
         export: if the method run during reflex export.
         transpile_packages: list of packages to transpile via next.config.js.
     """
-    next_config_file = Path(constants.Dirs.WEB, constants.Next.CONFIG_FILE)
+    next_config_file = get_web_dir() / constants.Next.CONFIG_FILE
 
     next_config = _update_next_config(
         get_config(), export=export, transpile_packages=transpile_packages
@@ -845,9 +855,7 @@ def cached_procedure(cache_file: str, payload_fn: Callable[..., str]):
 
 
 @cached_procedure(
-    cache_file=os.path.join(
-        constants.Dirs.WEB, "reflex.install_frontend_packages.cached"
-    ),
+    cache_file=str(get_web_dir() / "reflex.install_frontend_packages.cached"),
     payload_fn=lambda p, c: f"{repr(sorted(list(p)))},{c.json()}",
 )
 def install_frontend_packages(packages: set[str], config: Config):
@@ -874,7 +882,7 @@ def install_frontend_packages(packages: set[str], config: Config):
         fallback=fallback_command,
         analytics_enabled=True,
         show_status_message="Installing base frontend packages",
-        cwd=constants.Dirs.WEB,
+        cwd=get_web_dir(),
         shell=constants.IS_WINDOWS,
     )
 
@@ -890,7 +898,7 @@ def install_frontend_packages(packages: set[str], config: Config):
             fallback=fallback_command,
             analytics_enabled=True,
             show_status_message="Installing tailwind",
-            cwd=constants.Dirs.WEB,
+            cwd=get_web_dir(),
             shell=constants.IS_WINDOWS,
         )
 
@@ -901,7 +909,7 @@ def install_frontend_packages(packages: set[str], config: Config):
             fallback=fallback_command,
             analytics_enabled=True,
             show_status_message="Installing frontend packages from config and components",
-            cwd=constants.Dirs.WEB,
+            cwd=get_web_dir(),
             shell=constants.IS_WINDOWS,
         )
 
@@ -933,7 +941,7 @@ def needs_reinit(frontend: bool = True) -> bool:
         return True
 
     # Make sure the .web directory exists in frontend mode.
-    if not os.path.exists(constants.Dirs.WEB):
+    if not get_web_dir().exists():
         return True
 
     # If the template is out of date, then we need to re-init
@@ -971,10 +979,10 @@ def is_latest_template() -> bool:
     Returns:
         Whether the app is using the latest template.
     """
-    if not os.path.exists(constants.Reflex.JSON):
+    json_file = get_web_dir() / constants.Reflex.JSON
+    if not json_file.exists():
         return False
-    with open(constants.Reflex.JSON) as f:  # type: ignore
-        app_version = json.load(f)["version"]
+    app_version = json.load(json_file.open()).get("version")
     return app_version == constants.Reflex.VERSION
 
 
@@ -1170,7 +1178,7 @@ def should_show_rx_chakra_migration_instructions() -> bool:
         return False
 
     existing_init_reflex_version = None
-    reflex_json = Path(constants.Dirs.REFLEX_JSON)
+    reflex_json = get_web_dir() / constants.Dirs.REFLEX_JSON
     if reflex_json.exists():
         with reflex_json.open("r") as f:
             data = json.load(f)

reflex/utils/processes.py

@@ -185,7 +185,7 @@ def new_process(args, run: bool = False, show_logs: bool = False, **kwargs):
 
 @contextlib.contextmanager
 def run_concurrently_context(
-    *fns: Union[Callable, Tuple]
+    *fns: Union[Callable, Tuple],
 ) -> Generator[list[futures.Future], None, None]:
     """Run functions concurrently in a thread pool.
 

reflex/utils/serializers.py

@@ -94,18 +94,15 @@ def serializer(
 @overload
 def serialize(
     value: Any, get_type: Literal[True]
-) -> Tuple[Optional[SerializedType], Optional[types.GenericType]]:
-    ...
+) -> Tuple[Optional[SerializedType], Optional[types.GenericType]]: ...
 
 
 @overload
-def serialize(value: Any, get_type: Literal[False]) -> Optional[SerializedType]:
-    ...
+def serialize(value: Any, get_type: Literal[False]) -> Optional[SerializedType]: ...
 
 
 @overload
-def serialize(value: Any) -> Optional[SerializedType]:
-    ...
+def serialize(value: Any) -> Optional[SerializedType]: ...
 
 
 def serialize(

reflex/utils/watch.py

@@ -9,6 +9,7 @@ from watchdog.events import FileSystemEvent, FileSystemEventHandler
 from watchdog.observers import Observer
 
 from reflex.constants import Dirs
+from reflex.utils.prerequisites import get_web_dir
 
 
 class AssetFolderWatch:
@@ -90,5 +91,6 @@ class AssetFolderHandler(FileSystemEventHandler):
             The public file path.
         """
         return src_path.replace(
-            str(self.root / Dirs.APP_ASSETS), str(self.root / Dirs.WEB_ASSETS)
+            str(self.root / Dirs.APP_ASSETS),
+            str(self.root / get_web_dir() / Dirs.PUBLIC),
         )

reflex/vars.py

@@ -39,7 +39,12 @@ from reflex.utils import console, imports, serializers, types
 from reflex.utils.exceptions import VarAttributeError, VarTypeError, VarValueError
 
 # This module used to export ImportVar itself, so we still import it for export here
-from reflex.utils.imports import ImportDict, ImportVar
+from reflex.utils.imports import (
+    ImportDict,
+    ImportVar,
+    ParsedImportDict,
+    parse_imports,
+)
 from reflex.utils.types import override
 
 if TYPE_CHECKING:
@@ -120,7 +125,7 @@ class VarData(Base):
     state: str = ""
 
     # Imports needed to render this var
-    imports: ImportDict = {}
+    imports: ParsedImportDict = {}
 
     # Hooks that need to be present in the component to render this var
     hooks: Dict[str, None] = {}
@@ -130,6 +135,19 @@ class VarData(Base):
     # segments.
     interpolations: List[Tuple[int, int]] = []
 
+    def __init__(
+        self, imports: Union[ImportDict, ParsedImportDict] | None = None, **kwargs: Any
+    ):
+        """Initialize the var data.
+
+        Args:
+            imports: The imports needed to render this var.
+            **kwargs: The var data fields.
+        """
+        if imports:
+            kwargs["imports"] = parse_imports(imports)
+        super().__init__(**kwargs)
+
     @classmethod
     def merge(cls, *others: VarData | None) -> VarData | None:
         """Merge multiple var data objects.
@@ -464,7 +482,7 @@ class Var:
             self._var_name = _var_name
             self._var_data = VarData.merge(self._var_data, _var_data)
 
-    def _replace(self, merge_var_data=None, **kwargs: Any) -> Var:
+    def _replace(self, merge_var_data=None, **kwargs: Any) -> BaseVar:
         """Make a copy of this Var with updated fields.
 
         Args:
@@ -1774,18 +1792,16 @@ class Var:
         """
         from reflex.style import Style
 
-        type_ = (
-            get_origin(self._var_type)
-            if types.is_generic_alias(self._var_type)
-            else self._var_type
-        )
+        generic_alias = types.is_generic_alias(self._var_type)
+
+        type_ = get_origin(self._var_type) if generic_alias else self._var_type
         wrapped_var = str(self)
 
         return (
             wrapped_var
             if not self._var_state
-            and types._issubclass(type_, dict)
-            or types._issubclass(type_, Style)
+            and not generic_alias
+            and (types._issubclass(type_, dict) or types._issubclass(type_, Style))
             else wrapped_var.strip("{}")
         )
 

reflex/vars.pyi

@@ -10,7 +10,7 @@ from reflex.base import Base as Base
 from reflex.state import State as State
 from reflex.state import BaseState as BaseState
 from reflex.utils import console as console, format as format, types as types
-from reflex.utils.imports import ImportVar
+from reflex.utils.imports import ImportVar, ImportDict, ParsedImportDict
 from types import FunctionType
 from typing import (
     Any,
@@ -36,7 +36,7 @@ def _extract_var_data(value: Iterable) -> list[VarData | None]: ...
 
 class VarData(Base):
     state: str = ""
-    imports: dict[str, List[ImportVar]] = {}
+    imports: Union[ImportDict, ParsedImportDict] = {}
     hooks: Dict[str, None] = {}
     interpolations: List[Tuple[int, int]] = []
     @classmethod
@@ -59,7 +59,7 @@ class Var:
     ) -> Var: ...
     @classmethod
     def __class_getitem__(cls, type_: Type) -> _GenericAlias: ...
-    def _replace(self, merge_var_data=None, **kwargs: Any) -> Var: ...
+    def _replace(self, merge_var_data=None, **kwargs: Any) -> BaseVar: ...
     def equals(self, other: Var) -> bool: ...
     def to_string(self) -> Var: ...
     def __hash__(self) -> int: ...

{reflex-0.5.4a3.dist-info → reflex-0.5.5a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: reflex
-Version: 0.5.4a3
+Version: 0.5.5a1
 Summary: Web apps in pure Python.
 Home-page: https://reflex.dev
 License: Apache-2.0
@@ -21,7 +21,7 @@ Requires-Dist: build (>=1.0.3,<2.0)
 Requires-Dist: charset-normalizer (>=3.3.2,<4.0)
 Requires-Dist: dill (>=0.3.8,<0.4)
 Requires-Dist: distro (>=1.8.0,<2.0) ; sys_platform == "linux"
-Requires-Dist: fastapi (>=0.96.0,<1.0)
+Requires-Dist: fastapi (>=0.96.0,<0.111.0)
 Requires-Dist: gunicorn (>=20.1.0,<23.0)
 Requires-Dist: httpx (>=0.25.1,<1.0)
 Requires-Dist: jinja2 (>=3.1.2,<4.0)