swarms 7.8.0__tar.gz → 7.8.3__tar.gz

{swarms-7.8.0 → swarms-7.8.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: swarms
-Version: 7.8.0
+Version: 7.8.3
 Summary: Swarms - TGSC
 License: MIT
 Keywords: artificial intelligence,deep learning,optimizers,Prompt Engineering,swarms,agents,llms,transformers,multi-agent,swarms of agents,Enterprise-Grade Agents,Production-Grade Agents,Agents,Multi-Grade-Agents,Swarms,Transformers,LLMs,Prompt Engineering,Agents,Generative Agents,Generative AI,Agent Marketplace,Agent Store,quant,finance,algorithmic trading,portfolio optimization,risk management,financial modeling,machine learning for finance,natural language processing for finance
@@ -27,7 +27,6 @@ Requires-Dist: loguru
 Requires-Dist: mcp
 Requires-Dist: networkx
 Requires-Dist: numpy
-Requires-Dist: numpydoc
 Requires-Dist: psutil
 Requires-Dist: pydantic
 Requires-Dist: pypdf (==5.1.0)

{swarms-7.8.0 → swarms-7.8.3}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "swarms"
-version = "7.8.0"
+version = "7.8.3"
 description = "Swarms - TGSC"
 license = "MIT"
 authors = ["Kye Gomez <kye@apac.ai>"]
@@ -79,7 +79,6 @@ torch = "*"
 httpx = "*"
 mcp = "*"
 aiohttp = "*"
-numpydoc = "*"
 
 [tool.poetry.scripts]
 swarms = "swarms.cli.main:main"

{swarms-7.8.0 → swarms-7.8.3}/swarms/structs/swarm_router.py

@@ -538,8 +538,8 @@ class SwarmRouter:
     def _run(
         self,
         task: str,
-        img: str,
-        model_response: str,
+        img: Optional[str] = None,
+        model_response: Optional[str] = None,
         *args,
         **kwargs,
     ) -> Any:
@@ -591,7 +591,8 @@ class SwarmRouter:
     def run(
         self,
         task: str,
-        img: str = None,
+        img: Optional[str] = None,
+        model_response: Optional[str] = None,
         *args,
         **kwargs,
     ) -> Any:
@@ -613,7 +614,13 @@ class SwarmRouter:
             Exception: If an error occurs during task execution.
         """
         try:
-            return self._run(task=task, img=img, *args, **kwargs)
+            return self._run(
+                task=task,
+                img=img,
+                model_response=model_response,
+                *args,
+                **kwargs,
+            )
         except Exception as e:
             logger.error(f"Error executing task on swarm: {str(e)}")
             raise

{swarms-7.8.0 → swarms-7.8.3}/swarms/tools/base_tool.py

@@ -2,7 +2,6 @@ import json
 from typing import Any, Callable, Dict, List, Optional, Union
 from concurrent.futures import ThreadPoolExecutor, as_completed
 
-# from litellm.utils import function_to_dict
 from pydantic import BaseModel, Field
 
 from swarms.tools.func_to_str import function_to_str, functions_to_str

swarms-7.8.3/swarms/utils/litellm_tokenizer.py

@@ -0,0 +1,106 @@
+from litellm import encode, model_list
+from loguru import logger
+from typing import Optional
+from functools import lru_cache
+
+# Use consistent default model
+DEFAULT_MODEL = "gpt-4o-mini"
+
+
+def count_tokens(
+    text: str,
+    model: str = DEFAULT_MODEL,
+    default_encoder: Optional[str] = DEFAULT_MODEL,
+) -> int:
+    """
+    Count the number of tokens in the given text using the specified model.
+
+    Args:
+        text: The text to tokenize
+        model: The model to use for tokenization (defaults to gpt-4o-mini)
+        default_encoder: Fallback encoder if the primary model fails (defaults to DEFAULT_MODEL)
+
+    Returns:
+        int: Number of tokens in the text
+
+    Raises:
+        ValueError: If text is empty or if both primary and fallback models fail
+    """
+    if not text or not text.strip():
+        logger.warning("Empty or whitespace-only text provided")
+        return 0
+
+    # Set fallback encoder
+    fallback_model = default_encoder or DEFAULT_MODEL
+
+    # First attempt with the requested model
+    try:
+        tokens = encode(model=model, text=text)
+        return len(tokens)
+
+    except Exception as e:
+        logger.warning(
+            f"Failed to tokenize with model '{model}': {e} using fallback model '{fallback_model}'"
+        )
+
+        logger.info(f"Using fallback model '{fallback_model}'")
+
+        # Only try fallback if it's different from the original model
+        if fallback_model != model:
+            try:
+                logger.info(
+                    f"Falling back to default encoder: {fallback_model}"
+                )
+                tokens = encode(model=fallback_model, text=text)
+                return len(tokens)
+
+            except Exception as fallback_error:
+                logger.error(
+                    f"Fallback encoder '{fallback_model}' also failed: {fallback_error}"
+                )
+                raise ValueError(
+                    f"Both primary model '{model}' and fallback '{fallback_model}' failed to tokenize text"
+                )
+        else:
+            logger.error(
+                f"Primary model '{model}' failed and no different fallback available"
+            )
+            raise ValueError(
+                f"Model '{model}' failed to tokenize text: {e}"
+            )
+
+
+@lru_cache(maxsize=100)
+def get_supported_models() -> list:
+    """Get list of supported models from litellm."""
+    try:
+        return model_list
+    except Exception as e:
+        logger.warning(f"Could not retrieve model list: {e}")
+        return []
+
+
+# if __name__ == "__main__":
+#     # Test with different scenarios
+#     test_text = "Hello, how are you?"
+
+#     # # Test with Claude model
+#     # try:
+#     #     tokens = count_tokens(test_text, model="claude-3-5-sonnet-20240620")
+#     #     print(f"Claude tokens: {tokens}")
+#     # except Exception as e:
+#     #     print(f"Claude test failed: {e}")
+
+#     # # Test with default model
+#     # try:
+#     #     tokens = count_tokens(test_text)
+#     #     print(f"Default model tokens: {tokens}")
+#     # except Exception as e:
+#     #     print(f"Default test failed: {e}")
+
+#     # Test with explicit fallback
+#     try:
+#         tokens = count_tokens(test_text, model="some-invalid-model", default_encoder="gpt-4o-mini")
+#         print(f"Fallback test tokens: {tokens}")
+#     except Exception as e:
+#         print(f"Fallback test failed: {e}")

swarms-7.8.0/swarms/utils/litellm_tokenizer.py

@@ -1,20 +0,0 @@
-import subprocess
-
-
-def count_tokens(text: str, model: str = "gpt-4o") -> int:
-    """Count the number of tokens in the given text."""
-    try:
-        from litellm import encode
-    except ImportError:
-        import sys
-
-        subprocess.run(
-            [sys.executable, "-m", "pip", "install", "litellm"]
-        )
-        from litellm import encode
-
-    return len(encode(model=model, text=text))
-
-
-# if __name__ == "__main__":
-#     print(count_tokens("Hello, how are you?"))