Update browser logic to match updated chat format

Author: GregoryComer

chat_in_browser.py

@@ -17,19 +17,37 @@ def create_app(*args):
 
     # create a new process and set up pipes for communication
     proc = subprocess.Popen(
-        ["python3", "generate.py", *args], stdin=subprocess.PIPE, stdout=subprocess.PIPE
+        ["python", "generate.py", *args], stdin=subprocess.PIPE, stdout=subprocess.PIPE
     )
 
+
     @app.route("/")
     def main():
+        print("Starting chat session.")
+        line = b""
         output = ""
         global disable_input
 
         while True:
-            line = proc.stdout.readline()
-            if line.decode("utf-8").startswith("What is your prompt?"):
+            buffer = proc.stdout.read(1)
+            line += buffer
+            decoded = line.decode("utf-8")
+
+            if decoded.startswith("System Prompt") and decoded.endswith(": "):
+                print(f"| {decoded}")
+                proc.stdin.write("\n".encode("utf-8"))
+                proc.stdin.flush()
+                line = b""
+            elif line.decode("utf-8").startswith("User: "):
+                print(f"| {decoded}")
                 break
-            output += line.decode("utf-8").strip() + "\n"
+
+            if decoded.endswith("\r") or decoded.endswith("\n"):
+                decoded = decoded.strip()
+                print(f"| {decoded}")
+                output += decoded + "\n"
+                line = b""
+
         return render_template(
             "chat.html",
             convo="Hello! What is your prompt?",
@@ -44,23 +62,38 @@ def chat():
         proc.stdin.write((_prompt + "\n").encode("utf-8"))
         proc.stdin.flush()
 
+        print(f"User: {_prompt}")
+
+        line = b""
         output = ""
         global disable_input
 
         while True:
-            line = proc.stdout.readline()
-            if line.decode("utf-8").startswith("What is your prompt?"):
+            buffer = proc.stdout.read(1)
+            line += buffer
+            decoded = line.decode("utf-8")
+
+            if decoded.startswith("User: "):
                 break
-            if line.decode("utf-8").startswith("=========="):
+            if decoded.startswith("=========="):
                 disable_input = True
                 break
-            output += line.decode("utf-8").strip() + "\n"
+            if decoded.endswith("\r") or decoded.endswith("\n"):
+                decoded = decoded.strip()
+                print(f"| {decoded}")
+                output += decoded + "\n"
+                line = b""
+
+        # Strip "Model: " from output
+        model_prefix = "Model: "
+        if output.startswith(model_prefix):
+            output = output[len(model_prefix):]
 
         global convo
 
         if _prompt:
-            convo += "<H1>Your prompt</H1>\n<p> " + _prompt + " </p>\n\n"
-            convo += "<H1>My response</H1>\n<p> " + output + " </p>\n\n"
+            convo += "<H1>User</H1>\n<p> " + _prompt + " </p>\n\n"
+            convo += "<H1>Model</H1>\n<p> " + output + " </p>\n\n"
 
         return render_template("chat.html", convo=convo, disable_input=disable_input)