apunkt/MetaGPT
1
0
Fork 0
mirror of https://github.com/FoundationAgents/MetaGPT.git synced 2026-06-02 14:45:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix all conflicts.

Browse source
This commit is contained in:
geekan 2023-12-26 01:39:16 +08:00
commit d300acbac8
11 changed files with 57 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
metagpt/provider/google_gemini_api.py
View file

@ -20,7 +20,7 @@ from tenacity import (
)
from metagpt.config import CONFIG, LLMProviderEnum
from metagpt.logs import logger
from metagpt.logs import log_llm_stream, logger
from metagpt.provider.base_gpt_api import BaseGPTAPI
from metagpt.provider.llm_provider_registry import register_provider
from metagpt.provider.openai_api import log_and_reraise
@ -121,7 +121,7 @@ class GeminiGPTAPI(BaseGPTAPI):
collected_content = []
async for chunk in resp:
content = chunk.text
print(content, end="")
log_llm_stream(content)
collected_content.append(content)
full_content = "".join(collected_content)

4
metagpt/provider/ollama_api.py
View file

@ -15,7 +15,7 @@ from tenacity import (
from metagpt.config import CONFIG, LLMProviderEnum
from metagpt.const import LLM_API_TIMEOUT
from metagpt.logs import logger
from metagpt.logs import log_llm_stream, logger
from metagpt.provider.base_gpt_api import BaseGPTAPI
from metagpt.provider.general_api_requestor import GeneralAPIRequestor
from metagpt.provider.llm_provider_registry import register_provider
@ -131,7 +131,7 @@ class OllamaGPTAPI(BaseGPTAPI):
if not chunk.get("done", False):
content = self.get_choice_text(chunk)
collected_content.append(content)
print(content, end="")
log_llm_stream(content)
else:
# stream finished
usage = self.get_usage(chunk)

4
metagpt/provider/zhipuai_api.py
View file

@ -16,7 +16,7 @@ from tenacity import (
)
from metagpt.config import CONFIG, LLMProviderEnum
from metagpt.logs import logger
from metagpt.logs import log_llm_stream, logger
from metagpt.provider.base_gpt_api import BaseGPTAPI
from metagpt.provider.llm_provider_registry import register_provider
from metagpt.provider.openai_api import log_and_reraise
@ -96,7 +96,7 @@ class ZhiPuAIGPTAPI(BaseGPTAPI):
if event.event == ZhiPuEvent.ADD.value:
content = event.data
collected_content.append(content)
print(content, end="")
log_llm_stream(content)
elif event.event == ZhiPuEvent.ERROR.value or event.event == ZhiPuEvent.INTERRUPTED.value:
content = event.data
logger.error(f"event error: {content}", end="")