beswarm 0.2.32__py3-none-any.whl → 0.2.33__py3-none-any.whl

beswarm/aient/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="aient",
-    version="1.1.49",
+    version="1.1.51",
     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/request.py

@@ -239,26 +239,50 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
             ]
 
     if "gemini-2.5" in original_model:
-        payload["generationConfig"]["thinkingConfig"] = {
-            "includeThoughts": True,
-        }
+        generation_config = payload.get("generationConfig", {})
         # 从请求模型名中检测思考预算设置
         m = re.match(r".*-think-(-?\d+)", request.model)
         if m:
             try:
                 val = int(m.group(1))
-                if val > 32768 and "gemini-2.5-pro" in original_model:
-                    val = 32768
-                elif val < 128 and "gemini-2.5-pro" in original_model:
-                    val = 128
-                elif val <= 0:
-                    val = 0
-                elif val > 24576:
-                    val = 24576
-                payload["generationConfig"]["thinkingConfig"]["thinkingBudget"] = val
+                budget = None
+                # gemini-2.5-pro: [128, 32768]
+                if "gemini-2.5-pro" in original_model:
+                    if val < 128:
+                        budget = 128
+                    elif val > 32768:
+                        budget = 32768
+                    else: # 128 <= val <= 32768
+                        budget = val
+                
+                # gemini-2.5-flash-lite: [0] or [512, 24576]
+                elif "gemini-2.5-flash-lite" in original_model:
+                    if val > 0 and val < 512:
+                        budget = 512
+                    elif val > 24576:
+                        budget = 24576
+                    else: # Includes 0 and valid range, and clamps invalid negatives
+                        budget = val if val >= 0 else 0
+
+                # gemini-2.5-flash (and other gemini-2.5 models as a fallback): [0, 24576]
+                else:
+                    if val > 24576:
+                        budget = 24576
+                    else: # Includes 0 and valid range, and clamps invalid negatives
+                        budget = val if val >= 0 else 0
+                
+                payload["generationConfig"]["thinkingConfig"] = {
+                    "includeThoughts": True,
+                    "thinkingBudget": budget
+                }
             except ValueError:
                 # 如果转换为整数失败，忽略思考预算设置
                 pass
+        else:
+            payload["generationConfig"]["thinkingConfig"] = {
+                "includeThoughts": True,
+            }
+        payload["generationConfig"] = generation_config
 
     # # 检测search标签
     # if request.model.endswith("-search"):
@@ -535,26 +559,48 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
             payload["generationConfig"]["max_output_tokens"] = 8192
 
     if "gemini-2.5" in original_model:
-        payload["generationConfig"]["thinkingConfig"] = {
-            "includeThoughts": True,
-        }
         # 从请求模型名中检测思考预算设置
         m = re.match(r".*-think-(-?\d+)", request.model)
         if m:
             try:
                 val = int(m.group(1))
-                if val > 32768 and "gemini-2.5-pro" in original_model:
-                    val = 32768
-                elif val < 128 and "gemini-2.5-pro" in original_model:
-                    val = 128
-                elif val <= 0:
-                    val = 0
-                elif val > 24576:
-                    val = 24576
-                payload["generationConfig"]["thinkingConfig"]["thinkingBudget"] = val
+                budget = None
+                # gemini-2.5-pro: [128, 32768]
+                if "gemini-2.5-pro" in original_model:
+                    if val < 128:
+                        budget = 128
+                    elif val > 32768:
+                        budget = 32768
+                    else: # 128 <= val <= 32768
+                        budget = val
+                
+                # gemini-2.5-flash-lite: [0] or [512, 24576]
+                elif "gemini-2.5-flash-lite" in original_model:
+                    if val > 0 and val < 512:
+                        budget = 512
+                    elif val > 24576:
+                        budget = 24576
+                    else: # Includes 0 and valid range, and clamps invalid negatives
+                        budget = val if val >= 0 else 0
+
+                # gemini-2.5-flash (and other gemini-2.5 models as a fallback): [0, 24576]
+                else:
+                    if val > 24576:
+                        budget = 24576
+                    else: # Includes 0 and valid range, and clamps invalid negatives
+                        budget = val if val >= 0 else 0
+                
+                payload["generationConfig"]["thinkingConfig"] = {
+                    "includeThoughts": True,
+                    "thinkingBudget": budget
+                }
             except ValueError:
                 # 如果转换为整数失败，忽略思考预算设置
                 pass
