From c220da280d42105a5e20520ded0632130d711756 Mon Sep 17 00:00:00 2001 From: usamimeri_renko <1710269958@qq.com> Date: Mon, 20 May 2024 15:16:40 +0800 Subject: [PATCH] pre-commit --- metagpt/provider/__init__.py | 2 +- metagpt/provider/ark_api.py | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/metagpt/provider/__init__.py b/metagpt/provider/__init__.py index e51dae433..c90f5774a 100644 --- a/metagpt/provider/__init__.py +++ b/metagpt/provider/__init__.py @@ -33,5 +33,5 @@ __all__ = [ "DashScopeLLM", "AnthropicLLM", "BedrockLLM", - "ArkLLM" + "ArkLLM", ] diff --git a/metagpt/provider/ark_api.py b/metagpt/provider/ark_api.py index d5a31b7d6..5cc2e15c6 100644 --- a/metagpt/provider/ark_api.py +++ b/metagpt/provider/ark_api.py @@ -2,11 +2,12 @@ from openai import AsyncStream from openai.types import CompletionUsage from openai.types.chat import ChatCompletion, ChatCompletionChunk -from metagpt.provider.openai_api import OpenAILLM from metagpt.configs.llm_config import LLMType -from metagpt.provider.llm_provider_registry import register_provider from metagpt.const import USE_CONFIG_TIMEOUT from metagpt.logs import log_llm_stream +from metagpt.provider.llm_provider_registry import register_provider +from metagpt.provider.openai_api import OpenAILLM + @register_provider(LLMType.ARK) class ArkLLM(OpenAILLM): @@ -14,10 +15,10 @@ class ArkLLM(OpenAILLM): 用于火山方舟的API 见:https://www.volcengine.com/docs/82379/1263482 """ - + async def _achat_completion_stream(self, messages: list[dict], timeout=USE_CONFIG_TIMEOUT) -> str: response: AsyncStream[ChatCompletionChunk] = await self.aclient.chat.completions.create( - **self._cons_kwargs(messages, timeout=self.get_timeout(timeout)), + **self._cons_kwargs(messages, timeout=self.get_timeout(timeout)), stream=True, extra_body={"stream_options": {"include_usage": True}} ) @@ -29,15 +30,15 @@ class ArkLLM(OpenAILLM): collected_messages.append(chunk_message) if chunk.usage: # the usage of ark when streaming is in the last chunk while others are null - usage=CompletionUsage(**chunk.usage) + usage = CompletionUsage(**chunk.usage) log_llm_stream("\n") full_reply_content = "".join(collected_messages) - self._update_costs(usage,chunk.model) + self._update_costs(usage, chunk.model) return full_reply_content - + async def _achat_completion(self, messages: list[dict], timeout=USE_CONFIG_TIMEOUT) -> ChatCompletion: kwargs = self._cons_kwargs(messages, timeout=self.get_timeout(timeout)) rsp: ChatCompletion = await self.aclient.chat.completions.create(**kwargs) - self._update_costs(rsp.usage,rsp.model) + self._update_costs(rsp.usage, rsp.model) return rsp