diff --git a/.vscode/launch.json b/.vscode/launch.json index be5e826..8605db7 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -11,6 +11,7 @@ "program": "${file}", "console": "integratedTerminal", "justMyCode": false, + "env": {"SECRET_KEY":"dkdkdk"} // "args": [ // "--num_inference_steps", // "6", diff --git a/ai_frame_image_server.py b/ai_frame_image_server.py index 39428c5..90e2184 100644 --- a/ai_frame_image_server.py +++ b/ai_frame_image_server.py @@ -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()) + return render_template("create_image.html", models=load_models_from_config(), topics=load_topics_from_config()) else: return redirect(url_for('login')) return render_template('login.html') @@ -159,10 +159,8 @@ 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=models, topics=topics) + return render_template("create_image.html", models=load_models_from_config(), topics=load_topics_from_config()) if user_config["frame"]["auto_regen"] == "True": diff --git a/libs/generic.py b/libs/generic.py index 42f1509..6e2a678 100644 --- a/libs/generic.py +++ b/libs/generic.py @@ -100,16 +100,14 @@ def get_current_version(): return None def load_models_from_config(): - flux_models = user_config["comfyui:flux"]["models"].split(",") - sdxl_models = user_config["comfyui"]["models"].split(",") + flux_models = load_config()["comfyui:flux"]["models"].split(",") + sdxl_models = load_config()["comfyui"]["models"].split(",") all_models = flux_models + sdxl_models return all_models def load_topics_from_config(): - topics = user_config["comfyui"]["topics"].split(", ") + topics = load_config()["comfyui"]["topics"].split(", ") return topics - - user_config = load_config() output_folder = user_config["comfyui"]["output_dir"] \ No newline at end of file