Merge remote-tracking branch 'origin/develop' into develop
# Conflicts: # app/service/chat_robot/script/main.py
This commit is contained in:
@@ -1,26 +1,24 @@
|
||||
import json
|
||||
import logging
|
||||
|
||||
from langchain_community.chat_models import ChatTongyi
|
||||
from loguru import logger
|
||||
from langchain.agents import Tool
|
||||
from langchain_community.utilities import SerpAPIWrapper
|
||||
from langchain.callbacks import FileCallbackHandler
|
||||
from langchain.utilities import SerpAPIWrapper
|
||||
from langchain.prompts.chat import ChatPromptTemplate, HumanMessagePromptTemplate, MessagesPlaceholder
|
||||
from langchain.schema import SystemMessage, AIMessage
|
||||
# from langchain_community.chat_models import ChatOpenAI
|
||||
# from langchain_community.llms import OpenAI
|
||||
from langchain.chat_models import ChatOpenAI
|
||||
from langchain.llms.openai import OpenAI
|
||||
from langchain.callbacks import FileCallbackHandler
|
||||
from app.service.chat_robot.script.agents import CustomAgentExecutor, ConversationalFunctionsAgent
|
||||
from app.service.chat_robot.script.callbacks import OpenAITokenRecordCallbackHandler
|
||||
from app.service.chat_robot.script.database import CustomDatabase
|
||||
from app.service.chat_robot.script.memory import UserConversationBufferWindowMemory
|
||||
from app.service.chat_robot.script.prompt import FASHION_CHAT_BOT_PREFIX, TOOLS_FUNCTIONS_SUFFIX
|
||||
from app.service.chat_robot.script.service import CallQWen
|
||||
from app.service.chat_robot.script.tools import (QuerySQLDataBaseTool, InfoSQLDatabaseTool, QuerySQLCheckerTool, ListSQLDatabaseTool)
|
||||
from app.service.chat_robot.script.memory import UserConversationBufferWindowMemory
|
||||
from app.service.chat_robot.script.tools.tutorial_tool import CustomTutorialTool
|
||||
from app.core.config import *
|
||||
|
||||
import os
|
||||
|
||||
# os.environ["http_proxy"] = "http://127.0.0.1:7890"
|
||||
# os.environ["https_proxy"] = "http://127.0.0.1:7890"
|
||||
# log callbacks
|
||||
@@ -138,5 +136,5 @@ def chat(post_data):
|
||||
'completion_tokens': final_outputs['completion_tokens'],
|
||||
'response_type': final_outputs["response_type"]
|
||||
}
|
||||
logging.info(api_response)
|
||||
logging.info(json.dumps(api_response))
|
||||
return api_response
|
||||
|
||||
Reference in New Issue
Block a user