:recycle: [Refactor] OpenaiStreamOutputer: Unify JSON output formatters

conversations/conversation_connector.py

@@ -8,7 +8,7 @@ from networks import (
     ChathubRequestPayloadConstructor,
     ConversationRequestHeadersConstructor,
 )
-from networks import MessageParser, IdleOutputer, ContentJSONOutputer
+from networks import MessageParser, OpenaiStreamOutputer
 from utils.logger import logger
 
 http_proxy = "http://localhost:11111"  # Replace with yours
@@ -80,7 +80,7 @@ class ConversationConnector:
     async def stream_chat(self, prompt="", yield_output=False):
         await self.connect()
         await self.send_chathub_request(prompt)
-        message_parser = MessageParser(outputer=ContentJSONOutputer())
+        message_parser = MessageParser(outputer=OpenaiStreamOutputer())
         while not self.wss.closed:
             response_lines_str = await self.wss.receive_str()
             if isinstance(response_lines_str, str):
@@ -111,15 +111,9 @@ class ConversationConnector:
                     await self.wss.close()
                     await self.aiohttp_session.close()
                     if yield_output:
-                        yield (
-                            json.dumps(
-                                {
-                                    "content": finished_str,
-                                    "content_type": "Finished",
-                                }
-                            )
-                            + "\n"
-                        ).encode("utf-8")
+                        yield message_parser.outputer.output(
+                            content=finished_str, content_type="Finished"
+                        )
                     break
                 # Stream: Heartbeat Signal
                 elif data.get("type") == 6:

networks/__init__.py

@@ -3,6 +3,6 @@ from .cookies_constructor import CookiesConstructor
 from .conversation_request_headers_constructor import (
     ConversationRequestHeadersConstructor,
 )
-from .message_outputer import IdleOutputer, ContentJSONOutputer
+from .message_outputer import OpenaiStreamOutputer
 from .message_parser import MessageParser
 from .stream_response_constructor import StreamResponseConstructor

networks/message_outputer.py

@@ -1,13 +1,8 @@
 import json
 
 
-class IdleOutputer:
-    def output(self, content=None, content_type=None):
-        return json.dumps({}).encode("utf-8")
-
-
-class ContentJSONOutputer:
-    def output(self, content=None, content_type=None):
+class OpenaiStreamOutputer:
+    def output(self, content=None, content_type=None) -> bytes:
         return (
             json.dumps(
                 {

networks/message_parser.py

@@ -1,11 +1,11 @@
 import json
 
 from utils.logger import logger
-from networks import IdleOutputer, ContentJSONOutputer
+from networks import OpenaiStreamOutputer
 
 
 class MessageParser:
-    def __init__(self, outputer=ContentJSONOutputer()):
+    def __init__(self, outputer=OpenaiStreamOutputer()):
         self.delta_content_pointer = 0
         self.outputer = outputer
 
@@ -26,8 +26,11 @@ class MessageParser:
                     # Message: Suggested Questions
                     if message.get("suggestedResponses"):
                         logger.note("\nSuggested Questions: ")
-                        for suggestion in message.get("suggestedResponses"):
-                            suggestion_text = suggestion.get("text")
+                        suggestion_texts = [
+                            suggestion.get("text")
+                            for suggestion in message.get("suggestedResponses")
+                        ]
+                        for suggestion_text in suggestion_texts:
                             logger.file(f"- {suggestion_text}")
                     if return_output:
                         output_bytes = self.outputer.output(
@@ -35,7 +38,7 @@ class MessageParser:
                         )
                         if message.get("suggestedResponses"):
                             output_bytes += self.outputer.output(
-                                message.get("suggestedResponses"),
+                                suggestion_texts,
                                 content_type="SuggestedResponses",
                             )
                         return output_bytes
@@ -78,14 +81,5 @@ class MessageParser:
                         f"Not Supported Message Type: {message_type}"
                     )
 
-        return (
-            (
-                json.dumps(
-                    {
-                        "content": "",
-                        "content_type": "NotImplemented",
-                    }
-                )
-            )
-            + "\n"
-        ).encode("utf-8")
+        # return OpenaiStreamOutputer().output(content="", content_type="NotImplemented")
+        return b""