Skip to content

Commit 72fa1b9

Browse files
authored
Merge pull request #8 from codefuse-ai/feat_req_update
Feat req update
2 parents 7723b6c + 9f219a0 commit 72fa1b9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+692
-385
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ setup_test.py
1414
build
1515
*egg-info
1616
dist
17-
.ipynb_checkpoints
17+
.ipynb_checkpoints
18+
zdatafront*

Dockerfile

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
From python:3.9.18-bookworm
2+
3+
WORKDIR /home/user
4+
5+
COPY ./requirements.txt /home/user/docker_requirements.txt
6+
7+
8+
# RUN apt-get update
9+
# RUN apt-get install -y iputils-ping telnetd net-tools vim tcpdump
10+
# RUN echo telnet stream tcp nowait telnetd /usr/sbin/tcpd /usr/sbin/in.telnetd /etc/inetd.conf
11+
# RUN service inetutils-inetd start
12+
# service inetutils-inetd status
13+
14+
RUN wget https://oss-cdn.nebula-graph.com.cn/package/3.6.0/nebula-graph-3.6.0.ubuntu1804.amd64.deb
15+
RUN dpkg -i nebula-graph-3.6.0.ubuntu1804.amd64.deb
16+
17+
RUN pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple
18+
RUN pip install -r /home/user/docker_requirements.txt
19+
20+
CMD ["bash"]

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ Developed by the Ant CodeFuse Team, CodeFuse-muAgent is a Multi-Agent framework
3333
![](docs/resources/agent_runtime.png)
3434

