refactor: rename RAG_Agent to LlamaIndexAgent and LangChainAgent and …

…add knowledge_bank params
modelscope · Nov 19, 2024 · 6a70b63 · 6a70b63
1 parent 7909ab8
commit 6a70b63
Show file tree

Hide file tree

Showing 8 changed files with 260 additions and 134 deletions.
diff --git a/examples/conversation_with_RAG_agents/configs/agent_config.json b/examples/conversation_with_RAG_agents/configs/agent_config.json
@@ -1,6 +1,6 @@
 [
   {
-    "class": "RAG_Agent",
+    "class": "LlamaIndexAgent",
     "args": {
       "name": "Tutorial-Assistant",
       "description": "Tutorial-Assistant is an agent that can provide answer based on English tutorial material, mainly the markdown files. It can answer general questions about AgentScope.",
@@ -13,7 +13,7 @@
     }
   },
   {
-    "class": "RAG_Agent",
+    "class": "LlamaIndexAgent",
     "args": {
       "name": "Code-Search-Assistant",
       "description": "Code-Search-Assistant is an agent that can provide answer based on AgentScope code base. It can answer questions about specific modules in AgentScope.",
@@ -26,7 +26,7 @@
     }
   },
   {
-    "class": "RAG_Agent",
+    "class": "LlamaIndexAgent",
     "args": {
       "name": "API-Assistant",
       "description": "API-Assistant is an agent that can answer questions about APIs in AgentScope. It can answer general questions about AgentScope.",
@@ -39,7 +39,7 @@
     }
   },
   {
-    "class": "RAG_Agent",
+    "class": "LlamaIndexAgent",
     "args": {
       "name": "Searching-Assistant",
       "description": "Search-Assistant is an agent that can provide answer based on AgentScope code and tutorial. It can answer questions about everything in AgentScope codes and tutorials.",

diff --git a/examples/conversation_with_RAG_agents/configs/lc_agent_config.json b/examples/conversation_with_RAG_agents/configs/lc_agent_config.json
@@ -1,6 +1,6 @@
 [
   {
-    "class": "RAG_Agent",
+    "class": "LangChainAgent",
     "args": {
       "name": "Tutorial-Assistant",
       "description": "Tutorial-Assistant is an agent that can provide answer based on English tutorial material, mainly the markdown files. It can answer general questions about AgentScope.",
@@ -13,7 +13,7 @@
     }
   },
   {
-    "class": "RAG_Agent",
+    "class": "LangChainAgent",
     "args": {
       "name": "Code-Search-Assistant",
       "description": "Code-Search-Assistant is an agent that can provide answer based on AgentScope code base. It can answer questions about specific modules in AgentScope.",
@@ -26,7 +26,7 @@
     }
   },
   {
-    "class": "RAG_Agent",
+    "class": "LangChainAgent",
     "args": {
       "name": "API-Assistant",
       "description": "API-Assistant is an agent that can answer questions about APIs in AgentScope. It can answer general questions about AgentScope.",
@@ -39,7 +39,7 @@
     }
   },
   {
-    "class": "RAG_Agent",
+    "class": "LangChainAgent",
     "args": {
       "name": "Searching-Assistant",
       "description": "Search-Assistant is an agent that can provide answer based on AgentScope code and tutorial. It can answer questions about everything in AgentScope codes and tutorials.",

diff --git a/examples/conversation_with_RAG_agents/configs/lc_knowledge_config.json b/examples/conversation_with_RAG_agents/configs/lc_knowledge_config.json
@@ -27,23 +27,7 @@
           }
         }
       }
-    ],
-    "store_and_index":{
-      "stores":{
-        "vector_store": {
-          "create_object": true,
-          "module": "langchain_elasticsearch",
-          "class": "ElasticsearchStore",
-          "init_args": {
-            "es_url": "http://localhost:9200",
-            "index_name": "lc_code_rag",
-            "es_user": "elastic",
-            "es_password": "147258",
-            "embedding_key": "embedding"
-          }
-        }
-      }
-    }
+    ]
   },
   {
     "knowledge_id": "agentscope_api_rag",

diff --git a/examples/conversation_with_RAG_agents/rag_example.py b/examples/conversation_with_RAG_agents/rag_example.py
@@ -78,6 +78,16 @@ def main() -> None:
         },
     )
 
+    # # if use langchain knowledge, we need to set backend_engine
+    # knowledge_bank.add_data_as_knowledge(
+    #     knowledge_id="agentscope_tutorial_rag",
+    #     emb_model_name="qwen_emb_config",
+    #     data_dirs_and_types={
+    #         "../../docs/sphinx_doc/en/source/tutorial": ["*.md"],
+    #     },
+    #     backend_engine="langchain"
+    # )
+
     # let knowledgebank to equip rag agent with a (set of) knowledge
     # corresponding to its knowledge_id_list
     for agent in rag_agent_list:

diff --git a/src/agentscope/agents/__init__.py b/src/agentscope/agents/__init__.py
@@ -8,7 +8,7 @@
 from .react_agent import ReActAgent
 from .rag_agent import (
     LlamaIndexAgent,
-    RAG_Agent,
+    LangChainAgent,
 )
 
 
@@ -20,4 +20,5 @@
     "UserAgent",
     "ReActAgent",
     "LlamaIndexAgent",
+    "LangChainAgent",
 ]