swarms 7.8.0__py3-none-any.whl → 7.8.1__py3-none-any.whl

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,7 @@ 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/utils/litellm_tokenizer.py

@@ -1,20 +1,106 @@
-import subprocess
+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 = "gpt-4o") -> int:
-    """Count the number of tokens in the given text."""
+
+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:
-        from litellm import encode
-    except ImportError:
-        import sys
+        tokens = encode(model=model, text=text)
+        return len(tokens)
 
-        subprocess.run(
-            [sys.executable, "-m", "pip", "install", "litellm"]
+    except Exception as e:
+        logger.warning(
+            f"Failed to tokenize with model '{model}': {e} using fallback model '{fallback_model}'"
         )
-        from litellm import encode
 
-    return len(encode(model=model, text=text))
+        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__":
-#     print(count_tokens("Hello, how are you?"))
+#     # 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.dist-info → swarms-7.8.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: swarms
-Version: 7.8.0
+Version: 7.8.1
 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

{swarms-7.8.0.dist-info → swarms-7.8.1.dist-info}/RECORD

@@ -146,7 +146,7 @@ swarms/structs/swarm_eval.py,sha256=148E2R2zaCmt_LZYx15nmdFjybXHiQ2CZbl6pk77jNs,
 swarms/structs/swarm_id_generator.py,sha256=Wly7AtGM9e6VgzhYmfg8_gSOdxAdsOvWHJFK81cpQNQ,68
 swarms/structs/swarm_matcher.py,sha256=E2KwHHEJxmW-UfTeMPWZ6VCmYdQ_I9_fwrfJbxD02GY,23322
 swarms/structs/swarm_registry.py,sha256=P0XRrqp1qBNyt0BycqPQljUzKv9jClaQMhtaBMinhYg,5578
-swarms/structs/swarm_router.py,sha256=oj5QumyxutVawthcTFUsY8DcHbn3iWOxAi7xpkoDRQg,30457
+swarms/structs/swarm_router.py,sha256=Q6g3tLUJM9OZn4tbjlChxb6xz_DIl0ix4NUschFtEf0,30578
 swarms/structs/swarming_architectures.py,sha256=q2XrY2lOqFhVckA8oin65Dz1VPUe-lfbEJHlP1Z8aTE,28278
 swarms/structs/tree_swarm.py,sha256=AnIxrt0KhWxAQN8uGjfCcOq-XCmsuTJiH8Ex4mXy8V8,12500
 swarms/structs/utils.py,sha256=Mo6wHQYOB8baWZUKnAJN5Dsgubpo81umNwJIEDitb2A,1873
@@ -186,7 +186,7 @@ swarms/utils/function_caller_model.py,sha256=ZfgCMzOizNnuZipYLclTziECNHszH9p8RQc
 swarms/utils/generate_keys.py,sha256=i0Ewm1LCTLaqp7qm7B7MgNolaI9IZyJcxNVRLUZklt4,1700
 swarms/utils/history_output_formatter.py,sha256=d4J-TF63ENCjsQXU36MGR2pvx59y0qBFuBlOrJt_K8M,1487
 swarms/utils/index.py,sha256=iYVlMiuSpBuKHF34uSrxDUuSYmS26bbYoAqyz_VIyvY,6902
-swarms/utils/litellm_tokenizer.py,sha256=0AAj4NffBe2eHii_3_5SpQAhSiBbunJR8MzaBTIm7hg,484
+swarms/utils/litellm_tokenizer.py,sha256=PqzAY4C5lJ3P-K9SL-dCNtxmHHlZvAw1UohT-ob9lxY,3389
 swarms/utils/litellm_wrapper.py,sha256=dZ9KCR_Rxlm3VZWWVfhpTb4Y6KM_xHipynueJUeU_Jc,15023
 swarms/utils/loguru_logger.py,sha256=hIoSK3NHLpe7eAmjHRURrEYzNXYC2gbR7_Vv63Yaydk,685
 swarms/utils/markdown_message.py,sha256=RThHNnMf6ZLTlYK4vKn3yuewChaxWAYAWb0Xm_pTyIU,652
@@ -198,8 +198,8 @@ swarms/utils/visualizer.py,sha256=0ylohEk62MAS6iPRaDOV03m9qo2k5J56tWlKJk_46p4,16
 swarms/utils/vllm_wrapper.py,sha256=OIGnU9Vf81vE_hul1FK-xEhChFK8fxqZX6-fhQeW22c,4987
 swarms/utils/wrapper_clusterop.py,sha256=PMSCVM7ZT1vgj1D_MYAe835RR3SMLYxA-si2JS02yNQ,4220
 swarms/utils/xml_utils.py,sha256=j8byUa56VT7V4e18pL8UBftLdyWKsUHbid1KDxnAWBo,1416
-swarms-7.8.0.dist-info/LICENSE,sha256=jwRtEmTWjLrEsvFB6QFdYs2cEeZPRMdj-UMOFkPF8_0,11363
-swarms-7.8.0.dist-info/METADATA,sha256=6Npfe5U1IoF9Rty5vbt4vp-17U5psURrMEIFPdqCDXw,94969
-swarms-7.8.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-swarms-7.8.0.dist-info/entry_points.txt,sha256=2K0rTtfO1X1WaO-waJlXIKw5Voa_EpAL_yU0HXE2Jgc,47
-swarms-7.8.0.dist-info/RECORD,,
+swarms-7.8.1.dist-info/LICENSE,sha256=jwRtEmTWjLrEsvFB6QFdYs2cEeZPRMdj-UMOFkPF8_0,11363
+swarms-7.8.1.dist-info/METADATA,sha256=PqIGF4MP1adudx2SRbDfxkqmOCuP8QC3l-2pq7AVUDg,94969
+swarms-7.8.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+swarms-7.8.1.dist-info/entry_points.txt,sha256=2K0rTtfO1X1WaO-waJlXIKw5Voa_EpAL_yU0HXE2Jgc,47
+swarms-7.8.1.dist-info/RECORD,,