[features-service][add atomic crud]

Author: lightislost

docker-compose.yaml

@@ -127,9 +127,9 @@ services:
       TZ:   "${TZ}"
     ports:
       - 11434:11434
-    volumes:
+    # volumes:
       # - //d/models/ollama:/root/.ollama # windows path
-      # - /Users/wangyunpeng/Downloads/models:/root/.ollama # linux/mac path
+      # - /Users/xxxx/Desktop/ollama:/root/.ollama # linux/mac path
     networks:
       - ekg-net
     restart: on-failure

examples/muagent_examples/codechat_example.py

@@ -31,11 +31,11 @@
     embeddings = None
     logger.error(f"{e}")
 
-# # test local code
-# src_dir = os.path.join(
-#     os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-# )
-# sys.path.append(src_dir)
+# test local code
+src_dir = os.path.join(
+    os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+)
+sys.path.append(src_dir)
 from muagent.base_configs.env_config import CB_ROOT_PATH
 from muagent.llm_models.llm_config import EmbedConfig, LLMConfig
 from muagent.connector.phase import BasePhase
@@ -58,7 +58,7 @@
 
 # delete codebase
 codebase_name = 'client_local'
-code_path = "D://chromeDownloads/devopschat-bot/client_v2/client"
+code_path = "{add_your_code_path}"
 # initialize codebase
 use_nh = True
 do_interpret = True

muagent/base_configs/prompts/intention_template_prompt.py

