Compare commits

..

No commits in common. "main" and "0.1.3" have entirely different histories.
main ... 0.1.3

14 changed files with 136 additions and 461 deletions

View File

@ -1,5 +1,5 @@
[tool.bumpversion] [tool.bumpversion]
current_version = "0.1.19" current_version = "0.1.3"
parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)" parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
serialize = ["{major}.{minor}.{patch}"] serialize = ["{major}.{minor}.{patch}"]
search = "{current_version}" search = "{current_version}"
@ -7,12 +7,12 @@ replace = "{new_version}"
regex = false regex = false
ignore_missing_version = false ignore_missing_version = false
ignore_missing_files = false ignore_missing_files = false
tag = true tag = false
sign_tags = false sign_tags = false
tag_name = "{new_version}" tag_name = "v{new_version}"
tag_message = "Bump version: {current_version} → {new_version}" tag_message = "Bump version: {current_version} → {new_version}"
allow_dirty = false allow_dirty = false
commit = true commit = false
message = "Bump version: {current_version} → {new_version}" message = "Bump version: {current_version} → {new_version}"
moveable_tags = [] moveable_tags = []
commit_args = "" commit_args = ""

View File

@ -2,7 +2,8 @@ name: Build and Publish Docker Image
on: on:
push: push:
tags: ["*"] # Only triggers on tag pushes branches: [main]
tags: ['*'] # triggers on any tag push
workflow_dispatch: workflow_dispatch:
jobs: jobs:
@ -12,8 +13,6 @@ jobs:
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4
with:
fetch-depth: 0 # ensures tags are fetched
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v3
@ -26,15 +25,23 @@ jobs:
IMAGE_NAME="ai-frame-image-server" IMAGE_NAME="ai-frame-image-server"
REGISTRY="${{ secrets.REGISTRY }}" REGISTRY="${{ secrets.REGISTRY }}"
USERNAME="${{ secrets.USERNAME }}" USERNAME="${{ secrets.USERNAME }}"
GIT_TAG="${GITHUB_REF#refs/tags/}"
IMAGE_TAGGED="$REGISTRY/$USERNAME/$IMAGE_NAME:$GIT_TAG"
IMAGE_LATEST="$REGISTRY/$USERNAME/$IMAGE_NAME:latest" IMAGE_LATEST="$REGISTRY/$USERNAME/$IMAGE_NAME:latest"
echo "🔧 Building $IMAGE_TAGGED and $IMAGE_LATEST" # Always build and tag as latest
docker build -t $IMAGE_LATEST -t $IMAGE_TAGGED . echo "🔧 Building $IMAGE_LATEST"
docker build -t $IMAGE_LATEST .
echo "📤 Pushing $IMAGE_TAGGED"
docker push $IMAGE_TAGGED
echo "📤 Pushing $IMAGE_LATEST" echo "📤 Pushing $IMAGE_LATEST"
docker push $IMAGE_LATEST docker push $IMAGE_LATEST
# If this is a tag push, tag the image accordingly
if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
GIT_TAG="${GITHUB_REF#refs/tags/}"
IMAGE_TAGGED="$REGISTRY/$USERNAME/$IMAGE_NAME:$GIT_TAG"
echo "🏷️ Also tagging as $IMAGE_TAGGED"
docker tag $IMAGE_LATEST $IMAGE_TAGGED
echo "📤 Pushing $IMAGE_TAGGED"
docker push $IMAGE_TAGGED
fi

2
.gitignore vendored
View File

@ -8,5 +8,3 @@ user_config.cfg
output/ output/
prompts_log.jsonl prompts_log.jsonl
publish.sh publish.sh
test.py
.vscode/launch.json

View File

