From 4244d376250ecf0dbee58ab87944b8748af4b006 Mon Sep 17 00:00:00 2001 From: Raven95676 Date: Fri, 11 Apr 2025 01:06:20 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E7=A6=81=E7=94=A8gemini=20source=20debug?= =?UTF-8?q?=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/provider/sources/gemini_source.py | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/astrbot/core/provider/sources/gemini_source.py b/astrbot/core/provider/sources/gemini_source.py index c9da2ec9f..527ebf348 100644 --- a/astrbot/core/provider/sources/gemini_source.py +++ b/astrbot/core/provider/sources/gemini_source.py @@ -1,19 +1,23 @@ +import asyncio import base64 import json import random -import asyncio -from google import genai -from google.genai import types, errors -import astrbot.core.message.components as Comp -from astrbot.core.message.message_event_result import MessageChain -from astrbot.core.utils.io import download_image_by_url -from astrbot.core.db import BaseDatabase -from astrbot.api.provider import Provider, Personality -from astrbot import logger -from astrbot.core.provider.func_tool_manager import FuncCall from typing import Dict, List -from ..register import register_provider_adapter + +from google import genai +from google.genai import errors, types + +import astrbot.core.message.components as Comp +from astrbot import logger +from astrbot.api.provider import Personality, Provider +from astrbot.core.db import BaseDatabase +from astrbot.core.message.message_event_result import MessageChain from astrbot.core.provider.entities import LLMResponse +from astrbot.core.provider.func_tool_manager import FuncCall +from astrbot.core.utils.io import download_image_by_url + +from ..register import register_provider_adapter + @register_provider_adapter( "googlegenai_chat_completion", "Google Gemini Chat Completion 提供商适配器" @@ -174,7 +178,7 @@ class ProviderGoogleGenAI(Provider): ) ) - logger.debug(f"gemini_contents: {gemini_contents}") + # logger.debug(f"gemini_contents: {gemini_contents}") return gemini_contents @@ -218,7 +222,7 @@ class ProviderGoogleGenAI(Provider): ), ), ) - logger.debug(f"gemini result: {result}") + # logger.debug(f"gemini result: {result}") if "Developer instruction is not enabled" in str(result): logger.warning(f"{self.get_model()} 不支持 system prompt,已自动去除。") @@ -302,7 +306,7 @@ class ProviderGoogleGenAI(Provider): keys = self.api_keys.copy() chosen_key = random.choice(keys) - for i in range(retry): + for _ in range(retry): try: self.chosen_api_key = chosen_key llm_response = await self._query(payloads, func_tool)