Skip to content

Commit ebc8c3f

Browse files
authored
Merge pull request #101 from codefuse-ai/muagent_dev
[muagent v0.1.1] add reasoning logger and shutdown nbclient kernel
2 parents 6c51c98 + adbb1d3 commit ebc8c3f

File tree

29 files changed

+63
-39
lines changed

29 files changed

+63
-39
lines changed

examples/test_config.py.example

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import os, openai, base64
22
from loguru import logger
3+
import json
34

45
os.environ["DM_llm_name"] = 'Qwen2_72B_Instruct_OpsGPT' #or gpt_4
56

@@ -123,7 +124,7 @@ DB_CONFIGS = {
123124
"gb_config": {
124125
"gb_type": "NebulaHandler",
125126
"extra_kwargs": {
126-
'host':'graphd',
127+
'host': os.environ['nb_host'],
127128
'port': '9669',
128129
'username': os.environ['nb_username'],
129130
'password': os.environ['nb_password'],
@@ -133,7 +134,7 @@ DB_CONFIGS = {
133134
"tb_config": {
134135
"tb_type": 'TBaseHandler',
135136
"index_name": "opsgptkg",
136-
"host": 'redis-stack',
137+
"host": os.environ['tb_host'],
137138
"port": '6379',
138139
"username": os.environ['tb_username'],
139140
"password": os.environ['tb_password'],
@@ -146,6 +147,7 @@ DB_CONFIGS = {
146147
os.environ["DB_CONFIGS"] = json.dumps(DB_CONFIGS)
147148

148149

150+
os.environ["clear_history_data"] = "False" # 'True'
149151

150152
########################################
151153
########## 以下参数暂不涉及无需配置 ########

muagent/db_handler/graph_db_handler/geabase_handler.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
from gdbc2.geabase_client import GeaBaseClient, Node, Edge, MutateBatchOperation, GeaBaseUtil
88
from gdbc2.geabase_env import GeaBaseEnv
99
except:
10-
logger.error("ignore this sdk")
10+
pass
11+
# logger.error("ignore this sdk")
1112

1213
from .base_gb_handler import GBHandler
1314
from muagent.db_handler.utils import deduplicate_dict

muagent/db_handler/graph_db_handler/nebula_handler.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1021,7 +1021,7 @@ def is_nodeid_exist(self, nodeid: str) -> bool:
10211021
def check_edge_exist(self, src_id: str, dst_id: str) -> bool:
10221022
try:
10231023
if self.get_current_edge(src_id, dst_id):
1024-
print('Edge already exists!')
1024+
# print('Edge already exists!')
10251025
return True
10261026
except Exception as e:
10271027
print('Edge not exists!')
@@ -1041,7 +1041,7 @@ def check_node_before_execute(self, nodeid: str, action: str = ""):
10411041
)
10421042
# 节点是否存在: 1.删除时节点存在不报错 2.添加时节点存在报错 3.update时节点存在不报错
10431043
if self.is_nodeid_exist(nodeid) and action == "add":
1044-
logger.info('Node already exits!')
1044+
# logger.info('Node already exits!')
10451045
return GbaseExecStatus(
10461046
errorMessage='GDB_ENGINE_PRIMARY_KEY_DUPLICATE',
10471047
errorCode=1,

muagent/ekg_project.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
import time
1616
import random
1717

18+
os.environ["operation_mode"] = "open_source"
19+
os.environ["intention_url"] = ""
20+
1821
from .llm_models import LLMConfig, EmbedConfig
1922
from .schemas.db import TBConfig, GBConfig
2023
from .schemas.models import ModelConfig
@@ -228,7 +231,6 @@ def get_ekg_project_config_from_env(
228231
model_type = random.choice(embedding_list)
229232
default_model_config = project_configs["model_configs"][model_type]
230233
project_configs["model_configs"]["default_embed"] = default_model_config
231-
project_configs[k] = v
232234

233235
# init embedding configs
234236
if embed_configs:
@@ -286,7 +288,7 @@ def get_ekg_project_config_from_env(
286288
project_configs["prompt_configs"] = prompt_configs
287289
else:
288290
logger.warning(
289-
f"Cant't init any AGENT_CONFIGS in this env."
291+
f"Cant't init any PROMPT_CONFIGS in this env."
290292
)
291293

292294

muagent/prompt_manager/language/__init__.py

Whitespace-only changes.

muagent/sandbox/nbclient.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,8 @@ def reset_notebook(self) -> str:
179179
asyncio.run(self._restart_client())
180180
return "Reset notebook"
181181

182-
182+
async def close_client(self):
183+
await self.nb_client.km.shutdown_kernel(now=True)
183184

184185

185186

@@ -291,7 +292,7 @@ def restart(self, ) -> CodeBoxStatus:
291292
return CodeBoxStatus(status="restared")
292293

293294
def stop(self, ) -> CodeBoxStatus:
294-
pass
295+
asyncio.run(self.nbe.close_client())
295296

296297
def __del__(self):
297298
self.stop()

muagent/schemas/kb/__init__.py

Whitespace-only changes.

muagent/service/ekg_reasoning/__init__.py

Whitespace-only changes.

muagent/service/ekg_reasoning/src/__init__.py

Whitespace-only changes.

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

Whitespace-only changes.

0 commit comments

Comments
 (0)