mirror of
https://github.com/karl0ss/ai_image_frame_server.git
synced 2025-07-05 14:06:07 +01:00
Compare commits
No commits in common. "main" and "0.1.17" have entirely different histories.
@ -1,5 +1,5 @@
|
||||
[tool.bumpversion]
|
||||
current_version = "0.2.8"
|
||||
current_version = "0.1.17"
|
||||
parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
|
||||
serialize = ["{major}.{minor}.{patch}"]
|
||||
search = "{current_version}"
|
||||
|
||||
2
.gitignore
vendored
2
.gitignore
vendored
@ -9,5 +9,3 @@ output/
|
||||
prompts_log.jsonl
|
||||
publish.sh
|
||||
test.py
|
||||
.vscode/launch.json
|
||||
favourites.json
|
||||
|
||||
1
.vscode/launch.json
vendored
1
.vscode/launch.json
vendored
@ -11,7 +11,6 @@
|
||||
"program": "${file}",
|
||||
"console": "integratedTerminal",
|
||||
"justMyCode": false,
|
||||
"env": {"SECRET_KEY":"dkdkdk"}
|
||||
// "args": [
|
||||
// "--num_inference_steps",
|
||||
// "6",
|
||||
|
||||
@ -1,50 +1,157 @@
|
||||
from flask import Flask
|
||||
from libs.generic import load_config
|
||||
import os
|
||||
|
||||
from routes import (
|
||||
auth_routes,
|
||||
gallery_routes,
|
||||
image_routes,
|
||||
index_routes,
|
||||
job_routes,
|
||||
create_routes,
|
||||
settings_routes
|
||||
from flask import (
|
||||
Flask,
|
||||
render_template,
|
||||
send_from_directory,
|
||||
request,
|
||||
jsonify,
|
||||
redirect,
|
||||
url_for
|
||||
)
|
||||
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, load_models_from_config
|
||||
from libs.comfyui import cancel_current_job, create_image
|
||||
from libs.ollama import create_prompt_on_openwebui
|
||||
|
||||
#workflow test commit
|
||||
|
||||
user_config = load_config()
|
||||
|
||||
app = Flask(__name__)
|
||||
app.secret_key = os.environ.get("SECRET_KEY")
|
||||
|
||||
# Inject config into routes that need it
|
||||
create_routes.init_app(user_config)
|
||||
auth_routes.init_app(user_config)
|
||||
image_folder = "./output"
|
||||
|
||||
# Register blueprints
|
||||
app.register_blueprint(index_routes.bp)
|
||||
app.register_blueprint(auth_routes.bp)
|
||||
app.register_blueprint(gallery_routes.bp)
|
||||
app.register_blueprint(image_routes.bp)
|
||||
app.register_blueprint(job_routes.bp)
|
||||
app.register_blueprint(create_routes.bp)
|
||||
app.register_blueprint(settings_routes.bp)
|
||||
@app.route("/", methods=["GET"])
|
||||
def index() -> str:
|
||||
"""
|
||||
Renders the main HTML template with image and prompt.
|
||||
"""
|
||||
image_filename = "./image.png"
|
||||
image_path = os.path.join(image_folder, image_filename)
|
||||
|
||||
# Optional: scheduler setup
|
||||
from apscheduler.schedulers.background import BackgroundScheduler
|
||||
import time
|
||||
from libs.comfyui import create_image
|
||||
prompt = get_details_from_png(image_path)["p"]
|
||||
|
||||
def scheduled_task():
|
||||
version = get_current_version()
|
||||
|
||||
return render_template(
|
||||
"index.html",
|
||||
image=image_filename,
|
||||
prompt=prompt,
|
||||
reload_interval=user_config["frame"]["reload_interval"],
|
||||
version=version
|
||||
)
|
||||
|
||||
@app.route("/images", methods=["GET"])
|
||||
def gallery() -> str:
|
||||
images = []
|
||||
for f in os.listdir(image_folder):
|
||||
if f.lower().endswith(('png', 'jpg', 'jpeg', 'gif')):
|
||||
images.append({'filename': f})
|
||||
images = sorted(images, key=lambda x: os.path.getmtime(os.path.join(image_folder, x['filename'])), reverse=True)
|
||||
return render_template("gallery.html", images=images)
|
||||
|
||||
|
||||
@app.route("/image-details/<filename>", methods=["GET"])
|
||||
def image_details(filename):
|
||||
path = os.path.join(image_folder, filename)
|
||||
if not os.path.exists(path):
|
||||
return {"error": "File not found"}, 404
|
||||
details = get_details_from_png(path)
|
||||
return {
|
||||
"prompt": details["p"],
|
||||
"model": details["m"],
|
||||
"date": details["d"]
|
||||
}
|
||||
|
||||
|
||||
@app.route('/images/thumbnails/<path:filename>')
|
||||
def serve_thumbnail(filename):
|
||||
return send_from_directory('output/thumbnails', filename)
|
||||
|
||||
|
||||
@app.route("/images/<filename>", methods=["GET"])
|
||||
def images(filename: str) -> None:
|
||||
"""
|
||||
Serves the requested image file.
|
||||
Args:
|
||||
filename (str): The name of the image file.
|
||||
Returns:
|
||||
None: Sends the image file.
|
||||
"""
|
||||
return send_from_directory(image_folder, filename)
|
||||
|
||||
|
||||
@app.route("/cancel", methods=["GET"])
|
||||
def cancel_job() -> None:
|
||||
"""
|
||||
Serves the requested image file.
|
||||
Args:
|
||||
filename (str): The name of the image file.
|
||||
Returns:
|
||||
None: Sends the image file.
|
||||
"""
|
||||
return cancel_current_job()
|
||||
|
||||
|
||||
@app.route("/create", methods=["GET", "POST"])
|
||||
def create():
|
||||
if request.method == "POST":
|
||||
prompt = request.form.get("prompt")
|
||||
model = request.form.get("model") or "Random"
|
||||
|
||||
if not prompt:
|
||||
prompt = create_prompt_on_openwebui(user_config["comfyui"]["prompt"])
|
||||
|
||||
# Start generation in background
|
||||
threading.Thread(target=lambda: create_image(prompt, model)).start()
|
||||
|
||||
# store prompt in query string temporarily
|
||||
return redirect(url_for("image_queued", prompt=prompt))
|
||||
|
||||
# For GET requests, just show the form to enter prompt
|
||||
return render_template("create_image.html", models=load_models_from_config())
|
||||
|
||||
|
||||
@app.route("/image_queued")
|
||||
def image_queued():
|
||||
prompt = request.args.get("prompt", "No prompt provided.")
|
||||
return render_template("image_queued.html", prompt=prompt)
|
||||
|
||||
def scheduled_task() -> None:
|
||||
"""Executes the scheduled image generation task."""
|
||||
print(f"Executing scheduled task at {time.strftime('%Y-%m-%d %H:%M:%S')}")
|
||||
create_image(None)
|
||||
|
||||
@app.route("/create_image", methods=["GET"])
|
||||
def create_image_endpoint() -> str:
|
||||
"""
|
||||
Renders the create image template with image and prompt.
|
||||
"""
|
||||
|
||||
models = load_models_from_config()
|
||||
|
||||
return render_template(
|
||||
"create_image.html", models=models
|
||||
)
|
||||
|
||||
|
||||
|
||||
if user_config["frame"]["auto_regen"] == "True":
|
||||
if os.environ.get("WERKZEUG_RUN_MAIN") == "true":
|
||||
scheduler = BackgroundScheduler()
|
||||
h, m = user_config["frame"]["regen_time"].split(":")
|
||||
scheduler.add_job(scheduled_task, "cron", hour=h, minute=m, id="scheduled_task", max_instances=1, replace_existing=True)
|
||||
regen_time = user_config["frame"]["regen_time"].split(":")
|
||||
scheduler.add_job(
|
||||
scheduled_task,
|
||||
"cron",
|
||||
hour=regen_time[0],
|
||||
minute=regen_time[1],
|
||||
id="scheduled_task",
|
||||
max_instances=1, # prevent overlapping
|
||||
replace_existing=True # don't double-schedule
|
||||
)
|
||||
scheduler.start()
|
||||
|
||||
os.makedirs("./output", exist_ok=True)
|
||||
os.makedirs(image_folder, exist_ok=True)
|
||||
app.run(host="0.0.0.0", port=user_config["frame"]["port"], debug=True)
|
||||
|
||||
|
||||
@ -1,6 +0,0 @@
|
||||
[settings]
|
||||
my_items = chelsea fc, stamford bridge, charpi dog, soccer, IT, computing, cybernetic insects, alien, predator, the simpsons, south park, nintendo, sega, xbox, playstation, pixelart, bmw e90, test
|
||||
|
||||
[comfyui]
|
||||
topics = chelsea fc, stamford bridge, charpi dog, soccer, IT, computing, cybernetic insects, alien, predator, the simpsons, south park, nintendo, sega, xbox, playstation, pixelart, bmw e90, gg
|
||||
|
||||
@ -32,9 +32,12 @@ def get_available_models() -> list:
|
||||
response = requests.get(url)
|
||||
if response.status_code == 200:
|
||||
data = response.json()
|
||||
general = data.get("CheckpointLoaderSimple", {}).get("input", {}).get("required", {}).get("ckpt_name", [])[0]
|
||||
flux = data.get("UnetLoaderGGUF", {}).get("input", {}).get("required", {}).get("unet_name", [])[0]
|
||||
return general + flux
|
||||
return (
|
||||
data.get("CheckpointLoaderSimple", {})
|
||||
.get("input", {})
|
||||
.get("required", {})
|
||||
.get("ckpt_name", [])[0]
|
||||
)
|
||||
else:
|
||||
print(f"Failed to fetch models: {response.status_code}")
|
||||
return []
|
||||
@ -119,27 +122,6 @@ def generate_image(
|
||||
logging.error(f"Failed to generate image for UID: {file_name}. Error: {e}")
|
||||
raise
|
||||
|
||||
def select_model(model: str) -> tuple[str, str]:
|
||||
use_flux = json.loads(user_config["comfyui"].get("FLUX", "false").lower())
|
||||
only_flux = json.loads(user_config["comfyui"].get("ONLY_FLUX", "false").lower())
|
||||
|
||||
if model == "Random":
|
||||
selected_workflow = "FLUX" if (use_flux and (only_flux or random.choice([True, False]))) else "SDXL"
|
||||
elif "flux" in model.lower():
|
||||
selected_workflow = "FLUX"
|
||||
else:
|
||||
selected_workflow = "SDXL"
|
||||
|
||||
if model == "Random":
|
||||
if selected_workflow == "FLUX":
|
||||
valid_models = user_config["comfyui:flux"]["models"].split(",")
|
||||
else: # SDXL
|
||||
available_model_list = user_config["comfyui"]["models"].split(",")
|
||||
valid_models = list(set(get_available_models()) & set(available_model_list))
|
||||
model = random.choice(valid_models)
|
||||
|
||||
return selected_workflow, model
|
||||
|
||||
|
||||
def create_image(prompt: str | None = None, model: str = "Random") -> None:
|
||||
"""Generate an image with a chosen workflow (Random, FLUX*, or SDXL*)."""
|
||||
@ -152,9 +134,18 @@ def create_image(prompt: str | None = None, model: str = "Random") -> None:
|
||||
return
|
||||
|
||||
save_prompt(prompt)
|
||||
selected_workflow, model = select_model(model)
|
||||
|
||||
use_flux = json.loads(user_config["comfyui"].get("FLUX", "false").lower())
|
||||
only_flux = json.loads(user_config["comfyui"].get("ONLY_FLUX", "false").lower())
|
||||
if model == "Random":
|
||||
selected_workflow = "FLUX" if (use_flux and (only_flux or random.choice([True, False]))) else "SDXL"
|
||||
elif "flux" in model.lower():
|
||||
selected_workflow = "FLUX"
|
||||
else:
|
||||
selected_workflow = "SDXL"
|
||||
if selected_workflow == "FLUX":
|
||||
if model == "Random":
|
||||
valid_models = user_config["comfyui:flux"]["models"].split(",")
|
||||
model = random.choice(valid_models)
|
||||
generate_image(
|
||||
file_name="image",
|
||||
comfy_prompt=prompt,
|
||||
@ -164,11 +155,17 @@ def create_image(prompt: str | None = None, model: str = "Random") -> None:
|
||||
seed_param="seed",
|
||||
save_node="CivitAI Image Saver",
|
||||
save_param="filename",
|
||||
model_node="UnetLoaderGGUFAdvancedDisTorchMultiGPU",
|
||||
model_node="Unet Loader (GGUF)",
|
||||
model_param="unet_name",
|
||||
model=model
|
||||
)
|
||||
else: # SDXL
|
||||
if model == "Random":
|
||||
available_model_list = user_config["comfyui"]["models"].split(",")
|
||||
valid_models = list(set(get_available_models()) & set(available_model_list))
|
||||
model = random.choice(valid_models)
|
||||
generate_image("image", comfy_prompt=prompt, model=model)
|
||||
|
||||
logging.info(f"{selected_workflow} generation started with prompt: {prompt}")
|
||||
|
||||
|
||||
@ -100,17 +100,11 @@ 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(",")
|
||||
sorted_flux_models = sorted(flux_models, key=str.lower)
|
||||
sorted_sdxl_models = sorted(sdxl_models, key=str.lower)
|
||||
return sorted_sdxl_models, sorted_flux_models
|
||||
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(",")
|
||||
sorted_topics = sorted(topics, key=str.lower)
|
||||
return sorted_topics
|
||||
|
||||
user_config = load_config()
|
||||
output_folder = user_config["comfyui"]["output_dir"]
|
||||
@ -3,7 +3,6 @@ import logging
|
||||
import litellm
|
||||
import nest_asyncio
|
||||
from libs.generic import load_recent_prompts, load_config
|
||||
import re
|
||||
nest_asyncio.apply()
|
||||
|
||||
logging.basicConfig(level=logging.INFO)
|
||||
@ -13,23 +12,15 @@ LOG_FILE = "./prompts_log.jsonl"
|
||||
user_config = load_config()
|
||||
output_folder = user_config["comfyui"]["output_dir"]
|
||||
|
||||
def create_prompt_on_openwebui(prompt: str, topic: str = "random") -> str:
|
||||
def create_prompt_on_openwebui(prompt: str) -> str:
|
||||
"""Sends prompt to OpenWebui and returns the generated response."""
|
||||
topic_instruction = ""
|
||||
selected_topic = ""
|
||||
# Unique list of recent prompts
|
||||
recent_prompts = list(set(load_recent_prompts()))
|
||||
if topic == "random":
|
||||
topics = [t.strip() for t in user_config["comfyui"]["topics"].split(",") if t.strip()]
|
||||
selected_topic = random.choice(topics)
|
||||
elif topic != "":
|
||||
selected_topic = topic
|
||||
else:
|
||||
# Decide on whether to include a topic (e.g., 30% chance to include)
|
||||
topics = [t.strip() for t in user_config["comfyui"]["topics"].split(",") if t.strip()]
|
||||
if random.random() < 0.3 and topics:
|
||||
topic_instruction = ""
|
||||
if random.random() < 0.5 and topics:
|
||||
selected_topic = random.choice(topics)
|
||||
if selected_topic != "":
|
||||
topic_instruction = f" Incorporate the theme of '{selected_topic}' into the new prompt."
|
||||
|
||||
user_content = (
|
||||
@ -75,10 +66,5 @@ def create_prompt_on_openwebui(prompt: str, topic: str = "random") -> str:
|
||||
# api_key=user_config["openwebui"]["api_key"],
|
||||
# )
|
||||
# prompt = response["choices"][0]["message"]["content"].strip('"')
|
||||
match = re.search(r'"([^"]+)"', prompt)
|
||||
if not match:
|
||||
match = re.search(r":\s*\n*\s*(.+)", prompt)
|
||||
if match:
|
||||
prompt = match.group(1)
|
||||
logging.debug(prompt)
|
||||
return prompt
|
||||
return prompt.split(": ")[-1]
|
||||
@ -1,11 +0,0 @@
|
||||
from . import auth_routes, create_routes, gallery_routes, image_routes, index_routes, job_routes, settings_routes
|
||||
|
||||
__all__ = [
|
||||
"auth_routes",
|
||||
"create_routes",
|
||||
"gallery_routes",
|
||||
"image_routes",
|
||||
"index_routes",
|
||||
"job_routes",
|
||||
"settings_routes"
|
||||
]
|
||||
@ -1,29 +0,0 @@
|
||||
from flask import Blueprint, render_template, request, redirect, url_for, session
|
||||
from libs.generic import load_models_from_config, load_topics_from_config
|
||||
from urllib.parse import urlparse, urljoin
|
||||
|
||||
bp = Blueprint("auth_routes", __name__)
|
||||
user_config = None
|
||||
|
||||
def init_app(config):
|
||||
global user_config
|
||||
user_config = config
|
||||
|
||||
def is_safe_url(target):
|
||||
ref_url = urlparse(request.host_url)
|
||||
test_url = urlparse(urljoin(request.host_url, target))
|
||||
return test_url.scheme in ("http", "https") and ref_url.netloc == test_url.netloc
|
||||
|
||||
@bp.route("/login", methods=["GET", "POST"])
|
||||
def login():
|
||||
next_url = request.args.get("next") if request.method == "GET" else request.form.get("next")
|
||||
|
||||
if request.method == "POST":
|
||||
if request.form["password"] == user_config["frame"]["password_for_auth"]:
|
||||
session["authenticated"] = True
|
||||
if next_url and is_safe_url(next_url):
|
||||
return redirect(next_url)
|
||||
return redirect(url_for("create_image")) # fallback
|
||||
return redirect(url_for("auth_routes.login", next=next_url)) # retry with `next`
|
||||
|
||||
return render_template("login.html", next=next_url)
|
||||
@ -1,41 +0,0 @@
|
||||
from flask import Blueprint, request, render_template, redirect, url_for, session
|
||||
import threading
|
||||
from libs.comfyui import create_image, select_model, get_available_models
|
||||
from libs.ollama import create_prompt_on_openwebui
|
||||
from libs.generic import load_models_from_config, load_topics_from_config
|
||||
import os
|
||||
|
||||
bp = Blueprint("create_routes", __name__)
|
||||
user_config = None # will be set in init_app
|
||||
|
||||
@bp.route("/create", methods=["GET", "POST"])
|
||||
def create():
|
||||
if request.method == "POST":
|
||||
prompt = request.form.get("prompt")
|
||||
selected_workflow, model = select_model(request.form.get("model") or "Random")
|
||||
topic = request.form.get("topic")
|
||||
|
||||
if not prompt:
|
||||
prompt = create_prompt_on_openwebui(user_config["comfyui"]["prompt"], topic)
|
||||
|
||||
threading.Thread(target=lambda: create_image(prompt, model)).start()
|
||||
return redirect(url_for("create_routes.image_queued", prompt=prompt, model=model.split(".")[0]))
|
||||
|
||||
return render_template("create_image.html", models=load_models_from_config()[0]+load_models_from_config()[1], topics=load_topics_from_config())
|
||||
|
||||
@bp.route("/image_queued")
|
||||
def image_queued():
|
||||
prompt = request.args.get("prompt", "No prompt provided.")
|
||||
model = request.args.get("model", "No model selected.").split(".")[0]
|
||||
return render_template("image_queued.html", prompt=prompt, model=model)
|
||||
|
||||
@bp.route("/create_image", methods=["GET"])
|
||||
def create_image_page():
|
||||
if user_config["frame"]["create_requires_auth"] == "True" and not session.get("authenticated"):
|
||||
return redirect(url_for("auth_routes.login", next=request.path))
|
||||
return render_template("create_image.html", models=load_models_from_config()[0]+load_models_from_config()[1], topics=load_topics_from_config())
|
||||
|
||||
|
||||
def init_app(config):
|
||||
global user_config
|
||||
user_config = config
|
||||
@ -1,50 +0,0 @@
|
||||
from flask import Blueprint, render_template, jsonify, request
|
||||
import os
|
||||
import json
|
||||
|
||||
bp = Blueprint("gallery_routes", __name__)
|
||||
image_folder = "./output"
|
||||
favourites_file = "./favourites.json"
|
||||
|
||||
def get_favourites():
|
||||
if not os.path.exists(favourites_file):
|
||||
return []
|
||||
with open(favourites_file, 'r') as f:
|
||||
return json.load(f)
|
||||
|
||||
def save_favourites(favourites):
|
||||
with open(favourites_file, 'w') as f:
|
||||
json.dump(favourites, f)
|
||||
|
||||
@bp.route("/images", methods=["GET"])
|
||||
def gallery():
|
||||
favourites = get_favourites()
|
||||
images = [
|
||||
{"filename": f, "favourited": f in favourites}
|
||||
for f in os.listdir(image_folder)
|
||||
if f.lower().endswith(("png", "jpg", "jpeg", "gif"))
|
||||
]
|
||||
images = sorted(images, key=lambda x: os.path.getmtime(os.path.join(image_folder, x["filename"])), reverse=True)
|
||||
return render_template("gallery.html", images=images)
|
||||
|
||||
@bp.route("/favourites", methods=["GET"])
|
||||
def get_favourites_route():
|
||||
return jsonify(get_favourites())
|
||||
|
||||
@bp.route("/favourites/toggle", methods=["POST"])
|
||||
def toggle_favourite():
|
||||
data = request.get_json()
|
||||
filename = data.get("filename")
|
||||
if not filename:
|
||||
return jsonify({"status": "error", "message": "Filename missing"}), 400
|
||||
|
||||
favourites = get_favourites()
|
||||
is_favourited = False
|
||||
if filename in favourites:
|
||||
favourites.remove(filename)
|
||||
else:
|
||||
favourites.append(filename)
|
||||
is_favourited = True
|
||||
|
||||
save_favourites(favourites)
|
||||
return jsonify({"status": "success", "favourited": is_favourited})
|
||||
@ -1,22 +0,0 @@
|
||||
from flask import Blueprint, send_from_directory, jsonify
|
||||
import os
|
||||
from libs.generic import get_details_from_png
|
||||
|
||||
bp = Blueprint("image_routes", __name__)
|
||||
image_folder = "./output"
|
||||
|
||||
@bp.route("/images/<filename>", methods=["GET"])
|
||||
def serve_image(filename):
|
||||
return send_from_directory(image_folder, filename)
|
||||
|
||||
@bp.route("/images/thumbnails/<path:filename>")
|
||||
def serve_thumbnail(filename):
|
||||
return send_from_directory("output/thumbnails", filename)
|
||||
|
||||
@bp.route("/image-details/<filename>", methods=["GET"])
|
||||
def image_details(filename):
|
||||
path = os.path.join(image_folder, filename)
|
||||
if not os.path.exists(path):
|
||||
return jsonify({"error": "File not found"}), 404
|
||||
details = get_details_from_png(path)
|
||||
return jsonify({"prompt": details["p"], "model": details["m"], "date": details["d"]})
|
||||
@ -1,22 +0,0 @@
|
||||
from flask import Blueprint, render_template
|
||||
import os
|
||||
from libs.generic import get_details_from_png, get_current_version, load_config
|
||||
|
||||
bp = Blueprint("index_routes", __name__)
|
||||
image_folder = "./output"
|
||||
user_config = load_config()
|
||||
|
||||
@bp.route("/", methods=["GET"])
|
||||
def index():
|
||||
image_filename = "./image.png"
|
||||
image_path = os.path.join(image_folder, image_filename)
|
||||
prompt = get_details_from_png(image_path)["p"]
|
||||
version = get_current_version()
|
||||
|
||||
return render_template(
|
||||
"index.html",
|
||||
image=image_filename,
|
||||
prompt=prompt,
|
||||
reload_interval=user_config["frame"]["reload_interval"],
|
||||
version=version,
|
||||
)
|
||||
@ -1,8 +0,0 @@
|
||||
from flask import Blueprint
|
||||
from libs.comfyui import cancel_current_job
|
||||
|
||||
bp = Blueprint("job_routes", __name__)
|
||||
|
||||
@bp.route("/cancel", methods=["GET"])
|
||||
def cancel_job():
|
||||
return cancel_current_job()
|
||||
@ -1,98 +0,0 @@
|
||||
from flask import Blueprint, render_template, request, redirect, url_for, session
|
||||
import configparser
|
||||
from libs.generic import load_topics_from_config, load_models_from_config
|
||||
|
||||
bp = Blueprint('settings_route', __name__)
|
||||
CONFIG_PATH = "./user_config.cfg"
|
||||
|
||||
@bp.route('/settings', methods=['GET', 'POST'])
|
||||
def config_editor():
|
||||
if not session.get("authenticated"):
|
||||
return redirect(url_for("auth_routes.login", next=request.path))
|
||||
|
||||
config = configparser.ConfigParser()
|
||||
config.read(CONFIG_PATH)
|
||||
|
||||
topics = config.get('comfyui', 'topics', fallback='').split(',')
|
||||
general_models = config.get('comfyui', 'models', fallback='').split(',')
|
||||
flux_models = config.get('comfyui:flux', 'models', fallback='').split(',')
|
||||
|
||||
topics = [t.strip() for t in topics if t.strip()]
|
||||
general_models = [m.strip() for m in general_models if m.strip()]
|
||||
flux_models = [m.strip() for m in flux_models if m.strip()]
|
||||
|
||||
if request.method == 'POST':
|
||||
if 'new_topic' in request.form:
|
||||
new_topic = request.form.get('new_topic', '').strip()
|
||||
if new_topic and new_topic not in topics:
|
||||
topics.append(new_topic)
|
||||
|
||||
if 'delete_topic' in request.form:
|
||||
to_delete = request.form.getlist('delete_topic')
|
||||
topics = [topic for topic in topics if topic not in to_delete]
|
||||
|
||||
if 'new_model' in request.form:
|
||||
new_model = request.form.get('new_model', '').strip()
|
||||
if new_model:
|
||||
if 'flux' in new_model and new_model not in flux_models:
|
||||
flux_models.append(new_model)
|
||||
elif 'flux' not in new_model and new_model not in general_models:
|
||||
general_models.append(new_model)
|
||||
|
||||
if 'delete_model' in request.form:
|
||||
to_delete = request.form.getlist('delete_model')
|
||||
general_models = [m for m in general_models if m not in to_delete]
|
||||
flux_models = [m for m in flux_models if m not in to_delete]
|
||||
|
||||
# Save models/topics into the shared config object
|
||||
if not config.has_section('comfyui'):
|
||||
config.add_section('comfyui')
|
||||
if not config.has_section('comfyui:flux'):
|
||||
config.add_section('comfyui:flux')
|
||||
|
||||
config.set('comfyui', 'models', ','.join(general_models))
|
||||
config.set('comfyui:flux', 'models', ','.join(flux_models))
|
||||
config.set('comfyui', 'topics', ','.join(topics))
|
||||
|
||||
# Handle dynamic CFG field updates (excluding DEFAULT and protected keys)
|
||||
for section in config.sections():
|
||||
for key in config[section]:
|
||||
if key == 'models' and section in ('comfyui', 'comfyui:flux'):
|
||||
continue
|
||||
if key == 'topics' and section == 'comfyui':
|
||||
continue
|
||||
form_key = f"{section}:{key}"
|
||||
if form_key in request.form:
|
||||
new_value = request.form[form_key]
|
||||
# Prevent overwriting masked secrets unless actually changed
|
||||
if key in ('password_for_auth', 'api_key') and new_value == "********":
|
||||
continue # Skip overwriting
|
||||
config[section][key] = new_value
|
||||
|
||||
|
||||
# Save everything at once
|
||||
with open(CONFIG_PATH, 'w') as configfile:
|
||||
config.write(configfile)
|
||||
|
||||
return redirect(url_for('settings_route.config_editor'))
|
||||
|
||||
# Prepare filtered config for display
|
||||
filtered_config = {}
|
||||
for section in config.sections():
|
||||
items = {
|
||||
k: v for k, v in config[section].items()
|
||||
if not (
|
||||
(k == 'models' and section in ('comfyui', 'comfyui:flux')) or
|
||||
(k == 'topics' and section == 'comfyui')
|
||||
)
|
||||
}
|
||||
if items: # only include non-empty sections
|
||||
filtered_config[section] = items
|
||||
|
||||
return render_template(
|
||||
'settings.html',
|
||||
topics=sorted(topics,key=str.lower),
|
||||
models=sorted(general_models + flux_models,key=str.lower),
|
||||
config_sections=filtered_config.keys(),
|
||||
config_values=filtered_config
|
||||
)
|
||||
@ -144,17 +144,6 @@
|
||||
</optgroup>
|
||||
</select>
|
||||
|
||||
<select id="topic-select">
|
||||
<option value="">No Topic</option>
|
||||
<option value="random">Random</option>
|
||||
<optgroup label="Topics">
|
||||
{% for t in topics %}
|
||||
<option value="{{ t }}">{{ t }}</option>
|
||||
{% endfor %}
|
||||
</optgroup>
|
||||
</select>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<!-- waiting overlay -->
|
||||
@ -194,11 +183,9 @@
|
||||
function randomPrompt() {
|
||||
showSpinner();
|
||||
const model = document.getElementById('model-select').value;
|
||||
const topic = document.getElementById('topic-select').value; // this line was missing
|
||||
|
||||
const formData = new URLSearchParams();
|
||||
formData.append('model', model);
|
||||
formData.append('topic', topic); // include topic in request
|
||||
|
||||
fetch('/create', {
|
||||
method: 'POST',
|
||||
|
||||
@ -116,22 +116,6 @@
|
||||
/* lower than lightbox (999) */
|
||||
}
|
||||
|
||||
.favourites-button {
|
||||
position: fixed;
|
||||
top: 20px;
|
||||
right: 120px;
|
||||
z-index: 500;
|
||||
}
|
||||
|
||||
.favourite-heart {
|
||||
position: absolute;
|
||||
top: 20px;
|
||||
left: 30px;
|
||||
font-size: 30px;
|
||||
color: white;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.button-link {
|
||||
background: #333;
|
||||
color: white;
|
||||
@ -143,7 +127,6 @@
|
||||
transition: background 0.3s;
|
||||
display: inline-block;
|
||||
text-align: center;
|
||||
border: none;
|
||||
}
|
||||
|
||||
.button-link:hover {
|
||||
@ -196,17 +179,15 @@
|
||||
|
||||
<body>
|
||||
<a href="/" class="button-link home-button">Home</a>
|
||||
<button class="button-link favourites-button" id="favourites-button" onclick="toggleFavouritesView()">Show Favourites</button>
|
||||
|
||||
<h1 id="page-title">Image Archive</h1>
|
||||
<h1>Image Archive</h1>
|
||||
|
||||
<!-- Empty gallery container; images will be loaded incrementally -->
|
||||
<div class="gallery" id="gallery"></div>
|
||||
|
||||
<!-- Lightbox -->
|
||||
<div class="lightbox" id="lightbox" tabindex="-1" onkeyup="handleLightboxKeys(event)">
|
||||
<div class="lightbox" id="lightbox">
|
||||
<span class="close" onclick="closeLightbox()">×</span>
|
||||
<span class="favourite-heart" id="favourite-heart" onclick="toggleFavourite()">♡</span>
|
||||
<span class="arrow left" onclick="prevImage()">❮</span>
|
||||
<img id="lightbox-img" src="" />
|
||||
<p id="lightbox-prompt"></p>
|
||||
@ -215,11 +196,11 @@
|
||||
|
||||
<!-- Pass image filenames from Flask to JS -->
|
||||
<script>
|
||||
let allImages = JSON.parse(`[
|
||||
const allImages = [
|
||||
{% for image in images %}
|
||||
{ "filename": "{{ image.filename }}", "favourited": {{ 'true' if image.favourited else 'false' }} }{% if not loop.last %},{% endif %}
|
||||
{ filename: "{{ image.filename }}" },
|
||||
{% endfor %}
|
||||
]`);
|
||||
];
|
||||
</script>
|
||||
|
||||
<script>
|
||||
@ -228,15 +209,12 @@
|
||||
let loadedCount = 0;
|
||||
let currentIndex = 0;
|
||||
const detailsCache = {}; // Cache for image details
|
||||
let showingFavourites = false;
|
||||
let filteredImages = allImages;
|
||||
|
||||
function createImageElement(image) {
|
||||
const img = document.createElement('img');
|
||||
img.src = `/images/thumbnails/${image.filename}`;
|
||||
img.dataset.fullsrc = `/images/${image.filename}`;
|
||||
img.dataset.filename = image.filename;
|
||||
img.dataset.favourited = image.favourited;
|
||||
img.loading = 'lazy';
|
||||
img.style.cursor = 'pointer';
|
||||
img.style.borderRadius = '10px';
|
||||
@ -245,8 +223,7 @@
|
||||
}
|
||||
|
||||
function loadNextBatch() {
|
||||
const imagesToLoad = showingFavourites ? filteredImages : allImages;
|
||||
const nextImages = imagesToLoad.slice(loadedCount, loadedCount + batchSize);
|
||||
const nextImages = allImages.slice(loadedCount, loadedCount + batchSize);
|
||||
nextImages.forEach(image => {
|
||||
const imgEl = createImageElement(image);
|
||||
gallery.appendChild(imgEl);
|
||||
@ -254,35 +231,12 @@
|
||||
loadedCount += nextImages.length;
|
||||
}
|
||||
|
||||
function renderGallery() {
|
||||
gallery.innerHTML = '';
|
||||
loadedCount = 0;
|
||||
loadNextBatch();
|
||||
}
|
||||
|
||||
function toggleFavouritesView() {
|
||||
showingFavourites = !showingFavourites;
|
||||
const button = document.getElementById('favourites-button');
|
||||
const pageTitle = document.getElementById('page-title');
|
||||
if (showingFavourites) {
|
||||
filteredImages = allImages.filter(img => img.favourited);
|
||||
button.textContent = 'Show All';
|
||||
pageTitle.textContent = 'Favourites';
|
||||
} else {
|
||||
filteredImages = allImages;
|
||||
button.textContent = 'Show Favourites';
|
||||
pageTitle.textContent = 'Image Archive';
|
||||
}
|
||||
renderGallery();
|
||||
}
|
||||
|
||||
// Load initial batch
|
||||
renderGallery();
|
||||
loadNextBatch();
|
||||
|
||||
// Load more images when scrolling near bottom
|
||||
window.addEventListener('scroll', () => {
|
||||
const imagesToLoad = showingFavourites ? filteredImages : allImages;
|
||||
if (loadedCount >= imagesToLoad.length) return; // all loaded
|
||||
if (loadedCount >= allImages.length) return; // all loaded
|
||||
if ((window.innerHeight + window.scrollY) >= (document.body.offsetHeight - 100)) {
|
||||
loadNextBatch();
|
||||
}
|
||||
@ -297,45 +251,7 @@
|
||||
const images = getGalleryImages();
|
||||
currentIndex = images.indexOf(imgEl);
|
||||
showImageAndLoadDetails(currentIndex);
|
||||
const lightbox = document.getElementById("lightbox");
|
||||
lightbox.style.display = "flex";
|
||||
lightbox.focus();
|
||||
}
|
||||
|
||||
function updateFavouriteHeart(isFavourited) {
|
||||
const heart = document.getElementById('favourite-heart');
|
||||
heart.innerHTML = isFavourited ? '♥' : '♡'; // solid vs outline heart
|
||||
heart.style.color = isFavourited ? 'red' : 'white';
|
||||
}
|
||||
|
||||
function toggleFavourite() {
|
||||
const images = getGalleryImages();
|
||||
const imgEl = images[currentIndex];
|
||||
const filename = imgEl.dataset.filename;
|
||||
|
||||
fetch('/favourites/toggle', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ filename: filename })
|
||||
})
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
if (data.status === 'success') {
|
||||
const isFavourited = data.favourited;
|
||||
imgEl.dataset.favourited = isFavourited;
|
||||
updateFavouriteHeart(isFavourited);
|
||||
|
||||
const originalImage = allImages.find(img => img.filename === filename);
|
||||
if (originalImage) {
|
||||
originalImage.favourited = isFavourited;
|
||||
}
|
||||
|
||||
if (showingFavourites) {
|
||||
filteredImages = allImages.filter(img => img.favourited);
|
||||
renderGallery();
|
||||
}
|
||||
}
|
||||
});
|
||||
document.getElementById("lightbox").style.display = "flex";
|
||||
}
|
||||
|
||||
function showImageAndLoadDetails(index) {
|
||||
@ -343,10 +259,8 @@
|
||||
const imgEl = images[index];
|
||||
const filename = imgEl.dataset.filename;
|
||||
const fullsrc = imgEl.dataset.fullsrc;
|
||||
const isFavourited = imgEl.dataset.favourited === 'true';
|
||||
|
||||
document.getElementById("lightbox-img").src = fullsrc;
|
||||
updateFavouriteHeart(isFavourited);
|
||||
|
||||
if (detailsCache[filename]) {
|
||||
document.getElementById("lightbox-prompt").textContent =
|
||||
@ -373,16 +287,12 @@
|
||||
|
||||
function nextImage() {
|
||||
const images = getGalleryImages();
|
||||
const imagesToLoad = showingFavourites ? filteredImages : allImages;
|
||||
if (currentIndex + 1 >= images.length && loadedCount < imagesToLoad.length) {
|
||||
if (currentIndex + 1 >= images.length && loadedCount < allImages.length) {
|
||||
loadNextBatch();
|
||||
// Wait briefly to ensure DOM updates
|
||||
setTimeout(() => {
|
||||
const updatedImages = getGalleryImages();
|
||||
if (currentIndex + 1 < updatedImages.length) {
|
||||
currentIndex++;
|
||||
showImageAndLoadDetails(currentIndex);
|
||||
}
|
||||
}, 100);
|
||||
} else {
|
||||
currentIndex = (currentIndex + 1) % images.length;
|
||||
@ -399,27 +309,6 @@
|
||||
|
||||
function closeLightbox() {
|
||||
document.getElementById("lightbox").style.display = "none";
|
||||
if (showingFavourites) {
|
||||
// Refresh the gallery if a favourite was removed
|
||||
const currentImage = getGalleryImages()[currentIndex];
|
||||
const wasFavourited = currentImage.dataset.favourited === 'true';
|
||||
const originalImage = allImages.find(img => img.filename === currentImage.dataset.filename);
|
||||
if (originalImage && !originalImage.favourited) {
|
||||
renderGallery();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function handleLightboxKeys(e) {
|
||||
if (e.key === 'f') {
|
||||
toggleFavourite();
|
||||
} else if (e.key === 'Escape') {
|
||||
closeLightbox();
|
||||
} else if (e.key === 'ArrowLeft') {
|
||||
prevImage();
|
||||
} else if (e.key === 'ArrowRight') {
|
||||
nextImage();
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
|
||||
@ -52,11 +52,10 @@
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="message">Image will be made with <i>{{ model }}</i> using prompt:</div>
|
||||
<div class="message">Image will be made using prompt:</div>
|
||||
<div class="prompt-text">
|
||||
{{ prompt }}
|
||||
</div>
|
||||
<button onclick="location.href='/'">Home</button>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
||||
@ -92,20 +92,10 @@
|
||||
font-size: 12px;
|
||||
font-family: monospace;
|
||||
user-select: none;
|
||||
pointer-events: none;
|
||||
opacity: 0.6;
|
||||
}
|
||||
|
||||
.version a {
|
||||
color: inherit;
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.version a:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
|
||||
@media (max-width: 768px) {
|
||||
.image-container {
|
||||
max-width: 100vw;
|
||||
@ -144,7 +134,7 @@
|
||||
<body>
|
||||
{% if image %}
|
||||
<div class="image-container">
|
||||
<img src="{{ url_for('image_routes.serve_image', filename=image) }}" alt="Latest Image" />
|
||||
<img src="{{ url_for('images', filename=image) }}" alt="Latest Image" />
|
||||
</div>
|
||||
{% if prompt %}
|
||||
<div class="prompt">{{ prompt }}</div>
|
||||
@ -158,9 +148,7 @@
|
||||
{% endif %}
|
||||
|
||||
<!-- Version number at bottom right -->
|
||||
<div class="version">
|
||||
<a href="{{ url_for('settings_route.config_editor') }}">v{{ version }}</a>
|
||||
</div>
|
||||
<div class="version">v{{ version }}</div>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
@ -1,73 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>Login</title>
|
||||
<style>
|
||||
* {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
body {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
height: 100vh;
|
||||
background: black;
|
||||
color: white;
|
||||
font-family: Arial, sans-serif;
|
||||
padding: 20px;
|
||||
text-align: center;
|
||||
}
|
||||
.message {
|
||||
font-size: 22px;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
.prompt-text {
|
||||
font-size: 20px;
|
||||
background: #111;
|
||||
padding: 20px;
|
||||
border-radius: 10px;
|
||||
border: 1px solid #333;
|
||||
max-width: 80vw;
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
input[type="password"] {
|
||||
padding: 10px;
|
||||
border-radius: 8px;
|
||||
border: 1px solid #555;
|
||||
background: #222;
|
||||
color: white;
|
||||
font-size: 16px;
|
||||
margin-bottom: 20px;
|
||||
width: 250px;
|
||||
}
|
||||
button {
|
||||
background: #333;
|
||||
color: white;
|
||||
border: none;
|
||||
padding: 10px 20px;
|
||||
border-radius: 8px;
|
||||
font-size: 16px;
|
||||
cursor: pointer;
|
||||
transition: background 0.3s;
|
||||
}
|
||||
button:hover {
|
||||
background: #555;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="message">Please enter the password to continue:</div>
|
||||
<form method="post">
|
||||
<div class="prompt-text">
|
||||
<input type="password" name="password" placeholder="Password" required>
|
||||
<input type="hidden" name="next" value="{{ next }}">
|
||||
</div>
|
||||
<button type="submit">Login</button>
|
||||
</form>
|
||||
</body>
|
||||
</html>
|
||||
@ -1,192 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>Config Editor</title>
|
||||
<style>
|
||||
* {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
body {
|
||||
background: black;
|
||||
color: white;
|
||||
font-family: Arial, sans-serif;
|
||||
min-height: 100vh;
|
||||
padding: 40px 20px;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.box {
|
||||
background: #1a1a1a;
|
||||
padding: 20px;
|
||||
border-radius: 12px;
|
||||
width: 45%;
|
||||
min-width: 300px;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
h2 {
|
||||
margin-bottom: 20px;
|
||||
font-size: 24px;
|
||||
}
|
||||
|
||||
form {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
select,
|
||||
input[type="text"] {
|
||||
width: 100%;
|
||||
padding: 10px;
|
||||
margin-bottom: 10px;
|
||||
font-size: 16px;
|
||||
border-radius: 6px;
|
||||
border: none;
|
||||
outline: none;
|
||||
}
|
||||
|
||||
button {
|
||||
width: 100%;
|
||||
background: #333;
|
||||
color: white;
|
||||
text-decoration: none;
|
||||
padding: 10px;
|
||||
border-radius: 8px;
|
||||
font-size: 16px;
|
||||
cursor: pointer;
|
||||
transition: background 0.3s;
|
||||
border: none;
|
||||
}
|
||||
|
||||
button:hover {
|
||||
background: #555;
|
||||
}
|
||||
|
||||
.button-group {
|
||||
text-align: center;
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
.button-link {
|
||||
background: #333;
|
||||
height: 40px;
|
||||
color: white;
|
||||
text-decoration: none;
|
||||
padding: 10px 20px;
|
||||
border-radius: 8px;
|
||||
font-size: 16px;
|
||||
transition: background 0.3s;
|
||||
display: inline-block;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.button-link:hover {
|
||||
background: #555;
|
||||
}
|
||||
|
||||
@media (max-width: 768px) {
|
||||
body {
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.box {
|
||||
width: 90%;
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
}
|
||||
|
||||
.back-button-wrapper {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
margin-top: 20px;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<div class="box">
|
||||
<h2>Topics</h2>
|
||||
<form method="post">
|
||||
<select name="delete_topic">
|
||||
{% for item in topics %}
|
||||
<option value="{{ item }}">{{ item }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
<button name="delete_topic" type="submit">Delete Selected Topic</button>
|
||||
</form>
|
||||
|
||||
<form method="post">
|
||||
<input type="text" name="new_topic" placeholder="New topic">
|
||||
<button name="new_topic" type="submit">Add Topic</button>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div class="box">
|
||||
<h2>Models</h2>
|
||||
<form method="post">
|
||||
<select name="delete_model">
|
||||
{% for item in models %}
|
||||
<option value="{{ item }}">{{ item }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
<button name="delete_model" type="submit">Delete Selected Model</button>
|
||||
</form>
|
||||
|
||||
<form method="post">
|
||||
<input type="text" name="new_model" placeholder="New model">
|
||||
<button name="new_model" type="submit">Add Model</button>
|
||||
</form>
|
||||
</div>
|
||||
<div class="box" style="width: 100%;">
|
||||
<h2>Config Values</h2>
|
||||
<form method="post" style="display:flex; flex-wrap:wrap; justify-content:space-between;">
|
||||
{% for section in config_sections %}
|
||||
<div class="box">
|
||||
<h2>[{{ section }}]</h2>
|
||||
{% for key, value in config_values[section].items() %}
|
||||
<label>{{ key }}</label>
|
||||
{% if value.lower() in ['true', 'false'] %}
|
||||
<select name="{{ section }}:{{ key }}">
|
||||
<option value="True" {% if value.lower()=='true' %}selected{% endif %}>True</option>
|
||||
<option value="False" {% if value.lower()=='false' %}selected{% endif %}>False</option>
|
||||
</select>
|
||||
{% else %}
|
||||
{% if key in ['password_for_auth', 'api_key'] %}
|
||||
<input type="text" name="{{ section }}:{{ key }}" value="********" placeholder="********">
|
||||
{% elif value.lower() in ['true', 'false'] %}
|
||||
<select name="{{ section }}:{{ key }}">
|
||||
<option value="True" {% if value.lower()=='true' %}selected{% endif %}>True</option>
|
||||
<option value="False" {% if value.lower()=='false' %}selected{% endif %}>False</option>
|
||||
</select>
|
||||
{% else %}
|
||||
<input type="text" name="{{ section }}:{{ key }}" value="{{ value }}">
|
||||
{% endif %}
|
||||
|
||||
{% endif %}
|
||||
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% endfor %}
|
||||
<div class="box" style="width: 100%;">
|
||||
<button type="submit">Save Config</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div class="back-button-wrapper">
|
||||
<a href="/" class="button-link">Back to Home</a>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
@ -3,8 +3,6 @@ reload_interval = 30000
|
||||
auto_regen = True
|
||||
regen_time = 03:00
|
||||
port = 5000
|
||||
create_requires_auth = False
|
||||
password_for_auth = create
|
||||
|
||||
[comfyui]
|
||||
comfyui_url = http://comfyui
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
1
|
||||
],
|
||||
"vae": [
|
||||
"73",
|
||||
"27",
|
||||
0
|
||||
]
|
||||
},
|
||||
@ -15,6 +15,75 @@
|
||||
"title": "VAE Decode"
|
||||
}
|
||||
},
|
||||
"22": {
|
||||
"inputs": {
|
||||
"clip_name1": "t5/t5xxl_fp8_e4m3fn.safetensors",
|
||||
"clip_name2": "clip_l.safetensors",
|
||||
"type": "flux",
|
||||
"device": "default"
|
||||
},
|
||||
"class_type": "DualCLIPLoader",
|
||||
"_meta": {
|
||||
"title": "DualCLIPLoader"
|
||||
}
|
||||
},
|
||||
"27": {
|
||||
"inputs": {
|
||||
"vae_name": "FLUX1/ae.safetensors"
|
||||
},
|
||||
"class_type": "VAELoader",
|
||||
"_meta": {
|
||||
"title": "Load VAE"
|
||||
}
|
||||
},
|
||||
"32": {
|
||||
"inputs": {
|
||||
"upscale_model": [
|
||||
"33",
|
||||
0
|
||||
],
|
||||
"image": [
|
||||
"8",
|
||||
0
|
||||
]
|
||||
},
|
||||
"class_type": "ImageUpscaleWithModel",
|
||||
"_meta": {
|
||||
"title": "Upscale Image (using Model)"
|
||||
}
|
||||
},
|
||||
"33": {
|
||||
"inputs": {
|
||||
"model_name": "4x-UltraSharp.pth"
|
||||
},
|
||||
"class_type": "UpscaleModelLoader",
|
||||
"_meta": {
|
||||
"title": "Load Upscale Model"
|
||||
}
|
||||
},
|
||||
"34": {
|
||||
"inputs": {
|
||||
"upscale_method": "lanczos",
|
||||
"scale_by": 0.5,
|
||||
"image": [
|
||||
"32",
|
||||
0
|
||||
]
|
||||
},
|
||||
"class_type": "ImageScaleBy",
|
||||
"_meta": {
|
||||
"title": "Half size"
|
||||
}
|
||||
},
|
||||
"35": {
|
||||
"inputs": {
|
||||
"unet_name": "flux1-dev-Q4_0.gguf"
|
||||
},
|
||||
"class_type": "UnetLoaderGGUF",
|
||||
"_meta": {
|
||||
"title": "Unet Loader (GGUF)"
|
||||
}
|
||||
},
|
||||
"40": {
|
||||
"inputs": {
|
||||
"int": 20
|
||||
@ -57,7 +126,10 @@
|
||||
"50",
|
||||
1
|
||||
],
|
||||
"scheduler_name": "normal",
|
||||
"scheduler": [
|
||||
"49",
|
||||
1
|
||||
],
|
||||
"positive": [
|
||||
"44",
|
||||
0
|
||||
@ -100,7 +172,7 @@
|
||||
]
|
||||
},
|
||||
"images": [
|
||||
"8",
|
||||
"34",
|
||||
0
|
||||
]
|
||||
},
|
||||
@ -111,7 +183,7 @@
|
||||
},
|
||||
"44": {
|
||||
"inputs": {
|
||||
"text": "Yautja Predator wielding flamethrower in smoky, cyberpunk alleyway darkness",
|
||||
"text": "",
|
||||
"speak_and_recognation": {
|
||||
"__value__": [
|
||||
false,
|
||||
@ -126,7 +198,7 @@
|
||||
},
|
||||
"45": {
|
||||
"inputs": {
|
||||
"text": "text, watermark, deformed Avoid flat colors, poor lighting, and artificial elements. No unrealistic elements, low resolution, or flat colors. Avoid generic objects, poor lighting, and inconsistent styles, blurry, low-quality, distorted faces, overexposed lighting, extra limbs, bad anatomy, low contrast",
|
||||
"text": "",
|
||||
"speak_and_recognation": {
|
||||
"__value__": [
|
||||
false,
|
||||
@ -152,19 +224,18 @@
|
||||
]
|
||||
},
|
||||
"clip": [
|
||||
"72",
|
||||
0
|
||||
"68",
|
||||
1
|
||||
]
|
||||
},
|
||||
"class_type": "CLIPTextEncode",
|
||||
"_meta": {
|
||||
"title": "Prompt Encoder"
|
||||
"title": "CLIP Text Encode (Prompt)"
|
||||
}
|
||||
},
|
||||
"48": {
|
||||
"inputs": {
|
||||
"seed": 47371998700984,
|
||||
"increment": 1
|
||||
"seed": 903006749445372
|
||||
},
|
||||
"class_type": "Seed Generator (Image Saver)",
|
||||
"_meta": {
|
||||
@ -177,7 +248,7 @@
|
||||
},
|
||||
"class_type": "Scheduler Selector (Comfy) (Image Saver)",
|
||||
"_meta": {
|
||||
"title": "Scheduler"
|
||||
"title": "Scheduler Selector"
|
||||
}
|
||||
},
|
||||
"50": {
|
||||
@ -186,27 +257,66 @@
|
||||
},
|
||||
"class_type": "Sampler Selector (Image Saver)",
|
||||
"_meta": {
|
||||
"title": "Sampler"
|
||||
"title": "Sampler Selector (Image Saver)"
|
||||
}
|
||||
},
|
||||
"51": {
|
||||
"inputs": {
|
||||
"images": [
|
||||
"8",
|
||||
0
|
||||
]
|
||||
},
|
||||
"class_type": "PreviewImage",
|
||||
"_meta": {
|
||||
"title": "Preview Image"
|
||||
}
|
||||
},
|
||||
"52": {
|
||||
"inputs": {
|
||||
"float": 3.500000000000001
|
||||
"float": 3.5
|
||||
},
|
||||
"class_type": "Float Literal (Image Saver)",
|
||||
"_meta": {
|
||||
"title": "CFG Scale"
|
||||
"title": "CFG"
|
||||
}
|
||||
},
|
||||
"53": {
|
||||
"inputs": {
|
||||
"float": 1.0000000000000002
|
||||
"float": 1
|
||||
},
|
||||
"class_type": "Float Literal (Image Saver)",
|
||||
"_meta": {
|
||||
"title": "Denoise"
|
||||
}
|
||||
},
|
||||
"60": {
|
||||
"inputs": {
|
||||
"clip_l": "",
|
||||
"t5xxl": [
|
||||
"44",
|
||||
0
|
||||
],
|
||||
"guidance": [
|
||||
"52",
|
||||
0
|
||||
],
|
||||
"speak_and_recognation": {
|
||||
"__value__": [
|
||||
false,
|
||||
true
|
||||
]
|
||||
},
|
||||
"clip": [
|
||||
"68",
|
||||
1
|
||||
]
|
||||
},
|
||||
"class_type": "CLIPTextEncodeFlux",
|
||||
"_meta": {
|
||||
"title": "CLIPTextEncodeFlux"
|
||||
}
|
||||
},
|
||||
"62": {
|
||||
"inputs": {
|
||||
"noise": [
|
||||
@ -232,7 +342,7 @@
|
||||
},
|
||||
"class_type": "SamplerCustomAdvanced",
|
||||
"_meta": {
|
||||
"title": "Custom Sampler"
|
||||
"title": "SamplerCustomAdvanced"
|
||||
}
|
||||
},
|
||||
"63": {
|
||||
@ -262,13 +372,13 @@
|
||||
0
|
||||
],
|
||||
"model": [
|
||||
"35",
|
||||
"68",
|
||||
0
|
||||
]
|
||||
},
|
||||
"class_type": "BasicScheduler",
|
||||
"_meta": {
|
||||
"title": "Sigma Generator"
|
||||
"title": "BasicScheduler"
|
||||
}
|
||||
},
|
||||
"65": {
|
||||
@ -280,13 +390,13 @@
|
||||
},
|
||||
"class_type": "RandomNoise",
|
||||
"_meta": {
|
||||
"title": "Noise Generator"
|
||||
"title": "RandomNoise"
|
||||
}
|
||||
},
|
||||
"67": {
|
||||
"inputs": {
|
||||
"model": [
|
||||
"35",
|
||||
"68",
|
||||
0
|
||||
],
|
||||
"conditioning": [
|
||||
@ -296,48 +406,31 @@
|
||||
},
|
||||
"class_type": "BasicGuider",
|
||||
"_meta": {
|
||||
"title": "Prompt Guider"
|
||||
"title": "BasicGuider"
|
||||
}
|
||||
},
|
||||
"72": {
|
||||
"68": {
|
||||
"inputs": {
|
||||
"clip_name1": "t5-v1_1-xxl-encoder-Q4_K_M.gguf",
|
||||
"clip_name2": "clip_l.safetensors",
|
||||
"type": "flux",
|
||||
"device": "cuda:0",
|
||||
"virtual_vram_gb": 0,
|
||||
"use_other_vram": false,
|
||||
"expert_mode_allocations": ""
|
||||
"lora_01": "None",
|
||||
"strength_01": 1,
|
||||
"lora_02": "None",
|
||||
"strength_02": 1,
|
||||
"lora_03": "None",
|
||||
"strength_03": 1,
|
||||
"lora_04": "None",
|
||||
"strength_04": 1,
|
||||
"model": [
|
||||
"35",
|
||||
0
|
||||
],
|
||||
"clip": [
|
||||
"22",
|
||||
0
|
||||
]
|
||||
},
|
||||
"class_type": "DualCLIPLoaderGGUFDisTorchMultiGPU",
|
||||
"class_type": "Lora Loader Stack (rgthree)",
|
||||
"_meta": {
|
||||
"title": "DualCLIPLoaderGGUFDisTorchMultiGPU"
|
||||
}
|
||||
},
|
||||
"73": {
|
||||
"inputs": {
|
||||
"vae_name": "FLUX1/ae.safetensors",
|
||||
"device": "cuda:0"
|
||||
},
|
||||
"class_type": "VAELoaderMultiGPU",
|
||||
"_meta": {
|
||||
"title": "VAELoaderMultiGPU"
|
||||
}
|
||||
},
|
||||
"35": {
|
||||
"inputs": {
|
||||
"unet_name": "flux1-dev-Q4_0.gguf",
|
||||
"dequant_dtype": "default",
|
||||
"patch_dtype": "default",
|
||||
"patch_on_device": false,
|
||||
"device": "cuda:1",
|
||||
"virtual_vram_gb": 0,
|
||||
"use_other_vram": false,
|
||||
"expert_mode_allocations": ""
|
||||
},
|
||||
"class_type": "UnetLoaderGGUFAdvancedDisTorchMultiGPU",
|
||||
"_meta": {
|
||||
"title": "UnetLoaderGGUFAdvancedDisTorchMultiGPU"
|
||||
"title": "Lora Loader Stack (rgthree)"
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,433 +0,0 @@
|
||||
{
|
||||
"8": {
|
||||
"inputs": {
|
||||
"samples": [
|
||||
"62",
|
||||
1
|
||||
],
|
||||
"vae": [
|
||||
"27",
|
||||
0
|
||||
]
|
||||
},
|
||||
"class_type": "VAEDecode",
|
||||
"_meta": {
|
||||
"title": "VAE Decode"
|
||||
}
|
||||
},
|
||||
"22": {
|
||||
"inputs": {
|
||||
"clip_name1": "t5/t5xxl_fp8_e4m3fn.safetensors",
|
||||
"clip_name2": "clip_l.safetensors",
|
||||
"type": "flux",
|
||||
"device": "default"
|
||||
},
|
||||
"class_type": "DualCLIPLoader",
|
||||
"_meta": {
|
||||
"title": "DualCLIPLoader"
|
||||
}
|
||||
},
|
||||
"27": {
|
||||
"inputs": {
|
||||
"vae_name": "FLUX1/ae.safetensors"
|
||||
},
|
||||
"class_type": "VAELoader",
|
||||
"_meta": {
|
||||
"title": "Load VAE"
|
||||
}
|
||||
},
|
||||
"32": {
|
||||
"inputs": {
|
||||
"upscale_model": [
|
||||
"33",
|
||||
0
|
||||
],
|
||||
"image": [
|
||||
"8",
|
||||
0
|
||||
]
|
||||
},
|
||||
"class_type": "ImageUpscaleWithModel",
|
||||
"_meta": {
|
||||
"title": "Upscale Image (using Model)"
|
||||
}
|
||||
},
|
||||
"33": {
|
||||
"inputs": {
|
||||
"model_name": "4x-UltraSharp.pth"
|
||||
},
|
||||
"class_type": "UpscaleModelLoader",
|
||||
"_meta": {
|
||||
"title": "Load Upscale Model"
|
||||
}
|
||||
},
|
||||
"34": {
|
||||
"inputs": {
|
||||
"upscale_method": "lanczos",
|
||||
"scale_by": 0.5,
|
||||
"image": [
|
||||
"32",
|
||||
0
|
||||
]
|
||||
},
|
||||
"class_type": "ImageScaleBy",
|
||||
"_meta": {
|
||||
"title": "Half size"
|
||||
}
|
||||
},
|
||||
"35": {
|
||||
"inputs": {
|
||||
"unet_name": "flux1-dev-Q4_0.gguf"
|
||||
},
|
||||
"class_type": "UnetLoaderGGUF",
|
||||
"_meta": {
|
||||
"title": "Unet Loader (GGUF)"
|
||||
}
|
||||
},
|
||||
"40": {
|
||||
"inputs": {
|
||||
"int": 20
|
||||
},
|
||||
"class_type": "Int Literal (Image Saver)",
|
||||
"_meta": {
|
||||
"title": "Generation Steps"
|
||||
}
|
||||
},
|
||||
"41": {
|
||||
"inputs": {
|
||||
"width": 720,
|
||||
"height": 1080,
|
||||
"aspect_ratio": "custom",
|
||||
"swap_dimensions": "Off",
|
||||
"upscale_factor": 2,
|
||||
"prescale_factor": 1,
|
||||
"batch_size": 1
|
||||
},
|
||||
"class_type": "CR Aspect Ratio",
|
||||
"_meta": {
|
||||
"title": "CR Aspect Ratio"
|
||||
}
|
||||
},
|
||||
"42": {
|
||||
"inputs": {
|
||||
"filename": "THISFILE",
|
||||
"path": "",
|
||||
"extension": "png",
|
||||
"steps": [
|
||||
"40",
|
||||
0
|
||||
],
|
||||
"cfg": [
|
||||
"52",
|
||||
0
|
||||
],
|
||||
"modelname": "flux1-dev-Q4_0.gguf",
|
||||
"sampler_name": [
|
||||
"50",
|
||||
1
|
||||
],
|
||||
"positive": [
|
||||
"44",
|
||||
0
|
||||
],
|
||||
"negative": [
|
||||
"45",
|
||||
0
|
||||
],
|
||||
"seed_value": [
|
||||
"48",
|
||||
0
|
||||
],
|
||||
"width": [
|
||||
"41",
|
||||
0
|
||||
],
|
||||
"height": [
|
||||
"41",
|
||||
1
|
||||
],
|
||||
"lossless_webp": true,
|
||||
"quality_jpeg_or_webp": 100,
|
||||
"optimize_png": false,
|
||||
"counter": 0,
|
||||
"denoise": [
|
||||
"53",
|
||||
0
|
||||
],
|
||||
"clip_skip": 0,
|
||||
"time_format": "%Y-%m-%d-%H%M%S",
|
||||
"save_workflow_as_json": true,
|
||||
"embed_workflow": true,
|
||||
"additional_hashes": "",
|
||||
"download_civitai_data": true,
|
||||
"easy_remix": true,
|
||||
"speak_and_recognation": {
|
||||
"__value__": [
|
||||
false,
|
||||
true
|
||||
]
|
||||
},
|
||||
"images": [
|
||||
"34",
|
||||
0
|
||||
]
|
||||
},
|
||||
"class_type": "Image Saver",
|
||||
"_meta": {
|
||||
"title": "CivitAI Image Saver"
|
||||
}
|
||||
},
|
||||
"44": {
|
||||
"inputs": {
|
||||
"text": "",
|
||||
"speak_and_recognation": {
|
||||
"__value__": [
|
||||
false,
|
||||
true
|
||||
]
|
||||
}
|
||||
},
|
||||
"class_type": "ttN text",
|
||||
"_meta": {
|
||||
"title": "Positive Prompt T5"
|
||||
}
|
||||
},
|
||||
"45": {
|
||||
"inputs": {
|
||||
"text": "text, watermark, deformed Avoid flat colors, poor lighting, and artificial elements. No unrealistic elements, low resolution, or flat colors. Avoid generic objects, poor lighting, and inconsistent styles, blurry, low-quality, distorted faces, overexposed lighting, extra limbs, bad anatomy, low contrast",
|
||||
"speak_and_recognation": {
|
||||
"__value__": [
|
||||
false,
|
||||
true
|
||||
]
|
||||
}
|
||||
},
|
||||
"class_type": "ttN text",
|
||||
"_meta": {
|
||||
"title": "Negative Prompt"
|
||||
}
|
||||
},
|
||||
"47": {
|
||||
"inputs": {
|
||||
"text": [
|
||||
"44",
|
||||
0
|
||||
],
|
||||
"speak_and_recognation": {
|
||||
"__value__": [
|
||||
false,
|
||||
true
|
||||
]
|
||||
},
|
||||
"clip": [
|
||||
"68",
|
||||
1
|
||||
]
|
||||
},
|
||||
"class_type": "CLIPTextEncode",
|
||||
"_meta": {
|
||||
"title": "CLIP Text Encode (Prompt)"
|
||||
}
|
||||
},
|
||||
"48": {
|
||||
"inputs": {
|
||||
"seed": 903006749445372,
|
||||
"increment": 1
|
||||
},
|
||||
"class_type": "Seed Generator (Image Saver)",
|
||||
"_meta": {
|
||||
"title": "Seed"
|
||||
}
|
||||
},
|
||||
"49": {
|
||||
"inputs": {
|
||||
"scheduler": "beta"
|
||||
},
|
||||
"class_type": "Scheduler Selector (Comfy) (Image Saver)",
|
||||
"_meta": {
|
||||
"title": "Scheduler Selector"
|
||||
}
|
||||
},
|
||||
"50": {
|
||||
"inputs": {
|
||||
"sampler_name": "euler"
|
||||
},
|
||||
"class_type": "Sampler Selector (Image Saver)",
|
||||
"_meta": {
|
||||
"title": "Sampler Selector (Image Saver)"
|
||||
}
|
||||
},
|
||||
"51": {
|
||||
"inputs": {
|
||||
"images": [
|
||||
"8",
|
||||
0
|
||||
]
|
||||
},
|
||||
"class_type": "PreviewImage",
|
||||
"_meta": {
|
||||
"title": "Preview Image"
|
||||
}
|
||||
},
|
||||
"52": {
|
||||
"inputs": {
|
||||
"float": 3.5
|
||||
},
|
||||
"class_type": "Float Literal (Image Saver)",
|
||||
"_meta": {
|
||||
"title": "CFG"
|
||||
}
|
||||
},
|
||||
"53": {
|
||||
"inputs": {
|
||||
"float": 1
|
||||
},
|
||||
"class_type": "Float Literal (Image Saver)",
|
||||
"_meta": {
|
||||
"title": "Denoise"
|
||||
}
|
||||
},
|
||||
"60": {
|
||||
"inputs": {
|
||||
"clip_l": "",
|
||||
"t5xxl": [
|
||||
"44",
|
||||
0
|
||||
],
|
||||
"guidance": [
|
||||
"52",
|
||||
0
|
||||
],
|
||||
"speak_and_recognation": {
|
||||
"__value__": [
|
||||
false,
|
||||
true
|
||||
]
|
||||
},
|
||||
"clip": [
|
||||
"68",
|
||||
1
|
||||
]
|
||||
},
|
||||
"class_type": "CLIPTextEncodeFlux",
|
||||
"_meta": {
|
||||
"title": "CLIPTextEncodeFlux"
|
||||
}
|
||||
},
|
||||
"62": {
|
||||
"inputs": {
|
||||
"noise": [
|
||||
"65",
|
||||
0
|
||||
],
|
||||
"guider": [
|
||||
"67",
|
||||
0
|
||||
],
|
||||
"sampler": [
|
||||
"63",
|
||||
0
|
||||
],
|
||||
"sigmas": [
|
||||
"64",
|
||||
0
|
||||
],
|
||||
"latent_image": [
|
||||
"41",
|
||||
5
|
||||
]
|
||||
},
|
||||
"class_type": "SamplerCustomAdvanced",
|
||||
"_meta": {
|
||||
"title": "SamplerCustomAdvanced"
|
||||
}
|
||||
},
|
||||
"63": {
|
||||
"inputs": {
|
||||
"sampler_name": [
|
||||
"50",
|
||||
0
|
||||
]
|
||||
},
|
||||
"class_type": "KSamplerSelect",
|
||||
"_meta": {
|
||||
"title": "KSamplerSelect"
|
||||
}
|
||||
},
|
||||
"64": {
|
||||
"inputs": {
|
||||
"scheduler": [
|
||||
"49",
|
||||
0
|
||||
],
|
||||
"steps": [
|
||||
"40",
|
||||
0
|
||||
],
|
||||
"denoise": [
|
||||
"53",
|
||||
0
|
||||
],
|
||||
"model": [
|
||||
"68",
|
||||
0
|
||||
]
|
||||
},
|
||||
"class_type": "BasicScheduler",
|
||||
"_meta": {
|
||||
"title": "BasicScheduler"
|
||||
}
|
||||
},
|
||||
"65": {
|
||||
"inputs": {
|
||||
"noise_seed": [
|
||||
"48",
|
||||
0
|
||||
]
|
||||
},
|
||||
"class_type": "RandomNoise",
|
||||
"_meta": {
|
||||
"title": "RandomNoise"
|
||||
}
|
||||
},
|
||||
"67": {
|
||||
"inputs": {
|
||||
"model": [
|
||||
"68",
|
||||
0
|
||||
],
|
||||
"conditioning": [
|
||||
"47",
|
||||
0
|
||||
]
|
||||
},
|
||||
"class_type": "BasicGuider",
|
||||
"_meta": {
|
||||
"title": "BasicGuider"
|
||||
}
|
||||
},
|
||||
"68": {
|
||||
"inputs": {
|
||||
"lora_01": "None",
|
||||
"strength_01": 1,
|
||||
"lora_02": "None",
|
||||
"strength_02": 1,
|
||||
"lora_03": "None",
|
||||
"strength_03": 1,
|
||||
"lora_04": "None",
|
||||
"strength_04": 1,
|
||||
"model": [
|
||||
"35",
|
||||
0
|
||||
],
|
||||
"clip": [
|
||||
"22",
|
||||
0
|
||||
]
|
||||
},
|
||||
"class_type": "Lora Loader Stack (rgthree)",
|
||||
"_meta": {
|
||||
"title": "Lora Loader Stack (rgthree)"
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user