beswarm 0.2.28__tar.gz → 0.2.30__tar.gz

{beswarm-0.2.28 → beswarm-0.2.30}/PKG-INFO

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

{beswarm-0.2.28 → beswarm-0.2.30}/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-0.2.28 → beswarm-0.2.30}/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-0.2.28 → beswarm-0.2.30}/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 = "lithium-ion battery remaining useful life prediction machine learning"
         print(f"Performing web search for: '{search_query}'")
         results = await search_web(search_query)  # results is a list of URLs
 

{beswarm-0.2.28 → beswarm-0.2.30}/beswarm/tools/worker.py

@@ -79,7 +79,7 @@ async def worker(goal, tools, work_dir, cache_messages=None):
     work_agent_config = {
         "api_key": os.getenv("API_KEY"),
         "api_url": os.getenv("BASE_URL"),
-        "engine": os.getenv("MODEL"),
+        "engine": os.getenv("FAST_MODEL") or os.getenv("MODEL"),
         "system_prompt": work_agent_system_prompt,
         "print_log": True,
         # "max_tokens": 8000,
@@ -288,7 +288,7 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
     work_agent_config = {
         "api_key": os.getenv("API_KEY"),
         "api_url": os.getenv("BASE_URL"),
-        "engine": os.getenv("MODEL"),
+        "engine": os.getenv("FAST_MODEL") or os.getenv("MODEL"),
         "system_prompt": work_agent_system_prompt,
         "print_log": True,
         # "max_tokens": 8000,

{beswarm-0.2.28 → beswarm-0.2.30}/beswarm.egg-info/PKG-INFO

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

{beswarm-0.2.28 → beswarm-0.2.30}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "beswarm"
-version = "0.2.28"
+version = "0.2.30"
 description = "MAS"
 readme = "README.md"
 requires-python = ">=3.11"