Commit Graph

37 Commits

Author SHA1 Message Date
Yizhou f65bd9bbf5 1. support multiple mcp servers
2. allow manus agent to connect to mcp servers whilst keeping the local tool set
3. include automatic mcp config loading
2025-04-14 12:18:04 +08:00
liangxinbing 2d4116d98d update config.example-model-*.toml 2025-03-30 23:57:03 +08:00
liangxinbing 55015797c6 Add type hint for WebSearch and update SearchSettings 2025-03-30 14:04:34 +08:00
liangxinbing 782687f3b7 update WebSearch Tool 2025-03-30 00:30:01 +08:00
mannaandpoem b17e451d86 Merge pull request #810 from a-holm/separate-config-examples
Separate config file examples for each LLM API provider
2025-03-30 00:08:51 +08:00
zhiyuanren e10aa08013 Update the MCP configuration, replace the hardcoding value with server_reference in config, and add the MCPSettings class in config.py to support MCP configuration. 2025-03-28 10:19:23 +08:00
leeseett 3dd990e554 删除合并冲突提示代码 2025-03-21 11:49:26 +08:00
mannaandpoem d63e88f089 Merge pull request #772 from a-holm/fix-for-search-rate-limits
feat(search): Add configurable fallback engines and retry logic for robust web search
2025-03-21 01:56:21 +08:00
Array 2a13cb49f3 feat: modular non-intrusive Amazon Bedrock support, add config example 2025-03-20 12:25:53 +08:00
Johan Holm baf439f6c3 Merge branch 'main' of https://github.com/a-holm/OpenManus into separate-config-examples 2025-03-19 11:02:42 +01:00
a-holm 855caad4d9 Merge branch 'fix-for-search-rate-limits' of https://github.com/a-holm/OpenManus into fix-for-search-rate-limits 2025-03-18 21:53:34 +01:00
a-holm 95e3487402 Merge branch 'main' of https://github.com/a-holm/OpenManus into fix-for-search-rate-limits 2025-03-18 21:47:16 +01:00
Johan A. Holm fe44fe726d Merge branch 'main' into fix-for-search-rate-limits 2025-03-18 20:51:45 +01:00
Johan Holm ba05d625fd fix spelling error 2025-03-18 11:32:50 +01:00
seeker 1204d841ae fix: fix bug 2025-03-18 17:56:29 +08:00
seeker 4df605e8db Merge remote-tracking branch 'upstream/main' into sandbox 2025-03-18 17:24:57 +08:00
Johan Holm 19b24cbdf7 Separate files for each type provider 2025-03-18 09:24:51 +01:00
Johan Holm 711c2805e4 feat(search): Add robust fallback system with configurable retries and enhanced error handling
- Implement multi-engine failover system with configurable fallback order
    - Add retry logic with exponential backoff and rate limit detection
    - Introduce search configuration options:
      * fallback_engines: Ordered list of backup search providers
      * retry_delay: Seconds between retry batches (default: 60)
      * max_retries: Maximum system-wide retry attempts (default: 3)
    - Improve error resilience with:
      - Automatic engine switching on 429/Too Many Requests
      - Full system retries after configurable cooldown periods
      - Detailed logging for diagnostics and monitoring
    - Enhance engine prioritization logic:
      1. Primary configured engine
      2. Configured fallback engines
      3. Remaining available engines

    Example configuration:
    [search]
    engine = "Google"
    fallback_engines = ["DuckDuckGo", "Baidu"]  # Cascading fallback order
    retry_delay = 60                            # 1 minute between retry batches
    max_retries = 3                             # Attempt 3 full system retries

    This addresses critical reliability issues by:
    - Preventing search failures due to single-engine rate limits
    - Enabling recovery from transient network errors
    - Providing operational flexibility through configurable parameters
    - Improving visibility through granular logging (INFO/WARN/ERROR)
2025-03-17 10:43:42 +01:00
liangxinbing 114bd46720 update config.example.toml and format file_saver.py 2025-03-17 00:04:17 +08:00
liangxinbing 5e35f01ea8 format code 2025-03-16 12:57:06 +08:00
Sheng Fan 07655aacce Merge branch 'main' into main 2025-03-15 17:05:05 +08:00
mannaandpoem d35cd5ccf0 Merge pull request #573 from nezhazheng/main
Use the max_input_tokens configuration to constrain the agent’s token usage.
2025-03-15 14:11:19 +08:00
Sheng Fan b6f8f825e0 chore: ensure TOML configuration files are formatted well 2025-03-15 12:58:18 +08:00
the0807 7a5de55615 Add config support for Ollama 2025-03-14 14:02:32 +09:00
zhengshuli 9b0b69a5e1 Use the max_input_tokens configuration to constrain the agent’s token usage. 2025-03-14 12:35:26 +08:00
liangxinbing 9c7834eff2 update readme; format code; update config.example.toml 2025-03-14 12:20:59 +08:00
Kingtous 198f70d524 opt: update config.example.json 2025-03-13 09:11:20 +08:00
Kingtous bbaff4f095 feat: add baidu search tool and optional config 2025-03-13 00:27:48 +08:00
zhengshuli 3cb4489cd5 Support configuring all BrowserConfig parameters within browser-use. 2025-03-12 17:57:43 +08:00
liangxinbing dc28e9187b adjust code format 2025-03-08 15:54:23 +08:00
Aria F d9e6e9a8e5 #refactor: Update config.example.toml with blur AZURE_OPENAI 2025-03-07 21:00:22 +08:00
Aria F ecac3382ec # feat: AzureOpenaiAPI support 2025-03-07 20:55:02 +08:00
seeker 15024e320a add: Added a sandbox for executing commands within docker containers 2025-03-07 18:47:53 +08:00
xiangjinyu b5c1b9ed88 modify config 2025-03-07 01:14:09 +08:00
xiangjinyu f841c50108 modify config 2025-03-07 01:11:27 +08:00
liangxinbing bd74238235 update README.md and config.example.toml 2025-03-06 23:29:53 +08:00
liangxinbing d028e64a98 init project 2025-03-06 22:57:07 +08:00