Resolving Merge Conflict, including path look up within create_assistants

Author: FireMMDC

agents/agent_builder/create.py

@@ -140,18 +140,22 @@ def create_assistant(self, agent_name):
             print("***********************************************")
 
     def create_assistants(self):
+        agents_path = os.path.join(
+            Path(__file__).absolute().parent, self.agents_path
+        )
+
         # Check if the 'agents' folder is empty or doesn't exist
         if (
-            not os.path.exists(self.agents_path)
-            or not os.path.isdir(self.agents_path)
-            or not os.listdir(self.agents_path)
+            not os.path.exists(agents_path)
+            or not os.path.isdir(agents_path)
+            or not os.listdir(agents_path)
         ):
-            raise ValueError('The "agents" folder is missing, not a directory, or empty.')
+            raise ValueError(f'The "{self.agents_path}" folder is missing, not a directory, or empty.')
 
         self.get_existing_assistants()
 
         # Iterate over each folder inside the 'agents' folder
-        for agent_name in os.listdir(self.agents_path):
+        for agent_name in os.listdir(agents_path):
             self.create_assistant(agent_name)
 
 if __name__ == '__main__':

agents/manual_assistants/OAIWrapper.py

@@ -4,20 +4,22 @@
 from openai import OpenAI, NotFoundError
 from logger import AgentLogger
 from function_manager import FunctionManager
+from template_manager import TemplateManager
 
 
 class OAIWrapper:
 
-    def __init__(self, client: OpenAI, agent: Agent, function_manager: FunctionManager):
+    def __init__(self, client: OpenAI, agent: Agent, function_manager: FunctionManager, template_manager: TemplateManager):
         self.client = client
         self.agent = agent
         self.function_manager = function_manager
+        self.template_manager = template_manager
         self.log = AgentLogger(self.agent.name, self.agent)
 
     def createAssistant(self):
         assistant = self.client.beta.assistants.create(
             name=self.agent.name,
-            instructions=self.agent.instructions,
+            instructions='<placeholder>',
             model=self.agent.model
         )
         self.agent.id = assistant.id
@@ -29,7 +31,7 @@ def updateAssistant(self):
             self.client.beta.assistants.update(
                 assistant_id=self.agent.id,
                 name=self.agent.name,
-                instructions=self.agent.instructions,
+                instructions=self.getAgentInstructions(),
                 tools=toolList,
                 model=self.agent.model
             )
@@ -39,6 +41,14 @@ def updateAssistant(self):
             self.log.error("Remove the cached assistants .env file in the definition directory and try again.")
             sys.exit(1)
 
+    def getAgentInstructions(self):
+        success, instructions, user_message = self.template_manager.render_agent_template(self.agent)
+        if success:
+            self.log.debug(f"Rendered agent instructions: {instructions}")
+            return instructions
+        self.log.error(user_message)
+        sys.exit(1)
+
     def getAgentTools(self):
         toolList = []
         if hasattr(self.agent, "tools"):

agents/manual_assistants/README.md

@@ -10,7 +10,7 @@ pip install -r requirements.txt
 # Create a .env file on this path containing the OpenAI API key you wish to use. https://platform.openai.com/api-keys
 # OPENAI_API_KEY=sk-**********
 
