beswarm 0.3.10__tar.gz → 0.3.12__tar.gz

{beswarm-0.3.10 → beswarm-0.3.12}/PKG-INFO

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

{beswarm-0.3.10 → beswarm-0.3.12}/beswarm/aient/aient/core/request.py

@@ -295,7 +295,7 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
             if key == request.model:
                 for k, v in value.items():
                     payload[k] = v
-            elif all(_model not in request.model.lower() for _model in ["gemini", "gpt", "claude", "deepseek"]) and "-" not in key:
+            elif all(_model not in request.model.lower() for _model in model_dict.keys()) and "-" not in key:
                 payload[key] = value
 
     return url, headers, payload
@@ -591,7 +591,7 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
             if key == request.model:
                 for k, v in value.items():
                     payload[k] = v
-            elif all(_model not in request.model.lower() for _model in ["gemini", "gpt", "claude"]):
+            elif all(_model not in request.model.lower() for _model in model_dict.keys()) and "-" not in key:
                 payload[key] = value
 
     return url, headers, payload
@@ -1149,7 +1149,7 @@ async def get_gpt_payload(request, engine, provider, api_key=None):
             if key == request.model:
                 for k, v in value.items():
                     payload[k] = v
-            elif all(_model not in request.model.lower() for _model in ["gemini", "gpt", "claude"]):
+            elif all(_model not in request.model.lower() for _model in model_dict.keys()) and "-" not in key:
                 payload[key] = value
 
     return url, headers, payload
@@ -1247,7 +1247,7 @@ async def get_azure_payload(request, engine, provider, api_key=None):
             if key == request.model:
                 for k, v in value.items():
                     payload[k] = v
-            elif all(_model not in request.model.lower() for _model in ["gemini", "gpt", "claude"]):
+            elif all(_model not in request.model.lower() for _model in model_dict.keys()) and "-" not in key:
                 payload[key] = value
 
     return url, headers, payload
@@ -1367,7 +1367,7 @@ async def get_azure_databricks_payload(request, engine, provider, api_key=None):
             if key == request.model:
                 for k, v in value.items():
                     payload[k] = v
-            elif all(_model not in request.model.lower() for _model in ["gemini", "gpt", "claude"]):
+            elif all(_model not in request.model.lower() for _model in model_dict.keys()) and "-" not in key:
                 payload[key] = value
 
     return url, headers, payload
@@ -1454,7 +1454,7 @@ async def get_openrouter_payload(request, engine, provider, api_key=None):
             if key == request.model:
                 for k, v in value.items():
                     payload[k] = v
-            elif all(_model not in request.model.lower() for _model in ["gemini", "gpt", "claude"]):
+            elif all(_model not in request.model.lower() for _model in model_dict.keys()) and "-" not in key:
                 payload[key] = value
 
     return url, headers, payload
@@ -1820,7 +1820,7 @@ async def get_claude_payload(request, engine, provider, api_key=None):
             if key == request.model:
                 for k, v in value.items():
                     payload[k] = v
-            elif all(_model not in request.model.lower() for _model in ["gemini", "gpt", "claude"]):
+            elif all(_model not in request.model.lower() for _model in model_dict.keys()) and "-" not in key:
                 payload[key] = value
 
     return url, headers, payload

{beswarm-0.3.10 → beswarm-0.3.12}/beswarm/tools/search_web.py

@@ -51,7 +51,13 @@ async def search_web(query: str):
         async with httpx.AsyncClient() as client:
             response = await client.post(api_url, headers=headers, data=payload)
             response.raise_for_status()  # 如果状态码是 4xx 或 5xx，则引发 HTTPStatusError
