Compare commits
7 Commits
v2026.03.0
...
async-cont
| Author | SHA1 | Date | |
|---|---|---|---|
|
f061d82409 | ||
|
|
2eee7c5d35 | ||
|
|
9bf31488ae | ||
|
|
ef86a2c3c4 | ||
|
|
b4c6d23dfb | ||
|
|
6102851e55 | ||
|
|
79c1fde217 |
@@ -73,11 +73,13 @@ Create two versioned release notes files:
|
||||
#### Required Sections
|
||||
|
||||
Each file must include:
|
||||
1. **Title**: `# v{version} Release Notes` (EN) / `# v{version} 版本发布说明` (CN)
|
||||
2. **Overview**: One paragraph summarizing this release
|
||||
3. **New Features** / **新功能**: Bulleted list of features
|
||||
4. **Bug Fixes** / **问题修复**: Bulleted list of fixes
|
||||
5. **Migration Notes** / **迁移说明**: Breaking changes or Valve key renames (omit section if none)
|
||||
0. **Marketplace Link**: Direct link to the plugin on openwebui.com (e.g., `**[🚀 Get/Update on OpenWebUI Community](URL)**`)
|
||||
1. **Overview**: One paragraph summarizing this release
|
||||
2. **New Features** / **新功能**: Bulleted list of features
|
||||
3. **Bug Fixes** / **问题修复**: Bulleted list of fixes
|
||||
4. **Related Issues** / **相关 Issue**: Link to the GitHub Issue(s) resolved in this release (e.g., `**[#56](URL)**`). MANDATORY if the release resolves a reported issue.
|
||||
5. **Related PRs** / **相关 PR**: Link to the Pull Request(s) associated with this release. (e.g., `**[#123](URL)**`). MANDATORY if the release is being prepared within an existing PR.
|
||||
6. **Migration Notes** / **迁移说明**: Breaking changes or Valve key renames (omit section if none)
|
||||
6. **Companion Plugins** / **配套插件** (optional): If a companion plugin was updated
|
||||
|
||||
If a release notes file already exists for this version, update it rather than creating a new one.
|
||||
@@ -98,8 +100,10 @@ Generate the commit message following `commit-message.instructions.md` rules:
|
||||
- **Language**: English ONLY
|
||||
- **Format**: `type(scope): subject` + blank line + body bullets
|
||||
- **Scope**: use plugin folder name (e.g., `github-copilot-sdk`)
|
||||
- **Body**: 1-3 bullets summarizing key changes
|
||||
- Explicitly mention "READMEs and docs synced" if version was bumped
|
||||
- **Body**:
|
||||
- 1-3 bullets summarizing key changes
|
||||
- Explicitly mention "READMEs and docs synced" if version was bumped
|
||||
- **MUST** end with `Closes #XX` or `Fixes #XX` if an issue is being resolved.
|
||||
|
||||
Present the full commit message to the user for review before executing.
|
||||
|
||||
|
||||
144
.github/workflows/release.yml
vendored
144
.github/workflows/release.yml
vendored
@@ -5,13 +5,13 @@
|
||||
# Triggers:
|
||||
# - Push to main branch when plugins are modified (auto-release)
|
||||
# - Manual trigger (workflow_dispatch) with custom release notes
|
||||
# - Push of version tags (v*)
|
||||
# - Push of plugin version tags (<plugin>-v*)
|
||||
#
|
||||
# What it does:
|
||||
# 1. Detects plugin version changes compared to the last release
|
||||
# 2. Generates release notes with updated plugin information
|
||||
# 3. Creates a GitHub Release with plugin files as downloadable assets
|
||||
# 4. Supports multiple plugin updates in a single release
|
||||
# 4. Enforces one plugin creation/update per release
|
||||
|
||||
name: Plugin Release
|
||||
|
||||
@@ -28,13 +28,14 @@ on:
|
||||
- 'plugins/**/v*_CN.md'
|
||||
- 'docs/plugins/**/*.md'
|
||||
tags:
|
||||
- '*-v*'
|
||||
- 'v*'
|
||||
|
||||
# Manual trigger with inputs
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
version:
|
||||
description: 'Release version (e.g., v1.0.0). Leave empty for auto-generated version.'
|
||||
description: 'Release tag (e.g., markdown-normalizer-v1.2.8). Leave empty for auto-generated tag.'
|
||||
required: false
|
||||
type: string
|
||||
release_title:
|
||||
@@ -65,7 +66,9 @@ jobs:
|
||||
outputs:
|
||||
has_changes: ${{ steps.detect.outputs.has_changes }}
|
||||
changed_plugins: ${{ steps.detect.outputs.changed_plugins }}
|
||||
changed_plugin_titles: ${{ steps.detect.outputs.changed_plugin_titles }}
|
||||
changed_plugin_title: ${{ steps.detect.outputs.changed_plugin_title }}
|
||||
changed_plugin_slug: ${{ steps.detect.outputs.changed_plugin_slug }}
|
||||
changed_plugin_version: ${{ steps.detect.outputs.changed_plugin_version }}
|
||||
changed_plugin_count: ${{ steps.detect.outputs.changed_plugin_count }}
|
||||
release_notes: ${{ steps.detect.outputs.release_notes }}
|
||||
has_doc_changes: ${{ steps.detect.outputs.has_doc_changes }}
|
||||
@@ -95,12 +98,12 @@ jobs:
|
||||
run: |
|
||||
# Always compare against the most recent previously released version.
|
||||
CURRENT_TAG=""
|
||||
if [[ "${GITHUB_REF}" == refs/tags/v* ]]; then
|
||||
if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
|
||||
CURRENT_TAG="${GITHUB_REF#refs/tags/}"
|
||||
echo "Current tag event detected: $CURRENT_TAG"
|
||||
fi
|
||||
|
||||
PREVIOUS_RELEASE_TAG=$(git tag --sort=-creatordate | grep -E '^v' | grep -Fxv "$CURRENT_TAG" | head -n1 || true)
|
||||
PREVIOUS_RELEASE_TAG=$(git tag --sort=-creatordate | grep -Fxv "$CURRENT_TAG" | head -n1 || true)
|
||||
|
||||
if [ -n "$PREVIOUS_RELEASE_TAG" ]; then
|
||||
echo "Comparing with previous release tag: $PREVIOUS_RELEASE_TAG"
|
||||
@@ -162,22 +165,80 @@ jobs:
|
||||
# Only trigger release if there are actual version changes, not just doc changes
|
||||
echo "has_changes=false" >> $GITHUB_OUTPUT
|
||||
echo "changed_plugins=" >> $GITHUB_OUTPUT
|
||||
echo "changed_plugin_titles=" >> $GITHUB_OUTPUT
|
||||
echo "changed_plugin_title=" >> $GITHUB_OUTPUT
|
||||
echo "changed_plugin_slug=" >> $GITHUB_OUTPUT
|
||||
echo "changed_plugin_version=" >> $GITHUB_OUTPUT
|
||||
echo "changed_plugin_count=0" >> $GITHUB_OUTPUT
|
||||
else
|
||||
echo "has_changes=true" >> $GITHUB_OUTPUT
|
||||
|
||||
# Extract changed plugin file paths and titles using Python
|
||||
python3 -c "import json; data = json.load(open('changes.json', 'r')); get_title = lambda plugin: ((plugin.get('data', {}).get('function', {}).get('meta', {}).get('manifest', {}).get('title')) or plugin.get('title') or '').strip(); files = []; [files.append(plugin['file_path']) for plugin in data.get('added', []) if plugin.get('file_path')]; [files.append(update['current']['file_path']) for update in data.get('updated', []) if update.get('current', {}).get('file_path')]; print('\\n'.join(files))" > changed_files.txt
|
||||
# Extract changed plugin metadata and enforce a single-plugin release.
|
||||
python3 <<'PY'
|
||||
import json
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
python3 -c "import json; data = json.load(open('changes.json', 'r')); get_title = lambda plugin: ((plugin.get('data', {}).get('function', {}).get('meta', {}).get('manifest', {}).get('title')) or plugin.get('title') or '').strip(); titles = []; [titles.append(title) for plugin in data.get('added', []) for title in [get_title(plugin)] if title and title not in titles]; [titles.append(title) for update in data.get('updated', []) for title in [get_title(update.get('current', {}))] if title and title not in titles]; print(', '.join(titles)); open('changed_plugin_count.txt', 'w').write(str(len(titles)))" > changed_plugin_titles.txt
|
||||
data = json.load(open('changes.json', 'r', encoding='utf-8'))
|
||||
|
||||
def get_plugin_meta(plugin):
|
||||
manifest = plugin.get('data', {}).get('function', {}).get('meta', {}).get('manifest', {})
|
||||
title = (manifest.get('title') or plugin.get('title') or '').strip()
|
||||
version = (manifest.get('version') or plugin.get('version') or '').strip()
|
||||
file_path = (plugin.get('file_path') or '').strip()
|
||||
slug = Path(file_path).parent.name.replace('_', '-').strip() if file_path else ''
|
||||
return {
|
||||
'title': title,
|
||||
'slug': slug,
|
||||
'version': version,
|
||||
'file_path': file_path,
|
||||
}
|
||||
|
||||
plugins = []
|
||||
seen_keys = set()
|
||||
|
||||
for plugin in data.get('added', []):
|
||||
meta = get_plugin_meta(plugin)
|
||||
key = meta['file_path'] or meta['title']
|
||||
if key and key not in seen_keys:
|
||||
plugins.append(meta)
|
||||
seen_keys.add(key)
|
||||
|
||||
for update in data.get('updated', []):
|
||||
meta = get_plugin_meta(update.get('current', {}))
|
||||
key = meta['file_path'] or meta['title']
|
||||
if key and key not in seen_keys:
|
||||
plugins.append(meta)
|
||||
seen_keys.add(key)
|
||||
|
||||
Path('changed_files.txt').write_text(
|
||||
'\n'.join(meta['file_path'] for meta in plugins if meta['file_path']),
|
||||
encoding='utf-8',
|
||||
)
|
||||
Path('changed_plugin_count.txt').write_text(str(len(plugins)), encoding='utf-8')
|
||||
|
||||
if len(plugins) > 1:
|
||||
print('Error: release workflow only supports one plugin creation/update per release.', file=sys.stderr)
|
||||
for meta in plugins:
|
||||
print(
|
||||
f"- {meta['title'] or 'Unknown'} v{meta['version'] or '?'} ({meta['file_path'] or 'unknown path'})",
|
||||
file=sys.stderr,
|
||||
)
|
||||
sys.exit(1)
|
||||
|
||||
selected = plugins[0] if plugins else {'title': '', 'slug': '', 'version': ''}
|
||||
Path('changed_plugin_title.txt').write_text(selected['title'], encoding='utf-8')
|
||||
Path('changed_plugin_slug.txt').write_text(selected['slug'], encoding='utf-8')
|
||||
Path('changed_plugin_version.txt').write_text(selected['version'], encoding='utf-8')
|
||||
PY
|
||||
|
||||
echo "changed_plugins<<EOF" >> $GITHUB_OUTPUT
|
||||
cat changed_files.txt >> $GITHUB_OUTPUT
|
||||
echo "" >> $GITHUB_OUTPUT
|
||||
echo "EOF" >> $GITHUB_OUTPUT
|
||||
|
||||
echo "changed_plugin_titles=$(cat changed_plugin_titles.txt)" >> $GITHUB_OUTPUT
|
||||
echo "changed_plugin_title=$(cat changed_plugin_title.txt)" >> $GITHUB_OUTPUT
|
||||
echo "changed_plugin_slug=$(cat changed_plugin_slug.txt)" >> $GITHUB_OUTPUT
|
||||
echo "changed_plugin_version=$(cat changed_plugin_version.txt)" >> $GITHUB_OUTPUT
|
||||
echo "changed_plugin_count=$(cat changed_plugin_count.txt)" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
|
||||
@@ -191,7 +252,7 @@ jobs:
|
||||
|
||||
release:
|
||||
needs: check-changes
|
||||
if: needs.check-changes.outputs.has_changes == 'true' || github.event_name == 'workflow_dispatch' || startsWith(github.ref, 'refs/tags/v')
|
||||
if: needs.check-changes.outputs.has_changes == 'true' || github.event_name == 'workflow_dispatch' || startsWith(github.ref, 'refs/tags/')
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
LANG: en_US.UTF-8
|
||||
@@ -219,53 +280,34 @@ jobs:
|
||||
id: version
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
CHANGED_PLUGIN_SLUG: ${{ needs.check-changes.outputs.changed_plugin_slug }}
|
||||
CHANGED_PLUGIN_VERSION: ${{ needs.check-changes.outputs.changed_plugin_version }}
|
||||
run: |
|
||||
if [ "${{ github.event_name }}" = "workflow_dispatch" ] && [ -n "${{ github.event.inputs.version }}" ]; then
|
||||
VERSION="${{ github.event.inputs.version }}"
|
||||
elif [[ "${{ github.ref }}" == refs/tags/v* ]]; then
|
||||
elif [[ "${{ github.ref }}" == refs/tags/* ]]; then
|
||||
VERSION="${GITHUB_REF#refs/tags/}"
|
||||
elif [ -n "$CHANGED_PLUGIN_SLUG" ] && [ -n "$CHANGED_PLUGIN_VERSION" ]; then
|
||||
VERSION="${CHANGED_PLUGIN_SLUG}-v${CHANGED_PLUGIN_VERSION}"
|
||||
else
|
||||
# Auto-generate version based on date and daily release count
|
||||
TODAY=$(date +'%Y.%m.%d')
|
||||
TODAY_PREFIX="v${TODAY}-"
|
||||
|
||||
# Count existing releases with today's date prefix
|
||||
# grep -c returns 1 if count is 0, so we use || true to avoid script failure
|
||||
EXISTING_COUNT=$(gh release list --limit 100 2>/dev/null | grep -c "^${TODAY_PREFIX}" || true)
|
||||
|
||||
# Clean up output (handle potential newlines or fallback issues)
|
||||
EXISTING_COUNT=$(echo "$EXISTING_COUNT" | tr -cd '0-9')
|
||||
if [ -z "$EXISTING_COUNT" ]; then EXISTING_COUNT=0; fi
|
||||
|
||||
NEXT_NUM=$((EXISTING_COUNT + 1))
|
||||
|
||||
VERSION="${TODAY_PREFIX}${NEXT_NUM}"
|
||||
|
||||
# Final fallback to ensure VERSION is never empty
|
||||
if [ -z "$VERSION" ]; then
|
||||
VERSION="v$(date +'%Y.%m.%d-%H%M%S')"
|
||||
fi
|
||||
echo "Error: failed to determine plugin-scoped release tag." >&2
|
||||
exit 1
|
||||
fi
|
||||
echo "version=$VERSION" >> $GITHUB_OUTPUT
|
||||
echo "Release version: $VERSION"
|
||||
echo "Release tag: $VERSION"
|
||||
|
||||
- name: Build release metadata
|
||||
id: meta
|
||||
env:
|
||||
VERSION: ${{ steps.version.outputs.version }}
|
||||
INPUT_TITLE: ${{ github.event.inputs.release_title }}
|
||||
CHANGED_PLUGIN_TITLES: ${{ needs.check-changes.outputs.changed_plugin_titles }}
|
||||
CHANGED_PLUGIN_COUNT: ${{ needs.check-changes.outputs.changed_plugin_count }}
|
||||
CHANGED_PLUGIN_TITLE: ${{ needs.check-changes.outputs.changed_plugin_title }}
|
||||
CHANGED_PLUGIN_VERSION: ${{ needs.check-changes.outputs.changed_plugin_version }}
|
||||
run: |
|
||||
if [ -n "$INPUT_TITLE" ]; then
|
||||
RELEASE_NAME="$INPUT_TITLE"
|
||||
elif [ "$CHANGED_PLUGIN_COUNT" = "1" ] && [ -n "$CHANGED_PLUGIN_TITLES" ]; then
|
||||
RELEASE_NAME="$CHANGED_PLUGIN_TITLES $VERSION"
|
||||
elif [ -n "$CHANGED_PLUGIN_TITLES" ] && [ "$CHANGED_PLUGIN_COUNT" = "2" ]; then
|
||||
RELEASE_NAME="$VERSION - $CHANGED_PLUGIN_TITLES"
|
||||
elif [ -n "$CHANGED_PLUGIN_TITLES" ] && [ "${CHANGED_PLUGIN_COUNT:-0}" -gt 2 ]; then
|
||||
FIRST_PLUGIN=$(echo "$CHANGED_PLUGIN_TITLES" | cut -d',' -f1 | xargs)
|
||||
RELEASE_NAME="$VERSION - $FIRST_PLUGIN and $CHANGED_PLUGIN_COUNT plugin updates"
|
||||
elif [ -n "$CHANGED_PLUGIN_TITLE" ] && [ -n "$CHANGED_PLUGIN_VERSION" ]; then
|
||||
RELEASE_NAME="$CHANGED_PLUGIN_TITLE v$CHANGED_PLUGIN_VERSION"
|
||||
else
|
||||
RELEASE_NAME="$VERSION"
|
||||
fi
|
||||
@@ -391,12 +433,22 @@ jobs:
|
||||
VERSION: ${{ steps.version.outputs.version }}
|
||||
TITLE: ${{ github.event.inputs.release_title }}
|
||||
NOTES: ${{ github.event.inputs.release_notes }}
|
||||
CHANGED_PLUGIN_TITLE: ${{ needs.check-changes.outputs.changed_plugin_title }}
|
||||
CHANGED_PLUGIN_VERSION: ${{ needs.check-changes.outputs.changed_plugin_version }}
|
||||
DETECTED_CHANGES: ${{ needs.check-changes.outputs.release_notes }}
|
||||
COMMITS: ${{ steps.commits.outputs.commits }}
|
||||
DOC_FILES: ${{ needs.check-changes.outputs.changed_doc_files }}
|
||||
run: |
|
||||
> release_notes.md
|
||||
|
||||
if [ -n "$CHANGED_PLUGIN_TITLE" ] && [ -n "$CHANGED_PLUGIN_VERSION" ]; then
|
||||
echo "# $CHANGED_PLUGIN_TITLE v$CHANGED_PLUGIN_VERSION" >> release_notes.md
|
||||
echo "" >> release_notes.md
|
||||
elif [ -n "$TITLE" ]; then
|
||||
echo "# $TITLE" >> release_notes.md
|
||||
echo "" >> release_notes.md
|
||||
fi
|
||||
|
||||
# 1. Release notes from v*.md files (highest priority, shown first)
|
||||
if [ -n "$DOC_FILES" ]; then
|
||||
RELEASE_NOTE_FILES=$(echo "$DOC_FILES" | grep -E '^plugins/.*/v[^/]*\.md$' | grep -v '_CN\.md$' || true)
|
||||
@@ -404,7 +456,7 @@ jobs:
|
||||
while IFS= read -r file; do
|
||||
[ -z "$file" ] && continue
|
||||
if [ -f "$file" ]; then
|
||||
python3 -c "import json, pathlib, re; file_path = pathlib.Path(r'''$file'''); plugin_versions_path = pathlib.Path('plugin_versions.json'); text = file_path.read_text(encoding='utf-8'); plugin_dir = file_path.parent.as_posix(); plugins = json.loads(plugin_versions_path.read_text(encoding='utf-8')) if plugin_versions_path.exists() else []; plugin_title = next((plugin.get('title', '').strip() for plugin in plugins if plugin.get('file_path', '').startswith(plugin_dir + '/')), ''); text = re.sub(r'^#\\s+(v[0-9][^\\n]*Release Notes)\\s*$', '# ' + plugin_title + ' ' + r'\\1', text, count=1, flags=re.MULTILINE) if plugin_title else text; print(text.rstrip())" >> release_notes.md
|
||||
python3 -c "import pathlib, re; file_path = pathlib.Path(r'''$file'''); text = file_path.read_text(encoding='utf-8'); text = re.sub(r'^#\\s+.+?(?:\\r?\\n)+', '', text, count=1, flags=re.MULTILINE); print(text.lstrip().rstrip())" >> release_notes.md
|
||||
echo "" >> release_notes.md
|
||||
fi
|
||||
done <<< "$RELEASE_NOTE_FILES"
|
||||
@@ -412,7 +464,7 @@ jobs:
|
||||
fi
|
||||
|
||||
# 2. Plugin version changes detected by script
|
||||
if [ -n "$TITLE" ]; then
|
||||
if [ -z "$CHANGED_PLUGIN_TITLE" ] && [ -z "$CHANGED_PLUGIN_VERSION" ] && [ -n "$TITLE" ]; then
|
||||
echo "## $TITLE" >> release_notes.md
|
||||
echo "" >> release_notes.md
|
||||
fi
|
||||
@@ -469,7 +521,7 @@ jobs:
|
||||
cat release_notes.md
|
||||
|
||||
- name: Create Git Tag
|
||||
if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
|
||||
if: ${{ !startsWith(github.ref, 'refs/tags/') }}
|
||||
run: |
|
||||
VERSION="${{ steps.version.outputs.version }}"
|
||||
|
||||
|
||||
104
ISSUE_57_ANALYSIS_REPORT.md
Normal file
104
ISSUE_57_ANALYSIS_REPORT.md
Normal file
@@ -0,0 +1,104 @@
|
||||
# Markdown Normalizer 插件可靠性修复分析报告 (Issue #57)
|
||||
|
||||
## 1. 问题背景
|
||||
根据 Issue #57 报告，`Markdown Normalizer` 在 v1.2.7 版本中存在数项严重影响可靠性的 Bug，包括错误回滚失效、对内联技术内容的过度转义、配置项不生效以及调试日志潜在的隐私风险。
|
||||
|
||||
## 2. 核心处理流程图 (v1.2.8)
|
||||
以下流程展示了插件如何在确保“不损坏原始内容”的前提下进行智能修复：
|
||||
|
||||
```mermaid
|
||||
graph TD
|
||||
Start([开始处理内容]) --> Cache[1. 内存中存入原始快照 Snapshot]
|
||||
Cache --> Logic{进入修复流程}
|
||||
|
||||
subgraph "分层保护逻辑 (Context-Aware)"
|
||||
Logic --> Block[识别并锁定 ``` 代码块]
|
||||
Block --> Inline[识别并锁定 ` 行内代码]
|
||||
Inline --> Math[识别并锁定 $ LaTeX 公式]
|
||||
Math --> Clean[仅对非锁定区域执行转义清理]
|
||||
end
|
||||
|
||||
Clean --> Others[执行其他规则: Thought/Details/Table等]
|
||||
Others --> Check{运行是否报错?}
|
||||
|
||||
Check -- 否 (成功) --> Success[返回修复后的内容]
|
||||
Check -- 是 (失败) --> Rollback[触发回滚: 丢弃所有修改]
|
||||
|
||||
Rollback --> Original[返回步骤1存储的原始快照]
|
||||
|
||||
Success --> End([输出结果])
|
||||
Original --> End
|
||||
```
|
||||
|
||||
## 3. 修复项详细说明
|
||||
|
||||
### 2.1 错误回滚机制修复 (Reliability: Error Fallback)
|
||||
- **问题**：在 `normalize` 流程中，如果某个清理器抛出异常，返回的是已被部分修改的 `content`，导致输出内容损坏。
|
||||
- **技术实现**：
|
||||
```python
|
||||
def normalize(self, content: str) -> str:
|
||||
original_content = content # 1. 流程开始前缓存原始快照
|
||||
try:
|
||||
# ... 执行一系列清理步骤 ...
|
||||
return content
|
||||
except Exception as e:
|
||||
# 2. 任何步骤失败，立即记录日志并回滚
|
||||
logger.error(f"Content normalization failed: {e}", exc_info=True)
|
||||
return original_content # 确保返回的是原始快照
|
||||
```
|
||||
- **验证结果**：通过模拟 `RuntimeError` 验证，插件现在能 100% 回滚至原始状态。
|
||||
|
||||
### 2.2 上下文感知的转义保护 (Context-Aware Escaping)
|
||||
- **问题**：全局替换导致正文中包含在 `` ` `` 内的代码片段（如正则、Windows 路径）被破坏。
|
||||
- **技术实现**：
|
||||
重构后的 `_fix_escape_characters` 采用了 **“分词保护策略”**，通过多层嵌套分割来确保仅在非代码上下文中进行清理：
|
||||
```python
|
||||
def _fix_escape_characters(self, content: str) -> str:
|
||||
# 层级 1: 以 ``` 分隔代码块
|
||||
parts = content.split("```")
|
||||
for i in range(len(parts)):
|
||||
is_code_block = (i % 2 != 0)
|
||||
if is_code_block and not self.config.enable_escape_fix_in_code_blocks:
|
||||
continue # 默认跳过代码块
|
||||
|
||||
if not is_code_block:
|
||||
# 层级 2: 在非代码块正文中，以 ` 分隔内联代码
|
||||
inline_parts = parts[i].split("`")
|
||||
for k in range(0, len(inline_parts), 2): # 仅处理非内联代码部分
|
||||
# 层级 3: 在非内联代码中，以 $ 分隔 LaTeX 公式
|
||||
sub_parts = inline_parts[k].split("$")
|
||||
for j in range(0, len(sub_parts), 2):
|
||||
# 最终：仅在确认为“纯文本”的部分执行 clean_text
|
||||
sub_parts[j] = clean_text(sub_parts[j])
|
||||
inline_parts[k] = "$".join(sub_parts)
|
||||
parts[i] = "`".join(inline_parts)
|
||||
else:
|
||||
parts[i] = clean_text(parts[i])
|
||||
return "```".join(parts)
|
||||
```
|
||||
- **验证结果**：测试用例 `Regex: [\n\r]` 和 `C:\Windows` 在正文中保持原样，而普通文本中的 `\\n` 被正确转换。
|
||||
|
||||
### 2.3 配置项激活 (Configuration Enforcement)
|
||||
- **问题**：`enable_escape_fix_in_code_blocks` 开关在代码中被定义但未被逻辑引用。
|
||||
- **修复方案**：在 `_fix_escape_characters` 处理流程中加入对该开关的判断。
|
||||
- **验证结果**：当开关关闭（默认）时，代码块内容保持不变；开启时，代码块内执行转义修复。
|
||||
|
||||
### 2.4 默认日志策略调整 (Privacy & Performance)
|
||||
- **问题**：`show_debug_log` 默认为 `True`，且会将原始内容打印到浏览器控制台。
|
||||
- **修复方案**：将默认值改为 `False`。
|
||||
- **验证结果**：新安装或默认配置下不再主动输出全量日志，仅在用户显式开启时用于调试。
|
||||
|
||||
## 3. 综合测试覆盖
|
||||
已建立 `comprehensive_test_markdown_normalizer.py` 测试脚本，覆盖以下场景：
|
||||
1. **异常抛出回滚**：确保插件“不破坏”原始内容。
|
||||
2. **内联代码保护**：验证正则和路径字符串的完整性。
|
||||
3. **代码块开关控制**：验证配置项的有效性。
|
||||
4. **LaTeX 命令回归测试**：确保 `\times`, `\theta` 等命令不被误触。
|
||||
5. **复杂嵌套结构**：验证包含 Thought 标签、列表、内联代码及代码块的混合文本处理。
|
||||
|
||||
## 4. 结论
|
||||
`Markdown Normalizer v1.2.8` 已解决 Issue #57 提出的所有核心可靠性问题。插件现在具备“不损坏内容”的防御性编程能力，并能更智能地感知 Markdown 上下文。
|
||||
|
||||
---
|
||||
**报告日期**：2026-03-08
|
||||
**修复版本**：v1.2.8
|
||||
12
ISSUE_57_REPLY.md
Normal file
12
ISSUE_57_REPLY.md
Normal file
@@ -0,0 +1,12 @@
|
||||
# Reply to Issue #57
|
||||
|
||||
I have addressed these issues in **v1.2.8** with a focus on reliability and a "Safe-by-Default" approach:
|
||||
|
||||
1. **Robust Error Rollback (Items 1, 4, 5)**: I implemented a full `try...except` wrapper. If any error occurs during normalization, the plugin now returns the **100% original text**. This ensures that the output is never partially modified or corrupted.
|
||||
2. **Conservative Escaping (Item 2)**: To avoid breaking technical content like regex or paths, the escape fixer now strictly skips all code blocks, inline code, and LaTeX formulas by default. I have shifted toward an "opt-in" model where aggressive cleaning is disabled unless specifically requested.
|
||||
3. **Fixed Configuration (Item 3)**: The `enable_escape_fix_in_code_blocks` Valve was intended to handle escaping within code blocks (e.g., for fixing flat SQL output), but there was a bug preventing it from being applied. I have fixed this, and the setting is now fully functional.
|
||||
4. **Privacy & Reliability**: I have changed the default for `show_debug_log` to `False`. While it was previously enabled by default to help gather feedback and squash bugs during the initial development phase, the plugin has now undergone multiple iterations and reliability enhancements (including the new tiered protection and rollback mechanisms), making it stable enough for a "silent" and private default operation.
|
||||
|
||||
**Recommendation**: If you encounter SQL or data blocks that appear on a single line, you can now manually enable `enable_escape_fix_in_code_blocks` in the Valves to fix them safely.
|
||||
|
||||
Please update to the latest version via [OpenWebUI Community](https://openwebui.com/functions/baaa8732-9348-40b7-8359-7e009660e23c). Thank you for your valuable feedback!
|
||||
@@ -27,7 +27,7 @@ A collection of enhancements, plugins, and prompts for [open-webui](https://gith
|
||||
| 🥈 | [Smart Infographic](https://openwebui.com/posts/smart_infographic_ad6f0c7f) |  |  |  |  |
|
||||
| 🥉 | [Markdown Normalizer](https://openwebui.com/posts/markdown_normalizer_baaa8732) |  |  |  |  |
|
||||
| 4️⃣ | [Export to Word Enhanced](https://openwebui.com/posts/export_to_word_enhanced_formatting_fca6a315) |  |  |  |  |
|
||||
| 5️⃣ | [Async Context Compression](https://openwebui.com/posts/async_context_compression_b1655bc8) |  |  |  |  |
|
||||
| 5️⃣ | [Async Context Compression](https://openwebui.com/posts/async_context_compression_b1655bc8) |  |  |  |  |
|
||||
| 6️⃣ | [AI Task Instruction Generator](https://openwebui.com/posts/ai_task_instruction_generator_9bab8b37) |  |  |  |  |
|
||||
|
||||
### 📈 Total Downloads Trend
|
||||
|
||||
@@ -24,7 +24,7 @@ OpenWebUI 增强功能集合。包含个人开发与收集的插件、提示词
|
||||
| 🥈 | [Smart Infographic](https://openwebui.com/posts/smart_infographic_ad6f0c7f) |  |  |  |  |
|
||||
| 🥉 | [Markdown Normalizer](https://openwebui.com/posts/markdown_normalizer_baaa8732) |  |  |  |  |
|
||||
| 4️⃣ | [Export to Word Enhanced](https://openwebui.com/posts/export_to_word_enhanced_formatting_fca6a315) |  |  |  |  |
|
||||
| 5️⃣ | [Async Context Compression](https://openwebui.com/posts/async_context_compression_b1655bc8) |  |  |  |  |
|
||||
| 5️⃣ | [Async Context Compression](https://openwebui.com/posts/async_context_compression_b1655bc8) |  |  |  |  |
|
||||
| 6️⃣ | [AI Task Instruction Generator](https://openwebui.com/posts/ai_task_instruction_generator_9bab8b37) |  |  |  |  |
|
||||
|
||||
### 📈 总下载量累计趋势
|
||||
|
||||
99
TEST_CASES_V1.2.8.md
Normal file
99
TEST_CASES_V1.2.8.md
Normal file
@@ -0,0 +1,99 @@
|
||||
# Markdown Normalizer v1.2.8 测试用例集
|
||||
|
||||
您可以将以下内容逐个复制到 OpenWebUI 的聊天框中，以验证插件的各项修复功能。
|
||||
|
||||
---
|
||||
|
||||
## 用例 1：验证 SQL 代码块换行修复 (需要手动开启配置)
|
||||
|
||||
**测试目的**：验证 `enable_escape_fix_in_code_blocks` 开关是否生效。
|
||||
**前提条件**：请先在插件 Valves 设置中将 `enable_escape_fix_in_code_blocks` 设置为 **开启 (True)**。
|
||||
|
||||
**复制以下内容：**
|
||||
```text
|
||||
请帮我美化这段 SQL 的排版，使其恢复正常换行：
|
||||
|
||||
```sql
|
||||
SELECT * \n FROM users \n WHERE status = 'active' \n AND created_at > '2024-01-01' \n ORDER BY id DESC;
|
||||
```
|
||||
```
|
||||
|
||||
**预期效果**：SQL 代码块内的 `\n` 消失，变为整齐的多行 SQL 语句。
|
||||
|
||||
---
|
||||
|
||||
## 用例 2：验证上下文感知保护 (防止误伤技术内容)
|
||||
|
||||
**测试目的**：验证插件是否能准确识别“纯文本”和“代码区域”，只修复该修复的地方。
|
||||
**配置要求**：默认配置即可。
|
||||
|
||||
**复制以下内容：**
|
||||
```text
|
||||
这是一个综合测试用例。
|
||||
|
||||
1. 普通文本修复测试：
|
||||
这是第一行\\n这是第二行（你应该看到这里发生了换行）。
|
||||
|
||||
2. 行内代码保护测试（不应被修改）：
|
||||
- 正则表达式：`[\n\r\t]`
|
||||
- Windows 路径：`C:\Windows\System32\drivers\etc\hosts`
|
||||
- 转义测试：`\\n` 应该保持字面量。
|
||||
|
||||
3. LaTeX 命令保护测试：
|
||||
这里的数学公式 $\times \theta \nu \sum$ 应该渲染正常，反斜杠不应被修掉。
|
||||
|
||||
4. 现代 LaTeX 定界符转换：
|
||||
\[ E = mc^2 \]
|
||||
（上面这行应该被自动转换为 $$ 包围的块级公式）
|
||||
```
|
||||
|
||||
**预期效果**：
|
||||
- 第一部分的 `\\n` 成功换行。
|
||||
- 第二部分反引号 `` ` `` 里的内容原封不动。
|
||||
- 第三部分的希腊字母公式渲染正常。
|
||||
- 第四部分的 `\[` 变成了 `$$` 且能正常显示公式。
|
||||
|
||||
---
|
||||
|
||||
## 用例 3：验证思维链与详情标签规范化
|
||||
|
||||
**测试目的**：验证对 `<thought>` 和 `<details>` 标签的排版优化。
|
||||
|
||||
**复制以下内容：**
|
||||
```text
|
||||
<thinking>
|
||||
这是一个正在思考的思维链。
|
||||
</thinking>
|
||||
<details>
|
||||
<summary>点击查看详情</summary>
|
||||
这里的排版通常容易出错。
|
||||
</details>
|
||||
紧接着详情标签的文字（应该和上面有空行隔开）。
|
||||
```
|
||||
|
||||
**预期效果**：
|
||||
- `<thinking>` 标签被统一为 `<thought>`。
|
||||
- `</details>` 标签下方自动注入了空行，防止与正文粘连导致渲染失效。
|
||||
|
||||
---
|
||||
|
||||
## 用例 4：极端压力与回滚测试 (稳定性验证)
|
||||
|
||||
**测试目的**：模拟复杂嵌套环境，验证 100% 回滚机制。
|
||||
|
||||
**复制以下内容：**
|
||||
```text
|
||||
尝试混合所有复杂元素：
|
||||
- 列表项 1
|
||||
- 列表项 2 with `inline \\n code`
|
||||
- $ \text{Math } \alpha $
|
||||
```sql
|
||||
-- SQL with nested issue
|
||||
SELECT 'literal \n string' FROM `table`;
|
||||
```
|
||||
<thought>End of test</thought>
|
||||
```
|
||||
|
||||
**预期效果**：
|
||||
- 无论内部处理逻辑多么复杂，插件都应保证输出稳定的结果。
|
||||
- 如果模拟任何内部崩溃（技术人员可用），消息会回滚至此原始文本，不会导致页面白屏。
|
||||
124
docs/development/fix-role-tool-error.md
Normal file
124
docs/development/fix-role-tool-error.md
Normal file
@@ -0,0 +1,124 @@
|
||||
# Fix: OpenAI API Error "messages with role 'tool' must be a response to a preceding message with 'tool_calls'"
|
||||
|
||||
## Problem Description
|
||||
In the `async-context-compression` filter, chat history can be trimmed or summarized when the conversation grows. If the retained tail starts in the middle of a native tool-calling sequence, the next request may begin with a `tool` message whose triggering `assistant` message is no longer present.
|
||||
|
||||
That produces the OpenAI API error:
|
||||
`"messages with role 'tool' must be a response to a preceding message with 'tool_calls'"`
|
||||
|
||||
## Root Cause
|
||||
History compression boundaries were not fully aware of atomic tool-call chains. A valid chain may include:
|
||||
|
||||
1. An `assistant` message with `tool_calls`
|
||||
2. One or more `tool` messages
|
||||
3. An optional assistant follow-up that consumes the tool results
|
||||
|
||||
If truncation happens inside that chain, the request sent to the model becomes invalid.
|
||||
|
||||
## Solution: Atomic Boundary Alignment
|
||||
The fix groups tool-call sequences into atomic units and aligns trim boundaries to those groups.
|
||||
|
||||
### 1. `_get_atomic_groups()`
|
||||
This helper groups message indices into units that must be kept or dropped together. It explicitly recognizes native tool-calling patterns such as:
|
||||
|
||||
- `assistant(tool_calls)`
|
||||
- `tool`
|
||||
- assistant follow-up response
|
||||
|
||||
Conceptually, it treats the whole sequence as one atomic block instead of independent messages.
|
||||
|
||||
```python
|
||||
def _get_atomic_groups(self, messages: List[Dict]) -> List[List[int]]:
|
||||
groups = []
|
||||
current_group = []
|
||||
|
||||
for i, msg in enumerate(messages):
|
||||
role = msg.get("role")
|
||||
has_tool_calls = bool(msg.get("tool_calls"))
|
||||
|
||||
if role == "assistant" and has_tool_calls:
|
||||
if current_group:
|
||||
groups.append(current_group)
|
||||
current_group = [i]
|
||||
elif role == "tool":
|
||||
if not current_group:
|
||||
groups.append([i])
|
||||
else:
|
||||
current_group.append(i)
|
||||
elif (
|
||||
role == "assistant"
|
||||
and current_group
|
||||
and messages[current_group[-1]].get("role") == "tool"
|
||||
):
|
||||
current_group.append(i)
|
||||
groups.append(current_group)
|
||||
current_group = []
|
||||
else:
|
||||
if current_group:
|
||||
groups.append(current_group)
|
||||
current_group = []
|
||||
groups.append([i])
|
||||
|
||||
if current_group:
|
||||
groups.append(current_group)
|
||||
|
||||
return groups
|
||||
```
|
||||
|
||||
### 2. `_align_tail_start_to_atomic_boundary()`
|
||||
This helper checks whether a proposed trim point falls inside one of those atomic groups. If it does, the start index is moved backward to the beginning of that group.
|
||||
|
||||
```python
|
||||
def _align_tail_start_to_atomic_boundary(
|
||||
self, messages: List[Dict], raw_start_index: int, protected_prefix: int
|
||||
) -> int:
|
||||
aligned_start = max(raw_start_index, protected_prefix)
|
||||
|
||||
if aligned_start <= protected_prefix or aligned_start >= len(messages):
|
||||
return aligned_start
|
||||
|
||||
trimmable = messages[protected_prefix:]
|
||||
local_start = aligned_start - protected_prefix
|
||||
|
||||
for group in self._get_atomic_groups(trimmable):
|
||||
group_start = group[0]
|
||||
group_end = group[-1] + 1
|
||||
|
||||
if local_start == group_start:
|
||||
return aligned_start
|
||||
|
||||
if group_start < local_start < group_end:
|
||||
return protected_prefix + group_start
|
||||
|
||||
return aligned_start
|
||||
```
|
||||
|
||||
### 3. Applied to Tail Retention and Summary Progress
|
||||
The aligned boundary is now used when rebuilding the retained tail and when calculating how much history can be summarized safely.
|
||||
|
||||
Example from the current implementation:
|
||||
|
||||
```python
|
||||
raw_start_index = max(compressed_count, effective_keep_first)
|
||||
start_index = self._align_tail_start_to_atomic_boundary(
|
||||
messages, raw_start_index, effective_keep_first
|
||||
)
|
||||
tail_messages = messages[start_index:]
|
||||
```
|
||||
|
||||
And during summary progress calculation:
|
||||
|
||||
```python
|
||||
raw_target_compressed_count = max(0, len(messages) - self.valves.keep_last)
|
||||
target_compressed_count = self._align_tail_start_to_atomic_boundary(
|
||||
messages, raw_target_compressed_count, effective_keep_first
|
||||
)
|
||||
```
|
||||
|
||||
## Verification Results
|
||||
- **First compression boundary**: When history first crosses the compression threshold, the retained tail no longer starts inside a tool-call block.
|
||||
- **Complex sessions**: Real-world testing with 30+ messages, multiple tool calls, and failed calls remained stable during background summarization.
|
||||
- **Regression behavior**: The filter now prefers a valid boundary even if that means retaining slightly more context than a naive raw slice would allow.
|
||||
|
||||
## Conclusion
|
||||
The fix prevents orphaned `tool` messages by making history trimming and summary progress aware of atomic tool-call groups. This eliminates the 400 error during long conversations and background compression.
|
||||
126
docs/development/fix-role-tool-error.zh.md
Normal file
126
docs/development/fix-role-tool-error.zh.md
Normal file
@@ -0,0 +1,126 @@
|
||||
# 修复：OpenAI API 错误 "messages with role 'tool' must be a response to a preceding message with 'tool_calls'"
|
||||
|
||||
## 问题描述
|
||||
在 `async-context-compression` 过滤器中，当对话历史变长时，系统会对消息进行裁剪或摘要。如果保留下来的尾部历史恰好从一个原生工具调用序列的中间开始，那么下一次请求就可能以一条 `tool` 消息开头，而触发它的 `assistant` 消息已经被裁掉。
|
||||
|
||||
这就会触发 OpenAI API 的错误：
|
||||
`"messages with role 'tool' must be a response to a preceding message with 'tool_calls'"`
|
||||
|
||||
## 根本原因
|
||||
|
||||
真正的缺陷在于历史压缩边界没有完整识别工具调用链的“原子性”。一个合法的工具调用链通常包括：
|
||||
|
||||
1. 一条带有 `tool_calls` 的 `assistant` 消息
|
||||
2. 一条或多条 `tool` 消息
|
||||
3. 一条可选的 assistant 跟进回复，用于消费工具结果
|
||||
|
||||
如果裁剪点落在这段链条内部，发给模型的消息序列就会变成非法格式。
|
||||
|
||||
## 解决方案：对齐原子边界
|
||||
修复通过把工具调用序列分组为原子单元，并使裁剪边界对齐到这些单元。
|
||||
|
||||
### 1. `_get_atomic_groups()`
|
||||
这个辅助函数会把消息索引分组为“必须一起保留或一起丢弃”的原子单元。它显式识别以下原生工具调用模式：
|
||||
|
||||
- `assistant(tool_calls)`
|
||||
- `tool`
|
||||
- assistant 跟进回复
|
||||
|
||||
也就是说，它不再把这些消息看成彼此独立的单条消息，而是把整段序列视为一个原子块。
|
||||
|
||||
```python
|
||||
def _get_atomic_groups(self, messages: List[Dict]) -> List[List[int]]:
|
||||
groups = []
|
||||
current_group = []
|
||||
|
||||
for i, msg in enumerate(messages):
|
||||
role = msg.get("role")
|
||||
has_tool_calls = bool(msg.get("tool_calls"))
|
||||
|
||||
if role == "assistant" and has_tool_calls:
|
||||
if current_group:
|
||||
groups.append(current_group)
|
||||
current_group = [i]
|
||||
elif role == "tool":
|
||||
if not current_group:
|
||||
groups.append([i])
|
||||
else:
|
||||
current_group.append(i)
|
||||
elif (
|
||||
role == "assistant"
|
||||
and current_group
|
||||
and messages[current_group[-1]].get("role") == "tool"
|
||||
):
|
||||
current_group.append(i)
|
||||
groups.append(current_group)
|
||||
current_group = []
|
||||
else:
|
||||
if current_group:
|
||||
groups.append(current_group)
|
||||
current_group = []
|
||||
groups.append([i])
|
||||
|
||||
if current_group:
|
||||
groups.append(current_group)
|
||||
|
||||
return groups
|
||||
```
|
||||
|
||||
### 2. `_align_tail_start_to_atomic_boundary()`
|
||||
这个辅助函数会检查一个拟定的裁剪起点是否落在某个原子块内部。如果是，它会把起点向前回退到该原子块的开头位置。
|
||||
|
||||
```python
|
||||
def _align_tail_start_to_atomic_boundary(
|
||||
self, messages: List[Dict], raw_start_index: int, protected_prefix: int
|
||||
) -> int:
|
||||
aligned_start = max(raw_start_index, protected_prefix)
|
||||
|
||||
if aligned_start <= protected_prefix or aligned_start >= len(messages):
|
||||
return aligned_start
|
||||
|
||||
trimmable = messages[protected_prefix:]
|
||||
local_start = aligned_start - protected_prefix
|
||||
|
||||
for group in self._get_atomic_groups(trimmable):
|
||||
group_start = group[0]
|
||||
group_end = group[-1] + 1
|
||||
|
||||
if local_start == group_start:
|
||||
return aligned_start
|
||||
|
||||
if group_start < local_start < group_end:
|
||||
return protected_prefix + group_start
|
||||
|
||||
return aligned_start
|
||||
```
|
||||
|
||||
### 3. 应用于尾部保留和摘要进度计算
|
||||
这个对齐后的边界现在被用于重建保留尾部消息，以及计算可以安全摘要的历史范围。
|
||||
|
||||
当前实现中的示例：
|
||||
|
||||
```python
|
||||
raw_start_index = max(compressed_count, effective_keep_first)
|
||||
start_index = self._align_tail_start_to_atomic_boundary(
|
||||
messages, raw_start_index, effective_keep_first
|
||||
)
|
||||
tail_messages = messages[start_index:]
|
||||
```
|
||||
|
||||
在摘要进度计算中同样如此：
|
||||
|
||||
```python
|
||||
raw_target_compressed_count = max(0, len(messages) - self.valves.keep_last)
|
||||
target_compressed_count = self._align_tail_start_to_atomic_boundary(
|
||||
messages, raw_target_compressed_count, effective_keep_first
|
||||
)
|
||||
```
|
||||
|
||||
## 验证结果
|
||||
|
||||
- **首次压缩边界**：当历史第一次越过压缩阈值时，保留尾部不再从工具调用块中间开始。
|
||||
- **复杂会话验证**：在 30+ 条消息、多个工具调用和失败调用的真实场景下，后台摘要过程保持稳定。
|
||||
- **回归行为更安全**：过滤器现在会优先选择合法边界，即使这意味着比原始的朴素切片稍微多保留一点上下文。
|
||||
|
||||
## 结论
|
||||
通过让历史裁剪与摘要进度计算具备"工具调用原子块感知"能力，避免孤立的 `tool` 消息出现，消除长对话与后台压缩期间的 400 错误。
|
||||
@@ -1,16 +1,15 @@
|
||||
# Async Context Compression Filter
|
||||
|
||||
**Author:** [Fu-Jie](https://github.com/Fu-Jie/openwebui-extensions) | **Version:** 1.3.0 | **Project:** [OpenWebUI Extensions](https://github.com/Fu-Jie/openwebui-extensions) | **License:** MIT
|
||||
**Author:** [Fu-Jie](https://github.com/Fu-Jie/openwebui-extensions) | **Version:** 1.4.0 | **Project:** [OpenWebUI Extensions](https://github.com/Fu-Jie/openwebui-extensions) | **License:** MIT
|
||||
|
||||
This filter reduces token consumption in long conversations through intelligent summarization and message compression while keeping conversations coherent.
|
||||
|
||||
## What's new in 1.3.0
|
||||
## What's new in 1.4.0
|
||||
|
||||
- **Internationalization (i18n)**: Complete localization of user-facing messages across 9 languages (English, Chinese, Japanese, Korean, French, German, Spanish, Italian).
|
||||
- **Smart Status Display**: Added `token_usage_status_threshold` valve (default 80%) to intelligently control when token usage status is shown.
|
||||
- **Improved Performance**: Frontend language detection and logging are optimized to be completely non-blocking, maintaining lightning-fast TTFB.
|
||||
- **Copilot SDK Integration**: Automatically detects and skips compression for copilot_sdk based models to prevent conflicts.
|
||||
- **Configuration**: `debug_mode` is now set to `false` by default for a quieter production experience.
|
||||
- **Atomic Message Grouping**: Introduced structure-aware grouping for `assistant-tool-tool-assistant` chains to prevent "No tool call found" errors.
|
||||
- **Tail Boundary Alignment**: Implemented automatic correction for truncation points to ensure they don't fall inside a tool-calling sequence.
|
||||
- **Chat Session Locking**: Added a session-based lock to prevent multiple concurrent summary tasks for the same chat ID.
|
||||
- **Enhanced Traceability**: Improved summary formatting to include message IDs, names, and metadata for better context tracking.
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -1,18 +1,17 @@
|
||||
# 异步上下文压缩过滤器
|
||||
|
||||
**作者:** [Fu-Jie](https://github.com/Fu-Jie/openwebui-extensions) | **版本:** 1.3.0 | **项目:** [OpenWebUI Extensions](https://github.com/Fu-Jie/openwebui-extensions) | **许可证:** MIT
|
||||
**作者:** [Fu-Jie](https://github.com/Fu-Jie/openwebui-extensions) | **版本:** 1.4.0 | **项目:** [OpenWebUI Extensions](https://github.com/Fu-Jie/openwebui-extensions) | **许可证:** MIT
|
||||
|
||||
> **重要提示**：为了确保所有过滤器的可维护性和易用性，每个过滤器都应附带清晰、完整的文档，以确保其功能、配置和使用方法得到充分说明。
|
||||
|
||||
本过滤器通过智能摘要和消息压缩技术，在保持对话连贯性的同时，显著降低长对话的 Token 消耗。
|
||||
|
||||
## 1.3.0 版本更新
|
||||
## 1.4.0 版本更新
|
||||
|
||||
- **国际化 (i18n) 支持**: 完成了所有用户可见消息的本地化，现已原生支持 9 种语言（含中、英、日、韩及欧洲主要语言）。
|
||||
- **智能状态显示**: 新增 `token_usage_status_threshold` 阀门（默认 80%），可以智能控制何时显示 Token 用量状态，减少不必要的打扰。
|
||||
- **性能大幅优化**: 对前端语言检测和日志处理流程进行了非阻塞重构，完全不影响首字节响应时间（TTFB），保持毫秒级极速推流。
|
||||
- **Copilot SDK 兼容**: 自动检测并跳过基于 `copilot_sdk` 模型的上下文压缩，避免冲突。
|
||||
- **配置项调整**: 为了提供更安静的生产环境体验，`debug_mode` 现已默认设置为 `false`。
|
||||
- **原子消息组 (Atomic Grouping)**: 引入结构感知的消息分组逻辑，确保工具调用链被整体保留或移除，彻底解决 "No tool call found" 错误。
|
||||
- **尾部边界自动对齐**: 实现了截断点的自动修正逻辑，确保历史上下文截断不会落在工具调用序列中间。
|
||||
- **会话级异步锁**: 增加了基于 `chat_id` 的后台任务锁，防止同一会话并发触发多个总结任务。
|
||||
- **元数据溯源增强**: 优化了总结输入格式，在总结中保留了消息 ID、参与者名称及关键元数据，提升上下文可追踪性。
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ Filters act as middleware in the message pipeline:
|
||||
|
||||
Reduces token consumption in long conversations through intelligent summarization while maintaining coherence.
|
||||
|
||||
**Version:** 1.3.0
|
||||
**Version:** 1.4.0
|
||||
|
||||
[:octicons-arrow-right-24: Documentation](async-context-compression.md)
|
||||
|
||||
@@ -52,7 +52,7 @@ Filters act as middleware in the message pipeline:
|
||||
|
||||
Fixes common Markdown formatting issues in LLM outputs, including Mermaid syntax, code blocks, and LaTeX formulas.
|
||||
|
||||
**Version:** 1.2.7
|
||||
**Version:** 1.2.8
|
||||
|
||||
[:octicons-arrow-right-24: Documentation](markdown_normalizer.md)
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ Filter 充当消息管线中的中间件：
|
||||
|
||||
通过智能总结减少长对话的 token 消耗，同时保持连贯性。
|
||||
|
||||
**版本：** 1.3.0
|
||||
**版本：** 1.4.0
|
||||
|
||||
[:octicons-arrow-right-24: 查看文档](async-context-compression.md)
|
||||
|
||||
@@ -52,7 +52,7 @@ Filter 充当消息管线中的中间件：
|
||||
|
||||
修复 LLM 输出中常见的 Markdown 格式问题，包括 Mermaid 语法、代码块和 LaTeX 公式。
|
||||
|
||||
**版本：** 1.2.7
|
||||
**版本：** 1.2.8
|
||||
|
||||
[:octicons-arrow-right-24: 查看文档](markdown_normalizer.zh.md)
|
||||
|
||||
|
||||
@@ -1,81 +1,90 @@
|
||||
# Markdown Normalizer Filter
|
||||
**Author:** [Fu-Jie](https://github.com/Fu-Jie/openwebui-extensions) | **Version:** 1.2.8 | **Project:** [OpenWebUI Extensions](https://github.com/Fu-Jie/openwebui-extensions) | **License:** MIT
|
||||
|
||||
**Author:** [Fu-Jie](https://github.com/Fu-Jie/openwebui-extensions) | **Version:** 1.2.7 | **Project:** [OpenWebUI Extensions](https://github.com/Fu-Jie/openwebui-extensions) | **License:** MIT
|
||||
A powerful, context-aware content normalizer filter for Open WebUI designed to fix common Markdown formatting issues in LLM outputs. It ensures that code blocks, LaTeX formulas, Mermaid diagrams, and other structural Markdown elements are rendered flawlessly, without destroying valid technical content.
|
||||
|
||||
A content normalizer filter for Open WebUI that fixes common Markdown formatting issues in LLM outputs. It ensures that code blocks, LaTeX formulas, Mermaid diagrams, and other Markdown elements are rendered correctly.
|
||||
> 🏆 **Featured by OpenWebUI Official** — This plugin was recommended in the official OpenWebUI Community Newsletter: [January 28, 2026](https://openwebui.com/blog/newsletter-january-28-2026)
|
||||
|
||||
> 🏆 **Featured by OpenWebUI Official** — Recommended in the official OpenWebUI Community Newsletter: [January 28, 2026](https://openwebui.com/blog/newsletter-january-28-2026)
|
||||
[English](https://github.com/Fu-Jie/openwebui-extensions/blob/main/plugins/filters/markdown_normalizer/README.md) | [简体中文](https://github.com/Fu-Jie/openwebui-extensions/blob/main/plugins/filters/markdown_normalizer/README_CN.md)
|
||||
|
||||
## 🔥 What's New in v1.2.7
|
||||
---
|
||||
|
||||
* **LaTeX Formula Protection**: Enhanced escape character cleaning to protect LaTeX commands like `\times`, `\nu`, and `\theta` from being corrupted.
|
||||
* **Expanded i18n Support**: Now supports 12 languages with automatic detection and fallback.
|
||||
* **Valves Optimization**: Optimized configuration descriptions to be English-only for better consistency.
|
||||
* **Bug Fixes**:
|
||||
* Resolved [Issue #49](https://github.com/Fu-Jie/openwebui-extensions/issues/49): Fixed a bug where consecutive bold parts on the same line caused spaces between them to be removed.
|
||||
* Fixed a `NameError` in the plugin code that caused test collection failures.
|
||||
## 🔥 What's New in v1.2.8
|
||||
* **Safe-by-Default Strategy**: The `enable_escape_fix` feature is now **disabled by default**. This prevents unwanted modifications to valid technical text like Windows file paths (`C:\new\test`) or complex LaTeX formulas.
|
||||
* **LaTeX Parsing Fix**: Improved the logic for identifying display math (`$$ ... $$`). Fixed a bug where LaTeX commands starting with `\n` (like `\nabla`) were incorrectly treated as newlines.
|
||||
* **Reliability Enhancement**: Complete error fallback mechanism. Guarantees 0% data loss during processing.
|
||||
* **Inline Code Protection**: Upgraded escaping logic to protect inline code blocks (`` `...` ``).
|
||||
* **Code Block Escaping Control**: The `enable_escape_fix_in_code_blocks` Valve now correctly targets broken newlines inside code blocks (perfect for fixing flat SQL queries) when enabled.
|
||||
* **Privacy Optimization**: `show_debug_log` now defaults to `False` to prevent console noise.
|
||||
|
||||
---
|
||||
|
||||
## 🚀 Why do you need this plugin? (What does it do?)
|
||||
|
||||
Language Models (LLMs) often generate malformed Markdown due to tokenization artifacts, aggressive escaping, or hallucinated formatting. If you've ever seen:
|
||||
- A `mermaid` diagram fail to render because of missing quotes around labels.
|
||||
- A SQL block stuck on a single line because `\n` was output literally instead of a real newline.
|
||||
- A `<details>` block break the entire chat rendering because of missing newlines.
|
||||
- A LaTeX formula fail because the LLM used `\[` instead of `$$`.
|
||||
|
||||
**This plugin automatically intercepts the LLM's raw output, analyzes its structure, and surgically repairs these formatting errors in real-time before they reach your browser.**
|
||||
|
||||
## ✨ Comprehensive Feature List
|
||||
|
||||
### 1. Advanced Structural Protections (Context-Aware)
|
||||
Before making any changes, the plugin builds a semantic map of the text to protect your technical content:
|
||||
- **Code Block Protection**: Skips formatting inside ` ``` ` code blocks by default to protect code logic.
|
||||
- **Inline Code Protection**: Recognizes `` `code` `` snippets and protects regular expressions and file paths (e.g., `C:\Windows`) from being incorrectly unescaped.
|
||||
- **LaTeX Protection**: Identifies inline (`$`) and block (`$$`) formulas to prevent modifying critical math commands like `\times`, `\theta`, or `\nu`.
|
||||
|
||||
### 2. Auto-Healing Transformations
|
||||
- **Details Tag Normalization**: `<details>` blocks (often used for Chain of Thought) require strict spacing to render correctly. The plugin automatically injects blank lines after `</details>` and self-closing `<details />` tags.
|
||||
- **Mermaid Syntax Fixer**: One of the most common LLM errors is omitting quotes in Mermaid diagrams (e.g., `A --> B(Some text)`). This plugin parses the Mermaid syntax and auto-quotes labels and citations to guarantee the graph renders.
|
||||
- **Emphasis Spacing Fix**: Fixes formatting-breaking extra spaces inside bold/italic markers (e.g., `** text **` becomes `**text**`) while cleverly ignoring math expressions like `2 * 3 * 4`.
|
||||
- **Intelligent Escape Character Cleanup**: Removes excessive literal `\n` and `\t` generated by some models and converts them to actual structural newlines (only in safe text areas).
|
||||
- **LaTeX Standardization**: Automatically upgrades old-school LaTeX delimiters (`\[...\]` and `\(...\)`) to modern Markdown standards (`$$...$$` and `$ ... $`).
|
||||
- **Thought Tag Unification**: Standardizes various model thought outputs (`<think>`, `<thinking>`) into a unified `<thought>` tag.
|
||||
- **Broken Code Block Repair**: Fixes indentation issues, repairs mangled language prefixes (e.g., ` ```python`), and automatically closes unclosed code blocks if a generation was cut off.
|
||||
- **List & Table Formatting**: Injects missing newlines to repair broken numbered lists and adds missing closing pipes (`|`) to tables.
|
||||
- **XML Artifact Cleanup**: Silently removes leftover `<antArtifact>` or `<antThinking>` tags often leaked by Claude models.
|
||||
|
||||
### 3. Reliability & Safety
|
||||
- **100% Rollback Guarantee**: If any normalization logic fails or crashes, the plugin catches the error and silently returns the exact original text, ensuring your chat never breaks.
|
||||
|
||||
## 🌐 Multilingual Support
|
||||
|
||||
Supports automatic interface and status switching for the following languages:
|
||||
The plugin UI and status notifications automatically switch based on your language:
|
||||
`English`, `简体中文`, `繁體中文 (香港)`, `繁體中文 (台灣)`, `한국어`, `日本語`, `Français`, `Deutsch`, `Español`, `Italiano`, `Tiếng Việt`, `Bahasa Indonesia`.
|
||||
|
||||
## ✨ Core Features
|
||||
|
||||
* **Details Tag Normalization**: Ensures proper spacing for `<details>` tags (used for thought chains). Adds a blank line after `</details>` and ensures a newline after self-closing `<details />` tags to prevent rendering issues.
|
||||
* **Emphasis Spacing Fix**: Fixes extra spaces inside emphasis markers (e.g., `** text **` -> `**text**`) which can cause rendering failures. Includes safeguards to protect math expressions (e.g., `2 * 3 * 4`) and list variables.
|
||||
* **Mermaid Syntax Fix**: Automatically fixes common Mermaid syntax errors, such as unquoted node labels (including multi-line labels and citations) and unclosed subgraphs. **New in v1.1.2**: Comprehensive protection for edge labels (text on connecting lines) across all link types (solid, dotted, thick).
|
||||
* **Frontend Console Debugging**: Supports printing structured debug logs directly to the browser console (F12) for easier troubleshooting.
|
||||
* **Code Block Formatting**: Fixes broken code block prefixes, suffixes, and indentation.
|
||||
* **LaTeX Normalization**: Standardizes LaTeX formula delimiters (`\[` -> `$$`, `\(` -> `$`).
|
||||
* **Thought Tag Normalization**: Unifies thought tags (`<think>`, `<thinking>` -> `<thought>`).
|
||||
* **Escape Character Fix**: Cleans up excessive escape characters (`\\n`, `\\t`).
|
||||
* **List Formatting**: Ensures proper newlines in list items.
|
||||
* **Heading Fix**: Adds missing spaces in headings (`#Heading` -> `# Heading`).
|
||||
* **Table Fix**: Adds missing closing pipes in tables.
|
||||
* **XML Cleanup**: Removes leftover XML artifacts.
|
||||
|
||||
## How to Use 🛠️
|
||||
|
||||
1. Install the plugin in Open WebUI.
|
||||
2. Enable the filter globally or for specific models.
|
||||
3. Configure the enabled fixes in the **Valves** settings.
|
||||
4. (Optional) **Show Debug Log** is enabled by default in Valves. This prints structured logs to the browser console (F12).
|
||||
> [!WARNING]
|
||||
> As this is an initial version, some "negative fixes" might occur (e.g., breaking valid Markdown). If you encounter issues, please check the console logs, copy the "Original" vs "Normalized" content, and submit an issue.
|
||||
2. Enable the filter globally or assign it to specific models (highly recommended for models with poor formatting).
|
||||
3. Tune the specific fixes you want via the **Valves** settings.
|
||||
|
||||
## Configuration (Valves) ⚙️
|
||||
|
||||
| Parameter | Default | Description |
|
||||
| :--- | :--- | :--- |
|
||||
| `priority` | `50` | Filter priority. Higher runs later (recommended after other filters). |
|
||||
| `enable_escape_fix` | `True` | Fix excessive escape characters (`\n`, `\t`, etc.). |
|
||||
| `enable_escape_fix_in_code_blocks` | `False` | Apply escape fix inside code blocks (may affect valid code). |
|
||||
| `enable_thought_tag_fix` | `True` | Normalize thought tags (`</thought>`). |
|
||||
| `enable_details_tag_fix` | `True` | Normalize `<details>` tags and add safe spacing. |
|
||||
| `enable_code_block_fix` | `True` | Fix code block formatting (indentation/newlines). |
|
||||
| `enable_latex_fix` | `True` | Normalize LaTeX delimiters (`\[` -> `$$`, `\(` -> `$`). |
|
||||
| `priority` | `50` | Filter priority. Higher runs later (recommended to run this after all other content filters). |
|
||||
| `enable_escape_fix` | `False` | Convert excessive literal escape characters (`\n`, `\t`) to real spacing. (Default: False for safety). |
|
||||
| `enable_escape_fix_in_code_blocks` | `False` | **Pro-tip**: Turn this ON if your SQL/HTML code blocks are constantly printing on a single line. Turn OFF for Python/C++. |
|
||||
| `enable_thought_tag_fix` | `True` | Normalize `<think>` tags. |
|
||||
| `enable_details_tag_fix` | `True` | Normalize `<details>` spacing. |
|
||||
| `enable_code_block_fix` | `True` | Fix code block indentation and newlines. |
|
||||
| `enable_latex_fix` | `True` | Standardize LaTeX delimiters (`\[` -> `$$`). |
|
||||
| `enable_list_fix` | `False` | Fix list item newlines (experimental). |
|
||||
| `enable_unclosed_block_fix` | `True` | Auto-close unclosed code blocks. |
|
||||
| `enable_fullwidth_symbol_fix` | `False` | Fix full-width symbols in code blocks. |
|
||||
| `enable_mermaid_fix` | `True` | Fix common Mermaid syntax errors. |
|
||||
| `enable_heading_fix` | `True` | Fix missing space in headings. |
|
||||
| `enable_table_fix` | `True` | Fix missing closing pipe in tables. |
|
||||
| `enable_xml_tag_cleanup` | `True` | Cleanup leftover XML tags. |
|
||||
| `enable_emphasis_spacing_fix` | `False` | Fix extra spaces in emphasis. |
|
||||
| `show_status` | `True` | Show status notification when fixes are applied. |
|
||||
| `show_debug_log` | `True` | Print debug logs to browser console (F12). |
|
||||
| `enable_mermaid_fix` | `True` | Fix common Mermaid syntax errors (auto-quoting). |
|
||||
| `enable_heading_fix` | `True` | Add missing space after heading hashes (`#Title` -> `# Title`). |
|
||||
| `enable_table_fix` | `True` | Add missing closing pipe in tables. |
|
||||
| `enable_xml_tag_cleanup` | `True` | Remove leftover XML artifacts. |
|
||||
| `enable_emphasis_spacing_fix` | `False` | Fix extra spaces in emphasis formatting. |
|
||||
| `show_status` | `True` | Show UI status notification when a fix is actively applied. |
|
||||
| `show_debug_log` | `False` | Print detailed before/after diffs to browser console (F12). |
|
||||
|
||||
## ⭐ Support
|
||||
|
||||
If this plugin has been useful, a star on [OpenWebUI Extensions](https://github.com/Fu-Jie/openwebui-extensions) is a big motivation for me. Thank you for the support.
|
||||
If this plugin saves your day, a star on [OpenWebUI Extensions](https://github.com/Fu-Jie/openwebui-extensions) is a big motivation for me. Thank you!
|
||||
|
||||
## 🧩 Others
|
||||
|
||||
### Troubleshooting ❓
|
||||
|
||||
* **Submit an Issue**: If you encounter any problems, please submit an issue on GitHub: [OpenWebUI Extensions Issues](https://github.com/Fu-Jie/openwebui-extensions/issues)
|
||||
|
||||
### Changelog
|
||||
|
||||
See the full history on GitHub: [OpenWebUI Extensions](https://github.com/Fu-Jie/openwebui-extensions)
|
||||
* **Troubleshooting**: Encountering "negative fixes"? Enable `show_debug_log`, check your console, and submit an issue on GitHub: [OpenWebUI Extensions Issues](https://github.com/Fu-Jie/openwebui-extensions/issues)
|
||||
|
||||
@@ -1,81 +1,89 @@
|
||||
# Markdown 格式化过滤器 (Markdown Normalizer)
|
||||
|
||||
**作者:** [Fu-Jie](https://github.com/Fu-Jie/openwebui-extensions) | **Version:** 1.2.7 | **项目:** [OpenWebUI Extensions](https://github.com/Fu-Jie/openwebui-extensions) | **许可证:** MIT
|
||||
**作者:** [Fu-Jie](https://github.com/Fu-Jie/openwebui-extensions) | **版本:** 1.2.8 | **项目:** [OpenWebUI Extensions](https://github.com/Fu-Jie/openwebui-extensions) | **许可证:** MIT
|
||||
|
||||
这是一个用于 Open WebUI 的内容格式化过滤器，旨在修复 LLM 输出中常见的 Markdown 格式问题。它能确保代码块、LaTeX 公式、Mermaid 图表和其他 Markdown 元素被正确渲染。
|
||||
这是一个强大的、具备上下文感知的 Markdown 内容规范化过滤器，专为 Open WebUI 设计，旨在实时修复大语言模型 (LLM) 输出中常见的格式错乱问题。它能确保代码块、LaTeX 公式、Mermaid 图表以及其他结构化元素被完美渲染，同时**绝不破坏**你原有的有效技术内容（如代码、正则、路径）。
|
||||
|
||||
> 🏆 **OpenWebUI 官方推荐** — 获得 OpenWebUI 社区 Newsletter 官方推荐：[2026 年 1 月 28 日](https://openwebui.com/blog/newsletter-january-28-2026)
|
||||
> 🏆 **OpenWebUI 官方推荐** — 本插件获得 OpenWebUI 社区 Newsletter 官方推荐：[2026 年 1 月 28 日](https://openwebui.com/blog/newsletter-january-28-2026)
|
||||
|
||||
## 🔥 最新更新 v1.2.7
|
||||
[English](https://github.com/Fu-Jie/openwebui-extensions/blob/main/plugins/filters/markdown_normalizer/README.md) | [简体中文](https://github.com/Fu-Jie/openwebui-extensions/blob/main/plugins/filters/markdown_normalizer/README_CN.md)
|
||||
|
||||
* **LaTeX 公式保护**: 增强了转义字符清理逻辑，自动保护 `$ $` 或 `$$ $$` 内的 LaTeX 命令（如 `\times`、`\nu`、`\theta`），防止渲染失效。
|
||||
* **扩展国际化 (i18n) 支持**: 现已支持 12 种语言，具备自动探测与回退机制。
|
||||
* **配置项优化**: 将 Valves 配置项的描述统一为英文，保持界面一致性。
|
||||
* **修复 Bug**:
|
||||
* 修复了 [Issue #49](https://github.com/Fu-Jie/openwebui-extensions/issues/49)：解决了当同一行存在多个加粗部分时，由于正则匹配过于贪婪导致中间内容丢失空格的问题。
|
||||
* 修复了插件代码中的 `NameError` 错误，确保测试脚本能正常运行。
|
||||
---
|
||||
|
||||
## 🔥 最新更新 v1.2.8
|
||||
* **“默认安全”策略 (Safe-by-Default)**：`enable_escape_fix` 功能现在**默认禁用**。这能有效防止插件在未经授权的情况下误改 Windows 路径 (`C:\new\test`) 或复杂的 LaTeX 公式。
|
||||
* **LaTeX 解析优化**：重构了显示数学公式 (`$$ ... $$`) 的识别逻辑。修复了 LaTeX 命令如果以 `\n` 开头（如 `\nabla`）会被错误识别为换行符的 Bug。
|
||||
* **可靠性增强**：实现了完整的错误回滚机制。当修复过程发生意外错误时，保证 100% 返回原始文本，不丢失任何数据。
|
||||
* **配置项修复**：`enable_escape_fix_in_code_blocks` 配置项现在能正确作用于代码块了。**如果您遇到 SQL 挤在一行的问题，只需在设置中手动开启此项即可。**
|
||||
|
||||
---
|
||||
|
||||
## 🚀 为什么你需要这个插件？(它能解决什么问题？)
|
||||
|
||||
由于分词 (Tokenization) 伪影、过度转义或格式幻觉，LLM 经常会生成破损的 Markdown。如果你遇到过以下情况：
|
||||
- `mermaid` 图表因为节点标签缺少双引号而渲染失败、白屏。
|
||||
- LLM 输出的 SQL 语句挤在一行，因为本该换行的地方输出了字面量 `\n`。
|
||||
- 复杂的 `<details>` (思维链展开块) 因为缺少换行符导致整个聊天界面排版崩塌。
|
||||
- LaTeX 数学公式无法显示，因为模型使用了旧版的 `\[` 而不是 Markdown 支持的 `$$`。
|
||||
|
||||
**本插件会自动拦截 LLM 返回的原始数据，实时分析其文本结构，并像外科手术一样精准修复这些排版错误，然后再将其展示在你的浏览器中。**
|
||||
|
||||
## ✨ 核心功能与修复能力全景
|
||||
|
||||
### 1. 高级结构保护 (上下文感知)
|
||||
在执行任何修改前，插件会为整个文本建立语义地图，确保技术性内容不被误伤：
|
||||
- **代码块保护**：默认跳过 ` ``` ` 内部的内容，保护所有编程逻辑。
|
||||
- **行内代码保护**：识别 `` `代码` `` 片段，防止正则表达式（如 `[\n\r]`）或文件路径（如 `C:\Windows`）被错误地去转义。
|
||||
- **LaTeX 公式保护**：识别行内 (`$`) 和块级 (`$$`) 公式，防止诸如 `\times`, `\theta` 等核心数学命令被意外破坏。
|
||||
|
||||
### 2. 自动治愈转换 (Auto-Healing)
|
||||
- **Details 标签排版修复**：`<details>` 块要求极为严格的空行才能正确渲染内部内容。插件会自动在 `</details>` 以及自闭合 `<details />` 标签后注入安全的换行符。
|
||||
- **Mermaid 语法急救**：自动修复最常见的 Mermaid 错误——为未加引号的节点标签（如 `A --> B(Some text)`）自动补充双引号，甚至支持多行标签和引用，确保拓扑图 100% 渲染。
|
||||
- **强调语法间距修复**：修复加粗/斜体语法内部多余的空格（如 `** 文本 **` 变为 `**文本**`，否则 OpenWebUI 无法加粗），同时智能忽略数学算式（如 `2 * 3 * 4`）。
|
||||
- **智能转义字符清理**：将模型过度转义生成的字面量 `\n` 和 `\t` 转化为真正的换行和缩进（仅在安全的纯文本区域执行）。
|
||||
- **LaTeX 现代化转换**：自动将旧式的 LaTeX 定界符（`\[...\]` 和 `\(...\)`）升级为现代 Markdown 标准（`$$...$$` 和 `$ ... $`）。
|
||||
- **思维标签大一统**：无论模型输出的是 `<think>` 还是 `<thinking>`，统一标准化为 `<thought>` 标签。
|
||||
- **残缺代码块修复**：修复乱码的语言前缀（例如 ` ```python`），调整缩进，并在模型回答被截断时，自动补充闭合的 ` ``` `。
|
||||
- **列表与表格急救**：为粘连的编号列表注入换行，为残缺的 Markdown 表格补充末尾的闭合管道符（`|`）。
|
||||
- **XML 伪影消除**：静默移除 Claude 模型经常泄露的 `<antArtifact>` 或 `<antThinking>` 残留标签。
|
||||
|
||||
### 3. 绝对的可靠性与安全 (100% Rollback)
|
||||
- **无损回滚机制**：如果在修复过程中发生任何意外错误或崩溃，插件会立即捕获异常，并静默返回**绝对原始**的文本，确保你的对话永远不会因插件报错而丢失。
|
||||
|
||||
## 🌐 多语言支持 (i18n)
|
||||
|
||||
支持以下语言的界面与状态自动切换：
|
||||
界面的状态提示气泡会根据你的浏览器语言自动切换：
|
||||
`English`, `简体中文`, `繁體中文 (香港)`, `繁體中文 (台灣)`, `한국어`, `日本語`, `Français`, `Deutsch`, `Español`, `Italiano`, `Tiếng Việt`, `Bahasa Indonesia`
|
||||
|
||||
## ✨ 核心特性
|
||||
|
||||
* **Details 标签规范化**: 确保 `<details>` 标签（常用于思维链）有正确的间距。在 `</details>` 后添加空行，并在自闭合 `<details />` 标签后添加换行，防止渲染问题。
|
||||
* **强调空格修复**: 修复强调标记内部的多余空格（例如 `** 文本 **` -> `**文本**`），这会导致 Markdown 渲染失败。包含保护机制，防止误修改数学表达式（如 `2 * 3 * 4`）或列表变量。
|
||||
* **Mermaid 语法修复**: 自动修复常见的 Mermaid 语法错误，如未加引号的节点标签（支持多行标签和引用标记）和未闭合的子图 (Subgraph)。**v1.1.2 新增**: 全面保护各种类型的连线标签（实线、虚线、粗线），防止被误修改。
|
||||
* **前端控制台调试**: 支持将结构化的调试日志直接打印到浏览器控制台 (F12)，方便排查问题。
|
||||
* **代码块格式化**: 修复破损的代码块前缀、后缀和缩进问题。
|
||||
* **LaTeX 规范化**: 标准化 LaTeX 公式定界符 (`\[` -> `$$`, `\(` -> `$`)。
|
||||
* **思维标签规范化**: 统一思维链标签 (`<think>`, `<thinking>` -> `<thought>`)。
|
||||
* **转义字符修复**: 清理过度的转义字符 (`\\n`, `\\t`)。
|
||||
* **列表格式化**: 确保列表项有正确的换行。
|
||||
* **标题修复**: 修复标题中缺失的空格 (`#标题` -> `# 标题`)。
|
||||
* **表格修复**: 修复表格中缺失的闭合管道符。
|
||||
* **XML 清理**: 移除残留的 XML 标签。
|
||||
|
||||
## 使用方法
|
||||
## 使用方法 🛠️
|
||||
|
||||
1. 在 Open WebUI 中安装此插件。
|
||||
2. 全局启用或为特定模型启用此过滤器。
|
||||
3. 在 **Valves** 设置中配置需要启用的修复项。
|
||||
4. (可选) **显示调试日志 (Show Debug Log)** 在 Valves 中默认开启。这会将结构化的日志打印到浏览器控制台 (F12)。
|
||||
> [!WARNING]
|
||||
> 由于这是初版，可能会出现“负向修复”的情况（例如破坏了原本正确的格式）。如果您遇到问题，请务目查看控制台日志，复制“原始 (Original)”与“规范化 (Normalized)”的内容对比，并提交 Issue 反馈。
|
||||
2. 全局启用或为特定模型启用此过滤器（强烈建议为格式输出不稳定的模型启用）。
|
||||
3. 在 **Valves (配置参数)** 设置中微调你需要的修复项。
|
||||
|
||||
## 配置参数 (Valves) ⚙️
|
||||
|
||||
| 参数 | 默认值 | 描述 |
|
||||
| :--- | :--- | :--- |
|
||||
| `priority` | `50` | 过滤器优先级。数值越大越靠后（建议在其他过滤器之后运行）。 |
|
||||
| `enable_escape_fix` | `True` | 修复过度的转义字符（`\n`, `\t` 等）。 |
|
||||
| `enable_escape_fix_in_code_blocks` | `False` | 在代码块内应用转义修复（可能影响有效代码）。 |
|
||||
| `enable_thought_tag_fix` | `True` | 规范化思维标签（`</thought>`）。 |
|
||||
| `enable_details_tag_fix` | `True` | 规范化 `<details>` 标签并添加安全间距。 |
|
||||
| `enable_code_block_fix` | `True` | 修复代码块格式（缩进/换行）。 |
|
||||
| `enable_latex_fix` | `True` | 规范化 LaTeX 定界符（`\[` -> `$$`, `\(` -> `$`）。 |
|
||||
| `priority` | `50` | 过滤器优先级。数值越大越靠后（建议放在其他内容过滤器之后运行）。 |
|
||||
| `enable_escape_fix` | `False` | 修复过度的转义字符（将字面量 `\n` 转换为实际换行）。**默认禁用以保证安全。** |
|
||||
| `enable_escape_fix_in_code_blocks` | `False` | **高阶技巧**：如果你的 SQL 或 HTML 代码块总是挤在一行，**请开启此项**。如果你经常写 Python/C++，建议保持关闭。 |
|
||||
| `enable_thought_tag_fix` | `True` | 规范化思维标签为 `<thought>`。 |
|
||||
| `enable_details_tag_fix` | `True` | 修复 `<details>` 标签的排版间距。 |
|
||||
| `enable_code_block_fix` | `True` | 修复代码块前缀、缩进和换行。 |
|
||||
| `enable_latex_fix` | `True` | 规范化 LaTeX 定界符（`\[` -> `$$`）。 |
|
||||
| `enable_list_fix` | `False` | 修复列表项换行（实验性）。 |
|
||||
| `enable_unclosed_block_fix` | `True` | 自动闭合未闭合的代码块。 |
|
||||
| `enable_fullwidth_symbol_fix` | `False` | 修复代码块中的全角符号。 |
|
||||
| `enable_mermaid_fix` | `True` | 修复常见 Mermaid 语法错误。 |
|
||||
| `enable_heading_fix` | `True` | 修复标题中缺失的空格。 |
|
||||
| `enable_unclosed_block_fix` | `True` | 自动闭合被截断的代码块。 |
|
||||
| `enable_mermaid_fix` | `True` | 修复常见 Mermaid 语法错误（如自动加引号）。 |
|
||||
| `enable_heading_fix` | `True` | 修复标题中缺失的空格 (`#Title` -> `# Title`)。 |
|
||||
| `enable_table_fix` | `True` | 修复表格中缺失的闭合管道符。 |
|
||||
| `enable_xml_tag_cleanup` | `True` | 清理残留的 XML 标签。 |
|
||||
| `enable_emphasis_spacing_fix` | `False` | 修复强调语法中的多余空格。 |
|
||||
| `show_status` | `True` | 应用修复时显示状态通知。 |
|
||||
| `show_debug_log` | `True` | 在浏览器控制台打印调试日志。 |
|
||||
| `enable_xml_tag_cleanup` | `True` | 清理残留的 XML 分析标签。 |
|
||||
| `enable_emphasis_spacing_fix` | `False` | 修复强调语法（加粗/斜体）内部的多余空格。 |
|
||||
| `show_status` | `True` | 当触发任何修复规则时，在页面底部显示提示气泡。 |
|
||||
| `show_debug_log` | `False` | 在浏览器控制台 (F12) 打印修改前后的详细对比日志。 |
|
||||
|
||||
## ⭐ 支持
|
||||
如果这个插件拯救了你的排版，欢迎到 [OpenWebUI Extensions](https://github.com/Fu-Jie/openwebui-extensions) 点个 Star，这是我持续改进的最大动力。感谢支持！
|
||||
|
||||
如果这个插件对你有帮助，欢迎到 [OpenWebUI Extensions](https://github.com/Fu-Jie/openwebui-extensions) 点个 Star，这将是我持续改进的动力，感谢支持。
|
||||
|
||||
## 其他
|
||||
|
||||
### 故障排除 (Troubleshooting) ❓
|
||||
|
||||
* **提交 Issue**: 如果遇到任何问题，请在 GitHub 上提交 Issue：[OpenWebUI Extensions Issues](https://github.com/Fu-Jie/openwebui-extensions/issues)
|
||||
|
||||
### 更新日志
|
||||
|
||||
完整历史请查看 GitHub 项目： [OpenWebUI Extensions](https://github.com/Fu-Jie/openwebui-extensions)
|
||||
## 🧩 其他
|
||||
* **故障排除**：遇到“负向修复”（即原本正常的排版被修坏了）？请开启 `show_debug_log`，在 F12 控制台复制出原始文本，并在 GitHub 提交 Issue：[提交 Issue](https://github.com/Fu-Jie/openwebui-extensions/issues)
|
||||
|
||||
@@ -0,0 +1,354 @@
|
||||
# ✨ 异步上下文压缩本地部署工具 — 完整文件清单
|
||||
|
||||
## 📦 新增文件总览
|
||||
|
||||
为 async_context_compression Filter 插件增加的本地部署功能包括：
|
||||
|
||||
```
|
||||
openwebui-extensions/
|
||||
├── scripts/
|
||||
│ ├── ✨ deploy_async_context_compression.py (新增) 专用部署脚本 [70 行]
|
||||
│ ├── ✨ deploy_filter.py (新增) 通用 Filter 部署工具 [300 行]
|
||||
│ ├── ✨ DEPLOYMENT_GUIDE.md (新增) 完整部署指南 [详细]
|
||||
│ ├── ✨ DEPLOYMENT_SUMMARY.md (新增) 技术架构总结 [详细]
|
||||
│ ├── ✨ QUICK_START.md (新增) 快速参考卡片 [速查]
|
||||
│ ├── ✨ README.md (新增) 脚本使用说明 [本文]
|
||||
│ └── deploy_pipe.py (已有) Pipe 部署工具
|
||||
│
|
||||
└── tests/
|
||||
└── scripts/
|
||||
└── ✨ test_deploy_filter.py (新增) 单元测试 [10个测试 ✅]
|
||||
```
|
||||
|
||||
## 🎯 快速使用
|
||||
|
||||
### 最简单的方式 — 一行命令
|
||||
|
||||
```bash
|
||||
cd scripts && python deploy_async_context_compression.py
|
||||
```
|
||||
|
||||
**✅ 结果**:
|
||||
- async_context_compression Filter 被部署到本地 OpenWebUI
|
||||
- 无需重启 OpenWebUI，立即生效
|
||||
- 显示部署状态和后续步骤
|
||||
|
||||
### 第一次使用建议
|
||||
|
||||
```bash
|
||||
# 1. 进入 scripts 目录
|
||||
cd scripts
|
||||
|
||||
# 2. 查看所有可用的部署脚本
|
||||
ls -la deploy_*.py
|
||||
|
||||
# 3. 阅读快速开始指南
|
||||
cat QUICK_START.md
|
||||
|
||||
# 4. 部署 async_context_compression
|
||||
python deploy_async_context_compression.py
|
||||
```
|
||||
|
||||
## 📚 文件详细说明
|
||||
|
||||
### 1. `deploy_async_context_compression.py` ⭐ 推荐
|
||||
|
||||
**最快速的部署方式！**
|
||||
|
||||
```bash
|
||||
python deploy_async_context_compression.py
|
||||
```
|
||||
|
||||
**特点**:
|
||||
- 专为 async_context_compression 优化
|
||||
- 一条命令完成部署
|
||||
- 清晰的成功/失败提示
|
||||
- 显示后续配置步骤
|
||||
|
||||
**代码**: 约 70 行，简洁清晰
|
||||
|
||||
---
|
||||
|
||||
### 2. `deploy_filter.py` — 通用工具
|
||||
|
||||
支持部署 **所有 Filter 插件**
|
||||
|
||||
```bash
|
||||
# 默认部署 async_context_compression
|
||||
python deploy_filter.py
|
||||
|
||||
# 部署其他 Filter
|
||||
python deploy_filter.py folder-memory
|
||||
python deploy_filter.py context_enhancement_filter
|
||||
|
||||
# 列出所有可用 Filter
|
||||
python deploy_filter.py --list
|
||||
```
|
||||
|
||||
**特点**:
|
||||
- 通用的 Filter 部署框架
|
||||
- 自动元数据提取
|
||||
- 支持多个插件
|
||||
- 智能错误处理
|
||||
|
||||
**代码**: 约 300 行，完整功能
|
||||
|
||||
---
|
||||
|
||||
### 3. `QUICK_START.md` — 快速参考
|
||||
|
||||
一页纸的速查表，包含：
|
||||
- ⚡ 30秒快速开始
|
||||
- 📋 常见命令表格
|
||||
- ❌ 故障排除速查
|
||||
|
||||
**适合**: 第二次及以后使用
|
||||
|
||||
---
|
||||
|
||||
### 4. `DEPLOYMENT_GUIDE.md` — 完整指南
|
||||
|
||||
详细的部署指南，包含：
|
||||
- 前置条件检查
|
||||
- 分步工作流
|
||||
- API 密钥获取方法
|
||||
- 详细的故障排除
|
||||
- CI/CD 集成示例
|
||||
|
||||
**适合**: 首次部署或需要深入了解
|
||||
|
||||
---
|
||||
|
||||
### 5. `DEPLOYMENT_SUMMARY.md` — 技术总结
|
||||
|
||||
技术架构和实现细节：
|
||||
- 工作原理流程图
|
||||
- 元数据提取机制
|
||||
- API 集成说明
|
||||
- 安全最佳实践
|
||||
|
||||
**适合**: 开发者和想了解实现的人
|
||||
|
||||
---
|
||||
|
||||
### 6. `test_deploy_filter.py` — 单元测试
|
||||
|
||||
完整的测试覆盖：
|
||||
|
||||
```bash
|
||||
pytest tests/scripts/test_deploy_filter.py -v
|
||||
```
|
||||
|
||||
**测试内容**: 10 个单元测试 ✅
|
||||
- Filter 发现
|
||||
- 元数据提取
|
||||
- 负载构建
|
||||
- 版本处理
|
||||
|
||||
---
|
||||
|
||||
## 🚀 三个使用场景
|
||||
|
||||
### 场景 1: 快速部署（最常用）
|
||||
|
||||
```bash
|
||||
cd scripts
|
||||
python deploy_async_context_compression.py
|
||||
# 完成！✅
|
||||
```
|
||||
|
||||
**耗时**: 5 秒
|
||||
**适合**: 日常开发迭代
|
||||
|
||||
---
|
||||
|
||||
### 场景 2: 部署其他 Filter
|
||||
|
||||
```bash
|
||||
cd scripts
|
||||
python deploy_filter.py --list # 查看所有
|
||||
python deploy_filter.py folder-memory # 部署指定的
|
||||
```
|
||||
|
||||
**耗时**: 5 秒 × N
|
||||
**适合**: 管理多个 Filter
|
||||
|
||||
---
|
||||
|
||||
### 场景 3: 完整设置（首次）
|
||||
|
||||
```bash
|
||||
cd scripts
|
||||
|
||||
# 1. 创建 API 密钥配置
|
||||
echo "api_key=sk-your-key" > .env
|
||||
|
||||
# 2. 验证配置
|
||||
cat .env
|
||||
|
||||
# 3. 部署
|
||||
python deploy_async_context_compression.py
|
||||
|
||||
# 4. 查看结果
|
||||
curl http://localhost:3003/api/v1/functions
|
||||
```
|
||||
|
||||
**耗时**: 1 分钟
|
||||
**适合**: 第一次设置
|
||||
|
||||
---
|
||||
|
||||
## 📋 文件访问指南
|
||||
|
||||
| 我想... | 文件 | 命令 |
|
||||
|---------|------|------|
|
||||
| 部署 async_context_compression | deploy_async_context_compression.py | `python deploy_async_context_compression.py` |
|
||||
| 看快速参考 | QUICK_START.md | `cat QUICK_START.md` |
|
||||
| 完整指南 | DEPLOYMENT_GUIDE.md | `cat DEPLOYMENT_GUIDE.md` |
|
||||
| 技术细节 | DEPLOYMENT_SUMMARY.md | `cat DEPLOYMENT_SUMMARY.md` |
|
||||
| 运行测试 | test_deploy_filter.py | `pytest tests/scripts/test_deploy_filter.py -v` |
|
||||
| 部署其他 Filter | deploy_filter.py | `python deploy_filter.py --list` |
|
||||
|
||||
## ✅ 验证清单
|
||||
|
||||
确保一切就绪：
|
||||
|
||||
```bash
|
||||
# 1. 检查所有部署脚本都已创建
|
||||
ls -la scripts/deploy*.py
|
||||
# 应该看到: deploy_pipe.py, deploy_filter.py, deploy_async_context_compression.py
|
||||
|
||||
# 2. 检查所有文档都已创建
|
||||
ls -la scripts/*.md
|
||||
# 应该看到: DEPLOYMENT_GUIDE.md, DEPLOYMENT_SUMMARY.md, QUICK_START.md, README.md
|
||||
|
||||
# 3. 检查测试存在
|
||||
ls -la tests/scripts/test_deploy_filter.py
|
||||
|
||||
# 4. 运行一次测试验证
|
||||
python -m pytest tests/scripts/test_deploy_filter.py -v
|
||||
# 应该看到: 10 passed ✅
|
||||
|
||||
# 5. 尝试部署
|
||||
cd scripts && python deploy_async_context_compression.py
|
||||
```
|
||||
|
||||
## 🎓 学习路径
|
||||
|
||||
### 初学者路径
|
||||
|
||||
```
|
||||
1. 阅读本文件 (5 分钟)
|
||||
2. 阅读 QUICK_START.md (5 分钟)
|
||||
3. 运行部署脚本 (5 分钟)
|
||||
4. 在 OpenWebUI 中测试 (5 分钟)
|
||||
```
|
||||
|
||||
### 开发者路径
|
||||
|
||||
```
|
||||
1. 阅读本文件
|
||||
2. 阅读 DEPLOYMENT_GUIDE.md
|
||||
3. 阅读 DEPLOYMENT_SUMMARY.md
|
||||
4. 查看源代码: deploy_filter.py
|
||||
5. 运行测试: pytest tests/scripts/test_deploy_filter.py -v
|
||||
```
|
||||
|
||||
## 🔧 常见问题
|
||||
|
||||
### Q: 如何更新已部署的插件？
|
||||
|
||||
```bash
|
||||
# 修改代码后
|
||||
vim ../plugins/filters/async-context-compression/async_context_compression.py
|
||||
|
||||
# 重新部署（自动覆盖）
|
||||
python deploy_async_context_compression.py
|
||||
```
|
||||
|
||||
### Q: 支持哪些 Filter？
|
||||
|
||||
```bash
|
||||
python deploy_filter.py --list
|
||||
```
|
||||
|
||||
### Q: 如何获取 API 密钥？
|
||||
|
||||
1. 打开 OpenWebUI
|
||||
2. 点击用户菜单 → Settings
|
||||
3. 找到 "API Keys" 部分
|
||||
4. 复制密钥到 `.env` 文件
|
||||
|
||||
### Q: 脚本失败了怎么办？
|
||||
|
||||
1. 查看错误信息
|
||||
2. 参考 `QUICK_START.md` 的故障排除部分
|
||||
3. 或查看 `DEPLOYMENT_GUIDE.md` 的详细说明
|
||||
|
||||
### Q: 安全吗？
|
||||
|
||||
✅ 完全安全
|
||||
|
||||
- API 密钥存储在本地 `.env` 文件
|
||||
- `.env` 已添加到 `.gitignore`
|
||||
- 绝不会被提交到 Git
|
||||
- 密钥可随时轮换
|
||||
|
||||
### Q: 可以在生产环境使用吗？
|
||||
|
||||
✅ 可以
|
||||
|
||||
- 生产环境建议通过 CI/CD 秘密管理
|
||||
- 参考 `DEPLOYMENT_GUIDE.md` 中的 GitHub Actions 示例
|
||||
|
||||
## 🚦 快速状态检查
|
||||
|
||||
```bash
|
||||
# 检查所有部署工具是否就绪
|
||||
cd scripts
|
||||
|
||||
# 查看脚本列表
|
||||
ls -la deploy*.py
|
||||
|
||||
# 查看文档列表
|
||||
ls -la *.md | grep -i deploy
|
||||
|
||||
# 验证测试通过
|
||||
python -m pytest tests/scripts/test_deploy_filter.py -q
|
||||
|
||||
# 执行部署
|
||||
python deploy_async_context_compression.py
|
||||
```
|
||||
|
||||
## 📞 下一步
|
||||
|
||||
1. **立即尝试**: `cd scripts && python deploy_async_context_compression.py`
|
||||
2. **查看结果**: 打开 OpenWebUI → Settings → Filters → 找 "Async Context Compression"
|
||||
3. **启用使用**: 在对话中启用这个 Filter，体验上下文压缩功能
|
||||
4. **继续开发**: 修改代码后重复部署过程
|
||||
|
||||
## 📝 更多资源
|
||||
|
||||
- 🚀 快速开始: [QUICK_START.md](QUICK_START.md)
|
||||
- 📖 完整指南: [DEPLOYMENT_GUIDE.md](DEPLOYMENT_GUIDE.md)
|
||||
- 🏗️ 技术架构: [DEPLOYMENT_SUMMARY.md](DEPLOYMENT_SUMMARY.md)
|
||||
- 🧪 测试套件: [test_deploy_filter.py](../tests/scripts/test_deploy_filter.py)
|
||||
|
||||
---
|
||||
|
||||
## 📊 文件统计
|
||||
|
||||
```
|
||||
新增 Python 脚本: 2 个 (deploy_filter.py, deploy_async_context_compression.py)
|
||||
新增文档文件: 4 个 (DEPLOYMENT_*.md, QUICK_START.md)
|
||||
新增测试文件: 1 个 (test_deploy_filter.py)
|
||||
新增总代码行数: ~600 行
|
||||
测试覆盖率: 10/10 单元测试通过 ✅
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
**创建日期**: 2026-03-09
|
||||
**最好用于**: 本地开发和快速迭代
|
||||
**维护者**: Fu-Jie
|
||||
**项目**: [openwebui-extensions](https://github.com/Fu-Jie/openwebui-extensions)
|
||||
189
plugins/filters/async-context-compression/ISSUE_56_ANALYSIS.md
Normal file
189
plugins/filters/async-context-compression/ISSUE_56_ANALYSIS.md
Normal file
@@ -0,0 +1,189 @@
|
||||
# Issue #56: Critical tool-calling corruption and multiple reliability issues
|
||||
|
||||
## Overview
|
||||
This document consolidates all reported issues in the async-context-compression filter as described in [GitHub Issue #56](https://github.com/Fu-Jie/openwebui-extensions/issues/56).
|
||||
|
||||
---
|
||||
|
||||
## Issue List
|
||||
|
||||
### 1. 🔴 CRITICAL: Native tool-calling history can be corrupted
|
||||
|
||||
**Severity**: Critical
|
||||
**Impact**: Conversation integrity
|
||||
|
||||
#### Description
|
||||
The compression logic removes individual messages without preserving native tool-calling structures as atomic units. This can break the relationship between assistant `tool_calls` and their corresponding `tool` result messages.
|
||||
|
||||
#### Symptom
|
||||
```
|
||||
No tool call found for function call output with call_id ...
|
||||
```
|
||||
|
||||
#### Root Cause
|
||||
- Assistant messages containing `tool_calls` can be removed while their matching `tool` result messages remain
|
||||
- This creates orphaned tool outputs that reference non-existent `tool_call_id`s
|
||||
- The model/provider rejects the request because the `call_id` no longer matches any tool call in history
|
||||
|
||||
#### Expected Behavior
|
||||
Compression must treat tool-calling blocks atomically:
|
||||
- `assistant(tool_calls)` message
|
||||
- Corresponding `tool` result message(s)
|
||||
- Optional assistant follow-up that consumes tool results
|
||||
|
||||
Should never be split or partially removed.
|
||||
|
||||
---
|
||||
|
||||
### 2. 🟠 HIGH: Compression progress mixes original-history and compressed-view semantics
|
||||
|
||||
**Severity**: High
|
||||
**Impact**: Summary advancement consistency
|
||||
|
||||
#### Description
|
||||
The plugin stores `compressed_message_count` as progress over the original conversation history, but later recalculates it from the already-compressed conversation view. This mixes two different coordinate systems for the same field.
|
||||
|
||||
#### Problem
|
||||
- Original-history progress (before compression)
|
||||
- Compressed-view progress (after compression)
|
||||
|
||||
These two meanings are inconsistent, causing:
|
||||
- Summary advancement to become inconsistent
|
||||
- Summary progress to stall after summaries already exist
|
||||
- Later updates to be measured in a different coordinate system than stored values
|
||||
|
||||
#### Expected Behavior
|
||||
Progress tracking must use a single, consistent coordinate system throughout the lifetime of the conversation.
|
||||
|
||||
---
|
||||
|
||||
### 3. 🟡 MEDIUM: Async summary generation has no per-chat lock
|
||||
|
||||
**Severity**: Medium
|
||||
**Impact**: Token usage, race conditions
|
||||
|
||||
#### Description
|
||||
Each response can launch a new background summary task for the same chat, even if one is already in progress.
|
||||
|
||||
#### Problems
|
||||
- Duplicate summary work
|
||||
- Increased token usage
|
||||
- Race conditions in saved summary state
|
||||
- Potential data consistency issues
|
||||
|
||||
#### Expected Behavior
|
||||
Use per-chat locking to ensure only one summary task runs per chat at a time.
|
||||
|
||||
---
|
||||
|
||||
### 4. 🟡 MEDIUM: Native tool-output trimming is too aggressive
|
||||
|
||||
**Severity**: Medium
|
||||
**Impact**: Content accuracy in technical conversations
|
||||
|
||||
#### Description
|
||||
The tool-output trimming heuristics can rewrite or trim normal assistant messages if they contain patterns such as:
|
||||
- Code fences (triple backticks)
|
||||
- `Arguments:` text
|
||||
- `<tool_code>` tags
|
||||
|
||||
#### Problem
|
||||
This is risky in technical conversations and may alter valid assistant content unintentionally.
|
||||
|
||||
#### Expected Behavior
|
||||
Trimming logic should be more conservative and avoid modifying assistant messages that are not actually tool-output summaries.
|
||||
|
||||
---
|
||||
|
||||
### 5. 🟡 MEDIUM: `max_context_tokens = 0` has inconsistent semantics
|
||||
|
||||
**Severity**: Medium
|
||||
**Impact**: Determinism, configuration clarity
|
||||
|
||||
#### Description
|
||||
The setting `max_context_tokens = 0` behaves inconsistently across different code paths:
|
||||
- In some paths: behaves like "no threshold" (special mode, no compression)
|
||||
- In other paths: still triggers reduction/truncation logic
|
||||
|
||||
#### Problem
|
||||
Non-deterministic behavior makes the setting unpredictable and confusing for users.
|
||||
|
||||
#### Expected Behavior
|
||||
- Define clear semantics for `max_context_tokens = 0`
|
||||
- Apply consistently across all code paths
|
||||
- Document the intended behavior
|
||||
|
||||
---
|
||||
|
||||
### 6. 🔵 LOW: Corrupted Korean i18n string
|
||||
|
||||
**Severity**: Low
|
||||
**Impact**: User experience for Korean speakers
|
||||
|
||||
#### Description
|
||||
One translation string contains broken mixed-language text.
|
||||
|
||||
#### Expected Behavior
|
||||
Clean up the Korean translation string to be properly formatted and grammatically correct.
|
||||
|
||||
---
|
||||
|
||||
## Related / Broader Context
|
||||
|
||||
**Note from issue reporter**: The critical bug is not limited to tool-calling fields alone. Because compression deletes or replaces whole message objects, it can also drop other per-message fields such as:
|
||||
- Message-level `id`
|
||||
- `metadata`
|
||||
- `name`
|
||||
- Similar per-message attributes
|
||||
|
||||
So the issue is broader than native tool-calling: any integration relying on per-message metadata may also be affected when messages are trimmed or replaced.
|
||||
|
||||
---
|
||||
|
||||
## Reproduction Steps
|
||||
|
||||
1. Start a chat with a model using native tool calling
|
||||
2. Enable the async-context-compression filter
|
||||
3. Send a conversation long enough to trigger compression / summary generation
|
||||
4. Let the model perform multiple tool calls across several turns
|
||||
5. Continue the same chat after the filter has already compressed part of the history
|
||||
|
||||
**Expected**: Chat continues normally
|
||||
**Actual**: Chat can become desynchronized and fail with errors like `No tool call found for function call output with call_id ...`
|
||||
|
||||
**Control Test**:
|
||||
- With filter disabled: failure does not occur
|
||||
- With filter enabled: failure reproduces reliably
|
||||
|
||||
---
|
||||
|
||||
## Suggested Fix Direction
|
||||
|
||||
### High Priority (Blocks Issue #56)
|
||||
|
||||
1. **Preserve tool-calling atomicity**: Compress history in a way that never separates `assistant(tool_calls)` from its corresponding `tool` messages
|
||||
2. **Unify progress tracking**: Use a single, consistent coordinate system for `compressed_message_count` throughout
|
||||
3. **Add per-chat locking**: Ensure only one background summary task runs per chat at a time
|
||||
|
||||
### Medium Priority
|
||||
|
||||
4. **Conservative trimming**: Refine tool-output trimming heuristics to avoid altering valid assistant content
|
||||
5. **Define `max_context_tokens = 0` semantics**: Make behavior consistent and predictable
|
||||
6. **Fix i18n**: Clean up the corrupted Korean translation string
|
||||
|
||||
---
|
||||
|
||||
## Environment
|
||||
|
||||
- **Plugin**: async-context-compression
|
||||
- **OpenWebUI Version**: 0.8.9
|
||||
- **OS**: Ubuntu 24.04 LTS ARM64
|
||||
- **Reported by**: @dhaern
|
||||
- **Issue Date**: [Recently opened]
|
||||
|
||||
---
|
||||
|
||||
## References
|
||||
|
||||
- [GitHub Issue #56](https://github.com/Fu-Jie/openwebui-extensions/issues/56)
|
||||
- Plugin: `plugins/filters/async-context-compression/async_context_compression.py`
|
||||
@@ -0,0 +1,189 @@
|
||||
# Issue #56: 异步上下文压缩中的关键工具调用破坏和多个可靠性问题
|
||||
|
||||
## 概述
|
||||
本文档汇总了 [GitHub Issue #56](https://github.com/Fu-Jie/openwebui-extensions/issues/56) 中所有关于异步上下文压缩过滤器的已报告问题。
|
||||
|
||||
---
|
||||
|
||||
## 问题列表
|
||||
|
||||
### 1. 🔴 关键：原生工具调用历史可能被破坏
|
||||
|
||||
**严重级别**: 关键
|
||||
**影响范围**: 对话完整性
|
||||
|
||||
#### 描述
|
||||
压缩逻辑逐条删除消息，而不是把原生工具调用结构作为原子整体保留。这可能会破坏 assistant `tool_calls` 与其对应 `tool` 结果消息的关系。
|
||||
|
||||
#### 症状
|
||||
```
|
||||
No tool call found for function call output with call_id ...
|
||||
```
|
||||
|
||||
#### 根本原因
|
||||
- 包含 `tool_calls` 的 assistant 消息可能被删除，但其对应的 `tool` 结果消息仍保留
|
||||
- 这会产生孤立的工具输出，引用不存在的 `tool_call_id`
|
||||
- 模型/API 提供商会拒绝该请求，因为 `call_id` 不再匹配历史中的任何工具调用
|
||||
|
||||
#### 期望行为
|
||||
压缩必须把工具调用块当作原子整体对待：
|
||||
- `assistant(tool_calls)` 消息
|
||||
- 对应的 `tool` 结果消息
|
||||
- 可选的 assistant 跟进消息（消费工具结果）
|
||||
|
||||
这些消息的任何部分都不应被分割或部分删除。
|
||||
|
||||
---
|
||||
|
||||
### 2. 🟠 高优先级：压缩进度混淆了原始历史和压缩视图语义
|
||||
|
||||
**严重级别**: 高
|
||||
**影响范围**: 摘要进度一致性
|
||||
|
||||
#### 描述
|
||||
插件将 `compressed_message_count` 存储为原始对话历史的进度，但稍后从已压缩的对话视图重新计算。这混淆了同一字段的两个不同坐标系。
|
||||
|
||||
#### 问题
|
||||
- 原始历史进度（压缩前）
|
||||
- 压缩视图进度（压缩后）
|
||||
|
||||
这两个含义不一致，造成：
|
||||
- 摘要进度变得不一致
|
||||
- 摘要已存在后进度可能停滞
|
||||
- 后续更新用不同于存储值的坐标系测量
|
||||
|
||||
#### 期望行为
|
||||
进度跟踪必须在对话整个生命周期中使用单一、一致的坐标系。
|
||||
|
||||
---
|
||||
|
||||
### 3. 🟡 中等优先级：异步摘要生成没有每聊天锁
|
||||
|
||||
**严重级别**: 中等
|
||||
**影响范围**: 令牌使用、竞态条件
|
||||
|
||||
#### 描述
|
||||
每个响应都可能为同一聊天启动新的后台摘要任务，即使已有任务在进行中。
|
||||
|
||||
#### 问题
|
||||
- 摘要工作重复
|
||||
- 令牌使用增加
|
||||
- 已保存摘要状态出现竞态条件
|
||||
- 数据一致性问题
|
||||
|
||||
#### 期望行为
|
||||
使用每聊天锁机制确保每次只有一个摘要任务在该聊天中运行。
|
||||
|
||||
---
|
||||
|
||||
### 4. 🟡 中等优先级：原生工具输出裁剪太激进
|
||||
|
||||
**严重级别**: 中等
|
||||
**影响范围**: 技术对话的内容准确性
|
||||
|
||||
#### 描述
|
||||
工具输出裁剪启发式方法会重写或裁剪普通 assistant 消息，如果包含诸如以下模式：
|
||||
- 代码围栏（三个反引号）
|
||||
- `Arguments:` 文本
|
||||
- `<tool_code>` 标签
|
||||
|
||||
#### 问题
|
||||
这在技术对话中存在风险，可能无意中更改有效的 assistant 内容。
|
||||
|
||||
#### 期望行为
|
||||
裁剪逻辑应更保守，避免修改非工具输出摘要的 assistant 消息。
|
||||
|
||||
---
|
||||
|
||||
### 5. 🟡 中等优先级：`max_context_tokens = 0` 语义不一致
|
||||
|
||||
**严重级别**: 中等
|
||||
**影响范围**: 确定性、配置清晰度
|
||||
|
||||
#### 描述
|
||||
设置 `max_context_tokens = 0` 在不同代码路径中行为不一致：
|
||||
- 在某些路径中：像"无阈值"一样（特殊模式，无压缩）
|
||||
- 在其他路径中：仍然触发缩减/截断逻辑
|
||||
|
||||
#### 问题
|
||||
非确定性行为使设置变得不可预测和令人困惑。
|
||||
|
||||
#### 期望行为
|
||||
- 为 `max_context_tokens = 0` 定义清晰语义
|
||||
- 在所有代码路径中一致应用
|
||||
- 清楚地记录预期行为
|
||||
|
||||
---
|
||||
|
||||
### 6. 🔵 低优先级：破损的韩文 i18n 字符串
|
||||
|
||||
**严重级别**: 低
|
||||
**影响范围**: 韩文使用者的用户体验
|
||||
|
||||
#### 描述
|
||||
一个翻译字符串包含破损的混合语言文本。
|
||||
|
||||
#### 期望行为
|
||||
清理韩文翻译字符串，使其格式正确和语法正确。
|
||||
|
||||
---
|
||||
|
||||
## 相关/更广泛的上下文
|
||||
|
||||
**问题报告者附注**：关键错误不仅限于工具调用字段。由于压缩删除或替换整个消息对象，它还可能丢弃其他每消息字段，例如：
|
||||
- 消息级 `id`
|
||||
- `metadata`
|
||||
- `name`
|
||||
- 其他每消息属性
|
||||
|
||||
因此问题范围广于原生工具调用：任何依赖每消息元数据的集成在消息被裁剪或替换时也可能受影响。
|
||||
|
||||
---
|
||||
|
||||
## 复现步骤
|
||||
|
||||
1. 使用原生工具调用启动与模型的聊天
|
||||
2. 启用异步上下文压缩过滤器
|
||||
3. 发送足够长的对话以触发压缩/摘要生成
|
||||
4. 让模型在几个回合中执行多个工具调用
|
||||
5. 在过滤器已压缩部分历史后继续同一聊天
|
||||
|
||||
**期望**: 聊天继续正常运行
|
||||
**实际**: 聊天可能变得不同步并失败，出现错误如 `No tool call found for function call output with call_id ...`
|
||||
|
||||
**对照测试**:
|
||||
- 禁用过滤器：不出现失败
|
||||
- 启用过滤器：可靠地复现失败
|
||||
|
||||
---
|
||||
|
||||
## 建议的修复方向
|
||||
|
||||
### 高优先级（阻止 Issue #56）
|
||||
|
||||
1. **保护工具调用原子性**：以不分割 `assistant(tool_calls)` 与其对应 `tool` 消息的方式压缩历史
|
||||
2. **统一进度跟踪**：在整个过程中使用单一、一致的坐标系统追踪 `compressed_message_count`
|
||||
3. **添加每聊天锁**：确保每次只有一个后台摘要任务在该聊天中运行
|
||||
|
||||
### 中等优先级
|
||||
|
||||
4. **保守的裁剪**：精化工具输出裁剪启发式方法，避免更改有效 assistant 内容
|
||||
5. **定义 `max_context_tokens = 0` 语义**：使行为一致且可预测
|
||||
6. **修复 i18n**：清理破损的韩文翻译字符串
|
||||
|
||||
---
|
||||
|
||||
## 环境
|
||||
|
||||
- **插件**: async-context-compression
|
||||
- **OpenWebUI 版本**: 0.8.9
|
||||
- **操作系统**: Ubuntu 24.04 LTS ARM64
|
||||
- **报告者**: @dhaern
|
||||
- **问题日期**: [最近提交]
|
||||
|
||||
---
|
||||
|
||||
## 参考资源
|
||||
|
||||
- [GitHub Issue #56](https://github.com/Fu-Jie/openwebui-extensions/issues/56)
|
||||
- 插件: `plugins/filters/async-context-compression/async_context_compression.py`
|
||||
@@ -1,16 +1,15 @@
|
||||
# Async Context Compression Filter
|
||||
|
||||
**Author:** [Fu-Jie](https://github.com/Fu-Jie/openwebui-extensions) | **Version:** 1.3.0 | **Project:** [OpenWebUI Extensions](https://github.com/Fu-Jie/openwebui-extensions) | **License:** MIT
|
||||
**Author:** [Fu-Jie](https://github.com/Fu-Jie/openwebui-extensions) | **Version:** 1.4.0 | **Project:** [OpenWebUI Extensions](https://github.com/Fu-Jie/openwebui-extensions) | **License:** MIT
|
||||
|
||||
This filter reduces token consumption in long conversations through intelligent summarization and message compression while keeping conversations coherent.
|
||||
|
||||
## What's new in 1.3.0
|
||||
## What's new in 1.4.0
|
||||
|
||||
- **Internationalization (i18n)**: Complete localization of user-facing messages across 9 languages (English, Chinese, Japanese, Korean, French, German, Spanish, Italian).
|
||||
- **Smart Status Display**: Added `token_usage_status_threshold` valve (default 80%) to intelligently control when token usage status is shown.
|
||||
- **Improved Performance**: Frontend language detection and logging are optimized to be completely non-blocking, maintaining lightning-fast TTFB.
|
||||
- **Copilot SDK Integration**: Automatically detects and skips compression for copilot_sdk based models to prevent conflicts.
|
||||
- **Configuration**: `debug_mode` is now set to `false` by default for a quieter production experience.
|
||||
- **Atomic Message Grouping**: Introduced structure-aware grouping for `assistant-tool-tool-assistant` chains to prevent "No tool call found" errors.
|
||||
- **Tail Boundary Alignment**: Implemented automatic correction for truncation points to ensure they don't fall inside a tool-calling sequence.
|
||||
- **Chat Session Locking**: Added a session-based lock to prevent multiple concurrent summary tasks for the same chat ID.
|
||||
- **Enhanced Traceability**: Improved summary formatting to include message IDs, names, and metadata for better context tracking.
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -1,18 +1,17 @@
|
||||
# 异步上下文压缩过滤器
|
||||
|
||||
**作者:** [Fu-Jie](https://github.com/Fu-Jie/openwebui-extensions) | **版本:** 1.3.0 | **项目:** [OpenWebUI Extensions](https://github.com/Fu-Jie/openwebui-extensions) | **许可证:** MIT
|
||||
**作者:** [Fu-Jie](https://github.com/Fu-Jie/openwebui-extensions) | **版本:** 1.4.0 | **项目:** [OpenWebUI Extensions](https://github.com/Fu-Jie/openwebui-extensions) | **许可证:** MIT
|
||||
|
||||
> **重要提示**：为了确保所有过滤器的可维护性和易用性，每个过滤器都应附带清晰、完整的文档，以确保其功能、配置和使用方法得到充分说明。
|
||||
|
||||
本过滤器通过智能摘要和消息压缩技术，在保持对话连贯性的同时，显著降低长对话的 Token 消耗。
|
||||
|
||||
## 1.3.0 版本更新
|
||||
## 1.4.0 版本更新
|
||||
|
||||
- **国际化 (i18n) 支持**: 完成了所有用户可见消息的本地化，现已原生支持 9 种语言（含中、英、日、韩及欧洲主要语言）。
|
||||
- **智能状态显示**: 新增 `token_usage_status_threshold` 阀门（默认 80%），可以智能控制何时显示 Token 用量状态，减少不必要的打扰。
|
||||
- **性能大幅优化**: 对前端语言检测和日志处理流程进行了非阻塞重构，完全不影响首字节响应时间（TTFB），保持毫秒级极速推流。
|
||||
- **Copilot SDK 兼容**: 自动检测并跳过基于 `copilot_sdk` 模型的上下文压缩，避免冲突。
|
||||
- **配置项调整**: 为了提供更安静的生产环境体验，`debug_mode` 现已默认设置为 `false`。
|
||||
- **原子消息组 (Atomic Grouping)**: 引入结构感知的消息分组逻辑，确保工具调用链被整体保留或移除，彻底解决 "No tool call found" 错误。
|
||||
- **尾部边界自动对齐**: 实现了截断点的自动修正逻辑，确保历史上下文截断不会落在工具调用序列中间。
|
||||
- **会话级异步锁**: 增加了基于 `chat_id` 的后台任务锁，防止同一会话并发触发多个总结任务。
|
||||
- **元数据溯源增强**: 优化了总结输入格式，在总结中保留了消息 ID、参与者名称及关键元数据，提升上下文可追踪性。
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ author: Fu-Jie
|
||||
author_url: https://github.com/Fu-Jie/openwebui-extensions
|
||||
funding_url: https://github.com/open-webui
|
||||
description: Reduces token consumption in long conversations while maintaining coherence through intelligent summarization and message compression.
|
||||
version: 1.3.0
|
||||
version: 1.4.0
|
||||
openwebui_id: b1655bc8-6de9-4cad-8cb5-a6f7829a02ce
|
||||
license: MIT
|
||||
|
||||
@@ -460,7 +460,7 @@ TRANSLATIONS = {
|
||||
"status_context_summary_updated": "컨텍스트 요약 업데이트됨: {tokens} / {max_tokens} 토큰 ({ratio}%)",
|
||||
"status_generating_summary": "백그라운드에서 컨텍스트 요약 생성 중...",
|
||||
"status_summary_error": "요약 오류: {error}",
|
||||
"summary_prompt_prefix": "【이전 요약: 다음은 이전 대화의 요약이며 문맥 참고용으로만 제공됩니다. 요약 내용 자체에 답하지 말고 последу의 최신 질문에 직접 답하세요.】\n\n",
|
||||
"summary_prompt_prefix": "【이전 요약: 다음은 이전 대화의 요약이며 문맥 참고용으로만 제공됩니다. 요약 내용 자체에 답하지 말고 최신 질문에 직접 답하세요.】\n\n",
|
||||
"summary_prompt_suffix": "\n\n---\n다음은 최근 대화입니다:",
|
||||
"tool_trimmed": "... [도구 출력 잘림]\n{content}",
|
||||
"content_collapsed": "\n... [내용 접힘] ...\n",
|
||||
@@ -566,6 +566,8 @@ class Filter:
|
||||
"de-AT": "de-DE",
|
||||
}
|
||||
|
||||
# Concurrency control: Lock per chat session
|
||||
self._chat_locks = {}
|
||||
self._init_database()
|
||||
|
||||
def _resolve_language(self, lang: str) -> str:
|
||||
@@ -604,6 +606,104 @@ class Filter:
|
||||
logger.warning(f"Translation formatting failed for {key}: {e}")
|
||||
return text
|
||||
|
||||
def _get_chat_lock(self, chat_id: str) -> asyncio.Lock:
|
||||
"""Get or create an asyncio lock for a specific chat ID."""
|
||||
if chat_id not in self._chat_locks:
|
||||
self._chat_locks[chat_id] = asyncio.Lock()
|
||||
return self._chat_locks[chat_id]
|
||||
|
||||
def _get_atomic_groups(self, messages: List[Dict]) -> List[List[int]]:
|
||||
"""
|
||||
Groups message indices into atomic units that must be kept or dropped together.
|
||||
Specifically handles native tool-calling sequences:
|
||||
- assistant(tool_calls)
|
||||
- tool(s)
|
||||
- assistant(final response)
|
||||
"""
|
||||
groups = []
|
||||
current_group = []
|
||||
|
||||
for i, msg in enumerate(messages):
|
||||
role = msg.get("role")
|
||||
has_tool_calls = bool(msg.get("tool_calls"))
|
||||
|
||||
# Logic:
|
||||
# 1. If assistant message has tool_calls, it starts a potential block.
|
||||
# 2. If message is 'tool' role, it MUST belong to the preceding assistant group.
|
||||
# 3. If message is 'assistant' and follows a 'tool' group, it's the final answer.
|
||||
|
||||
if role == "assistant" and has_tool_calls:
|
||||
# Close previous group if any
|
||||
if current_group:
|
||||
groups.append(current_group)
|
||||
current_group = [i]
|
||||
elif role == "tool":
|
||||
# Force tool results into the current group
|
||||
if not current_group:
|
||||
# An orphaned tool result? Group it alone but warn
|
||||
groups.append([i])
|
||||
else:
|
||||
current_group.append(i)
|
||||
elif (
|
||||
role == "assistant"
|
||||
and current_group
|
||||
and messages[current_group[-1]].get("role") == "tool"
|
||||
):
|
||||
# This is likely the assistant follow-up consuming tool results
|
||||
current_group.append(i)
|
||||
groups.append(current_group)
|
||||
current_group = []
|
||||
else:
|
||||
# Regular message (user, or assistant without tool calls)
|
||||
if current_group:
|
||||
groups.append(current_group)
|
||||
current_group = []
|
||||
groups.append([i])
|
||||
|
||||
if current_group:
|
||||
groups.append(current_group)
|
||||
|
||||
return groups
|
||||
|
||||
def _get_effective_keep_first(self, messages: List[Dict]) -> int:
|
||||
"""Protect configured head messages and all leading system messages."""
|
||||
last_system_index = -1
|
||||
for i, msg in enumerate(messages):
|
||||
if msg.get("role") == "system":
|
||||
last_system_index = i
|
||||
|
||||
return max(self.valves.keep_first, last_system_index + 1)
|
||||
|
||||
def _align_tail_start_to_atomic_boundary(
|
||||
self, messages: List[Dict], raw_start_index: int, protected_prefix: int
|
||||
) -> int:
|
||||
"""
|
||||
Align the retained tail to an atomic-group boundary.
|
||||
|
||||
If the raw tail start falls in the middle of an assistant/tool/assistant
|
||||
chain, move it backward to the start of that chain so the next request
|
||||
never begins with an orphaned tool result or assistant follow-up.
|
||||
"""
|
||||
aligned_start = max(raw_start_index, protected_prefix)
|
||||
|
||||
if aligned_start <= protected_prefix or aligned_start >= len(messages):
|
||||
return aligned_start
|
||||
|
||||
trimmable = messages[protected_prefix:]
|
||||
local_start = aligned_start - protected_prefix
|
||||
|
||||
for group in self._get_atomic_groups(trimmable):
|
||||
group_start = group[0]
|
||||
group_end = group[-1] + 1
|
||||
|
||||
if local_start == group_start:
|
||||
return aligned_start
|
||||
|
||||
if group_start < local_start < group_end:
|
||||
return protected_prefix + group_start
|
||||
|
||||
return aligned_start
|
||||
|
||||
async def _get_user_context(
|
||||
self,
|
||||
__user__: Optional[Dict[str, Any]],
|
||||
@@ -1218,87 +1318,6 @@ class Filter:
|
||||
content = msg.get("content", "")
|
||||
if not isinstance(content, str):
|
||||
continue
|
||||
|
||||
role = msg.get("role")
|
||||
|
||||
# Only process assistant messages with native tool outputs
|
||||
if role == "assistant":
|
||||
# Detect tool output markers in assistant content
|
||||
if "tool_call_id:" in content or (
|
||||
content.startswith('"') and "\\"" in content
|
||||
):
|
||||
# Always trim tool outputs when enabled
|
||||
|
||||
if self.valves.show_debug_log and __event_call__:
|
||||
await self._log(
|
||||
f"[Inlet] 🔍 Native tool output detected in assistant message.",
|
||||
event_call=__event_call__,
|
||||
)
|
||||
|
||||
# Strategy 1: Tool Output / Code Block Trimming
|
||||
# Detect if message contains large tool outputs or code blocks
|
||||
# Improved regex to be less brittle
|
||||
is_tool_output = (
|
||||
""" in content
|
||||
or "Arguments:" in content
|
||||
or "```" in content
|
||||
or "<tool_code>" in content
|
||||
)
|
||||
|
||||
if is_tool_output:
|
||||
# Regex to find the last occurrence of a tool output block or code block
|
||||
# This pattern looks for:
|
||||
# 1. OpenWebUI's escaped JSON format: """..."""
|
||||
# 2. "Arguments: {...}" pattern
|
||||
# 3. Generic code blocks: ```...```
|
||||
# 4. <tool_code>...</tool_code>
|
||||
# It captures the content *after* the last such block.
|
||||
tool_output_pattern = r'(?:""".*?"""|Arguments:\s*\{[^}]+\}|```.*?```|<tool_code>.*?</tool_code>)\s*'
|
||||
|
||||
# Find all matches
|
||||
matches = list(
|
||||
re.finditer(tool_output_pattern, content, re.DOTALL)
|
||||
)
|
||||
|
||||
if matches:
|
||||
# Get the end position of the last match
|
||||
last_match_end = matches[-1].end()
|
||||
|
||||
# Everything after the last tool output is the final answer
|
||||
final_answer = content[last_match_end:].strip()
|
||||
|
||||
if final_answer:
|
||||
msg["content"] = self._get_translation(
|
||||
(
|
||||
__user__.get("language", "en-US")
|
||||
if __user__
|
||||
else "en-US"
|
||||
),
|
||||
"tool_trimmed",
|
||||
content=final_answer,
|
||||
)
|
||||
trimmed_count += 1
|
||||
else:
|
||||
# Fallback: If no specific pattern matched, but it was identified as tool output,
|
||||
# try a simpler split or just mark as trimmed if no final answer can be extracted.
|
||||
# (Preserving backward compatibility or different model behaviors)
|
||||
parts = re.split(
|
||||
r"(?:Arguments:\s*\{[^}]+\})\n+", content
|
||||
)
|
||||
if len(parts) > 1:
|
||||
final_answer = parts[-1].strip()
|
||||
if final_answer:
|
||||
msg["content"] = self._get_translation(
|
||||
(
|
||||
__user__.get("language", "en-US")
|
||||
if __user__
|
||||
else "en-US"
|
||||
),
|
||||
"tool_trimmed",
|
||||
content=final_answer,
|
||||
)
|
||||
trimmed_count += 1
|
||||
|
||||
if trimmed_count > 0 and self.valves.show_debug_log and __event_call__:
|
||||
await self._log(
|
||||
f"[Inlet] ✂️ Trimmed {trimmed_count} tool output message(s).",
|
||||
@@ -1500,12 +1519,7 @@ class Filter:
|
||||
summary_record = await asyncio.to_thread(self._load_summary_record, chat_id)
|
||||
|
||||
# Calculate effective_keep_first to ensure all system messages are protected
|
||||
last_system_index = -1
|
||||
for i, msg in enumerate(messages):
|
||||
if msg.get("role") == "system":
|
||||
last_system_index = i
|
||||
|
||||
effective_keep_first = max(self.valves.keep_first, last_system_index + 1)
|
||||
effective_keep_first = self._get_effective_keep_first(messages)
|
||||
|
||||
final_messages = []
|
||||
|
||||
@@ -1531,9 +1545,13 @@ class Filter:
|
||||
)
|
||||
summary_msg = {"role": "assistant", "content": summary_content}
|
||||
|
||||
# 3. Tail messages (Tail) - All messages starting from the last compression point
|
||||
# Note: Must ensure head messages are not duplicated
|
||||
start_index = max(compressed_count, effective_keep_first)
|
||||
# 3. Tail messages (Tail) - All messages starting from the last compression point.
|
||||
# Align legacy/raw progress to an atomic boundary so old summary rows do not
|
||||
# reintroduce orphaned tool messages into the retained tail.
|
||||
raw_start_index = max(compressed_count, effective_keep_first)
|
||||
start_index = self._align_tail_start_to_atomic_boundary(
|
||||
messages, raw_start_index, effective_keep_first
|
||||
)
|
||||
tail_messages = messages[start_index:]
|
||||
|
||||
if self.valves.show_debug_log and __event_call__:
|
||||
@@ -1570,7 +1588,14 @@ class Filter:
|
||||
estimated_tokens = self._estimate_messages_tokens(calc_messages)
|
||||
|
||||
# Since this is a hard limit check, only skip precise calculation if we are far below it (margin of 15%)
|
||||
if estimated_tokens < max_context_tokens * 0.85:
|
||||
# max_context_tokens == 0 means "no limit", skip reduction entirely
|
||||
if max_context_tokens <= 0:
|
||||
total_tokens = estimated_tokens
|
||||
await self._log(
|
||||
f"[Inlet] 🔎 No max_context_tokens limit set (0). Skipping reduction. Est: {total_tokens}t",
|
||||
event_call=__event_call__,
|
||||
)
|
||||
elif estimated_tokens < max_context_tokens * 0.85:
|
||||
total_tokens = estimated_tokens
|
||||
await self._log(
|
||||
f"[Inlet] 🔎 Fast Preflight Check (Est): {total_tokens}t / {max_context_tokens}t (Well within limit)",
|
||||
@@ -1588,126 +1613,36 @@ class Filter:
|
||||
event_call=__event_call__,
|
||||
)
|
||||
|
||||
# If over budget, reduce history (Keep Last)
|
||||
if total_tokens > max_context_tokens:
|
||||
await self._log(
|
||||
f"[Inlet] ⚠️ Candidate prompt ({total_tokens} Tokens) exceeds limit ({max_context_tokens}). Reducing history...",
|
||||
log_type="warning",
|
||||
event_call=__event_call__,
|
||||
)
|
||||
# Identify atomic groups to avoid breaking tool-calling context
|
||||
atomic_groups = self._get_atomic_groups(tail_messages)
|
||||
|
||||
# Dynamically remove messages from the start of tail_messages
|
||||
# Always try to keep at least the last message (usually user input)
|
||||
while total_tokens > max_context_tokens and len(tail_messages) > 1:
|
||||
# Strategy 1: Structure-Aware Assistant Trimming
|
||||
# Retain: Headers (#), First Line, Last Line. Collapse the rest.
|
||||
target_msg = None
|
||||
target_idx = -1
|
||||
while total_tokens > max_context_tokens and len(atomic_groups) > 1:
|
||||
# Strategy 1: Structure-Aware Assistant Trimming (Optional, only for non-tool messages)
|
||||
# For simplicity and reliability in this fix, we prioritize Group-Drop over partial trim
|
||||
# if a group contains tool calls.
|
||||
|
||||
# Find the oldest assistant message that is long and not yet trimmed
|
||||
for i, msg in enumerate(tail_messages):
|
||||
# Skip the last message (usually user input, protect it)
|
||||
if i == len(tail_messages) - 1:
|
||||
break
|
||||
# Strategy 2: Drop Oldest Atomic Group Entirely
|
||||
dropped_group_indices = atomic_groups.pop(0)
|
||||
# Note: indices in dropped_group_indices are relative to ORIGINAL tail_messages
|
||||
# But since we are popping from tail_messages itself, we need to be careful.
|
||||
|
||||
if msg.get("role") == "assistant":
|
||||
content = str(msg.get("content", ""))
|
||||
is_trimmed = msg.get("metadata", {}).get(
|
||||
"is_trimmed", False
|
||||
)
|
||||
# Only target messages that are reasonably long (> 200 chars)
|
||||
if len(content) > 200 and not is_trimmed:
|
||||
target_msg = msg
|
||||
target_idx = i
|
||||
break
|
||||
|
||||
# If found a suitable assistant message, apply structure-aware trimming
|
||||
if target_msg:
|
||||
content = str(target_msg.get("content", ""))
|
||||
lines = content.split("\n")
|
||||
kept_lines = []
|
||||
|
||||
# Logic: Keep headers, first non-empty line, last non-empty line
|
||||
first_line_found = False
|
||||
last_line_idx = -1
|
||||
|
||||
# Find last non-empty line index
|
||||
for idx in range(len(lines) - 1, -1, -1):
|
||||
if lines[idx].strip():
|
||||
last_line_idx = idx
|
||||
break
|
||||
|
||||
for idx, line in enumerate(lines):
|
||||
stripped = line.strip()
|
||||
if not stripped:
|
||||
continue
|
||||
|
||||
# Keep headers (H1-H6, requires space after #)
|
||||
if re.match(r"^#{1,6}\s+", stripped):
|
||||
kept_lines.append(line)
|
||||
continue
|
||||
|
||||
# Keep first non-empty line
|
||||
if not first_line_found:
|
||||
kept_lines.append(line)
|
||||
first_line_found = True
|
||||
# Add placeholder if there's more content coming
|
||||
if idx < last_line_idx:
|
||||
kept_lines.append(
|
||||
self._get_translation(lang, "content_collapsed")
|
||||
)
|
||||
continue
|
||||
|
||||
# Keep last non-empty line
|
||||
if idx == last_line_idx:
|
||||
kept_lines.append(line)
|
||||
continue
|
||||
|
||||
# Update message content
|
||||
new_content = "\n".join(kept_lines)
|
||||
|
||||
# Safety check: If trimming didn't save much (e.g. mostly headers), force drop
|
||||
if len(new_content) > len(content) * 0.8:
|
||||
# Fallback to drop if structure preservation is too verbose
|
||||
pass
|
||||
# Extract and drop messages in this group from the actual list
|
||||
# Since we always pop group 0, we pop len(dropped_group_indices) times from front
|
||||
dropped_tokens = 0
|
||||
for _ in range(len(dropped_group_indices)):
|
||||
dropped = tail_messages.pop(0)
|
||||
if total_tokens == estimated_tokens:
|
||||
dropped_tokens += len(str(dropped.get("content", ""))) // 4
|
||||
else:
|
||||
target_msg["content"] = new_content
|
||||
if "metadata" not in target_msg:
|
||||
target_msg["metadata"] = {}
|
||||
target_msg["metadata"]["is_trimmed"] = True
|
||||
dropped_tokens += self._count_tokens(
|
||||
str(dropped.get("content", ""))
|
||||
)
|
||||
|
||||
# Calculate token reduction
|
||||
# Use current token strategy
|
||||
if total_tokens == estimated_tokens:
|
||||
old_tokens = len(content) // 4
|
||||
new_tokens = len(target_msg["content"]) // 4
|
||||
else:
|
||||
old_tokens = self._count_tokens(content)
|
||||
new_tokens = self._count_tokens(target_msg["content"])
|
||||
diff = old_tokens - new_tokens
|
||||
total_tokens -= diff
|
||||
|
||||
if self.valves.show_debug_log and __event_call__:
|
||||
await self._log(
|
||||
f"[Inlet] 📉 Structure-trimmed Assistant message. Saved: {diff} tokens.",
|
||||
event_call=__event_call__,
|
||||
)
|
||||
continue
|
||||
|
||||
# Strategy 2: Fallback - Drop Oldest Message Entirely (FIFO)
|
||||
# (User requested to remove progressive trimming for other cases)
|
||||
dropped = tail_messages.pop(0)
|
||||
if total_tokens == estimated_tokens:
|
||||
dropped_tokens = len(str(dropped.get("content", ""))) // 4
|
||||
else:
|
||||
dropped_tokens = self._count_tokens(
|
||||
str(dropped.get("content", ""))
|
||||
)
|
||||
total_tokens -= dropped_tokens
|
||||
|
||||
if self.valves.show_debug_log and __event_call__:
|
||||
await self._log(
|
||||
f"[Inlet] 🗑️ Dropped message from history to fit context. Role: {dropped.get('role')}, Tokens: {dropped_tokens}",
|
||||
f"[Inlet] 🗑️ Dropped atomic group ({len(dropped_group_indices)} msgs) to fit context. Tokens: {dropped_tokens}",
|
||||
event_call=__event_call__,
|
||||
)
|
||||
|
||||
@@ -1829,7 +1764,14 @@ class Filter:
|
||||
estimated_tokens = self._estimate_messages_tokens(calc_messages)
|
||||
|
||||
# Only skip precise calculation if we are clearly below the limit
|
||||
if estimated_tokens < max_context_tokens * 0.85:
|
||||
# max_context_tokens == 0 means "no limit", skip reduction entirely
|
||||
if max_context_tokens <= 0:
|
||||
total_tokens = estimated_tokens
|
||||
await self._log(
|
||||
f"[Inlet] 🔎 No max_context_tokens limit set (0). Skipping reduction. Est: {total_tokens}t",
|
||||
event_call=__event_call__,
|
||||
)
|
||||
elif estimated_tokens < max_context_tokens * 0.85:
|
||||
total_tokens = estimated_tokens
|
||||
await self._log(
|
||||
f"[Inlet] 🔎 Fast limit check (Est): {total_tokens}t / {max_context_tokens}t",
|
||||
@@ -1840,34 +1782,34 @@ class Filter:
|
||||
self._calculate_messages_tokens, calc_messages
|
||||
)
|
||||
|
||||
if total_tokens > max_context_tokens:
|
||||
if total_tokens > max_context_tokens and max_context_tokens > 0:
|
||||
await self._log(
|
||||
f"[Inlet] ⚠️ Original messages ({total_tokens} Tokens) exceed limit ({max_context_tokens}). Reducing history...",
|
||||
log_type="warning",
|
||||
event_call=__event_call__,
|
||||
)
|
||||
|
||||
# Dynamically remove messages from the start
|
||||
# We'll respect effective_keep_first to protect system prompts
|
||||
# Use atomic grouping to preserve tool-calling integrity
|
||||
trimmable = final_messages[effective_keep_first:]
|
||||
atomic_groups = self._get_atomic_groups(trimmable)
|
||||
|
||||
start_trim_index = effective_keep_first
|
||||
|
||||
while (
|
||||
total_tokens > max_context_tokens
|
||||
and len(final_messages)
|
||||
> start_trim_index + 1 # Keep at least 1 message after keep_first
|
||||
):
|
||||
dropped = final_messages.pop(start_trim_index)
|
||||
if total_tokens == estimated_tokens:
|
||||
dropped_tokens = len(str(dropped.get("content", ""))) // 4
|
||||
else:
|
||||
dropped_tokens = self._count_tokens(
|
||||
str(dropped.get("content", ""))
|
||||
)
|
||||
while total_tokens > max_context_tokens and len(atomic_groups) > 1:
|
||||
dropped_group_indices = atomic_groups.pop(0)
|
||||
dropped_tokens = 0
|
||||
for _ in range(len(dropped_group_indices)):
|
||||
dropped = trimmable.pop(0)
|
||||
if total_tokens == estimated_tokens:
|
||||
dropped_tokens += len(str(dropped.get("content", ""))) // 4
|
||||
else:
|
||||
dropped_tokens += self._count_tokens(
|
||||
str(dropped.get("content", ""))
|
||||
)
|
||||
total_tokens -= dropped_tokens
|
||||
|
||||
final_messages = final_messages[:effective_keep_first] + trimmable
|
||||
|
||||
await self._log(
|
||||
f"[Inlet] ✂️ Messages reduced. New total: {total_tokens} Tokens",
|
||||
f"[Inlet] ✂️ Messages reduced (atomic). New total: {total_tokens} Tokens",
|
||||
event_call=__event_call__,
|
||||
)
|
||||
|
||||
@@ -1948,12 +1890,28 @@ class Filter:
|
||||
model = body.get("model") or ""
|
||||
messages = body.get("messages", [])
|
||||
|
||||
# Calculate target compression progress directly
|
||||
target_compressed_count = max(0, len(messages) - self.valves.keep_last)
|
||||
# Calculate target compression progress directly, then align it to an atomic
|
||||
# boundary so the saved summary never cuts through a tool-calling block.
|
||||
effective_keep_first = self._get_effective_keep_first(messages)
|
||||
raw_target_compressed_count = max(0, len(messages) - self.valves.keep_last)
|
||||
target_compressed_count = self._align_tail_start_to_atomic_boundary(
|
||||
messages, raw_target_compressed_count, effective_keep_first
|
||||
)
|
||||
|
||||
# Process Token calculation and summary generation asynchronously in the background
|
||||
# Use a lock to prevent multiple concurrent summary tasks for the same chat
|
||||
chat_lock = self._get_chat_lock(chat_id)
|
||||
|
||||
if chat_lock.locked():
|
||||
if self.valves.debug_mode:
|
||||
logger.info(
|
||||
f"[Outlet] Skipping summary task for {chat_id}: Task already in progress"
|
||||
)
|
||||
return body
|
||||
|
||||
# Process Token calculation and summary generation asynchronously in the background (do not wait for completion, do not affect output)
|
||||
asyncio.create_task(
|
||||
self._check_and_generate_summary_async(
|
||||
self._locked_summary_task(
|
||||
chat_lock,
|
||||
chat_id,
|
||||
model,
|
||||
body,
|
||||
@@ -1967,6 +1925,31 @@ class Filter:
|
||||
|
||||
return body
|
||||
|
||||
async def _locked_summary_task(
|
||||
self,
|
||||
lock: asyncio.Lock,
|
||||
chat_id: str,
|
||||
model: str,
|
||||
body: dict,
|
||||
user_data: Optional[dict],
|
||||
target_compressed_count: Optional[int],
|
||||
lang: str,
|
||||
__event_emitter__: Callable,
|
||||
__event_call__: Callable,
|
||||
):
|
||||
"""Wrapper to run summary generation with an async lock."""
|
||||
async with lock:
|
||||
await self._check_and_generate_summary_async(
|
||||
chat_id,
|
||||
model,
|
||||
body,
|
||||
user_data,
|
||||
target_compressed_count,
|
||||
lang,
|
||||
__event_emitter__,
|
||||
__event_call__,
|
||||
)
|
||||
|
||||
async def _check_and_generate_summary_async(
|
||||
self,
|
||||
chat_id: str,
|
||||
@@ -2134,11 +2117,19 @@ class Filter:
|
||||
event_call=__event_call__,
|
||||
)
|
||||
|
||||
# 2. Determine the range of messages to compress (Middle)
|
||||
start_index = self.valves.keep_first
|
||||
end_index = len(messages) - self.valves.keep_last
|
||||
if self.valves.keep_last == 0:
|
||||
end_index = len(messages)
|
||||
# 2. Determine the range of messages to compress (Middle).
|
||||
# Use the same aligned boundary used for summary persistence so the tail
|
||||
# always starts at an atomic-group boundary.
|
||||
start_index = self._get_effective_keep_first(messages)
|
||||
if target_compressed_count is None:
|
||||
raw_end_index = max(0, len(messages) - self.valves.keep_last)
|
||||
end_index = self._align_tail_start_to_atomic_boundary(
|
||||
messages, raw_end_index, start_index
|
||||
)
|
||||
else:
|
||||
end_index = self._align_tail_start_to_atomic_boundary(
|
||||
messages, target_compressed_count, start_index
|
||||
)
|
||||
|
||||
# Ensure indices are valid
|
||||
if start_index >= end_index:
|
||||
@@ -2204,7 +2195,12 @@ class Filter:
|
||||
# Add buffer for prompt and output (approx 2000 tokens)
|
||||
estimated_input_tokens = middle_tokens + 2000
|
||||
|
||||
if estimated_input_tokens > max_context_tokens:
|
||||
if max_context_tokens <= 0:
|
||||
await self._log(
|
||||
"[🤖 Async Summary Task] No max_context_tokens limit set (0). Skipping middle-message truncation.",
|
||||
event_call=__event_call__,
|
||||
)
|
||||
elif estimated_input_tokens > max_context_tokens:
|
||||
excess_tokens = estimated_input_tokens - max_context_tokens
|
||||
await self._log(
|
||||
f"[🤖 Async Summary Task] ⚠️ Middle messages ({middle_tokens} Tokens) + Buffer exceed summary model limit ({max_context_tokens}), need to remove approx {excess_tokens} Tokens",
|
||||
@@ -2212,20 +2208,24 @@ class Filter:
|
||||
event_call=__event_call__,
|
||||
)
|
||||
|
||||
# Remove from the head of middle_messages
|
||||
# Remove from the head of middle_messages using atomic groups
|
||||
# to avoid creating orphaned tool-call/tool-result pairs.
|
||||
removed_tokens = 0
|
||||
removed_count = 0
|
||||
|
||||
while removed_tokens < excess_tokens and middle_messages:
|
||||
msg_to_remove = middle_messages.pop(0)
|
||||
msg_tokens = self._count_tokens(
|
||||
str(msg_to_remove.get("content", ""))
|
||||
)
|
||||
removed_tokens += msg_tokens
|
||||
removed_count += 1
|
||||
summary_atomic_groups = self._get_atomic_groups(middle_messages)
|
||||
while removed_tokens < excess_tokens and len(summary_atomic_groups) > 1:
|
||||
group_indices = summary_atomic_groups.pop(0)
|
||||
for _ in range(len(group_indices)):
|
||||
msg_to_remove = middle_messages.pop(0)
|
||||
msg_tokens = self._count_tokens(
|
||||
str(msg_to_remove.get("content", ""))
|
||||
)
|
||||
removed_tokens += msg_tokens
|
||||
removed_count += 1
|
||||
|
||||
await self._log(
|
||||
f"[🤖 Async Summary Task] Removed {removed_count} messages, totaling {removed_tokens} Tokens",
|
||||
f"[🤖 Async Summary Task] Removed {removed_count} messages (atomic), totaling {removed_tokens} Tokens",
|
||||
event_call=__event_call__,
|
||||
)
|
||||
|
||||
@@ -2443,12 +2443,26 @@ class Filter:
|
||||
logger.exception("[🤖 Async Summary Task] Unhandled exception")
|
||||
|
||||
def _format_messages_for_summary(self, messages: list) -> str:
|
||||
"""Formats messages for summarization."""
|
||||
"""
|
||||
Formats messages for summarization with metadata awareness.
|
||||
Preserves IDs, names, and key metadata fragments to ensure traceability.
|
||||
"""
|
||||
formatted = []
|
||||
for i, msg in enumerate(messages, 1):
|
||||
role = msg.get("role", "unknown")
|
||||
content = msg.get("content", "")
|
||||
|
||||
# Extract Identity Metadata
|
||||
msg_id = msg.get("id", "N/A")
|
||||
msg_name = msg.get("name", "")
|
||||
# Only pick non-system, interesting metadata keys
|
||||
metadata = msg.get("metadata", {})
|
||||
safe_meta = {
|
||||
k: v
|
||||
for k, v in metadata.items()
|
||||
if k not in ["is_trimmed", "is_summary"]
|
||||
}
|
||||
|
||||
# Handle multimodal content
|
||||
if isinstance(content, list):
|
||||
text_parts = []
|
||||
@@ -2460,10 +2474,13 @@ class Filter:
|
||||
# Handle role name
|
||||
role_name = {"user": "User", "assistant": "Assistant"}.get(role, role)
|
||||
|
||||
# User requested to remove truncation to allow full context for summary
|
||||
# unless it exceeds model limits (which is handled by the LLM call itself or max_tokens)
|
||||
meta_str = f" [ID: {msg_id}]"
|
||||
if msg_name:
|
||||
meta_str += f" [Name: {msg_name}]"
|
||||
if safe_meta:
|
||||
meta_str += f" [Meta: {safe_meta}]"
|
||||
|
||||
formatted.append(f"[{i}] {role_name}: {content}")
|
||||
formatted.append(f"[{i}] {role_name}{meta_str}: {content}")
|
||||
|
||||
return "\n\n".join(formatted)
|
||||
|
||||
@@ -2511,11 +2528,15 @@ This conversation may contain previous summaries (as system messages or text) an
|
||||
* **Progress & Conclusions**: Completed steps and reached consensus.
|
||||
* **Action Items/Next Steps**: Clear follow-up actions.
|
||||
|
||||
### Identity Traceability
|
||||
The input dialogue contains message IDs (e.g., [ID: ...]) and optional names.
|
||||
If a specific message contributes a critical decision, a unique code snippet, or a tool-calling result, please reference its ID or Name in your summary to maintain traceability.
|
||||
|
||||
---
|
||||
{new_conversation_text}
|
||||
---
|
||||
|
||||
Based on the content above, generate the summary:
|
||||
Based on the content above, generate the summary (including key message identities where relevant):
|
||||
"""
|
||||
# Determine the model to use
|
||||
model = self._clean_model_id(self.valves.summary_model) or self._clean_model_id(
|
||||
|
||||
@@ -0,0 +1,169 @@
|
||||
# Async Context Compression 核心故障分析与修复总结 (Issue #56)
|
||||
|
||||
Report: <https://github.com/Fu-Jie/openwebui-extensions/issues/56>
|
||||
|
||||
## 1. 问题分析
|
||||
|
||||
### 1.1 Critical: Tool-Calling 结构损坏
|
||||
|
||||
- **故障根源**: 插件在压缩历史消息时采用了“消息感知 (Message-Aware)”而非“结构感知 (Structure-Aware)”的策略。大模型的 `tool-calling` 依赖于 `assistant(tool_calls)` 与紧随其后的 `tool(s)` 消息的严格配对。
|
||||
- **后果**: 如果压缩导致只有 `tool_calls` 被总结，而其对应的 `tool` 结果仍留在上下文，将触发 `No tool call found` 致命错误。
|
||||
|
||||
### 1.2 High: 坐标系偏移导致进度错位
|
||||
|
||||
- **故障根源**: 插件此前使用 `len(messages)` 计算总结进度。由于总结后消息列表变短，旧的索引无法正确映射回原始历史坐标。
|
||||
- **后果**: 导致总结逻辑在对话进行中反复处理重叠的区间，或在某些边界条件下停止推进。
|
||||
|
||||
### 1.3 Medium: 并发竞态与元数据丢失
|
||||
|
||||
- **并发**: 缺乏针对 `chat_id` 的后台任务锁，导致并发请求下可能触发多个 LLM 总结任务。
|
||||
- **元数据**: 消息被折叠为总结块后，其原始的 `id`、`name` 和扩展 `metadata` 彻底消失，破坏了依赖这些指纹的第三方集成。
|
||||
|
||||
---
|
||||
|
||||
## 2. 修复方案 (核心重构)
|
||||
|
||||
### 2.1 引入原子消息组 (Atomic Grouping)
|
||||
|
||||
实现 `_get_atomic_groups` 算法，将 `assistant-tool-assistant` 的调用链识别并标记。确保这些组被**整体保留或整体移除**。
|
||||
|
||||
该算法应用于两处截断路径：
|
||||
|
||||
1. **inlet 阶段**（有 summary / 无 summary 两条路径均已覆盖）
|
||||
2. **outlet 后台 summary 任务**中，当 `middle_messages` 超出 summary model 上下文窗口需要截断时，同样使用原子组删除，防止在进入 LLM 总结前产生孤立的 tool result。（2026-03-09 补丁）
|
||||
|
||||
具体做法：
|
||||
|
||||
- `_get_atomic_groups(messages)` 会把消息扫描成多个“不可拆分单元”。
|
||||
- 当遇到 `assistant` 且带 `tool_calls` 时，开启一个原子组。
|
||||
- 后续所有 `tool` 消息都会被并入这个原子组。
|
||||
- 如果紧跟着出现消费工具结果的 assistant 跟进回复，也会并入同一个原子组。
|
||||
- 这样做之后，裁剪逻辑不再按“单条消息”删除，而是按“整组消息”删除。
|
||||
|
||||
这解决了 Issue #56 最核心的问题：
|
||||
|
||||
- 过去：可能删掉 `assistant(tool_calls)`，却留下 `tool` 结果
|
||||
- 现在：要么整组一起保留，要么整组一起移除
|
||||
|
||||
也就是说，发送给模型的历史上下文不再出现孤立的 `tool_call_id`。
|
||||
|
||||
### 2.1.1 Tail 边界对齐 (Atomic Boundary Alignment)
|
||||
|
||||
除了按组删除之外，还新增了 `_align_tail_start_to_atomic_boundary` 来修正“保留尾部”的起点。
|
||||
|
||||
原因是：即使 `compressed_message_count` 本身来自旧数据或原始计数，如果它刚好落在一个工具调用链中间，直接拿来做 `tail` 起点仍然会造成损坏。
|
||||
|
||||
修复步骤如下：
|
||||
|
||||
1. 先计算理论上的 `raw_start_index`
|
||||
2. 调用 `_align_tail_start_to_atomic_boundary(messages, raw_start_index, protected_prefix)`
|
||||
3. 如果该起点落在某个原子组内部，就自动回退到该组起始位置
|
||||
4. 用修正后的 `start_index` 重建 `tail_messages`
|
||||
|
||||
这个逻辑同时用于：
|
||||
|
||||
- `inlet` 中已存在 summary 时的 tail 重建
|
||||
- `outlet` 中计算 `target_compressed_count`
|
||||
- 后台 summary 任务里计算 `middle_messages` / `tail` 分界线
|
||||
|
||||
因此，修复并不只是“删除时按组删除”，而是连“边界落点”本身都改成结构感知。
|
||||
|
||||
### 2.2 实现单会话异步锁 (Chat Session Lock)
|
||||
|
||||
在 `Filter` 类中维护 `_chat_locks`。在 `outlet` 阶段，如果检测到已有后台任务持有该锁，则自动跳过当前请求，确保一个 `chat_id` 始终只有一个任务在运行。
|
||||
|
||||
具体流程：
|
||||
|
||||
1. `outlet` 先通过 `_get_chat_lock(chat_id)` 取得当前会话的锁对象
|
||||
2. 如果 `chat_lock.locked()` 为真，直接跳过本次后台总结任务
|
||||
3. 如果没有任务在运行，则创建 `_locked_summary_task(...)`
|
||||
4. `_locked_summary_task` 内部用 `async with lock:` 包裹真正的 `_check_and_generate_summary_async(...)`
|
||||
|
||||
这样修复后，同一个会话不会再并发发起多个 summary LLM 调用，也不会出现多个后台任务互相覆盖 `compressed_message_count` 或 summary 内容的情况。
|
||||
|
||||
### 2.3 元数据溯源 (Metadata Traceability)
|
||||
|
||||
重构总结数据的格式化流程：
|
||||
|
||||
- 提取消息 ID (`msg[id]`)、参与者名称 (`msg[name]`) 和关键元数据。
|
||||
- 将这些身份标识以 `[ID: xxx] [Name: yyy]` 的形式注入 LLM 的总结输入。
|
||||
- 增强总结提示词 (Prompt)，要求模型按 ID 引用重要行为。
|
||||
|
||||
这里的修复目的不是“恢复被压缩消息的原始对象”，而是尽量保留它们的身份痕迹，降低以下风险：
|
||||
|
||||
- 压缩后 summary 完全失去消息来源
|
||||
- 某段关键决策、工具结果或用户要求在总结中无法追溯
|
||||
- 依赖消息身份的后续分析或人工排查变得困难
|
||||
|
||||
当前实现方式是 `_format_messages_for_summary`：
|
||||
|
||||
- 把每条消息格式化为 `[序号] Role [ID: ...] [Name: ...] [Meta: ...]: content`
|
||||
- 多模态内容会先抽出文本部分再汇总
|
||||
- summary prompt 中明确要求模型保留关键 ID / Name 的可追踪性
|
||||
|
||||
这不能等价替代原始消息对象，但比“直接丢掉所有身份信息后只保留一段自然语言总结”安全很多。
|
||||
|
||||
### 2.4 `max_context_tokens = 0` 语义统一
|
||||
|
||||
Issue #56 里还有一个不太显眼但实际会影响行为的一致性问题：
|
||||
|
||||
- `inlet` 路径已经把 `max_context_tokens <= 0` 视为“无限制，不做裁剪”
|
||||
- 但后台 summary 任务里，之前仍会继续拿 `0` 参与 `estimated_input_tokens > max_context_tokens` 判断
|
||||
|
||||
这会造成前台请求和后台总结对同一配置的解释不一致。
|
||||
|
||||
修复后：
|
||||
|
||||
- `inlet` 与后台 summary 路径统一使用 `<= 0` 表示“no limit”
|
||||
- 当 `max_context_tokens <= 0` 时，后台任务会直接跳过 `middle_messages` 的截断逻辑
|
||||
- 并新增回归测试，确保该行为不会再次退化
|
||||
|
||||
这一步虽然不如 tool-calling 原子化那么显眼，但它解决了“配置含义前后不一致”的稳定性问题。
|
||||
|
||||
### 2.5 tool-output trimming 的风险收敛
|
||||
|
||||
Issue #56 提到原先的 tool-output trimming 可能误伤普通 assistant 内容。对此没有继续扩展一套更复杂的启发式规则，而是采用了更保守的收敛策略：
|
||||
|
||||
- `enable_tool_output_trimming` 默认保持 `False`
|
||||
- 当前 trimming 分支不再主动重写普通 assistant 内容
|
||||
|
||||
这意味着插件优先保证“不误伤正常消息”，而不是冒险做激进裁剪。对于这个 bug 修复阶段，这是一个刻意的稳定性优先决策。
|
||||
|
||||
### 2.6 修复顺序总结
|
||||
|
||||
从实现层面看，这次修复不是单点补丁，而是一组按顺序落下去的结构性改动：
|
||||
|
||||
1. 先把消息从“单条处理”升级为“原子组处理”
|
||||
2. 再把 tail / middle 的边界从“裸索引”升级为“结构感知边界”
|
||||
3. 再加每会话异步锁，堵住并发 summary 覆盖
|
||||
4. 再补 summary 输入格式，让被压缩历史仍保留可追踪身份信息
|
||||
5. 最后统一 `max_context_tokens = 0` 的语义，并加测试防回归
|
||||
|
||||
因此，Issue #56 的修复本质上是：
|
||||
|
||||
把这个过滤器从“按字符串和长度裁剪消息”重构成“按对话结构和上下文契约裁剪消息”。
|
||||
|
||||
---
|
||||
|
||||
## 3. 修复覆盖范围对照表
|
||||
|
||||
| # | 严重级别 | 问题 | 状态 |
|
||||
|---|----------|------|------|
|
||||
| 1 | **Critical** | tool-calling 消息被单条压缩 → `No tool call found` | ✅ inlet 两条路径均已原子化 |
|
||||
| 2 | **High** | `compressed_message_count` 坐标系混用 | ✅ outlet 始终在原始消息空间计算 |
|
||||
| 3 | **Medium** | 无 per-chat 异步锁 | ✅ `_chat_locks` + `asyncio.Lock()` |
|
||||
| 4 | **Medium** | tool-output 修剪过于激进 | ✅ 默认 `False`；循环体已置空 |
|
||||
| 5 | **Medium** | `max_context_tokens = 0` 语义不一致 | ✅ 统一 `<= 0` 表示"无限制" |
|
||||
| 6 | **Low** | 韩语 i18n 字符串混入俄文字符 | ✅ 已替换为纯韩文 |
|
||||
| 7 | **(后发现)** | summary 任务内截断不使用原子组 | ✅ 2026-03-09 补丁：改用 `_get_atomic_groups` |
|
||||
|
||||
## 4. 验证结论
|
||||
|
||||
- **inlet 路径**: `_get_atomic_groups` 贯穿 `inlet` 两条分支，以原子组为单位丢弃消息，永不产生孤立 tool result。
|
||||
- **summary 任务**: 超出上下文限制时，同样以原子组截断 `middle_messages`，保证进入 LLM 的输入完整性。
|
||||
- **并发控制**: `chat_lock.locked()` 确保同一 `chat_id` 同时只有一个总结任务运行。
|
||||
- **元数据**: `_format_messages_for_summary` 以 `[ID: xxx]` 形式保留原始消息身份标识。
|
||||
|
||||
## 5. 后置建议
|
||||
|
||||
该修复旨在将过滤器从“关键词总结”提升到“结构感知代理”的层面。在后续开发中，应继续保持对 OpenWebUI 原生消息指纹的尊重。
|
||||
26
plugins/filters/async-context-compression/v1.4.0.md
Normal file
26
plugins/filters/async-context-compression/v1.4.0.md
Normal file
@@ -0,0 +1,26 @@
|
||||
## Overview
|
||||
|
||||
**[🚀 Get/Update on OpenWebUI Community](https://openwebui.com/posts/async_context_compression_b1655bc8)**
|
||||
|
||||
This release focuses on improving the structural integrity of chat history when using function-calling models and enhancing task reliability through concurrent task management. Version 1.4.0 introduces "Atomic Message Grouping" to prevent chat context corruption and a session-based locking mechanism to ensure stable background operations.
|
||||
|
||||
## New Features
|
||||
|
||||
- **Atomic Message Grouping**: A new structure-aware logic that identifies and groups `assistant-tool-tool-assistant` calling sequences. This ensures that tool results are never orphaned from their calls during compression.
|
||||
- **Tail Boundary Alignment**: Automatically corrects truncation indices to ensure the recent context "tail" starts at a valid message boundary, preventing partial tool-calling sequences from being sent to the LLM.
|
||||
- **Chat Session Locking**: Implements a per-chat-id asynchronous lock to prevent multiple summary tasks from running concurrently for the same session, reducing redundant LLM calls and race conditions.
|
||||
- **Metadata Traceability**: Summarization inputs now include message IDs, participant names, and key metadata labels, allowing the summary model to maintain better traceability in its output.
|
||||
|
||||
## Bug Fixes
|
||||
|
||||
- **Fixed "No tool call found" Errors**: By enforcing atomic grouping, the filter no longer truncates the context in a way that separates tool calls from their results.
|
||||
- **Improved Progress Calculation**: Fixed an issue where summarizing messages would cause the progress tracking to drift due to shifting list indices.
|
||||
- **Prevented Duplicate Summary Tasks**: The new locking mechanism ensures that only one background summary process is active per session.
|
||||
|
||||
## Related Issues
|
||||
|
||||
- **[#56](https://github.com/Fu-Jie/openwebui-extensions/issues/56)**: Tool-Calling context corruption and concurrent summary tasks.
|
||||
|
||||
## Related PRs
|
||||
|
||||
- **[#61](https://github.com/Fu-Jie/openwebui-extensions/pull/61)**: (Placeholder) Full implementation of structure-aware grouping.
|
||||
26
plugins/filters/async-context-compression/v1.4.0_CN.md
Normal file
26
plugins/filters/async-context-compression/v1.4.0_CN.md
Normal file
@@ -0,0 +1,26 @@
|
||||
## 概述
|
||||
|
||||
**[🚀 在 OpenWebUI 社区获取/更新](https://openwebui.com/posts/async_context_compression_b1655bc8)**
|
||||
|
||||
本次发布重点优化了在使用工具调用（Function Calling）模型时对话历史的结构完整性，并通过并发任务管理增强了系统的可靠性。1.4.0 版本引入了“原子消息组”逻辑以防止上下文损坏，并增加了会话级锁定机制以确保后台任务的稳定运行。
|
||||
|
||||
## 新功能
|
||||
|
||||
- **原子消息组 (Atomic Grouping)**: 引入结构感知的消息处理逻辑，能够识别并成组处理 `assistant-tool-tool-assistant` 调用序列。这确保了在压缩过程中，工具结果永远不会与其调用指令分离。
|
||||
- **尾部边界自动对齐**: 自动修正截断索引，确保保留的“尾部”上下文从合法的消息边界开始，防止将残缺的工具调用序列发送给大模型。
|
||||
- **会话级异步锁**: 为每个 `chat_id` 实现异步锁，防止同一会话并发触发多个总结任务，减少冗余的 LLM 调用并消除竞态条件。
|
||||
- **元数据溯源增强**: 总结输入现在包含消息 ID、参与者名称和关键元数据标签，使总结模型能够在其输出中保持更好的可追踪性。
|
||||
|
||||
## 问题修复
|
||||
|
||||
- **彻底解决 "No tool call found" 错误**: 通过强制执行原子分组，过滤器不再会以分离工具调用及其结果的方式截断上下文。
|
||||
- **优化进度计算**: 修复了总结消息后由于列表索引偏移导致进度跟踪漂移的问题。
|
||||
- **防止重复总结任务**: 新的锁定机制确保每个会话在同一时间只有一个后台总结进程在运行。
|
||||
|
||||
## 相关 Issue
|
||||
|
||||
- **[#56](https://github.com/Fu-Jie/openwebui-extensions/issues/56)**: 修复工具调用上下文损坏及并发总结任务冲突问题。
|
||||
|
||||
## 相关 PR
|
||||
|
||||
- **[#61](https://github.com/Fu-Jie/openwebui-extensions/pull/61)**: (占位符) 结构感知消息分组的完整实现。
|
||||
@@ -1,81 +1,90 @@
|
||||
# Markdown Normalizer Filter
|
||||
**Author:** [Fu-Jie](https://github.com/Fu-Jie/openwebui-extensions) | **Version:** 1.2.8 | **Project:** [OpenWebUI Extensions](https://github.com/Fu-Jie/openwebui-extensions) | **License:** MIT
|
||||
|
||||
**Author:** [Fu-Jie](https://github.com/Fu-Jie/openwebui-extensions) | **Version:** 1.2.7 | **Project:** [OpenWebUI Extensions](https://github.com/Fu-Jie/openwebui-extensions) | **License:** MIT
|
||||
|
||||
A content normalizer filter for Open WebUI that fixes common Markdown formatting issues in LLM outputs. It ensures that code blocks, LaTeX formulas, Mermaid diagrams, and other Markdown elements are rendered correctly.
|
||||
A powerful, context-aware content normalizer filter for Open WebUI designed to fix common Markdown formatting issues in LLM outputs. It ensures that code blocks, LaTeX formulas, Mermaid diagrams, and other structural Markdown elements are rendered flawlessly, without destroying valid technical content.
|
||||
|
||||
> 🏆 **Featured by OpenWebUI Official** — This plugin was recommended in the official OpenWebUI Community Newsletter: [January 28, 2026](https://openwebui.com/blog/newsletter-january-28-2026)
|
||||
|
||||
## 🔥 What's New in v1.2.7
|
||||
[English](https://github.com/Fu-Jie/openwebui-extensions/blob/main/plugins/filters/markdown_normalizer/README.md) | [简体中文](https://github.com/Fu-Jie/openwebui-extensions/blob/main/plugins/filters/markdown_normalizer/README_CN.md)
|
||||
|
||||
* **LaTeX Formula Protection**: Enhanced escape character cleaning to protect LaTeX commands like `\times`, `\nu`, and `\theta` from being corrupted.
|
||||
* **Expanded i18n Support**: Now supports 12 languages with automatic detection and fallback.
|
||||
* **Valves Optimization**: Optimized configuration descriptions to be English-only for better consistency.
|
||||
* **Bug Fixes**:
|
||||
* Resolved [Issue #49](https://github.com/Fu-Jie/openwebui-extensions/issues/49): Fixed a bug where consecutive bold parts on the same line caused spaces between them to be removed.
|
||||
* Fixed a `NameError` in the plugin code that caused test collection failures.
|
||||
---
|
||||
|
||||
## 🔥 What's New in v1.2.8
|
||||
* **Safe-by-Default Strategy**: The `enable_escape_fix` feature is now **disabled by default**. This prevents unwanted modifications to valid technical text like Windows file paths (`C:\new\test`) or complex LaTeX formulas.
|
||||
* **LaTeX Parsing Fix**: Improved the logic for identifying display math (`$$ ... $$`). Fixed a bug where LaTeX commands starting with `\n` (like `\nabla`) were incorrectly treated as newlines.
|
||||
* **Reliability Enhancement**: Complete error fallback mechanism. Guarantees 0% data loss during processing.
|
||||
* **Inline Code Protection**: Upgraded escaping logic to protect inline code blocks (`` `...` ``).
|
||||
* **Code Block Escaping Control**: The `enable_escape_fix_in_code_blocks` Valve now correctly targets broken newlines inside code blocks (perfect for fixing flat SQL queries) when enabled.
|
||||
* **Privacy Optimization**: `show_debug_log` now defaults to `False` to prevent console noise.
|
||||
|
||||
---
|
||||
|
||||
## 🚀 Why do you need this plugin? (What does it do?)
|
||||
|
||||
Language Models (LLMs) often generate malformed Markdown due to tokenization artifacts, aggressive escaping, or hallucinated formatting. If you've ever seen:
|
||||
- A `mermaid` diagram fail to render because of missing quotes around labels.
|
||||
- A SQL block stuck on a single line because `\n` was output literally instead of a real newline.
|
||||
- A `<details>` block break the entire chat rendering because of missing newlines.
|
||||
- A LaTeX formula fail because the LLM used `\[` instead of `$$`.
|
||||
|
||||
**This plugin automatically intercepts the LLM's raw output, analyzes its structure, and surgically repairs these formatting errors in real-time before they reach your browser.**
|
||||
|
||||
## ✨ Comprehensive Feature List
|
||||
|
||||
### 1. Advanced Structural Protections (Context-Aware)
|
||||
Before making any changes, the plugin builds a semantic map of the text to protect your technical content:
|
||||
- **Code Block Protection**: Skips formatting inside ` ``` ` code blocks by default to protect code logic.
|
||||
- **Inline Code Protection**: Recognizes `` `code` `` snippets and protects regular expressions and file paths (e.g., `C:\Windows`) from being incorrectly unescaped.
|
||||
- **LaTeX Protection**: Identifies inline (`$`) and block (`$$`) formulas to prevent modifying critical math commands like `\times`, `\theta`, or `\nu`.
|
||||
|
||||
### 2. Auto-Healing Transformations
|
||||
- **Details Tag Normalization**: `<details>` blocks (often used for Chain of Thought) require strict spacing to render correctly. The plugin automatically injects blank lines after `</details>` and self-closing `<details />` tags.
|
||||
- **Mermaid Syntax Fixer**: One of the most common LLM errors is omitting quotes in Mermaid diagrams (e.g., `A --> B(Some text)`). This plugin parses the Mermaid syntax and auto-quotes labels and citations to guarantee the graph renders.
|
||||
- **Emphasis Spacing Fix**: Fixes formatting-breaking extra spaces inside bold/italic markers (e.g., `** text **` becomes `**text**`) while cleverly ignoring math expressions like `2 * 3 * 4`.
|
||||
- **Intelligent Escape Character Cleanup**: Removes excessive literal `\n` and `\t` generated by some models and converts them to actual structural newlines (only in safe text areas).
|
||||
- **LaTeX Standardization**: Automatically upgrades old-school LaTeX delimiters (`\[...\]` and `\(...\)`) to modern Markdown standards (`$$...$$` and `$ ... $`).
|
||||
- **Thought Tag Unification**: Standardizes various model thought outputs (`<think>`, `<thinking>`) into a unified `<thought>` tag.
|
||||
- **Broken Code Block Repair**: Fixes indentation issues, repairs mangled language prefixes (e.g., ` ```python`), and automatically closes unclosed code blocks if a generation was cut off.
|
||||
- **List & Table Formatting**: Injects missing newlines to repair broken numbered lists and adds missing closing pipes (`|`) to tables.
|
||||
- **XML Artifact Cleanup**: Silently removes leftover `<antArtifact>` or `<antThinking>` tags often leaked by Claude models.
|
||||
|
||||
### 3. Reliability & Safety
|
||||
- **100% Rollback Guarantee**: If any normalization logic fails or crashes, the plugin catches the error and silently returns the exact original text, ensuring your chat never breaks.
|
||||
|
||||
## 🌐 Multilingual Support
|
||||
|
||||
Supports automatic interface and status switching for the following languages:
|
||||
The plugin UI and status notifications automatically switch based on your language:
|
||||
`English`, `简体中文`, `繁體中文 (香港)`, `繁體中文 (台灣)`, `한국어`, `日本語`, `Français`, `Deutsch`, `Español`, `Italiano`, `Tiếng Việt`, `Bahasa Indonesia`.
|
||||
|
||||
## ✨ Core Features
|
||||
|
||||
* **Details Tag Normalization**: Ensures proper spacing for `<details>` tags (used for thought chains). Adds a blank line after `</details>` and ensures a newline after self-closing `<details />` tags to prevent rendering issues.
|
||||
* **Emphasis Spacing Fix**: Fixes extra spaces inside emphasis markers (e.g., `** text **` -> `**text**`) which can cause rendering failures. Includes safeguards to protect math expressions (e.g., `2 * 3 * 4`) and list variables.
|
||||
* **Mermaid Syntax Fix**: Automatically fixes common Mermaid syntax errors, such as unquoted node labels (including multi-line labels and citations) and unclosed subgraphs. **New in v1.1.2**: Comprehensive protection for edge labels (text on connecting lines) across all link types (solid, dotted, thick).
|
||||
* **Frontend Console Debugging**: Supports printing structured debug logs directly to the browser console (F12) for easier troubleshooting.
|
||||
* **Code Block Formatting**: Fixes broken code block prefixes, suffixes, and indentation.
|
||||
* **LaTeX Normalization**: Standardizes LaTeX formula delimiters (`\[` -> `$$`, `\(` -> `$`).
|
||||
* **Thought Tag Normalization**: Unifies thought tags (`<think>`, `<thinking>` -> `<thought>`).
|
||||
* **Escape Character Fix**: Cleans up excessive escape characters (`\\n`, `\\t`).
|
||||
* **List Formatting**: Ensures proper newlines in list items.
|
||||
* **Heading Fix**: Adds missing spaces in headings (`#Heading` -> `# Heading`).
|
||||
* **Table Fix**: Adds missing closing pipes in tables.
|
||||
* **XML Cleanup**: Removes leftover XML artifacts.
|
||||
|
||||
## How to Use 🛠️
|
||||
|
||||
1. Install the plugin in Open WebUI.
|
||||
2. Enable the filter globally or for specific models.
|
||||
3. Configure the enabled fixes in the **Valves** settings.
|
||||
4. (Optional) **Show Debug Log** is enabled by default in Valves. This prints structured logs to the browser console (F12).
|
||||
> [!WARNING]
|
||||
> As this is an initial version, some "negative fixes" might occur (e.g., breaking valid Markdown). If you encounter issues, please check the console logs, copy the "Original" vs "Normalized" content, and submit an issue.
|
||||
2. Enable the filter globally or assign it to specific models (highly recommended for models with poor formatting).
|
||||
3. Tune the specific fixes you want via the **Valves** settings.
|
||||
|
||||
## Configuration (Valves) ⚙️
|
||||
|
||||
| Parameter | Default | Description |
|
||||
| :--- | :--- | :--- |
|
||||
| `priority` | `50` | Filter priority. Higher runs later (recommended after other filters). |
|
||||
| `enable_escape_fix` | `True` | Fix excessive escape characters (`\n`, `\t`, etc.). |
|
||||
| `enable_escape_fix_in_code_blocks` | `False` | Apply escape fix inside code blocks (may affect valid code). |
|
||||
| `enable_thought_tag_fix` | `True` | Normalize thought tags (`</thought>`). |
|
||||
| `enable_details_tag_fix` | `True` | Normalize `<details>` tags and add safe spacing. |
|
||||
| `enable_code_block_fix` | `True` | Fix code block formatting (indentation/newlines). |
|
||||
| `enable_latex_fix` | `True` | Normalize LaTeX delimiters (`\[` -> `$$`, `\(` -> `$`). |
|
||||
| `priority` | `50` | Filter priority. Higher runs later (recommended to run this after all other content filters). |
|
||||
| `enable_escape_fix` | `False` | Convert excessive literal escape characters (`\n`, `\t`) to real spacing. (Default: False for safety). |
|
||||
| `enable_escape_fix_in_code_blocks` | `False` | **Pro-tip**: Turn this ON if your SQL/HTML code blocks are constantly printing on a single line. Turn OFF for Python/C++. |
|
||||
| `enable_thought_tag_fix` | `True` | Normalize `<think>` tags. |
|
||||
| `enable_details_tag_fix` | `True` | Normalize `<details>` spacing. |
|
||||
| `enable_code_block_fix` | `True` | Fix code block indentation and newlines. |
|
||||
| `enable_latex_fix` | `True` | Standardize LaTeX delimiters (`\[` -> `$$`). |
|
||||
| `enable_list_fix` | `False` | Fix list item newlines (experimental). |
|
||||
| `enable_unclosed_block_fix` | `True` | Auto-close unclosed code blocks. |
|
||||
| `enable_fullwidth_symbol_fix` | `False` | Fix full-width symbols in code blocks. |
|
||||
| `enable_mermaid_fix` | `True` | Fix common Mermaid syntax errors. |
|
||||
| `enable_heading_fix` | `True` | Fix missing space in headings. |
|
||||
| `enable_table_fix` | `True` | Fix missing closing pipe in tables. |
|
||||
| `enable_xml_tag_cleanup` | `True` | Cleanup leftover XML tags. |
|
||||
| `enable_emphasis_spacing_fix` | `False` | Fix extra spaces in emphasis. |
|
||||
| `show_status` | `True` | Show status notification when fixes are applied. |
|
||||
| `show_debug_log` | `True` | Print debug logs to browser console (F12). |
|
||||
| `enable_mermaid_fix` | `True` | Fix common Mermaid syntax errors (auto-quoting). |
|
||||
| `enable_heading_fix` | `True` | Add missing space after heading hashes (`#Title` -> `# Title`). |
|
||||
| `enable_table_fix` | `True` | Add missing closing pipe in tables. |
|
||||
| `enable_xml_tag_cleanup` | `True` | Remove leftover XML artifacts. |
|
||||
| `enable_emphasis_spacing_fix` | `False` | Fix extra spaces in emphasis formatting. |
|
||||
| `show_status` | `True` | Show UI status notification when a fix is actively applied. |
|
||||
| `show_debug_log` | `False` | Print detailed before/after diffs to browser console (F12). |
|
||||
|
||||
## ⭐ Support
|
||||
|
||||
If this plugin has been useful, a star on [OpenWebUI Extensions](https://github.com/Fu-Jie/openwebui-extensions) is a big motivation for me. Thank you for the support.
|
||||
If this plugin saves your day, a star on [OpenWebUI Extensions](https://github.com/Fu-Jie/openwebui-extensions) is a big motivation for me. Thank you!
|
||||
|
||||
## 🧩 Others
|
||||
|
||||
### Troubleshooting ❓
|
||||
|
||||
* **Submit an Issue**: If you encounter any problems, please submit an issue on GitHub: [OpenWebUI Extensions Issues](https://github.com/Fu-Jie/openwebui-extensions/issues)
|
||||
|
||||
### Changelog
|
||||
|
||||
See the full history on GitHub: [OpenWebUI Extensions](https://github.com/Fu-Jie/openwebui-extensions)
|
||||
* **Troubleshooting**: Encountering "negative fixes"? Enable `show_debug_log`, check your console, and submit an issue on GitHub: [OpenWebUI Extensions Issues](https://github.com/Fu-Jie/openwebui-extensions/issues)
|
||||
|
||||
@@ -1,81 +1,89 @@
|
||||
# Markdown 格式化过滤器 (Markdown Normalizer)
|
||||
|
||||
**作者:** [Fu-Jie](https://github.com/Fu-Jie/openwebui-extensions) | **版本:** 1.2.7 | **项目:** [OpenWebUI Extensions](https://github.com/Fu-Jie/openwebui-extensions) | **许可证:** MIT
|
||||
**作者:** [Fu-Jie](https://github.com/Fu-Jie/openwebui-extensions) | **版本:** 1.2.8 | **项目:** [OpenWebUI Extensions](https://github.com/Fu-Jie/openwebui-extensions) | **许可证:** MIT
|
||||
|
||||
这是一个用于 Open WebUI 的内容格式化过滤器，旨在修复 LLM 输出中常见的 Markdown 格式问题。它能确保代码块、LaTeX 公式、Mermaid 图表和其他 Markdown 元素被正确渲染。
|
||||
这是一个强大的、具备上下文感知的 Markdown 内容规范化过滤器，专为 Open WebUI 设计，旨在实时修复大语言模型 (LLM) 输出中常见的格式错乱问题。它能确保代码块、LaTeX 公式、Mermaid 图表以及其他结构化元素被完美渲染，同时**绝不破坏**你原有的有效技术内容（如代码、正则、路径）。
|
||||
|
||||
> 🏆 **OpenWebUI 官方推荐** — 本插件获得 OpenWebUI 社区 Newsletter 官方推荐：[2026 年 1 月 28 日](https://openwebui.com/blog/newsletter-january-28-2026)
|
||||
|
||||
## 🔥 最新更新 v1.2.7
|
||||
[English](https://github.com/Fu-Jie/openwebui-extensions/blob/main/plugins/filters/markdown_normalizer/README.md) | [简体中文](https://github.com/Fu-Jie/openwebui-extensions/blob/main/plugins/filters/markdown_normalizer/README_CN.md)
|
||||
|
||||
* **LaTeX 公式保护**: 增强了转义字符清理逻辑，自动保护 `$ $` 或 `$$ $$` 内的 LaTeX 命令（如 `\times`、`\nu`、`\theta`），防止渲染失效。
|
||||
* **扩展国际化 (i18n) 支持**: 现已支持 12 种语言，具备自动探测与回退机制。
|
||||
* **配置项优化**: 将 Valves 配置项的描述统一为英文，保持界面一致性。
|
||||
* **修复 Bug**:
|
||||
* 修复了 [Issue #49](https://github.com/Fu-Jie/openwebui-extensions/issues/49)：解决了当同一行存在多个加粗部分时，由于正则匹配过于贪婪导致中间内容丢失空格的问题。
|
||||
* 修复了插件代码中的 `NameError` 错误，确保测试脚本能正常运行。
|
||||
---
|
||||
|
||||
## 🔥 最新更新 v1.2.8
|
||||
* **“默认安全”策略 (Safe-by-Default)**：`enable_escape_fix` 功能现在**默认禁用**。这能有效防止插件在未经授权的情况下误改 Windows 路径 (`C:\new\test`) 或复杂的 LaTeX 公式。
|
||||
* **LaTeX 解析优化**：重构了显示数学公式 (`$$ ... $$`) 的识别逻辑。修复了 LaTeX 命令如果以 `\n` 开头（如 `\nabla`）会被错误识别为换行符的 Bug。
|
||||
* **可靠性增强**：实现了完整的错误回滚机制。当修复过程发生意外错误时，保证 100% 返回原始文本，不丢失任何数据。
|
||||
* **配置项修复**：`enable_escape_fix_in_code_blocks` 配置项现在能正确作用于代码块了。**如果您遇到 SQL 挤在一行的问题，只需在设置中手动开启此项即可。**
|
||||
|
||||
---
|
||||
|
||||
## 🚀 为什么你需要这个插件？(它能解决什么问题？)
|
||||
|
||||
由于分词 (Tokenization) 伪影、过度转义或格式幻觉，LLM 经常会生成破损的 Markdown。如果你遇到过以下情况：
|
||||
- `mermaid` 图表因为节点标签缺少双引号而渲染失败、白屏。
|
||||
- LLM 输出的 SQL 语句挤在一行，因为本该换行的地方输出了字面量 `\n`。
|
||||
- 复杂的 `<details>` (思维链展开块) 因为缺少换行符导致整个聊天界面排版崩塌。
|
||||
- LaTeX 数学公式无法显示，因为模型使用了旧版的 `\[` 而不是 Markdown 支持的 `$$`。
|
||||
|
||||
**本插件会自动拦截 LLM 返回的原始数据，实时分析其文本结构，并像外科手术一样精准修复这些排版错误，然后再将其展示在你的浏览器中。**
|
||||
|
||||
## ✨ 核心功能与修复能力全景
|
||||
|
||||
### 1. 高级结构保护 (上下文感知)
|
||||
在执行任何修改前，插件会为整个文本建立语义地图，确保技术性内容不被误伤：
|
||||
- **代码块保护**：默认跳过 ` ``` ` 内部的内容，保护所有编程逻辑。
|
||||
- **行内代码保护**：识别 `` `代码` `` 片段，防止正则表达式（如 `[\n\r]`）或文件路径（如 `C:\Windows`）被错误地去转义。
|
||||
- **LaTeX 公式保护**：识别行内 (`$`) 和块级 (`$$`) 公式，防止诸如 `\times`, `\theta` 等核心数学命令被意外破坏。
|
||||
|
||||
### 2. 自动治愈转换 (Auto-Healing)
|
||||
- **Details 标签排版修复**：`<details>` 块要求极为严格的空行才能正确渲染内部内容。插件会自动在 `</details>` 以及自闭合 `<details />` 标签后注入安全的换行符。
|
||||
- **Mermaid 语法急救**：自动修复最常见的 Mermaid 错误——为未加引号的节点标签（如 `A --> B(Some text)`）自动补充双引号，甚至支持多行标签和引用，确保拓扑图 100% 渲染。
|
||||
- **强调语法间距修复**：修复加粗/斜体语法内部多余的空格（如 `** 文本 **` 变为 `**文本**`，否则 OpenWebUI 无法加粗），同时智能忽略数学算式（如 `2 * 3 * 4`）。
|
||||
- **智能转义字符清理**：将模型过度转义生成的字面量 `\n` 和 `\t` 转化为真正的换行和缩进（仅在安全的纯文本区域执行）。
|
||||
- **LaTeX 现代化转换**：自动将旧式的 LaTeX 定界符（`\[...\]` 和 `\(...\)`）升级为现代 Markdown 标准（`$$...$$` 和 `$ ... $`）。
|
||||
- **思维标签大一统**：无论模型输出的是 `<think>` 还是 `<thinking>`，统一标准化为 `<thought>` 标签。
|
||||
- **残缺代码块修复**：修复乱码的语言前缀（例如 ` ```python`），调整缩进，并在模型回答被截断时，自动补充闭合的 ` ``` `。
|
||||
- **列表与表格急救**：为粘连的编号列表注入换行，为残缺的 Markdown 表格补充末尾的闭合管道符（`|`）。
|
||||
- **XML 伪影消除**：静默移除 Claude 模型经常泄露的 `<antArtifact>` 或 `<antThinking>` 残留标签。
|
||||
|
||||
### 3. 绝对的可靠性与安全 (100% Rollback)
|
||||
- **无损回滚机制**：如果在修复过程中发生任何意外错误或崩溃，插件会立即捕获异常，并静默返回**绝对原始**的文本，确保你的对话永远不会因插件报错而丢失。
|
||||
|
||||
## 🌐 多语言支持 (i18n)
|
||||
|
||||
支持以下语言的界面与状态自动切换：
|
||||
界面的状态提示气泡会根据你的浏览器语言自动切换：
|
||||
`English`, `简体中文`, `繁體中文 (香港)`, `繁體中文 (台灣)`, `한국어`, `日本語`, `Français`, `Deutsch`, `Español`, `Italiano`, `Tiếng Việt`, `Bahasa Indonesia`
|
||||
|
||||
## ✨ 核心特性
|
||||
|
||||
* **Details 标签规范化**: 确保 `<details>` 标签（常用于思维链）有正确的间距。在 `</details>` 后添加空行，并在自闭合 `<details />` 标签后添加换行，防止渲染问题。
|
||||
* **强调空格修复**: 修复强调标记内部的多余空格（例如 `** 文本 **` -> `**文本**`），这会导致 Markdown 渲染失败。包含保护机制，防止误修改数学表达式（如 `2 * 3 * 4`）或列表变量。
|
||||
* **Mermaid 语法修复**: 自动修复常见的 Mermaid 语法错误，如未加引号的节点标签（支持多行标签和引用标记）和未闭合的子图 (Subgraph)。**v1.1.2 新增**: 全面保护各种类型的连线标签（实线、虚线、粗线），防止被误修改。
|
||||
* **前端控制台调试**: 支持将结构化的调试日志直接打印到浏览器控制台 (F12)，方便排查问题。
|
||||
* **代码块格式化**: 修复破损的代码块前缀、后缀和缩进问题。
|
||||
* **LaTeX 规范化**: 标准化 LaTeX 公式定界符 (`\[` -> `$$`, `\(` -> `$`)。
|
||||
* **思维标签规范化**: 统一思维链标签 (`<think>`, `<thinking>` -> `<thought>`)。
|
||||
* **转义字符修复**: 清理过度的转义字符 (`\\n`, `\\t`)。
|
||||
* **列表格式化**: 确保列表项有正确的换行。
|
||||
* **标题修复**: 修复标题中缺失的空格 (`#标题` -> `# 标题`)。
|
||||
* **表格修复**: 修复表格中缺失的闭合管道符。
|
||||
* **XML 清理**: 移除残留的 XML 标签。
|
||||
|
||||
## 使用方法
|
||||
## 使用方法 🛠️
|
||||
|
||||
1. 在 Open WebUI 中安装此插件。
|
||||
2. 全局启用或为特定模型启用此过滤器。
|
||||
3. 在 **Valves** 设置中配置需要启用的修复项。
|
||||
4. (可选) **显示调试日志 (Show Debug Log)** 在 Valves 中默认开启。这会将结构化的日志打印到浏览器控制台 (F12)。
|
||||
> [!WARNING]
|
||||
> 由于这是初版，可能会出现“负向修复”的情况（例如破坏了原本正确的格式）。如果您遇到问题，请务必查看控制台日志，复制“原始 (Original)”与“规范化 (Normalized)”的内容对比，并提交 Issue 反馈。
|
||||
2. 全局启用或为特定模型启用此过滤器（强烈建议为格式输出不稳定的模型启用）。
|
||||
3. 在 **Valves (配置参数)** 设置中微调你需要的修复项。
|
||||
|
||||
## 配置参数 (Valves) ⚙️
|
||||
|
||||
| 参数 | 默认值 | 描述 |
|
||||
| :--- | :--- | :--- |
|
||||
| `priority` | `50` | 过滤器优先级。数值越大越靠后（建议在其他过滤器之后运行）。 |
|
||||
| `enable_escape_fix` | `True` | 修复过度的转义字符（`\n`, `\t` 等）。 |
|
||||
| `enable_escape_fix_in_code_blocks` | `False` | 在代码块内应用转义修复（可能影响有效代码）。 |
|
||||
| `enable_thought_tag_fix` | `True` | 规范化思维标签（`</thought>`）。 |
|
||||
| `enable_details_tag_fix` | `True` | 规范化 `<details>` 标签并添加安全间距。 |
|
||||
| `enable_code_block_fix` | `True` | 修复代码块格式（缩进/换行）。 |
|
||||
| `enable_latex_fix` | `True` | 规范化 LaTeX 定界符（`\[` -> `$$`, `\(` -> `$`）。 |
|
||||
| `priority` | `50` | 过滤器优先级。数值越大越靠后（建议放在其他内容过滤器之后运行）。 |
|
||||
| `enable_escape_fix` | `False` | 修复过度的转义字符（将字面量 `\n` 转换为实际换行）。**默认禁用以保证安全。** |
|
||||
| `enable_escape_fix_in_code_blocks` | `False` | **高阶技巧**：如果你的 SQL 或 HTML 代码块总是挤在一行，**请开启此项**。如果你经常写 Python/C++，建议保持关闭。 |
|
||||
| `enable_thought_tag_fix` | `True` | 规范化思维标签为 `<thought>`。 |
|
||||
| `enable_details_tag_fix` | `True` | 修复 `<details>` 标签的排版间距。 |
|
||||
| `enable_code_block_fix` | `True` | 修复代码块前缀、缩进和换行。 |
|
||||
| `enable_latex_fix` | `True` | 规范化 LaTeX 定界符（`\[` -> `$$`）。 |
|
||||
| `enable_list_fix` | `False` | 修复列表项换行（实验性）。 |
|
||||
| `enable_unclosed_block_fix` | `True` | 自动闭合未闭合的代码块。 |
|
||||
| `enable_fullwidth_symbol_fix` | `False` | 修复代码块中的全角符号。 |
|
||||
| `enable_mermaid_fix` | `True` | 修复常见 Mermaid 语法错误。 |
|
||||
| `enable_heading_fix` | `True` | 修复标题中缺失的空格。 |
|
||||
| `enable_unclosed_block_fix` | `True` | 自动闭合被截断的代码块。 |
|
||||
| `enable_mermaid_fix` | `True` | 修复常见 Mermaid 语法错误（如自动加引号）。 |
|
||||
| `enable_heading_fix` | `True` | 修复标题中缺失的空格 (`#Title` -> `# Title`)。 |
|
||||
| `enable_table_fix` | `True` | 修复表格中缺失的闭合管道符。 |
|
||||
| `enable_xml_tag_cleanup` | `True` | 清理残留的 XML 标签。 |
|
||||
| `enable_emphasis_spacing_fix` | `False` | 修复强调语法中的多余空格。 |
|
||||
| `show_status` | `True` | 应用修复时显示状态通知。 |
|
||||
| `show_debug_log` | `True` | 在浏览器控制台打印调试日志。 |
|
||||
| `enable_xml_tag_cleanup` | `True` | 清理残留的 XML 分析标签。 |
|
||||
| `enable_emphasis_spacing_fix` | `False` | 修复强调语法（加粗/斜体）内部的多余空格。 |
|
||||
| `show_status` | `True` | 当触发任何修复规则时，在页面底部显示提示气泡。 |
|
||||
| `show_debug_log` | `False` | 在浏览器控制台 (F12) 打印修改前后的详细对比日志。 |
|
||||
|
||||
## ⭐ 支持
|
||||
如果这个插件拯救了你的排版，欢迎到 [OpenWebUI Extensions](https://github.com/Fu-Jie/openwebui-extensions) 点个 Star，这是我持续改进的最大动力。感谢支持！
|
||||
|
||||
如果这个插件对你有帮助，欢迎到 [OpenWebUI Extensions](https://github.com/Fu-Jie/openwebui-extensions) 点个 Star，这将是我持续改进的动力，感谢支持。
|
||||
|
||||
## 其他
|
||||
|
||||
### 故障排除 (Troubleshooting) ❓
|
||||
|
||||
* **提交 Issue**: 如果遇到任何问题，请在 GitHub 上提交 Issue：[OpenWebUI Extensions Issues](https://github.com/Fu-Jie/openwebui-extensions/issues)
|
||||
|
||||
### 更新日志
|
||||
|
||||
完整历史请查看 GitHub 项目： [OpenWebUI Extensions](https://github.com/Fu-Jie/openwebui-extensions)
|
||||
## 🧩 其他
|
||||
* **故障排除**：遇到“负向修复”（即原本正常的排版被修坏了）？请开启 `show_debug_log`，在 F12 控制台复制出原始文本，并在 GitHub 提交 Issue：[提交 Issue](https://github.com/Fu-Jie/openwebui-extensions/issues)
|
||||
|
||||
@@ -3,7 +3,7 @@ title: Markdown Normalizer
|
||||
author: Fu-Jie
|
||||
author_url: https://github.com/Fu-Jie/openwebui-extensions
|
||||
funding_url: https://github.com/open-webui
|
||||
version: 1.2.7
|
||||
version: 1.2.8
|
||||
openwebui_id: baaa8732-9348-40b7-8359-7e009660e23c
|
||||
description: A content normalizer filter that fixes common Markdown formatting issues in LLM outputs, such as broken code blocks, LaTeX formulas, and list formatting. Including LaTeX command protection.
|
||||
"""
|
||||
@@ -236,7 +236,7 @@ TRANSLATIONS = {
|
||||
class NormalizerConfig:
|
||||
"""Configuration class for enabling/disabling specific normalization rules"""
|
||||
|
||||
enable_escape_fix: bool = True # Fix excessive escape characters
|
||||
enable_escape_fix: bool = False # Fix excessive escape characters (Default False for safety)
|
||||
enable_escape_fix_in_code_blocks: bool = (
|
||||
False # Apply escape fix inside code blocks (default: False for safety)
|
||||
)
|
||||
@@ -456,28 +456,47 @@ class ContentNormalizer:
|
||||
except Exception as e:
|
||||
# Production safeguard: return original content on error
|
||||
logger.error(f"Content normalization failed: {e}", exc_info=True)
|
||||
return content
|
||||
return original_content
|
||||
|
||||
def _fix_escape_characters(self, content: str) -> str:
|
||||
"""Fix excessive escape characters while protecting LaTeX and code blocks."""
|
||||
"""Fix excessive escape characters while protecting LaTeX, code blocks, and inline code."""
|
||||
|
||||
def clean_text(text: str) -> str:
|
||||
# Only fix \n and double backslashes, skip \t as it's dangerous for LaTeX (\times, \theta)
|
||||
# First handle literal escaped newlines
|
||||
text = text.replace("\\r\\n", "\n")
|
||||
text = text.replace("\\n", "\n")
|
||||
|
||||
# Then handle double backslashes that are not followed by n or r
|
||||
# (which would have been part of an escaped newline handled above)
|
||||
# Use regex to replace \\ with \ only if not followed by n or r
|
||||
# But wait, \n is already \n (actual newline) here.
|
||||
# So we can safely replace all remaining \\ with \
|
||||
text = text.replace("\\\\", "\\")
|
||||
return text
|
||||
|
||||
# 1. Protect code blocks
|
||||
# 1. Protect block code
|
||||
parts = content.split("```")
|
||||
for i in range(0, len(parts), 2): # Even indices are text
|
||||
# 2. Protect LaTeX formulas within text
|
||||
# Split by $ to find inline/block math
|
||||
sub_parts = parts[i].split("$")
|
||||
for j in range(0, len(sub_parts), 2): # Even indices are non-math text
|
||||
sub_parts[j] = clean_text(sub_parts[j])
|
||||
for i in range(0, len(parts)):
|
||||
is_code_block = (i % 2 != 0)
|
||||
if is_code_block and not self.config.enable_escape_fix_in_code_blocks:
|
||||
continue
|
||||
|
||||
parts[i] = "$".join(sub_parts)
|
||||
if not is_code_block:
|
||||
# 2. Protect inline code
|
||||
inline_parts = parts[i].split("`")
|
||||
for k in range(0, len(inline_parts), 2): # Even indices are non-inline-code text
|
||||
# 3. Protect LaTeX formulas within text (safe for $$ and $)
|
||||
# Use regex to split and keep delimiters
|
||||
sub_parts = re.split(
|
||||
r"(\$\$.*?\$\$|\$.*?\$)", inline_parts[k], flags=re.DOTALL
|
||||
)
|
||||
for j in range(0, len(sub_parts), 2): # Even indices are non-math text
|
||||
sub_parts[j] = clean_text(sub_parts[j])
|
||||
inline_parts[k] = "".join(sub_parts)
|
||||
parts[i] = "`".join(inline_parts)
|
||||
else:
|
||||
# Inside code block and enable_escape_fix_in_code_blocks is True
|
||||
parts[i] = clean_text(parts[i])
|
||||
|
||||
return "```".join(parts)
|
||||
|
||||
@@ -707,8 +726,8 @@ class Filter:
|
||||
description="Priority level (lower = earlier).",
|
||||
)
|
||||
enable_escape_fix: bool = Field(
|
||||
default=True,
|
||||
description="Fix excessive escape characters (\\n, \\t, etc.).",
|
||||
default=False,
|
||||
description="Fix excessive escape characters (\\n, \\t, etc.). Default: False for safety.",
|
||||
)
|
||||
enable_escape_fix_in_code_blocks: bool = Field(
|
||||
default=False,
|
||||
@@ -767,7 +786,7 @@ class Filter:
|
||||
description="Show status notification when fixes are applied.",
|
||||
)
|
||||
show_debug_log: bool = Field(
|
||||
default=True,
|
||||
default=False,
|
||||
description="Print debug logs to browser console (F12).",
|
||||
)
|
||||
|
||||
|
||||
13
plugins/filters/markdown_normalizer/v1.2.8.md
Normal file
13
plugins/filters/markdown_normalizer/v1.2.8.md
Normal file
@@ -0,0 +1,13 @@
|
||||
# v1.2.8 Release Notes
|
||||
|
||||
This release focuses on significantly improving the reliability and safety of the Markdown Normalizer filter, ensuring that it never corrupts valid technical content and elegantly handles unexpected errors.
|
||||
|
||||
## Bug Fixes
|
||||
|
||||
- **Error Fallback Mechanism**: Fixed an issue where the plugin could return partially modified or broken text if an error occurred during normalization. It now guarantees a 100% rollback to the original text upon any failure.
|
||||
- **Inline Code Protection**: Refined the escape character fixing logic to accurately identify and protect inline code blocks (`` `...` ``). This prevents valid technical strings, such as regular expressions (`[\n\r]`) and Windows file paths (`C:\Windows`), from being unintentionally modified.
|
||||
- **Code Block Escaping Control**: Fixed a bug where the `enable_escape_fix_in_code_blocks` Valve setting was ignored. The setting now correctly applies, allowing users to optionally fix broken newlines inside code blocks (e.g., repairing flat SQL queries) when enabled.
|
||||
|
||||
## New Features
|
||||
|
||||
- **Privacy & Log Optimization**: The `show_debug_log` Valve now defaults to `False` instead of `True`. This prevents sensitive chat content from automatically printing to the browser console and reduces unnecessary log noise for general users.
|
||||
13
plugins/filters/markdown_normalizer/v1.2.8_CN.md
Normal file
13
plugins/filters/markdown_normalizer/v1.2.8_CN.md
Normal file
@@ -0,0 +1,13 @@
|
||||
# v1.2.8 版本发布说明
|
||||
|
||||
本次更新重点在于大幅提升 Markdown Normalizer 插件的可靠性与安全性，确保它在任何情况下都不会损坏有效的技术内容，并能优雅地处理各种意外错误。
|
||||
|
||||
## 问题修复
|
||||
|
||||
- **错误回滚机制 (Error Fallback)**：修复了规范化过程中如果发生错误会导致返回残缺或损坏文本的问题。现在，插件在遇到任何异常失败时，保证 100% 回滚并返回原始文本，确保对话内容不丢失。
|
||||
- **内联代码保护 (Inline Code Protection)**：优化了转义字符的修复逻辑，现在能够精准识别并保护内联代码块（`` `...` ``）。这防止了像正则表达式（`[\n\r]`）和 Windows 文件路径（`C:\Windows`）这样的有效技术字符串被意外修改。
|
||||
- **代码块转义控制修复 (Code Block Escaping Control)**：修复了 `enable_escape_fix_in_code_blocks` 配置项失效的 Bug。现在该选项可以正常生效，当开启时，用户可以借此修复代码块内部（例如 SQL 查询语句）因错误转义导致挤在一行的问题。
|
||||
|
||||
## 新功能
|
||||
|
||||
- **隐私与日志优化 (Privacy & Log Optimization)**：`show_debug_log` 的默认值从 `True` 更改为了 `False`。这避免了将可能包含敏感信息的对话内容自动打印到浏览器控制台，并减少了普通用户的日志噪音。
|
||||
@@ -54,6 +54,15 @@ from open_webui.storage.provider import Storage
|
||||
import mimetypes
|
||||
import uuid
|
||||
|
||||
if os.path.exists("/app/backend/data"):
|
||||
CHAT_MAPPING_FILE = Path(
|
||||
"/app/backend/data/copilot_workspace/api_key_chat_id_mapping.json"
|
||||
)
|
||||
else:
|
||||
CHAT_MAPPING_FILE = (
|
||||
Path(os.getcwd()) / "copilot_workspace" / "api_key_chat_id_mapping.json"
|
||||
)
|
||||
|
||||
# Get OpenWebUI version for capability detection
|
||||
try:
|
||||
from open_webui.env import VERSION as open_webui_version
|
||||
@@ -4879,6 +4888,41 @@ class Pipe:
|
||||
|
||||
return cwd
|
||||
|
||||
def _record_user_chat_mapping(
|
||||
self, user_id: Optional[str], chat_id: Optional[str]
|
||||
) -> None:
|
||||
"""Persist the latest chat_id for the current user."""
|
||||
if not user_id or not chat_id:
|
||||
return
|
||||
|
||||
mapping_file = CHAT_MAPPING_FILE
|
||||
|
||||
try:
|
||||
mapping_file.parent.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
mapping: Dict[str, str] = {}
|
||||
if mapping_file.exists():
|
||||
try:
|
||||
loaded = json.loads(mapping_file.read_text(encoding="utf-8"))
|
||||
if isinstance(loaded, dict):
|
||||
mapping = {str(k): str(v) for k, v in loaded.items()}
|
||||
except Exception as e:
|
||||
logger.warning(
|
||||
f"[Session Tracking] Failed to read mapping file {mapping_file}: {e}"
|
||||
)
|
||||
|
||||
mapping[str(user_id)] = str(chat_id)
|
||||
|
||||
temp_file = mapping_file.with_suffix(mapping_file.suffix + ".tmp")
|
||||
temp_file.write_text(
|
||||
json.dumps(mapping, ensure_ascii=False, indent=2, sort_keys=True)
|
||||
+ "\n",
|
||||
encoding="utf-8",
|
||||
)
|
||||
temp_file.replace(mapping_file)
|
||||
except Exception as e:
|
||||
logger.warning(f"[Session Tracking] Failed to persist mapping: {e}")
|
||||
|
||||
def _build_client_config(self, user_id: str = None, chat_id: str = None) -> dict:
|
||||
"""Build CopilotClient config from valves and request body."""
|
||||
cwd = self._get_workspace_dir(user_id=user_id, chat_id=chat_id)
|
||||
@@ -5837,6 +5881,8 @@ class Pipe:
|
||||
)
|
||||
is_admin = user_data.get("role") == "admin"
|
||||
|
||||
self._record_user_chat_mapping(user_data.get("id"), __chat_id__)
|
||||
|
||||
# Robustly parse User Valves
|
||||
user_valves = self._get_user_valves(__user__)
|
||||
|
||||
|
||||
206
scripts/DEPLOYMENT_GUIDE.md
Normal file
206
scripts/DEPLOYMENT_GUIDE.md
Normal file
@@ -0,0 +1,206 @@
|
||||
# 🚀 本地部署脚本指南 (Local Deployment Guide)
|
||||
|
||||
## 概述
|
||||
|
||||
本目录包含用于将开发中的插件部署到本地 OpenWebUI 实例的自动化脚本。它们可以快速推送代码更改而无需重启 OpenWebUI。
|
||||
|
||||
## 前置条件
|
||||
|
||||
1. **OpenWebUI 运行中**: 确保 OpenWebUI 在本地运行（默认 `http://localhost:3003`）
|
||||
2. **API 密钥**: 需要一个有效的 OpenWebUI API 密钥
|
||||
3. **环境文件**: 在此目录创建 `.env` 文件，包含 API 密钥：
|
||||
```
|
||||
api_key=sk-xxxxxxxxxxxxx
|
||||
```
|
||||
|
||||
## 快速开始
|
||||
|
||||
### 部署 Pipe 插件
|
||||
|
||||
```bash
|
||||
# 部署 GitHub Copilot SDK Pipe
|
||||
python deploy_pipe.py
|
||||
```
|
||||
|
||||
### 部署 Filter 插件
|
||||
|
||||
```bash
|
||||
# 部署 async_context_compression Filter（默认）
|
||||
python deploy_filter.py
|
||||
|
||||
# 部署指定的 Filter 插件
|
||||
python deploy_filter.py my-filter-name
|
||||
|
||||
# 列出所有可用的 Filter
|
||||
python deploy_filter.py --list
|
||||
```
|
||||
|
||||
## 脚本说明
|
||||
|
||||
### `deploy_filter.py` — Filter 插件部署工具
|
||||
|
||||
用于部署 Filter 类型的插件（如消息过滤、上下文压缩等）。
|
||||
|
||||
**主要特性**:
|
||||
- ✅ 从 Python 文件自动提取元数据（版本、作者、描述等）
|
||||
- ✅ 尝试更新现有插件，若不存在则创建新插件
|
||||
- ✅ 支持多个 Filter 插件管理
|
||||
- ✅ 详细的错误提示和连接诊断
|
||||
|
||||
**用法**:
|
||||
```bash
|
||||
# 默认部署 async_context_compression
|
||||
python deploy_filter.py
|
||||
|
||||
# 部署其他 Filter
|
||||
python deploy_filter.py async-context-compression
|
||||
python deploy_filter.py workflow-guide
|
||||
|
||||
# 列出所有可用 Filter
|
||||
python deploy_filter.py --list
|
||||
python deploy_filter.py -l
|
||||
```
|
||||
|
||||
**工作流程**:
|
||||
1. 从 `.env` 加载 API 密钥
|
||||
2. 查找目标 Filter 插件目录
|
||||
3. 读取 Python 源文件
|
||||
4. 从 docstring 提取元数据（title, version, author, description, etc.）
|
||||
5. 构建 API 请求负载
|
||||
6. 发送更新请求到 OpenWebUI
|
||||
7. 若更新失败，自动尝试创建新插件
|
||||
8. 显示结果和诊断信息
|
||||
|
||||
### `deploy_pipe.py` — Pipe 插件部署工具
|
||||
|
||||
用于部署 Pipe 类型的插件（如 GitHub Copilot SDK）。
|
||||
|
||||
**使用**:
|
||||
```bash
|
||||
python deploy_pipe.py
|
||||
```
|
||||
|
||||
## 获取 API 密钥
|
||||
|
||||
### 方法 1: 使用现有用户令牌（推荐）
|
||||
|
||||
1. 打开 OpenWebUI 界面
|
||||
2. 点击用户头像 → Settings（设置）
|
||||
3. 找到 API Keys 部分
|
||||
4. 复制你的 API 密钥（sk-开头）
|
||||
5. 粘贴到 `.env` 文件中
|
||||
|
||||
### 方法 2: 创建长期 API 密钥
|
||||
|
||||
在 OpenWebUI 设置中创建专用于部署的长期 API 密钥。
|
||||
|
||||
## 故障排除
|
||||
|
||||
### "Connection error: Could not reach OpenWebUI at localhost:3003"
|
||||
|
||||
**原因**: OpenWebUI 未运行或端口不同
|
||||
|
||||
**解决方案**:
|
||||
- 确保 OpenWebUI 正在运行
|
||||
- 检查 OpenWebUI 实际监听的端口（通常是 3000 或 3003）
|
||||
- 根据需要编辑脚本中的 URL
|
||||
|
||||
### ".env file not found"
|
||||
|
||||
**原因**: 未创建 `.env` 文件
|
||||
|
||||
**解决方案**:
|
||||
```bash
|
||||
echo "api_key=sk-your-api-key-here" > .env
|
||||
```
|
||||
|
||||
### "Filter 'xxx' not found"
|
||||
|
||||
**原因**: Filter 目录名不正确
|
||||
|
||||
**解决方案**:
|
||||
```bash
|
||||
# 列出所有可用的 Filter
|
||||
python deploy_filter.py --list
|
||||
```
|
||||
|
||||
### "Failed to update or create. Status: 401"
|
||||
|
||||
**原因**: API 密钥无效或过期
|
||||
|
||||
**解决方案**:
|
||||
1. 验证 API 密钥的有效性
|
||||
2. 获取新的 API 密钥
|
||||
3. 更新 `.env` 文件
|
||||
|
||||
## 工作流示例
|
||||
|
||||
### 开发并部署新的 Filter
|
||||
|
||||
```bash
|
||||
# 1. 在 plugins/filters/ 创建新的 Filter 目录
|
||||
mkdir plugins/filters/my-new-filter
|
||||
|
||||
# 2. 创建 my_new_filter.py 文件，包含必要的元数据：
|
||||
# """
|
||||
# title: My New Filter
|
||||
# author: Your Name
|
||||
# version: 1.0.0
|
||||
# description: Filter description
|
||||
# """
|
||||
|
||||
# 3. 部署到本地 OpenWebUI
|
||||
cd scripts
|
||||
python deploy_filter.py my-new-filter
|
||||
|
||||
# 4. 在 OpenWebUI UI 中测试插件
|
||||
|
||||
# 5. 继续迭代开发
|
||||
# ... 修改代码 ...
|
||||
|
||||
# 6. 重新部署（自动覆盖）
|
||||
python deploy_filter.py my-new-filter
|
||||
```
|
||||
|
||||
### 修复 Bug 并快速部署
|
||||
|
||||
```bash
|
||||
# 1. 修改源代码
|
||||
# vim ../plugins/filters/async-context-compression/async_context_compression.py
|
||||
|
||||
# 2. 立即部署到本地
|
||||
python deploy_filter.py async-context-compression
|
||||
|
||||
# 3. 在 OpenWebUI 中测试修复
|
||||
# （无需重启 OpenWebUI）
|
||||
```
|
||||
|
||||
## 安全注意事项
|
||||
|
||||
⚠️ **重要**:
|
||||
- ✅ 将 `.env` 文件添加到 `.gitignore`（避免提交敏感信息）
|
||||
- ✅ 不要在版本控制中提交 API 密钥
|
||||
- ✅ 仅在可信的网络环境中使用
|
||||
- ✅ 定期轮换 API 密钥
|
||||
|
||||
## 文件结构
|
||||
|
||||
```
|
||||
scripts/
|
||||
├── deploy_filter.py # Filter 插件部署工具
|
||||
├── deploy_pipe.py # Pipe 插件部署工具
|
||||
├── .env # API 密钥（本地，不提交）
|
||||
├── README.md # 本文件
|
||||
└── ...
|
||||
```
|
||||
|
||||
## 参考资源
|
||||
|
||||
- [OpenWebUI 文档](https://docs.openwebui.com/)
|
||||
- [插件开发指南](../docs/development/plugin-guide.md)
|
||||
- [Filter 插件示例](../plugins/filters/)
|
||||
|
||||
---
|
||||
|
||||
**最后更新**: 2026-03-09
|
||||
**作者**: Fu-Jie
|
||||
378
scripts/DEPLOYMENT_SUMMARY.md
Normal file
378
scripts/DEPLOYMENT_SUMMARY.md
Normal file
@@ -0,0 +1,378 @@
|
||||
# 📦 Async Context Compression — 本地部署工具 (Local Deployment Tools)
|
||||
|
||||
## 🎯 功能概述
|
||||
|
||||
为 `async_context_compression` Filter 插件添加了完整的本地部署工具链，支持快速迭代开发无需重启 OpenWebUI。
|
||||
|
||||
## 📋 新增文件
|
||||
|
||||
### 1. **deploy_filter.py** — Filter 插件部署脚本
|
||||
- **位置**: `scripts/deploy_filter.py`
|
||||
- **功能**: 自动部署 Filter 类插件到本地 OpenWebUI 实例
|
||||
- **特性**:
|
||||
- ✅ 从 Python docstring 自动提取元数据
|
||||
- ✅ 智能版本号识别（semantic versioning）
|
||||
- ✅ 支持多个 Filter 插件管理
|
||||
- ✅ 自动更新或创建插件
|
||||
- ✅ 详细的错误诊断和连接测试
|
||||
- ✅ 列表指令查看所有可用 Filter
|
||||
- **代码行数**: ~300 行
|
||||
|
||||
### 2. **DEPLOYMENT_GUIDE.md** — 完整部署指南
|
||||
- **位置**: `scripts/DEPLOYMENT_GUIDE.md`
|
||||
- **内容**:
|
||||
- 前置条件和快速开始
|
||||
- 脚本详细说明
|
||||
- API 密钥获取方法
|
||||
- 故障排除指南
|
||||
- 分步工作流示例
|
||||
|
||||
### 3. **QUICK_START.md** — 快速参考卡片
|
||||
- **位置**: `scripts/QUICK_START.md`
|
||||
- **内容**:
|
||||
- 一行命令部署
|
||||
- 前置步骤
|
||||
- 常见命令表格
|
||||
- 故障诊断速查表
|
||||
- CI/CD 集成示例
|
||||
|
||||
### 4. **test_deploy_filter.py** — 单元测试套件
|
||||
- **位置**: `tests/scripts/test_deploy_filter.py`
|
||||
- **测试覆盖**:
|
||||
- ✅ Filter 文件发现 (3 个测试)
|
||||
- ✅ 元数据提取 (3 个测试)
|
||||
- ✅ API 负载构建 (4 个测试)
|
||||
- **测试通过率**: 10/10 ✅
|
||||
|
||||
## 🚀 使用方式
|
||||
|
||||
### 基本部署（一行命令）
|
||||
|
||||
```bash
|
||||
cd scripts
|
||||
python deploy_filter.py
|
||||
```
|
||||
|
||||
### 列出所有可用 Filter
|
||||
|
||||
```bash
|
||||
python deploy_filter.py --list
|
||||
```
|
||||
|
||||
### 部署指定 Filter
|
||||
|
||||
```bash
|
||||
python deploy_filter.py folder-memory
|
||||
python deploy_filter.py context_enhancement_filter
|
||||
```
|
||||
|
||||
## 🔧 工作原理
|
||||
|
||||
```
|
||||
┌─────────────────────────────────────────────────────────────┐
|
||||
│ 1. 加载 API 密钥 (.env) │
|
||||
└──────────────────┬──────────────────────────────────────────┘
|
||||
│
|
||||
┌──────────────────▼──────────────────────────────────────────┐
|
||||
│ 2. 查找 Filter 插件文件 │
|
||||
│ - 从名称推断文件路径 │
|
||||
│ - 支持 hyphen-case 和 snake_case 查找 │
|
||||
└──────────────────┬──────────────────────────────────────────┘
|
||||
│
|
||||
┌──────────────────▼──────────────────────────────────────────┐
|
||||
│ 3. 读取 Python 源代码 │
|
||||
│ - 提取 docstring 元数据 │
|
||||
│ - title, version, author, description, openwebui_id │
|
||||
└──────────────────┬──────────────────────────────────────────┘
|
||||
│
|
||||
┌──────────────────▼──────────────────────────────────────────┐
|
||||
│ 4. 构建 API 请求负载 │
|
||||
│ - 组装 manifest 和 meta 信息 │
|
||||
│ - 包含完整源代码内容 │
|
||||
└──────────────────┬──────────────────────────────────────────┘
|
||||
│
|
||||
┌──────────────────▼──────────────────────────────────────────┐
|
||||
│ 5. 发送请求 │
|
||||
│ - POST /api/v1/functions/id/{id}/update （更新） │
|
||||
│ - POST /api/v1/functions/create （创建备用） │
|
||||
└──────────────────┬──────────────────────────────────────────┘
|
||||
│
|
||||
┌──────────────────▼──────────────────────────────────────────┐
|
||||
│ 6. 显示结果和诊断 │
|
||||
│ - ✅ 更新/创建成功 │
|
||||
│ - ❌ 错误信息和解决建议 │
|
||||
└─────────────────────────────────────────────────────────────┘
|
||||
```
|
||||
|
||||
## 📊 支持的 Filter 列表
|
||||
|
||||
脚本自动发现以下 Filter：
|
||||
|
||||
| Filter 名称 | Python 文件 | 版本 |
|
||||
|-----------|-----------|------|
|
||||
| async-context-compression | async_context_compression.py | 1.3.0+ |
|
||||
| chat-session-mapping-filter | chat_session_mapping_filter.py | 0.1.0+ |
|
||||
| context_enhancement_filter | context_enhancement_filter.py | 0.3+ |
|
||||
| folder-memory | folder_memory.py | 0.1.0+ |
|
||||
| github_copilot_sdk_files_filter | github_copilot_sdk_files_filter.py | 0.1.3+ |
|
||||
| markdown_normalizer | markdown_normalizer.py | 1.2.8+ |
|
||||
| web_gemini_multimodel_filter | web_gemini_multimodel_filter.py | 0.3.2+ |
|
||||
|
||||
## ⚙️ 技术细节
|
||||
|
||||
### 元数据提取
|
||||
|
||||
脚本从 Python 文件顶部的 docstring 中提取元数据：
|
||||
|
||||
```python
|
||||
"""
|
||||
title: Async Context Compression
|
||||
id: async_context_compression
|
||||
author: Fu-Jie
|
||||
author_url: https://github.com/Fu-Jie/openwebui-extensions
|
||||
funding_url: https://github.com/open-webui
|
||||
description: Reduces token consumption...
|
||||
version: 1.3.0
|
||||
openwebui_id: b1655bc8-6de9-4cad-8cb5-a6f7829a02ce
|
||||
"""
|
||||
```
|
||||
|
||||
**支持的元数据字段**:
|
||||
- `title` — Filter 显示名称 ✅
|
||||
- `id` — 唯一标识符 ✅
|
||||
- `author` — 作者名称 ✅
|
||||
- `author_url` — 作者主页链接 ✅
|
||||
- `funding_url` — 项目链接 ✅
|
||||
- `description` — 功能描述 ✅
|
||||
- `version` — 语义化版本号 ✅
|
||||
- `openwebui_id` — OpenWebUI UUID （可选）
|
||||
|
||||
### API 集成
|
||||
|
||||
脚本使用 OpenWebUI REST API：
|
||||
|
||||
```
|
||||
POST /api/v1/functions/id/{filter_id}/update
|
||||
- 更新现有 Filter
|
||||
- HTTP 200: 更新成功
|
||||
- HTTP 404: Filter 不存在，自动尝试创建
|
||||
|
||||
POST /api/v1/functions/create
|
||||
- 创建新 Filter
|
||||
- HTTP 200: 创建成功
|
||||
```
|
||||
|
||||
**认证**: Bearer token (API 密钥方式)
|
||||
|
||||
## 🔐 安全性
|
||||
|
||||
### API 密钥管理
|
||||
|
||||
```bash
|
||||
# 1. 创建 .env 文件
|
||||
echo "api_key=sk-your-key-here" > scripts/.env
|
||||
|
||||
# 2. 将 .env 添加到 .gitignore
|
||||
echo "scripts/.env" >> .gitignore
|
||||
|
||||
# 3. 不要提交 API 密钥
|
||||
git add scripts/.gitignore
|
||||
git commit -m "chore: add .env to gitignore"
|
||||
```
|
||||
|
||||
### 最佳实践
|
||||
|
||||
- ✅ 使用长期认证令牌（而不是短期 JWT）
|
||||
- ✅ 定期轮换 API 密钥
|
||||
- ✅ 限制密钥权限范围
|
||||
- ✅ 在可信网络中使用
|
||||
- ✅ 生产环境使用 CI/CD 秘密管理
|
||||
|
||||
## 🧪 测试验证
|
||||
|
||||
### 运行测试套件
|
||||
|
||||
```bash
|
||||
pytest tests/scripts/test_deploy_filter.py -v
|
||||
```
|
||||
|
||||
### 测试覆盖范围
|
||||
|
||||
```
|
||||
✅ TestFilterDiscovery (3 个测试)
|
||||
- test_find_async_context_compression
|
||||
- test_find_nonexistent_filter
|
||||
- test_find_filter_with_underscores
|
||||
|
||||
✅ TestMetadataExtraction (3 个测试)
|
||||
- test_extract_metadata_from_async_compression
|
||||
- test_extract_metadata_empty_file
|
||||
- test_extract_metadata_multiline_docstring
|
||||
|
||||
✅ TestPayloadBuilding (4 个测试)
|
||||
- test_build_filter_payload_basic
|
||||
- test_payload_has_required_fields
|
||||
- test_payload_with_openwebui_id
|
||||
|
||||
✅ TestVersionExtraction (1 个测试)
|
||||
- test_extract_valid_version
|
||||
|
||||
结果: 10/10 通过 ✅
|
||||
```
|
||||
|
||||
## 💡 常见用例
|
||||
|
||||
### 用例 1: 修复 Bug 后快速测试
|
||||
|
||||
```bash
|
||||
# 1. 修改代码
|
||||
vim plugins/filters/async-context-compression/async_context_compression.py
|
||||
|
||||
# 2. 立即部署（不需要重启 OpenWebUI）
|
||||
cd scripts && python deploy_filter.py
|
||||
|
||||
# 3. 在 OpenWebUI 中测试修复
|
||||
# 4. 重复迭代（返回步骤 1）
|
||||
```
|
||||
|
||||
### 用例 2: 开发新的 Filter
|
||||
|
||||
```bash
|
||||
# 1. 创建新 Filter 目录
|
||||
mkdir plugins/filters/my-new-filter
|
||||
|
||||
# 2. 编写代码（包含必要的 docstring 元数据）
|
||||
cat > plugins/filters/my-new-filter/my_new_filter.py << 'EOF'
|
||||
"""
|
||||
title: My New Filter
|
||||
author: Your Name
|
||||
version: 1.0.0
|
||||
description: Filter description
|
||||
"""
|
||||
|
||||
class Filter:
|
||||
# ... implementation ...
|
||||
EOF
|
||||
|
||||
# 3. 首次部署（创建）
|
||||
cd scripts && python deploy_filter.py my-new-filter
|
||||
|
||||
# 4. 在 OpenWebUI UI 测试
|
||||
# 5. 重复更新
|
||||
cd scripts && python deploy_filter.py my-new-filter
|
||||
```
|
||||
|
||||
### 用例 3: 版本更新和发布
|
||||
|
||||
```bash
|
||||
# 1. 更新版本号
|
||||
vim plugins/filters/async-context-compression/async_context_compression.py
|
||||
# 修改: version: 1.3.0 → version: 1.4.0
|
||||
|
||||
# 2. 部署新版本
|
||||
cd scripts && python deploy_filter.py
|
||||
|
||||
# 3. 测试通过后提交
|
||||
git add plugins/filters/async-context-compression/
|
||||
git commit -m "feat(filters): update async-context-compression to 1.4.0"
|
||||
git push
|
||||
```
|
||||
|
||||
## 🔄 CI/CD 集成
|
||||
|
||||
### GitHub Actions 示例
|
||||
|
||||
```yaml
|
||||
name: Deploy Filter on Release
|
||||
|
||||
on:
|
||||
release:
|
||||
types: [published]
|
||||
|
||||
jobs:
|
||||
deploy:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Setup Python
|
||||
uses: actions/setup-python@v4
|
||||
with:
|
||||
python-version: '3.12'
|
||||
|
||||
- name: Deploy Filter
|
||||
run: |
|
||||
cd scripts
|
||||
python deploy_filter.py async-context-compression
|
||||
env:
|
||||
api_key: ${{ secrets.OPENWEBUI_API_KEY }}
|
||||
```
|
||||
|
||||
## 📚 参考文档
|
||||
|
||||
- [完整部署指南](DEPLOYMENT_GUIDE.md)
|
||||
- [快速参考卡片](QUICK_START.md)
|
||||
- [测试套件](../tests/scripts/test_deploy_filter.py)
|
||||
- [插件开发指南](../docs/development/plugin-guide.md)
|
||||
- [OpenWebUI 文档](https://docs.openwebui.com/)
|
||||
|
||||
## 🎓 学习资源
|
||||
|
||||
### 架构理解
|
||||
|
||||
```
|
||||
OpenWebUI 系统设计
|
||||
↓
|
||||
Filter 插件类型定义
|
||||
↓
|
||||
REST API 接口 (/api/v1/functions)
|
||||
↓
|
||||
本地部署脚本实现 (deploy_filter.py)
|
||||
↓
|
||||
元数据提取和投递
|
||||
```
|
||||
|
||||
### 调试技巧
|
||||
|
||||
1. **启用详细日志**:
|
||||
```bash
|
||||
python deploy_filter.py 2>&1 | tee deploy.log
|
||||
```
|
||||
|
||||
2. **测试 API 连接**:
|
||||
```bash
|
||||
curl -X GET http://localhost:3003/api/v1/functions \
|
||||
-H "Authorization: Bearer $API_KEY"
|
||||
```
|
||||
|
||||
3. **验证 .env 文件**:
|
||||
```bash
|
||||
grep "api_key=" scripts/.env
|
||||
```
|
||||
|
||||
## 📞 故障排除
|
||||
|
||||
| 问题 | 诊断 | 解决方案 |
|
||||
|------|------|----------|
|
||||
| Connection error | OpenWebUI 地址/端口不对 | 检查 localhost:3003；修改 URL 如需要 |
|
||||
| .env not found | 未创建配置文件 | `echo "api_key=sk-..." > scripts/.env` |
|
||||
| Filter not found | 插件名称错误 | 运行 `python deploy_filter.py --list` |
|
||||
| Status 401 | API 密钥无效/过期 | 更新 `.env` 中的密钥 |
|
||||
| Status 500 | 服务器错误 | 检查 OpenWebUI 服务日志 |
|
||||
|
||||
## ✨ 特色功能
|
||||
|
||||
| 特性 | 描述 |
|
||||
|------|------|
|
||||
| 🔍 自动发现 | 自动查找所有 Filter 插件 |
|
||||
| 📊 元数据提取 | 从代码自动提取版本和元数据 |
|
||||
| ♻️ 自动更新 | 智能处理更新或创建 |
|
||||
| 🛡️ 错误处理 | 详细的错误提示和诊断信息 |
|
||||
| 🚀 快速迭代 | 秒级部署，无需重启 |
|
||||
| 🧪 完整测试 | 10 个单元测试覆盖核心功能 |
|
||||
|
||||
---
|
||||
|
||||
**最后更新**: 2026-03-09
|
||||
**作者**: Fu-Jie
|
||||
**项目**: [openwebui-extensions](https://github.com/Fu-Jie/openwebui-extensions)
|
||||
113
scripts/QUICK_START.md
Normal file
113
scripts/QUICK_START.md
Normal file
@@ -0,0 +1,113 @@
|
||||
# ⚡ 快速部署参考 (Quick Deployment Reference)
|
||||
|
||||
## 一行命令部署
|
||||
|
||||
```bash
|
||||
# 部署 async_context_compression Filter（默认）
|
||||
cd scripts && python deploy_filter.py
|
||||
|
||||
# 列出所有可用 Filter
|
||||
cd scripts && python deploy_filter.py --list
|
||||
```
|
||||
|
||||
## 前置步骤（仅需一次）
|
||||
|
||||
```bash
|
||||
# 1. 进入 scripts 目录
|
||||
cd scripts
|
||||
|
||||
# 2. 创建 .env 文件，包含 OpenWebUI API 密钥
|
||||
echo "api_key=sk-your-api-key-here" > .env
|
||||
|
||||
# 3. 确保 OpenWebUI 运行在 localhost:3003
|
||||
```
|
||||
|
||||
## 获取 API 密钥
|
||||
|
||||
1. 打开 OpenWebUI → 用户头像 → Settings
|
||||
2. 找到 "API Keys" 部分
|
||||
3. 复制密钥（sk-开头）
|
||||
4. 粘贴到 `.env` 文件
|
||||
|
||||
## 部署流程
|
||||
|
||||
```bash
|
||||
# 1. 编辑插件代码
|
||||
vim ../plugins/filters/async-context-compression/async_context_compression.py
|
||||
|
||||
# 2. 部署到本地
|
||||
python deploy_filter.py
|
||||
|
||||
# 3. 在 OpenWebUI 测试（无需重启）
|
||||
|
||||
# 4. 重复部署（自动覆盖）
|
||||
python deploy_filter.py
|
||||
```
|
||||
|
||||
## 常见命令
|
||||
|
||||
| 命令 | 说明 |
|
||||
|------|------|
|
||||
| `python deploy_filter.py` | 部署 async_context_compression |
|
||||
| `python deploy_filter.py filter-name` | 部署指定 Filter |
|
||||
| `python deploy_filter.py --list` | 列出所有可用 Filter |
|
||||
| `python deploy_pipe.py` | 部署 GitHub Copilot SDK Pipe |
|
||||
|
||||
## 故障诊断
|
||||
|
||||
| 错误 | 原因 | 解决方案 |
|
||||
|------|------|----------|
|
||||
| Connection error | OpenWebUI 未运行 | 启动 OpenWebUI 或检查端口 |
|
||||
| .env not found | 未创建配置文件 | `echo "api_key=sk-..." > .env` |
|
||||
| Filter not found | Filter 名称错误 | 运行 `python deploy_filter.py --list` |
|
||||
| Status 401 | API 密钥无效 | 更新 `.env` 中的密钥 |
|
||||
|
||||
## 文件位置
|
||||
|
||||
```
|
||||
openwebui-extensions/
|
||||
├── scripts/
|
||||
│ ├── deploy_filter.py ← Filter 部署工具
|
||||
│ ├── deploy_pipe.py ← Pipe 部署工具
|
||||
│ ├── .env ← API 密钥（不提交）
|
||||
│ └── DEPLOYMENT_GUIDE.md ← 完整指南
|
||||
│
|
||||
└── plugins/
|
||||
└── filters/
|
||||
└── async-context-compression/
|
||||
├── async_context_compression.py
|
||||
├── README.md
|
||||
└── README_CN.md
|
||||
```
|
||||
|
||||
## 工作流建议
|
||||
|
||||
### 快速迭代开发
|
||||
|
||||
```bash
|
||||
# Terminal 1: 启动 OpenWebUI（如果未运行）
|
||||
docker run -d -p 3003:8080 ghcr.io/open-webui/open-webui:latest
|
||||
|
||||
# Terminal 2: 开发环节（重复执行）
|
||||
cd scripts
|
||||
code ../plugins/filters/async-context-compression/ # 编辑代码
|
||||
python deploy_filter.py # 部署
|
||||
# → 在 OpenWebUI 测试
|
||||
# → 返回编辑，重复
|
||||
```
|
||||
|
||||
### CI/CD 集成
|
||||
|
||||
```bash
|
||||
# 在 GitHub Actions 中
|
||||
- name: Deploy filter to staging
|
||||
run: |
|
||||
cd scripts
|
||||
python deploy_filter.py async-context-compression
|
||||
env:
|
||||
api_key: ${{ secrets.OPENWEBUI_API_KEY }}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
📚 **更多帮助**: 查看 `DEPLOYMENT_GUIDE.md`
|
||||
416
scripts/README.md
Normal file
416
scripts/README.md
Normal file
@@ -0,0 +1,416 @@
|
||||
# 🚀 部署脚本使用指南 (Deployment Scripts Guide)
|
||||
|
||||
## 📁 新增部署工具
|
||||
|
||||
为了支持快速本地部署 async_context_compression 和其他 Filter 插件，我们添加了以下文件：
|
||||
|
||||
### 具体文件列表
|
||||
|
||||
```
|
||||
scripts/
|
||||
├── deploy_filter.py ✨ 通用 Filter 部署工具
|
||||
├── deploy_async_context_compression.py ✨ Async Context Compression 快捷部署
|
||||
├── deploy_pipe.py (已有) Pipe 部署工具
|
||||
├── DEPLOYMENT_GUIDE.md ✨ 完整部署指南
|
||||
├── DEPLOYMENT_SUMMARY.md ✨ 部署功能总结
|
||||
├── QUICK_START.md ✨ 快速参考卡片
|
||||
├── .env (需要创建) API 密钥配置
|
||||
└── ...其他现有脚本
|
||||
```
|
||||
|
||||
## ⚡ 快速开始 (30 秒)
|
||||
|
||||
### 步骤 1: 准备 API 密钥
|
||||
|
||||
```bash
|
||||
cd scripts
|
||||
|
||||
# 获取你的 OpenWebUI API 密钥：
|
||||
# 1. 打开 OpenWebUI → 用户菜单 → Settings
|
||||
# 2. 找到 "API Keys" 部分
|
||||
# 3. 复制你的密钥（以 sk- 开头）
|
||||
|
||||
# 创建 .env 文件
|
||||
echo "api_key=sk-你的密钥" > .env
|
||||
```
|
||||
|
||||
### 步骤 2: 部署异步上下文压缩
|
||||
|
||||
```bash
|
||||
# 最简单的方式 - 专用脚本
|
||||
python deploy_async_context_compression.py
|
||||
|
||||
# 或使用通用脚本
|
||||
python deploy_filter.py
|
||||
|
||||
# 或指定插件名称
|
||||
python deploy_filter.py async-context-compression
|
||||
```
|
||||
|
||||
## 📋 部署工具详解
|
||||
|
||||
### 1️⃣ `deploy_async_context_compression.py` — 专用部署脚本
|
||||
|
||||
**最简单的部署方式！**
|
||||
|
||||
```bash
|
||||
cd scripts
|
||||
python deploy_async_context_compression.py
|
||||
```
|
||||
|
||||
**特点**:
|
||||
- ✅ 专为 async_context_compression 优化
|
||||
- ✅ 清晰的部署步骤和确认
|
||||
- ✅ 友好的错误提示
|
||||
- ✅ 部署成功后显示后续步骤
|
||||
|
||||
**输出样例**:
|
||||
```
|
||||
======================================================================
|
||||
🚀 Deploying Async Context Compression Filter Plugin
|
||||
======================================================================
|
||||
|
||||
📦 Deploying filter 'Async Context Compression' (version 1.3.0)...
|
||||
File: /path/to/async_context_compression.py
|
||||
✅ Successfully updated 'Async Context Compression' filter!
|
||||
|
||||
======================================================================
|
||||
✅ Deployment successful!
|
||||
======================================================================
|
||||
|
||||
Next steps:
|
||||
1. Open OpenWebUI in your browser: http://localhost:3003
|
||||
2. Go to Settings → Filters
|
||||
3. Enable 'Async Context Compression'
|
||||
4. Configure Valves as needed
|
||||
5. Start using the filter in conversations
|
||||
```
|
||||
|
||||
### 2️⃣ `deploy_filter.py` — 通用 Filter 部署工具
|
||||
|
||||
**支持所有 Filter 插件！**
|
||||
|
||||
```bash
|
||||
# 部署默认的 async_context_compression
|
||||
python deploy_filter.py
|
||||
|
||||
# 部署其他 Filter
|
||||
python deploy_filter.py folder-memory
|
||||
python deploy_filter.py context_enhancement_filter
|
||||
|
||||
# 列出所有可用 Filter
|
||||
python deploy_filter.py --list
|
||||
```
|
||||
|
||||
**特点**:
|
||||
- ✅ 通用的 Filter 部署工具
|
||||
- ✅ 支持多个插件
|
||||
- ✅ 自动元数据提取
|
||||
- ✅ 智能更新/创建逻辑
|
||||
- ✅ 完整的错误诊断
|
||||
|
||||
### 3️⃣ `deploy_pipe.py` — Pipe 部署工具
|
||||
|
||||
```bash
|
||||
python deploy_pipe.py
|
||||
```
|
||||
|
||||
用于部署 Pipe 类型的插件（如 GitHub Copilot SDK）。
|
||||
|
||||
## 🔧 工作原理
|
||||
|
||||
```
|
||||
你的代码变更
|
||||
↓
|
||||
运行部署脚本
|
||||
↓
|
||||
脚本读取对应插件文件
|
||||
↓
|
||||
从代码自动提取元数据 (title, version, author, etc.)
|
||||
↓
|
||||
构建 API 请求
|
||||
↓
|
||||
发送到本地 OpenWebUI
|
||||
↓
|
||||
OpenWebUI 更新或创建插件
|
||||
↓
|
||||
立即生效！（无需重启）
|
||||
```
|
||||
|
||||
## 📊 可部署的 Filter 列表
|
||||
|
||||
使用 `python deploy_filter.py --list` 查看所有可用 Filter：
|
||||
|
||||
| Filter 名称 | Python 文件 | 描述 |
|
||||
|-----------|-----------|------|
|
||||
| **async-context-compression** | async_context_compression.py | 异步上下文压缩 |
|
||||
| chat-session-mapping-filter | chat_session_mapping_filter.py | 聊天会话映射 |
|
||||
| context_enhancement_filter | context_enhancement_filter.py | 上下文增强 |
|
||||
| folder-memory | folder_memory.py | 文件夹记忆 |
|
||||
| github_copilot_sdk_files_filter | github_copilot_sdk_files_filter.py | Copilot SDK Files |
|
||||
| markdown_normalizer | markdown_normalizer.py | Markdown 规范化 |
|
||||
| web_gemini_multimodel_filter | web_gemini_multimodel_filter.py | Gemini 多模态 |
|
||||
|
||||
## 🎯 常见使用场景
|
||||
|
||||
### 场景 1: 开发新功能后部署
|
||||
|
||||
```bash
|
||||
# 1. 修改代码
|
||||
vim ../plugins/filters/async-context-compression/async_context_compression.py
|
||||
|
||||
# 2. 更新版本号（可选）
|
||||
# version: 1.3.0 → 1.3.1
|
||||
|
||||
# 3. 部署
|
||||
python deploy_async_context_compression.py
|
||||
|
||||
# 4. 在 OpenWebUI 中测试
|
||||
# → 无需重启，立即生效！
|
||||
|
||||
# 5. 继续开发，重复上述步骤
|
||||
```
|
||||
|
||||
### 场景 2: 修复 Bug 并快速验证
|
||||
|
||||
```bash
|
||||
# 1. 定位并修复 Bug
|
||||
vim ../plugins/filters/async-context-compression/async_context_compression.py
|
||||
|
||||
# 2. 快速部署验证
|
||||
python deploy_async_context_compression.py
|
||||
|
||||
# 3. 在 OpenWebUI 测试 Bug 修复
|
||||
# 一键部署，秒级反馈！
|
||||
```
|
||||
|
||||
### 场景 3: 部署多个 Filter
|
||||
|
||||
```bash
|
||||
# 部署所有需要更新的 Filter
|
||||
python deploy_filter.py async-context-compression
|
||||
python deploy_filter.py folder-memory
|
||||
python deploy_filter.py context_enhancement_filter
|
||||
```
|
||||
|
||||
## 🔐 安全提示
|
||||
|
||||
### 管理 API 密钥
|
||||
|
||||
```bash
|
||||
# 1. 创建 .env（只在本地）
|
||||
echo "api_key=sk-your-key" > .env
|
||||
|
||||
# 2. 添加到 .gitignore（防止提交）
|
||||
echo "scripts/.env" >> ../.gitignore
|
||||
|
||||
# 3. 验证不会被提交
|
||||
git status # 应该看不到 .env
|
||||
|
||||
# 4. 定期轮换密钥
|
||||
# → 在 OpenWebUI Settings 中生成新密钥
|
||||
# → 更新 .env 文件
|
||||
```
|
||||
|
||||
### ✅ 安全检查清单
|
||||
|
||||
- [ ] `.env` 文件在 `.gitignore` 中
|
||||
- [ ] 从不在代码中硬编码 API 密钥
|
||||
- [ ] 定期轮换 API 密钥
|
||||
- [ ] 仅在可信网络中使用
|
||||
- [ ] 生产环境使用 CI/CD 秘密管理
|
||||
|
||||
## ❌ 故障排除
|
||||
|
||||
### 问题 1: "Connection error"
|
||||
|
||||
```
|
||||
❌ Connection error: Could not reach OpenWebUI at localhost:3003
|
||||
Make sure OpenWebUI is running and accessible.
|
||||
```
|
||||
|
||||
**解决方案**:
|
||||
```bash
|
||||
# 1. 检查 OpenWebUI 是否运行
|
||||
curl http://localhost:3003
|
||||
|
||||
# 2. 如果端口不同，编辑脚本中的 URL
|
||||
# 默认: http://localhost:3003
|
||||
# 修改位置: deploy_filter.py 中的 "localhost:3003"
|
||||
|
||||
# 3. 检查防火墙设置
|
||||
```
|
||||
|
||||
### 问题 2: ".env file not found"
|
||||
|
||||
```
|
||||
❌ [ERROR] .env file not found at .env
|
||||
Please create it with: api_key=sk-xxxxxxxxxxxx
|
||||
```
|
||||
|
||||
**解决方案**:
|
||||
```bash
|
||||
echo "api_key=sk-your-api-key" > .env
|
||||
cat .env # 验证文件已创建
|
||||
```
|
||||
|
||||
### 问题 3: "Filter not found"
|
||||
|
||||
```
|
||||
❌ [ERROR] Filter 'xxx' not found in .../plugins/filters
|
||||
```
|
||||
|
||||
**解决方案**:
|
||||
```bash
|
||||
# 列出所有可用 Filter
|
||||
python deploy_filter.py --list
|
||||
|
||||
# 使用正确的名称重试
|
||||
python deploy_filter.py async-context-compression
|
||||
```
|
||||
|
||||
### 问题 4: "Status 401" (Unauthorized)
|
||||
|
||||
```
|
||||
❌ Failed to update or create. Status: 401
|
||||
Error: {"error": "Unauthorized"}
|
||||
```
|
||||
|
||||
**解决方案**:
|
||||
```bash
|
||||
# 1. 验证 API 密钥是否正确
|
||||
grep "api_key=" .env
|
||||
|
||||
# 2. 在 OpenWebUI 中检查密钥是否仍然有效
|
||||
# Settings → API Keys → 检查
|
||||
|
||||
# 3. 生成新密钥并更新 .env
|
||||
echo "api_key=sk-new-key" > .env
|
||||
```
|
||||
|
||||
## 📖 文档导航
|
||||
|
||||
| 文档 | 描述 |
|
||||
|------|------|
|
||||
| **README.md** (本文件) | 快速参考和常见问题 |
|
||||
| [QUICK_START.md](QUICK_START.md) | 一页速查表 |
|
||||
| [DEPLOYMENT_GUIDE.md](DEPLOYMENT_GUIDE.md) | 完整详细指南 |
|
||||
| [DEPLOYMENT_SUMMARY.md](DEPLOYMENT_SUMMARY.md) | 技术架构说明 |
|
||||
|
||||
## 🧪 验证部署成功
|
||||
|
||||
### 方式 1: 检查脚本输出
|
||||
|
||||
```bash
|
||||
python deploy_async_context_compression.py
|
||||
|
||||
# 成功标志:
|
||||
✅ Successfully updated 'Async Context Compression' filter!
|
||||
```
|
||||
|
||||
### 方式 2: 在 OpenWebUI 中验证
|
||||
|
||||
1. 打开 OpenWebUI: http://localhost:3003
|
||||
2. 进入 Settings → Filters
|
||||
3. 查看 "Async Context Compression" 是否列出
|
||||
4. 查看版本号是否正确（应该是最新的）
|
||||
|
||||
### 方式 3: 测试插件功能
|
||||
|
||||
1. 打开一个新对话
|
||||
2. 启用 "Async Context Compression" Filter
|
||||
3. 进行多轮对话，验证压缩和总结功能正常
|
||||
|
||||
## 💡 高级用法
|
||||
|
||||
### 自动化部署测试
|
||||
|
||||
```bash
|
||||
#!/bin/bash
|
||||
# deploy_and_test.sh
|
||||
|
||||
echo "部署插件..."
|
||||
python scripts/deploy_async_context_compression.py
|
||||
|
||||
if [ $? -eq 0 ]; then
|
||||
echo "✅ 部署成功，运行测试..."
|
||||
python -m pytest tests/plugins/filters/async-context-compression/ -v
|
||||
else
|
||||
echo "❌ 部署失败"
|
||||
exit 1
|
||||
fi
|
||||
```
|
||||
|
||||
### CI/CD 集成
|
||||
|
||||
```yaml
|
||||
# .github/workflows/deploy.yml
|
||||
name: Deploy on Push
|
||||
|
||||
on: [push]
|
||||
|
||||
jobs:
|
||||
deploy:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/setup-python@v4
|
||||
|
||||
- name: Deploy Async Context Compression
|
||||
run: python scripts/deploy_async_context_compression.py
|
||||
env:
|
||||
api_key: ${{ secrets.OPENWEBUI_API_KEY }}
|
||||
```
|
||||
|
||||
## 📞 获取帮助
|
||||
|
||||
### 检查脚本状态
|
||||
|
||||
```bash
|
||||
# 列出所有可用脚本
|
||||
ls -la scripts/*.py
|
||||
|
||||
# 检查部署脚本是否存在
|
||||
ls -la scripts/deploy_*.py
|
||||
```
|
||||
|
||||
### 查看脚本版本
|
||||
|
||||
```bash
|
||||
# 查看脚本帮助
|
||||
python scripts/deploy_filter.py --help # 如果支持的话
|
||||
python scripts/deploy_async_context_compression.py --help
|
||||
```
|
||||
|
||||
### 调试模式
|
||||
|
||||
```bash
|
||||
# 保存输出到日志文件
|
||||
python scripts/deploy_async_context_compression.py | tee deploy.log
|
||||
|
||||
# 检查日志
|
||||
cat deploy.log
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📝 文件清单
|
||||
|
||||
新增的部署相关文件：
|
||||
|
||||
```
|
||||
✨ scripts/deploy_filter.py (新增) ~300 行
|
||||
✨ scripts/deploy_async_context_compression.py (新增) ~70 行
|
||||
✨ scripts/DEPLOYMENT_GUIDE.md (新增) 完整指南
|
||||
✨ scripts/DEPLOYMENT_SUMMARY.md (新增) 技术总结
|
||||
✨ scripts/QUICK_START.md (新增) 快速参考
|
||||
📄 tests/scripts/test_deploy_filter.py (新增) 10 个单元测试 ✅
|
||||
|
||||
✅ 所有文件已创建并测试通过！
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
**最后更新**: 2026-03-09
|
||||
**脚本状态**: ✅ Ready for production
|
||||
**测试覆盖**: 10/10 通过 ✅
|
||||
345
scripts/UPDATE_MECHANISM.md
Normal file
345
scripts/UPDATE_MECHANISM.md
Normal file
@@ -0,0 +1,345 @@
|
||||
# 🔄 部署脚本的更新机制 (Deployment Update Mechanism)
|
||||
|
||||
## 核心答案
|
||||
|
||||
✅ **是的，再次部署会自动更新！**
|
||||
|
||||
部署脚本采用**智能两阶段策略**：
|
||||
1. 🔄 **优先尝试更新** (UPDATE) — 如果插件已存在
|
||||
2. 📝 **自动创建** (CREATE) — 如果更新失败（插件不存在）
|
||||
|
||||
## 工作流程图
|
||||
|
||||
```
|
||||
运行部署脚本
|
||||
↓
|
||||
读取本地代码和元数据
|
||||
↓
|
||||
发送 UPDATE 请求到 OpenWebUI
|
||||
↓
|
||||
├─ HTTP 200 ✅
|
||||
│ └─ 插件已存在 → 更新成功！
|
||||
│
|
||||
└─ 其他状态代码 (404, 400 等)
|
||||
└─ 插件不存在或更新失败
|
||||
↓
|
||||
发送 CREATE 请求
|
||||
↓
|
||||
├─ HTTP 200 ✅
|
||||
│ └─ 创建成功！
|
||||
│
|
||||
└─ 失败
|
||||
└─ 显示错误信息
|
||||
```
|
||||
|
||||
## 详细步骤分析
|
||||
|
||||
### 步骤 1️⃣: 尝试更新 (UPDATE)
|
||||
|
||||
```python
|
||||
# 代码位置: deploy_filter.py 第 220-230 行
|
||||
|
||||
update_url = "http://localhost:3003/api/v1/functions/id/{filter_id}/update"
|
||||
|
||||
response = requests.post(
|
||||
update_url,
|
||||
headers=headers,
|
||||
data=json.dumps(payload),
|
||||
timeout=10,
|
||||
)
|
||||
|
||||
if response.status_code == 200:
|
||||
print(f"✅ Successfully updated '{title}' filter!")
|
||||
return True
|
||||
```
|
||||
|
||||
**这一步**:
|
||||
- 向 OpenWebUI API 发送 **POST** 到 `/api/v1/functions/id/{filter_id}/update`
|
||||
- 如果返回 **HTTP 200**，说明插件已存在且成功更新
|
||||
- 包含的内容:
|
||||
- 完整的最新代码
|
||||
- 元数据 (title, version, author, description 等)
|
||||
- 清单信息 (manifest)
|
||||
|
||||
### 步骤 2️⃣: 若更新失败，尝试创建 (CREATE)
|
||||
|
||||
```python
|
||||
# 代码位置: deploy_filter.py 第 231-245 行
|
||||
|
||||
if response.status_code != 200:
|
||||
print(f"⚠️ Update failed with status {response.status_code}, "
|
||||
"attempting to create instead...")
|
||||
|
||||
create_url = "http://localhost:3003/api/v1/functions/create"
|
||||
res_create = requests.post(
|
||||
create_url,
|
||||
headers=headers,
|
||||
data=json.dumps(payload),
|
||||
timeout=10,
|
||||
)
|
||||
|
||||
if res_create.status_code == 200:
|
||||
print(f"✅ Successfully created '{title}' filter!")
|
||||
return True
|
||||
```
|
||||
|
||||
**这一步**:
|
||||
- 如果更新失败 (HTTP ≠ 200)，自动尝试创建
|
||||
- 向 `/api/v1/functions/create` 发送 **POST** 请求
|
||||
- 使用**相同的 payload**（代码、元数据都一样）
|
||||
- 如果创建成功，第一次部署到 OpenWebUI
|
||||
|
||||
## 实际使用场景
|
||||
|
||||
### 场景 A: 第一次部署
|
||||
|
||||
```bash
|
||||
$ python deploy_async_context_compression.py
|
||||
|
||||
📦 Deploying filter 'Async Context Compression' (version 1.3.0)...
|
||||
File: .../async_context_compression.py
|
||||
⚠️ Update failed with status 404, attempting to create instead... ← 第一次，插件不存在
|
||||
✅ Successfully created 'Async Context Compression' filter! ← 创建成功
|
||||
```
|
||||
|
||||
**发生的事**:
|
||||
1. 尝试 UPDATE → 失败 (HTTP 404 — 插件不存在)
|
||||
2. 自动尝试 CREATE → 成功 (HTTP 200)
|
||||
3. 插件被创建到 OpenWebUI
|
||||
|
||||
---
|
||||
|
||||
### 场景 B: 再次部署 (修改代码后)
|
||||
|
||||
```bash
|
||||
# 第一次修改代码，再次部署
|
||||
$ python deploy_async_context_compression.py
|
||||
|
||||
📦 Deploying filter 'Async Context Compression' (version 1.3.1)...
|
||||
File: .../async_context_compression.py
|
||||
✅ Successfully updated 'Async Context Compression' filter! ← 直接更新！
|
||||
```
|
||||
|
||||
**发生的事**:
|
||||
1. 读取修改后的代码
|
||||
2. 尝试 UPDATE → 成功 (HTTP 200 — 插件已存在)
|
||||
3. OpenWebUI 中的插件被更新为最新代码
|
||||
4. **无需重启 OpenWebUI**，立即生效！
|
||||
|
||||
---
|
||||
|
||||
### 场景 C: 多次快速迭代
|
||||
|
||||
```bash
|
||||
# 第1次修改
|
||||
$ python deploy_async_context_compression.py
|
||||
✅ Successfully updated 'Async Context Compression' filter!
|
||||
|
||||
# 第2次修改
|
||||
$ python deploy_async_context_compression.py
|
||||
✅ Successfully updated 'Async Context Compression' filter!
|
||||
|
||||
# 第3次修改
|
||||
$ python deploy_async_context_compression.py
|
||||
✅ Successfully updated 'Async Context Compression' filter!
|
||||
|
||||
# ... 无限制地重复 ...
|
||||
```
|
||||
|
||||
**特点**:
|
||||
- 🚀 每次更新只需 5 秒
|
||||
- 📝 每次都是增量更新
|
||||
- ✅ 无需重启 OpenWebUI
|
||||
- 🔄 可以无限制地重复
|
||||
|
||||
## 更新的内容清单
|
||||
|
||||
每次部署时，以下内容会被更新：
|
||||
|
||||
✅ **代码** — 全部最新的 Python 代码
|
||||
✅ **版本号** — 从 docstring 自动提取
|
||||
✅ **标题** — 插件的显示名称
|
||||
✅ **作者信息** — author, author_url
|
||||
✅ **描述** — plugin description
|
||||
✅ **元数据** — funding_url, openwebui_id 等
|
||||
|
||||
❌ **配置不会被覆盖** — 用户在 OpenWebUI 中设置的 Valves 配置保持不变
|
||||
|
||||
## 版本号管理
|
||||
|
||||
### 更新时版本号会变吗？
|
||||
|
||||
✅ **是的，会变！**
|
||||
|
||||
```python
|
||||
# async_context_compression.py 的 docstring
|
||||
|
||||
"""
|
||||
title: Async Context Compression
|
||||
version: 1.3.0
|
||||
"""
|
||||
```
|
||||
|
||||
**每次部署时**:
|
||||
1. 脚本从 docstring 读取版本号
|
||||
2. 发送给 OpenWebUI 的 manifest 包含这个版本号
|
||||
3. 如果代码中改了版本号，部署时会更新到新版本
|
||||
|
||||
**最佳实践**:
|
||||
```bash
|
||||
# 1. 修改代码
|
||||
vim async_context_compression.py
|
||||
|
||||
# 2. 更新版本号（在 docstring 中）
|
||||
# 版本: 1.3.0 → 1.3.1
|
||||
|
||||
# 3. 部署
|
||||
python deploy_async_context_compression.py
|
||||
|
||||
# 结果: OpenWebUI 中显示版本 1.3.1
|
||||
```
|
||||
|
||||
## 部署失败的情况
|
||||
|
||||
### 情况 1: 网络错误
|
||||
|
||||
```bash
|
||||
❌ Connection error: Could not reach OpenWebUI at localhost:3003
|
||||
Make sure OpenWebUI is running and accessible.
|
||||
```
|
||||
|
||||
**原因**: OpenWebUI 未运行或端口错误
|
||||
**解决**: 检查 OpenWebUI 是否在运行
|
||||
|
||||
### 情况 2: API 密钥无效
|
||||
|
||||
```bash
|
||||
❌ Failed to update or create. Status: 401
|
||||
Error: {"error": "Unauthorized"}
|
||||
```
|
||||
|
||||
**原因**: .env 中的 API 密钥无效或过期
|
||||
**解决**: 更新 `.env` 文件中的 api_key
|
||||
|
||||
### 情况 3: 服务器错误
|
||||
|
||||
```bash
|
||||
❌ Failed to update or create. Status: 500
|
||||
Error: Internal server error
|
||||
```
|
||||
|
||||
**原因**: OpenWebUI 服务器内部错误
|
||||
**解决**: 检查 OpenWebUI 日志
|
||||
|
||||
## 设置版本号的最佳实践
|
||||
|
||||
### 语义化版本 (Semantic Versioning)
|
||||
|
||||
遵循 `MAJOR.MINOR.PATCH` 格式：
|
||||
|
||||
```python
|
||||
"""
|
||||
version: 1.3.0
|
||||
│ │ │
|
||||
│ │ └─ PATCH: Bug 修复 (1.3.0 → 1.3.1)
|
||||
│ └────── MINOR: 新功能 (1.3.0 → 1.4.0)
|
||||
└───────── MAJOR: 破坏性变更 (1.3.0 → 2.0.0)
|
||||
"""
|
||||
```
|
||||
|
||||
**例子**:
|
||||
|
||||
```python
|
||||
# Bug 修复 (PATCH)
|
||||
version: 1.3.0 → 1.3.1
|
||||
|
||||
# 新功能 (MINOR)
|
||||
version: 1.3.0 → 1.4.0
|
||||
|
||||
# 重大更新 (MAJOR)
|
||||
version: 1.3.0 → 2.0.0
|
||||
```
|
||||
|
||||
## 完整的迭代工作流
|
||||
|
||||
```bash
|
||||
# 1. 首次部署
|
||||
cd scripts
|
||||
python deploy_async_context_compression.py
|
||||
# 结果: 创建插件 (第一次)
|
||||
|
||||
# 2. 修改代码
|
||||
vim ../plugins/filters/async-context-compression/async_context_compression.py
|
||||
# 修改内容...
|
||||
|
||||
# 3. 再次部署 (自动更新)
|
||||
python deploy_async_context_compression.py
|
||||
# 结果: 更新插件 (立即生效，无需重启 OpenWebUI)
|
||||
|
||||
# 4. 重复步骤 2-3，无限次迭代
|
||||
# 每次修改 → 每次部署 → 立即测试 → 继续改进
|
||||
```
|
||||
|
||||
## 自动更新的优势
|
||||
|
||||
| 优势 | 说明 |
|
||||
|-----|------|
|
||||
| ⚡ **快速迭代** | 修改代码 → 部署 (5秒) → 测试，无需等待 |
|
||||
| 🔄 **自动检测** | 无需手动判断是创建还是更新 |
|
||||
| 📝 **版本管理** | 版本号自动从代码提取 |
|
||||
| ✅ **无需重启** | OpenWebUI 无需重启，配置保持不变 |
|
||||
| 🛡️ **安全更新** | 用户配置 (Valves) 不会被覆盖 |
|
||||
|
||||
## 禁用自动更新? ❌
|
||||
|
||||
通常**不需要**禁用自动更新，因为：
|
||||
|
||||
1. ✅ 更新是幂等的 (多次更新相同代码 = 无变化)
|
||||
2. ✅ 用户配置不会被修改
|
||||
3. ✅ 版本号自动管理
|
||||
4. ✅ 失败时自动回退
|
||||
|
||||
但如果真的需要控制，可以：
|
||||
- 手动修改脚本 (修改 `deploy_filter.py`)
|
||||
- 或分别使用 UPDATE/CREATE 的具体 API 端点
|
||||
|
||||
## 常见问题
|
||||
|
||||
### Q: 更新是否会丢失用户的配置？
|
||||
|
||||
❌ **不会！**
|
||||
用户在 OpenWebUI 中设置的 Valves (参数配置) 会被保留。
|
||||
|
||||
### Q: 是否可以回到旧版本？
|
||||
|
||||
✅ **可以！**
|
||||
修改代码中的 `version` 号为旧版本，然后重新部署。
|
||||
|
||||
### Q: 更新需要多长时间？
|
||||
|
||||
⚡ **约 5 秒**
|
||||
包括: 读文件 (1s) + 发送请求 (3s) + 响应 (1s)
|
||||
|
||||
### Q: 可以同时部署多个插件吗？
|
||||
|
||||
✅ **可以！**
|
||||
```bash
|
||||
python deploy_filter.py async-context-compression
|
||||
python deploy_filter.py folder-memory
|
||||
python deploy_filter.py context_enhancement_filter
|
||||
```
|
||||
|
||||
### Q: 部署失败了会怎样？
|
||||
|
||||
✅ **OpenWebUI 中的插件保持不变**
|
||||
失败不会修改已部署的插件。
|
||||
|
||||
---
|
||||
|
||||
**总结**: 部署脚本的更新机制完全自动化，开发者只需修改代码，每次运行 `deploy_async_context_compression.py` 就会自动：
|
||||
1. ✅ 创建（第一次）或更新（后续）插件
|
||||
2. ✅ 从代码提取最新的元数据和版本号
|
||||
3. ✅ 立即生效，无需重启 OpenWebUI
|
||||
4. ✅ 保留用户的配置不变
|
||||
|
||||
这使得本地开发和快速迭代变得极其流畅！🚀
|
||||
91
scripts/UPDATE_QUICK_REF.md
Normal file
91
scripts/UPDATE_QUICK_REF.md
Normal file
@@ -0,0 +1,91 @@
|
||||
# 🔄 快速参考：部署更新机制 (Quick Reference)
|
||||
|
||||
## 最简短的答案
|
||||
|
||||
✅ **再次部署会自动更新。**
|
||||
|
||||
## 工作原理 (30 秒理解)
|
||||
|
||||
```
|
||||
每次运行部署脚本：
|
||||
1. 优先尝试 UPDATE（如果插件已存在）→ 更新成功
|
||||
2. 失败时自动 CREATE（第一次部署时）→ 创建成功
|
||||
|
||||
结果：
|
||||
✅ 不管第几次部署，脚本都能正确处理
|
||||
✅ 无需手动判断创建还是更新
|
||||
✅ 立即生效，无需重启
|
||||
```
|
||||
|
||||
## 三个场景
|
||||
|
||||
| 场景 | 发生什么 | 结果 |
|
||||
|------|---------|------|
|
||||
| **第1次部署** | UPDATE 失败 → CREATE 成功 | ✅ 插件被创建 |
|
||||
| **修改代码后再次部署** | UPDATE 直接成功 | ✅ 插件立即更新 |
|
||||
| **未修改，重复部署** | UPDATE 成功 (无任何变化) | ✅ 无效果 (安全) |
|
||||
|
||||
## 开发流程
|
||||
|
||||
```bash
|
||||
# 1. 第一次部署
|
||||
python deploy_async_context_compression.py
|
||||
# 结果: ✅ Created
|
||||
|
||||
# 2. 修改代码
|
||||
vim ../plugins/filters/async-context-compression/async_context_compression.py
|
||||
# 编辑...
|
||||
|
||||
# 3. 再次部署 (自动更新)
|
||||
python deploy_async_context_compression.py
|
||||
# 结果: ✅ Updated
|
||||
|
||||
# 4. 继续修改，重复部署
|
||||
# ... 可以无限重复 ...
|
||||
```
|
||||
|
||||
## 关键点
|
||||
|
||||
✅ **自动化** — 不用管是更新还是创建
|
||||
✅ **快速** — 每次部署 5 秒
|
||||
✅ **安全** — 用户配置不会被覆盖
|
||||
✅ **即时** — 无需重启 OpenWebUI
|
||||
✅ **版本管理** — 自动从代码提取版本号
|
||||
|
||||
## 版本号怎么管理？
|
||||
|
||||
修改代码中的版本号：
|
||||
|
||||
```python
|
||||
# async_context_compression.py
|
||||
|
||||
"""
|
||||
version: 1.3.0 → 1.3.1 (修复 Bug)
|
||||
version: 1.3.0 → 1.4.0 (新功能)
|
||||
version: 1.3.0 → 2.0.0 (重大更新)
|
||||
"""
|
||||
```
|
||||
|
||||
然后部署，脚本会自动读取新版本号并更新。
|
||||
|
||||
## 常见问题速答
|
||||
|
||||
**Q: 用户的配置会被覆盖吗？**
|
||||
A: ❌ 不会，Valves 配置保持不变
|
||||
|
||||
**Q: 需要重启 OpenWebUI 吗？**
|
||||
A: ❌ 不需要，立即生效
|
||||
|
||||
**Q: 更新失败了会怎样？**
|
||||
A: ✅ 安全，保持原有插件不变
|
||||
|
||||
**Q: 可以无限制地重复部署吗？**
|
||||
A: ✅ 可以，完全幂等
|
||||
|
||||
## 一行总结
|
||||
|
||||
> 首次部署创建插件，之后每次部署自动更新，5 秒即时反馈，无需重启。
|
||||
|
||||
---
|
||||
|
||||
📖 详细文档：`scripts/UPDATE_MECHANISM.md`
|
||||
71
scripts/deploy_async_context_compression.py
Normal file
71
scripts/deploy_async_context_compression.py
Normal file
@@ -0,0 +1,71 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
Deploy Async Context Compression Filter Plugin
|
||||
|
||||
Fast deployment script specifically for async_context_compression Filter plugin.
|
||||
This is a shortcut for: python deploy_filter.py async-context-compression
|
||||
|
||||
Usage:
|
||||
python deploy_async_context_compression.py
|
||||
|
||||
To get started:
|
||||
1. Create .env file with your OpenWebUI API key:
|
||||
echo "api_key=sk-your-key-here" > .env
|
||||
|
||||
2. Make sure OpenWebUI is running on localhost:3003
|
||||
|
||||
3. Run this script:
|
||||
python deploy_async_context_compression.py
|
||||
"""
|
||||
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
# Import the generic filter deployment function
|
||||
SCRIPTS_DIR = Path(__file__).parent
|
||||
sys.path.insert(0, str(SCRIPTS_DIR))
|
||||
|
||||
from deploy_filter import deploy_filter
|
||||
|
||||
|
||||
def main():
|
||||
"""Deploy async_context_compression filter to local OpenWebUI."""
|
||||
print("=" * 70)
|
||||
print("🚀 Deploying Async Context Compression Filter Plugin")
|
||||
print("=" * 70)
|
||||
print()
|
||||
|
||||
# Deploy the filter
|
||||
success = deploy_filter("async-context-compression")
|
||||
|
||||
if success:
|
||||
print()
|
||||
print("=" * 70)
|
||||
print("✅ Deployment successful!")
|
||||
print("=" * 70)
|
||||
print()
|
||||
print("Next steps:")
|
||||
print(" 1. Open OpenWebUI in your browser: http://localhost:3003")
|
||||
print(" 2. Go to Settings → Filters")
|
||||
print(" 3. Enable 'Async Context Compression'")
|
||||
print(" 4. Configure Valves as needed")
|
||||
print(" 5. Start using the filter in conversations")
|
||||
print()
|
||||
else:
|
||||
print()
|
||||
print("=" * 70)
|
||||
print("❌ Deployment failed!")
|
||||
print("=" * 70)
|
||||
print()
|
||||
print("Troubleshooting:")
|
||||
print(" • Check that OpenWebUI is running: http://localhost:3003")
|
||||
print(" • Verify API key in .env file")
|
||||
print(" • Check network connectivity")
|
||||
print()
|
||||
return 1
|
||||
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
sys.exit(main())
|
||||
306
scripts/deploy_filter.py
Normal file
306
scripts/deploy_filter.py
Normal file
@@ -0,0 +1,306 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
Deploy Filter plugins to OpenWebUI instance.
|
||||
|
||||
This script deploys filter plugins (like async_context_compression) to a running
|
||||
OpenWebUI instance. It reads the plugin metadata and submits it to the local API.
|
||||
|
||||
Usage:
|
||||
python deploy_filter.py # Deploy async_context_compression
|
||||
python deploy_filter.py <filter_name> # Deploy specific filter
|
||||
"""
|
||||
|
||||
import requests
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
import sys
|
||||
from pathlib import Path
|
||||
from typing import Optional, Dict, Any
|
||||
|
||||
# ─── Configuration ───────────────────────────────────────────────────────────
|
||||
SCRIPT_DIR = Path(__file__).parent
|
||||
ENV_FILE = SCRIPT_DIR / ".env"
|
||||
FILTERS_DIR = SCRIPT_DIR.parent / "plugins/filters"
|
||||
|
||||
# Default target filter
|
||||
DEFAULT_FILTER = "async-context-compression"
|
||||
|
||||
|
||||
def _load_api_key() -> str:
|
||||
"""Load API key from .env file in the same directory as this script.
|
||||
|
||||
The .env file should contain a line like:
|
||||
api_key=sk-xxxxxxxxxxxx
|
||||
"""
|
||||
if not ENV_FILE.exists():
|
||||
raise FileNotFoundError(
|
||||
f".env file not found at {ENV_FILE}. "
|
||||
"Please create it with: api_key=sk-xxxxxxxxxxxx"
|
||||
)
|
||||
|
||||
for line in ENV_FILE.read_text(encoding="utf-8").splitlines():
|
||||
line = line.strip()
|
||||
if line.startswith("api_key="):
|
||||
key = line.split("=", 1)[1].strip()
|
||||
if key:
|
||||
return key
|
||||
|
||||
raise ValueError("api_key not found in .env file.")
|
||||
|
||||
|
||||
def _find_filter_file(filter_name: str) -> Optional[Path]:
|
||||
"""Find the main Python file for a filter.
|
||||
|
||||
Args:
|
||||
filter_name: Directory name of the filter (e.g., 'async-context-compression')
|
||||
|
||||
Returns:
|
||||
Path to the main Python file, or None if not found.
|
||||
"""
|
||||
filter_dir = FILTERS_DIR / filter_name
|
||||
if not filter_dir.exists():
|
||||
return None
|
||||
|
||||
# Try to find a .py file matching the filter name
|
||||
py_files = list(filter_dir.glob("*.py"))
|
||||
|
||||
# Prefer a file with the filter name (with hyphens converted to underscores)
|
||||
preferred_name = filter_name.replace("-", "_") + ".py"
|
||||
for py_file in py_files:
|
||||
if py_file.name == preferred_name:
|
||||
return py_file
|
||||
|
||||
# Otherwise, return the first .py file (usually the only one)
|
||||
if py_files:
|
||||
return py_files[0]
|
||||
|
||||
return None
|
||||
|
||||
|
||||
def _extract_metadata(content: str) -> Dict[str, Any]:
|
||||
"""Extract metadata from the plugin docstring.
|
||||
|
||||
Args:
|
||||
content: Python file content
|
||||
|
||||
Returns:
|
||||
Dictionary with extracted metadata (title, author, version, etc.)
|
||||
"""
|
||||
metadata = {}
|
||||
|
||||
# Extract docstring
|
||||
match = re.search(r'"""(.*?)"""', content, re.DOTALL)
|
||||
if not match:
|
||||
return metadata
|
||||
|
||||
docstring = match.group(1)
|
||||
|
||||
# Extract key-value pairs
|
||||
for line in docstring.split("\n"):
|
||||
line = line.strip()
|
||||
if ":" in line and not line.startswith("#") and not line.startswith("═"):
|
||||
parts = line.split(":", 1)
|
||||
key = parts[0].strip().lower()
|
||||
value = parts[1].strip()
|
||||
metadata[key] = value
|
||||
|
||||
return metadata
|
||||
|
||||
|
||||
def _build_filter_payload(
|
||||
filter_name: str, file_path: Path, content: str, metadata: Dict[str, Any]
|
||||
) -> Dict[str, Any]:
|
||||
"""Build the payload for the filter update/create API.
|
||||
|
||||
Args:
|
||||
filter_name: Directory name of the filter
|
||||
file_path: Path to the plugin file
|
||||
content: File content
|
||||
metadata: Extracted metadata
|
||||
|
||||
Returns:
|
||||
Payload dictionary ready for API submission
|
||||
"""
|
||||
# Generate a unique ID from filter name
|
||||
filter_id = metadata.get("id", filter_name).replace("-", "_")
|
||||
title = metadata.get("title", filter_name)
|
||||
author = metadata.get("author", "Fu-Jie")
|
||||
author_url = metadata.get("author_url", "https://github.com/Fu-Jie/openwebui-extensions")
|
||||
funding_url = metadata.get("funding_url", "https://github.com/open-webui")
|
||||
description = metadata.get("description", f"Filter plugin: {title}")
|
||||
version = metadata.get("version", "1.0.0")
|
||||
openwebui_id = metadata.get("openwebui_id", "")
|
||||
|
||||
payload = {
|
||||
"id": filter_id,
|
||||
"name": title,
|
||||
"meta": {
|
||||
"description": description,
|
||||
"manifest": {
|
||||
"title": title,
|
||||
"author": author,
|
||||
"author_url": author_url,
|
||||
"funding_url": funding_url,
|
||||
"description": description,
|
||||
"version": version,
|
||||
"type": "filter",
|
||||
},
|
||||
"type": "filter",
|
||||
},
|
||||
"content": content,
|
||||
}
|
||||
|
||||
# Add openwebui_id if available
|
||||
if openwebui_id:
|
||||
payload["meta"]["manifest"]["openwebui_id"] = openwebui_id
|
||||
|
||||
return payload
|
||||
|
||||
|
||||
def deploy_filter(filter_name: str = DEFAULT_FILTER) -> bool:
|
||||
"""Deploy a filter plugin to OpenWebUI.
|
||||
|
||||
Args:
|
||||
filter_name: Directory name of the filter to deploy
|
||||
|
||||
Returns:
|
||||
True if successful, False otherwise
|
||||
"""
|
||||
# 1. Load API key
|
||||
try:
|
||||
api_key = _load_api_key()
|
||||
except (FileNotFoundError, ValueError) as e:
|
||||
print(f"[ERROR] {e}")
|
||||
return False
|
||||
|
||||
# 2. Find filter file
|
||||
file_path = _find_filter_file(filter_name)
|
||||
if not file_path:
|
||||
print(f"[ERROR] Filter '{filter_name}' not found in {FILTERS_DIR}")
|
||||
print(f"[INFO] Available filters:")
|
||||
for d in FILTERS_DIR.iterdir():
|
||||
if d.is_dir() and not d.name.startswith("_"):
|
||||
print(f" - {d.name}")
|
||||
return False
|
||||
|
||||
# 3. Read local source file
|
||||
if not file_path.exists():
|
||||
print(f"[ERROR] Source file not found: {file_path}")
|
||||
return False
|
||||
|
||||
content = file_path.read_text(encoding="utf-8")
|
||||
metadata = _extract_metadata(content)
|
||||
|
||||
if not metadata:
|
||||
print(f"[ERROR] Could not extract metadata from {file_path}")
|
||||
return False
|
||||
|
||||
version = metadata.get("version", "1.0.0")
|
||||
title = metadata.get("title", filter_name)
|
||||
filter_id = metadata.get("id", filter_name).replace("-", "_")
|
||||
|
||||
# 4. Build payload
|
||||
payload = _build_filter_payload(filter_name, file_path, content, metadata)
|
||||
|
||||
# 5. Build headers
|
||||
headers = {
|
||||
"Accept": "application/json",
|
||||
"Content-Type": "application/json",
|
||||
"Authorization": f"Bearer {api_key}",
|
||||
}
|
||||
|
||||
# 6. Send update request
|
||||
update_url = "http://localhost:3003/api/v1/functions/id/{}/update".format(filter_id)
|
||||
create_url = "http://localhost:3003/api/v1/functions/create"
|
||||
|
||||
print(f"📦 Deploying filter '{title}' (version {version})...")
|
||||
print(f" File: {file_path}")
|
||||
|
||||
try:
|
||||
# Try update first
|
||||
response = requests.post(
|
||||
update_url,
|
||||
headers=headers,
|
||||
data=json.dumps(payload),
|
||||
timeout=10,
|
||||
)
|
||||
|
||||
if response.status_code == 200:
|
||||
print(f"✅ Successfully updated '{title}' filter!")
|
||||
return True
|
||||
else:
|
||||
print(
|
||||
f"⚠️ Update failed with status {response.status_code}, "
|
||||
"attempting to create instead..."
|
||||
)
|
||||
|
||||
# Try create if update fails
|
||||
res_create = requests.post(
|
||||
create_url,
|
||||
headers=headers,
|
||||
data=json.dumps(payload),
|
||||
timeout=10,
|
||||
)
|
||||
|
||||
if res_create.status_code == 200:
|
||||
print(f"✅ Successfully created '{title}' filter!")
|
||||
return True
|
||||
else:
|
||||
print(f"❌ Failed to update or create. Status: {res_create.status_code}")
|
||||
try:
|
||||
error_msg = res_create.json()
|
||||
print(f" Error: {error_msg}")
|
||||
except:
|
||||
print(f" Response: {res_create.text[:500]}")
|
||||
return False
|
||||
|
||||
except requests.exceptions.ConnectionError:
|
||||
print(
|
||||
"❌ Connection error: Could not reach OpenWebUI at localhost:3003"
|
||||
)
|
||||
print(" Make sure OpenWebUI is running and accessible.")
|
||||
return False
|
||||
except requests.exceptions.Timeout:
|
||||
print("❌ Request timeout: OpenWebUI took too long to respond")
|
||||
return False
|
||||
except Exception as e:
|
||||
print(f"❌ Request error: {e}")
|
||||
return False
|
||||
|
||||
|
||||
def list_filters() -> None:
|
||||
"""List all available filters."""
|
||||
print("📋 Available filters:")
|
||||
filters = [d.name for d in FILTERS_DIR.iterdir() if d.is_dir() and not d.name.startswith("_")]
|
||||
|
||||
if not filters:
|
||||
print(" (No filters found)")
|
||||
return
|
||||
|
||||
for filter_name in sorted(filters):
|
||||
filter_dir = FILTERS_DIR / filter_name
|
||||
py_file = _find_filter_file(filter_name)
|
||||
|
||||
if py_file:
|
||||
content = py_file.read_text(encoding="utf-8")
|
||||
metadata = _extract_metadata(content)
|
||||
title = metadata.get("title", filter_name)
|
||||
version = metadata.get("version", "?")
|
||||
print(f" - {filter_name:<30} {title:<40} v{version}")
|
||||
else:
|
||||
print(f" - {filter_name:<30} (no Python file found)")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
if len(sys.argv) > 1:
|
||||
if sys.argv[1] == "--list" or sys.argv[1] == "-l":
|
||||
list_filters()
|
||||
else:
|
||||
filter_name = sys.argv[1]
|
||||
success = deploy_filter(filter_name)
|
||||
sys.exit(0 if success else 1)
|
||||
else:
|
||||
# Deploy default filter
|
||||
success = deploy_filter()
|
||||
sys.exit(0 if success else 1)
|
||||
104
scripts/verify_deployment_tools.py
Normal file
104
scripts/verify_deployment_tools.py
Normal file
@@ -0,0 +1,104 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
Quick verification script to ensure all deployment tools are in place.
|
||||
|
||||
This script checks that all necessary files for async_context_compression
|
||||
local deployment are present and functional.
|
||||
"""
|
||||
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
def main():
|
||||
"""Check all deployment tools are ready."""
|
||||
base_dir = Path(__file__).parent.parent
|
||||
|
||||
print("\n" + "="*80)
|
||||
print("✨ 异步上下文压缩本地部署工具 — 验证状态")
|
||||
print("="*80 + "\n")
|
||||
|
||||
files_to_check = {
|
||||
"🐍 Python 脚本": [
|
||||
"scripts/deploy_async_context_compression.py",
|
||||
"scripts/deploy_filter.py",
|
||||
"scripts/deploy_pipe.py",
|
||||
],
|
||||
"📖 部署文档": [
|
||||
"scripts/README.md",
|
||||
"scripts/QUICK_START.md",
|
||||
"scripts/DEPLOYMENT_GUIDE.md",
|
||||
"scripts/DEPLOYMENT_SUMMARY.md",
|
||||
"plugins/filters/async-context-compression/DEPLOYMENT_REFERENCE.md",
|
||||
],
|
||||
"🧪 测试文件": [
|
||||
"tests/scripts/test_deploy_filter.py",
|
||||
],
|
||||
}
|
||||
|
||||
all_exist = True
|
||||
|
||||
for category, files in files_to_check.items():
|
||||
print(f"\n{category}:")
|
||||
print("-" * 80)
|
||||
|
||||
for file_path in files:
|
||||
full_path = base_dir / file_path
|
||||
exists = full_path.exists()
|
||||
status = "✅" if exists else "❌"
|
||||
|
||||
print(f" {status} {file_path}")
|
||||
|
||||
if exists and file_path.endswith(".py"):
|
||||
size = full_path.stat().st_size
|
||||
lines = len(full_path.read_text().split('\n'))
|
||||
print(f" └─ [{size} bytes, ~{lines} lines]")
|
||||
|
||||
if not exists:
|
||||
all_exist = False
|
||||
|
||||
print("\n" + "="*80)
|
||||
|
||||
if all_exist:
|
||||
print("✅ 所有部署工具文件已准备就绪！")
|
||||
print("="*80 + "\n")
|
||||
|
||||
print("🚀 快速开始（3 种方式）：\n")
|
||||
|
||||
print(" 方式 1: 最简单 (推荐)")
|
||||
print(" ─────────────────────────────────────────────────────────")
|
||||
print(" cd scripts")
|
||||
print(" python deploy_async_context_compression.py")
|
||||
print()
|
||||
|
||||
print(" 方式 2: 通用工具")
|
||||
print(" ─────────────────────────────────────────────────────────")
|
||||
print(" cd scripts")
|
||||
print(" python deploy_filter.py")
|
||||
print()
|
||||
|
||||
print(" 方式 3: 部署其他 Filter")
|
||||
print(" ─────────────────────────────────────────────────────────")
|
||||
print(" cd scripts")
|
||||
print(" python deploy_filter.py --list")
|
||||
print(" python deploy_filter.py folder-memory")
|
||||
print()
|
||||
|
||||
print("="*80 + "\n")
|
||||
print("📚 文档参考：\n")
|
||||
print(" • 快速开始: scripts/QUICK_START.md")
|
||||
print(" • 完整指南: scripts/DEPLOYMENT_GUIDE.md")
|
||||
print(" • 技术总结: scripts/DEPLOYMENT_SUMMARY.md")
|
||||
print(" • 脚本说明: scripts/README.md")
|
||||
print(" • 测试覆盖: pytest tests/scripts/test_deploy_filter.py -v")
|
||||
print()
|
||||
|
||||
print("="*80 + "\n")
|
||||
return 0
|
||||
else:
|
||||
print("❌ 某些文件缺失！")
|
||||
print("="*80 + "\n")
|
||||
return 1
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
sys.exit(main())
|
||||
@@ -0,0 +1,22 @@
|
||||
from plugins.filters.markdown_normalizer.markdown_normalizer import ContentNormalizer, NormalizerConfig
|
||||
|
||||
def test_latex_display_math_protection():
|
||||
"""Verify that $$\nabla$$ is NOT broken by escape fix."""
|
||||
config = NormalizerConfig(enable_escape_fix=True)
|
||||
norm = ContentNormalizer(config)
|
||||
|
||||
# Input has literal backslash + n (represented as \\n in python code)
|
||||
# Total input: $$ \ n a b l a $$
|
||||
text = r"$$\nabla$$"
|
||||
res = norm.normalize(text)
|
||||
|
||||
# It should NOT change literal \n to a newline inside $$
|
||||
assert "\n" not in res, f"LaTeX display math was corrupted with a real newline: {repr(res)}"
|
||||
assert res == text, f"Expected {repr(text)}, got {repr(res)}"
|
||||
|
||||
if __name__ == "__main__":
|
||||
try:
|
||||
test_latex_display_math_protection()
|
||||
print("✅ LaTeX protection test passed.")
|
||||
except AssertionError as e:
|
||||
print(f"❌ LaTeX protection test FAILED: {e}")
|
||||
@@ -0,0 +1,53 @@
|
||||
from plugins.filters.markdown_normalizer.markdown_normalizer import ContentNormalizer, NormalizerConfig
|
||||
|
||||
def test_error_rollback():
|
||||
"""Issue 57-1: Ensure content is NOT modified if a cleaner raises an exception."""
|
||||
def broken_cleaner(text): raise RuntimeError("Plugin Crash Simulation")
|
||||
config = NormalizerConfig(custom_cleaners=[broken_cleaner])
|
||||
norm = ContentNormalizer(config)
|
||||
raw_text = "Content that should NOT be modified on error."
|
||||
res = norm.normalize(raw_text)
|
||||
assert res == raw_text
|
||||
|
||||
def test_inline_code_protection():
|
||||
"""Issue 57-2: Protect backslashes inside inline code blocks."""
|
||||
norm = ContentNormalizer(NormalizerConfig(enable_escape_fix=True))
|
||||
inline_code = "Regex: `[\\\\n\\\\r]` and Path: `C:\\\\\\\\Windows` and Normal: \\\\n"
|
||||
res = norm.normalize(inline_code)
|
||||
# The normal \\\\n at the end SHOULD be converted to actual \n
|
||||
# The backslashes inside ` ` should NOT be converted.
|
||||
assert "`[\\\\n\\\\r]`" in res
|
||||
assert "`C:\\\\\\\\Windows`" in res
|
||||
assert "\n" in res
|
||||
|
||||
def test_code_block_escape_control():
|
||||
"""Issue 57-3: Verify enable_escape_fix_in_code_blocks valve."""
|
||||
# input code: print('\\n')
|
||||
# representation: "print('\\\\n')"
|
||||
block_text = "```python\nprint('\\\\n')\n```"
|
||||
|
||||
# Subcase A: Disabled (Default)
|
||||
norm_off = ContentNormalizer(NormalizerConfig(enable_escape_fix_in_code_blocks=False))
|
||||
assert norm_off.normalize(block_text) == block_text
|
||||
|
||||
# Subcase B: Enabled
|
||||
norm_on = ContentNormalizer(NormalizerConfig(enable_escape_fix_in_code_blocks=True))
|
||||
# Expected: "```python\nprint('\n')\n```"
|
||||
res = norm_on.normalize(block_text)
|
||||
assert "\n" in res
|
||||
assert "\\n" not in res.split("```")[1]
|
||||
|
||||
def test_latex_protection():
|
||||
"""Regression: Ensure LaTeX commands are not corrupted by escape fix."""
|
||||
norm = ContentNormalizer(NormalizerConfig(enable_escape_fix=True))
|
||||
latex_text = "Math: $\\\\times \\\\theta \\\\nu$ and Normal: \\\\n"
|
||||
res = norm.normalize(latex_text)
|
||||
assert "$\\\\times \\\\theta \\\\nu$" in res
|
||||
assert "\n" in res
|
||||
|
||||
if __name__ == "__main__":
|
||||
test_error_rollback()
|
||||
test_inline_code_protection()
|
||||
test_code_block_escape_control()
|
||||
test_latex_protection()
|
||||
print("All tests passed!")
|
||||
Reference in New Issue
Block a user