Update app.py

app.py

@@ -4,7 +4,6 @@ import requests
 import json
 from typing import List, Dict, Optional, Tuple
 import random
-import time
 
 class GifChatBot:
     def __init__(self):
@@ -12,14 +11,13 @@ class GifChatBot:
         self.giphy_key = None
         self.chat_history = []
         self.is_initialized = False
-        self.session = requests.Session()  # Use session for better performance
+        self.session = requests.Session()
 
     def setup_keys(self, openai_key: str, giphy_key: str) -> str:
         """Initialize API clients with user's keys"""
         try:
             self.openai_client = OpenAI(api_key=openai_key)
             self.giphy_key = giphy_key
-            # Test both keys
             self._test_giphy_key()
             self._test_openai_key()
             self.is_initialized = True
@@ -51,10 +49,7 @@ class GifChatBot:
     def verify_gif_url(self, gif_url: str) -> bool:
         """Verify if a GIF URL is accessible"""
         try:
-            # Head request is faster than full GET
             response = self.session.head(gif_url, timeout=3)
-            
-            # Check if status is OK and content type is correct
             if response.status_code == 200:
                 content_type = response.headers.get('content-type', '').lower()
                 return 'gif' in content_type or 'image' in content_type
@@ -68,7 +63,7 @@ class GifChatBot:
             params = {
                 'api_key': self.giphy_key,
                 'q': search_query,
-                'limit': 25,  # Get more options
+                'limit': 25,
                 'rating': 'pg-13',
                 'bundle': 'messaging_non_clips'
             }
@@ -82,11 +77,9 @@ class GifChatBot:
             if response.status_code == 200:
                 data = response.json()
                 if data["data"]:
-                    # Shuffle results for variety
                     gifs = list(data["data"])
                     random.shuffle(gifs)
                     
-                    # Try GIFs until we find a good one
                     for gif in gifs:
                         if not self._is_good_quality_gif(gif):
                             continue
@@ -95,9 +88,7 @@ class GifChatBot:
                         if self.verify_gif_url(gif_url):
                             return gif_url
                     
-                    # If no GIFs passed validation, try trending
                     return self._get_trending_gif()
-            
             return None
             
         except Exception as error:
@@ -121,7 +112,6 @@ class GifChatBot:
             if response.status_code == 200:
                 data = response.json()
                 if data["data"]:
-                    # Try each trending GIF until we find a working one
                     gifs = list(data["data"])
                     random.shuffle(gifs)
                     
@@ -137,15 +127,12 @@ class GifChatBot:
     def _is_good_quality_gif(self, gif: Dict) -> bool:
         """Check if a GIF meets quality criteria"""
         try:
-            # Skip GIFs that are too long
             if int(gif.get("images", {}).get("original", {}).get("frames", 50)) > 50:
                 return False
             
-            # Skip GIFs that are too large
-            if int(gif.get("images", {}).get("original", {}).get("size", 0)) > 2000000:  # 2MB
+            if int(gif.get("images", {}).get("original", {}).get("size", 0)) > 2000000:
                 return False
             
-            # Skip if no image data
             if not gif.get("images", {}).get("original", {}).get("url"):
                 return False
             
@@ -153,12 +140,16 @@ class GifChatBot:
         except:
             return False
 
-    def reset_chat(self) -> Tuple[str, List[List[str]]]:
+    def reset_chat(self) -> Tuple[List[Dict[str, str]], str]:
         """Reset the chat history"""
         self.chat_history = []
-        return "", []
+        return [], ""
+
+    def format_message(self, role: str, content: str) -> Dict[str, str]:
+        """Format message in the new Gradio chat format"""
+        return {"role": role, "content": content}
 
-    def chat(self, message: str, history: List[List[str]]) -> Tuple[str, List[List[str]], str]:
+    def chat(self, message: str, history: List[Dict[str, str]]) -> Tuple[str, List[Dict[str, str]], str]:
         """Main chat function with natural GIF integration"""
         if not self.is_initialized:
             return message, history, "Please set up your API keys first!"
@@ -167,7 +158,6 @@ class GifChatBot:
             return message, history, ""
 
         try:
-            # System message emphasizing natural GIF usage
             system_message = """You are a supportive, empathetic friend who uses GIFs naturally in conversation. 
             When using GIFs, keep search terms simple and contextual:
 
@@ -184,16 +174,11 @@ class GifChatBot:
             
             Use 0-1 GIFs per message unless the moment really calls for more."""
 
-            # Prepare conversation history
             messages = [{"role": "system", "content": system_message}]
             for chat in history:
-                messages.extend([
-                    {"role": "user", "content": chat[0]},
-                    {"role": "assistant", "content": chat[1]}
-                ])
+                messages.append({"role": chat["role"], "content": chat["content"]})
             messages.append({"role": "user", "content": message})
 
-            # Get AI response
             response = self.openai_client.chat.completions.create(
                 model="gpt-4o-mini",
                 messages=messages,
@@ -201,11 +186,9 @@ class GifChatBot:
                 max_tokens=150
             )
 
-            # Process response and insert GIFs
             ai_message = response.choices[0].message.content
             final_response = ""
             
-            # Split by GIF markers and process
             parts = ai_message.split("[GIF:")
             final_response += parts[0]
             
@@ -218,17 +201,14 @@ class GifChatBot:
                         final_response += f"\n![GIF]({gif_url})\n"
                     final_response += part[gif_desc_end + 1:]
 
-            history.append([message, final_response])
+            history.append(self.format_message("user", message))
+            history.append(self.format_message("assistant", final_response))
             return "", history, ""
 
         except Exception as error:
             error_message = f"Oops! Something went wrong: {str(error)}"
             return message, history, error_message
 
-    def cleanup(self):
-        """Cleanup resources"""
-        self.session.close()
-
 def create_interface():
     """Create the Gradio interface"""
     bot = GifChatBot()
@@ -262,8 +242,8 @@ def create_interface():
         chatbot = gr.Chatbot(
             label="Chat",
             bubble_full_width=False,
-            show_label=False,
-            height=450
+            height=450,
+            type="messages"  # Use new message format
         )
         
         with gr.Row():
@@ -294,7 +274,7 @@ def create_interface():
         
         clear_button.click(
             bot.reset_chat,
-            outputs=[message_box, chatbot]
+            outputs=[chatbot, error_box]
         )
         
         gr.Markdown("""
@@ -304,16 +284,9 @@ def create_interface():
         - 🎯 GIFs are chosen to match the emotion
         - 🔄 Use 'Clear Chat' to start fresh
         """)
-
-        # Cleanup on page unload
-        interface.load(lambda: None, [], [], _js="""() => {
-            window.addEventListener('unload', function() {
-                // Cleanup resources
-            })
-        }""")
     
     return interface
 
 if __name__ == "__main__":
     demo = create_interface()
-    demo.launch() 
+    demo.launch()