Update app.py

app.py

@@ -14,8 +14,6 @@ classAns = os.environ['classAns']
 defaultMsg = os.environ['defaultMsg']
 defaultMsgEnd = os.environ['defaultMsgEnd']
 
-mod = 3;
-
 def localRace(race):    
     race = race
     return race
@@ -24,20 +22,12 @@ def localClass(cls):
     cls = cls
     return cls
 
-def trimMessages(messages):
-    # Assuming messages is an array of objects with "role" and "content" properties
-    content = {}
-    for message in messages:        
-        if message["role"] == "assistant":
-            if "Current Status:" in message["content"]:
-                content = message["content"]
-                start_index = message["content"].index("Current Status:") + len("Current Status:")
-                end_index = message["content"].index("Wielding:")
-                new_content = message["content"][:start_index] + message["content"][end_index:]
-                message["content"] = new_content
-    if content != {}:
-        messages.append({"role": "assistant", "content": content})
-    return messages
+def getStatus(msg):     
+    if "Current Status:" in msg:
+        start_index = msg.index("Current Status:") + len("Current Status:")
+        end_index = msg.index("Description:")
+        new_content = msg[start_index:] + msg[:end_index]
+    return new_content
 
 def getChooseRole(msg):
     start_index = msg.index("As a") + len("As a")
@@ -65,21 +55,29 @@ def getChooseClass(msg):
 
 def chatbot(race, cls, input, localvar): 
     #messages = messages or [{"role": "system", "content": initMsg}]
-    localvar = localvar or {"messages": [{"role": "system", "content": "I choose as "+ race + " "+ cls +" in D&D world.\n" + initMsg}], "race": race, "class": cls, "status":""}
+    init = {"role": "system", "content": "I choose as "+ race + " "+ cls +" in D&D world.\n" + initMsg}
+    localvar = localvar or {"messages": [init], "race": race, "class": cls, "status":""}
     messages = localvar['messages']
-    if input:
-        messages.append({"role": "user", "content": defaultMsg + "（I am an "+race+" "+cls+"）( My Current status is as follows :" + localvar['status'] + ") " + defaultMsgEnd + ". \n" + input})
+    if len(messages) == 1:
+        input = " "
+    if input:        
+        message = [init, {"role": "user", "content": defaultMsg + "（I am an "+race+" "+cls+"）( My Current status is as follows :" + localvar['status'] + ") " + defaultMsgEnd + ". \n" + input}]
+        messages.append(message)
         chat = openai.ChatCompletion.create(
-            model="gpt-3.5-turbo", messages=messages[-2:],
+            model="gpt-3.5-turbo", messages=message,#messages[-2:]
             max_tokens=2048,n=1,temperature=0.5,
         )
         reply = chat.choices[0].message.content
         logging.info("AI Reply:"+reply)
         if len(messages) == 1:
             localvar['status'] = reply
+        else:
+            localvar['status'] = getStatus(reply)
         messages.append({"role": "assistant", "content": reply})
         localvar['messages'] = messages
         return reply, printMessages(messages), localvar
+    else:
+        return "please input words!", printMessages(messages), localvar
 
 def printMessages(messages):
     delimiter = '\n'
@@ -89,7 +87,7 @@ def printMessages(messages):
 
 app = gr.Interface(fn=chatbot, inputs=[gr.Dropdown(["Orc", "Human", "Elf", "Dwarf", "Halfling", "Goliath", "Dragonborn"], value="Orc", label="Race", info="please choose your race:"), 
                                        gr.Dropdown(["Warrior", "Mage", "Priest", "Assassin", "Thief", "Paladin", "Archer", "Guardian"], value="Warrior", label="Class", info="please choose the name of the class you wish to play as:"),
-                                       gr.Textbox(lines=7, label="You ask and answer questions below, press submit to start", placeholder="", value="start"), "state"], #Type word 'start game'
-                   outputs=[gr.Textbox(label="DND Game Reply", placeholder="Waiting for you press submit to start play..."), gr.Textbox(label="History"), "state"], title="DND Game",#, gr.Textbox(label="History"), 
+                                       gr.Textbox(lines=7, label="You ask and answer questions below", placeholder="Press submit button to start game"), "state"], #Type word 'start game'
+                   outputs=[gr.Textbox(label="DND Game Reply", placeholder="Waiting for you press submit button to start play..."), gr.Textbox(label="History"), "state"], title="DND Game",#, gr.Textbox(label="History"), 
                    description="DND Game",theme="compact")
 app.launch(share=False)