mirror of
https://github.com/karl0ss/ai_image_frame_server.git
synced 2025-09-07 15:13:15 +01:00
Compare commits
No commits in common. "086695d898889d712f13d7ff0e2a794ec5d8a22a" and "06d3a64bb964e697784dad0d90c4cc90ea14cc95" have entirely different histories.
086695d898
...
06d3a64bb9
@ -1,5 +1,5 @@
|
||||
[tool.bumpversion]
|
||||
current_version = "0.3.12"
|
||||
current_version = "0.3.11"
|
||||
parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
|
||||
serialize = ["{major}.{minor}.{patch}"]
|
||||
replace = "{new_version}"
|
||||
|
@ -4,7 +4,7 @@ FROM python:3.11-slim
|
||||
# Set the working directory in the container
|
||||
WORKDIR /app
|
||||
# Set version label
|
||||
ARG VERSION="0.3.12"
|
||||
ARG VERSION="0.3.11"
|
||||
LABEL version=$VERSION
|
||||
|
||||
# Copy project files into the container
|
||||
|
@ -240,6 +240,7 @@ def create_prompt_with_random_model(base_prompt: str, topic: str = "random"):
|
||||
logging.error(f"Error with OpenRouter: {e}")
|
||||
return "A colorful abstract composition" # Default fallback prompt
|
||||
|
||||
return "A colorful abstract composition" # Default fallback prompt
|
||||
|
||||
user_config = load_config()
|
||||
output_folder = user_config["comfyui"]["output_dir"]
|
@ -1,9 +1,8 @@
|
||||
import random
|
||||
import logging
|
||||
from openai import OpenAI, RateLimitError
|
||||
from openai import OpenAI
|
||||
import nest_asyncio
|
||||
from libs.generic import load_recent_prompts, load_config
|
||||
from libs.openwebui import create_prompt_on_openwebui
|
||||
import re
|
||||
nest_asyncio.apply()
|
||||
|
||||
@ -91,20 +90,6 @@ def create_prompt_on_openrouter(prompt: str, topic: str = "random", model: str =
|
||||
prompt = match.group(1)
|
||||
logging.debug(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:
|
||||
logging.error(f"Error generating prompt with OpenRouter: {e}")
|
||||
return ""
|
Loading…
x
Reference in New Issue
Block a user