From 0b74672844e10047637f3f2b602d76aaf00b2b77 Mon Sep 17 00:00:00 2001 From: Karl Date: Sun, 18 May 2025 21:16:11 +0100 Subject: [PATCH] select model on create page --- ai_frame_image_server.py | 9 +++-- libs/generic.py | 6 ++++ templates/create_image.html | 71 +++++++++++++++++++++++++++---------- 3 files changed, 66 insertions(+), 20 deletions(-) diff --git a/ai_frame_image_server.py b/ai_frame_image_server.py index 7645adc..ddbf030 100644 --- a/ai_frame_image_server.py +++ b/ai_frame_image_server.py @@ -9,7 +9,7 @@ import os import time import threading from apscheduler.schedulers.background import BackgroundScheduler -from libs.generic import load_config, load_recent_prompts, get_details_from_png, get_current_version +from libs.generic import load_config, load_recent_prompts, get_details_from_png, get_current_version, load_models_from_config from libs.comfyui import cancel_current_job, create_image from libs.ollama import create_prompt_on_openwebui @@ -100,6 +100,8 @@ def create() -> str: str: Redirect to the main page or a JSON response. """ prompt = request.form.get("prompt") if request.method == "POST" else None + model = request.form.get("model") if request.method == "POST" else None + if prompt is None: prompt = create_prompt_on_openwebui(user_config["comfyui"]["prompt"]) @@ -122,8 +124,11 @@ def create_image_endpoint() -> str: Renders the create image template with image and prompt. """ + models = load_models_from_config() + models.insert(0, "Random") + return render_template( - "create_image.html" + "create_image.html", models=models ) diff --git a/libs/generic.py b/libs/generic.py index e51e411..1c6cd10 100644 --- a/libs/generic.py +++ b/libs/generic.py @@ -98,6 +98,12 @@ def get_current_version(): print("Error running bump-my-version:", e) return None +def load_models_from_config(): + flux_models = user_config["comfyui:flux"]["models"].split(",") + sdxl_models = user_config["comfyui"]["models"].split(",") + all_models = flux_models + sdxl_models + return all_models + user_config = load_config() output_folder = user_config["comfyui"]["output_dir"] \ No newline at end of file diff --git a/templates/create_image.html b/templates/create_image.html index cbac593..67bd6f1 100644 --- a/templates/create_image.html +++ b/templates/create_image.html @@ -1,15 +1,14 @@ - - + + Create An Image