Compare commits

..

No commits in common. "c4e86a5433ccbaf23546de5279747de2f36908b8" and "9d80741da1c284c95c5c8768fd0b3180541cd450" have entirely different histories.

4 changed files with 10 additions and 7 deletions

View File

@ -1,5 +1,5 @@
[tool.bumpversion]
current_version = "0.1.21"
current_version = "0.1.20"
parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
serialize = ["{major}.{minor}.{patch}"]
search = "{current_version}"

1
.vscode/launch.json vendored
View File

@ -11,7 +11,6 @@
"program": "${file}",
"console": "integratedTerminal",
"justMyCode": false,
"env": {"SECRET_KEY":"dkdkdk"}
// "args": [
// "--num_inference_steps",
// "6",

View File

@ -60,7 +60,7 @@ def login():
if request.method == 'POST':
if request.form['password'] == user_config["frame"]["password_for_auth"]:
session['authenticated'] = True
return render_template("create_image.html", models=load_models_from_config(), topics=load_topics_from_config())
return render_template("create_image.html", models=load_models_from_config())
else:
return redirect(url_for('login'))
return render_template('login.html')
@ -159,8 +159,10 @@ def create_image_endpoint() -> str:
"""
if user_config["frame"]["create_requires_auth"] == "True" and not session.get('authenticated'):
return redirect(url_for("login"))
models = load_models_from_config()
topics = load_topics_from_config()
return render_template("create_image.html", models=load_models_from_config(), topics=load_topics_from_config())
return render_template("create_image.html", models=models, topics=topics)
if user_config["frame"]["auto_regen"] == "True":

View File

@ -100,14 +100,16 @@ def get_current_version():
return None
def load_models_from_config():
flux_models = load_config()["comfyui:flux"]["models"].split(",")
sdxl_models = load_config()["comfyui"]["models"].split(",")
flux_models = user_config["comfyui:flux"]["models"].split(",")
sdxl_models = user_config["comfyui"]["models"].split(",")
all_models = flux_models + sdxl_models
return all_models
def load_topics_from_config():
topics = load_config()["comfyui"]["topics"].split(", ")
topics = user_config["comfyui"]["topics"].split(", ")
return topics
user_config = load_config()
output_folder = user_config["comfyui"]["output_dir"]