split out routes and add settings page

ai_frame_image_server.py

@@ -1,182 +1,50 @@
-from flask import (
+from flask import Flask
-    Flask,
+from libs.generic import load_config
-    render_template,
-    send_from_directory,
-    request,
-    jsonify,
-    redirect,
-    url_for,
-    session,
-    render_template_string,
-)
 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,
-    load_topics_from_config
-)
-from libs.comfyui import cancel_current_job, create_image, select_model
-from libs.ollama import create_prompt_on_openwebui
 
-# workflow test commit
+from routes import (
+    auth_routes,
+    gallery_routes,
+    image_routes,
+    index_routes,
+    job_routes,
+    create_routes,
+    settings_routes
+)
 
 user_config = load_config()
 
 app = Flask(__name__)
-app.secret_key = os.environ.get('SECRET_KEY') 
+app.secret_key = os.environ.get("SECRET_KEY")
 
-image_folder = "./output"
+# Inject config into routes that need it
+create_routes.init_app(user_config)
+auth_routes.init_app(user_config)
 
+# 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"])
+# Optional: scheduler setup
-def index() -> str:
+from apscheduler.schedulers.background import BackgroundScheduler
-    """
+import time
-    Renders the main HTML template with image and prompt.
+from libs.comfyui import create_image
-    """
-    image_filename = "./image.png"
-    image_path = os.path.join(image_folder, image_filename)
 
-    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('/login', methods=['GET', 'POST'])
-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())
-        else:
-            return  redirect(url_for('login'))
-    return render_template('login.html')
-
-
-@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")
-        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)
-
-        # Start generation in background
-        threading.Thread(target=lambda: create_image(prompt, model)).start()
-
-        return redirect(
-            url_for("image_queued", prompt=prompt, model=model.split(".")[0])
-        )
-
-    # 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.")
-    model = request.args.get("model", "No model selected.").split(".")[0]
-    return render_template("image_queued.html", prompt=prompt, model=model)
-
-
-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.
-    """
-    if user_config["frame"]["create_requires_auth"] == "True" and not session.get('authenticated'):
-        return redirect(url_for("login"))
-
-    return render_template("create_image.html", models=load_models_from_config(), topics=load_topics_from_config())
-
-
 if user_config["frame"]["auto_regen"] == "True":
     if os.environ.get("WERKZEUG_RUN_MAIN") == "true":
         scheduler = BackgroundScheduler()
-        regen_time = user_config["frame"]["regen_time"].split(":")
+        h, m = user_config["frame"]["regen_time"].split(":")
-        scheduler.add_job(
+        scheduler.add_job(scheduled_task, "cron", hour=h, minute=m, id="scheduled_task", max_instances=1, replace_existing=True)
-            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(image_folder, exist_ok=True)
+os.makedirs("./output", exist_ok=True)
-    app.run(host="0.0.0.0", port=user_config["frame"]["port"], debug=True)
+app.run(host="0.0.0.0", port=user_config["frame"]["port"], debug=True)

config.cfg

@@ -0,0 +1,6 @@
+[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
+

routes/__init__.py

@@ -0,0 +1,11 @@
+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"
+]

routes/auth_routes.py

@@ -0,0 +1,29 @@
+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)

routes/create_routes.py

@@ -0,0 +1,41 @@
+from flask import Blueprint, request, render_template, redirect, url_for, session
+import threading
+from libs.comfyui import create_image, select_model
+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(), 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(), topics=load_topics_from_config())
+
+
+def init_app(config):
+    global user_config
+    user_config = config

routes/gallery_routes.py

@@ -0,0 +1,15 @@
+from flask import Blueprint, render_template
+import os
+
+bp = Blueprint("gallery_routes", __name__)
+image_folder = "./output"
+
+@bp.route("/images", methods=["GET"])
+def gallery():
+    images = [
+        {"filename": f}
+        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)

routes/image_routes.py

@@ -0,0 +1,22 @@
+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"]})

routes/index_routes.py

@@ -0,0 +1,22 @@
+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,
+    )

routes/job_routes.py

@@ -0,0 +1,8 @@
+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()

routes/settings_routes.py

@@ -0,0 +1,40 @@
+from flask import Blueprint, render_template, request, redirect, url_for, session
+import configparser
+from libs.generic import load_topics_from_config
+
+bp = Blueprint('settings_route', __name__)
+CONFIG_PATH = "./user_config.cfg"
+
+def save_items(items):
+    config = configparser.ConfigParser()
+    config.read(CONFIG_PATH)
+
+    # Make sure the section exists
+    if not config.has_section('comfyui'):
+        config.add_section('comfyui')
+
+    # Save updated list to the 'topics' key
+    config.set('comfyui', 'topics', ', '.join(items))
+
+    with open(CONFIG_PATH, 'w') as configfile:
+        config.write(configfile)
+
+@bp.route('/settings', methods=['GET', 'POST'])
+def config_editor():
+    if not session.get("authenticated"):
+        return redirect(url_for("auth_routes.login", next=request.path))
+    items = load_topics_from_config()  # should return list[str]
+
+    if request.method == 'POST':
+        if 'new_topic' in request.form:
+            new_item = request.form.get('new_topic', '').strip()
+            if new_item and new_item not in items:
+                items.append(new_item)
+        elif 'delete_topic' in request.form:
+            to_delete = request.form.getlist('delete_topic')
+            items = [item for item in items if item not in to_delete]
+
+        save_items(items)
+        return redirect(url_for('settings_route.config_editor'))
+
+    return render_template('settings.html', topics=items)

templates/index.html

@@ -134,7 +134,7 @@
 <body>
     {% if image %}
     <div class="image-container">
-        <img src="{{ url_for('images', filename=image) }}" alt="Latest Image" />
+        <img src="{{ url_for('image_routes.serve_image', filename=image) }}" alt="Latest Image" />
     </div>
     {% if prompt %}
     <div class="prompt">{{ prompt }}</div>

templates/login.html

@@ -65,6 +65,7 @@
     <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>

templates/settings.html

@@ -0,0 +1,157 @@
+<!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="back-button-wrapper">
+    <a href="/" class="button-link">Back to Home</a>
+  </div>
+
+</body>
+
+</html>