dev #2

Merged
ly merged 17 commits from dev into main 2024-08-23 09:37:06 +08:00
Showing only changes of commit e71da586e3 - Show all commits
+3 -5
View File
@@ -1,15 +1,13 @@
import os import os
from llama_index.core.agent import AgentRunner, ReActChatFormatter
from llama_index.core.settings import Settings from llama_index.core.settings import Settings
from llama_index.core.agent import AgentRunner, StructuredPlannerAgent, FunctionCallingAgentWorker, ReActChatFormatter
from llama_index.core.tools.query_engine import QueryEngineTool from llama_index.core.tools.query_engine import QueryEngineTool
from sqlalchemy import create_engine, Engine
from llama_index.core.response_synthesizers.type import ResponseMode
from app.engine.engine import create_query_engine, create_summary_query_engine from app.engine.engine import create_query_engine, create_summary_query_engine
from app.engine.index import get_index
from app.engine.loaders.db import makeDescriptionByEngine from app.engine.loaders.db import makeDescriptionByEngine
from app.engine.tools import ToolFactory from app.engine.tools import ToolFactory
from app.engine.index import get_index
def get_chat_engine(filters=None, params=None): def get_chat_engine(filters=None, params=None):
@@ -32,7 +30,7 @@ def get_chat_engine(filters=None, params=None):
summary_query_tool = QueryEngineTool.from_defaults( query_engine=summary_query_engine, name="summary_query_tool", summary_query_tool = QueryEngineTool.from_defaults( query_engine=summary_query_engine, name="summary_query_tool",
description="适用于任何需要进行全面总结、概括的要求。", description="适用于任何需要进行全面总结、概括的要求。",
) )
query_engine = create_query_engine() query_engine = create_query_engine(index)
query_engine_tool = QueryEngineTool.from_defaults(query_engine=query_engine, name="zj_query_tool", query_engine_tool = QueryEngineTool.from_defaults(query_engine=query_engine, name="zj_query_tool",
) )