3535
## 🚀 快速使用
36-
For complete documentation, see: [CodeFuse-muAgent](docs/overview/o1.muagent.md)
37-
For more [demos](docs/overview/o3.quick-start.md)
36+
For complete documentation, see: [CodeFuse-muAgent](https://codefuse-ai.github.io/docs/api-docs/MuAgent/overview/multi-agent)
37+
For more [demos](https://codefuse-ai.github.io/docs/api-docs/MuAgent/connector/customed_examples)
3838

3939
1. Installation
4040
```
@@ -115,7 +115,7 @@ We are deeply grateful for your interest in the Codefuse project and warmly welc
115115

116116
Feel free to raise your suggestions, opinions, and comments directly through GitHub Issues. There are numerous ways to participate in and contribute to the Codefuse project: code implementation, writing tests, process tool improvements, documentation enhancements, etc.
117117

118-
We welcome any contribution and will add you to the list of contributors. See [Contribution Guide...](docs/contribution/contribute_guide.md)
118+
We welcome any contribution and will add you to the list of contributors. See [Contribution Guide...](https://codefuse-ai.github.io/contribution/contribution)
119119

120120

121121
## 🗂 Miscellaneous

README_zh.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ CodeFuse-muAgent 是蚂蚁CodeFuse团队开发的Mulit Agent框架,其核心
3434

3535

3636
## 🚀 快速使用
37-
完整文档见:[CodeFuse-muAgent](docs/overview/o1.muagent.md)
38-
更多[demo](docs/overview/o3.quick-start.md)
37+
完整文档见:[CodeFuse-muAgent](https://codefuse-ai.github.io/zh-CN/docs/api-docs/MuAgent/overview/multi-agent)
38+
更多[demo](https://codefuse-ai.github.io/zh-CN/docs/api-docs/MuAgent/connector/customed_examples)
3939

4040
1. 安装
4141
```
@@ -120,7 +120,7 @@ print(output_memory3.to_str_messages(return_all=True, content_key="parsed_output
120120

121121
您对 Codefuse 的各种建议、意见、评论可以直接通过 GitHub 的 Issues 提出。
122122

123-
参与 Codefuse 项目并为其作出贡献的方法有很多:代码实现、测试编写、流程工具改进、文档完善等等。任何贡献我们都会非常欢迎,并将您加入贡献者列表。详见[Contribution Guide...](docs/contribution/contribute_guide.md)
123+
参与 Codefuse 项目并为其作出贡献的方法有很多:代码实现、测试编写、流程工具改进、文档完善等等。任何贡献我们都会非常欢迎,并将您加入贡献者列表。详见[Contribution Guide...](https://codefuse-ai.github.io/zh-CN/contribution/issue)
124124

125125

126126
## 🗂 其他

docker_build.sh

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
3+
docker build -t muagent:0.0.1 .

examples/muagent_examples/baseGroup_example.py

+7-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
model_name = os.environ["model_name"]
1414
embed_model = os.environ["embed_model"]
1515
embed_model_path = os.environ["embed_model_path"]
16+
model_engine = os.environ["model_engine"]
1617

1718
try:
1819
from test_config import BgeBaseChineseEmbeddings
@@ -24,12 +25,17 @@
2425
api_key = ""
2526
api_base_url= ""
2627
model_name = ""
28+
model_engine = ""
2729
embed_model = ""
2830
embed_model_path = ""
2931
embeddings = None
3032
logger.error(f"{e}")
3133

32-
34+
# # test local code
35+
# src_dir = os.path.join(
36+
# os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
37+
# )
38+
# sys.path.append(src_dir)
3339
from muagent.base_configs.env_config import JUPYTER_WORK_PATH
3440
from muagent.tools import toLangchainTools, TOOL_DICT, TOOL_SETS
3541
from muagent.llm_models.llm_config import EmbedConfig, LLMConfig

examples/muagent_examples/baseTask_examples.py

+15-1
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,30 @@
1313
model_name = os.environ["model_name"]
1414
embed_model = os.environ["embed_model"]
1515
embed_model_path = os.environ["embed_model_path"]
16+
model_engine = os.environ["model_engine"]
17+
18+
try:
19+
from test_config import BgeBaseChineseEmbeddings
20+
embeddings = BgeBaseChineseEmbeddings()
21+
except:
22+
embeddings = None
1623
except Exception as e:
1724
# set your config
1825
api_key = ""
1926
api_base_url= ""
2027
model_name = ""
28+
model_engine = ""
2129
embed_model = ""
2230
embed_model_path = ""
31+
embeddings = None
2332
logger.error(f"{e}")
2433

2534

35+
# # test local code
36+
# src_dir = os.path.join(
37+
# os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
38+
# )
39+
# sys.path.append(src_dir)
2640
from muagent.llm_models.llm_config import EmbedConfig, LLMConfig
2741
from muagent.connector.phase import BasePhase
2842
from muagent.connector.schema import Message
@@ -32,7 +46,7 @@
3246
os.environ["log_verbose"] = "0"
3347

3448
llm_config = LLMConfig(
35-
model_name=model_name, api_key=api_key, api_base_url=api_base_url, temperature=0.3
49+
model_name=model_name, model_engine=model_engine, api_key=api_key, api_base_url=api_base_url, temperature=0.3
3650
)
3751

3852
embed_config = EmbedConfig(

examples/muagent_examples/codeGenDoc_example.py

+15-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import os
2-
import json
32
from loguru import logger
43

54
try:
@@ -14,22 +13,31 @@
1413
model_name = os.environ["model_name"]
1514
embed_model = os.environ["embed_model"]
1615
embed_model_path = os.environ["embed_model_path"]
16+
model_engine = os.environ["model_engine"]
17+
18+
try:
19+
from test_config import BgeBaseChineseEmbeddings
20+
embeddings = BgeBaseChineseEmbeddings()
21+
except:
22+
embeddings = None
1723
except Exception as e:
1824
# set your config
1925
api_key = ""
2026
api_base_url= ""
2127
model_name = ""
28+
model_engine = ""
2229
embed_model = ""
2330
embed_model_path = ""
31+
embeddings = None
2432
logger.error(f"{e}")
2533

2634
import sys, os
2735

28-
src_dir = os.path.join(
29-
os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
30-
)
31-
print(src_dir)
32-
sys.path.append(src_dir)
36+
# # test local code
37+
# src_dir = os.path.join(
38+
# os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
39+
# )
40+
# sys.path.append(src_dir)
3341
from muagent.base_configs.env_config import CB_ROOT_PATH
3442
from muagent.llm_models.llm_config import EmbedConfig, LLMConfig
3543
from muagent.connector.phase import BasePhase
@@ -151,7 +159,7 @@ def start_action_step(self, message: Message) -> Message:
151159

152160

153161
llm_config = LLMConfig(
154-
model_name="gpt-4", api_key=api_key, api_base_url=api_base_url, temperature=0.3
162+
model_name=model_name, model_engine=model_engine, api_key=api_key, api_base_url=api_base_url, temperature=0.3
155163
)
156164
embed_config = EmbedConfig(
157165
embed_engine="model", embed_model=embed_model, embed_model_path=embed_model_path

examples/muagent_examples/codeGenTest_example_copy.py renamed to examples/muagent_examples/codeGenTest_example.py

+16-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import os
2-
import json
32
from loguru import logger
43

54
try:
@@ -14,15 +13,30 @@
1413
model_name = os.environ["model_name"]
1514
embed_model = os.environ["embed_model"]
1615
embed_model_path = os.environ["embed_model_path"]
16+
model_engine = os.environ["model_engine"]
17+
18+
try:
19+
from test_config import BgeBaseChineseEmbeddings
20+
embeddings = BgeBaseChineseEmbeddings()
21+
except:
22+
embeddings = None
1723
except Exception as e:
1824
# set your config
1925
api_key = ""
2026
api_base_url= ""
2127
model_name = ""
28+
model_engine = ""
2229
embed_model = ""
2330
embed_model_path = ""
31+
embeddings = None
2432
logger.error(f"{e}")
2533

34+
35+
# # test local code
36+
# src_dir = os.path.join(
37+
# os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
38+
# )
39+
# sys.path.append(src_dir)
2640
from muagent.base_configs.env_config import CB_ROOT_PATH
2741
from muagent.llm_models.llm_config import EmbedConfig, LLMConfig
2842
from muagent.connector.phase import BasePhase
@@ -162,7 +176,7 @@ def start_action_step(self, message: Message) -> Message:
162176

163177

164178
llm_config = LLMConfig(
165-
model_name="gpt-4", api_key=api_key, api_base_url=api_base_url, temperature=0.3
179+
model_name=model_name, model_engine=model_engine, api_key=api_key, api_base_url=api_base_url, temperature=0.3
166180
)
167181
embed_config = EmbedConfig(
168182
embed_engine="model", embed_model=embed_model, embed_model_path=embed_model_path

examples/muagent_examples/codeReact_example.py

+17-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import os, sys, json
1+
import os
22
from loguru import logger
33

44
try:
5+
import os, sys
56
src_dir = os.path.join(
67
os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
78
)
@@ -12,16 +13,29 @@
1213
model_name = os.environ["model_name"]
1314
embed_model = os.environ["embed_model"]
1415
embed_model_path = os.environ["embed_model_path"]
16+
model_engine = os.environ["model_engine"]
17+
18+
try:
19+
from test_config import BgeBaseChineseEmbeddings
20+
embeddings = BgeBaseChineseEmbeddings()
21+
except:
22+
embeddings = None
1523
except Exception as e:
1624
# set your config
1725
api_key = ""
1826
api_base_url= ""
1927
model_name = ""
28+
model_engine = ""
2029
embed_model = ""
2130
embed_model_path = ""
31+
embeddings = None
2232
logger.error(f"{e}")
2333

24-
34+
# # test local code
35+
# src_dir = os.path.join(
36+
# os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
37+
# )
38+
# sys.path.append(src_dir)
2539
from muagent.base_configs.env_config import JUPYTER_WORK_PATH
2640
from muagent.llm_models.llm_config import EmbedConfig, LLMConfig
2741
from muagent.connector.phase import BasePhase
@@ -31,7 +45,7 @@
3145
os.environ["log_verbose"] = "0"
3246

3347
llm_config = LLMConfig(
34-
model_name=model_name, api_key=api_key, api_base_url=api_base_url, temperature=0.3
48+
model_name=model_name, model_engine=model_engine, api_key=api_key, api_base_url=api_base_url, temperature=0.3
3549
)
3650

3751
embed_config = EmbedConfig(

examples/muagent_examples/codeRetrieval_example.py

+17-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import os, sys, json
1+
import os
22
from loguru import logger
33

44
try:
5+
import os, sys
56
src_dir = os.path.join(
67
os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
78
)
@@ -12,16 +13,29 @@
1213
model_name = os.environ["model_name"]
1314
embed_model = os.environ["embed_model"]
1415
embed_model_path = os.environ["embed_model_path"]
16+
model_engine = os.environ["model_engine"]
17+
18+
try:
19+
from test_config import BgeBaseChineseEmbeddings
20+
embeddings = BgeBaseChineseEmbeddings()
21+
except:
22+
embeddings = None
1523
except Exception as e:
1624
# set your config
1725
api_key = ""
1826
api_base_url= ""
1927
model_name = ""
28+
model_engine = ""
2029
embed_model = ""
2130
embed_model_path = ""
31+
embeddings = None
2232
logger.error(f"{e}")
2333

24-
34+
# # test local code
35+
# src_dir = os.path.join(
36+
# os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
37+
# )
38+
# sys.path.append(src_dir)
2539
from muagent.llm_models.llm_config import EmbedConfig, LLMConfig
2640
from muagent.connector.agents import BaseAgent, ReactAgent, ExecutorAgent, SelectorAgent
2741
from muagent.connector.chains import BaseChain
@@ -132,7 +146,7 @@ def end_action_step(self, message: Message) -> Message:
132146

133147
#
134148
llm_config = LLMConfig(
135-
model_name=model_name, api_key=api_key, api_base_url=api_base_url, temperature=0.3
149+
model_name=model_name, model_engine=model_engine, api_key=api_key, api_base_url=api_base_url, temperature=0.3
136150
)
137151

138152
embed_config = EmbedConfig(

examples/muagent_examples/codeToolReact_example.py

+17-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import os, sys, json
1+
import os
22
from loguru import logger
33

44
try:
5+
import os, sys
56
src_dir = os.path.join(
67
os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
78
)
@@ -12,16 +13,29 @@
1213
model_name = os.environ["model_name"]
1314
embed_model = os.environ["embed_model"]
1415
embed_model_path = os.environ["embed_model_path"]
16+
model_engine = os.environ["model_engine"]
17+
18+
try:
19+
from test_config import BgeBaseChineseEmbeddings
20+
embeddings = BgeBaseChineseEmbeddings()
21+
except:
22+
embeddings = None
1523
except Exception as e:
1624
# set your config
1725
api_key = ""
1826
api_base_url= ""
1927
model_name = ""
28+
model_engine = ""
2029
embed_model = ""
2130
embed_model_path = ""
31+
embeddings = None
2232
logger.error(f"{e}")
2333

24-
34+
# # test local code
35+
# src_dir = os.path.join(
36+
# os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
37+
# )
38+
# sys.path.append(src_dir)
2539
from muagent.tools import toLangchainTools, TOOL_DICT, TOOL_SETS
2640
from muagent.llm_models.llm_config import EmbedConfig, LLMConfig
2741

@@ -38,7 +52,7 @@
3852
os.environ["log_verbose"] = "0"
3953

4054
llm_config = LLMConfig(
41-
model_name=model_name, api_key=api_key, api_base_url=api_base_url, temperature=0.3
55+
model_name=model_name, model_engine=model_engine, api_key=api_key, api_base_url=api_base_url, temperature=0.3
4256
)
4357

4458
embed_config = EmbedConfig(

0 commit comments

Comments
 (0)