Model selection (ai.py): - get_optimal_model() now scores Gemini 2.5 > 2.0 > 1.5 when ranking candidates - get_default_models() fallbacks updated to gemini-2.0-pro-exp (logic) and gemini-2.0-flash (writer/artist) - AI selection prompt rewritten: includes Gemini 2.x pricing context, guidance to avoid 'thinking' models for writer/artist roles, and instructions to prefer 2.x over 1.5 - Added image_model_name and image_model_source globals for UI visibility - init_models() now reads MODEL_IMAGE_HINT; tries imagen-3.0-generate-001 then imagen-3.0-fast-generate-001 on both Gemini API and Vertex AI paths Cover generation (marketing.py): - Fixed display bug: "Attempt X/5" now correctly reads "Attempt X/3" - Added imagen-3.0-fast-generate-001 as intermediate fallback before legacy Imagen 2 - Quality threshold: images with score < 5 are only kept if nothing better exists - Smarter prompt refinement on retry: deformity, blur, and watermark critique keywords each append targeted corrections to the art prompt - Fixed missing sys import (sys.platform check for macOS was silently broken) Config / Docker: - config.py: added MODEL_IMAGE_HINT env var, bumped version to 1.2.0 - docker-compose.yml: added MODEL_IMAGE environment variable - Dockerfile: added libpng-dev and libfreetype6-dev for better font/PNG rendering; added HEALTHCHECK so Portainer detects unhealthy containers System status UI: - system_status.html: added Image row showing active Imagen model and provider (Gemini API / Vertex AI) - Added cache expiry countdown with colour-coded badges Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
186 lines
8.1 KiB
HTML
186 lines
8.1 KiB
HTML
{% extends "base.html" %}
|
|
|
|
{% block content %}
|
|
<div class="row mb-4">
|
|
<div class="col-md-8">
|
|
<h2><i class="fas fa-server me-2"></i>System Status</h2>
|
|
<p class="text-muted">AI Model Health, Selection Reasoning, and Availability.</p>
|
|
</div>
|
|
<div class="col-md-4 text-end">
|
|
<a href="{{ url_for('index') }}" class="btn btn-outline-secondary me-2">Back to Dashboard</a>
|
|
<form action="{{ url_for('optimize_models') }}" method="POST" class="d-inline" onsubmit="return confirm('This will re-analyze all available models. Continue?');">
|
|
<button type="submit" class="btn btn-primary">
|
|
<i class="fas fa-sync me-2"></i>Refresh & Optimize
|
|
</button>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
|
|
{% if cache.error %}
|
|
<div class="alert alert-danger shadow-sm">
|
|
<h5 class="alert-heading"><i class="fas fa-exclamation-triangle me-2"></i>Last Scan Error</h5>
|
|
<p class="mb-0">{{ cache.error }}</p>
|
|
</div>
|
|
{% endif %}
|
|
|
|
<div class="card shadow-sm mb-4">
|
|
<div class="card-header bg-light">
|
|
<h5 class="mb-0"><i class="fas fa-robot me-2"></i>AI Model Selection</h5>
|
|
</div>
|
|
<div class="card-body p-0">
|
|
<div class="table-responsive">
|
|
<table class="table table-hover align-middle mb-0">
|
|
<thead class="table-light">
|
|
<tr>
|
|
<th style="width: 15%">Role</th>
|
|
<th style="width: 25%">Selected Model</th>
|
|
<th style="width: 15%">Est. Cost</th>
|
|
<th>Selection Reasoning</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
{% if models %}
|
|
{% for role, info in models.items() %}
|
|
{% if role != 'ranking' %}
|
|
<tr>
|
|
<td class="fw-bold text-uppercase">{{ role }}</td>
|
|
<td>
|
|
<span class="badge bg-info text-dark">{{ info.model }}</span>
|
|
</td>
|
|
<td>
|
|
<span class="badge bg-light text-dark border">{{ info.estimated_cost }}</span>
|
|
</td>
|
|
<td class="small text-muted">
|
|
{{ info.reason }}
|
|
</td>
|
|
</tr>
|
|
{% endif %}
|
|
{% endfor %}
|
|
<tr>
|
|
<td class="fw-bold text-uppercase">Image</td>
|
|
<td>
|
|
{% if image_model %}
|
|
<span class="badge bg-success">{{ image_model }}</span>
|
|
{% else %}
|
|
<span class="badge bg-danger">Unavailable</span>
|
|
{% endif %}
|
|
</td>
|
|
<td>
|
|
<span class="badge bg-light text-dark border">{{ image_source or 'None' }}</span>
|
|
</td>
|
|
<td class="small text-muted">
|
|
{% if image_model %}Imagen model used for book cover generation.{% else %}No image generation model could be initialized. Check GCP credentials or Gemini API key.{% endif %}
|
|
</td>
|
|
</tr>
|
|
{% else %}
|
|
<tr>
|
|
<td colspan="3" class="text-center py-4 text-muted">
|
|
<i class="fas fa-exclamation-circle me-2"></i>No model configuration found.
|
|
<br>Click <strong>Refresh & Optimize</strong> to scan available Gemini models.
|
|
</td>
|
|
</tr>
|
|
{% endif %}
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Ranked Models -->
|
|
<div class="card shadow-sm mb-4">
|
|
<div class="card-header bg-light">
|
|
<h5 class="mb-0"><i class="fas fa-list-ol me-2"></i>All Models Ranked</h5>
|
|
</div>
|
|
<div class="card-body p-0">
|
|
<div class="table-responsive">
|
|
<table class="table table-hover align-middle mb-0">
|
|
<thead class="table-light">
|
|
<tr>
|
|
<th style="width: 10%">Rank</th>
|
|
<th style="width: 30%">Model Name</th>
|
|
<th style="width: 15%">Est. Cost</th>
|
|
<th>Reasoning</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
{% if models and models.ranking %}
|
|
{% for item in models.ranking %}
|
|
<tr>
|
|
<td class="fw-bold">{{ loop.index }}</td>
|
|
<td><span class="badge bg-secondary">{{ item.model }}</span></td>
|
|
<td><small>{{ item.estimated_cost }}</small></td>
|
|
<td class="small text-muted">{{ item.reason }}</td>
|
|
</tr>
|
|
{% endfor %}
|
|
{% else %}
|
|
<tr>
|
|
<td colspan="3" class="text-center py-4 text-muted">
|
|
No ranking data available. Refresh models to generate.
|
|
</td>
|
|
</tr>
|
|
{% endif %}
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Raw API Output -->
|
|
<div class="card shadow-sm mb-4">
|
|
<div class="card-header bg-light d-flex justify-content-between align-items-center" style="cursor: pointer;" data-bs-toggle="collapse" data-bs-target="#rawOutput">
|
|
<h5 class="mb-0"><i class="fas fa-terminal me-2"></i>Raw API Output</h5>
|
|
<span class="badge bg-secondary">Click to Toggle</span>
|
|
</div>
|
|
<div id="rawOutput" class="collapse">
|
|
<div class="card-body bg-dark text-light font-monospace">
|
|
<p class="text-muted mb-2"># Full list of models returned by google.generativeai.list_models():</p>
|
|
<ul class="list-unstyled mb-0" style="column-count: 2;">
|
|
{% if cache.raw_models %}
|
|
{% for m in cache.raw_models %}
|
|
<li>
|
|
<span class="{{ 'text-success' if 'gemini' in m else 'text-muted' }}">{{ m }}</span>
|
|
</li>
|
|
{% endfor %}
|
|
{% else %}
|
|
<li class="text-muted">No raw data available. Run "Refresh & Optimize".</li>
|
|
{% endif %}
|
|
</ul>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Cache Info -->
|
|
<div class="card shadow-sm">
|
|
<div class="card-header bg-light">
|
|
<h5 class="mb-0"><i class="fas fa-clock me-2"></i>Cache Status</h5>
|
|
</div>
|
|
<div class="card-body">
|
|
<p class="mb-1">
|
|
<strong>Last Scan:</strong>
|
|
{% if cache and cache.timestamp %}
|
|
{{ datetime.fromtimestamp(cache.timestamp).strftime('%Y-%m-%d %H:%M:%S') }} UTC
|
|
{% else %}
|
|
Never
|
|
{% endif %}
|
|
</p>
|
|
<p class="mb-0">
|
|
<strong>Next Refresh:</strong>
|
|
{% if cache and cache.timestamp %}
|
|
{% set expires = cache.timestamp + 86400 %}
|
|
{% set now_ts = datetime.utcnow().timestamp() %}
|
|
{% if expires > now_ts %}
|
|
{% set remaining = (expires - now_ts) | int %}
|
|
{% set h = remaining // 3600 %}{% set m = (remaining % 3600) // 60 %}
|
|
in {{ h }}h {{ m }}m
|
|
<span class="badge bg-success ms-1">Cache Valid</span>
|
|
{% else %}
|
|
<span class="badge bg-warning text-dark">Expired — click Refresh & Optimize</span>
|
|
{% endif %}
|
|
{% else %}
|
|
<span class="badge bg-warning text-dark">No cache — click Refresh & Optimize</span>
|
|
{% endif %}
|
|
</p>
|
|
<p class="text-muted small mt-2 mb-0">Model selection is cached for 24 hours to save API calls.</p>
|
|
</div>
|
|
</div>
|
|
{% endblock %} |