♻️ 将OpenAI客户端更改为异步版本

Author: shadow3aaa

src/nonebot_plugin_nyaturingtest/__init__.py

@@ -21,7 +21,7 @@
 from nonebot.params import CommandArg
 from nonebot.permission import SUPERUSER
 from nonebot.plugin import PluginMetadata
-from openai import OpenAI
+from openai import AsyncOpenAI
 
 from .client import LLMClient
 from .config import Config, plugin_config
@@ -58,7 +58,7 @@ class GroupState:
     )
     messages_chunk: list[MMessage] = field(default_factory=list)
     client = LLMClient(
-        client=OpenAI(
+        client=AsyncOpenAI(
             api_key=plugin_config.nyaturingtest_chat_openai_api_key,
             base_url=plugin_config.nyaturingtest_chat_openai_base_url,
         )
@@ -84,7 +84,7 @@ async def spawn_state(state: GroupState):
             messages_chunk = state.messages_chunk.copy()
             state.messages_chunk.clear()
             try:
-                responses = state.session.update(
+                responses = await state.session.update(
                     messages_chunk=messages_chunk, llm=lambda x: llm_response(state.client, x)
                 )
             except Exception as e:
@@ -461,9 +461,9 @@ async def handle_list_groups_pm():
     await list_groups_pm.finish(msg)
 
 
-def llm_response(client: LLMClient, message: str) -> str:
+async def llm_response(client: LLMClient, message: str) -> str:
     try:
-        result = client.generate_response(prompt=message, model=plugin_config.nyaturingtest_chat_openai_model)
+        result = await client.generate_response(prompt=message, model=plugin_config.nyaturingtest_chat_openai_model)
         if result:
             return result
         else:

src/nonebot_plugin_nyaturingtest/client.py

@@ -1,12 +1,12 @@
-from openai import OpenAI
+from openai import AsyncOpenAI
 
 
 class LLMClient:
-    def __init__(self, client: OpenAI):
+    def __init__(self, client: AsyncOpenAI):
         self.client = client
 
-    def generate_response(self, prompt: str, model: str) -> str | None:
-        response = self.client.chat.completions.create(
+    async def generate_response(self, prompt: str, model: str) -> str | None:
+        response = await self.client.chat.completions.create(
             messages=[{"role": "user", "content": prompt}],
             model=model,
             temperature=0.5,

src/nonebot_plugin_nyaturingtest/session.py

@@ -1,5 +1,5 @@
 from collections import deque
-from collections.abc import Callable
+from collections.abc import Awaitable, Callable
 from dataclasses import dataclass
 from datetime import datetime
 from enum import Enum
@@ -11,7 +11,7 @@
 import traceback
 
 from nonebot import logger
-from openai import OpenAI
+from openai import AsyncOpenAI
 
 from .client import LLMClient
 from .config import plugin_config
@@ -71,7 +71,7 @@ def __init__(self, siliconflow_api_key: str, id: str = "global", name: str = "te
         """
         self.global_memory: Memory = Memory(
             llm_client=LLMClient(
-                client=OpenAI(
+                client=AsyncOpenAI(
                     api_key=plugin_config.nyaturingtest_siliconflow_api_key,
                     base_url="https://api.siliconflow.cn/v1",
                 )
@@ -257,7 +257,7 @@ def load_session(self):
                         compressed_message=session_data["global_memory"].get("compressed_history", ""),
                         messages=[Message.from_json(msg) for msg in session_data["global_memory"].get("messages", [])],
                         llm_client=LLMClient(
-                            client=OpenAI(
+                            client=AsyncOpenAI(
                                 api_key=plugin_config.nyaturingtest_siliconflow_api_key,
                                 base_url="https://api.siliconflow.cn/v1",
                             )
@@ -267,7 +267,7 @@ def load_session(self):
                     logger.error(f"[Session {self.id}] 恢复全局短时记忆失败: {e}")
                     self.global_memory = Memory(
                         llm_client=LLMClient(
-                            client=OpenAI(
+                            client=AsyncOpenAI(
                                 api_key=plugin_config.nyaturingtest_siliconflow_api_key,
                                 base_url="https://api.siliconflow.cn/v1",
                             )
@@ -406,8 +406,8 @@ def __search_stage(self, messages_chunk: list[Message]) -> _SearchResult:
             mem_history=long_term_memory,
         )
 
-    def __feedback_stage(
-        self, messages_chunk: list[Message], search_stage_result: _SearchResult, llm: Callable[[str], str]
+    async def __feedback_stage(
+        self, messages_chunk: list[Message], search_stage_result: _SearchResult, llm: Callable[[str], Awaitable[str]]
     ):
         """
         反馈总结阶段
@@ -626,7 +626,7 @@ def __feedback_stage(
 }}
 ```
 """
-        response = llm(prompt)
+        response = await llm(prompt)
         response = re.sub(r"^```json\s*|\s*```$", "", response)
         logger.debug(f"反馈阶段llm返回：{response}")
         try:
@@ -734,11 +734,11 @@ def __feedback_stage(
         except Exception as e:
             raise ValueError(f"Feedback stage unexpected error: {e} in response: {response}")
 
-    def __chat_stage(
+    async def __chat_stage(
         self,
         search_stage_result: _SearchResult,
         messages_chunk: list[Message],
-        llm: Callable[[str], str],
+        llm: Callable[[str], Awaitable[str]],
     ) -> list[str]:
         """
         对话阶段
@@ -867,7 +867,7 @@ def __chat_stage(
   ]
 }}
 """
-        response = llm(prompt)
+        response = await llm(prompt)
         response = re.sub(r"^```json\s*|\s*```$", "", response)
         logger.debug(f"对话阶段llm返回：{response}")
         try:
@@ -884,29 +884,29 @@ def __chat_stage(
         except json.JSONDecodeError:
             raise ValueError("LLM response is not valid JSON, response: " + response)
 
-    def update(self, messages_chunk: list[Message], llm: Callable[[str], str]) -> list[str] | None:
+    async def update(self, messages_chunk: list[Message], llm: Callable[[str], Awaitable[str]]) -> list[str] | None:
         """
         更新群聊消息
         """
         # 检索阶段
         search_stage_result = self.__search_stage(messages_chunk=messages_chunk)
         # 反馈阶段
-        self.__feedback_stage(messages_chunk=messages_chunk, search_stage_result=search_stage_result, llm=llm)
+        await self.__feedback_stage(messages_chunk=messages_chunk, search_stage_result=search_stage_result, llm=llm)
         # 对话阶段
         match self.__chatting_state:
             case _ChattingState.ILDE:
                 logger.debug("nyabot潜水中...")
                 reply_messages = None
             case _ChattingState.BUBBLE:
                 logger.debug("nyabot冒泡中...")
-                reply_messages = self.__chat_stage(
+                reply_messages = await self.__chat_stage(
                     search_stage_result=search_stage_result,
                     messages_chunk=messages_chunk,
                     llm=llm,
                 )
             case _ChattingState.ACTIVE:
                 logger.debug("nyabot对话中...")
-                reply_messages = self.__chat_stage(
+                reply_messages = await self.__chat_stage(
                     search_stage_result=search_stage_result,
                     messages_chunk=messages_chunk,
                     llm=llm,

src/nonebot_plugin_nyaturingtest/vlm.py

@@ -1,4 +1,4 @@
-from openai import OpenAI
+from openai import AsyncOpenAI
 
 
 class SiliconFlowVLM:
@@ -31,7 +31,7 @@ def __init__(
             max_retries: 最大重试次数
             retry_delay: 重试延迟(秒)
         """
-        self.client = OpenAI(
+        self.client = AsyncOpenAI(
             api_key=api_key,
             base_url=endpoint,
         )
@@ -40,7 +40,7 @@ def __init__(
         self.max_retries = max_retries
         self.retry_delay = retry_delay
 
-    def request(
+    async def request(
         self,
         prompt: str,
         image_base64: str,
@@ -49,7 +49,7 @@ def request(
         """
         让vlm根据图片和文本提示词生成描述
         """
-        responese = self.client.chat.completions.create(
+        responese = await self.client.chat.completions.create(
             model=self.model,
             messages=[
                 {