@ -4,35 +4,22 @@ from flask import (
send_from_directory, send_from_directory,
request, request,
jsonify, jsonify,
redirect,
url_for,
session,
render_template_string,
) )
import os import os
import time import time
import threading import threading
from apscheduler.schedulers.background import BackgroundScheduler from apscheduler.schedulers.background import BackgroundScheduler
from libs.generic import ( from libs.generic import load_config, load_recent_prompts, get_details_from_png
load_config, from libs.comfyui import cancel_current_job, create_image
load_recent_prompts,
get_details_from_png,
get_current_version,
load_models_from_config,
)
from libs.comfyui import cancel_current_job, create_image, select_model
from libs.ollama import create_prompt_on_openwebui from libs.ollama import create_prompt_on_openwebui
#workflow test commit #workflow test commit
user_config = load_config() user_config = load_config()
app = Flask(__name__) app = Flask(__name__)
app.secret_key = os.environ.get('SECRET_KEY')
image_folder = "./output" image_folder = "./output"
@app.route("/", methods=["GET"]) @app.route("/", methods=["GET"])
def index() -> str: def index() -> str:
""" """
@ -43,39 +30,20 @@ def index() -> str:
prompt = get_details_from_png(image_path)["p"] prompt = get_details_from_png(image_path)["p"]
version = get_current_version()
return render_template( return render_template(
"index.html", "index.html",
image=image_filename, image=image_filename,
prompt=prompt, prompt=prompt,
reload_interval=user_config["frame"]["reload_interval"], 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())
else:
return redirect(url_for('login'))
return render_template('login.html')
@app.route("/images", methods=["GET"]) @app.route("/images", methods=["GET"])
def gallery() -> str: def gallery() -> str:
images = [] images = []
for f in os.listdir(image_folder): for f in os.listdir(image_folder):
if f.lower().endswith(("png", "jpg", "jpeg", "gif")): if f.lower().endswith(('png', 'jpg', 'jpeg', 'gif')):
images.append({"filename": f}) images.append({'filename': f})
images = sorted( images = sorted(images, key=lambda x: os.path.getmtime(os.path.join(image_folder, x['filename'])), reverse=True)
images,
key=lambda x: os.path.getmtime(os.path.join(image_folder, x["filename"])),
reverse=True,
)
return render_template("gallery.html", images=images) return render_template("gallery.html", images=images)
@ -85,12 +53,15 @@ def image_details(filename):
if not os.path.exists(path): if not os.path.exists(path):
return {"error": "File not found"}, 404 return {"error": "File not found"}, 404
details = get_details_from_png(path) details = get_details_from_png(path)
return {"prompt": details["p"], "model": details["m"], "date": details["d"]} return {
"prompt": details["p"],
"model": details["m"]
}
@app.route("/images/thumbnails/<path:filename>") @app.route('/images/thumbnails/<path:filename>')
def serve_thumbnail(filename): def serve_thumbnail(filename):
return send_from_directory("output/thumbnails", filename) return send_from_directory('output/thumbnails', filename)
@app.route("/images/<filename>", methods=["GET"]) @app.route("/images/<filename>", methods=["GET"])
@ -118,30 +89,23 @@ def cancel_job() -> None:
@app.route("/create", methods=["GET", "POST"]) @app.route("/create", methods=["GET", "POST"])
def create(): def create() -> str:
if request.method == "POST": """Handles image creation requests.
prompt = request.form.get("prompt") Args:
selected_workflow, model = select_model(request.form.get("model") or "Random") None
Returns:
str: Redirect to the main page or a JSON response.
"""
prompt = request.form.get("prompt") if request.method == "POST" else None
if not prompt: if prompt is None:
prompt = create_prompt_on_openwebui(user_config["comfyui"]["prompt"]) prompt = create_prompt_on_openwebui(user_config["comfyui"]["prompt"])
# Start generation in background def create_image_in_background():
threading.Thread(target=lambda: create_image(prompt, model)).start() create_image(prompt)
return redirect( threading.Thread(target=create_image_in_background).start()
url_for("image_queued", prompt=prompt, model=model.split(".")[0]) return render_template('image_queued.html', 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.")
model = request.args.get("model", "No model selected.").split(".")[0]
return render_template("image_queued.html", prompt=prompt, model=model)
def scheduled_task() -> None: def scheduled_task() -> None:
@ -149,17 +113,16 @@ def scheduled_task() -> None:
print(f"Executing scheduled task at {time.strftime('%Y-%m-%d %H:%M:%S')}") print(f"Executing scheduled task at {time.strftime('%Y-%m-%d %H:%M:%S')}")
create_image(None) create_image(None)
@app.route("/create_image", methods=["GET"]) @app.route("/create_image", methods=["GET"])
def create_image_endpoint() -> str: def create_image_endpoint() -> str:
""" """
Renders the create image template with image and prompt. 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"))
models = load_models_from_config()
return render_template("create_image.html", models=models) return render_template(
"create_image.html"
)
if user_config["frame"]["auto_regen"] == "True": if user_config["frame"]["auto_regen"] == "True":
@ -173,9 +136,10 @@ if user_config["frame"]["auto_regen"] == "True":
minute=regen_time[1], minute=regen_time[1],
id="scheduled_task", id="scheduled_task",
max_instances=1, # prevent overlapping max_instances=1, # prevent overlapping
replace_existing=True, # don't double-schedule replace_existing=True # don't double-schedule
) )
scheduler.start() scheduler.start()
os.makedirs(image_folder, exist_ok=True) os.makedirs(image_folder, 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)

View File

@ -64,14 +64,13 @@ def generate_image(
file_name: str, file_name: str,
comfy_prompt: str, comfy_prompt: str,
workflow_path: str = "./workflow_sdxl.json", workflow_path: str = "./workflow_sdxl.json",
prompt_node: str = "Positive", prompt_node: str = "CLIP Text Encode (Prompt)",
seed_node: str = "KSampler", seed_node: str = "KSampler",
seed_param: str = "seed", seed_param: str = "seed",
save_node: str = "Save Image", save_node: str = "Save Image",
save_param: str = "filename_prefix", save_param: str = "filename_prefix",
model_node: Optional[str] = "Load Checkpoint", model_node: Optional[str] = "Load Checkpoint",
model_param: Optional[str] = "ckpt_name", model_param: Optional[str] = "ckpt_name",
model: Optional[str] = "None",
) -> None: ) -> None:
"""Generates an image using the Comfy API with configurable workflow settings.""" """Generates an image using the Comfy API with configurable workflow settings."""
try: try:
@ -101,6 +100,20 @@ def generate_image(
user_config["comfyui"]["height"], user_config["comfyui"]["height"],
) )
# Conditionally set model if node and param are provided
if model_node and model_param:
if "FLUX" in workflow_path:
valid_models = user_config["comfyui:flux"]["models"].split(",")
else:
available_model_list = user_config["comfyui"]["models"].split(",")
valid_models = list(
set(get_available_models()) & set(available_model_list)
)
if not valid_models:
raise Exception("No valid models available.")
model = random.choice(valid_models)
wf.set_node_param(model_node, model_param, model) wf.set_node_param(model_node, model_param, model)
# Generate image # Generate image
@ -122,40 +135,23 @@ def generate_image(
logging.error(f"Failed to generate image for UID: {file_name}. Error: {e}") logging.error(f"Failed to generate image for UID: {file_name}. Error: {e}")
raise 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*)."""
def create_image(prompt: str | None = None) -> None:
"""Main function for generating images."""
if prompt is None: if prompt is None:
prompt = create_prompt_on_openwebui(user_config["comfyui"]["prompt"]) prompt = create_prompt_on_openwebui(user_config["comfyui"]["prompt"])
if not prompt: if not prompt:
logging.error("No prompt generated.") logging.error("No prompt generated.")
return return
save_prompt(prompt) 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())
selected_workflow = "SDXL"
if use_flux:
selected_workflow = "FLUX" if only_flux else random.choice(["FLUX", "SDXL"])
if selected_workflow == "FLUX": if selected_workflow == "FLUX":
generate_image( generate_image(
@ -167,11 +163,12 @@ def create_image(prompt: str | None = None, model: str = "Random") -> None:
seed_param="seed", seed_param="seed",
save_node="CivitAI Image Saver", save_node="CivitAI Image Saver",
save_param="filename", save_param="filename",
model_node="Unet Loader (GGUF)", model_node="CivitAI Image Saver",
model_param="unet_name", model_param="modelname",
model=model
) )
else: # SDXL else:
generate_image("image", comfy_prompt=prompt, model=model) generate_image("image", prompt)
logging.info(f"{selected_workflow} generation started with prompt: {prompt}") logging.info(f"{selected_workflow} generation started with prompt: {prompt}")

View File

@ -1,4 +1,3 @@
import subprocess
import configparser import configparser
import logging import logging
import sys import sys
@ -66,7 +65,6 @@ def rename_image() -> str | None:
def get_details_from_png(path): def get_details_from_png(path):
try: try:
date = datetime.fromtimestamp(os.path.getctime(path)).strftime("%d-%m-%Y")
with Image.open(path) as img: with Image.open(path) as img:
try: try:
# Flux workflow # Flux workflow
@ -78,33 +76,11 @@ def get_details_from_png(path):
data = json.loads(img.info["prompt"]) data = json.loads(img.info["prompt"])
prompt = data['6']['inputs']['text'] prompt = data['6']['inputs']['text']
model = data['4']['inputs']['ckpt_name'] model = data['4']['inputs']['ckpt_name']
return {"p":prompt,"m":model,"d":date} or {"p":"","m":"","c":""} return {"p":prompt,"m":model} or {"p":"","m":""}
except Exception as e: except Exception as e:
print(f"Error reading metadata from {path}: {e}") print(f"Error reading metadata from {path}: {e}")
return "" return ""
def get_current_version():
try:
# Run the command and capture the output
result = subprocess.run(
['bump-my-version', 'show', 'current_version'],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
text=True, # to get string output instead of bytes
check=True # raises exception if command fails
)
version = result.stdout.strip()
return version
except subprocess.CalledProcessError as e:
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() user_config = load_config()
output_folder = user_config["comfyui"]["output_dir"] output_folder = user_config["comfyui"]["output_dir"]

View File

@ -24,13 +24,13 @@ def create_prompt_on_openwebui(prompt: str) -> str:
topic_instruction = f" Incorporate the theme of '{selected_topic}' into the new prompt." topic_instruction = f" Incorporate the theme of '{selected_topic}' into the new prompt."
user_content = ( user_content = (
"Can you generate me a really random image idea, Do not exceed 10 words. Use clear language, not poetic metaphors.”" "Here are the prompts from the last 7 days:\n\n"
+ topic_instruction
+ "Avoid prompts similar to the following:"
+ "\n".join(f"{i+1}. {p}" for i, p in enumerate(recent_prompts)) + "\n".join(f"{i+1}. {p}" for i, p in enumerate(recent_prompts))
+ "\n\nDo not repeat ideas, themes, or settings from the above. "
"Now generate a new, completely original Stable Diffusion prompt that hasn't been done yet."
+ topic_instruction
) )
model = random.choice(user_config["openwebui"]["models"].split(",")) model = random.choice(user_config["openwebui"]["models"].split(","))
response = litellm.completion( response = litellm.completion(
api_base=user_config["openwebui"]["base_url"], api_base=user_config["openwebui"]["base_url"],
@ -67,4 +67,4 @@ def create_prompt_on_openwebui(prompt: str) -> str:
# ) # )
# prompt = response["choices"][0]["message"]["content"].strip('"') # prompt = response["choices"][0]["message"]["content"].strip('"')
logging.debug(prompt) logging.debug(prompt)
return prompt.split(": ")[-1] return prompt

View File

@ -1,19 +1,15 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Create An Image</title> <title>Create An Image</title>
<style> <style>
/* ---------- reset ---------- */
* { * {
margin: 0; margin: 0;
padding: 0; padding: 0;
box-sizing: border-box; box-sizing: border-box;
} }
/* ---------- layout ---------- */
body { body {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@ -25,7 +21,6 @@
font-family: Arial, sans-serif; font-family: Arial, sans-serif;
padding: 20px; padding: 20px;
} }
textarea { textarea {
width: 80vw; width: 80vw;
height: 200px; height: 200px;
@ -39,15 +34,11 @@
color: #eee; color: #eee;
border: 1px solid #333; border: 1px solid #333;
} }
.button-group { .button-group {
display: flex; display: flex;
gap: 20px; gap: 20px;
align-items: center;
} }
button {
button,
select {
background: #333; background: #333;
color: white; color: white;
border: none; border: none;
@ -57,150 +48,42 @@
cursor: pointer; cursor: pointer;
transition: background 0.3s; transition: background 0.3s;
} }
button:hover {
button:hover,
select:hover {
background: #555; background: #555;
} }
/* ---------- spinner ---------- */
#spinner-overlay {
position: fixed;
inset: 0;
display: flex;
align-items: center;
justify-content: center;
background: rgba(0, 0, 0, 0.6);
visibility: hidden;
z-index: 1000;
}
.spinner {
width: 50px;
height: 50px;
border: 6px solid #555;
border-top-color: white;
border-radius: 50%;
animation: spin 0.8s linear infinite;
}
@keyframes spin {
to {
transform: rotate(360deg);
}
}
@media (max-width: 600px) {
body {
min-height: 100dvh;
height: auto;
justify-content: flex-start;
padding-top: 40px;
}
.button-group {
flex-direction: column;
align-items: stretch;
width: 100%;
}
button,
select {
width: 100%;
}
textarea {
height: 150px;
}
}
</style> </style>
</head> </head>
<body> <body>
<h1 style="margin-bottom: 20px;">Create An Image</h1> <h1 style="margin-bottom: 20px;">Create An Image</h1>
<textarea id="prompt-box" placeholder="Enter your custom prompt here..."></textarea> <textarea id="prompt-box" placeholder="Enter your custom prompt here..."></textarea>
<div class="button-group"> <div class="button-group">
<button onclick="showSpinner(); location.href='/'">Back</button> <button onclick="location.href='/'">Back</button>
<button onclick="sendPrompt()">Send Prompt</button> <button onclick="sendPrompt()">Send Prompt</button>
<button onclick="location.href='/create'">Random Prompt</button>
<button onclick="randomPrompt()">Random Prompt</button>
<select id="model-select">
<option value="" selected>Random</option>
<!-- Group: FLUX -->
<optgroup label="FLUX">
{% for m in models if 'flux' in m|lower %}
<option value="{{ m }}">{{ m.rsplit('.', 1)[0] }}</option>
{% endfor %}
</optgroup>
<!-- Group: SDXL -->
<optgroup label="SDXL">
{% for m in models if 'flux' not in m|lower %}
<option value="{{ m }}">{{ m.rsplit('.', 1)[0] }}</option>
{% endfor %}
</optgroup>
</select>
</div>
<!-- waiting overlay -->
<div id="spinner-overlay">
<div class="spinner"></div>
</div> </div>
<script> <script>
const overlay = document.getElementById('spinner-overlay');
function showSpinner() { overlay.style.visibility = 'visible'; }
function sendPrompt() { function sendPrompt() {
showSpinner();
const prompt = document.getElementById('prompt-box').value; const prompt = document.getElementById('prompt-box').value;
const model = document.getElementById('model-select').value;
const formData = new URLSearchParams(); const formData = new URLSearchParams();
formData.append('prompt', prompt); formData.append('prompt', prompt);
formData.append('model', model);
fetch('/create', { fetch('/create', {
method: 'POST', method: 'POST',
headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, headers: {
'Content-Type': 'application/x-www-form-urlencoded',
},
body: formData.toString() body: formData.toString()
}) }).then(response => {
.then(response => { if (response.redirected) {
window.location.href = response.redirected ? response.url : '/create'; window.location.href = response.url;
}) } else {
.catch(error => { alert("Image creation request sent.");
overlay.style.visibility = 'hidden';
alert("Error sending prompt: " + error);
});
} }
}).catch(error => {
// wrapper for Random Prompt button so it also sends the model alert("Error sending prompt: " + error);
function randomPrompt() {
showSpinner();
const model = document.getElementById('model-select').value;
const formData = new URLSearchParams();
formData.append('model', model);
fetch('/create', {
method: 'POST',
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
body: formData.toString()
})
.then(response => {
window.location.href = response.redirected ? response.url : '/create';
})
.catch(error => {
overlay.style.visibility = 'hidden';
alert("Error requesting random prompt: " + error);
}); });
} }
</script> </script>
</body> </body>
</html> </html>

View File

@ -55,7 +55,6 @@
align-items: center; align-items: center;
flex-direction: column; flex-direction: column;
z-index: 999; z-index: 999;
padding: 20px 0;
} }
.lightbox img { .lightbox img {
@ -101,19 +100,12 @@
max-width: 80%; max-width: 80%;
text-align: left; text-align: left;
margin-top: 20px; margin-top: 20px;
max-height: 25vh;
/* NEW: restrict height */
overflow-y: auto;
/* NEW: allow vertical scroll */
} }
/* Back button fixed top right */ .button-group {
.home-button { display: flex;
position: fixed; justify-content: center;
top: 20px; margin-top: 2rem;
right: 20px;
z-index: 500;
/* lower than lightbox (999) */
} }
.button-link { .button-link {
@ -163,10 +155,6 @@
font-size: 14px; font-size: 14px;
max-width: 90%; max-width: 90%;
padding: 8px 16px; padding: 8px 16px;
max-height: 20vh;
/* smaller height for mobile */
overflow-y: auto;
/* keep scroll on mobile too */
} }
.button-link { .button-link {
@ -178,13 +166,15 @@
</head> </head>
<body> <body>
<a href="/" class="button-link home-button">Home</a>
<h1>Image Archive</h1> <h1>Image Archive</h1>
<!-- Empty gallery container; images will be loaded incrementally --> <!-- Empty gallery container; images will be loaded incrementally -->
<div class="gallery" id="gallery"></div> <div class="gallery" id="gallery"></div>
<div class="button-group">
<a href="/" class="button-link">Back</a>
</div>
<!-- Lightbox --> <!-- Lightbox -->
<div class="lightbox" id="lightbox"> <div class="lightbox" id="lightbox">
<span class="close" onclick="closeLightbox()">&times;</span> <span class="close" onclick="closeLightbox()">&times;</span>
@ -205,7 +195,7 @@
<script> <script>
const gallery = document.getElementById('gallery'); const gallery = document.getElementById('gallery');
const batchSize = 9; // images to load per batch const batchSize = 6; // images to load per batch
let loadedCount = 0; let loadedCount = 0;
let currentIndex = 0; let currentIndex = 0;
const detailsCache = {}; // Cache for image details const detailsCache = {}; // Cache for image details
@ -264,8 +254,7 @@
if (detailsCache[filename]) { if (detailsCache[filename]) {
document.getElementById("lightbox-prompt").textContent = document.getElementById("lightbox-prompt").textContent =
`Model:${detailsCache[filename].model} - Created:${detailsCache[filename].date}\n\n${detailsCache[filename].prompt}`; `Model: ${detailsCache[filename].model}\n\n${detailsCache[filename].prompt}`;
} else { } else {
document.getElementById("lightbox-prompt").textContent = "Loading…"; document.getElementById("lightbox-prompt").textContent = "Loading…";
@ -277,7 +266,7 @@
.then(data => { .then(data => {
detailsCache[filename] = data; // Cache the data detailsCache[filename] = data; // Cache the data
document.getElementById("lightbox-prompt").textContent = document.getElementById("lightbox-prompt").textContent =
`Model:${data.model} - Created:${data.date}\n\n${data.prompt}`; `Model: ${data.model}\n\n${data.prompt}`;
}) })
.catch(() => { .catch(() => {
document.getElementById("lightbox-prompt").textContent = "Couldnt load details."; document.getElementById("lightbox-prompt").textContent = "Couldnt load details.";
@ -287,18 +276,9 @@
function nextImage() { function nextImage() {
const images = getGalleryImages(); const images = getGalleryImages();
if (currentIndex + 1 >= images.length && loadedCount < allImages.length) {
loadNextBatch();
// Wait briefly to ensure DOM updates
setTimeout(() => {
currentIndex++;
showImageAndLoadDetails(currentIndex);
}, 100);
} else {
currentIndex = (currentIndex + 1) % images.length; currentIndex = (currentIndex + 1) % images.length;
showImageAndLoadDetails(currentIndex); showImageAndLoadDetails(currentIndex);
} }
}
function prevImage() { function prevImage() {
const images = getGalleryImages(); const images = getGalleryImages();
@ -306,7 +286,6 @@
showImageAndLoadDetails(currentIndex); showImageAndLoadDetails(currentIndex);
} }
function closeLightbox() { function closeLightbox() {
document.getElementById("lightbox").style.display = "none"; document.getElementById("lightbox").style.display = "none";
} }

View File

@ -52,11 +52,10 @@
</style> </style>
</head> </head>
<body> <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"> <div class="prompt-text">
{{ prompt }} {{ prompt }}
</div> </div>
<button onclick="location.href='/'">Home</button> <button onclick="location.href='/'">Home</button>
</body> </body>
</html> </html>

View File

@ -2,8 +2,8 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>AI Image of the Day</title> <title>AI Image of the Day</title>
<style> <style>
* { * {
@ -21,12 +21,8 @@
background: black; background: black;
color: white; color: white;
font-family: Arial, sans-serif; font-family: Arial, sans-serif;
position: relative;
padding-top: 20px;
padding-bottom: 20px;
} }
.image-container { .image-container {
max-width: 90vw; max-width: 90vw;
max-height: 80vh; max-height: 80vh;
@ -53,10 +49,6 @@
border-radius: 10px; border-radius: 10px;
max-width: 80vw; max-width: 80vw;
text-align: left; text-align: left;
max-height: 30vh;
/* NEW: limit height */
overflow-y: auto;
/* NEW: allow scrolling */
} }
.button-group { .button-group {
@ -82,47 +74,6 @@
.button-link:hover { .button-link:hover {
background: #555; background: #555;
} }
/* New style for version number */
.version {
position: fixed;
bottom: 8px;
right: 12px;
color: #666;
font-size: 12px;
font-family: monospace;
user-select: none;
pointer-events: none;
opacity: 0.6;
}
@media (max-width: 768px) {
.image-container {
max-width: 100vw;
max-height: 50vh;
}
img {
max-width: 100%;
max-height: 100%;
}
.prompt {
max-height: 20vh;
font-size: 14px;
padding: 10px 15px;
}
.button-group {
flex-direction: column;
gap: 10px;
}
.button-link {
font-size: 14px;
padding: 8px 16px;
}
}
</style> </style>
<script> <script>
setInterval(() => { setInterval(() => {
@ -134,7 +85,7 @@
<body> <body>
{% if image %} {% if image %}
<div class="image-container"> <div class="image-container">
<img src="{{ url_for('images', filename=image) }}" alt="Latest Image" /> <img src="{{ url_for('images', filename=image) }}" alt="Latest Image">
</div> </div>
{% if prompt %} {% if prompt %}
<div class="prompt">{{ prompt }}</div> <div class="prompt">{{ prompt }}</div>
@ -146,9 +97,4 @@
{% else %} {% else %}
<p>No images found</p> <p>No images found</p>
{% endif %} {% endif %}
<!-- Version number at bottom right -->
<div class="version">v{{ version }}</div>
</body> </body>
</html>

View File

@ -1,72 +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>
</div>
<button type="submit">Login</button>
</form>
</body>
</html>

View File

@ -3,8 +3,6 @@ reload_interval = 30000
auto_regen = True auto_regen = True
regen_time = 03:00 regen_time = 03:00
port = 5000 port = 5000
create_requires_auth = False
password_for_auth = create
[comfyui] [comfyui]
comfyui_url = http://comfyui comfyui_url = http://comfyui

View File

@ -59,7 +59,7 @@
}, },
"class_type": "CLIPTextEncode", "class_type": "CLIPTextEncode",
"_meta": { "_meta": {
"title": "Positive" "title": "CLIP Text Encode (Prompt)"
} }
}, },
"7": { "7": {
@ -72,7 +72,7 @@
}, },
"class_type": "CLIPTextEncode", "class_type": "CLIPTextEncode",
"_meta": { "_meta": {
"title": "Negative" "title": "CLIP Text Encode (Prompt)"
} }
}, },
"8": { "8": {