+        else:
+            payload["generationConfig"]["thinkingConfig"] = {
+                "includeThoughts": True,
+            }
 
     # if request.model.endswith("-search"):
     #     payload["tools"] = [search_tool]

beswarm/aient/src/aient/plugins/websearch.py

@@ -44,6 +44,8 @@ def url_to_markdown(url):
                 body = body[0]
                 body = Cleaner(javascript=True, style=True).clean_html(body)
                 return ''.join(lxml.html.tostring(c, encoding='unicode') for c in body)
+        except ImportError as e:
+            raise e
         except Exception as e:
             # print('\033[31m')
             # print("error: url_to_markdown url", url)

{beswarm-0.2.32.dist-info → beswarm-0.2.33.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beswarm
-Version: 0.2.32
+Version: 0.2.33
 Summary: MAS
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -21,6 +21,7 @@ Requires-Dist: pyautogui>=0.9.54
 Requires-Dist: pygments>=2.19.1
 Requires-Dist: pyperclip>=1.9.0
 Requires-Dist: pytz>=2025.2
+Requires-Dist: reaktiv>=0.15.1
 Requires-Dist: requests>=2.32.3
 Requires-Dist: scipy>=1.15.3
 Requires-Dist: tqdm>=4.67.1

{beswarm-0.2.32.dist-info → beswarm-0.2.33.dist-info}/RECORD

@@ -2,12 +2,12 @@ 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=6ISxC2o5gga4VEcbWm8MMAmzPvTEM5igOGY2s64ekI0,487
+beswarm/aient/setup.py,sha256=MglF5g_LQLmX62ZgR1FmQUZanljhQx2EwLPPJjT4zac,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/request.py,sha256=7KpHHDyu0t2g4IQGqlV_UxK0zAAjN_-CZpyd7S5pxS0,74263
 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
@@ -35,7 +35,7 @@ beswarm/aient/src/aient/plugins/read_image.py,sha256=4FbIiMNVFUQpNyiH5ApGSRvOD9u
 beswarm/aient/src/aient/plugins/readonly.py,sha256=qK5-kBM3NDH1b-otFxFHpAjV5BXEY_e7cTWBcpP7G5k,710
 beswarm/aient/src/aient/plugins/registry.py,sha256=YknzhieU_8nQ3oKlUSSWDB4X7t2Jx0JnqT2Jd9Xsvfk,3574
 beswarm/aient/src/aient/plugins/run_python.py,sha256=MohvdtZUTDLrHBDtJ9L2_Qu1pWAGrkbzsGmmn5tMN20,4614
-beswarm/aient/src/aient/plugins/websearch.py,sha256=LPS5NmHrY-Rc0FCPlhHrUWE90XJmXF_AvShLHTV_Zqc,15285
+beswarm/aient/src/aient/plugins/websearch.py,sha256=9yImBa1s5V7Djqzx6L4naDyIsGIcf_js1LOyLX0aNHw,15338
 beswarm/aient/src/aient/plugins/write_file.py,sha256=hExFLuoNPtjYxJI3pVbofZRpokvUabpXdEkd3mZJPPc,3778
 beswarm/aient/src/aient/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 beswarm/aient/src/aient/utils/prompt.py,sha256=UcSzKkFE4-h_1b6NofI6xgk3GoleqALRKY8VBaXLjmI,11311
@@ -137,7 +137,7 @@ beswarm/tools/search_arxiv.py,sha256=caVIUOzMhFu-r_gVgJZrH2EO9xI5iV_qLAg0b3Ie9Xg
 beswarm/tools/search_web.py,sha256=ybbdbJq80plooXLMiyjAMOSCEyZJ0hquGUpabBhfFx0,16195
 beswarm/tools/taskmanager.py,sha256=rVLB0xwteT-5y9svmJ68K65U3JuX9BJGvqNzyxPvjaI,12178
 beswarm/tools/worker.py,sha256=s6tN4JhA07qzTlP7xWiB0MjnBIJ6XSrtlJTA_RqG1_A,23539
-beswarm-0.2.32.dist-info/METADATA,sha256=DGsrqStEuzb_l0WqyPlwA0xd6aziMKtShM1YmkpC6pQ,3847
-beswarm-0.2.32.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.2.32.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.2.32.dist-info/RECORD,,
+beswarm-0.2.33.dist-info/METADATA,sha256=76JECSt37iGRe_rmvWVqtcXfVcdL_iTfwtktCfnHKyY,3878
+beswarm-0.2.33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.2.33.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.2.33.dist-info/RECORD,,