Merge branch '0.6_dev' of github.com:OpenSPG/KAG into 0.6_dev

kag/common/registry/registrable.py

@@ -812,9 +812,7 @@ def from_config(
             logger.warn(f"Failed to initialize class {cls}, info: {e}")
             raise e
         if len(params) > 0:
-            raise ConfigurationError(
-                f"These params are not used for constructing {cls}:\n{params}"
-            )
+            logger.warn(f"These params are not used for constructing {cls}:\n{params}")
 
         return instant
 

kag/examples/2wiki/kag_config.yaml

@@ -61,21 +61,28 @@ vectorize_model: *id002
 vectorizer: *id002
 
 lf_solver_pipeline:
+  memory: default_memory
+  max_iterations: 3
   generator:
+    type: default_generator
     generate_prompt:
       type: resp_simple
+  reflector:
+    type: default_reflector
   reasoner:
-    type: base
+    type: default_reasoner
+    lf_planner:
+      type: default_lf_planner
     lf_executor:
-      type: base
+      type: default_lf_executor
       force_chunk_retriever: true
       exact_kg_retriever:
         type: default_exact_kg_retriever
         el_num: 5
         search_api: &id003
-          type: openspg
+          type: openspg_search_api
         graph_api: &id004
-          type: openspg
+          type: openspg_graph_api
       fuzzy_kg_retriever:
         type: default_fuzzy_kg_retriever
         el_num: 5
@@ -88,5 +95,5 @@ lf_solver_pipeline:
         recall_num: 10
         rerank_topk: 10
       merger:
-        type: base
+        type: default_lf_sub_query_res_merger
         chunk_retriever: *id005

kag/examples/baike/kag_config.yaml

@@ -61,34 +61,42 @@ kag-indexer:
   scanner:
     type: dir
 
+
+
 lf_solver_pipeline:
+  memory: default_memory
+  max_iterations: 3
   generator:
+    type: default_generator
     generate_prompt:
-      type: default_resp_generator # kag.solver.prompt.default.resp_generator.RespGenerator
-      #type: resp_simple # solver.prompt.resp_generator.RespGenerator
+      type: default_resp_generator
+  reflector:
+    type: default_reflector
   reasoner:
-    type: base
+    type: default_reasoner
+    lf_planner:
+      type: default_lf_planner
     lf_executor:
-      type: base
+      type: default_lf_executor
       force_chunk_retriever: true
       exact_kg_retriever:
-        type: default
+        type: default_exact_kg_retriever
         el_num: 5
         search_api: &id003
-          type: openspg
+          type: openspg_search_api
         graph_api: &id004
-          type: openspg
+          type: openspg_graph_api
       fuzzy_kg_retriever:
-        type: default
+        type: default_fuzzy_kg_retriever
         el_num: 5
         vectorize_model: *id002
         llm_client: *id001
         search_api: *id003
         graph_api: *id004
       chunk_retriever: &id005
-        type: default
+        type: default_chunk_retriever
         recall_num: 10
         rerank_topk: 10
       merger:
-        type: base
-        chunk_retriever: *id005
+        type: default_lf_sub_query_res_merger
+        chunk_retriever: *id005

kag/examples/hotpotqa/kag_config.yaml

@@ -59,22 +59,30 @@ runner:
     type: hotpotqa
 vectorize_model: *id002
 vectorizer: *id002
+
 lf_solver_pipeline:
+  memory: default_memory
+  max_iterations: 3
   generator:
+    type: default_generator
     generate_prompt:
       type: resp_simple
+  reflector:
+    type: default_reflector
   reasoner:
-    type: base
+    type: default_reasoner
+    lf_planner:
+      type: default_lf_planner
     lf_executor:
-      type: base
+      type: default_lf_executor
       force_chunk_retriever: true
       exact_kg_retriever:
         type: default_exact_kg_retriever
         el_num: 5
         search_api: &id003
-          type: openspg
+          type: openspg_search_api
         graph_api: &id004
-          type: openspg
+          type: openspg_graph_api
       fuzzy_kg_retriever:
         type: default_fuzzy_kg_retriever
         el_num: 5
@@ -87,5 +95,5 @@ lf_solver_pipeline:
         recall_num: 10
         rerank_topk: 10
       merger:
-        type: base
+        type: default_lf_sub_query_res_merger
         chunk_retriever: *id005

kag/examples/medicine/kag_config.yaml

@@ -36,18 +36,7 @@ extract_runner:
   num_chains: 8
   scanner:
     type: csv
-lf_solver_pipeline:
-  generator:
-    generate_prompt:
-      type: example_resp_generator
-  reasoner:
-    lf_solver:
-      chunk_retriever:
-        ner_prompt:
-          type: example_medical_question_ner
-        type: kag
-      kg_retriever:
-        type: base
+
 llm: *id001
 log:
   level: INFO
@@ -85,3 +74,41 @@ vectorize_model: *id002
 vectorizer:
   type: batch
   vectorize_model: *id002
+
+lf_solver_pipeline:
+  memory: default_memory
+  max_iterations: 3
+  generator:
+    type: default_generator
+    generate_prompt:
+      type: example_resp_generator
+  reflector:
+    type: default_reflector
+  reasoner:
+    type: default_reasoner
+    lf_planner:
+      type: default_lf_planner
+    lf_executor:
+      type: default_lf_executor
+      force_chunk_retriever: true
+      exact_kg_retriever:
+        type: default_exact_kg_retriever
+        el_num: 5
+        search_api: &id003
+          type: openspg_search_api
+        graph_api: &id004
+          type: openspg_graph_api
+      fuzzy_kg_retriever:
+        type: default_fuzzy_kg_retriever
+        el_num: 5
+        vectorize_model: *id002
+        llm_client: *id001
+        search_api: *id003
+        graph_api: *id004
+      chunk_retriever: &id005
+        type: default_chunk_retriever
+        recall_num: 10
+        rerank_topk: 10
+      merger:
+        type: default_lf_sub_query_res_merger
+        chunk_retriever: *id005

kag/examples/musique/kag_config.yaml

@@ -61,21 +61,28 @@ vectorize_model: *id002
 vectorizer: *id002
 
 lf_solver_pipeline:
+  memory: default_memory
+  max_iterations: 3
   generator:
+    type: default_generator
     generate_prompt:
       type: resp_simple
+  reflector:
+    type: default_reflector
   reasoner:
-    type: base
+    type: default_reasoner
+    lf_planner:
+      type: default_lf_planner
     lf_executor:
-      type: base
+      type: default_lf_executor
       force_chunk_retriever: true
       exact_kg_retriever:
         type: default_exact_kg_retriever
         el_num: 5
         search_api: &id003
-          type: openspg
+          type: openspg_search_api
         graph_api: &id004
-          type: openspg
+          type: openspg_graph_api
       fuzzy_kg_retriever:
         type: default_fuzzy_kg_retriever
         el_num: 5
@@ -88,5 +95,5 @@ lf_solver_pipeline:
         recall_num: 10
         rerank_topk: 10
       merger:
-        type: base
-        chunk_retriever: *id005
+        type: default_lf_sub_query_res_merger
+        chunk_retriever: *id005

kag/examples/riskmining/kag_config.yaml

@@ -1,13 +1,4 @@
-lf_solver_pipeline:
-  reasoner:
-    lf_planner:
-      logic_form_plan_prompt:
-        type: riskmining_lf_plan
-      type: base
-  generator:
-    generate_prompt:
-      type: resp_riskmining
-llm:
+llm: &id001
   api_key: key
   base_url: https://api.deepseek.com
   model: deepseek-chat
@@ -20,9 +11,50 @@ project:
   id: '4'
   language: zh
   namespace: RiskMining
-vectorize_model: &id001
+vectorize_model: &id002
   type: mock
   vector_dimensions: 768
 vectorizer:
   type: batch
-  vectorize_model: *id001
+  vectorize_model: *id002
+
+
+lf_solver_pipeline:
+  memory: default_memory
+  max_iterations: 3
+  generator:
+    type: default_generator
+    generate_prompt:
+      type: resp_riskmining
+  reflector:
+    type: default_reflector
+  reasoner:
+    type: default_reasoner
+    lf_planner:
+      logic_form_plan_prompt:
+        type: riskmining_lf_plan
+      type: default_lf_planner
+    lf_executor:
+      type: default_lf_executor
+      force_chunk_retriever: true
+      exact_kg_retriever:
+        type: default_exact_kg_retriever
+        el_num: 1
+        search_api: &id003
+          type: openspg_search_api
+        graph_api: &id004
+          type: openspg_graph_api
+      fuzzy_kg_retriever:
+        type: default_fuzzy_kg_retriever
+        el_num: 1
+        vectorize_model: *id002
+        llm_client: *id001
+        search_api: *id003
+        graph_api: *id004
+      chunk_retriever: &id005
+        type: default_chunk_retriever
+        recall_num: 10
+        rerank_topk: 10
+      merger:
+        type: default_lf_sub_query_res_merger
+        chunk_retriever: *id005

kag/examples/supplychain/kag_config.yaml

@@ -1,13 +1,4 @@
-lf_solver_pipeline:
-  reasoner:
-    lf_planner:
-      logic_form_plan_prompt:
-        type: supplychain_lf_plan
-      type: base
-  generator:
-    generate_prompt:
-      type: resp_supplychain
-llm:
+llm: &id001
   api_key: key
   base_url: https://api.deepseek.com
   model: deepseek-chat
@@ -20,9 +11,50 @@ project:
   id: '5'
   language: zh
   namespace: SupplyChain
-vectorize_model: &id001
+vectorize_model: &id002
   type: mock
   vector_dimensions: 768
 vectorizer:
   type: batch
-  vectorize_model: *id001
+  vectorize_model: *id002
+
+
+lf_solver_pipeline:
+  memory: default_memory
+  max_iterations: 3
+  generator:
+    type: default_generator
+    generate_prompt:
+      type: resp_supplychain
+  reflector:
+    type: default_reflector
+  reasoner:
+    type: default_reasoner
+    lf_planner:
+      logic_form_plan_prompt:
+        type: supplychain_lf_plan
+      type: default_lf_planner
+    lf_executor:
+      type: default_lf_executor
+      force_chunk_retriever: true
+      exact_kg_retriever:
+        type: default_exact_kg_retriever
+        el_num: 1
+        search_api: &id003
+          type: openspg_search_api
+        graph_api: &id004
+          type: openspg_graph_api
+      fuzzy_kg_retriever:
+        type: default_fuzzy_kg_retriever
+        el_num: 1
+        vectorize_model: *id002
+        llm_client: *id001
+        search_api: *id003
+        graph_api: *id004
+      chunk_retriever: &id005
+        type: default_chunk_retriever
+        recall_num: 10
+        rerank_topk: 10
+      merger:
+        type: default_lf_sub_query_res_merger
+        chunk_retriever: *id005