fix conflicts

This commit is contained in:
geekan 2023-12-26 01:40:53 +08:00
commit 25de7f9a74
2 changed files with 2 additions and 4 deletions

View file

@ -142,6 +142,4 @@ TIMEOUT: 60 # Timeout for llm invocation
#REDIS_PASSWORD: "YOUR_REDIS_PASSWORD"
#REDIS_DB: "YOUR_REDIS_DB_INDEX, str, 0-based"
=======
# DISABLE_LLM_PROVIDER_CHECK: false
>>>>>>> main

View file

@ -29,7 +29,7 @@ from tenacity import (
from metagpt.config import CONFIG, Config, LLMProviderEnum
from metagpt.const import DEFAULT_MAX_TOKENS, DEFAULT_TOKEN_SIZE
from metagpt.logs import logger
from metagpt.logs import log_llm_stream, logger
from metagpt.provider.base_gpt_api import BaseGPTAPI
from metagpt.provider.constant import GENERAL_FUNCTION_SCHEMA, GENERAL_TOOL_CHOICE
from metagpt.provider.llm_provider_registry import register_provider
@ -180,7 +180,7 @@ class OpenAIGPTAPI(BaseGPTAPI, RateLimiter):
collected_messages = []
async for i in resp:
print(i, end="")
log_llm_stream(i)
collected_messages.append(i)
full_reply_content = "".join(collected_messages)