reflex 0.8.13a1__py3-none-any.whl → 0.8.14a2__py3-none-any.whl

reflex/utils/processes.py

@@ -15,7 +15,6 @@ from contextlib import closing
 from pathlib import Path
 from typing import Any, Literal, overload
 
-import click
 import rich.markup
 from redis.exceptions import RedisError
 from rich.progress import Progress
@@ -39,7 +38,7 @@ def get_num_workers() -> int:
     """Get the number of backend worker processes.
 
     Raises:
-        Exit: If unable to connect to Redis.
+        SystemExit: If unable to connect to Redis.
 
     Returns:
         The number of backend worker processes.
@@ -50,7 +49,7 @@ def get_num_workers() -> int:
         redis_client.ping()
     except RedisError as re:
         console.error(f"Unable to connect to Redis: {re}")
-        raise click.exceptions.Exit(1) from re
+        raise SystemExit(1) from None
     return (os.cpu_count() or 1) * 2 + 1
 
 
@@ -131,7 +130,7 @@ def handle_port(service_name: str, port: int, auto_increment: bool) -> int:
         The port to run the service on.
 
     Raises:
-        Exit:when the port is in use.
+        SystemExit:when the port is in use.
     """
     console.debug(f"Checking if {service_name.capitalize()} port: {port} is in use.")
 
@@ -146,7 +145,7 @@ def handle_port(service_name: str, port: int, auto_increment: bool) -> int:
             f"Unable to bind to any port for {service_name}. "
             "Please check your network configuration."
         )
