feat: LLM-анализ — индикатор прогресса, кнопка рескана, статистика на дашборде
- Добавлен статус {"status": "analyzing"} в finding.report на время LLM-анализа
- Кнопка рескана (Retry) под LLM-отчётом в ручном режиме
- LLM-статистика на дашборде: analysed / pending
- Защита от двойного анализа через per-finding asyncio.Lock
- _llm_spinner.html — фрагмент спиннера для состояния analysing
- Удалён мёртвый код: constants, i18n, CSS, queries
- Фиксы: _env_int, индексы БД, UnicodeDecodeError, time.mktime и др.
- Шаблоны: shared includes (_status_badge, _pagination)
- AGENTS.md: workflow (lint, test, commit, rebuild)
This commit is contained in:
@@ -4,8 +4,15 @@
|
||||
{% if report.severity_rating %}
|
||||
<span class="llm-severity">{{ report.severity_rating }}</span>
|
||||
{% endif %}
|
||||
{% if config.llm_enabled and not config.llm_auto_analyze %}
|
||||
<span class="llm-retry"
|
||||
hx-post="/api/v1/findings/{{ finding_id }}/analyze?retry=1"
|
||||
hx-target="closest .llm-report"
|
||||
hx-swap="outerHTML"
|
||||
hx-indicator="closest .llm-report">{{ t('llm_retry', request.state.lang) }}</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
<p class="llm-summary">{{ report.summary }}</p>
|
||||
<p class="llm-analysis">{{ report.analysis }}</p>
|
||||
<p class="llm-disclaimer">⚠ AI-generated analysis — may contain inaccuracies. Always verify findings before taking action.</p>
|
||||
<p class="llm-disclaimer">{{ t('llm_disclaimer', request.state.lang) }}</p>
|
||||
</div>
|
||||
|
||||
3
guarddog_nexus/web/templates/_llm_spinner.html
Normal file
3
guarddog_nexus/web/templates/_llm_spinner.html
Normal file
@@ -0,0 +1,3 @@
|
||||
<div class="llm-actions">
|
||||
<small><span class="spinner"></span> {{ t('llm_analyzing', request.state.lang) }}</small>
|
||||
</div>
|
||||
@@ -38,14 +38,5 @@
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
{% set total_pages = (total // per_page) + (1 if total % per_page else 0) %}
|
||||
{% if total_pages > 1 %}
|
||||
<nav>
|
||||
<ul>
|
||||
<li>{% if page > 1 %}<a href="?page={{ page - 1 }}&flagged={{ flagged_filter }}&search={{ search }}&sort_by={{ sort_by }}&sort_dir={{ sort_dir }}">{{ t('btn_prev', request.state.lang) }}</a>{% else %}<span>{{ t('btn_prev', request.state.lang) }}</span>{% endif %}</li>
|
||||
<li><small>{{ t('page_label', request.state.lang) }} {{ page }} {{ t('page_of', request.state.lang) }} {{ total_pages }}</small></li>
|
||||
<li>{% if page < total_pages %}<a href="?page={{ page + 1 }}&flagged={{ flagged_filter }}&search={{ search }}&sort_by={{ sort_by }}&sort_dir={{ sort_dir }}">{{ t('btn_next', request.state.lang) }}</a>{% else %}<span>{{ t('btn_next', request.state.lang) }}</span>{% endif %}</li>
|
||||
</ul>
|
||||
</nav>
|
||||
{% endif %}
|
||||
{% include "_pagination.html" %}
|
||||
<small style="opacity: 0.5;">{{ t('total_packages', request.state.lang, total) }}</small>
|
||||
|
||||
10
guarddog_nexus/web/templates/_pagination.html
Normal file
10
guarddog_nexus/web/templates/_pagination.html
Normal file
@@ -0,0 +1,10 @@
|
||||
{% set total_pages = (total // per_page) + (1 if total % per_page else 0) %}
|
||||
{% if total_pages > 1 %}
|
||||
<nav>
|
||||
<ul>
|
||||
<li>{% if page > 1 %}<a href="?page={{ page - 1 }}{% if flagged_filter %}&flagged={{ flagged_filter }}{% endif %}{% if search %}&search={{ search }}{% endif %}{% if status_filter %}&status={{ status_filter }}{% endif %}&sort_by={{ sort_by }}&sort_dir={{ sort_dir }}">{{ t('btn_prev', request.state.lang) }}</a>{% else %}<span>{{ t('btn_prev', request.state.lang) }}</span>{% endif %}</li>
|
||||
<li><small>{{ t('page_label', request.state.lang) }} {{ page }} {{ t('page_of', request.state.lang) }} {{ total_pages }}</small></li>
|
||||
<li>{% if page < total_pages %}<a href="?page={{ page + 1 }}{% if flagged_filter %}&flagged={{ flagged_filter }}{% endif %}{% if search %}&search={{ search }}{% endif %}{% if status_filter %}&status={{ status_filter }}{% endif %}&sort_by={{ sort_by }}&sort_dir={{ sort_dir }}">{{ t('btn_next', request.state.lang) }}</a>{% else %}<span>{{ t('btn_next', request.state.lang) }}</span>{% endif %}</li>
|
||||
</ul>
|
||||
</nav>
|
||||
{% endif %}
|
||||
@@ -28,7 +28,7 @@
|
||||
<td>{{ s.package_version }}</td>
|
||||
<td>{{ s.repository }}</td>
|
||||
<td>
|
||||
{% if s.status == 'scanning' %}<span class="status-scanning"><span class="spinner"></span>scanning</span>{% else %}<span class="status-{{ s.status }}">{{ s.status }}</span>{% endif %}
|
||||
{% with status=s.status %}{% include "_status_badge.html" %}{% endwith %}
|
||||
</td>
|
||||
<td>{% if s.flagged %}<span class="flagged">{{ s.total_findings }}</span>{% else %}<span class="clean">0</span>{% endif %}</td>
|
||||
<td>{{ s.started_at.strftime('%Y-%m-%d %H:%M') if s.started_at }}</td>
|
||||
@@ -42,14 +42,5 @@
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
{% set total_pages = (total // per_page) + (1 if total % per_page else 0) %}
|
||||
{% if total_pages > 1 %}
|
||||
<nav>
|
||||
<ul>
|
||||
<li>{% if page > 1 %}<a href="?page={{ page - 1 }}&flagged={{ flagged_filter }}&search={{ search }}&status={{ status_filter }}&sort_by={{ sort_by }}&sort_dir={{ sort_dir }}">{{ t('btn_prev', request.state.lang) }}</a>{% else %}<span>{{ t('btn_prev', request.state.lang) }}</span>{% endif %}</li>
|
||||
<li><small>{{ t('page_label', request.state.lang) }} {{ page }} {{ t('page_of', request.state.lang) }} {{ total_pages }}</small></li>
|
||||
<li>{% if page < total_pages %}<a href="?page={{ page + 1 }}&flagged={{ flagged_filter }}&search={{ search }}&status={{ status_filter }}&sort_by={{ sort_by }}&sort_dir={{ sort_dir }}">{{ t('btn_next', request.state.lang) }}</a>{% else %}<span>{{ t('btn_next', request.state.lang) }}</span>{% endif %}</li>
|
||||
</ul>
|
||||
</nav>
|
||||
{% endif %}
|
||||
{% include "_pagination.html" %}
|
||||
<small style="opacity: 0.5;">{{ t('total_scans', request.state.lang, total) }}</small>
|
||||
|
||||
1
guarddog_nexus/web/templates/_status_badge.html
Normal file
1
guarddog_nexus/web/templates/_status_badge.html
Normal file
@@ -0,0 +1 @@
|
||||
{% if status == 'scanning' %}<span class="status-scanning"><span class="spinner"></span>scanning</span>{% else %}<span class="status-{{ status }}">{{ status }}</span>{% endif %}
|
||||
@@ -1,3 +1,10 @@
|
||||
{% if total_findings %}
|
||||
<div style="display:flex; gap:1.5rem; padding:0.3rem 0; margin-bottom:1rem; border-bottom:1px solid var(--pico-color-gray-500); font-size:0.82rem; opacity:0.8;">
|
||||
<span>{{ t('col_findings', request.state.lang) }}: <strong>{{ total_findings }}</strong></span>
|
||||
<span>{{ t('llm_analyzed', request.state.lang) }}: <strong>{{ llm_analyzed }}</strong></span>
|
||||
<span>{{ t('llm_pending', request.state.lang) }}: <strong>{{ llm_pending }}</strong></span>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if latest_flagged %}
|
||||
<article class="dash-block dash-block-warn">
|
||||
<h3>{{ t('heading_latest_flagged', request.state.lang) }}</h3>
|
||||
@@ -30,7 +37,7 @@
|
||||
<td>{{ s.package_version }}</td>
|
||||
<td><small>{{ s.repository }}</small></td>
|
||||
<td>
|
||||
{% if s.status == 'scanning' %}<span class="status-scanning"><span class="spinner"></span>scanning</span>{% else %}<span class="status-{{ s.status }}">{{ s.status }}</span>{% endif %}
|
||||
{% with status=s.status %}{% include "_status_badge.html" %}{% endwith %}
|
||||
</td>
|
||||
<td>{% if s.flagged %}<span class="flagged">⚠ {{ s.total_findings }}</span>{% elif s.status == 'completed' %}<span class="clean">✓</span>{% else %}<span>-</span>{% endif %}</td>
|
||||
<td>{{ s.started_at.strftime('%m-%d %H:%M') if s.started_at }}</td>
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
<td><a href="/scans/{{ s.id }}">#{{ s.id }}</a></td>
|
||||
<td>{{ s.repository }}</td>
|
||||
<td>
|
||||
{% if s.status == 'scanning' %}<span class="status-scanning"><span class="spinner"></span>scanning</span>{% else %}<span class="status-{{ s.status }}">{{ s.status }}</span>{% endif %}
|
||||
{% with status=s.status %}{% include "_status_badge.html" %}{% endwith %}
|
||||
</td>
|
||||
<td>{% if s.flagged %}<span class="flagged">{{ s.total_findings }}</span>{% else %}<span class="clean">0</span>{% endif %}</td>
|
||||
<td>{{ s.started_at.strftime('%Y-%m-%d %H:%M') if s.started_at }}</td>
|
||||
@@ -54,19 +54,28 @@
|
||||
<pre><code id="code-{{ f.id }}">{{ f.data.code }}</code></pre>
|
||||
{% endif %}
|
||||
|
||||
{% if f.report %}
|
||||
{% if f.report and f.report.status == "analyzing" %}
|
||||
{% include "_llm_spinner.html" %}
|
||||
{% elif f.report and f.report.verdict %}
|
||||
<div class="llm-report llm-{{ f.report.verdict }}">
|
||||
<div class="llm-header">
|
||||
<span class="llm-badge llm-badge-{{ f.report.verdict }}">{{ f.report.verdict }}</span>
|
||||
{% if f.report.severity_rating %}
|
||||
<span class="llm-severity">{{ f.report.severity_rating }}</span>
|
||||
{% endif %}
|
||||
{% if config.llm_enabled and not config.llm_auto_analyze %}
|
||||
<span class="llm-retry"
|
||||
hx-post="/api/v1/findings/{{ f.id }}/analyze?retry=1"
|
||||
hx-target="closest .llm-report"
|
||||
hx-swap="outerHTML"
|
||||
hx-indicator="closest .llm-report">{{ t('llm_retry', request.state.lang) }}</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
<p class="llm-summary">{{ f.report.summary }}</p>
|
||||
<p class="llm-analysis">{{ f.report.analysis }}</p>
|
||||
<p class="llm-disclaimer">{{ t('llm_disclaimer', request.state.lang) }}</p>
|
||||
</div>
|
||||
{% else %}
|
||||
{% elif config.llm_enabled and not config.llm_auto_analyze %}
|
||||
<div class="llm-actions" id="llm-{{ f.id }}">
|
||||
<button class="outline"
|
||||
hx-post="/api/v1/findings/{{ f.id }}/analyze"
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
<div><strong>{{ t('scan_info_ecosystem', request.state.lang) }}</strong><br>{{ scan.ecosystem }}</div>
|
||||
<div><strong>{{ t('scan_info_repository', request.state.lang) }}</strong><br>{{ scan.repository }}</div>
|
||||
<div><strong>{{ t('scan_info_status', request.state.lang) }}</strong><br>
|
||||
{% if scan.status == 'scanning' %}<span class="status-scanning"><span class="spinner"></span>scanning</span>{% else %}<span class="status-{{ scan.status }}">{{ scan.status }}</span>{% endif %}
|
||||
{% with status=scan.status %}{% include "_status_badge.html" %}{% endwith %}
|
||||
</div>
|
||||
<div><strong>{{ t('scan_info_sha256', request.state.lang) }}</strong><br><code class="sha256">{{ scan.sha256 or '-' }}</code></div>
|
||||
<div><strong>{{ t('scan_info_started', request.state.lang) }}</strong><br>{{ scan.started_at.strftime('%Y-%m-%d %H:%M') if scan.started_at }}</div>
|
||||
@@ -50,19 +50,28 @@
|
||||
<pre><code id="code-{{ f.id }}">{{ f.data.code }}</code></pre>
|
||||
{% endif %}
|
||||
|
||||
{% if f.report %}
|
||||
{% if f.report and f.report.status == "analyzing" %}
|
||||
{% include "_llm_spinner.html" %}
|
||||
{% elif f.report and f.report.verdict %}
|
||||
<div class="llm-report llm-{{ f.report.verdict }}">
|
||||
<div class="llm-header">
|
||||
<span class="llm-badge llm-badge-{{ f.report.verdict }}">{{ f.report.verdict }}</span>
|
||||
{% if f.report.severity_rating %}
|
||||
<span class="llm-severity">{{ f.report.severity_rating }}</span>
|
||||
{% endif %}
|
||||
{% if config.llm_enabled and not config.llm_auto_analyze %}
|
||||
<span class="llm-retry"
|
||||
hx-post="/api/v1/findings/{{ f.id }}/analyze?retry=1"
|
||||
hx-target="closest .llm-report"
|
||||
hx-swap="outerHTML"
|
||||
hx-indicator="closest .llm-report">{{ t('llm_retry', request.state.lang) }}</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
<p class="llm-summary">{{ f.report.summary }}</p>
|
||||
<p class="llm-analysis">{{ f.report.analysis }}</p>
|
||||
<p class="llm-disclaimer">{{ t('llm_disclaimer', request.state.lang) }}</p>
|
||||
</div>
|
||||
{% else %}
|
||||
{% elif config.llm_enabled and not config.llm_auto_analyze %}
|
||||
<div class="llm-actions" id="llm-{{ f.id }}">
|
||||
<button class="outline"
|
||||
hx-post="/api/v1/findings/{{ f.id }}/analyze"
|
||||
|
||||
Reference in New Issue
Block a user