GithubBackup/MoviePilot
1
0
Fork 0
mirror of https://github.com/jxxghp/MoviePilot.git synced 2026-09-06 16:07:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复 channel 为空时系统提示词 markdown_spec 占位符未替换导致 KeyError

Browse Source
This commit is contained in:
jxxghp
2026-03-25 13:17:41 +08:00
parent 94c75eb1c7
commit 940cececf4
1 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/agent/prompt/__init__.py
+27 -10
View File
@@ -1,9 +1,15 @@
"""提示词管理器""" """提示词管理器"""
from pathlib import Path from pathlib import Path
from typing import Dict from typing import Dict
from app.log import logger from app.log import logger
from app.schemas import ChannelCapability, ChannelCapabilities, MessageChannel, ChannelCapabilityManager from app.schemas import (
ChannelCapability,
ChannelCapabilities,
MessageChannel,
ChannelCapabilityManager,
)
class PromptManager: class PromptManager:
@@ -27,7 +33,7 @@ class PromptManager:
prompt_file = self.prompts_dir / prompt_name prompt_file = self.prompts_dir / prompt_name
try: try:
with open(prompt_file, 'r', encoding='utf-8') as f: with open(prompt_file, "r", encoding="utf-8") as f:
content = f.read().strip() content = f.read().strip()
# 缓存提示词 # 缓存提示词
self.prompts_cache[prompt_name] = content self.prompts_cache[prompt_name] = content
@@ -50,15 +56,22 @@ class PromptManager:
base_prompt = self.load_prompt("Agent Prompt.txt") base_prompt = self.load_prompt("Agent Prompt.txt")
# 识别渠道 # 识别渠道
msg_channel = next((c for c in MessageChannel if c.value.lower() == channel.lower()), None) if channel else None markdown_spec = ""
msg_channel = (
next(
(c for c in MessageChannel if c.value.lower() == channel.lower()), None
)
if channel
else None
)
if msg_channel: if msg_channel:
# 获取渠道能力说明 # 获取渠道能力说明
caps = ChannelCapabilityManager.get_capabilities(msg_channel) caps = ChannelCapabilityManager.get_capabilities(msg_channel)
if caps: if caps:
base_prompt = base_prompt.replace( markdown_spec = self._generate_formatting_instructions(caps)
"{markdown_spec}",
self._generate_formatting_instructions(caps) # 始终替换占位符，避免后续 .format() 时因残留花括号报 KeyError
) base_prompt = base_prompt.replace("{markdown_spec}", markdown_spec)
return base_prompt return base_prompt
@@ -69,11 +82,15 @@ class PromptManager:
""" """
instructions = [] instructions = []
if ChannelCapability.RICH_TEXT not in caps.capabilities: if ChannelCapability.RICH_TEXT not in caps.capabilities:
instructions.append("- Formatting: Use **Plain Text ONLY**. The channel does NOT support Markdown.")
instructions.append( instructions.append(
"- No Markdown Symbols: NEVER use `**`, `*`, `__`, or `[` blocks. Use natural text to emphasize (e.g., using ALL CAPS or separators).") "- Formatting: Use **Plain Text ONLY**. The channel does NOT support Markdown."
)
instructions.append( instructions.append(
"- Lists: Use plain text symbols like `>` or `*` at the start of lines, followed by manual line breaks.") "- No Markdown Symbols: NEVER use `**`, `*`, `__`, or `[` blocks. Use natural text to emphasize (e.g., using ALL CAPS or separators)."
)
instructions.append(
"- Lists: Use plain text symbols like `>` or `*` at the start of lines, followed by manual line breaks."
)
instructions.append("- Links: Paste URLs directly as text.") instructions.append("- Links: Paste URLs directly as text.")
return "\n".join(instructions) return "\n".join(instructions)