beswarm 0.2.29__py3-none-any.whl → 0.2.31__py3-none-any.whl

beswarm/aient/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="aient",
-    version="1.1.47",
+    version="1.1.48",
     description="Aient: The Awakening of Agent.",
     long_description=Path.open(Path("README.md"), encoding="utf-8").read(),
     long_description_content_type="text/markdown",

beswarm/aient/src/aient/core/response.py

@@ -247,7 +247,7 @@ async def fetch_gpt_response_stream(client, url, headers, payload):
             while "\n" in buffer:
                 line, buffer = buffer.split("\n", 1)
                 # logger.info("line: %s", repr(line))
-                if line and not line.startswith(": ") and (result:=line.lstrip("data: ").strip()):
+                if line and not line.startswith(":") and (result:=line.lstrip("data: ").strip()):
                     if result.strip() == "[DONE]":
                         break
                     line = json.loads(result)
@@ -361,7 +361,7 @@ async def fetch_azure_response_stream(client, url, headers, payload):
             while "\n" in buffer:
                 line, buffer = buffer.split("\n", 1)
                 # logger.info("line: %s", repr(line))
-                if line and not line.startswith(": ") and (result:=line.lstrip("data: ").strip()):
+                if line and not line.startswith(":") and (result:=line.lstrip("data: ").strip()):
                     if result.strip() == "[DONE]":
                         break
                     line = json.loads(result)

beswarm/tools/search_web.py

@@ -34,19 +34,21 @@ async def search_web(query: str):
 
     api_url = "https://scraperapi.thordata.com/request"
     headers = {
-        "Content-Type": "application/json",
+        "Content-Type": "application/x-www-form-urlencoded",
         "Authorization": f"Bearer {api_key}"  # 请注意：硬编码的 API 密钥
     }
     payload = {
-        "url": f"https://www.google.com/search?q={quote_plus(query)}"
+        "engine": "google",
+        "q": query,
+        "json": "1",
     }
     results = []
 
     try:
         async with httpx.AsyncClient() as client:
-            response = await client.post(api_url, headers=headers, json=payload)
+            response = await client.post(api_url, headers=headers, data=payload)
             response.raise_for_status()  # 如果状态码是 4xx 或 5xx，则引发 HTTPStatusError
