beswarm 0.2.32__tar.gz → 0.2.33__tar.gz

{beswarm-0.2.32 → beswarm-0.2.33}/PKG-INFO

@@ -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 → beswarm-0.2.33}/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-0.2.32 → beswarm-0.2.33}/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-0.2.32 → beswarm-0.2.33}/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 → beswarm-0.2.33}/beswarm.egg-info/PKG-INFO

@@ -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 → beswarm-0.2.33}/beswarm.egg-info/requires.txt

@@ -15,6 +15,7 @@ pyautogui>=0.9.54
 pygments>=2.19.1
 pyperclip>=1.9.0
 pytz>=2025.2
+reaktiv>=0.15.1
 requests>=2.32.3
 scipy>=1.15.3
 tqdm>=4.67.1

{beswarm-0.2.32 → beswarm-0.2.33}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "beswarm"
-version = "0.2.32"
+version = "0.2.33"
 description = "MAS"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -22,6 +22,7 @@ dependencies = [
     "pygments>=2.19.1",
     "pyperclip>=1.9.0",
     "pytz>=2025.2",
+    "reaktiv>=0.15.1",
     "requests>=2.32.3",
     "scipy>=1.15.3",
     "tqdm>=4.67.1",
@@ -37,4 +38,4 @@ search = [
 
 [tool.setuptools.packages.find]
 where = ["."]
-include = ["beswarm*"]
+include = ["beswarm*"]