From 20c3d8a19c22843c1d0ff25a09919a571f9fadf6 Mon Sep 17 00:00:00 2001
From: harshalmore31 <harshalmore2468@gmail.com>
Date: Mon, 30 Jun 2025 22:03:32 +0530
Subject: [PATCH] Refactor streaming response formatting and printing logic for
 improved clarity and functionality

---
 swarms/structs/agent.py   | 27 ++++++++++++++-------------
 swarms/utils/formatter.py | 14 +++++++++-----
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/swarms/structs/agent.py b/swarms/structs/agent.py
index 87eb131d..72cfdfc0 100644
--- a/swarms/structs/agent.py
+++ b/swarms/structs/agent.py
@@ -2557,7 +2557,7 @@ class Agent:
                         complete_response = formatter.print_streaming_panel(
                             streaming_response,
                             title=f"🤖 Agent: {self.agent_name} Loops: {current_loop}",
-                            style="bold cyan",
+                            style=None,  # Use random color like non-streaming approach
                             collect_chunks=True,
                             on_chunk_callback=on_chunk_received,
                         )
@@ -2796,19 +2796,20 @@ class Agent:
         return self.role
 
     def pretty_print(self, response: str, loop_count: int):
+        if self.streaming_on is True:
+            # Skip printing here since real streaming is handled in call_llm
+            # This avoids double printing when streaming_on=True
+            return
+        
         if self.print_on is False:
-            if self.streaming_on is True:
-                # Skip printing here since real streaming is handled in call_llm
-                # This avoids double printing when streaming_on=True
-                pass
-            elif self.no_print is True:
-                pass
-            else:
-                # logger.info(f"Response: {response}")
-                formatter.print_panel(
-                    f"{self.agent_name}: {response}",
-                    f"Agent Name {self.agent_name} [Max Loops: {loop_count} ]",
-                )
+            # Show raw text without formatting panels
+            print(f"\n{self.agent_name}: {response}\n")
+        else:
+            # Use formatted panels (default behavior when print_on=True)
+            formatter.print_panel(
+                f"{self.agent_name}: {response}",
+                f"Agent Name {self.agent_name} [Max Loops: {loop_count} ]",
+            )
 
     def parse_llm_output(self, response: Any):
         """Parse and standardize the output from the LLM.
diff --git a/swarms/utils/formatter.py b/swarms/utils/formatter.py
index 5a4b8c2e..e10afc7f 100644
--- a/swarms/utils/formatter.py
+++ b/swarms/utils/formatter.py
@@ -156,7 +156,7 @@ class Formatter:
         self,
         streaming_response,
         title: str = "🤖 Agent Streaming Response",
-        style: str = choose_random_color(),
+        style: str = None,
         collect_chunks: bool = False,
         on_chunk_callback: Optional[Callable] = None,
     ) -> str:
@@ -167,13 +167,17 @@ class Formatter:
         Args:
             streaming_response: The streaming response generator from LiteLLM.
             title (str): Title of the panel.
-            style (str): Style for the panel border.
+            style (str): Style for the panel border (if None, will use random color).
             collect_chunks (bool): Whether to collect individual chunks for conversation saving.
             on_chunk_callback (Optional[Callable]): Callback function to call for each chunk.
 
         Returns:
             str: The complete accumulated response text.
         """
+        # Get random color similar to non-streaming approach
+        random_color = choose_random_color()
+        panel_style = f"bold {random_color}" if style is None else style
+        text_style = random_color
 
         def create_streaming_panel(text_obj, is_complete=False):
             """Create panel with proper text wrapping using Rich's built-in capabilities"""
@@ -190,7 +194,7 @@ class Formatter:
             panel = Panel(
                 display_text,
                 title=panel_title,
-                border_style=style,
+                border_style=panel_style,
                 padding=(1, 2),
                 width=self.console.size.width,  # Rich handles wrapping automatically
             )
@@ -214,9 +218,9 @@ class Formatter:
                         and part.choices
                         and part.choices[0].delta.content
                     ):
-                        # Add ONLY the new chunk to the Text object
+                        # Add ONLY the new chunk to the Text object with random color style
                         chunk = part.choices[0].delta.content
-                        streaming_text.append(chunk, style="white")
+                        streaming_text.append(chunk, style=text_style)
                         complete_response += chunk
 
                         # Collect chunks if requested