Update app.py

app.py

@@ -78,6 +78,106 @@
 
 # iface.launch()
 
+# from time import sleep
+# import gradio as gr
+# import traceback
+# import requests
+# import openai
+# import random
+# import base64
+# import os 
+
+# def function(Textbox,Textbox2, Textbox3):
+#     target = os.environ.get("target")
+#     target2 = os.environ.get("target2")
+#     content = os.environ.get("content")
+#     content2 = os.environ.get("content2") 
+#     auth_key = os.environ.get("auth_key")
+#     link1 = os.environ.get("link1")
+#     path = os.environ.get("path")
+#     link2 = os.environ.get("link2")
+#     if "/web" in Textbox.lower() or "web" in Textbox.lower():
+#         try:
+#             prompt = Textbox.replace("/web","")
+#         except:
+#             prompt = Textbox.replace("web","")
+#         headers = {
+#             "authority": link1,
+#             "method": "POST",
+#             "path": path,
+#             "scheme": "https",
+#             "accept": "application/json, text/plain, */*",
+#             "accept-encoding": "gzip, deflate, br",
+#             "accept-language": "en-US,en;q=0.9",
+#             "content-length": "88",
+#             "content-type": "application/json",
+#             "origin": link2,
+#             "referer": f"{link2}/",
+#             "sec-ch-ua": '"Google Chrome";v="111", "Not(A:Brand";v="8", "Chromium";v="111"',
+#             "sec-ch-ua-mobile": "?0",
+#             "sec-ch-ua-platform": '"Windows"',
+#             "sec-fetch-dest": "empty",
+#             "sec-fetch-mode": "cors",
+#             "sec-fetch-site": "same-site",
+#             "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36"
+#         }
+#         href = os.environ.get("href")
+#         response = requests.post(href,json={
+#             "Body":prompt,
+#             "From":f"4b7cec35-d15b-422d-838f-b25583bde426{random.randint(1,100)}"
+#         },headers=headers)
+#         data = response.json()
+#         data = data["message"]
+#         trigger = os.environ.get("trigger")
+#         if trigger in data:
+#             data = data.replace(trigger,"John")
+#             return data
+#         else:
+#             return data
+#     else:
+#         # model = os.environ.get("model")
+#         # hrc = os.environ.get("hrc")
+#         if Textbox3 == target:
+#             Textbox2 = Textbox2.replace("[", "").replace("]", "").replace("'", "")
+#             Textbox2 = Textbox2.split(",")
+#             Textbox2_edited = [x.strip() for x in Textbox2]
+#             Textbox2_edited = list(Textbox2_edited)
+#             Textbox2_edited.append(Textbox)
+#             messages = [
+#                 {"role": "system", "content": content2},
+#             ]
+#             for i in Textbox2_edited:
+#                 messages.append(
+#                     {"role": "user", "content": i}
+#                 )
+#             try: 
+#                 # sleep(0.8)
+#                 # headers = {
+#                 #     "Authorization": f"Bearer {auth_key}"
+#                 # }
+#                 response = requests.post(target2, json={
+#                     "messages": messages
+#                 }).json()
+#                 # reply = response['choices'][0]['message']['content']
+#                 reply = response["content"]
+#                 messages.append({"role": "assistant", "content": reply})
+#                 return reply
+#             except Exception as e:
+#                 print(traceback.format_exc())
+#                 return "Please Wait!"
+#         else:
+#             return "Failed"
+
+# inputs = [
+#     gr.inputs.Textbox(label="Textbox",type="text"),
+#     gr.inputs.Textbox(label="Textbox2",type="text"),
+#     gr.inputs.Textbox(label="Textbox3",type="password")
+# ]
+
+# iface = gr.Interface(fn=function, inputs=inputs, outputs="text")
+
+# iface.launch()
+
 from time import sleep
 import gradio as gr
 import traceback
@@ -87,7 +187,7 @@ import random
 import base64
 import os 
 
-def function(Textbox,Textbox2, Textbox3):
+def function(Textbox,Textbox2, Textbox3, Textbox4):
     target = os.environ.get("target")
     target2 = os.environ.get("target2")
     content = os.environ.get("content")
@@ -138,29 +238,21 @@ def function(Textbox,Textbox2, Textbox3):
         # model = os.environ.get("model")
         # hrc = os.environ.get("hrc")
         if Textbox3 == target:
-            Textbox2 = Textbox2.replace("[", "").replace("]", "").replace("'", "")
-            Textbox2 = Textbox2.split(",")
-            Textbox2_edited = [x.strip() for x in Textbox2]
-            Textbox2_edited = list(Textbox2_edited)
-            Textbox2_edited.append(Textbox)
-            messages = [
-                {"role": "system", "content": content2},
-            ]
-            for i in Textbox2_edited:
-                messages.append(
-                    {"role": "user", "content": i}
-                )
             try: 
                 # sleep(0.8)
                 # headers = {
                 #     "Authorization": f"Bearer {auth_key}"
                 # }
-                response = requests.post(target2, json={
-                    "messages": messages
-                }).json()
+                response = requests.post(target2, headers={
+                    "Content-Type": "application/json"
+                }, data=json.dumps({
+                    "text": user,
+                    "key": auth_key,
+                    "playerId": Textbox4,
+                    "speak": False
+                }))
                 # reply = response['choices'][0]['message']['content']
-                reply = response["content"]
-                messages.append({"role": "assistant", "content": reply})
+                reply = response["output"]["text"]
                 return reply
             except Exception as e:
                 print(traceback.format_exc())
@@ -170,8 +262,9 @@ def function(Textbox,Textbox2, Textbox3):
 
 inputs = [
     gr.inputs.Textbox(label="Textbox",type="text"),
-    gr.inputs.Textbox(label="Textbox2",type="text"),
-    gr.inputs.Textbox(label="Textbox3",type="password")
+    # gr.inputs.Textbox(label="Textbox2",type="text"),
+    gr.inputs.Textbox(label="Textbox3",type="password"),
+    gr.inputs.Textbox(label="Textbox4",type="text")
 ]
 
 iface = gr.Interface(fn=function, inputs=inputs, outputs="text")