Update app.py

app.py

@@ -4,38 +4,28 @@ import json
 import os
 
 API_URL = "https://host.palple.polrambora.com/pmsq"
-AUTH_FILE = "auth_key.json"
-CONVO_FILE = "conversation_history.json"
-API_TOKEN = os.getenv("POLLY")
-
-ASSISTANT_PIC_PATH = "https://huggingface.co/spaces/PLRMB/P-MSQ-API-PREVIEW/resolve/main/API.png"  
-USER_PIC_PATH = "https://huggingface.co/spaces/PLRMB/P-MSQ-API-PREVIEW/resolve/main/usr.png"
+API_TOKEN = os.getenv("POLLY") 
 
 headers = {
-    "Authorization": f"{API_TOKEN}",
+    "Authorization": "",
     "Content-Type": "application/json",
 }
 
-def check_auth(key):
-    if not os.path.exists(AUTH_FILE):
-        return False
-    with open(AUTH_FILE, 'r') as f:
-        saved_key = f.read().strip()
-        return key == saved_key
-
-def save_auth(key):
-    with open(AUTH_FILE, 'w') as f:
-        f.write(key)
-
-def load_conversation():
-    if os.path.exists(CONVO_FILE):
-        with open(CONVO_FILE, 'r') as f:
-            return json.load(f)
-    return []
+ASSISTANT_PIC_PATH = "https://huggingface.co/spaces/PLRMB/P-MSQ-API-PREVIEW/resolve/main/API.png"  
+USER_PIC_PATH = "https://huggingface.co/spaces/PLRMB/P-MSQ-API-PREVIEW/resolve/main/usr.png"
 
-def save_conversation(history):
-    with open(CONVO_FILE, 'w') as f:
-        json.dump(history, f)
+def authorize(api_key):
+    test_data = {"test": "auth"}
+    test_headers = {
+        "Authorization": f"{api_key}",
+        "Content-Type": "application/json",
+    }
+    response = requests.post("https://", headers=test_headers, data=json.dumps(test_data))
+    if response.status_code == 200:
+        headers["Authorization"] = f"{api_key}"
+        return True
+    else:
+        return False
 
 def respond(message, history, system_message, max_tokens, top_p, temperature):
     messages = []
@@ -72,11 +62,21 @@ def respond(message, history, system_message, max_tokens, top_p, temperature):
         response_json = response.json()
         assistant_reply = response_json["msq"]["message"][0]
         history.append((message, assistant_reply, "You", "P-ALPLE", USER_PIC_PATH, ASSISTANT_PIC_PATH))
-        save_conversation(history)
         return history, assistant_reply
     else:
         return history, "Error: " + response.json().get("error", "Unknown error occurred.")
 
+def load_conversation_from_file(json_file):
+    with open(json_file, 'r') as file:
+        data = json.load(file)
+        history = []
+        for msg in data['conversation']:
+            user_message = msg.get('user_message', "")
+            assistant_message = msg.get('assistant_message', "")
+            history.append((user_message, assistant_message, "You", "P-ALPLE", USER_PIC_PATH, ASSISTANT_PIC_PATH))
+        return history
+
+# Message rendering
 def render_message(history):
     messages_html = ""
     for user_message, assistant_message, user_profile, assistant_profile, user_pic, assistant_pic in history:
@@ -95,112 +95,73 @@ def render_message(history):
     return messages_html
 
 with gr.Blocks(css=".chatbox {height: 400px; overflow-y: auto; border: 1px solid #ccc; padding: 10px; background-color: #f9f9f9;}") as demo:
-    def auth_and_load(auth_key):
-        if check_auth(auth_key):
-            history = load_conversation()
-            return render_message(history), gr.update(visible=True), gr.update(visible=False)
-        return "", gr.update(visible=False), gr.update(visible=True)
 
-    def authorize_and_proceed(auth_key):
-        save_auth(auth_key)
-        return auth_and_load(auth_key)
+    with gr.Column(visible=True) as auth_view:
+        gr.Markdown("## P-MSQ Authorization")
+        api_key_input = gr.Textbox(placeholder="Enter your API key", label="API Key")
+        auth_button = gr.Button("Authorize")
 
-    gr.Markdown("## P-MSQ Chat Interface")
+    with gr.Column(visible=False) as chat_view:
+        gr.Markdown("## P-MSQ Chat Interface")
 
-    chatbot_output = gr.HTML(elem_id="chatbox", visible=False)  
+        chatbot_output = gr.HTML(elem_id="chatbox")  
 
-    msg_input = gr.Textbox(
-        show_label=False, 
-        placeholder="Type your message and press Enter...", 
-        lines=2,
-        elem_id="input-text",
-        visible=False
-    )
+        msg_input = gr.Textbox(
+            show_label=False, 
+            placeholder="Type your message and press Enter...", 
+            lines=2,
+            elem_id="input-text"
+        )
 
-    send_btn = gr.Button("Send", visible=False)
-    regen_btn = gr.Button("Clear", visible=False)
+        send_btn = gr.Button("Send")
+        regen_btn = gr.Button("Clear")
 
