Back Commit

Main2.py

@@ -237,77 +237,50 @@ def create_interface():
                     refresh_characters_btn.click(fn=lambda: gr.update(value=get_existing_characters()), outputs=[character_list])
         
         with gr.Tab("Chat with Character"):
-            # Top row for "Choose Character" and "Current Chat ID"
             with gr.Row():
-                with gr.Column(scale=1):
-                    character_dropdown = gr.Dropdown(label="Choose Character", choices=[char[0] for char in get_existing_characters()], elem_id="character_dropdown")
-                with gr.Column(scale=1):
-                    chat_id_display = gr.Textbox(label="Current Chat ID", interactive=False, elem_id="chat_id_display")
-
-            # Main chat area with responses
-            with gr.Column():
-                chat_response = gr.Chatbot(label="Chat Responses", elem_id="chat_response", height=700, type="messages")
-
-                # Row for input elements (Your Message, Audio/Video buttons, and Send button at the bottom)
-                with gr.Row():
-                    with gr.Column(scale=8):
-                        user_input = gr.Textbox(label="Your Message", placeholder="Type your message", elem_id="user_input", lines=1)  # Reduced lines for a single-line input
-                    with gr.Column(scale=2):
-                        # Audio and Video as small buttons to the right of "Your Message"
-                        audio_button = gr.Button("🎤 Audio", elem_id="audio_button", size="sm")
-                        video_button = gr.Button("📹 Video", elem_id="video_button", size="sm")
-
-                # Send button below the chat response area
-                with gr.Row():
-                    with gr.Column(scale=1):
-                        chat_btn = gr.Button("Send", variant="primary")
-
-            def handle_chat(character_name, user_input, audio_file, video_file, user_id, chat_messages, current_chat_id):
-                if not user_id:
-                    return chat_messages, current_chat_id, "Please sign in with a numeric User ID first!"
-                if not character_name:
-                    return chat_messages, current_chat_id, "Please select a character!"
-                final_input = user_input or ""
-                
-                if audio_file:
-                    audio_text = speech_to_text(audio_file)
-                    if audio_text:
-                        final_input += f" {audio_text}"
-                    else:
-                        chat_messages.append({"role": "assistant", "content": "Could not understand audio."})
-                        return chat_messages, current_chat_id, None
+                character_dropdown = gr.Dropdown(label="Choose Character", choices=[char[0] for char in get_existing_characters()], elem_id="character_dropdown")
+                chat_id_display = gr.Textbox(label="Current Chat ID", interactive=False, elem_id="chat_id_display")
+                user_input = gr.Textbox(label="Your Message", placeholder="Type your message or use audio/video input", elem_id="user_input", lines=2)
+                audio_input = gr.Audio(label="Audio Input", type="filepath", elem_id="audio_input")
+                video_input = gr.Video(label="Video Input", elem_id="video_input")
+                chat_btn = gr.Button("Send", variant="primary")
+                chat_response = gr.Chatbot(label="Chat Responses", elem_id="chat_response", height=500, type="messages")  # Increased height here
+
+                def handle_chat(character_name, user_input, audio_file, video_file, user_id, chat_messages, current_chat_id):
+                    if not user_id:
+                        return chat_messages, current_chat_id, "Please sign in with a numeric User ID first!"
+                    if not character_name:
+                        return chat_messages, current_chat_id, "Please select a character!"
+                    final_input = user_input or ""
+                    
+                    if audio_file:
+                        audio_text = speech_to_text(audio_file)
+                        if audio_text:
+                            final_input += f" {audio_text}"
+                        else:
+                            chat_messages.append({"role": "assistant", "content": "Could not understand audio."})
+                            return chat_messages, current_chat_id, None
+                    
+                    if video_file:
+                        audio_file_path = extract_audio_from_video(video_file)
+                        if audio_file_path:
+                            video_text = speech_to_text(audio_file_path)
+                            if video_text:
+                                final_input += f" {video_text}"
+                            chat_messages.append({"role": "user", "content": "Video uploaded"})
+                        else:
+                            chat_messages.append({"role": "assistant", "content": "Failed to extract audio from video."})
+                            return chat_messages, current_chat_id, None
+
+                    if not final_input.strip():
+                        return chat_messages, current_chat_id, "Please provide a message, audio, or video!"
+
+                    response, new_chat_id = chat_with_character(character_name, final_input, user_id, current_chat_id)
+                    chat_messages.append({"role": "user", "content": final_input})
+                    chat_messages.append({"role": "assistant", "content": response})
+                    return chat_messages, new_chat_id, new_chat_id
                 
-                if video_file:
-                    audio_file_path = extract_audio_from_video(video_file)
-                    if audio_file_path:
-                        video_text = speech_to_text(audio_file_path)
-                        if video_text:
-                            final_input += f" {video_text}"
-                        chat_messages.append({"role": "user", "content": "Video uploaded"})
-                    else:
-                        chat_messages.append({"role": "assistant", "content": "Failed to extract audio from video."})
-                        return chat_messages, current_chat_id, None
-
-                if not final_input.strip():
-                    return chat_messages, current_chat_id, "Please provide a message, audio, or video!"
-
-                response, new_chat_id = chat_with_character(character_name, final_input, user_id, current_chat_id)
-                chat_messages.append({"role": "user", "content": final_input})
-                chat_messages.append({"role": "assistant", "content": response})
-                return chat_messages, new_chat_id, new_chat_id
-            
-            # Handle audio and video button clicks to trigger file uploads
-            def upload_audio():
-                return gr.update(value=None, visible=True), gr.update(value=None, visible=False)
-
-            def upload_video():
-                return gr.update(value=None, visible=False), gr.update(value=None, visible=True)
-
-            audio_button.click(fn=upload_audio, outputs=[audio_input, video_input])
-            video_button.click(fn=upload_video, outputs=[audio_input, video_input])
-
-            # Connect the Send button to handle the chat
-            chat_btn.click(fn=handle_chat, inputs=[character_dropdown, user_input, audio_input, video_input, user_id, chat_messages, current_chat_id], outputs=[chat_response, current_chat_id, chat_id_display])
+                chat_btn.click(fn=handle_chat, inputs=[character_dropdown, user_input, audio_input, video_input, user_id, chat_messages, current_chat_id], outputs=[chat_response, current_chat_id, chat_id_display])
         
         with gr.Tab("Chat History"):
             with gr.Row():