beswarm 0.3.13__py3-none-any.whl → 0.3.14__py3-none-any.whl

beswarm/aient/aient/architext/architext/core.py

@@ -423,8 +423,16 @@ class Message(ABC):
                             processed_items.append(Images(url=image_url))
                     else:
                         raise ValueError(f"Unsupported item type in list: {item_type}")
+            elif isinstance(item, dict):
+                item_type = item.get('type')
+                if item_type == 'image_url':
+                    image_url = item.get('image_url', {}).get('url')
+                    if image_url:
+                        processed_items.append(Images(url=image_url))
+                else:
+                    raise ValueError(f"Unsupported dict item type: {item_type}")
             else:
-                raise TypeError(f"Unsupported item type: {type(item)}. Must be str, ContextProvider, or list.")
+                raise TypeError(f"Unsupported item type: {type(item)}. Must be str, ContextProvider, list, or dict.")
         self._items: List[ContextProvider] = processed_items
         self._parent_messages: Optional['Messages'] = None
 

beswarm/aient/aient/architext/test/test.py

@@ -1884,6 +1884,32 @@ Files: {Files(visible=True, name="files")}
             if os.path.exists(non_existent_file):
                 os.remove(non_existent_file)
 
+    async def test_auto_convert_image_dict_to_image_provider(self):
+        """测试 UserMessage 是否能自动转换 image_url 字典为 Images provider"""
+        base64_image_data = "/9j/4AAQSkZJRgABAQEAYABgAAD/4QAiRXhpZgAATU0AKgAAAAgAAQESAAMAAAABAAEAAAAAAAD/2wBDAAIBAQIBAQICAgICAgICAwUDAwMDAwYEBAMFBwYHBwcGBwcICQsJCAgKCAcHCg0KCgsMDAwMBwkODw0MDgsMDAz/2wBDAQICAgMDAwYDAwYMCAcIDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAz/wAARCAABAAEDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD9/KKKKAP/2Q=="
+        image_dict = {
+            'type': 'image_url',
+            'image_url': {
+                'url': f'data:image/jpeg;base64,{base64_image_data}'
+            }
+        }
+
+        # This is the functionality we are testing.
+        # The UserMessage should be able to take this dictionary directly.
+        message = UserMessage(image_dict)
+
+        # 1. Verify that the message contains exactly one provider.
+        self.assertEqual(len(message.provider()), 1)
+
+        # 2. Verify that the provider is an instance of the Images class.
+        image_provider = message.provider()[0]
+        self.assertIsInstance(image_provider, Images)
+
+        # 3. Verify that the content of the Images provider is correct.
+        rendered = await message.render_latest()
+        self.assertEqual(rendered['content'][0]['image_url']['url'], image_dict['image_url']['url'])
+
+
 # ==============================================================================
 # 6. 演示
 # ==============================================================================

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 model_dict.keys()) and "-" not in key:
+            elif all(_model not in request.model.lower() for _model in model_dict.keys()) and "-" not in key 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 model_dict.keys()) and "-" not in key:
+            elif all(_model not in request.model.lower() for _model in model_dict.keys()) and "-" not in key and " " not in key:
                 payload[key] = value
 
     return url, headers, payload
@@ -1116,6 +1116,9 @@ async def get_gpt_payload(request, engine, provider, api_key=None):
         if "temperature" in payload:
             payload.pop("temperature")
 
+        if "v1/responses" in url:
+            payload.pop("stream_options", None)
+
     # 代码生成/数学解题  0.0
     # 数据抽取/分析	     1.0
     # 通用对话          1.3
@@ -1149,7 +1152,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 model_dict.keys()) and "-" not in key:
+            elif all(_model not in request.model.lower() for _model in model_dict.keys()) and "-" not in key and " " not in key:
                 payload[key] = value
 
     return url, headers, payload
@@ -1247,7 +1250,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 model_dict.keys()) and "-" not in key:
+            elif all(_model not in request.model.lower() for _model in model_dict.keys()) and "-" not in key and " " not in key:
                 payload[key] = value
 
     return url, headers, payload
@@ -1367,7 +1370,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 model_dict.keys()) and "-" not in key:
+            elif all(_model not in request.model.lower() for _model in model_dict.keys()) and "-" not in key and " " not in key:
                 payload[key] = value
 
     return url, headers, payload
@@ -1454,7 +1457,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 model_dict.keys()) and "-" not in key:
+            elif all(_model not in request.model.lower() for _model in model_dict.keys()) and "-" not in key and " " not in key:
                 payload[key] = value
 
     return url, headers, payload
@@ -1820,7 +1823,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 model_dict.keys()) and "-" not in key:
+            elif all(_model not in request.model.lower() for _model in model_dict.keys()) and "-" not in key and " " not in key:
                 payload[key] = value
 
     return url, headers, payload

