Compare commits

..

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

7 changed files with 7 additions and 75 deletions

View File

@ -1,5 +1,5 @@
[tool.bumpversion] [tool.bumpversion]
current_version = "0.3.12" current_version = "0.3.10"
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}"]
replace = "{new_version}" replace = "{new_version}"

View File

@ -4,7 +4,7 @@ FROM python:3.11-slim
# Set the working directory in the container # Set the working directory in the container
WORKDIR /app WORKDIR /app
# Set version label # Set version label
ARG VERSION="0.3.12" ARG VERSION="0.3.10"
LABEL version=$VERSION LABEL version=$VERSION
# Copy project files into the container # Copy project files into the container

View File

@ -240,6 +240,7 @@ def create_prompt_with_random_model(base_prompt: str, topic: str = "random"):
logging.error(f"Error with OpenRouter: {e}") logging.error(f"Error with OpenRouter: {e}")
return "A colorful abstract composition" # Default fallback prompt return "A colorful abstract composition" # Default fallback prompt
return "A colorful abstract composition" # Default fallback prompt
user_config = load_config() user_config = load_config()
output_folder = user_config["comfyui"]["output_dir"] output_folder = user_config["comfyui"]["output_dir"]

View File

@ -1,9 +1,8 @@
import random import random
import logging import logging
from openai import OpenAI, RateLimitError from openai import OpenAI
import nest_asyncio import nest_asyncio
from libs.generic import load_recent_prompts, load_config from libs.generic import load_recent_prompts, load_config
from libs.openwebui import create_prompt_on_openwebui
import re import re
nest_asyncio.apply() nest_asyncio.apply()
@ -91,20 +90,6 @@ def create_prompt_on_openrouter(prompt: str, topic: str = "random", model: str =
prompt = match.group(1) prompt = match.group(1)
logging.debug(prompt) logging.debug(prompt)
return prompt return prompt
except RateLimitError as e:
logging.warning(f"OpenRouter rate limit exceeded (429): {e}. Falling back to local OpenWebUI model.")
# Try to use OpenWebUI as fallback
openwebui_models = [m.strip() for m in user_config["openwebui"]["models"].split(",") if m.strip()] if "openwebui" in user_config and "models" in user_config["openwebui"] else []
if openwebui_models:
selected_model = random.choice(openwebui_models)
try:
return create_prompt_on_openwebui(user_content, topic, selected_model)
except Exception as e2:
logging.error(f"OpenWebUI fallback also failed: {e2}")
return "A colorful abstract composition" # Final fallback
else:
logging.error("No OpenWebUI models configured for fallback.")
return "A colorful abstract composition" # Final fallback
except Exception as e: except Exception as e:
logging.error(f"Error generating prompt with OpenRouter: {e}") logging.error(f"Error generating prompt with OpenRouter: {e}")
return "" return ""

View File

@ -38,7 +38,7 @@
"inputs": { "inputs": {
"filename_prefix": "ComfyUI", "filename_prefix": "ComfyUI",
"images": [ "images": [
"42", "8",
0 0
] ]
}, },
@ -201,19 +201,5 @@
"_meta": { "_meta": {
"title": "VAELoaderMultiGPU" "title": "VAELoaderMultiGPU"
} }
},
"42": {
"inputs": {
"offload_model": true,
"offload_cache": true,
"anything": [
"8",
0
]
},
"class_type": "VRAMCleanup",
"_meta": {
"title": "🎈VRAM-Cleanup"
}
} }
} }

View File

@ -98,7 +98,7 @@
"102": { "102": {
"inputs": { "inputs": {
"images": [ "images": [
"129", "98",
0 0
] ]
}, },
@ -143,19 +143,5 @@
"_meta": { "_meta": {
"title": "VAELoaderMultiGPU" "title": "VAELoaderMultiGPU"
} }
},
"129": {
"inputs": {
"offload_model": true,
"offload_cache": true,
"anything": [
"98",
0
]
},
"class_type": "VRAMCleanup",
"_meta": {
"title": "🎈VRAM-Cleanup"
}
} }
} }

View File

@ -52,12 +52,6 @@
"6": { "6": {
"inputs": { "inputs": {
"text": "A bustling cyberpunk street at night, filled with neon signs, rain-soaked pavement, and futuristic street vendors. High detail, vivid neon colors, and realistic reflections.", "text": "A bustling cyberpunk street at night, filled with neon signs, rain-soaked pavement, and futuristic street vendors. High detail, vivid neon colors, and realistic reflections.",
"speak_and_recognation": {
"__value__": [
false,
true
]
},
"clip": [ "clip": [
"4", "4",
1 1
@ -71,12 +65,6 @@
"7": { "7": {
"inputs": { "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": "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
]
},
"clip": [ "clip": [
"4", "4",
1 1
@ -107,7 +95,7 @@
"inputs": { "inputs": {
"filename_prefix": "ComfyUI", "filename_prefix": "ComfyUI",
"images": [ "images": [
"10", "8",
0 0
] ]
}, },
@ -115,19 +103,5 @@
"_meta": { "_meta": {
"title": "Save Image" "title": "Save Image"
} }
},
"10": {
"inputs": {
"offload_model": true,
"offload_cache": true,
"anything": [
"8",
0
]
},
"class_type": "VRAMCleanup",
"_meta": {
"title": "🎈VRAM-Cleanup"
}
} }
} }