auto hide badge for pro+ users for cloud deployments

This commit is contained in:
Lendemor 2025-02-13 20:56:54 +01:00
parent d79366d8b2
commit b74e2a6cc1
7 changed files with 72 additions and 14 deletions

View File

@ -108,7 +108,7 @@ from reflex.utils import (
prerequisites, prerequisites,
types, types,
) )
from reflex.utils.exec import is_prod_mode, is_testing_env from reflex.utils.exec import get_compile_context, is_prod_mode, is_testing_env
from reflex.utils.imports import ImportVar from reflex.utils.imports import ImportVar
if TYPE_CHECKING: if TYPE_CHECKING:
@ -198,14 +198,17 @@ def default_overlay_component() -> Component:
Returns: Returns:
The default overlay_component, which is a connection_modal. The default overlay_component, which is a connection_modal.
""" """
config = get_config()
from reflex.components.component import memo from reflex.components.component import memo
def default_overlay_components(): def default_overlay_components():
return Fragment.create( return Fragment.create(
connection_pulser(), connection_pulser(),
connection_toaster(), connection_toaster(),
*([backend_disabled()] if config.is_reflex_cloud else []), *(
[backend_disabled()]
if get_compile_context() == constants.CompileContext.DEPLOY
else []
),
*codespaces.codespaces_auto_redirect(), *codespaces.codespaces_auto_redirect(),
) )
@ -1071,6 +1074,16 @@ class App(MiddlewareMixin, LifespanMixin):
self._validate_var_dependencies() self._validate_var_dependencies()
self._setup_overlay_component() self._setup_overlay_component()
if config.show_built_with_reflex is None:
if (
get_compile_context() == constants.CompileContext.DEPLOY
and prerequisites.get_user_tier() in ["pro", "team", "enterprise"]
):
config.show_built_with_reflex = False
else:
config.show_built_with_reflex = True
if is_prod_mode() and config.show_built_with_reflex: if is_prod_mode() and config.show_built_with_reflex:
self._setup_sticky_badge() self._setup_sticky_badge()

View File

@ -484,6 +484,11 @@ class PerformanceMode(enum.Enum):
class EnvironmentVariables: class EnvironmentVariables:
"""Environment variables class to instantiate environment variables.""" """Environment variables class to instantiate environment variables."""
# Indicate the current command that was invoked in the reflex CLI.
REFLEX_COMPILE_CONTEXT: EnvVar[constants.CompileContext] = env_var(
constants.CompileContext.UNDEFINED, internal=True
)
# Whether to use npm over bun to install frontend packages. # Whether to use npm over bun to install frontend packages.
REFLEX_USE_NPM: EnvVar[bool] = env_var(False) REFLEX_USE_NPM: EnvVar[bool] = env_var(False)
@ -529,7 +534,7 @@ class EnvironmentVariables:
REFLEX_COMPILE_THREADS: EnvVar[Optional[int]] = env_var(None) REFLEX_COMPILE_THREADS: EnvVar[Optional[int]] = env_var(None)
# The directory to store reflex dependencies. # The directory to store reflex dependencies.
REFLEX_DIR: EnvVar[Path] = env_var(Path(constants.Reflex.DIR)) REFLEX_DIR: EnvVar[Path] = env_var(constants.Reflex.DIR)
# Whether to print the SQL queries if the log level is INFO or lower. # Whether to print the SQL queries if the log level is INFO or lower.
SQLALCHEMY_ECHO: EnvVar[bool] = env_var(False) SQLALCHEMY_ECHO: EnvVar[bool] = env_var(False)
@ -737,7 +742,7 @@ class Config(Base):
env_file: Optional[str] = None env_file: Optional[str] = None
# Whether to display the sticky "Built with Reflex" badge on all pages. # Whether to display the sticky "Built with Reflex" badge on all pages.
show_built_with_reflex: bool = True show_built_with_reflex: Optional[bool] = None
# Whether the app is running in the reflex cloud environment. # Whether the app is running in the reflex cloud environment.
is_reflex_cloud: bool = False is_reflex_cloud: bool = False

View File