beswarm/aient/aient/core/utils.py

@@ -52,7 +52,7 @@ class BaseAPI:
             self.v1_models: str = urlunparse(parsed_url[:2] + (before_v1 + "models",) + ("",) * 3)
 
         if "v1/responses" in parsed_url.path:
-            self.chat_url: str = urlunparse(parsed_url[:2] + ("v1/responses",) + ("",) * 3)
+            self.chat_url: str = api_url
         else:
             self.chat_url: str = urlunparse(parsed_url[:2] + (before_v1 + "chat/completions",) + ("",) * 3)
         self.image_url: str = urlunparse(parsed_url[:2] + (before_v1 + "images/generations",) + ("",) * 3)

beswarm/aient/aient/models/chatgpt.py

@@ -89,6 +89,13 @@ class RepetitiveResponseError(Exception):
         self.count = count
 
 
+class AllToolsMissingParametersError(Exception):
+    """Custom exception for when all tools are missing required parameters."""
+    def __init__(self, message, response_text):
+        super().__init__(message)
+        self.response_text = response_text
+
+
 class chatgpt(BaseLLM):
     """
     Official ChatGPT API
@@ -500,6 +507,9 @@ class chatgpt(BaseLLM):
                             missing_required_params.append(f"Error: {tool_name} missing required parameters: {missing_required_params}")
                 function_parameter = valid_function_parameters
 
+                if not function_parameter and missing_required_params:
+                    raise AllToolsMissingParametersError("\n\n".join(missing_required_params), response_text=full_response)
+
                 # 删除 task_complete 跟其他工具一起调用的情况，因为 task_complete 必须单独调用
                 if len(function_parameter) > 1:
                     function_parameter = [tool_dict for tool_dict in function_parameter if tool_dict.get("function_name", "") != "task_complete"]
@@ -810,6 +820,13 @@ class chatgpt(BaseLLM):
                     {"role": "user", "content": "你的消息没有以[done]结尾，请重新输出"}
                 ]
                 continue
+            except AllToolsMissingParametersError as e:
+                self.logger.warning(f"All tools are missing required parameters: {e}. Retrying with corrective prompt.")
+                need_done_prompt = [
+                    {"role": "assistant", "content": e.response_text},
+                    {"role": "user", "content": f"{e.message}，请重新输出"}
+                ]
+                continue
             except EmptyResponseError as e:
                 self.logger.warning(f"{e}, retrying...")
                 continue

{beswarm-0.3.13.dist-info → beswarm-0.3.14.dist-info}/METADATA

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

{beswarm-0.3.13.dist-info → beswarm-0.3.14.dist-info}/RECORD

@@ -10,16 +10,16 @@ beswarm/agents/chatgroup.py,sha256=PzrmRcDKAbB7cxL16nMod_CzPosDV6bfTmXxQVuv-AQ,1
 beswarm/agents/planact.py,sha256=dhPkMUaZLc1dO0TrI1Orr_i60iLzJHQIYBI_QjjSJwI,18723
 beswarm/aient/aient/__init__.py,sha256=SRfF7oDVlOOAi6nGKiJIUK6B_arqYLO9iSMp-2IZZps,21
 beswarm/aient/aient/architext/architext/__init__.py,sha256=79Ih1151rfcqZdr7F8HSZSTs_iT2SKd1xCkehMsXeXs,19
-beswarm/aient/aient/architext/architext/core.py,sha256=3io21wNZ-Za8VpQZn9nnc8qIjfON9fxMxURMC7fYCPY,37559
+beswarm/aient/aient/architext/architext/core.py,sha256=E5QTM0NNoHPxRawH_Lmb01azAAlmLlm0bPy5c78zG38,37972
 beswarm/aient/aient/architext/test/openai_client.py,sha256=Dqtbmubv6vwF8uBqcayG0kbsiO65of7sgU2-DRBi-UM,4590
-beswarm/aient/aient/architext/test/test.py,sha256=kWsvKq8lYLuRVlU6Sqe7PyQAP15ENpemy5EV6Se4UpE,89019
+beswarm/aient/aient/architext/test/test.py,sha256=c6wHwo8DQL5yeEQ3T1lqMleHJ9M5Sifnk4Qqk64Vv7w,90970
 beswarm/aient/aient/architext/test/test_save_load.py,sha256=o8DqH6gDYZkFkQy-a7blqLtJTRj5e4a-Lil48pJ0V3g,3260
 beswarm/aient/aient/core/__init__.py,sha256=NxjebTlku35S4Dzr16rdSqSTWUvvwEeACe8KvHJnjPg,34
 beswarm/aient/aient/core/log_config.py,sha256=kz2_yJv1p-o3lUQOwA3qh-LSc3wMHv13iCQclw44W9c,274
 beswarm/aient/aient/core/models.py,sha256=KMlCRLjtq1wQHZTJGqnbWhPS2cHq6eLdnk7peKDrzR8,7490
-beswarm/aient/aient/core/request.py,sha256=u9wkesp0JMQoJdLoDCNQQgiAB7a_W4Hs38uX6Ppqpi8,77836
+beswarm/aient/aient/core/request.py,sha256=s9cRpSLmuujuPxqKfmT8X1_eRby4z3NREjlSEG5Bwzg,78052
 beswarm/aient/aient/core/response.py,sha256=VYpXfF6RO3Y-fTZMGV2p-bcrd73BPAKlz33gQkOcqjE,38462
-beswarm/aient/aient/core/utils.py,sha256=9T6Ze9sMnsX4NBWeYCgY3AlZdhh6HFV1LI5SojzZars,31751
+beswarm/aient/aient/core/utils.py,sha256=jlEjtsCnnUxp-z9NLCiDbLBxEd9AE0zEWxnpjq7_5ao,31700
 beswarm/aient/aient/core/test/test_base_api.py,sha256=pWnycRJbuPSXKKU9AQjWrMAX1wiLC_014Qc9hh5C2Pw,524
 beswarm/aient/aient/core/test/test_geminimask.py,sha256=HFX8jDbNg_FjjgPNxfYaR-0-roUrOO-ND-FVsuxSoiw,13254
 beswarm/aient/aient/core/test/test_image.py,sha256=_T4peNGdXKBHHxyQNx12u-NTyFE8TlYI6NvvagsG2LE,319
@@ -27,7 +27,7 @@ beswarm/aient/aient/core/test/test_payload.py,sha256=8jBiJY1uidm1jzL-EiK0s6UGmW9
 beswarm/aient/aient/models/__init__.py,sha256=ZTiZgbfBPTjIPSKURE7t6hlFBVLRS9lluGbmqc1WjxQ,43
 beswarm/aient/aient/models/audio.py,sha256=FNW4lxG1IhxOU7L8mvcbaeC1nXk_lpUZQlg9ijQ0h_Q,1937
 beswarm/aient/aient/models/base.py,sha256=HWIGfa2A7OTccvHK0wG1-UlHB-yaWRC7hbi4oR1Mu1Y,7228
-beswarm/aient/aient/models/chatgpt.py,sha256=ZM0Ol_0vTZ5-5NjTolVfQzN47OyH1e8eJEDf2QRqwHA,43875
+beswarm/aient/aient/models/chatgpt.py,sha256=lhn2Q2iSIB_edXgEv8bP7t4JZK1e3pZiImXjSMJR54Y,44736
 beswarm/aient/aient/plugins/__init__.py,sha256=p3KO6Aa3Lupos4i2SjzLQw1hzQTigOAfEHngsldrsyk,986
 beswarm/aient/aient/plugins/arXiv.py,sha256=yHjb6PS3GUWazpOYRMKMzghKJlxnZ5TX8z9F6UtUVow,1461
 beswarm/aient/aient/plugins/config.py,sha256=TGgZ5SnNKZ8MmdznrZ-TEq7s2ulhAAwTSKH89bci3dA,7079
@@ -121,8 +121,8 @@ beswarm/tools/subtasks.py,sha256=Fsf_542CkECcwFwxD-F38_IUsmk06xe1P7e6pBPTy4Y,128
 beswarm/tools/worker.py,sha256=mQ1qdrQ8MgL99byAbTvxfEByFFGN9mty3UHqHjARMQ8,2331
 beswarm/tools/write_csv.py,sha256=u0Hq18Ksfheb52MVtyLNCnSDHibITpsYBPs2ub7USYA,1466
 beswarm/tools/write_file.py,sha256=L2coBqz-aRFxPBvJBrbWbUJhu7p3oKAAGb9R144bFtk,4926
-beswarm-0.3.13.dist-info/METADATA,sha256=MQHN-a_l_axNIuLC3PR6h0r_3xWYTkMiy4dBC-K3frs,3878
-beswarm-0.3.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.3.13.dist-info/entry_points.txt,sha256=URK7Y4PDzBgxIecQnxsWTu4O-eaFa1CoAcNTWh5R7LM,45
-beswarm-0.3.13.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.3.13.dist-info/RECORD,,
+beswarm-0.3.14.dist-info/METADATA,sha256=7EF549W5qhomzsWEHBSdg4ZJwQttF1VC72muLl2F9Jo,3878
+beswarm-0.3.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.3.14.dist-info/entry_points.txt,sha256=URK7Y4PDzBgxIecQnxsWTu4O-eaFa1CoAcNTWh5R7LM,45
+beswarm-0.3.14.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.3.14.dist-info/RECORD,,