-            results = response.json()
+            results = json.loads(response.json())
     except httpx.HTTPStatusError as e:
         return {
             "error": f"HTTP error occurred: {e.response.status_code} - {e.response.text}",
@@ -78,8 +80,8 @@ async def search_web(query: str):
         raise Exception(f"Error fetching search results for '{query}':")
     else:
         # print(f"Search results for '{query}':")
-        html_content = results.get("html", "")
-        # print(html_content)
+        html_content = results
+        # print(json.dumps(results, indent=2, ensure_ascii=False))
         if "Your search did not match any documents" in html_content:
             return "Your search did not match any documents"
         if html_content:
@@ -90,7 +92,8 @@ async def search_web(query: str):
 
             # 1. 初步提取潜在的 URL 字符串
             #    使用更宽容的正则，允许末尾有非URL字符，后续清理
-            candidate_urls = re.findall(r'https?://[^\s"]+|www\.[^\s"]+', html_content)
+            # candidate_urls = re.findall(r'https?://[^\s"]+|www\.[^\s"]+', html_content)
+            candidate_urls = [url["link"] for url in html_content.get("organic", [])]
 
             processed_urls = []
             for url_str in candidate_urls:
@@ -361,7 +364,7 @@ if __name__ == '__main__':
         # search_query = "美国"
         # search_query = "machine learning models for higher heating value prediction using proximate vs ultimate analysis"
         # search_query = "patent driver cognitive load monitoring micro-expression thermal imaging fusion"
-        search_query = "patent predictive driver fatigue warning V2X data fusion driving behavior sequence"
+        search_query = "Self-supervised learning for seismology"
         print(f"Performing web search for: '{search_query}'")
         results = await search_web(search_query)  # results is a list of URLs
 

beswarm/tools/worker.py

@@ -169,7 +169,8 @@ async def worker(goal, tools, work_dir, cache_messages=None):
             print("\n🤖 指令智能体生成的下一步指令:", next_instruction)
             if "fetch_gpt_response_stream HTTP Error', 'status_code': 404" in next_instruction:
                 raise Exception(f"Model: {instruction_agent_config['engine']} not found!")
-            if "'status_code': 413" in next_instruction:
+            if "'status_code': 413" in next_instruction or \
+            "'status_code': 400" in next_instruction:
                 end_time = datetime.now()
                 total_time = end_time - start_time
                 print(f"\n任务开始时间: {start_time.strftime('%Y-%m-%d %H:%M:%S')}")
@@ -378,7 +379,8 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
             print("\n🤖 指令智能体生成的下一步指令:", next_instruction)
             if "fetch_gpt_response_stream HTTP Error', 'status_code': 404" in next_instruction:
                 raise Exception(f"Model: {instruction_agent_config['engine']} not found!")
-            if "'status_code': 413" in next_instruction:
+            if "'status_code': 413" in next_instruction or \
+            "'status_code': 400" in next_instruction:
                 end_time = datetime.now()
                 total_time = end_time - start_time
                 print(f"\n任务开始时间: {start_time.strftime('%Y-%m-%d %H:%M:%S')}")

{beswarm-0.2.29.dist-info → beswarm-0.2.31.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beswarm
-Version: 0.2.29
+Version: 0.2.31
 Summary: MAS
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{beswarm-0.2.29.dist-info → beswarm-0.2.31.dist-info}/RECORD

@@ -2,13 +2,13 @@ beswarm/__init__.py,sha256=HZjUOJtZR5QhMuDbq-wukQQn1VrBusNWai_ysGo-VVI,20
 beswarm/prompt.py,sha256=5JMfOuXWHscsaeDzwBn223mj9N85eAQdOHXQZk7zeWE,32238
 beswarm/utils.py,sha256=xxbNifOPlfcVkKmF_qFzuEnZgF3MQg3mnOfz1EF0Qss,6697
 beswarm/aient/main.py,sha256=SiYAIgQlLJqYusnTVEJOx1WNkSJKMImhgn5aWjfroxg,3814
-beswarm/aient/setup.py,sha256=mDFzdO4betWxiHRtK2bR9z4ahWthoYip79BFKMMGvFo,487
+beswarm/aient/setup.py,sha256=_e0YH917y7yY1zW87YGgOuTrDGvx8zE1gSxnUswn4nQ,487
 beswarm/aient/src/aient/__init__.py,sha256=SRfF7oDVlOOAi6nGKiJIUK6B_arqYLO9iSMp-2IZZps,21
 beswarm/aient/src/aient/core/__init__.py,sha256=NxjebTlku35S4Dzr16rdSqSTWUvvwEeACe8KvHJnjPg,34
 beswarm/aient/src/aient/core/log_config.py,sha256=kz2_yJv1p-o3lUQOwA3qh-LSc3wMHv13iCQclw44W9c,274
 beswarm/aient/src/aient/core/models.py,sha256=d4MISNezTSe0ls0-fjuToI2SoT-sk5fWqAJuKVinIlo,7502
 beswarm/aient/src/aient/core/request.py,sha256=8HlSFaBhWMs5thhL4C5qj-hvuDZWUXCYWwVShFR99QU,72263
-beswarm/aient/src/aient/core/response.py,sha256=xSOmc4aBFeoT-Cx42B6GrRvsxalx-dOiGdjN1WByyXs,35673
+beswarm/aient/src/aient/core/response.py,sha256=-28HYKuzgfC1y7VOrYLk75_QH5yh6c1IS024yoQM0mg,35671
 beswarm/aient/src/aient/core/utils.py,sha256=NcXdb8zBN0GE01OGaUzg8U34RaraoFf2MaLDDGFvvC4,27492
 beswarm/aient/src/aient/core/test/test_base_api.py,sha256=pWnycRJbuPSXKKU9AQjWrMAX1wiLC_014Qc9hh5C2Pw,524
 beswarm/aient/src/aient/core/test/test_geminimask.py,sha256=HFX8jDbNg_FjjgPNxfYaR-0-roUrOO-ND-FVsuxSoiw,13254
@@ -134,10 +134,10 @@ beswarm/tools/repomap.py,sha256=YsTPq5MXfn_Ds5begcvHDnY_Xp2d4jH-xmWqNMHnNHY,4523
 beswarm/tools/request_input.py,sha256=gXNAJPOJektMqxJVyzNTFOeMQ7xUkO-wWMYH-r2Rdwk,942
 beswarm/tools/screenshot.py,sha256=u6t8FCgW5YHJ_Oc4coo8e0F3wTusWE_-H8dFh1rBq9Q,1011
 beswarm/tools/search_arxiv.py,sha256=caVIUOzMhFu-r_gVgJZrH2EO9xI5iV_qLAg0b3Ie9Xg,8095
-beswarm/tools/search_web.py,sha256=XkKb2_Snm4-bIOrkMhsyxao0-VPsYmfM2CKQbJ5TGFI,16101
+beswarm/tools/search_web.py,sha256=ybbdbJq80plooXLMiyjAMOSCEyZJ0hquGUpabBhfFx0,16195
 beswarm/tools/taskmanager.py,sha256=rVLB0xwteT-5y9svmJ68K65U3JuX9BJGvqNzyxPvjaI,12178
-beswarm/tools/worker.py,sha256=JZAdsH-wKc-GfYXK95g-9bwzuDqgsXd4T_ple14Cjhc,23423
-beswarm-0.2.29.dist-info/METADATA,sha256=wNmSeJgEmOid51QhcVVj0AzMIoBx6zy5SZMEvHW0CC0,3847
-beswarm-0.2.29.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.2.29.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.2.29.dist-info/RECORD,,
+beswarm/tools/worker.py,sha256=s6tN4JhA07qzTlP7xWiB0MjnBIJ6XSrtlJTA_RqG1_A,23539
+beswarm-0.2.31.dist-info/METADATA,sha256=F5sShEmQQKo5WI3xjLjlxnq-epXXZDR9C_k7Je8nDWY,3847
+beswarm-0.2.31.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.2.31.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.2.31.dist-info/RECORD,,