Merge pull request #72 from codefuse-ai/bug_70

bugfix: #70 acquire llm output by CustomLLMModel class

Author: cloud-waiting-for-wind

examples/ekg_examples/who_is_spy_game.py

@@ -286,6 +286,21 @@ def test_whoisspy_datas(ekg_service, ):
 
     logger.info(neighbor_nodes)
     logger.info(current_nodes)
+    
+    
+    logger.info('剧本杀/谁是卧底/智能交互/开始新一轮的讨论')
+    start_nodetype    ='opsgptkg_task'
+    start_nodeid = hash_id('剧本杀/谁是卧底/智能交互/开始新一轮的讨论')
+
+    neighbor_nodes = ekg_service.gb.get_neighbor_nodes(attributes={"id": start_nodeid,}, 
+                                    node_type=start_nodetype)
+
+    current_nodes = ekg_service.gb.get_current_nodes(attributes={"id": start_nodeid,}, 
+                                    node_type=start_nodetype)
+
+    logger.info(neighbor_nodes)
+    logger.info(current_nodes)
+
 
 
 

muagent/codechat/code_analyzer/code_intepreter.py

@@ -32,9 +32,10 @@ def get_intepretation(self, code_list):
         res = {}
         for code in code_list:
             message = CODE_INTERPERT_TEMPLATE.format(code=code)
-            message = [HumanMessage(content=message)]
-            chat_res = chat_model.predict_messages(message)
-            content = chat_res.content
+            # message = [HumanMessage(content=message)]
+            # chat_res = chat_model.predict_messages(message)
+            # content = chat_res.content
+            content = chat_model.predict(message)
             res[code] = content
         return res
 

muagent/codechat/code_search/cypher_generator.py

@@ -54,9 +54,10 @@ def get_cypher(self, query: str):
         content = self.NGQL_GENERATION_PROMPT.format(schema=schema, question=query)
         # logger.info(content)
         ans = ''
-        message = [HumanMessage(content=content)]
-        chat_res = self.model.predict_messages(message)
-        ans = chat_res.content
+        # message = [HumanMessage(content=content)]
+        # chat_res = self.model.predict_messages(message)
+        # ans = chat_res.content
+        self.model.predict(content)
 
         ans = replace_lt_gt(ans)
 

muagent/db_handler/graph_db_handler/nebula_handler.py

@@ -91,7 +91,8 @@ def execute_cypher(self, cypher: str, space_name: str = '',ignore_log: bool = Fa
 
             if ignore_log == False:
                 if resp.is_succeeded():
-                    logger.info(f"Successfully executed Cypher query: {cypher}")
+                    #logger.info(f"Successfully executed Cypher query: {cypher}")
+                    pass
 
                 else:
                     logger.error(f"Failed to execute Cypher query: {cypher}")

muagent/service/ekg_reasoning/src/geabase_handler/geabase_handlerplus.py

@@ -449,7 +449,7 @@ def get_extra_tag(self, rootNodeId = 'None', rootNodeType = 'opsgptkg_task', key
             oneNode = self.geabase_handler.get_current_node(attributes={"id": rootNodeId,}, 
                                     node_type=rootNodeType)
         except:
-            logging.info('user_input_memory_tag 没有找到合适的数据， 可能原因是当前查找对象不是 opsgptkg_task 类型的节点'  )
+            logging.info('get_extra_tag 没有找到合适的数据， 可能原因是当前查找对象不是 opsgptkg_task 类型的节点'  )
             return None
         # print(oneNode)
         if oneNode.attributes['extra'] == '':
@@ -463,6 +463,29 @@ def get_extra_tag(self, rootNodeId = 'None', rootNodeType = 'opsgptkg_task', key
             return None
         else:
             return extra[key]
+        
+    def get_tag(self, rootNodeId = 'None', rootNodeType = 'opsgptkg_task', key = 'ignorememory'):
+        # print(f'rootNodeId is {rootNodeId},  rootNodeType is {rootNodeType}')
+        try:
+            oneNode = self.geabase_handler.get_current_node(attributes={"id": rootNodeId,}, 
+                                    node_type=rootNodeType)
+        except:
+            logging.info(f'get_tag 没有找到合适的数据， 可能原因是当前对象为 {rootNodeType} 类型的节点'  )
+            return None
+        # print(oneNode)
+        if key not in oneNode.attributes.keys():
+            logging.info(f'get_tag 没有找到合适的数据， 可能原因key名错误'  )
+            return None
+        if oneNode.attributes[key] == '':
+            logging.info(f'get_tag 没有找到合适的数据， 可能原因为空字符串'  )
+            return None
+        
+        return oneNode.attributes[key]
+
+        
+        
+
+
 
     def user_input_memory_tag(self,  rootNodeId = 'None', rootNodeType = 'opsgptkg_task'):
         print(f'rootNodeId is {rootNodeId},  rootNodeType is {rootNodeType}')

muagent/service/ekg_reasoning/src/graph_search/geabase_search_plus.py

@@ -547,7 +547,7 @@ def get_tool_ancestor(self, sessionId, start_nodeid = '为什么余额宝没收
 
             #查祖先节点 reverse=True
             neighborNodes = self.geabase_handler.get_neighbor_nodes(attributes={"id": nodeid_now,}, node_type=nodetype_now, reverse=True)
-            print(nodeid_now, nodetype_now, neighborNodes, '=========')
+            #print(nodeid_now, nodetype_now, neighborNodes, '=========')
 
 
             for i in range(len(neighborNodes) ):

muagent/service/ekg_reasoning/src/graph_search/graph_search_main.py

@@ -605,11 +605,13 @@ def outputFuc(self):
         currentNodeType = self.gst.search_node_type(self.nodeid_in_subtree, self.currentNodeId )
         logging.info(f"currentNodeId is {self.currentNodeId}  ")
         logging.info(f"currentNodeType is {currentNodeType} , currentNodeId is {self.currentNodeId}")
-        if self.gb_handler.get_extra_tag(rootNodeId = self.currentNodeId, rootNodeType = currentNodeType, key = 'dodisplay') == 'True' or self.gb_handler.get_extra_tag(rootNodeId = self.currentNodeId, rootNodeType = currentNodeType, key = 'dodisplay') == 'Ture':
+        if self.gb_handler.get_extra_tag(rootNodeId = self.currentNodeId, rootNodeType = currentNodeType, key = 'dodisplay') == 'True'   \
+            or self.gb_handler.get_extra_tag(rootNodeId = self.currentNodeId, rootNodeType = currentNodeType, key = 'dodisplay') == 'Ture' \
+                or self.gb_handler.get_tag(rootNodeId = self.currentNodeId, rootNodeType = currentNodeType, key = 'dodisplay') == 'True' :
             outputinfo_str = self.memory_handler.get_output(self.sessionId, self.start_datetime, self.end_datetime)
         else:
-            dodisplaystr = self.gb_handler.get_extra_tag(rootNodeId = self.currentNodeId, rootNodeType = currentNodeType, key = 'dodisplay') 
-            logging.info(f" 查询dodisplay字段结果为空, 结果为{dodisplaystr}")
+            dodisplaystr = self.gb_handler.get_tag(rootNodeId = self.currentNodeId, rootNodeType = currentNodeType, key = 'dodisplay') 
+            logging.info(f" 查询dodisplay字段结果为空, 或者为{dodisplaystr}，本次不对外输出")
             outputinfo_str = None