Update agents.py

agents.py

@@ -36,7 +36,7 @@ used_ports = []
 server_ports = []
 client_ports = []
 
-class Llama2:
+ class Llama2:
 
     def __init__(self, fireworksAPI):
 
@@ -81,18 +81,13 @@ class Llama2:
                 else:
                     generated_responses.append(message[2])
 
-            # Create a list of message dictionaries for the conversation history
-            conversation_history = []
-            for user_input, generated_response in zip(past_user_inputs, generated_responses):
-                conversation_history.append({"role": "user", "content": str(user_input)})
-                conversation_history.append({"role": "assistant", "content": str(generated_response)})
-
             # Prepare data to send to the chatgpt-api.shn.hk           
             response = fireworks.client.ChatCompletion.create(
-                model="accounts/fireworks/models/llama-v2-7b-chat",
+                model="accounts/fireworks/models/llama-v2-70b-chat",
                 messages=[
-                {"role": "system", "content": instruction},
-                conversation_history,
+                {"role": "system", "content": self.system_instruction},
+                *[{"role": "user", "content": input} for input in past_user_inputs],
+                *[{"role": "assistant", "content": response} for response in generated_responses],
                 {"role": "user", "content": question}
                 ],
                 stream=False,
@@ -189,11 +184,11 @@ class Llama2:
                     continue
 
                 except websockets.exceptions.ConnectionClosedError as e:
-                    clients.remove(self.cli_name2)
+                    self.clients.remove(self.cli_name2)
                     print(f"Connection closed: {e}")
 
                 except Exception as e:
-                    clients.remove(self.cli_name2)
+                    self.clients.remove(self.cli_name2)
                     print(f"Error: {e}")
 
     async def start_server(self, serverPort):
@@ -296,14 +291,14 @@ class Llama2:
         await self.startClient(clientPort)
 
     async def ask_Forefront(self, question):
-        api = FOREFRONT_API_KEY
+        api = "sk-9nDzLqZ7Umy7hmp1kZRPun628aSpABt6"
         forefront = ForefrontAI(api)
         response = await forefront.handleInput(question)
         print(response)
         return response
                 
     async def ask_Claude(self, question):
-        api = ANTHROPIC_API_KEY
+        api = "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"
         claude = Claude3(api)
         response = await claude.handleInput(question)
         print(response)
@@ -494,7 +489,7 @@ class Llama2:
 
     async def askCharacter(self, question):
         characterID = await self.pickCharacter(question)
-        token = CHARACTERAI_API_KEY
+        token = "d9016ef1aa499a1addb44049cedece57e21e8cbb"
         character = CharacterAI(token, characterID)
         answer = await character.handleInput(question)
         return answer