zhuchaowe/qwen_agent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,048 Commits 4 Branches 0 Tags 72 MiB
bot_manager
Commit Graph

211 Commits

Author SHA1 Message Date
朱潮
2fa779e61e disable for autoload 2026-04-18 23:08:28 +08:00
朱潮
9f12a633bc 优化mcp配置 2026-04-17 11:05:16 +08:00
朱潮
393842b3f2 优化提示词 2026-04-16 17:22:27 +08:00
朱潮
8c49997ed6 dataset to datsets 2026-04-15 11:09:55 +08:00
朱潮
d4bdff64f7 Merge branch 'feature/moshui20260410-file-path-fix' into developing 2026-04-13 18:54:09 +08:00
朱潮
9825a43cad Merge branch 'feature/moshui20260410-file-path-fix' into bot_manager 2026-04-13 18:53:26 +08:00
朱潮
ccff7be046 Merge branch 'developing' into bot_manager 2026-04-11 21:02:18 +08:00
朱潮
4591163282 修复空内容重试 2026-04-11 19:15:53 +08:00
朱潮
3da3cc90e1 virtual_mode=False 2026-04-11 17:52:48 +08:00
朱潮
2964326cb8 update to deepagents 0.5.2 2026-04-11 16:23:59 +08:00
朱潮
7d22f0b34d 禁止路径穿越 2026-04-11 11:48:18 +08:00
朱潮
788bb0089f upgrade to deepagents-0_5_2 2026-04-11 11:40:43 +08:00
朱潮
d2bba9e095 update path fix 2026-04-10 17:17:03 +08:00
朱潮
d1e31953b0 merge guideline-assistant-message-error 2026-04-09 15:05:11 +08:00
朱潮
513dda8bbb 🐛 fix: 修复 GuidelineMiddleware 导致 assistant message prefill 报错 
enable_thinking 开启时，thinking 中间件将 AIMessage 追加到 messages 末尾，
导致不支持 assistant prefill 的模型返回 400 错误。
修复方式：在 AIMessage 后追加多语言 HumanMessage，确保消息以 user 结尾。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-04-09 15:02:28 +08:00
朱潮
0d18c2fc61 Merge branch 'feature/pre-memory-prompt' into bot_manager 2026-04-03 11:29:04 +08:00
朱潮
ab6b68268e Merge branch 'feature/pre-memory-prompt' into dev 2026-04-02 17:49:21 +08:00
朱潮
5eb0b7759d 🐛 fix: 修复 Mem0 连接池耗尽问题，改为操作级连接获取/释放 
每个缓存的 Mem0 实例长期持有数据库连接导致并发时连接池耗尽。
改为每次操作前从池中获取连接、操作后立即释放，并添加 Semaphore 限制并发数。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-04-02 17:46:00 +08:00
朱潮
738a904a6f merge 2026-04-02 11:25:20 +08:00
autobee-sparticle
213e541697
fix: resolve PrePrompt Hook env var crash and increase Mem0 pool size (#24) 
1. Fix "all environment values must be bytes or str" error in hook execution
   by ensuring all env values are converted to str (getattr may return None
   when attribute exists but is None). Also sanitize shell_env values.

2. Increase MEM0_POOL_SIZE default from 20 to 50 to address "connection pool
   exhausted" errors under high concurrency.

Fixes: sparticleinc/felo-mygpt#2519

Co-authored-by: zhuchao <zhuchaowe@163.com>
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-04-01 22:04:31 +09:00
朱潮
44db634cbb Merge branch 'feature/moshui20260330-schedule-job' into dev 2026-04-01 10:37:16 +08:00
朱潮
fd0fbc422d uuid2str 2026-04-01 10:27:21 +08:00
朱潮
6d6c7a92ef add voice skill 2026-04-01 10:26:17 +08:00
朱潮
dc2e8a39e3 Merge branch 'feature/moshui20260330-schedule-job' into dev 2026-03-31 20:04:49 +08:00
朱潮
41b4329b5e Merge branch 'feature/moshui20260330-schedule-job' into bot_manager 2026-03-31 14:37:28 +08:00
朱潮
c2f7148f98 增加环境变量到pre prompt 2026-03-31 14:37:20 +08:00
朱潮
9ffe408e27 Merge branch 'feature/pre-memory-prompt' into bot_manager 2026-03-30 21:53:50 +08:00
朱潮
fea6b35779 ✨ feat: 添加 PreMemoryPrompt hook 支持自定义记忆提取提示词 
通过插件 hook 机制允许自定义 Mem0 的 FACT_RETRIEVAL_PROMPT，
包含联系人关系追踪和同姓消歧等增强能力。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-03-30 20:36:35 +08:00
朱潮
2dbe16cfb9 Merge branch 'developing' into bot_manager 2026-03-24 00:12:58 +08:00
朱潮
e13405ba29 shell_env support 2026-03-24 00:12:19 +08:00
朱潮
30dc697071 realtime接口支持16khz输出 2026-03-23 10:37:17 +08:00
朱潮
4b70da5bb0 语音 2026-03-21 02:41:10 +08:00
朱潮
c27270588f 增加取消推理 2026-03-16 22:22:39 +08:00
朱潮
da1352550f 实现shell_env支持 2026-03-16 13:56:24 +08:00
朱潮
5d10ed275e Merge branch 'master' into bot_manager 2026-03-16 13:40:50 +08:00
朱潮
5a7aa06681 v2 实现shell_env支持 2026-03-16 13:39:58 +08:00
朱潮
dd6dfb7116 Merge branch 'master' into bot_manager 2026-03-16 13:32:36 +08:00
朱潮
32fd8c8656 shell_env支持 2026-03-16 13:31:59 +08:00
朱潮
f7e8680472 merge from master 2026-03-14 22:03:23 +08:00
朱潮
85cc57ce1a aupdate from_v2_request 新增 model_name、model_server、api_key 三个可选参数 2026-03-06 12:53:16 +08:00
朱潮
8264257ab6 现在 from_v2_request 的 model_name 和 model_server 优先级逻辑为： 
1. 最高优先级：generate_cfg 中的 model / model_server（需不为空且不等于 whatever）
  2. 回退：bot_config 中的值（原有逻辑）
 2026-03-06 12:47:33 +08:00
朱潮
c6641337c1 Merge branch 'master' into bot_manager 2026-03-05 15:39:59 +08:00
朱潮
b6b821c9bb bug fix 2026-03-04 14:30:44 +08:00
朱潮
f7773a93e1 Merge branch 'upgrade/deepagents-0.4.4' 2026-03-04 14:08:51 +08:00
朱潮
52d8161b0e 修改确保 max_length 永远不会是 None 2026-03-04 14:08:26 +08:00
朱潮
26905ad623 新增memory管理 2026-03-04 13:43:49 +08:00
朱潮
9215f8236d 🐛 fix: 修复 Mem0 连接池耗尽和 LLM 参数透传问题 
- mem0_manager: 添加 _cleanup_mem0_instance 方法，在缓存移除实例时显式释放数据库连接，避免等待 GC 导致连接池耗尽
- deep_assistant: 根据 model_provider 过滤不支持的参数，Anthropic 不支持 OpenAI 特有参数如 n、presence_penalty 等

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
 2026-03-04 10:11:44 +08:00
zhuchao
86b38262fa fix(memory): handle Mem0 get_all response format with results key 
Mem0's get_all() returns data in format {"results": [...]}, not a direct list.
Also, agent_id is at the top level of each memory, not in metadata.

Changes:
- Add _extract_memories_from_response() to handle both new and old response formats
- Add _check_agent_id_match() to check agent_id at both top-level and in metadata
- Update get_all_memories, delete_memory, delete_all_memories to use new helpers

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
 2026-03-02 13:28:39 +00:00
autobee-sparticle
572374b297
fix(memory): handle Mem0 get_all returning string or dict items (#11) 
Mem0's get_all() method may return a list containing either strings
(older version format) or dictionaries (newer version format). This
fix adds proper type checking to handle both cases gracefully.

- get_all_memories: Skip string items, only process dict items
- delete_memory: Add type checking before accessing dict methods
- delete_all_memories: Add type checking before accessing dict methods

Fixes: 'str' object has no attribute 'get' error

Co-authored-by: zhuchao <zhuchaowe@163.com>
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
 2026-03-02 22:02:59 +09:00
zhuchao
a1f60a7024 fix: 修复 get_all_memories 调用时 config 为 None 导致的错误 
问题：当调用 get_all_memories API 时，没有传递 config 参数，
导致 _create_mem0_instance 中的 config 为 None，
调用 config.get_custom_fact_extraction_prompt() 时抛出 AttributeError。

修复：添加 config 的空值检查，只在 config 存在时才添加 custom_fact_extraction_prompt。

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
 2026-03-02 12:39:45 +00:00
朱潮
5b29e866f2 现在 v1 和 v2 接口都支持传递额外参数了 2026-03-02 20:01:43 +08:00
朱潮
f72a53462a Merge branch 'master' of https://github.com/sparticleinc/catalog-agent 2026-03-02 16:07:10 +08:00
朱潮
81e5479094 Merge branch 'upgrade/deepagents-0.4.4' into bot_manager 2026-03-02 12:55:47 +08:00
朱潮
4a534163d5 skill.md文件长度限制解除 2026-03-02 12:55:39 +08:00
朱潮
6cb7392488 Merge branch 'upgrade/deepagents-0.4.4' into bot_manager 2026-03-02 12:17:41 +08:00
朱潮
03078a2077 移除虚拟文件夹 2026-03-02 12:17:19 +08:00
朱潮
965c5f99ae upgrade/deepagents-0.4.4 2026-03-02 02:30:23 +08:00
朱潮
61c8186b55 upgrade/deepagents-0.4.4 2026-03-02 02:27:42 +08:00
朱潮
3ce0b6a9f8 fix: update CustomSkillsMiddleware.before_agent signature 
Add missing 'config' parameter to match new SkillsMiddleware API.
 2026-03-02 01:37:30 +08:00
朱潮
a0b6e4cc7f feat: upgrade deepagents 0.4.3 and deepagents-cli 0.0.25 
- Replace ShellMiddleware with LocalShellBackend
- Update AgentMemoryMiddleware to MemoryMiddleware with new signature
- Update CustomSkillsMiddleware to use new SkillsMiddleware signature
- Add LocalContextMiddleware for local context
- Update CompositeBackend to use routing
- Update dependencies: langgraph-checkpoint-postgres to 3.0.4

Breaking Changes:
- agent/deep_assistant.py: Major refactoring to adapt to new deepagents API
  - pyproject.toml: Version bump
    - deepagents: 0.2.8 -> 0.4.3
    - deepagents-cli: 0.0.11 -> 0.0.25
  - langgraph-checkpoint-postgres: 2.0.25 -> 3.0.4 (for compatibility with langgraph-checkpoint 3.x)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
 2026-03-02 01:29:58 +08:00
autobee-sparticle
108c675c3d
feat(memory): add memory management API endpoints (#10) 
* chore: add .worktrees/ to .gitignore

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* feat(memory): add memory management API endpoints

Add new /api/v1/memory endpoints for viewing and managing user memories:
- GET /api/v1/memory - list all memories for a bot
- DELETE /api/v1/memory/{memory_id} - delete single memory
- DELETE /api/v1/memory - delete all memories for a bot

Also add delete_memory and delete_all_memories methods to Mem0Manager.

Issue: #1844

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

---------

Co-authored-by: zhuchao <zhuchaowe@163.com>
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
 2026-02-27 18:01:12 +09:00
朱潮
c257a98a37 Merge branch 'master' into bot_manager 2026-02-23 23:23:44 +08:00
朱潮
a822a2a1d1 优化空的工具调用 2026-02-23 23:23:38 +08:00
朱潮
fd5a859030 Merge branch 'master' into bot_manager 2026-02-15 18:13:07 +08:00
朱潮
f5c7d3ff9c on_tool_start 长度调整 2026-02-15 18:12:22 +08:00
朱潮
1b49c353ec Merge branch 'master' into bot_manager 2026-02-15 09:49:00 +08:00
朱潮
a493e98719 增加工具调用的日志 2026-02-15 09:48:45 +08:00
朱潮
6befae11fb Merge branch 'master' into bot_manager 2026-02-14 19:07:00 +08:00
朱潮
198bb08690 修改tool 工具日志 2026-02-14 19:06:14 +08:00
朱潮
77b9798e32 Merge branch 'master' into bot_manager 2026-02-10 22:18:48 +08:00
朱潮
2d20c7cbba update dataset_id_str 2026-02-10 22:18:30 +08:00
朱潮
4e4052874a Merge branch 'master' into bot_manager 2026-02-10 20:08:16 +08:00
朱潮
569fb3aa79 env only command enable 2026-02-10 20:07:47 +08:00
朱潮
46a3fda7f5 Merge branch 'master' into bot_manager 2026-02-10 19:00:31 +08:00
朱潮
815ad01876 add mcp dataset_ids 2026-02-10 19:00:19 +08:00
朱潮
805bd6f5d4 modify skill middleware 2026-02-10 11:53:14 +08:00
朱潮
742eaf0a1c remove robot_type 2026-02-08 00:04:39 +08:00
朱潮
b7afbd0216 Merge branch 'master' into bot_manager 2026-02-07 15:39:43 +08:00
朱潮
3ec992436c add USER_IDENTIFIER 2026-02-07 15:39:20 +08:00
朱潮
1df52ca8d0 merge from prod 2026-02-06 22:07:47 +08:00
朱潮
c7e9f305b7 feat: 实现 Claude Plugins 模式的 Hook 机制 
- 新增 agent/plugin_hook_loader.py：支持通过 .claude-plugin/plugin.json 配置 hooks 和 mcpServers
- 修改 agent/prompt_loader.py：集成 PrePrompt hooks，优先读取 skill MCP 配置
- 修改 routes/chat.py：添加 PostAgent 和 PreSave hooks
- 修改 routes/skill_manager.py：优先从 plugin.json 读取 name/description，fallback 到 SKILL.md
- 删除旧的 agent/skill_hook_loader.py
- 新增示例 skill user-context-loader，演示完整的 hooks 用法

Hook 类型：
- PrePrompt: 在 system_prompt 加载时注入内容
- PostAgent: 在 agent 执行后处理
- PreSave: 在消息保存前处理

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
 2026-02-06 20:15:54 +08:00
朱潮
e67d50b4fc rename general agent 2026-02-06 17:05:17 +08:00
朱潮
7e058e1505 Merge branch 'prod' into bot_manager 2026-02-04 17:54:42 +08:00
朱潮
525801d7f5 update summary 2026-02-04 15:31:41 +08:00
朱潮
4c70857ff6 增加bot_manager 2026-01-28 23:32:34 +08:00
朱潮
f1107ea35a 增加enable_thinking和enable_memory 2026-01-28 17:13:41 +08:00
朱潮
5134c0d8a6 添加环境变量 2026-01-25 21:46:02 +08:00
朱潮
3dc119bca8 refactor(mem0): optimize connection pool and async memory handling 
- Fix mem0 connection pool exhausted error with proper pooling
- Convert memory operations to async tasks
- Optimize docker-compose configuration
- Add skill upload functionality
- Reduce cache size for better performance
- Update dependencies

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
 2026-01-22 19:39:12 +08:00
朱潮
0922ad084a patch 2026-01-21 13:23:11 +08:00
朱潮
99755ceab5 remove settingsetting 2026-01-21 10:38:29 +08:00
朱潮
223c63047d fix(mem0): use asyncio.run() for async call in sync embed method 
在 CustomMem0Embedding.embed() 同步方法中使用 asyncio.run()
调用异步的 manager.get_model()，解决同步/异步混合调用问题。

Generated with [Claude Code](https://claude.com/claude-code)
via [Happy](https://happy.engineering)

Co-Authored-By: Claude <noreply@anthropic.com>
Co-Authored-By: Happy <yesreply@happy.engineering>
 2026-01-20 23:03:21 +08:00
朱潮
366a64283e Added memory log 2026-01-20 21:30:32 +08:00
朱潮
f694101747 refactor: migrate from Memori to Mem0 for long-term memory 
Replace Memori with Mem0 for memory management:
- Delete memori_config.py, memori_manager.py, memori_middleware.py
- Add mem0_config.py, mem0_manager.py, mem0_middleware.py
- Update environment variables (MEMORI_* -> MEM0_*)
- Integrate Mem0 with LangGraph middleware
- Add sync connection pool for Mem0 in DBPoolManager
- Move checkpoint message prep to config creation

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
 2026-01-20 21:15:30 +08:00
朱潮
4d6ee6ae0c fix: pass db_url to init_global_memori 
Add db_url property to MemoriManager that falls back to
CHECKPOINT_DB_URL setting, and pass it explicitly from
fastapi_app.py to ensure Memori can create sync connections.

This fixes the error "Either db_pool or db_url must be provided"
when recalling memories.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
 2026-01-20 08:27:34 +08:00
朱潮
456bcf50e6 refactor: move Memori initialization to fastapi_app.py 
Move init_global_memori from deep_assistant.py to fastapi_app.py
lifespan function for proper application-level initialization.

This ensures Memori is initialized once at startup and closed at
shutdown, rather than checking and potentially initializing on every
agent creation.

Changes:
- fastapi_app.py: Add Memori init/close in lifespan
- deep_assistant.py: Simplify to only get memori_manager

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
 2026-01-20 00:15:21 +08:00
朱潮
455a48409d feat: integrate Memori long-term memory system 
Add Memori (https://github.com/MemoriLabs/Memori) integration for
persistent cross-session memory capabilities in both create_agent
and create_deep_agent.

## New Files

- agent/memori_config.py: MemoriConfig dataclass for configuration
- agent/memori_manager.py: MemoriManager for connection and instance management
- agent/memori_middleware.py: MemoriMiddleware for memory recall/storage
- tests/: Unit tests for Memori components

## Modified Files

- agent/agent_config.py: Added enable_memori, memori_semantic_search_top_k, etc.
- agent/deep_assistant.py: Integrated MemoriMiddleware into init_agent()
- utils/settings.py: Added MEMORI_* environment variables
- pyproject.toml: Added memori>=3.1.0 dependency

## Features

- Semantic memory search with configurable top-k and threshold
- Multi-tenant isolation (entity_id=user, process_id=bot, session_id)
- Memory injection into system prompt
- Background asynchronous memory augmentation
- Graceful degradation when Memori is unavailable

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
 2026-01-20 00:12:43 +08:00
朱潮
af63c54778 db_pool 2026-01-19 23:39:04 +08:00
朱潮
f9ba3c8e51 添加聊天记录查询 2026-01-18 12:29:20 +08:00
朱潮
174a5e2059 deep_agent支持 checkpoint 2026-01-11 00:08:19 +08:00
朱潮
b93c40d5a5 merge 2026-01-08 23:10:09 +08:00