Update llm.py

llm.py

@@ -64,14 +64,17 @@ class OpenAI3(LLM):
               history: Optional[List[List[str]]] = None,
               stop: Optional[List[str]] = None) -> str:
 
-        if history:
-            history = [i for i in history if i[0] is not None]
-            history = history[-self.history_len:]
-            message = [[{"role": "user", "content": i[0]}, {"role": "assistant", "content": i[1]}] for i in history]
-            message = sum(message, [])
-        else:
-            message = []
-        message.append({"role": "user", "content": prompt})
+        system, user = prompt.split('\n\nstop\n\n')
+        message = [{"role": "system", "content": system}, {"role": "user", "content": user}]
+        print(message)
+        # if history:
+        #     history = [i for i in history if i[0] is not None]
+        #     history = history[-self.history_len:]
+        #     message = [[{"role": "user", "content": i[0]}, {"role": "assistant", "content": i[1]}] for i in history]
+        #     message = sum(message, [])
+        # else:
+        #     message = []
+        # message.append({"role": "user", "content": prompt})
         params = {"model": self.MODEL_NAME, "messages": message, 'temperature': self.temperature}
         response = requests.post(self.URL, headers=self.HEADERS, json=params).json()
         answer = response['choices'][0]['message']['content']
@@ -104,15 +107,17 @@ class OpenAI4(LLM):
               prompt: str,
               history: Optional[List[List[str]]] = None,
               stop: Optional[List[str]] = None) -> str:
-
-        if history:
-            history = [i for i in history if i[0] is not None]
-            history = history[-self.history_len:]
-            message = [[{"role": "user", "content": i[0]}, {"role": "assistant", "content": i[1]}] for i in history]
-            message = sum(message, [])
-        else:
-            message = []
-        message.append({"role": "user", "content": prompt})
+        system, user = prompt.split('\n\nstop\n\n')
+        message = [{"role": "system", "content": system}, {"role": "user", "content": user}]
+        # if history:
+        #     history = [i for i in history if i[0] is not None]
+        #     history = history[-self.history_len:]
+        #     message = [[{"role": "user", "content": i[0]}, {"role": "assistant", "content": i[1]}] for i in history]
+        #     message = sum(message, [])
+        # else:
+        #     message = []
+        # message.append({"role": "user", "content": prompt})
+        print(message)
         params = {"model": self.MODEL_NAME, "messages": message, 'temperature': self.temperature}
         response = requests.post(self.URL, headers=self.HEADERS, json=params).json()
         answer = response['choices'][0]['message']['content']
@@ -121,6 +126,4 @@ class OpenAI4(LLM):
         # question = prompt.split('question:\n')[-1]
         # self.history = self.history+[[question, response]]
 
-        return answer
-
-
+        return answer