Skip to content

fix: 识别引用消息的图片时优先使用默认图片转述提供商 #2836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Soulter merged 3 commits into from
Sep 21, 2025
Merged

fix: 识别引用消息的图片时优先使用默认图片转述提供商 #2836

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
767d5b5
fix: 识别引用消息的图片时优先使用默认图片转述提供商
Soulter Sep 21, 2025
084825d
fix: 添加日志记录以处理未找到图片标题提供者的情况
Soulter Sep 21, 2025
b9543a2
style: format code
Soulter Sep 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions packages/astrbot/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1236,6 +1236,7 @@ async def decorate_llm_req(self, event: AstrMessageEvent, req: ProviderRequest):
)
req.system_prompt += f"\nCurrent datetime: {current_time}\n"

img_cap_prov_id = cfg.get("default_image_caption_provider_id")
if req.conversation:
# persona inject
persona_id = req.conversation.persona_id or cfg.get("default_personality")
Expand Down Expand Up @@ -1276,7 +1277,6 @@ async def decorate_llm_req(self, event: AstrMessageEvent, req: ProviderRequest):
logger.debug(f"Tool set for persona {persona_id}: {toolset.names()}")

# image caption
img_cap_prov_id = cfg.get("default_image_caption_provider_id")
if img_cap_prov_id and req.image_urls:
img_cap_prompt = cfg.get(
"image_caption_prompt", "Please describe the image."
Expand Down Expand Up @@ -1313,9 +1313,12 @@ async def decorate_llm_req(self, event: AstrMessageEvent, req: ProviderRequest):
break
if image_seg:
try:
if prov := self.context.get_using_provider(
event.unified_msg_origin
):
prov = None
if img_cap_prov_id:
prov = self.context.get_provider_by_id(img_cap_prov_id)
if prov is None:
prov = self.context.get_using_provider(event.unified_msg_origin)
if prov:
llm_resp = await prov.text_chat(
prompt="Please describe the image content.",
image_urls=[await image_seg.convert_to_file_path()],
Expand All @@ -1324,6 +1327,8 @@ async def decorate_llm_req(self, event: AstrMessageEvent, req: ProviderRequest):
req.system_prompt += (
f"Image Caption: {llm_resp.completion_text}\n"
)
else:
logger.warning("No provider found for image captioning.")
except BaseException as e:
logger.error(f"处理引用图片失败: {e}")

Expand Down