-        raise click.exceptions.Exit(1)
+        raise SystemExit(1)
 
     console.debug(
         f"Checking if {service_name.capitalize()} port: {port} is in use for families: {families}."
@@ -172,7 +171,7 @@ def handle_port(service_name: str, port: int, auto_increment: bool) -> int:
     else:
         console.error(f"{service_name.capitalize()} port: {port} is already in use.")
 
-    raise click.exceptions.Exit(1)
+    raise SystemExit(1)
 
 
 @overload
@@ -211,13 +210,13 @@ def new_process(
         Execute a child program in a new process.
 
     Raises:
-        Exit: When attempting to run a command with a None value.
+        SystemExit: When attempting to run a command with a None value.
     """
     # Check for invalid command first.
     non_empty_args = list(filter(None, args)) if isinstance(args, list) else [args]
     if isinstance(args, list) and len(non_empty_args) != len(args):
         console.error(f"Invalid command: {args}")
-        raise click.exceptions.Exit(1)
+        raise SystemExit(1)
 
     path_env: str = os.environ.get("PATH", "")
 
@@ -325,7 +324,7 @@ def stream_logs(
         The lines of the process output.
 
     Raises:
-        Exit: If the process failed.
+        SystemExit: If the process failed.
         ValueError: If the process stdout pipe is closed, but the process remains running.
     """
     from reflex.utils import telemetry
@@ -376,7 +375,7 @@ def stream_logs(
                 "NPM_CONFIG_REGISTRY environment variable. If TLS is the issue, and you know what "
                 "you are doing, you can disable it by setting the SSL_NO_VERIFY environment variable."
             )
-            raise click.exceptions.Exit(1)
+            raise SystemExit(1)
         for set_of_logs in (*prior_logs, tuple(logs)):
             for line in set_of_logs:
                 console.error(line, end="")
@@ -384,7 +383,7 @@ def stream_logs(
         if analytics_enabled:
             telemetry.send("error", context=message)
         console.error("Run with [bold]--loglevel debug [/bold] for the full log.")
-        raise click.exceptions.Exit(1)
+        raise SystemExit(1)
 
 
 def show_logs(message: str, process: subprocess.Popen):

reflex/utils/rename.py

@@ -4,8 +4,6 @@ import re
 import sys
 from pathlib import Path
 
-import click
-
 from reflex import constants
 from reflex.config import get_config
 from reflex.utils import console
@@ -57,7 +55,7 @@ def rename_app(new_app_name: str, loglevel: constants.LogLevel):
         loglevel: The log level to use.
 
     Raises:
-        Exit: If the command is not ran in the root dir or the app module cannot be imported.
+        SystemExit: If the command is not ran in the root dir or the app module cannot be imported.
     """
     # Set the log level.
     console.set_log_level(loglevel)
@@ -66,7 +64,7 @@ def rename_app(new_app_name: str, loglevel: constants.LogLevel):
         console.error(
             "No rxconfig.py found. Make sure you are in the root directory of your app."
         )
-        raise click.exceptions.Exit(1)
+        raise SystemExit(1)
 
     sys.path.insert(0, str(Path.cwd()))
 
@@ -74,7 +72,7 @@ def rename_app(new_app_name: str, loglevel: constants.LogLevel):
     module_path = get_module_path(config.module)
     if module_path is None:
         console.error(f"Could not find module {config.module}.")
-        raise click.exceptions.Exit(1)
+        raise SystemExit(1)
 
     console.info(f"Renaming app directory to {new_app_name}.")
     process_directory(

reflex/utils/serializers.py

@@ -413,8 +413,8 @@ def serialize_decimal(value: decimal.Decimal) -> float:
     return float(value)
 
 
-@serializer(to=dict)
-def serialize_color(color: Color) -> dict:
+@serializer(to=str)
+def serialize_color(color: Color) -> str:
     """Serialize a color.
 
     Args:
@@ -423,11 +423,7 @@ def serialize_color(color: Color) -> dict:
     Returns:
         The serialized color.
     """
-    return {
-        "color": color.color,
-        "shade": color.shade,
-        "alpha": color.alpha,
-    }
+    return color.__format__("")
 
 
 with contextlib.suppress(ImportError):

reflex/utils/templates.py

@@ -7,8 +7,6 @@ import zipfile
 from pathlib import Path
 from urllib.parse import urlparse
 
-import click
-
 from reflex import constants
 from reflex.config import get_config
 from reflex.utils import console, net, path_ops, redir
@@ -51,7 +49,7 @@ def initialize_app_directory(
         template_dir: The directory of the template source files.
 
     Raises:
-        Exit: If template_name, template_code_dir_name, template_dir combination is not supported.
+        SystemExit: If template_name, template_code_dir_name, template_dir combination is not supported.
     """
     console.log("Initializing the app directory.")
 
@@ -61,7 +59,7 @@ def initialize_app_directory(
             console.error(
                 f"Only {template_name=} should be provided, got {template_code_dir_name=}, {template_dir=}."
             )
-            raise click.exceptions.Exit(1)
+            raise SystemExit(1)
         template_code_dir_name = constants.Templates.Dirs.CODE
         template_dir = Path(constants.Templates.Dirs.BASE, "apps", template_name)
     else:
@@ -69,7 +67,7 @@ def initialize_app_directory(
             console.error(
                 f"For `{template_name}` template, `template_code_dir_name` and `template_dir` should both be provided."
             )
-            raise click.exceptions.Exit(1)
+            raise SystemExit(1)
 
     console.debug(f"Using {template_name=} {template_dir=} {template_code_dir_name=}.")
 
@@ -117,7 +115,7 @@ def create_config_init_app_from_remote_template(app_name: str, template_url: str
         template_url: The path to the template source code as a zip file.
 
     Raises:
-        Exit: If any download, file operations fail or unexpected zip file format.
+        SystemExit: If any download, file operations fail or unexpected zip file format.
 
     """
     import httpx
@@ -127,7 +125,7 @@ def create_config_init_app_from_remote_template(app_name: str, template_url: str
         temp_dir = tempfile.mkdtemp()
     except OSError as ose:
         console.error(f"Failed to create temp directory for download: {ose}")
-        raise click.exceptions.Exit(1) from ose
+        raise SystemExit(1) from None
 
     # Use httpx GET with redirects to download the zip file.
     zip_file_path: Path = Path(temp_dir) / "template.zip"
@@ -138,20 +136,20 @@ def create_config_init_app_from_remote_template(app_name: str, template_url: str
         response.raise_for_status()
     except httpx.HTTPError as he:
         console.error(f"Failed to download the template: {he}")
-        raise click.exceptions.Exit(1) from he
+        raise SystemExit(1) from None
     try:
         zip_file_path.write_bytes(response.content)
         console.debug(f"Downloaded the zip to {zip_file_path}")
     except OSError as ose:
         console.error(f"Unable to write the downloaded zip to disk {ose}")
-        raise click.exceptions.Exit(1) from ose
+        raise SystemExit(1) from None
 
     # Create a temp directory for the zip extraction.
     try:
         unzip_dir = Path(tempfile.mkdtemp())
     except OSError as ose:
         console.error(f"Failed to create temp directory for extracting zip: {ose}")
-        raise click.exceptions.Exit(1) from ose
+        raise SystemExit(1) from None
 
     try:
         zipfile.ZipFile(zip_file_path).extractall(path=unzip_dir)
@@ -159,11 +157,11 @@ def create_config_init_app_from_remote_template(app_name: str, template_url: str
         # repo-name-branch/**/*, so we need to remove the top level directory.
     except Exception as uze:
         console.error(f"Failed to unzip the template: {uze}")
-        raise click.exceptions.Exit(1) from uze
+        raise SystemExit(1) from None
 
     if len(subdirs := list(unzip_dir.iterdir())) != 1:
         console.error(f"Expected one directory in the zip, found {subdirs}")
-        raise click.exceptions.Exit(1)
+        raise SystemExit(1)
 
     template_dir = unzip_dir / subdirs[0]
     console.debug(f"Template folder is located at {template_dir}")
@@ -204,7 +202,7 @@ def validate_and_create_app_using_remote_template(
         templates: The available templates.
 
     Raises:
-        Exit: If the template is not found.
+        SystemExit: If the template is not found.
     """
     # If user selects a template, it needs to exist.
     if template in templates:
@@ -215,7 +213,7 @@ def validate_and_create_app_using_remote_template(
             console.print(
                 f"Please use `reflex login` to access the '{template}' template."
             )
-            raise click.exceptions.Exit(3)
+            raise SystemExit(3)
 
         template_url = templates[template].code_url
     else:
@@ -226,7 +224,7 @@ def validate_and_create_app_using_remote_template(
             template_url = f"https://github.com/{path}/archive/main.zip"
         else:
             console.error(f"Template `{template}` not found or invalid.")
-            raise click.exceptions.Exit(1)
+            raise SystemExit(1)
 
     if template_url is None:
         return
@@ -327,7 +325,7 @@ def prompt_for_template_options(templates: list[Template]) -> str:
         The template name the user selects.
 
     Raises:
-        Exit: If the user does not select a template.
+        SystemExit: If the user does not select a template.
     """
     # Show the user the URLs of each template to preview.
     console.print("\nGet started with a template:")
@@ -345,17 +343,17 @@ def prompt_for_template_options(templates: list[Template]) -> str:
 
     if not template:
         console.error("No template selected.")
-        raise click.exceptions.Exit(1)
+        raise SystemExit(1)
 
     try:
         template_index = int(template)
     except ValueError:
         console.error("Invalid template selected.")
-        raise click.exceptions.Exit(1) from None
+        raise SystemExit(1) from None
 
     if template_index < 0 or template_index >= len(templates):
         console.error("Invalid template selected.")
-        raise click.exceptions.Exit(1)
+        raise SystemExit(1)
 
     # Return the template.
     return templates[template_index].name
@@ -372,7 +370,7 @@ def initialize_app(app_name: str, template: str | None = None) -> str | None:
         The name of the template.
 
     Raises:
-        Exit: If the template is not valid or unspecified.
+        SystemExit: If the template is not valid or unspecified.
     """
     # Local imports to avoid circular imports.
     from reflex.utils import telemetry
@@ -393,11 +391,11 @@ def initialize_app(app_name: str, template: str | None = None) -> str | None:
 
         if template == constants.Templates.CHOOSE_TEMPLATES:
             redir.reflex_templates()
-            raise click.exceptions.Exit(0)
+            raise SystemExit(0)
 
     if template == constants.Templates.AI:
         redir.reflex_build_redirect()
-        raise click.exceptions.Exit(0)
+        raise SystemExit(0)
 
     # If the blank template is selected, create a blank app.
     if template == constants.Templates.DEFAULT:

reflex/vars/base.py

@@ -1135,17 +1135,14 @@ class Var(Generic[VAR_TYPE], metaclass=MetaclassVar):
         Returns:
             The reference to the var.
         """
-        from .object import ObjectVar
-
-        refs = Var(
-            _js_expr="refs",
+        return Var(
+            _js_expr=f"refs[{Var.create(str(self))}]",
             _var_data=VarData(
                 imports={
                     f"$/{constants.Dirs.STATE_PATH}": [imports.ImportVar(tag="refs")]
                 }
             ),
-        ).to(ObjectVar, Mapping[str, str])
-        return refs[LiteralVar.create(str(self))]
+        ).to(str)
 
     def js_type(self) -> StringVar:
         """Returns the javascript type of the object.

reflex/vars/color.py

@@ -10,72 +10,14 @@ from reflex.vars.base import (
     VarData,
     cached_property_no_lock,
     get_python_literal,
-    transform,
 )
-from reflex.vars.number import BooleanVar, NumberVar, ternary_operation
-from reflex.vars.object import LiteralObjectVar
+from reflex.vars.number import ternary_operation
 from reflex.vars.sequence import ConcatVarOperation, LiteralStringVar, StringVar
 
 
-@transform
-def evaluate_color(js_dict: Var[dict]) -> Var[Color]:
-    """Evaluate a color var.
-
-    Args:
-        js_dict: The color var as a dict.
-
-    Returns:
-        The color var as a string.
-    """
-    js_color_dict = js_dict.to(dict)
-    str_part = ConcatVarOperation.create(
-        LiteralStringVar.create("var(--"),
-        js_color_dict.color,
-        LiteralStringVar.create("-"),
-        ternary_operation(
-            js_color_dict.alpha,
-            LiteralStringVar.create("a"),
-            LiteralStringVar.create(""),
-        ),
-        js_color_dict.shade.to_string(use_json=False),
-        LiteralStringVar.create(")"),
-    )
-    return js_dict._replace(
-        _js_expr=f"Object.assign(new String({str_part!s}), {js_dict!s})",
-        _var_type=Color,
-    )
-
-
 class ColorVar(StringVar[Color], python_types=Color):
     """Base class for immutable color vars."""
 
-    @property
-    def color(self) -> StringVar:
-        """Get the color of the color var.
-
-        Returns:
-            The color of the color var.
-        """
-        return self.to(dict).color.to(str)
-
-    @property
-    def alpha(self) -> BooleanVar:
-        """Get the alpha of the color var.
-
-        Returns:
-            The alpha of the color var.
-        """
-        return self.to(dict).alpha.to(bool)
-
-    @property
-    def shade(self) -> NumberVar:
-        """Get the shade of the color var.
-
-        Returns:
-            The shade of the color var.
-        """
-        return self.to(dict).shade.to(int)
-
 
 @dataclasses.dataclass(
     eq=False,
@@ -150,7 +92,7 @@ class LiteralColorVar(CachedVarOperation, LiteralVar, ColorVar):
             if isinstance(shade, Var)
             else LiteralStringVar.create(str(shade))
         )
-        string_part = str(
+        return str(
             ConcatVarOperation.create(
                 LiteralStringVar.create("var(--"),
                 self._var_value.color,
@@ -160,14 +102,6 @@ class LiteralColorVar(CachedVarOperation, LiteralVar, ColorVar):
                 LiteralStringVar.create(")"),
             )
         )
-        dict_part = LiteralObjectVar.create(
-            {
-                "color": self._var_value.color,
-                "alpha": self._var_value.alpha,
-                "shade": self._var_value.shade,
-            }
-        )
-        return f"Object.assign(new String({string_part!s}), {dict_part!s})"
 
     @cached_property_no_lock
     def _cached_get_all_var_data(self) -> VarData | None:

reflex/vars/object.py

@@ -557,9 +557,7 @@ class ObjectItemOperation(CachedVarOperation, Var):
         Returns:
             The name of the operation.
         """
-        if types.is_optional(self._object._var_type):
-            return f"{self._object!s}?.[{self._key!s}]"
-        return f"{self._object!s}[{self._key!s}]"
+        return f"{self._object!s}?.[{self._key!s}]"
 
     @classmethod
     def create(

reflex/vars/sequence.py

@@ -1056,7 +1056,7 @@ def string_item_operation(string: StringVar[Any], index: NumberVar | int):
     Returns:
         The item from the string.
     """
-    return var_operation_return(js_expression=f"{string}.at({index})", var_type=str)
+    return var_operation_return(js_expression=f"{string}?.at?.({index})", var_type=str)
 
 
 @var_operation
@@ -1619,7 +1619,7 @@ def array_item_operation(array: ArrayVar, index: NumberVar | int):
     )
 
     return var_operation_return(
-        js_expression=f"{array!s}.at({index!s})",
+        js_expression=f"{array!s}?.at?.({index!s})",
         var_type=element_type,
     )
 

{reflex-0.8.13a1.dist-info → reflex-0.8.14a2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reflex
-Version: 0.8.13a1
+Version: 0.8.14a2
 Summary: Web apps in pure Python.
 Project-URL: homepage, https://reflex.dev
 Project-URL: repository, https://github.com/reflex-dev/reflex