-            results = json.loads(response.json())
+            # The API can return either a JSON object or a string containing JSON.
+            # This handles both cases to avoid a TypeError.
+            decoded_response = response.json()
+            if isinstance(decoded_response, str):
+                results = json.loads(decoded_response)
+            else:
+                results = decoded_response
     except httpx.HTTPStatusError as e:
         return {
             "error": f"HTTP error occurred: {e.response.status_code} - {e.response.text}",

{beswarm-0.3.10 → beswarm-0.3.12}/beswarm/utils.py

@@ -2,6 +2,9 @@ import re
 import sys
 import logging
 from pathlib import Path
+import queue
+import atexit
+from logging.handlers import QueueHandler, QueueListener
 
 def extract_xml_content(text, xml_tag):
     result = ''
@@ -167,9 +170,17 @@ async def {tool_name}({params_str}):
             print(f"Failed to create or register function for tool '{tool_name}': {e}")
             traceback.print_exc()
 
+# For asynchronous logging
+_listeners = []
+_atexit_registered = False
+
+def _stop_all_listeners():
+    for listener in _listeners:
+        listener.stop()
+
 def setup_logger(logger_name: str, log_file: Path):
     """
-    用最简单的方式设置一个 logger，使其同时输出到文件和终端。
+    用异步方式设置一个 logger，使其同时输出到文件和终端，避免IO阻塞。
 
     Args:
         logger_name (str): Logger 的唯一名称。
@@ -178,35 +189,52 @@ def setup_logger(logger_name: str, log_file: Path):
     Returns:
         logging.Logger: 配置好的 logger 实例。
     """
+    global _atexit_registered
+
     # 1. 获取 Logger 实例
     logger = logging.getLogger(logger_name)
     logger.setLevel(logging.INFO) # 设置 logger 的最低处理级别为 INFO
     logger.propagate = False
 
+    # 如果已经配置了异步 handler，直接返回
+    if any(isinstance(h, QueueHandler) for h in logger.handlers):
+        return logger
+
+    # 如果有其他 handler，说明被其他方式配置过，也直接返回
     if logger.hasHandlers():
         return logger
 
-    # 2. 创建文件 Handler
+    # 2. 创建用于 Listener 的 Handler（文件和终端）
     # 确保日志文件所在的目录存在
     log_file.parent.mkdir(parents=True, exist_ok=True)
     file_handler = logging.FileHandler(log_file, mode='a', encoding='utf-8')
-
-    # 3. 创建终端 Handler
-    # 使用 sys.stdout 可以确保输出在标准输出流，与 print() 行为一致
     stream_handler = logging.StreamHandler(sys.stdout)
 
-    # 4. 创建一个通用的 Formatter
+    # 3. 创建一个通用的 Formatter
     formatter = logging.Formatter('%(asctime)s - %(name)s - [%(levelname)s] - %(message)s')
 
-    # 5. 为两个 Handler 设置 Formatter
+    # 4. 为两个 Handler 设置 Formatter
     file_handler.setFormatter(formatter)
     stream_handler.setFormatter(formatter)
 
-    # 6. 将两个 Handler 添加到 Logger
-    # DEBUG = os.getenv("DEBUG", "false").lower() in ("true", "1", "t", "yes")
-    logger.addHandler(file_handler)
-    logger.addHandler(stream_handler)
-    logger.propagate = False
+    # 5. 设置 Queue、QueueHandler 和 QueueListener
+    log_queue = queue.Queue(-1)
+    # listener 在后台线程中从 queue 读取日志，并分发给 file_handler 和 stream_handler
+    listener = QueueListener(log_queue, file_handler, stream_handler, respect_handler_level=True)
+
+    # queue_handler 是一个非阻塞的 handler，它把日志消息放到 queue 中
+    queue_handler = QueueHandler(log_queue)
+
+    # 6. 将 QueueHandler 添加到 Logger
+    logger.addHandler(queue_handler)
+
+    # 7. 启动 listener 并注册 atexit 钩子以确保程序退出时停止
+    _listeners.append(listener)
+    listener.start()
+
+    if not _atexit_registered:
+        atexit.register(_stop_all_listeners)
+        _atexit_registered = True
 
     return logger
 

{beswarm-0.3.10 → beswarm-0.3.12}/beswarm.egg-info/PKG-INFO

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

{beswarm-0.3.10 → beswarm-0.3.12}/pyproject.toml

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