swarms 7.7.4__py3-none-any.whl → 7.7.6__py3-none-any.whl

swarms/structs/conversation.py

@@ -1,6 +1,8 @@
 import datetime
 import json
-from typing import Any, List, Optional, Union
+from typing import Any, List, Optional, Union, Dict
+import threading
+import hashlib
 
 import yaml
 from swarms.structs.base_structure import BaseStructure
@@ -8,7 +10,6 @@ from typing import TYPE_CHECKING
 from swarms.utils.any_to_str import any_to_str
 from swarms.utils.formatter import formatter
 from swarms.utils.litellm_tokenizer import count_tokens
-import threading
 
 if TYPE_CHECKING:
     from swarms.structs.agent import (
@@ -37,6 +38,9 @@ class Conversation(BaseStructure):
         save_as_json_bool (bool): Flag to save conversation history as JSON.
         token_count (bool): Flag to enable token counting for messages.
         conversation_history (list): List to store the history of messages.
+        cache_enabled (bool): Flag to enable prompt caching.
+        cache_stats (dict): Statistics about cache usage.
+        cache_lock (threading.Lock): Lock for thread-safe cache operations.
     """
 
     def __init__(
@@ -54,6 +58,7 @@ class Conversation(BaseStructure):
         save_as_yaml: bool = True,
         save_as_json_bool: bool = False,
         token_count: bool = True,
+        cache_enabled: bool = True,
         *args,
         **kwargs,
     ):
@@ -74,6 +79,7 @@ class Conversation(BaseStructure):
             save_as_yaml (bool): Flag to save conversation history as YAML.
             save_as_json_bool (bool): Flag to save conversation history as JSON.
             token_count (bool): Flag to enable token counting for messages.
+            cache_enabled (bool): Flag to enable prompt caching.
         """
         super().__init__()
         self.system_prompt = system_prompt
@@ -90,6 +96,14 @@ class Conversation(BaseStructure):
         self.save_as_yaml = save_as_yaml
         self.save_as_json_bool = save_as_json_bool
         self.token_count = token_count
+        self.cache_enabled = cache_enabled
+        self.cache_stats = {
+            "hits": 0,
+            "misses": 0,
+            "cached_tokens": 0,
+            "total_tokens": 0,
+        }
+        self.cache_lock = threading.Lock()
 
         # If system prompt is not None, add it to the conversation history
         if self.system_prompt is not None:
@@ -105,6 +119,61 @@ class Conversation(BaseStructure):
         if tokenizer is not None:
             self.truncate_memory_with_tokenizer()
 
+    def _generate_cache_key(
+        self, content: Union[str, dict, list]
+    ) -> str:
+        """Generate a cache key for the given content.
+
+        Args:
+            content (Union[str, dict, list]): The content to generate a cache key for.
+
+        Returns:
+            str: The cache key.
+        """
+        if isinstance(content, (dict, list)):
+            content = json.dumps(content, sort_keys=True)
+        return hashlib.md5(content.encode()).hexdigest()
+
+    def _get_cached_tokens(
+        self, content: Union[str, dict, list]
+    ) -> Optional[int]:
+        """Get the number of cached tokens for the given content.
+
+        Args:
+            content (Union[str, dict, list]): The content to check.
+
+        Returns:
+            Optional[int]: The number of cached tokens, or None if not cached.
+        """
+        if not self.cache_enabled:
+            return None
+
+        with self.cache_lock:
+            cache_key = self._generate_cache_key(content)
+            if cache_key in self.cache_stats:
+                self.cache_stats["hits"] += 1
+                return self.cache_stats[cache_key]
+            self.cache_stats["misses"] += 1
+            return None
+
+    def _update_cache_stats(
+        self, content: Union[str, dict, list], token_count: int
+    ):
+        """Update cache statistics for the given content.
+
+        Args:
+            content (Union[str, dict, list]): The content to update stats for.
+            token_count (int): The number of tokens in the content.
+        """
+        if not self.cache_enabled:
+            return
+
+        with self.cache_lock:
+            cache_key = self._generate_cache_key(content)
+            self.cache_stats[cache_key] = token_count
+            self.cache_stats["cached_tokens"] += token_count
+            self.cache_stats["total_tokens"] += token_count
+
     def add(
         self,
         role: str,
@@ -118,7 +187,6 @@ class Conversation(BaseStructure):
             role (str): The role of the speaker (e.g., 'User', 'System').
             content (Union[str, dict, list]): The content of the message to be added.
         """
-
         # Base message with role
         message = {
             "role": role,
@@ -134,10 +202,20 @@ class Conversation(BaseStructure):
         else:
             message["content"] = content
 
+        # Check cache for token count
+        cached_tokens = self._get_cached_tokens(content)
+        if cached_tokens is not None:
+            message["token_count"] = cached_tokens
+            message["cached"] = True
+        else:
+            message["cached"] = False
+
         # Add the message to history immediately without waiting for token count
         self.conversation_history.append(message)
 
-        if self.token_count is True:
+        if self.token_count is True and not message.get(
+            "cached", False
+        ):
             self._count_tokens(content, message)
 
     def add_multiple_messages(
@@ -155,6 +233,8 @@ class Conversation(BaseStructure):
                 tokens = count_tokens(any_to_str(content))
                 # Update the message that's already in the conversation history
                 message["token_count"] = int(tokens)
+                # Update cache stats
+                self._update_cache_stats(content, int(tokens))
 
                 # If autosave is enabled, save after token count is updated
                 if self.autosave:
@@ -277,13 +357,23 @@ class Conversation(BaseStructure):
             ]
         )
 
-    def get_str(self):
+    def get_str(self) -> str:
         """Get the conversation history as a string.
 
         Returns:
             str: The conversation history.
         """
-        return self.return_history_as_string()
+        messages = []
+        for message in self.conversation_history:
+            content = message["content"]
+            if isinstance(content, (dict, list)):
+                content = json.dumps(content)
+            messages.append(f"{message['role']}: {content}")
+            if "token_count" in message:
+                messages[-1] += f" (tokens: {message['token_count']})"
+            if message.get("cached", False):
+                messages[-1] += " [cached]"
+        return "\n".join(messages)
 
     def save_as_json(self, filename: str = None):
         """Save the conversation history as a JSON file.
@@ -512,6 +602,33 @@ class Conversation(BaseStructure):
         """
         self.conversation_history.extend(messages)
 
+    def get_cache_stats(self) -> Dict[str, int]:
+        """Get statistics about cache usage.
+
+        Returns:
+            Dict[str, int]: Statistics about cache usage.
+        """
+        with self.cache_lock:
+            return {
+                "hits": self.cache_stats["hits"],
+                "misses": self.cache_stats["misses"],
+                "cached_tokens": self.cache_stats["cached_tokens"],
+                "total_tokens": self.cache_stats["total_tokens"],
+                "hit_rate": (
+                    self.cache_stats["hits"]
+                    / (
+                        self.cache_stats["hits"]
+                        + self.cache_stats["misses"]
+                    )
+                    if (
+                        self.cache_stats["hits"]
+                        + self.cache_stats["misses"]
+                    )
+                    > 0
+                    else 0
+                ),
+            }
+
 
 # # Example usage
 # # conversation = Conversation()

swarms/structs/groupchat.py

@@ -1,10 +1,8 @@
 import concurrent.futures
 import random
-from datetime import datetime
 from typing import Callable, List
 
 from loguru import logger
-from pydantic import BaseModel, Field
 
 from swarms.structs.agent import Agent
 from swarms.structs.conversation import Conversation
@@ -16,16 +14,6 @@ from swarms.prompts.multi_agent_collab_prompt import (
     MULTI_AGENT_COLLAB_PROMPT_TWO,
 )
 
-
-class AgentResponse(BaseModel):
-    agent_name: str
-    role: str
-    message: str
-    timestamp: datetime = Field(default_factory=datetime.now)
-    turn_number: int
-    preceding_context: List[str] = Field(default_factory=list)
-
-
 SpeakerFunction = Callable[[List[str], "Agent"], bool]
 
 

swarms/structs/hybrid_hiearchical_peer_swarm.py

@@ -1,5 +1,5 @@
 import os
-from typing import List
+from typing import List, Literal
 from swarms.structs.agent import Agent
 from swarms.structs.conversation import Conversation
 from swarms.structs.multi_agent_exec import get_swarms_info
@@ -10,6 +10,23 @@ from swarms.utils.history_output_formatter import (
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from typing import Union, Callable
 
+
+HistoryOutputType = Literal[
+    "list",
+    "dict",
+    "dictionary",
+    "string",
+    "str",
+    "final",
+    "last",
+    "json",
+    "all",
+    "yaml",
+    # "dict-final",
+    "dict-all-except-first",
+    "str-all-except-first",
+]
+
 tools = [
     {
         "type": "function",
@@ -105,7 +122,7 @@ class HybridHierarchicalClusterSwarm:
         description: str = "A swarm that uses a hybrid hierarchical-peer model to solve complex tasks.",
         swarms: List[Union[SwarmRouter, Callable]] = [],
         max_loops: int = 1,
-        output_type: str = "list",
+        output_type: HistoryOutputType = "list",
         router_agent_model_name: str = "gpt-4o-mini",
         *args,
         **kwargs,

swarms/structs/multi_model_gpu_manager.py

@@ -1168,7 +1168,6 @@ class ModelGrid:
             try:
                 # This would need to be implemented based on the specific model types
                 # and tasks supported. Here's a simple placeholder:
-                model = model_metadata.model
 
                 if model_metadata.model_type == ModelType.PYTORCH:
                     # Run PyTorch model

swarms/structs/swarm_arange.py

@@ -6,7 +6,7 @@ from swarms.utils.any_to_str import any_to_str
 from swarms.utils.loguru_logger import initialize_logger
 from swarms.structs.conversation import Conversation
 from swarms.utils.history_output_formatter import (
-    output_type,
+    HistoryOutputType,
 )
 
 logger = initialize_logger(log_folder="swarm_arange")
@@ -58,7 +58,7 @@ class SwarmRearrange:
             Callable[[str], str]
         ] = None,
         return_json: bool = False,
-        output_type: output_type = "dict-all-except-first",
+        output_type: HistoryOutputType = "dict-all-except-first",
         *args,
         **kwargs,
     ):

{swarms-7.7.4.dist-info → swarms-7.7.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: swarms
-Version: 7.7.4
+Version: 7.7.6
 Summary: Swarms - TGSC
 Home-page: https://github.com/kyegomez/swarms
 License: MIT

{swarms-7.7.4.dist-info → swarms-7.7.6.dist-info}/RECORD

@@ -21,6 +21,9 @@ swarms/cli/main.py,sha256=T9YsCrNIzvbQA8h5qlke-TbRP498Wu6R_KkAxRiabvs,15319
 swarms/cli/onboarding_process.py,sha256=3-2LKoLhjnaPbX9iiasqXPZZpqmwm-ZrXawH88M4BIU,6940
 swarms/client/__init__.py,sha256=VASeCEYoZskTU3NOw5tQ22uc2_7gyK0oLsxG_WB20ys,268
 swarms/client/main.py,sha256=f-RpvfKfRK2AaapkyPN2ihXJvIGN4JWB_A7pJu4WyiU,13735
+swarms/communication/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+swarms/communication/duckdb_wrap.py,sha256=5wfvGM00fsxkp-wqXh7bxyQBlQ4a05Z-vh_YA7k3B5M,33938
+swarms/communication/sqlite_wrap.py,sha256=Yl8gnaHL685GwJc6eHAqJ5nY-xn_nZHyn4i7rhUj9kQ,26236
 swarms/prompts/__init__.py,sha256=ZFcghAs4b0Rsjcc_DIFssiztZub5tJ66rxmJD2_tXpQ,747
 swarms/prompts/accountant_swarm_prompts.py,sha256=swceN1B0fZCOedd3-y3gjNOHDmR-3H5YK17ytp7tTDM,11320
 swarms/prompts/ag_prompt.py,sha256=mMeqC84SMNrCjQcBeejroSXLuF_wWrVRebHU1MrEQko,4577
@@ -45,6 +48,7 @@ swarms/prompts/growth_agent_prompt.py,sha256=mOxIbuhsAp5QxE4m8DADNHnMI9rAmIbatNo
 swarms/prompts/idea2img.py,sha256=ZM-iD0ZFuqU2V1SY3V5Ds6ItTDd6JzQ4vpmz3faMzlM,880
 swarms/prompts/legal_agent_prompt.py,sha256=DhIroYuviqrU7cgKz6F8U2LNSBykLH57AZqoH5AfD0U,3346
 swarms/prompts/logistics.py,sha256=_XT_feYFgv-1IzHi5cPKuAp8xBjSX5KqwlPKh9xfK7E,4785
+swarms/prompts/max_loop_prompt.py,sha256=04YPA71i0w5xxaDEtTYJbc4Jf1dRHDFCLCIvBRysjM0,1896
 swarms/prompts/meta_system_prompt.py,sha256=GOsWqtGfFezpKyg8c876Y-kCkWGI563iS2-0AaI__MI,3374
 swarms/prompts/multi_agent_collab_prompt.py,sha256=C2fX9fEJhGudG-lzvTqfzQbmJdZfgi0RRSPY9RZ1f38,13419
 swarms/prompts/multi_modal_autonomous_instruction_prompt.py,sha256=SHfaKs5Hj9sV4jgtVAFhv1N_N2e3jKwvdx_8G8-OdhM,10662
@@ -61,6 +65,7 @@ swarms/prompts/prompt_generator.py,sha256=56xRcy9J86c-Z18HGKExsArVff2AdmmSDs7C8n
 swarms/prompts/prompt_generator_optimizer.py,sha256=ODhXgN4cIHbuuSOPrt1iTzntKeQm71hNUiZsqf-gj1M,3823
 swarms/prompts/python.py,sha256=JgykzeNYLHHVvjoTR5FhZEVWJFc3SWCMgf-mRN3yMEo,13215
 swarms/prompts/react.py,sha256=nPuaIgKD2xV41y0PR06mrkC82GnWk4mw0apkrcYS_cY,2960
+swarms/prompts/react_base_prompt.py,sha256=vN82wlxwj7c5PzIXMDcXg17950D2UZDDLaaRhGiAbQA,1928
 swarms/prompts/reasoning_prompt.py,sha256=tnuJWK9VHer0IvgwjUXCM5ixMn-yfozQL0KgKQKciu4,1113
 swarms/prompts/refiner_agent_prompt.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 swarms/prompts/sales.py,sha256=tIr46slbRA8KxoOERE83DX10cGvwafzocpR00KcG_tM,5126
@@ -82,7 +87,7 @@ swarms/schemas/__init__.py,sha256=AZ7BZE3bLabA5_m83jbELB6SaOMHx1MhMy9EeUODBqs,10
 swarms/schemas/agent_step_schemas.py,sha256=a14gb58vR0xOwB_fwSJQbN6yb9HddEaT30E6hUrzEQA,2573
 swarms/schemas/base_schemas.py,sha256=UvBLVWg2qRen4tK5GJz50v42SiX95EQ5qK7hfyAHTEU,3267
 swarms/structs/__init__.py,sha256=jfvyqtA5WMpjYgvmngBqijwOhjLhRkjWAucPGe91THU,4051
-swarms/structs/agent.py,sha256=3RzXpVKnYYlAiOFxzTr9Jw9ej3J3j-Vz0BelQSZhxdg,99677
+swarms/structs/agent.py,sha256=aWl6te6MaoJsucrFlqOs9ihGnNS4tHpHhCdMoBpzFxg,98387
 swarms/structs/agent_builder.py,sha256=tYNpfO4_8cgfMHfgA5DAOWffHnt70p6CLt59esqfVCY,12133
 swarms/structs/agent_registry.py,sha256=il507cO1NF-d4ChyANVLuWrN8bXsEAi8_7bLJ_sTU6A,12112
 swarms/structs/agent_roles.py,sha256=8XEw6RjOOZelaZaWt4gXaYQm5WMLEhSO7W6Z8sQjmFg,582
@@ -93,16 +98,16 @@ swarms/structs/base_structure.py,sha256=GDu4QJQQmhU7IyuFJHIh9UVThACCva-L7uoMbVD9
 swarms/structs/base_swarm.py,sha256=LSGJDPJdyUCcK6698mNtjxoC1OU3s_J2NxC2k_ccGUs,23779
 swarms/structs/base_workflow.py,sha256=DTfFwX3AdFYxACDYwUDqhsbcDZnITlg5TeEYyxmJBCc,11414
 swarms/structs/concat.py,sha256=utezSxNyh1mIwXgdf8-dJ803NDPyEy79WE8zJHuooGk,732
-swarms/structs/concurrent_workflow.py,sha256=d1_slbALpxrdEGzZffUSAcEbONW0kc7fyTpVZTBmzi4,15517
-swarms/structs/conversation.py,sha256=pBJZ24ONvhpgjG21PAR4Jv9NSAZdpc-a3cQgg-vTapk,17683
+swarms/structs/concurrent_workflow.py,sha256=IANeOnzHcHZfrmNG6HA1RXaZLRQv6q89DiOxUg2q0Hw,20490
+swarms/structs/conversation.py,sha256=_b9YddnIi8uhTjDQMGQSW-oSUfMG5tcwIm0Yi6yMF_o,21899
 swarms/structs/csv_to_agent.py,sha256=ug9JqQFPguXeU9JQpSUXuVtOpHYdJhlpKJUJBovo694,9443
 swarms/structs/de_hallucination_swarm.py,sha256=9cC0rSSXGwYu6SRDwpeMbCcQ40C1WI1RE9SNapKRLOQ,10309
 swarms/structs/deep_research_swarm.py,sha256=axhzSK43-TViQJntt2Gz2AUhAc6zoBPzj9weRmQ8yE8,16733
 swarms/structs/dynamic_conversational_swarm.py,sha256=n_d1jDCzBwiGb0QjJpW_MlXxqEkhGEhC1ttaebH7f3Q,8098
 swarms/structs/graph_workflow.py,sha256=TAaUG_J3898hhghPOp0WEAV3Zf0in6s48ZSVbSTX-vQ,8629
-swarms/structs/groupchat.py,sha256=CivOw0QlpjugG8MIu5uGGVoA_0_oY6sBg0XlA08gViQ,15691
+swarms/structs/groupchat.py,sha256=jjH0BqU9Nrd_3jl9QzrcvbSce527SFpUaepawaRiw2o,15391
 swarms/structs/hiearchical_swarm.py,sha256=2x3InS4HJg4T9Y195l_ANTGu6DYcllqCdJcR3v5Xuro,33402
-swarms/structs/hybrid_hiearchical_peer_swarm.py,sha256=HcT1cha0uqnjAgyr6EDYP1DEZOsUvxOirTEDnJS9MFs,9234
+swarms/structs/hybrid_hiearchical_peer_swarm.py,sha256=D1iBtNNee_mxPoOWS5WGTqcci5FQKtt38mW-J42GvfM,9494
 swarms/structs/ma_utils.py,sha256=FxMNCmeSpYEczZOxK0gpgn5a50CJTc1USmRHCqvxP54,3091
 swarms/structs/majority_voting.py,sha256=F_t_MOC3YCRyMw5N6qKdFThpaXZxwixRw592Ku5Uhto,10122
 swarms/structs/malt.py,sha256=0ZOuLfOzaJ4vAVOM6J1aZ3yWAiKxfMkNIBNp8pjsEqE,19392
@@ -113,7 +118,7 @@ swarms/structs/model_router.py,sha256=V5pZHYlxSmCvAA2Gsns7LaCz8dXtRi7pCvb-oLGHYI
 swarms/structs/multi_agent_collab.py,sha256=odh2NQRR23LidsphCxUfAke369lDdgL__w3Xovu9jkA,7731
 swarms/structs/multi_agent_exec.py,sha256=Gxwr9mHADX3n29pdxor-dQDnKPSNdnicpCxBLmPwnLg,14344
 swarms/structs/multi_agent_router.py,sha256=21PfswEuxMHqlWDBCyritj9UuHTShYVQRaK0o23eia8,10999
-swarms/structs/multi_model_gpu_manager.py,sha256=h5y4eNCeBRbBqK36ifPp0RkzVbdbTrIS-Vh_LXLD0-U,47400
+swarms/structs/multi_model_gpu_manager.py,sha256=Rdzj1l6wkrYlSx21ImWMt88tFSI-gTM3S3_uTOpkUOI,47355
 swarms/structs/omni_agent_types.py,sha256=RdKLfZ-lXDJrEa0aJT_Rfx9TypJQo8SISqKz4fnLkAk,230
 swarms/structs/output_types.py,sha256=zseJBL2e50nXWy71VeAY31z9Bb2ugq9ohWUYk1xQV20,158
 swarms/structs/rearrange.py,sha256=5u7HwTVVH414w9rhEQvLdltW1ACHjgwn-zS8-8JEXmA,22576
@@ -122,7 +127,7 @@ swarms/structs/safe_loading.py,sha256=gmYX8G9TsvAIp6OCvREBZt5mwSFc-p-t1rSnDBfhEm
 swarms/structs/sequential_workflow.py,sha256=5jxHP-a2CzdclSXIrVWkQKXBr01VzrgOBIexR9s8diw,8492
 swarms/structs/spreadsheet_swarm.py,sha256=ToX56QJjlm_nnC3MYppvKC_NTr9Zy_orkBzfxNLdwbA,14845
 swarms/structs/stopping_conditions.py,sha256=JHHwqgPoUvjX897ofW2gpPZH_cqEWmv5lDTqb2GtA6M,1382
-swarms/structs/swarm_arange.py,sha256=DYjuDCh1msFrjNnFO4aVVmeSy_QXkjZFuBAEAHDR1ew,15469
+swarms/structs/swarm_arange.py,sha256=5ewEfL52Y4gh-a0lRjFcleHWlsCBuc5XR1nVEEGh07w,15481
 swarms/structs/swarm_eval.py,sha256=148E2R2zaCmt_LZYx15nmdFjybXHiQ2CZbl6pk77jNs,11635
 swarms/structs/swarm_id_generator.py,sha256=Wly7AtGM9e6VgzhYmfg8_gSOdxAdsOvWHJFK81cpQNQ,68
 swarms/structs/swarm_matcher.py,sha256=E2KwHHEJxmW-UfTeMPWZ6VCmYdQ_I9_fwrfJbxD02GY,23322
@@ -176,8 +181,8 @@ swarms/utils/try_except_wrapper.py,sha256=appEGu9Afy3TmdkNNXUgQ9yU9lj2j0uNkIoW0J
 swarms/utils/visualizer.py,sha256=0ylohEk62MAS6iPRaDOV03m9qo2k5J56tWlKJk_46p4,16927
 swarms/utils/vllm_wrapper.py,sha256=OIGnU9Vf81vE_hul1FK-xEhChFK8fxqZX6-fhQeW22c,4987
 swarms/utils/wrapper_clusterop.py,sha256=PMSCVM7ZT1vgj1D_MYAe835RR3SMLYxA-si2JS02yNQ,4220
-swarms-7.7.4.dist-info/LICENSE,sha256=jwRtEmTWjLrEsvFB6QFdYs2cEeZPRMdj-UMOFkPF8_0,11363
-swarms-7.7.4.dist-info/METADATA,sha256=nsrofluYIt5VmvVlANUDYB9HLVOHJ2XU968XhC8p-kY,94905
-swarms-7.7.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-swarms-7.7.4.dist-info/entry_points.txt,sha256=2K0rTtfO1X1WaO-waJlXIKw5Voa_EpAL_yU0HXE2Jgc,47
-swarms-7.7.4.dist-info/RECORD,,
+swarms-7.7.6.dist-info/LICENSE,sha256=jwRtEmTWjLrEsvFB6QFdYs2cEeZPRMdj-UMOFkPF8_0,11363
+swarms-7.7.6.dist-info/METADATA,sha256=Bb_y8yPpStFUTExRM33G5WX-HiKTM2pT4Axv7YmTb1I,94905
+swarms-7.7.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+swarms-7.7.6.dist-info/entry_points.txt,sha256=2K0rTtfO1X1WaO-waJlXIKw5Voa_EpAL_yU0HXE2Jgc,47
+swarms-7.7.6.dist-info/RECORD,,