-    auth_key_input = gr.Textbox(label="Enter your auth key:", type="password", visible=True)
-    auth_btn = gr.Button("Authorize", visible=True)
+        system_message = gr.Textbox(value="You are P-MSQ (Messaging Service Query), a friendly AI Chatbot that can help in any situations.", label="System message")
+        
+        gr.Markdown("### Settings")
+        
+        max_tokens = gr.Slider(minimum=1, maximum=2048, value=1024, step=1, label="Max new tokens")
+        top_p = gr.Slider(minimum=0, maximum=2, value=0.8, step=0.1, label="Top P")
+        temperature = gr.Slider(minimum=0.1, maximum=1, value=0.7, step=0.1, label="Temperature")
 
-    system_message = gr.Textbox(value="You are P-MSQ (Messaging Service Query), a friendly AI Chatbot that can help in any situations.", label="System message", visible=False)
-    
-    gr.Markdown("### Settings", visible=False)
-    
-    max_tokens = gr.Slider(minimum=1, maximum=2048, value=1024, step=1, label="Max new tokens", visible=False)
-    top_p = gr.Slider(minimum=0, maximum=2, value=0.8, step=0.1, label="Top P", visible=False)
-    temperature = gr.Slider(minimum=0.1, maximum=1, value=0.7, step=0.1, label="Temperature", visible=False)
+        history_state = gr.State([])  
+        last_message_state = gr.State("")  
 
-    history_state = gr.State([])  
-    last_message_state = gr.State("")  
+        load_btn = gr.Button("Load Conversation")
+        json_file_input = gr.Textbox(placeholder="Path to .json file", label="JSON File Path")
 
-    def user_interaction(message, history, system_message, max_tokens, top_p, temperature):
-        history, assistant_reply = respond(message, history, system_message, max_tokens, top_p, temperature)
-        return render_message(history), history, "", message  
+        def load_conversation(file_path):
+            history = load_conversation_from_file(file_path)
+            return render_message(history), history
 
-    def regenerate_response(history, last_message, system_message, max_tokens, top_p, temperature):
-        return "", []
+        load_btn.click(load_conversation, inputs=json_file_input, outputs=[chatbot_output, history_state])
 
-    msg_input.submit(user_interaction, 
-                     inputs=[msg_input, history_state, system_message, max_tokens, top_p, temperature], 
-                     outputs=[chatbot_output, history_state, msg_input, last_message_state])
+        def user_interaction(message, history, system_message, max_tokens, top_p, temperature):
+            history, assistant_reply = respond(message, history, system_message, max_tokens, top_p, temperature)
+            return render_message(history), history, "", message  
 
-    send_btn.click(user_interaction, 
-                   inputs=[msg_input, history_state, system_message, max_tokens, top_p, temperature], 
-                   outputs=[chatbot_output, history_state, msg_input, last_message_state])
+        def regenerate_response(history, last_message, system_message, max_tokens, top_p, temperature):
+            return "", []
 
-    regen_btn.click(regenerate_response, 
-                    inputs=[history_state, last_message_state, system_message, max_tokens, top_p, temperature], 
-                    outputs=[chatbot_output, history_state])
+        msg_input.submit(user_interaction, 
+                         inputs=[msg_input, history_state, system_message, max_tokens, top_p, temperature], 
+                         outputs=[chatbot_output, history_state, msg_input, last_message_state])
 
-    auth_btn.click(auth_and_load, inputs=auth_key_input, outputs=[chatbot_output, chatbot_output, auth_btn])
+        send_btn.click(user_interaction, 
+                       inputs=[msg_input, history_state, system_message, max_tokens, top_p, temperature], 
+                       outputs=[chatbot_output, history_state, msg_input, last_message_state])
 
-    auth_key_input.submit(authorize_and_proceed, inputs=auth_key_input, outputs=[chatbot_output, chatbot_output, auth_btn])
+        regen_btn.click(regenerate_response, 
+                        inputs=[history_state, last_message_state, system_message, max_tokens, top_p, temperature], 
+                        outputs=[chatbot_output, history_state])
 
-    with gr.Row(visible=False):
-        send_btn
-        regen_btn
-
-    gr.HTML("""
-    <style>
-    #chatbox {
-        max-height: 400px;
-        overflow-y: auto;
-        border: 1px solid #ccc;
-        background-color: #242424;
-        padding: 10px;
-    }
-
-    #input-text {
-        width: 100%;
-        box-sizing: border-box;
-    }
-
-    .gr-button { 
-        margin: 5px;
-        padding: 8px 16px;
-        font-size: 14px;
-    }
-
-    .gr-row { 
-        justify-content: flex-end;
-    }
-
-    </style>
-    <script>
-    const chatbox = document.getElementById('chatbox');
-
-    function scrollToBottom() {
-        chatbox.scrollTop = chatbox.scrollHeight;
-    }
-
-    function handleNewMessage() {
-        setTimeout(scrollToBottom, 50); 
-    }
+    def authorize_and_proceed(api_key):
+        if authorize(api_key):
+            return gr.update(visible=False), gr.update(visible=True)
+        else:
+            return gr.update(visible=True), gr.update(visible=False)
 
-    window.addEventListener('message', handleNewMessage);
-    </script>
-    """)
+    auth_button.click(authorize_and_proceed, inputs=api_key_input, outputs=[auth_view, chat_view])
 
 if __name__ == "__main__":
     demo.launch()