From f07c54d47caf0b4f2caf4b256cc197dd1a79c390 Mon Sep 17 00:00:00 2001 From: Raven95676 Date: Wed, 23 Apr 2025 00:48:25 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E5=87=8F=E5=B0=91=E4=B8=80=E5=B1=82?= =?UTF-8?q?=20intent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Soulter <37870767+Soulter@users.noreply.github.com> --- .../core/provider/sources/gemini_source.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/astrbot/core/provider/sources/gemini_source.py b/astrbot/core/provider/sources/gemini_source.py index 038d57751..8600d3e9f 100644 --- a/astrbot/core/provider/sources/gemini_source.py +++ b/astrbot/core/provider/sources/gemini_source.py @@ -264,15 +264,16 @@ class ProviderGoogleGenAI(Provider): content_num = len(gemini_contents) for i in range(content_num): expected_type = types.UserContent if i % 2 == 0 else types.ModelContent - if not isinstance(gemini_contents[i], expected_type): - for j in range(i + 1, content_num): - if isinstance(gemini_contents[j], expected_type): - logger.debug(f"交换索引 {i} 与 {j}") - gemini_contents[i], gemini_contents[j] = ( - gemini_contents[j], - gemini_contents[i], - ) - break + if isinstance(gemini_contents[i], expected_type): + continue + for j in range(i + 1, content_num): + if isinstance(gemini_contents[j], expected_type): + logger.debug(f"交换索引 {i} 与 {j}") + gemini_contents[i], gemini_contents[j] = ( + gemini_contents[j], + gemini_contents[i], + ) + break return gemini_contents