laipeng/reflex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rework Init workflow

Browse Source
This commit is contained in:
Elijah 2024-11-13 15:37:19 +00:00
parent 853a9d8614
commit 1b42eea1ed
3 changed files with 112 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
reflex/constants/base.py
View File

@ -97,6 +97,10 @@ class Templates(SimpleNamespace):
# The default template
DEFAULT = "blank"
AI = "ai"
CHOOSE_TEMPLATES = "choose templates"
# The reflex.build frontend host
REFLEX_BUILD_FRONTEND = "https://flexgen.reflex.run"

24
reflex/reflex.py
View File

@ -89,30 +89,8 @@ def _init(
# Set up the web project.
prerequisites.initialize_frontend_dependencies()
# Integrate with reflex.build.
generation_hash = None
if ai:
if template is None:
# If AI is requested and no template specified, redirect the user to reflex.build.
generation_hash = redir.reflex_build_redirect()
elif prerequisites.is_generation_hash(template):
# Otherwise treat the template as a generation hash.
generation_hash = template
else:
console.error(
"Cannot use `--template` option with `--ai` option. Please remove `--template` option."
)
raise typer.Exit(2)
template = constants.Templates.DEFAULT
# Initialize the app.
template = prerequisites.initialize_app(app_name, template)
# If a reflex.build generation hash is available, download the code and apply it to the main module.
if generation_hash:
prerequisites.initialize_main_module_index_from_generation(
app_name, generation_hash=generation_hash
)
template = prerequisites.initialize_app(app_name, template, ai)
# Initialize the .gitignore.
prerequisites.initialize_gitignore()

87
reflex/utils/prerequisites.py
View File

@ -34,7 +34,7 @@ from redis.asyncio import Redis
from reflex import constants, model
from reflex.compiler import templates
from reflex.config import Config, environment, get_config
from reflex.utils import console, net, path_ops, processes
from reflex.utils import console, net, path_ops, processes, redir
from reflex.utils.exceptions import (
GeneratedCodeHasNoFunctionDefs,
raise_system_package_missing_error,
@ -1378,7 +1378,31 @@ def create_config_init_app_from_remote_template(app_name: str, template_url: str
shutil.rmtree(unzip_dir)
def initialize_app(app_name: str, template: str | None = None) -> str | None:
def prompt_templates(templates: dict[str, Template]) -> str:
while True:
console.print("visit https://reflex.dev/templates for the complete list of templates.")
answer = console.ask("Enter a valid template name", show_choices=False)
if not answer in templates:
console.error("Invalid template name. Please try again.")
else:
return answer
def use_ai_generation(template: str | None = None) -> str:
if template is None:
# If AI is requested and no template specified, redirect the user to reflex.build.
return redir.reflex_build_redirect()
elif is_generation_hash(template):
# Otherwise treat the template as a generation hash.
return template
else:
console.error(
"Cannot use `--template` option with `--ai` option. Please remove `--template` option."
)
raise typer.Exit(2)
def initialize_app(app_name: str, template: str | None = None, ai: bool = False) -> str | None:
"""Initialize the app either from a remote template or a blank app. If the config file exists, it is considered as reinit.
Args:
@ -1399,10 +1423,15 @@ def initialize_app(app_name: str, template: str | None = None) -> str | None:
telemetry.send("reinit")
return
generation_hash = None
if ai:
generation_hash = use_ai_generation(template)
template = constants.Templates.AI
templates: dict[str, Template] = {}
# Don't fetch app templates if the user directly asked for DEFAULT.
if template is None or (template != constants.Templates.DEFAULT):
if template is not None and (template != constants.Templates.DEFAULT or template != constants.Templates.AI):
try:
# Get the available templates
templates = fetch_app_templates(constants.Reflex.VERSION)
@ -1414,14 +1443,32 @@ def initialize_app(app_name: str, template: str | None = None) -> str | None:
finally:
template = template or constants.Templates.DEFAULT
if template is None:
template = prompt_for_template(get_init_cli_options())
if template == constants.Templates.AI:
generation_hash = use_ai_generation()
elif template == constants.Templates.CHOOSE_TEMPLATES:
try:
# Get the available templates
templates = fetch_app_templates(constants.Reflex.VERSION)
# default to the blank template if no templates are available
template = prompt_templates(templates) if len(templates) > 0 else constants.Templates.DEFAULT
except Exception as e:
console.warn("Failed to fetch templates. Falling back to default template.")
console.debug(f"Error while fetching templates: {e}")
template = constants.Templates.DEFAULT
else:
console.error("Invalid option selected.")
raise typer.Exit(2)
# If the blank template is selected, create a blank app.
if template == constants.Templates.DEFAULT:
if template == constants.Templates.DEFAULT or template == constants.Templates.AI:
# Default app creation behavior: a blank app.
create_config(app_name)
initialize_app_directory(app_name)
else:
# Fetch App templates from the backend server.
console.debug(f"Available templates: {templates}")
# If user selects a template, it needs to exist.
if template in templates:
@ -1444,9 +1491,37 @@ def initialize_app(app_name: str, template: str | None = None) -> str | None:
)
telemetry.send("init", template=template)
# If a reflex.build generation hash is available, download the code and apply it to the main module.
if generation_hash:
initialize_main_module_index_from_generation(
app_name, generation_hash=generation_hash
)
return template
def fetch_and_prompt_for_templates(template: str | None, templates: dict[str, Template]) -> str:
"""Fetches available templates and prompts the user if template is not specified."""
try:
templates = fetch_app_templates(constants.Reflex.VERSION)
if not template and templates:
template = prompt_for_template(list(templates.values()))
except Exception as e:
console.warn("Failed to fetch templates. Falling back to default template.")
console.debug(f"Error while fetching templates: {e}")
return template or constants.Templates.DEFAULT
def get_init_cli_options() -> list[Template]:
return [
Template(name=constants.Templates.DEFAULT, description="A blank Reflex app.", demo_url="", code_url=""),
Template(name=constants.Templates.AI, description="Generate a template using AI(Flexgen)", demo_url="https://flexgen.reflex.run",
code_url=""),
Template(name=constants.Templates.CHOOSE_TEMPLATES, description="Choose an existing template.", demo_url="https://reflex.dev/templates",
code_url=""),
]
def initialize_main_module_index_from_generation(app_name: str, generation_hash: str):
"""Overwrite the `index` function in the main module with reflex.build generated code.