fix no resualt bugs (infiniflow#1448)

### What problem does this PR solve? ### Type of change - [x] Bug Fix (non-breaking change which fixes an issue)
Halfknow · Jul 9, 2024 · d979781 · d979781
1 parent 6f65d91
commit d979781
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/graph/canvas.py b/graph/canvas.py
@@ -220,6 +220,7 @@ def prepare2run(cpns):
                             prepare2run([p])
                             break
                     traceback.print_exc()
+                    break
                 continue
 
             try:
@@ -231,6 +232,7 @@ def prepare2run(cpns):
                         prepare2run([p])
                         break
                 traceback.print_exc()
+                break
 
         if self.answer:
             cpn_id = self.answer[0]

diff --git a/graph/component/baidu.py b/graph/component/baidu.py
@@ -57,6 +57,6 @@ def _run(self, history, **kwargs):
                      in zip(url_res, title_res, body_res)]
         del body_res, url_res, title_res
 
-        br = pd.DataFrame(baidu_res, columns=['content'])
-        print(">>>>>>>>>>>>>>>>>>>>>>>>>>\n", br)
-        return br
+        print(baidu_res, ":::::::::::::::::::::::::::::::::")
+        return Baidu.be_output(baidu_res)
+
diff --git a/graph/component/duckduckgosearch.py b/graph/component/duckduckgosearch.py
@@ -57,6 +57,5 @@ def _run(self, history, **kwargs):
                 duck_res = ['<a href="' + i["url"] + '">' + i["title"] + '</a>    ' + i["body"] for i in
                             ddgs.news(ans, max_results=self._param.top_n)]
 
-        dr = pd.DataFrame(duck_res, columns=['content'])
-        print(">>>>>>>>>>>>>>>>>>>>>>>>>>\n", dr)
-        return dr
+        print(duck_res, ":::::::::::::::::::::::::::::::::")
+        return DuckDuckGoSearch.be_output(duck_res)
diff --git a/graph/component/message.py b/graph/component/message.py
@@ -46,7 +46,11 @@ def _run(self, history, **kwargs):
         return Message.be_output(random.choice(self._param.messages))
 
     def stream_output(self):
+        res = None
         if self._param.messages:
-            yield {"content": random.choice(self._param.messages)}
+            res = {"content": random.choice(self._param.messages)}
+            yield res
+
+        self.set_output(res)
 
 
diff --git a/graph/templates/HR_callout_zh.json b/graph/templates/HR_callout_zh.json
@@ -169,7 +169,7 @@
             "component_name": "Message",
             "params": {
               "messages": [
-                "我简单介绍以下：\nRAGFlow 是一款基于深度文档理解构建的开源 RAG（Retrieval-Augmented Generation）引擎。RAGFlow 可以为各种规模的企业及个人提供一套精简的 RAG 工作流程，结合大语言模型（LLM）针对用户各类不同的复杂格式数据提供可靠的问答以及有理有据的引用。https://github.com/infiniflow/ragflow\n您那边还有什么要了解的？"
+                "我简单介绍一下：\nRAGFlow 是一款基于深度文档理解构建的开源 RAG（Retrieval-Augmented Generation）引擎。RAGFlow 可以为各种规模的企业及个人提供一套精简的 RAG 工作流程，结合大语言模型（LLM）针对用户各类不同的复杂格式数据提供可靠的问答以及有理有据的引用。https://github.com/infiniflow/ragflow\n您那边还有什么要了解的？"
               ]
             }
           },
@@ -448,7 +448,7 @@
             "data": {
               "form": {
                 "messages": [
-                  "我简单介绍以下：\nRAGFlow 是一款基于深度文档理解构建的开源 RAG（Retrieval-Augmented Generation）引擎。RAGFlow 可以为各种规模的企业及个人提供一套精简的 RAG 工作流程，结合大语言模型（LLM）针对用户各类不同的复杂格式数据提供可靠的问答以及有理有据的引用。https://github.com/infiniflow/ragflow\n您那边还有什么要了解的？"
+                  "我简单介绍一下：\nRAGFlow 是一款基于深度文档理解构建的开源 RAG（Retrieval-Augmented Generation）引擎。RAGFlow 可以为各种规模的企业及个人提供一套精简的 RAG 工作流程，结合大语言模型（LLM）针对用户各类不同的复杂格式数据提供可靠的问答以及有理有据的引用。https://github.com/infiniflow/ragflow\n您那边还有什么要了解的？"
                 ]
               },
               "label": "Message",