From 6e25f51bbcf2ad52924d01ac4988d9cea05cf85d Mon Sep 17 00:00:00 2001
From: Kye <kye@apacmediasolutions.com>
Date: Fri, 6 Oct 2023 12:18:06 -0400
Subject: [PATCH] clean up

---
 swarms/swarms/groupchat.py | 69 ++++++++++++++------------------------
 1 file changed, 26 insertions(+), 43 deletions(-)

diff --git a/swarms/swarms/groupchat.py b/swarms/swarms/groupchat.py
index f314871c..e0085d06 100644
--- a/swarms/swarms/groupchat.py
+++ b/swarms/swarms/groupchat.py
@@ -7,29 +7,29 @@ from swarms.agents.base import AbstractAgent
 
 @dataclass
 class GroupChat:
-    """A group chat with multiple participants with a list of workers and a max number of rounds"""
+    """A group chat with multiple participants with a list of agents and a max number of rounds"""
 
-    workers: List[AbstractAgent]
+    agents: List[AbstractAgent]
     messages: List[Dict]
     max_rounds: int = 10
-    admin_name: str = "Admin" #admin worker
+    admin_name: str = "Admin" #admin agent
 
     @property
-    def worker_names(self) -> List[str]:
-        """returns the names of the workers in the group chat"""
-        return [worker.ai_name for worker in self.workers]
+    def agent_names(self) -> List[str]:
+        """returns the names of the agents in the group chat"""
+        return [agent.ai_name for agent in self.agents]
     
     def reset(self):
         self.messages.clear()
     
-    def worker_by_name(self, name: str) -> AbstractAgent:
+    def agent_by_name(self, name: str) -> AbstractAgent:
         """Find the next speaker baed on the message"""
-        return self.workers[self.worker_names.index(name)]
+        return self.agents[self.agent_names.index(name)]
     
-    def next_worker(self, worker: AbstractAgent) -> AbstractAgent:
-        """Returns the next worker in the list"""
-        return self.workers[
-            (self.workers_names.index(worker.ai_name) + 1) % len(self.workers)
+    def next_agent(self, agent: AbstractAgent) -> AbstractAgent:
+        """Returns the next agent in the list"""
+        return self.agents[
+            (self.agents_names.index(agent.ai_name) + 1) % len(self.agents)
         ]
     
     def select_speaker_msg(self):
@@ -39,7 +39,7 @@ class GroupChat:
         You are in a role play game the following rules are available:
         {self.__participant_roles()}.
 
-        Read the following conversation then select the next role from {self.worker_names}
+        Read the following conversation then select the next role from {self.agent_names}
         to play and only return the role
         """
     
@@ -55,20 +55,20 @@ class GroupChat:
             self.messages + [
                 {
                     "role": "system",
-                    "context": f"Read the above conversation. Then select the next role from {self.worker_names} to play. Only return the role.",
+                    "context": f"Read the above conversation. Then select the next role from {self.agent_names} to play. Only return the role.",
                 }
             ]
         )
         if not final:
-            return self.next_worker(last_speaker)
+            return self.next_agent(last_speaker)
         try:
-            return self.worker_by_name(name)
+            return self.agent_by_name(name)
         except ValueError:
-            return self.next_worker(last_speaker)
+            return self.next_agent(last_speaker)
         
     def _participant_roles(self):
         return "\n".join(
-            [f"{worker.ai_name}: {worker.system_message}" for worker in self.workers] 
+            [f"{agent.ai_name}: {agent.system_message}" for agent in self.agents] 
         )
 
 
@@ -118,12 +118,12 @@ class GroupChatManager(AbstractAgent):
             
             groupchat.messages.append(message)
 
-            #broadcast the message to all workers except the speaker
-            for worker in groupchat.workers:
-                if worker != speaker:
+            #broadcast the message to all agents except the speaker
+            for agent in groupchat.agents:
+                if agent != speaker:
                     self.send(
                         message,
-                        worker,
+                        agent,
                         request_reply=False,
                         silent=True,
                     )
@@ -138,12 +138,12 @@ class GroupChatManager(AbstractAgent):
             
             except KeyboardInterrupt:
                 #let the admin speak if interrupted
-                if groupchat.admin_name in groupchat.worker_names:
-                    #admin worker is a particpant
-                    speaker = groupchat.worker_by_name(groupchat.admin_name)
+                if groupchat.admin_name in groupchat.agent_names:
+                    #admin agent is a particpant
+                    speaker = groupchat.agent_by_name(groupchat.admin_name)
                     reply = speaker.generate_reply(sender=self)
                 else:
-                    #admin worker is not found in particpants
+                    #admin agent is not found in particpants
                     raise
             if reply is None:
                 break
@@ -157,20 +157,3 @@ class GroupChatManager(AbstractAgent):
             message = self.last_message(speaker)
             message = self.last_messge(speaker)
         return True, None
-
-# model = GroupChatManager(
-#     groupchat=GroupChat(
-#         workers=[
-#             AbstractAgent(name="A", system_message="I am worker A"),
-#             AbstractAgent(name="B", system_message="I am worker B"),
-#             AbstractAgent(name="C", system_message="I am worker C"),
-#         ]
-#     )
-# )
-
-# model.run(
-#     messages=[
-#         'A: Hello, I am worker A',
-#         'B: Hello, I am worker B',
-#     ]
-# )
\ No newline at end of file