barian0517/OpenManus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
269 Commits 12 Branches 0 Tags
Commit Graph

96 Commits

Author SHA1 Message Date
Johan A. Holm
fe44fe726d
Merge branch 'main' into fix-for-search-rate-limits 2025-03-18 20:51:45 +01:00
mannaandpoem
f518fc59b7
Merge pull request #623 from zyren123/main 
print the token used information
 2025-03-18 23:23:26 +08:00
liangxinbing
421e962258 add workspace_root for Config and update Manus 2025-03-18 23:00:13 +08:00
liangxinbing
dc42bd525a add BrowserAgent and update Manus 2025-03-18 22:51:27 +08:00
liangxinbing
99f1f054e4 change python:3.10 to python:3.12 for docker image 2025-03-18 20:52:42 +08: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
c7858c2eb4 Make sure to only include fallback search engines 2025-03-18 09:53:30 +01:00
xiangjinyu
2e661d486d modify manus prompt and directory 2025-03-18 14:56:05 +08:00
xiangjinyu
cc550af04b edit str_replace_editor.py 2025-03-18 14:25:23 +08:00
zyren123
f474290395
Merge branch 'mannaandpoem:main' into main 2025-03-18 09:46:10 +08:00
Sheng Fan
7703ea2cf7
Merge pull request #775 from fred913/main 2025-03-18 08:27:05 +08:00
liangxinbing
2509bc30c4 update ToolCallAgent and Manus 2025-03-18 02:39:11 +08:00
liangxinbing
c3203e7fa3 update BrowserUseTool 2025-03-18 02:38:56 +08:00
liangxinbing
91d14a3a47 update llm, schema, BaseTool and BaseAgent 2025-03-18 02:31:39 +08:00
liangxinbing
5cf34f82df remove WebSearch tool for Manus 2025-03-17 23:51:16 +08:00
liangxinbing
9bdd820105 update BrowserUseTool 2025-03-17 23:50:42 +08:00
zhiyuanRen
11d1bd7729 format change for precommit purpose 2025-03-17 21:39:36 +08:00
zhiyuanRen
6dcd2ca064 fix: replace chinese comment with english version 2025-03-17 21:36:04 +08:00
liangxinbing
fb0d1c02a6 add TokenCounter and ask_with_images 2025-03-17 21:30:04 +08:00
xiangjinyu
50ab26880e add get_current_state description 2025-03-17 20:18:10 +08:00
Sheng Fan
3fa14d0066 chore(app.__init__): add Python version check for 3.11-3.13 2025-03-17 20:10:50 +08:00
Johan Holm
9fa12e594c update from pre-commit 2025-03-17 11:05:03 +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
Cyzus
9bc267cef3 refine help text 2025-03-17 15:44:50 +08:00
Yizhou Chi
cc1abe630c fix click 2025-03-17 15:22:50 +08:00
liangxinbing
114bd46720 update config.example.toml and format file_saver.py 2025-03-17 00:04:17 +08:00
zhiyuanRen
10ecc91e5e print the token usage of each step's prompt and completion, as well as the cumulative total consumption up to now, which is useful for analyzing resource usage. 2025-03-16 21:47:46 +08:00
mannaandpoem
0d4cedd51d
Merge pull request #50 from obiscr/wuzi/generated-files 
place the generated file in the workspace directory
 2025-03-16 18:57:53 +08:00
liangxinbing
5e35f01ea8 format code 2025-03-16 12:57:06 +08:00
mannaandpoem
337adf011c
Merge pull request #635 from a-holm/avoid-Validation-error-when-using-gemini 
fix(llm): improve message handling to support LLMs without content/tool_calls
 2025-03-15 17:11:19 +08:00
mannaandpoem
5641c9bf8a
Merge pull request #598 from ca-ke/refactor/web-search-tool 
refactor(web_search): enhance web search functionality with engine fallback
 2025-03-15 17:06:32 +08:00
a-holm
60268f1696 reformat with precommit 2025-03-15 09:48:52 +01:00
liangxinbing
65a3898592 format code and remove max_input_tokens for ToolCallAgent 2025-03-15 14:43:07 +08:00
mannaandpoem
3bb8f8fe71
Merge pull request #642 from matengm1/bug/fix-temperature-defaulting 
Fix temperature using default if 0
 2025-03-15 14:16:46 +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
Matt Eng
49ccd72815 Reformat 2025-03-14 21:41:43 -07:00
Matt Eng
b17c9d31a9 Fix temperature using default if 0 2025-03-14 20:39:23 -07:00
a-holm
350b0038ee fix(llm): improve message handling to support LLMs without content/tool_calls 
This commit improves the message handling in the LLM class to gracefully handle
messages without 'content' or 'tool_calls' fields. Previously, the system would
raise a ValueError when encountering such messages, causing crashes when working
with models like Google's Gemini that sometimes return messages with different
structures.

Key changes:
- Reordered message processing to check for Message objects first
- Changed validation approach to silently skip malformed messages instead of crashing
- Removed the strict ValueError when content/tool_calls are missing

This change maintains compatibility with correctly formatted messages while
improving robustness when working with various LLM providers.
 2025-03-14 21:01:13 +01:00
Caique Minhare [Cake]
6ea5a4d1ef
Merge branch 'main' into refactor/web-search-tool 2025-03-14 15:04:55 -03:00
xiangjinyu
c0c03c0bef fix _handle_special_tool bug 2025-03-14 13:25:43 +08: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
mannaandpoem
e844dfca34
Merge pull request #510 from the0807/feature/o3-mini 
Support OpenAI Reasoning Models (o1, o3-mini)
 2025-03-14 11:47:34 +08:00
xRay
89c9d904db 将工具选择从 ToolChoice.REQUIRED 更新为 ToolChoice.AUTO，以优化规划代理和规划流程的工具调用逻辑。 2025-03-14 09:46:46 +08:00
ca-ke
cba275d405 refactor: enhance web search functionality with engine fallback and retry mechanism 2025-03-13 14:17:57 -03:00
Isaac
be5c2646af
Merge pull request #543 from aacedar/thread_safe 
update python_execute thread safe
 2025-03-13 21:15:17 +08:00
Kingtous
2b9ef4ea08 fix: perform search on query 2025-03-13 09:10:14 +08:00
Kingtous
86d2a7d6bf feat: implement duckduckgo search, abstract further 2025-03-13 09:05:14 +08:00
Kingtous
b7774b18ef opt: abstract web search interface, code cleanup 2025-03-13 08:31:40 +08:00