Merge branch 'fix-for-search-rate-limits' of https://github.com/a-holm/OpenManus into fix-for-search-rate-limits

app/tool/web_search.py

@@ -156,11 +156,6 @@ class WebSearch(BaseTool):
             if fallback in self._search_engine and fallback not in engine_order:
                 engine_order.append(fallback)
 
-        # Add any remaining engines
-        for key in self._search_engine:
-            if key not in engine_order:
-                engine_order.append(key)
-
         return engine_order
 
     @retry(

config/config.example.toml

@@ -72,9 +72,14 @@ temperature = 0.0                           # Controls randomness for vision mod
 # Maximum number of times to retry all engines when all fail. Default is 3.
 #max_retries = 3
 
-# Fallback engine order. Default is ["DuckDuckGo", "Baidu"] - will try in this order after primary engine fails.
-#fallback_engines = ["DuckDuckGo", "Baidu"]
-# Seconds to wait before retrying all engines again when they all fail due to rate limits. Default is 60.
-#retry_delay = 60
-# Maximum number of times to retry all engines when all fail. Default is 3.
-#max_retries = 3
+
+## Sandbox configuration
+#[sandbox]
+#use_sandbox = false
+#image = "python:3.12-slim"
+#work_dir = "/workspace"
+#memory_limit = "1g"  # 512m
+#cpu_limit = 2.0
+#timeout = 300
+#network_enabled = true
+>>>>>>>>> Temporary merge branch 2