@ -25,6 +25,7 @@ from .base import (
from .compiler import ( from .compiler import (
NOCOMPILE_FILE, NOCOMPILE_FILE,
SETTER_PREFIX, SETTER_PREFIX,
CompileContext,
CompileVars, CompileVars,
ComponentName, ComponentName,
Ext, Ext,
@ -65,6 +66,7 @@ __ALL__ = [
ColorMode, ColorMode,
Config, Config,
COOKIES, COOKIES,
CompileContext,
ComponentName, ComponentName,
CustomComponents, CustomComponents,
DefaultPage, DefaultPage,

View File

@ -111,6 +111,15 @@ class ComponentName(Enum):
return self.value.lower() + Ext.ZIP return self.value.lower() + Ext.ZIP
class CompileContext(str, Enum):
"""The context in which the compiler is running."""
RUN = "run"
EXPORT = "export"
DEPLOY = "deploy"
UNDEFINED = "undefined"
class Imports(SimpleNamespace): class Imports(SimpleNamespace):
"""Common sets of import vars.""" """Common sets of import vars."""

View File

@ -196,7 +196,7 @@ def _run(
prerequisites.check_latest_package_version(constants.Reflex.MODULE_NAME) prerequisites.check_latest_package_version(constants.Reflex.MODULE_NAME)
if frontend: if frontend:
if not config.show_built_with_reflex: if config.show_built_with_reflex is False:
# The sticky badge may be disabled at runtime for team/enterprise tiers. # The sticky badge may be disabled at runtime for team/enterprise tiers.
prerequisites.check_config_option_in_tier( prerequisites.check_config_option_in_tier(
option_name="show_built_with_reflex", option_name="show_built_with_reflex",
@ -306,6 +306,8 @@ def run(
if frontend and backend: if frontend and backend:
console.error("Cannot use both --frontend-only and --backend-only options.") console.error("Cannot use both --frontend-only and --backend-only options.")
raise typer.Exit(1) raise typer.Exit(1)
environment.REFLEX_COMPILE_CONTEXT.set(constants.CompileContext.RUN)
environment.REFLEX_BACKEND_ONLY.set(backend) environment.REFLEX_BACKEND_ONLY.set(backend)
environment.REFLEX_FRONTEND_ONLY.set(frontend) environment.REFLEX_FRONTEND_ONLY.set(frontend)
@ -352,17 +354,19 @@ def export(
from reflex.utils import export as export_utils from reflex.utils import export as export_utils
from reflex.utils import prerequisites from reflex.utils import prerequisites
environment.REFLEX_COMPILE_CONTEXT.set(constants.CompileContext.EXPORT)
frontend, backend = prerequisites.check_running_mode(frontend, backend) frontend, backend = prerequisites.check_running_mode(frontend, backend)
if prerequisites.needs_reinit(frontend=frontend or not backend): if prerequisites.needs_reinit(frontend=frontend or not backend):
_init(name=config.app_name, loglevel=loglevel) _init(name=config.app_name, loglevel=loglevel)
if frontend and not config.show_built_with_reflex: if frontend and config.show_built_with_reflex is False:
# The sticky badge may be disabled on export for team/enterprise tiers. # The sticky badge may be disabled on export for team/enterprise tiers.
prerequisites.check_config_option_in_tier( prerequisites.check_config_option_in_tier(
option_name="show_built_with_reflex", option_name="show_built_with_reflex",
allowed_tiers=["team", "enterprise"], allowed_tiers=["team", "enterprise"],
fallback_value=False, fallback_value=True,
help_link=SHOW_BUILT_WITH_REFLEX_INFO, help_link=SHOW_BUILT_WITH_REFLEX_INFO,
) )
@ -560,6 +564,8 @@ def deploy(
check_version() check_version()
environment.REFLEX_COMPILE_CONTEXT.set(constants.CompileContext.DEPLOY)
if not config.show_built_with_reflex: if not config.show_built_with_reflex:
# The sticky badge may be disabled on deploy for pro/team/enterprise tiers. # The sticky badge may be disabled on deploy for pro/team/enterprise tiers.
prerequisites.check_config_option_in_tier( prerequisites.check_config_option_in_tier(

View File

@ -584,3 +584,12 @@ def is_prod_mode() -> bool:
""" """
current_mode = environment.REFLEX_ENV_MODE.get() current_mode = environment.REFLEX_ENV_MODE.get()
return current_mode == constants.Env.PROD return current_mode == constants.Env.PROD
def get_compile_context() -> constants.CompileContext:
"""Check if the app is compiled for deploy.
Returns:
Whether the app is being compiled for deploy.
"""
return environment.REFLEX_COMPILE_CONTEXT.get()

View File

@ -2001,6 +2001,22 @@ def is_generation_hash(template: str) -> bool:
return re.match(r"^[0-9a-f]{32,}$", template) is not None return re.match(r"^[0-9a-f]{32,}$", template) is not None
def get_user_tier():
"""Get the current user's tier.
Returns:
The current user's tier.
"""
from reflex_cli.v2.utils import hosting
authenticated_token = hosting.authenticated_token()
return (
authenticated_token[1].get("tier", "").lower()
if authenticated_token[0]
else "anonymous"
)
def check_config_option_in_tier( def check_config_option_in_tier(
option_name: str, option_name: str,
allowed_tiers: list[str], allowed_tiers: list[str],
@ -2015,23 +2031,21 @@ def check_config_option_in_tier(
fallback_value: The fallback value if the option is not allowed. fallback_value: The fallback value if the option is not allowed.
help_link: The help link to show to a user that is authenticated. help_link: The help link to show to a user that is authenticated.
""" """
from reflex_cli.v2.utils import hosting
config = get_config() config = get_config()
authenticated_token = hosting.authenticated_token() current_tier = get_user_tier()
if not authenticated_token[0]:
if current_tier == "anonymous":
the_remedy = ( the_remedy = (
"You are currently logged out. Run `reflex login` to access this option." "You are currently logged out. Run `reflex login` to access this option."
) )
current_tier = "anonymous"
else: else:
current_tier = authenticated_token[1].get("tier", "").lower()
the_remedy = ( the_remedy = (
f"Your current subscription tier is `{current_tier}`. " f"Your current subscription tier is `{current_tier}`. "
f"Please upgrade to {allowed_tiers} to access this option. " f"Please upgrade to {allowed_tiers} to access this option. "
) )
if help_link: if help_link:
the_remedy += f"See {help_link} for more information." the_remedy += f"See {help_link} for more information."
if current_tier not in allowed_tiers: if current_tier not in allowed_tiers:
console.warn(f"Config option `{option_name}` is restricted. {the_remedy}") console.warn(f"Config option `{option_name}` is restricted. {the_remedy}")
setattr(config, option_name, fallback_value) setattr(config, option_name, fallback_value)