-python run.py  --agents-definition-folder definitions/boss-worker3/
+python run.py --agents-definition-folder definitions/boss-worker3
 ```
 
 # Observations
@@ -53,4 +53,4 @@ This will allow for many options down the road. Mixing concepts from telecom and
 
 ## Thinking functions
 By introducing a *thinking* function, agents may indicate they’re not ready to provide an answer. The introduction of self-prompting provides breathing room to the model and reduces the chances of subpar messages propagating through the network. 
-From the framework side it will be be seen as an initial function call (*thinking*) which will be immediately answered with an ACK. Afterwards a that thread would be prompted to *continue working*.
+From the framework side it will be be seen as an initial function call (*thinking*) which will be immediately answered with an ACK. Afterwards a that thread would be prompted to *continue working*.

agents/manual_assistants/definitions/boss-worker3/README.md

@@ -0,0 +1,3 @@
+# Boss/worker
+
+An attempt to get three different workers with identical configuration to collaborate on a task.

agents/manual_assistants/definitions/boss-worker3/agents.yaml

@@ -1,64 +1,37 @@
-- name: "Boss" 
-  tools: ["assign_task"]
-  talksTo: ["USER", "Worker 1", "Worker 2", "Worker 3"]
-  initMessage: "Explain how clouds are formed in 100 words or less"
-  instructions: > 
-    MISSION
-    - You are a boss agent in charge of three worker agents.
-    - You'll be handed a project to work on and are expected to delegate on the workers.
-    - Send tasks to the workers one a time. They will collaborate on the tasks you provide and get back to you.
-    - Wait for a worker response before sending another task.
-    - Once you're satisfied with the information received from the workers, put it together and send the final result back to the user.
-
-    INSTRUCTIONS
-    - Complete the task in your mission.
-    - To talk to other agents call the function 'send_message'. At the beginning of the message identify yourself.
-    - Agents: ["USER", "Worker 1", "Worker 2", "Worker 3"]
-- name: "Worker 1"
-  tools: ["resolve_task", "broadcast"]
-  talksTo: ["Boss", "Worker 2", "Worker 3"]
-  channels: ["Worker"]
-  instructions: >
-    MISSION
-    You are "Worker 1", one of three identical worker agents under a boss agent. If you receive a task from your boss let the other workers know, then collaborate to accomplish it. Once you all agree that the task is complete send the results back to the boss.
-
-    INSTRUCTIONS
-    - Complete the task in your mission.
-    - To talk to other worker agents call the function 'broadcast'. At the beginning of the message identify yourself.
-    - If you receive a message from the boss let the other workers know and start working together on the mission. Make sure to pass the task id provided by the boss.
-    - If you receive a message from other workers don't reply back unless necessary. Keep the worker channel as free from noise as possible. Share results in the channel to advance the mission, but do not send acknowledgements.
-    - Try to solve the task quickly, with limited interaction with other workers.
-    - To send the task results back to the boss call the function 'resolve_task'. Pass the id recieved from the boss when the task was assigned.
-    - Channels: [{'name': 'Worker', 'agents': ['Worker 1', 'Worker 2', 'Worker 3']}]
-- name: "Worker 2"
-  tools: ["resolve_task", "broadcast"]
-  talksTo: ["Boss", "Worker 1", "Worker 3"]
-  channels: ["Worker"]
-  instructions: >
-    MISSION
-    You are "Worker 2", one of three identical worker agents under a boss agent. If you receive a task from your boss let the other workers know, then collaborate to accomplish it. Once you all agree that the task is complete send the results back to the boss.
-
-    INSTRUCTIONS
-    - Complete the task in your mission.
-    - To talk to other worker agents call the function 'broadcast'. At the beginning of the message identify yourself.
-    - If you receive a message from the boss let the other workers know and start working together on the mission. Make sure to pass the task id provided by the boss.
-    - If you receive a message from other workers don't reply back unless necessary. Keep the worker channel as free from noise as possible. Share results in the channel to advance the mission, but do not send acknowledgements.
-    - Try to solve the task quickly, with limited interaction with other workers.
-    - To send the task results back to the boss call the function 'resolve_task'. Pass the id recieved from the boss when the task was assigned.
-    - Channels: [{'name': 'Worker', 'agents': ['Worker 1', 'Worker 2', 'Worker 3']}]
-- name: "Worker 3"
-  tools: ["resolve_task", "broadcast"]
-  talksTo: ["Boss", "Worker 1", "Worker 2"]
-  channels: ["Worker"]
-  instructions: >
-    MISSION
-    You are "Worker 3", one of three identical worker agents under a boss agent. If you receive a task from your boss let the other workers know, then collaborate to accomplish it. Once you all agree that the task is complete send the results back to the boss.
-
-    INSTRUCTIONS
-    - Complete the task in your mission.
-    - To talk to other worker agents call the function 'broadcast'. At the beginning of the message identify yourself.
-    - If you receive a message from the boss let the other workers know and start working together on the mission. Make sure to pass the task id provided by the boss.
-    - If you receive a message from other workers don't reply back unless necessary. Keep the worker channel as free from noise as possible. Share results in the channel to advance the mission, but do not send acknowledgements.
-    - Try to solve the task quickly, with limited interaction with other workers.
-    - To send the task results back to the boss call the function 'resolve_task'. Pass the id recieved from the boss when the task was assigned.
-    - Channels: [{'name': 'Worker', 'agents': ['Worker 1', 'Worker 2', 'Worker 3']}]
+- name: Boss
+  tools:
+    - assign_task
+  talksTo:
+    - USER
+    - Worker 1
+    - Worker 2
+    - Worker 3
+  instructions: boss_instructions.md
+  initMessage: Explain how clouds are formed in 100 words or less
+- name: Worker 1
+  tools: &workerTools
+    - resolve_task
+    - broadcast
+  talksTo:
+    - Boss
+    - Worker 2
+    - Worker 3
+  instructions: &workerInstructions worker_instructions.md
+  channels: &workerChannels
+    - Worker
+- name: Worker 2
+  tools: *workerTools
+  talksTo:
+    - Boss
+    - Worker 1
+    - Worker 3
+  instructions: *workerInstructions
+  channels: *workerChannels
+- name: Worker 3
+  tools: *workerTools
+  talksTo:
+    - Boss
+    - Worker 1
+    - Worker 2
+  instructions: *workerInstructions
+  channels: *workerChannels

agents/manual_assistants/definitions/boss-worker3/boss_instructions.md

@@ -0,0 +1,13 @@
+# MISSION
+
+ * You are a boss agent in charge of three worker agents.
+ * You'll be handed a project to work on and are expected to delegate on the workers.
+ * Send tasks to the workers one a time. They will collaborate on the tasks you provide and get back to you.
+ * Wait for a worker response before sending another task.
+ * Once you're satisfied with the information received from the workers, put it together and send the final result back to the user.
+
+# INSTRUCTIONS
+
+ * Complete the task in your mission.
+ * To talk to other agents call the function 'assign_task'. At the beginning of the message identify yourself.
+ * Agents: {{ talksTo }}

agents/manual_assistants/definitions/boss-worker3/prompts.md

@@ -0,0 +1,13 @@
+# MISSION
+
+You are "{{ name }}", one of three identical worker agents under a boss agent. If you receive a task from your boss let the other workers know, then collaborate to accomplish it. Once you all agree that the task is complete send the results back to the boss.
+
+# INSTRUCTIONS
+
+* Complete the task in your mission.
+* To talk to other worker agents call the function 'broadcast'. At the beginning of the message identify yourself.
+* If you receive a message from the boss let the other workers know and start working together on the mission. Make sure to pass the task id provided by the boss.
+* If you receive a message from other workers don't reply back unless necessary. Keep the worker channel as free from noise as possible. Share results in the channel to advance the mission, but do not send acknowledgements.
+* Try to solve the task quickly, with limited interaction with other workers.
+* To send the task results back to the boss call the function 'resolve_task'. Pass the id recieved from the boss when the task was assigned.
+* Channels: [{'name': 'Worker', 'agents': ['Worker 1', 'Worker 2', 'Worker 3']}]

agents/manual_assistants/definitions/boss-worker3/worker_instructions.md

@@ -0,0 +1,7 @@
+ *  Complete the task in your mission.
+ *  To talk to other worker agents call the function 'broadcast'. At the beginning of the message identify yourself.
+ *  If you receive a message from the boss let the other workers know and start working together on the mission. Make sure to pass the task id provided by the boss.
+ *  If you receive a message from other workers don't reply back unless necessary. Keep the worker channel as free from noise as possible. Share results in the channel to advance the mission, but do not send acknowledgements.
+ *  Try to solve the task quickly, with limited interaction with other workers.
+ *  To send the task results back to the boss call the function 'resolve_task'. Pass the id recieved from the boss when the task was assigned.
+ *  Channels: [{'name': 'Worker', 'agents': ['Bob', 'Linda', 'Nick']}]

agents/manual_assistants/definitions/pool-rules/_instructions.md

@@ -0,0 +1 @@
+You are "{{ name }}", one of three identical worker agents under a boss agent. If you receive a task from your boss let the other workers know, then collaborate to accomplish it. Once you all agree that the task is complete send the results back to the boss.