beswarm 0.2.66__tar.gz → 0.2.68__tar.gz

{beswarm-0.2.66 → beswarm-0.2.68}/PKG-INFO

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

{beswarm-0.2.66 → beswarm-0.2.68}/beswarm/aient/aient/core/request.py

@@ -1952,40 +1952,21 @@ async def get_embedding_payload(request, engine, provider, api_key=None):
     headers = {
         "Content-Type": "application/json",
     }
+    if api_key:
+        headers['Authorization'] = f"Bearer {api_key}"
 
     url = provider['base_url']
-    parsed_url = urlparse(url)
-    if "embedding-00" in original_model and "127.0.0.1" not in url and \
-    (parsed_url.path.endswith("/v1beta") or \
-    parsed_url.path.endswith("/v1") or \
-    (parsed_url.netloc == 'generativelanguage.googleapis.com' and "openai/chat/completions" not in parsed_url.path)):
-        if api_key:
-            headers['x-goog-api-key'] = f"{api_key}"
-        parsed_url = urllib.parse.urlparse(url)
-        url = f"{parsed_url.scheme}://{parsed_url.netloc}{parsed_url.path.split('/models')[0].rstrip('/')}/models/{original_model}:embedContent"
-        payload = {
-            "content": {
-                "parts": [
-                    {
-                        "text": request.input
-                    }
-                ]
-            }
-        }
-    else:
-        if api_key:
-            headers['Authorization'] = f"Bearer {api_key}"
-        url = BaseAPI(url).embeddings
-        payload = {
-            "input": request.input,
-            "model": original_model,
-        }
+    url = BaseAPI(url).embeddings
+    payload = {
+        "input": request.input,
+        "model": original_model,
+    }
 
-        if request.encoding_format:
-            if url.startswith("https://api.jina.ai"):
-                payload["embedding_type"] = request.encoding_format
-            else:
-                payload["encoding_format"] = request.encoding_format
+    if request.encoding_format:
+        if url.startswith("https://api.jina.ai"):
+            payload["embedding_type"] = request.encoding_format
+        else:
+            payload["encoding_format"] = request.encoding_format
 
     return url, headers, payload
 

{beswarm-0.2.66 → beswarm-0.2.68}/beswarm/aient/aient/core/utils.py

@@ -63,11 +63,14 @@ class BaseAPI:
         else:
             self.audio_speech: str = urlunparse(parsed_url[:2] + (before_v1 + "audio/speech",) + ("",) * 3)
 
-        if parsed_url.hostname == "generativelanguage.googleapis.com":
+        if parsed_url.path.endswith("/v1beta") or \
+        parsed_url.path.endswith("/v1") or \
+        (parsed_url.netloc == 'generativelanguage.googleapis.com' and "openai/chat/completions" not in parsed_url.path):
+            before_v1 = parsed_url.path.split("/v1")[0]
             self.base_url = api_url
             self.v1_url = api_url
             self.chat_url = api_url
-            self.embeddings = api_url
+            self.embeddings = urlunparse(parsed_url[:2] + (before_v1 + "/v1beta/embeddings",) + ("",) * 3)
 
 def get_engine(provider, endpoint=None, original_model=""):
     parsed_url = urlparse(provider['base_url'])

{beswarm-0.2.66 → beswarm-0.2.68}/beswarm/aient/aient/models/chatgpt.py

@@ -37,6 +37,10 @@ class RateLimitError(Exception):
     """Custom exception for rate limit (429) errors."""
     pass
 
+class HTTPError(Exception):
+    """Custom exception for HTTP 500 errors."""
+    pass
+
 class ConfigurationError(Exception):
     """Custom exception for configuration errors."""
     pass
@@ -531,6 +535,7 @@ class chatgpt(BaseLLM):
                 # 删除 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"]
+                    function_parameter = [tool_dict for tool_dict in function_parameter if tool_dict.get("function_name", "") != "get_task_result"]
                 if len(function_parameter) == 1 and function_parameter[0].get("function_name", "") == "task_complete":
                     raise TaskComplete(safe_get(function_parameter, 0, "parameter", "message", default="The task has been completed."))
 
@@ -792,6 +797,8 @@ class chatgpt(BaseLLM):
                             raise ModelNotFoundError(f"Model: {model or self.engine} not found!")
                         if "HTTP Error', 'status_code': 429" in processed_chunk:
                             raise RateLimitError(f"Rate limit exceeded for model: {model or self.engine}")
+                        if "HTTP Error', 'status_code': " in processed_chunk:
+                            raise HTTPError(f"HTTP Error: {processed_chunk}")
                     yield processed_chunk
                     index += 1
 
@@ -805,6 +812,9 @@ class chatgpt(BaseLLM):
             except APITimeoutError:
                 self.logger.warning("API response timeout (524), retrying...")
                 continue
+            except HTTPError as e:
+                self.logger.warning(f"{e}, retrying...")
+                continue
             except RateLimitError as e:
                 self.logger.warning(f"{e}, retrying...")
                 continue

{beswarm-0.2.66 → beswarm-0.2.68}/beswarm.egg-info/PKG-INFO

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

{beswarm-0.2.66 → beswarm-0.2.68}/pyproject.toml

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