@@ -97,15 +97,17 @@ def get_intention_prompt(
 
 
 INTENTIONS_CONSULT_WHICH = [
-    ('整体计划查询', '用户询问关于某个解决方案的完整流程或步骤，包含但不限于“整个流程”、“步骤”、“流程图”等词汇或概念。'),
-    ('下一步任务查询', '用户询问在某个解决方案的特定步骤中应如何操作或处理，通常会提及“下一步”、“具体操作”、“如何做”等，且明确指向解决方案中的某个特定环节。'),
+    ('整体计划查询', '用户想要获取某个问题的答案，或某个解决方案的完整流程（步骤）。'),
+    ('下一步任务查询', '用户询问某个问题或方案的特定步骤，通常会提及“下一步”、“具体操作”等'),
     ('闲聊', '用户询问的内容与当前的技术问题或解决方案无关，更多是出于兴趣或社交性质的交流。')
 ]
 CONSULT_WHICH_PROMPT = get_intention_prompt(
     '作为运维领域的客服，您的职责是根据用户询问的内容，精准判断其背后的意图，以便提供最恰当的服务和支持。',
     INTENTIONS_CONSULT_WHICH,
     {
+        '如何组织一次活动？': '整体计划查询',
         '系统升级的整个流程是怎样的？': '整体计划查询',
+        '为什么我没有收到红包？请告诉我方案': '整体计划查询',
         '听说你们采用了新工具，能讲讲它的特点吗？': '闲聊'
     }
 )
@@ -119,7 +121,7 @@ def get_intention_prompt(
     INTENTIONS_WHETHER_EXEC,
     {
         '为什么我的优惠券使用失败？': '执行',
-        '我想知道如何才能更好地优化我的服务器性能，你们有什么建议吗？': '询问'
+        '为什么我的优惠券使用失败？请告诉我方案': '询问'
     }
 )
 

muagent/connector/agents/base_agent.py

@@ -1,4 +1,4 @@
-from typing import List, Union
+from typing import List, Union,Generator
 import importlib
 import re, os
 import copy

muagent/connector/agents/executor_agent.py

@@ -1,4 +1,4 @@
-from typing import List, Union
+from typing import List, Union, Generator
 import copy
 import uuid
 from loguru import logger

muagent/connector/memory_manager.py

@@ -1,6 +1,6 @@
 from abc import abstractmethod, ABC
 from typing import List, Dict
-import os, sys, copy, json, uuid
+import os, sys, copy, json, uuid, random
 from jieba.analyse import extract_tags
 from collections import Counter
 from loguru import logger
@@ -238,7 +238,7 @@ def __init__(
         # self.unique_name = unique_name
         # self.memory_type = memory_type
         self.db_config = db_config
-        self.vb_config = vb_config
+        self.vb_config = vb_config or VBConfig(vb_type="LocalFaissHandler")
         self.gb_config = gb_config
         self.tb_config = tb_config
         self.do_init = do_init

muagent/connector/phase/base_phase.py

@@ -92,7 +92,8 @@ def __init__(
             )
         else:
             self.memory_manager: BaseMemoryManager = LocalMemoryManager(
-                unique_name=phase_name, do_init=True, kb_root_path = kb_root_path, embed_config=embed_config, llm_config=llm_config
+                # unique_name=phase_name, 
+                do_init=True, kb_root_path = kb_root_path, embed_config=embed_config, llm_config=llm_config
                 )
         self.conv_summary_agent = BaseAgent(
             role=role_configs["conv_summary"].role,

muagent/db_handler/graph_db_handler/geabase_handler.py

@@ -25,11 +25,24 @@ def __init__(
         self.project = gb_config.extra_kwargs.get("project")
         self.city = gb_config.extra_kwargs.get("city")
         self.lib_path = gb_config.extra_kwargs.get("lib_path")
-
-        GeaBaseEnv.init(self.lib_path)
-        self.geabase_client = GeaBaseClient(
-            self.metaserver_address, self.project,self.city
-        )
+        self.graph_name = gb_config.extra_kwargs.get("graph_name")
+
+        try:
+            GeaBaseEnv.init(self.lib_path)
+        except Exception as e:
+            logger.error(f"{e}")
+
+        if self.graph_name:
+            self.geabase_client = GeaBaseClient(
+                self.metaserver_address, self.project,self.city,
+                graph_name=self.graph_name
+            )
+            self.hop_max = 6
+        else:
+            self.geabase_client = GeaBaseClient(
+                self.metaserver_address, self.project,self.city,
+            )
+            self.hop_max = 8
 
         # option 指定
         self.option = GeaBaseEnv.QueryRequestOption.newBuilder().gqlType(GeaBaseEnv.QueryProtocol.GQLType.GQL_ISO).build()
@@ -227,7 +240,7 @@ def get_hop_infos(self, attributes: dict, node_type: str = None, hop: int = 2, b
         '''
         hop >= 2， 表面需要至少两跳
         '''
-        hop_max = 8
+        hop_max = self.hop_max
         # 
         where_str = ' and '.join([f"n0.{k}='{v}'" for k, v in attributes.items()])
         if reverse:

muagent/db_handler/graph_db_handler/nebula_handler.py

@@ -71,6 +71,12 @@ def execute_cypher(self, cypher: str, space_name: str = '', format_res: str = 'a
                 resp = resp.dict_for_vis()
         return resp
 
+    def add_hosts(self, hostname, port):
+            with self.connection_pool.session_context(self.username, self.password) as session:
+                cypher = f'ADD HOSTS "{hostname}":{port}'
+                resp = session.execute(cypher)
+            return resp
+
     def close_connection(self):
         self.connection_pool.close()
 

muagent/schemas/ekg/ekg_graph.py

@@ -165,9 +165,9 @@ class EKGNodeTbaseSchema(BaseModel):
     # node_str = 'graph_id={graph_id}'/teamids, use for searching by graph_id/teamids
     node_str: str
     name_keyword: str
-    desc_keyword: str
+    description_keyword: str
     name_vector: List
-    desc_vector: List
+    description_vector: List
 
 
 class EKGEdgeTbaseSchema(BaseModel):
@@ -204,6 +204,24 @@ class EKGSlsData(BaseModel):
 }
 
 
+###############################
+##### tbase & gbase status #####
+###############################
+
+class TbaseExecStatus(BaseModel):
+    errorMessage: Optional[str] = None
+    statusCode: Optional[int] = None
+    # 
+    total: Optional[int] = None
+    docs: Optional[List[dict]] = None
+
+class GbaseExecStatus(BaseModel):
+    errorMessage: Optional[str] = None
+    statusCode: Optional[int] = None
+
+
+
+
 #####################
 ##### yuque dsl #####
 #####################