From 7cdd6f24b892f80c96a84933ded30250497e7190 Mon Sep 17 00:00:00 2001
From: Benedikt Bartscher <bb@senbax.de>
Date: Mon, 28 Oct 2024 21:04:58 +0100
Subject: [PATCH] minor fixes/cleanup

---
 reflex/base.py                                | 3 ++-
 reflex/custom_components/custom_components.py | 4 ++--
 reflex/testing.py                             | 2 +-
 reflex/utils/exec.py                          | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/reflex/base.py b/reflex/base.py
index a7d1cc48a..299a06550 100644
--- a/reflex/base.py
+++ b/reflex/base.py
@@ -28,7 +28,8 @@ def validate_field_name(bases: List[Type["BaseModel"]], field_name: str) -> None
     """
     from reflex.utils.exceptions import VarNameError
 
-    reload = os.getenv("RELOAD_CONFIG") == "True"
+    # can't use reflex.config.environment here cause of circular import
+    reload = os.getenv("RELOAD_CONFIG", "").lower() == "true"
     for base in bases:
         try:
             if not reload and getattr(base, field_name, None):
diff --git a/reflex/custom_components/custom_components.py b/reflex/custom_components/custom_components.py
index 9e7fd5d8d..ddda3de56 100644
--- a/reflex/custom_components/custom_components.py
+++ b/reflex/custom_components/custom_components.py
@@ -609,14 +609,14 @@ def publish(
         help="The API token to use for authentication on python package repository. If token is provided, no username/password should be provided at the same time",
     ),
     username: Optional[str] = typer.Option(
-        environment.TWINE_USERNAME.name,
+        environment.TWINE_USERNAME,
         "-u",
         "--username",
         show_default="TWINE_USERNAME environment variable value if set",
         help="The username to use for authentication on python package repository. Username and password must both be provided.",
     ),
     password: Optional[str] = typer.Option(
-        environment.TWINE_PASSWORD.name,
+        environment.TWINE_PASSWORD,
         "-p",
         "--password",
         show_default="TWINE_PASSWORD environment variable value if set",
diff --git a/reflex/testing.py b/reflex/testing.py
index 5afbec78d..b786390ae 100644
--- a/reflex/testing.py
+++ b/reflex/testing.py
@@ -963,7 +963,7 @@ class AppHarnessProd(AppHarness):
         try:
             return super()._poll_for_servers(timeout)
         finally:
-            environment.REFLEX_SKIP_COMPILE.set(False)
+            environment.REFLEX_SKIP_COMPILE.set(None)
 
     def stop(self):
         """Stop the frontend python webserver."""
diff --git a/reflex/utils/exec.py b/reflex/utils/exec.py
index 6b2e74fb3..e7917aa46 100644
--- a/reflex/utils/exec.py
+++ b/reflex/utils/exec.py
@@ -370,7 +370,7 @@ def run_uvicorn_backend_prod(host, port, loglevel):
         run=True,
         show_logs=True,
         env={
-            environment.REFLEX_SKIP_COMPILE.name: "yes"
+            environment.REFLEX_SKIP_COMPILE.name: "true"
         },  # skip compile for prod backend
     )
 
@@ -407,7 +407,7 @@ def run_granian_backend_prod(host, port, loglevel):
             run=True,
             show_logs=True,
             env={
-                environment.REFLEX_SKIP_COMPILE.name: "yes"
+                environment.REFLEX_SKIP_COMPILE.name: "true"
             },  # skip compile for prod backend
         )
     except ImportError: