From 9f8a4fd2f8d2b9f88a7abeb73fb40d2d98d9c533 Mon Sep 17 00:00:00 2001 From: Matt Gideon <117586514+Haibersut@users.noreply.github.com> Date: Sun, 16 Jul 2023 21:58:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=20(#1058)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 修复程序开启http模式关不掉的问题 * 修复部分api错误 修复了加载预设导致engine重置为None的问题 * 不再强制检查API，新增非流API请求 * 格式化文件 * 优化部分代码 --- adapter/chatgpt/api.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/adapter/chatgpt/api.py b/adapter/chatgpt/api.py index b4c2b462..40aa2b2c 100644 --- a/adapter/chatgpt/api.py +++ b/adapter/chatgpt/api.py @@ -140,7 +140,7 @@ async def on_reset(self): self.bot.api_key = self.api_info.api_key self.bot.proxy = self.api_info.proxy self.bot.conversation[self.session_id] = [] - self.bot.engine = self.api_info.model + self.bot.engine = self.current_model self.__conversation_keep_from = 0 def construct_data(self, messages: list = None, api_key: str = None, stream: bool = True): @@ -172,7 +172,7 @@ def _prepare_request(self, session_id: str = None, messages: list = None, stream headers, data = self.construct_data(messages, api_key, stream) - return api_key, proxy, api_endpoint, headers, data + return proxy, api_endpoint, headers, data async def _process_response(self, resp, session_id: str = None): @@ -197,21 +197,23 @@ async def _process_response(self, resp, session_id: str = None): return content async def request(self, session_id: str = None, messages: list = None) -> str: - api_key, proxy, api_endpoint, headers, data = self._prepare_request(session_id, messages, stream=False) + proxy, api_endpoint, headers, data = self._prepare_request(session_id, messages, stream=False) async with aiohttp.ClientSession() as session: with async_timeout.timeout(self.bot.timeout): async with session.post(f'{api_endpoint}/chat/completions', headers=headers, - data=json.dumps(data)) as resp: + data=json.dumps(data), proxy=proxy) as resp: if resp.status != 200: response_text = await resp.text() raise Exception( f"{resp.status} {resp.reason} {response_text}", ) - return await self._process_response(resp, session_id) + content = await self._process_response(resp, session_id) + + return content async def request_with_stream(self, session_id: str = None, messages: list = None) -> AsyncGenerator[str, None]: - api_key, proxy, api_endpoint, headers, data = self._prepare_request(session_id, messages, stream=True) + proxy, api_endpoint, headers, data = self._prepare_request(session_id, messages, stream=True) async with aiohttp.ClientSession() as session: with async_timeout.timeout(self.bot.timeout): @@ -296,7 +298,9 @@ async def ask(self, prompt: str) -> AsyncGenerator[str, None]: logger.debug(f"[ChatGPT-API:{self.bot.engine}] 响应：{completion_text}") logger.debug(f"[ChatGPT-API:{self.bot.engine}] 使用 token 数：{token_count}") else: - yield await self.request(session_id=self.session_id) + completion_text = await self.request(session_id=self.session_id) + yield completion_text + event_time = time.time() - start_time if event_time is not None: logger.debug(f"[ChatGPT-API:{self.bot.engine}] 接收到全部消息花费了{event_time:.2f}秒")