Skip to content

Commit d5b752c

Browse files
committed
Merge remote-tracking branch 'upstream/main' into dev/dj_agent
2 parents 4377fe3 + 158a5e6 commit d5b752c

Some content is hidden

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

52 files changed

+4
-4303
lines changed

.pre-commit-config.yaml

Lines changed: 0 additions & 107 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,8 @@ If you'd like a feature or new type of example that doesn't exist in AgentScope
3434
### Setup
3535

3636
1. **Fork and clone** the repository
37-
2. **Install pre-commit**:
38-
```bash
39-
pip install pre-commit
40-
pre-commit install
41-
```
42-
3. **Create a branch**:
37+
38+
2. **Create a branch**:
4339
```bash
4440
git checkout -b feature/your-sample-name
4541
```
@@ -126,23 +122,6 @@ Your README.md **must** include:
126122

127123
Each example must include a standalone `requirements.txt` file listing all necessary dependencies to ensure it can be installed and run independently without relying on other examples.
128124

129-
#### Code Quality
130-
131-
We enforce the following using pre-commit hooks:
132-
133-
- **Black**: Code formatting (line length 79)
134-
- **flake8** and **pylint**: Code linting
135-
- **mypy**: Type checking
136-
137-
When writing example code:
138-
- Add clear comments and follow existing code style
139-
- Add type hints to function signatures
140-
- Keep code simple and focused on demonstrating specific features
141-
142-
Ensure all checks pass:
143-
```bash
144-
pre-commit run --all-files
145-
```
146125

147126
### Submitting Your Contribution
148127

CONTRIBUTING_zh.md

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,8 @@
3434
### 设置
3535

3636
1. **Fork 并克隆**仓库
37-
2. **安装 pre-commit**
38-
```bash
39-
pip install pre-commit
40-
pre-commit install
41-
```
42-
3. **创建分支**
37+
38+
2. **创建分支**
4339
```bash
4440
git checkout -b feature/your-sample-name
4541
```
@@ -126,24 +122,6 @@ your_sample_fullstack_runtime/
126122

127123
每个示例需包含独立的 `requirements.txt` 文件,列出所有必需的依赖项,以确保可独立安装和运行,不依赖其他示例。
128124

129-
#### 代码质量
130-
131-
我们使用 pre-commit hooks 强制执行:
132-
133-
- **Black**:代码格式化(行长度 79)
134-
- **flake8****pylint**:代码检查
135-
- **mypy**:类型检查
136-
137-
编写示例代码时:
138-
- 添加清晰的注释,遵循现有代码风格
139-
- 为函数签名添加类型提示
140-
- 保持代码简单,专注于演示特定功能
141-
142-
确保通过所有检查:
143-
```bash
144-
pre-commit run --all-files
145-
```
146-
147125
### 提交您的贡献
148126

149127
1. **提交**时使用清晰的消息:

README.md

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,7 @@ It includes **agent deployment** and **secure sandboxed tool execution**, and ca
7979
├── evaluation/
8080
│ └── ace_bench/ # Benchmarks and evaluation tools
8181
82-
├── functionality/
83-
│ ├── long_term_memory_mem0/ # Long-term memory integration
84-
│ ├── mcp/ # Memory/Context Protocol demo
85-
│ ├── plan/ # Plan with ReAct Agent
86-
│ ├── rag/ # RAG in AgentScope
87-
│ ├── session_with_sqlite/ # Persistent conversation with SQLite
88-
│ ├── stream_printing_messages/ # Streaming and printing messages
89-
│ ├── structured_output/ # Structured output parsing and validation
90-
│ ├── multiagent_concurrent/ # Concurrent multi-agent task execution
91-
│ └── meta_planner_agent/ # Planning agent with tool orchestration
92-
9382
├── data_juicer_agent/ # Data processing multi-agent system
94-
9583
├── sample_template/ # Template for new sample contributions
9684
└── README.md
9785
```
@@ -112,15 +100,6 @@ It includes **agent deployment** and **secure sandboxed tool execution**, and ca
112100
| | conversational_agents/multiagent_conversation ||| Multi-agent dialogue scenario |
113101
| | conversational_agents/multiagent_debate ||| Agents engaging in debates |
114102
| **Evaluation** | evaluation/ace_bench ||| Benchmarks with ACE Bench |
115-
| **Functionality Demos** | functionality/long_term_memory_mem0 ||| Long-term memory with mem0 support |
116-
| | functionality/mcp ||| Memory/Context Protocol demo |
117-
| | functionality/session_with_sqlite ||| Persistent context with SQLite |
118-
| | functionality/structured_output ||| Structured data extraction and validation |
119-
| | functionality/multiagent_concurrent ||| Concurrent task execution by multiple agents |
120-
| | functionality/meta_planner_agent ||| Planning agent with tool orchestration |
121-
| | functionality/plan ||| Task planning with ReAct agent |
122-
| | functionality/rag ||| Retrieval-Augmented Generation (RAG) integration |
123-
| | functionality/stream_printing_messages ||| Real-time message streaming and printing |
124103
| **Data Processing** | data_juicer_agent/ ||| Multi-agent data processing with Data-Juicer |
125104

126105
------

README_zh.md

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,7 @@ AgentScope Runtime 是一个**全面的运行时框架**,主要解决部署和
7979
├── evaluation/
8080
│ └── ace_bench/ # 基准测试与评估工具
8181
82-
├── functionality/
83-
│ ├── long_term_memory_mem0/ # 长期记忆集成
84-
│ ├── mcp/ # Memory/Context 协议演示
85-
│ ├── plan/ # ReAct Agent 任务计划
86-
│ ├── rag/ # AgentScope 中的 RAG
87-
│ ├── session_with_sqlite/ # 基于 SQLite 的持久对话
88-
│ ├── stream_printing_messages/ # 信息流式输出与打印
89-
│ ├── structured_output/ # 结构化输出解析与验证
90-
│ ├── multiagent_concurrent/ # 多 Agent 并发任务执行
91-
│ └── meta_planner_agent/ # 带工具编排的计划 Agent
92-
9382
├── data_juicer_agent/ # 数据处理多智能体系统
94-
9583
├── sample_template/ # 新样例贡献模板
9684
└── README.md
9785
```
@@ -112,15 +100,6 @@ AgentScope Runtime 是一个**全面的运行时框架**,主要解决部署和
112100
| | conversational_agents/multiagent_conversation ||| 多 Agent 对话场景 |
113101
| | conversational_agents/multiagent_debate ||| Agent 辩论 |
114102
| **评估** | evaluation/ace_bench ||| ACE Bench 基准测试 |
115-
| **功能演示** | functionality/long_term_memory_mem0 ||| 长期记忆(mem0 支持) |
116-
| | functionality/mcp ||| Memory/Context 协议 Demo |
117-
| | functionality/session_with_sqlite ||| 基于 SQLite 的持久上下文 |
118-
| | functionality/structured_output ||| 结构化数据提取与验证 |
119-
| | functionality/multiagent_concurrent ||| 多 Agent 并发任务执行 |
120-
| | functionality/meta_planner_agent ||| 带工具编排的计划 Agent |
121-
| | functionality/plan ||| 使用 ReAct Agent 规划任务 |
122-
| | functionality/rag ||| 检索增强生成 (RAG) 集成 |
123-
| | functionality/stream_printing_messages ||| 实时信息流输出与打印 |
124103
| **数据处理** | data_juicer_agent/ ||| 基于 Data-Juicer 的多智能体数据处理 |
125104

126105
---

0 commit comments

Comments
 (0)