beswarm 0.2.67__py3-none-any.whl → 0.2.68__py3-none-any.whl

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/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/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
@@ -793,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
 
@@ -806,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.67.dist-info → beswarm-0.2.68.dist-info}/METADATA

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

{beswarm-0.2.67.dist-info → beswarm-0.2.68.dist-info}/RECORD

@@ -11,9 +11,9 @@ beswarm/aient/aient/__init__.py,sha256=SRfF7oDVlOOAi6nGKiJIUK6B_arqYLO9iSMp-2IZZ
 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=nSLKNI-T6lI4yv873eQUElz5_fkJVy1LbOy27NiJPNk,77512
+beswarm/aient/aient/core/request.py,sha256=QnDhyrjzcJOEQU2oauMQi_HHMRR5NxdkrX7nn5JMwTc,76675
 beswarm/aient/aient/core/response.py,sha256=ye6Ie5HevXVcH3X5V5BoOC5yDJMBKTKopWQzsCNs008,34977
-beswarm/aient/aient/core/utils.py,sha256=wCPw4upG4-ciBxGyEXeTEHzxTbm38rVHrr4PIu8hDW8,28579
+beswarm/aient/aient/core/utils.py,sha256=9r-Z4KqZXXBm7bUkPx-vOYqgn4CEkG-cRRYz_tl0QUg,28851
 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
@@ -21,7 +21,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=kRd-8-WXzv4vwvsTGwnstK-WR8--vr9CdfCZzu8y9LA,1934
 beswarm/aient/aient/models/base.py,sha256=-nnihYnx-vHZMqeVO9ljjt3k4FcD3n-iMk4tT-10nRQ,7232
-beswarm/aient/aient/models/chatgpt.py,sha256=S2KLZEfJLoRh9u60C4AEjOR7yf5iyqMmvSYt9tr8ldY,45256
+beswarm/aient/aient/models/chatgpt.py,sha256=hMYVxN6BuAWKoZnL73z60dUnXmtXVul9kFhdCeOEkW8,45615
 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
@@ -116,7 +116,7 @@ beswarm/tools/search_web.py,sha256=NYrb5KL_WUGPm-fOKT8Cyjon04lxBU-gaLdrVjeYgGo,1
 beswarm/tools/subtasks.py,sha256=mIjA2QrRy9Fos4rYm8fCfu2QrsE_MGnQI9IR8dOxsGs,9885
 beswarm/tools/worker.py,sha256=_cSkRUKRJMAiZiTfnBze_e9Kc7k7KvbB5hdxdvp4FW4,2009
 beswarm/tools/write_csv.py,sha256=u0Hq18Ksfheb52MVtyLNCnSDHibITpsYBPs2ub7USYA,1466
-beswarm-0.2.67.dist-info/METADATA,sha256=45_G-NGSKRQ-SOwJc7z6vcM6icUnayEMJdXbWoHhJlE,3878
-beswarm-0.2.67.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.2.67.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.2.67.dist-info/RECORD,,
+beswarm-0.2.68.dist-info/METADATA,sha256=0we5CziVRMEK7GNhdSTnGYEQZdKdTkAhTw_J2qtsfKY,3878
+beswarm-0.2.68.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.2.68.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.2.68.dist-info/RECORD,,