:zap: [Enhance] OpenAI API to bing chat: Fix suggestions output, and unnecessary data line

apis/chat_api.py

@@ -11,17 +11,6 @@ from networks import OpenaiStreamOutputer
 from sse_starlette.sse import EventSourceResponse
 
 
-def mock_stream_chat(prompt):
-    outputer = OpenaiStreamOutputer()
-    for i in range(10):
-        output = outputer.output(content=f"MSG {i} ", content_type="Completions")
-        print(output)
-        yield output
-    output = outputer.output(content="", content_type="Finished")
-    print(output)
-    yield output
-
-
 class ChatAPIApp:
     def __init__(self):
         self.app = FastAPI(
@@ -144,13 +133,13 @@ class ChatAPIApp:
         )
 
     def chat_completions(self, item: ChatCompletionsPostItem):
-        # connector = ConversationConnector(
-        #     conversation_style=item.model,
-        #     sec_access_token=item.sec_access_token,
-        #     client_id=item.client_id,
-        #     conversation_id=item.conversation_id,
-        #     invocation_id=item.invocation_id,
-        # )
+        connector = ConversationConnector(
+            conversation_style=item.model,
+            sec_access_token=item.sec_access_token,
+            client_id=item.client_id,
+            conversation_id=item.conversation_id,
+            invocation_id=item.invocation_id,
+        )
 
         if item.invocation_id == 0:
             # TODO: History Messages Merger
@@ -159,8 +148,7 @@ class ChatAPIApp:
             prompt = item.messages[-1]["content"]
 
         return EventSourceResponse(
-            # connector.stream_chat(prompt=prompt, yield_output=True),
-            mock_stream_chat(prompt),
+            connector.stream_chat(prompt=prompt, yield_output=True),
             media_type="text/event-stream",
         )
 

conversations/conversation_connector.py

@@ -98,7 +98,12 @@ class ConversationConnector:
                 # Stream: Meaningful Messages
                 if data.get("type") == 1:
                     if yield_output:
-                        yield message_parser.parse(data, return_output=True)
+                        output = message_parser.parse(data, return_output=True)
+                        if isinstance(output, list):
+                            for item in output:
+                                yield item
+                        else:
+                            yield output
                     else:
                         message_parser.parse(data)
                 # Stream: List of all messages in the whole conversation

examples/chat_with_openai.py

@@ -15,7 +15,7 @@ response = client.chat.completions.create(
     messages=[
         {
             "role": "user",
-            "content": "how many questions have I asked you?",
+            "content": "search california's weather for me",
         }
     ],
     stream=True,
@@ -29,4 +29,5 @@ for chunk in response:
     elif chunk.choices[0].finish_reason == "stop":
         print()
     else:
-        print(chunk)
+        # print(chunk)
+        pass

networks/message_outputer.py

@@ -7,21 +7,13 @@ class OpenaiStreamOutputer:
     * https://platform.openai.com/docs/api-reference/chat/create
     """
 
-    def data_to_string(self, data={}, content_type="", media_type=None):
+    def data_to_string(self, data={}, content_type=""):
         # return (json.dumps(data) + "\n").encode("utf-8")
-        data_str = f"{json.dumps(data)}\n"
-
-        if media_type == "text/event-stream":
-            data_str = f"data: {data_str}"
+        data_str = f"{json.dumps(data)}"
 
         return data_str
 
-    def output(
-        self,
-        content=None,
-        content_type=None,
-        media_type=None,
-    ) -> bytes:
+    def output(self, content=None, content_type=None) -> str:
         data = {
             "created": 1677825464,
             "id": "chatcmpl-bing",
@@ -69,4 +61,4 @@ class OpenaiStreamOutputer:
                     "finish_reason": None,
                 }
             ]
-        return self.data_to_string(data, content_type, media_type)
+        return self.data_to_string(data, content_type)

networks/message_parser.py

@@ -1,5 +1,3 @@
-import json
-
 from utils.logger import logger
 from networks import OpenaiStreamOutputer
 
@@ -33,7 +31,7 @@ class MessageParser:
                         for suggestion_text in suggestion_texts:
                             logger.file(f"- {suggestion_text}")
                     if return_output:
-                        output_bytes = self.outputer.output(
+                        completions_output = self.outputer.output(
                             delta_content, content_type="Completions"
                         )
                         if message.get("suggestedResponses"):
@@ -41,11 +39,13 @@ class MessageParser:
                             suggestion_texts_str += "\n".join(
                                 f"- {item}" for item in suggestion_texts
                             )
-                            output_bytes += self.outputer.output(
+                            suggestions_output = self.outputer.output(
                                 suggestion_texts_str,
                                 content_type="SuggestedResponses",
                             )
-                        return output_bytes
+                            return [completions_output, suggestions_output]
+                        else:
+                            return completions_output
 
                 # Message: Search Query
                 elif message_type in ["InternalSearchQuery"]: