Update app.py

app.py

@@ -4,6 +4,8 @@ import requests
 import json
 from typing import List, Dict, Optional, Tuple
 import random
+import time
+from datetime import datetime
 
 class GifChatBot:
     def __init__(self):
@@ -12,92 +14,202 @@ class GifChatBot:
         self.chat_history = []
         self.is_initialized = False
         self.session = requests.Session()
+        
+        # Configure session for better performance
+        self.session.headers.update({
+            'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36'
+        })
+        
+        # Parameters for GIF quality checking
+        self.minimum_gif_size = 10000  # 10KB minimum
+        self.maximum_gif_size = 2000000  # 2MB maximum
+        self.minimum_dimension = 200
+        self.maximum_dimension = 1000
+        self.maximum_frames = 50
 
-    def setup_keys(self, openai_key: str, giphy_key: str) -> str:
-        """Initialize API clients with user's keys"""
+    def verify_gif_url(self, gif_url: str) -> bool:
+        """Comprehensive verification for GIF availability"""
         try:
-            self.openai_client = OpenAI(api_key=openai_key)
-            self.giphy_key = giphy_key
-            self._test_giphy_key()
-            self._test_openai_key()
-            self.is_initialized = True
-            return "✅ Setup successful! Let's chat!"
-        except Exception as error:
-            self.is_initialized = False
-            return f"❌ Error setting up: {str(error)}"
+            # Step 1: Quick HEAD request to check basic availability
+            head_response = self.session.head(gif_url, timeout=3)
+            
+            if head_response.status_code != 200:
+                print(f"HEAD request failed with status {head_response.status_code}")
+                return False
 
-    def _test_giphy_key(self):
-        """Test if GIPHY key is valid"""
-        response = self.session.get(
-            "https://api.giphy.com/v1/gifs/trending",
-            params={"api_key": self.giphy_key, "limit": 1}
-        )
-        if response.status_code != 200:
-            raise Exception("Invalid GIPHY API key")
+            # Step 2: Check content type
+            content_type = head_response.headers.get('content-type', '').lower()
+            if not ('gif' in content_type or 'image' in content_type):
+                print("Invalid content type:", content_type)
+                return False
 
-    def _test_openai_key(self):
-        """Test if OpenAI key is valid"""
-        try:
-            self.openai_client.chat.completions.create(
-                model="gpt-4o-mini",
-                messages=[{"role": "user", "content": "test"}],
-                max_tokens=5
-            )
-        except Exception:
-            raise Exception("Invalid OpenAI API key")
+            # Step 3: Check content length
+            content_length = head_response.headers.get('content-length')
+            if content_length:
+                size = int(content_length)
+                if size < self.minimum_gif_size:
+                    print("GIF too small, might be an error image")
+                    return False
+                if size > self.maximum_gif_size:
+                    print("GIF too large")
+                    return False
 
-    def verify_gif_url(self, gif_url: str) -> bool:
-        """Verify if a GIF URL is accessible"""
-        try:
-            response = self.session.head(gif_url, timeout=3)
-            if response.status_code == 200:
-                content_type = response.headers.get('content-type', '').lower()
-                return 'gif' in content_type or 'image' in content_type
+            # Step 4: Verify actual GIF content
+            content_response = self.session.get(gif_url, timeout=3, stream=True)
+            
+            # Read first chunk to verify GIF header
+            chunk = next(content_response.iter_content(chunk_size=512))
+            content_response.close()
+            
+            # Check for GIF magic numbers
+            if not chunk.startswith(b'GIF87a') and not chunk.startswith(b'GIF89a'):
+                print("Not a valid GIF file")
+                return False
+
+            return True
+
+        except Exception as error:
+            print(f"GIF validation error: {error}")
             return False
-        except:
+
+    def _is_good_quality_gif(self, gif: Dict) -> bool:
+        """Comprehensive quality check for GIFs"""
+        try:
+            # Check required attributes
+            if not gif.get("images") or not gif.get("images").get("original"):
+                print("Missing image data")
+                return False
+
+            original = gif.get("images").get("original")
+
+            # Check dimensions
+            try:
+                width = int(original.get("width", 0))
+                height = int(original.get("height", 0))
+                
+                if width < self.minimum_dimension or height < self.minimum_dimension:
+                    print("GIF too small:", width, height)
+                    return False
+                if width > self.maximum_dimension or height > self.maximum_dimension:
+                    print("GIF too large:", width, height)
+                    return False
+            except (ValueError, TypeError):
+                print("Invalid dimensions")
+                return False
+
+            # Check frame count
+            try:
+                frames = int(original.get("frames", self.maximum_frames))
+                if frames > self.maximum_frames:
+                    print("Too many frames:", frames)
+                    return False
+            except (ValueError, TypeError):
+                print("Invalid frame count")
+                return False
+
+            # Check file size
+            try:
+                size = int(original.get("size", 0))
+                if size < self.minimum_gif_size or size > self.maximum_gif_size:
+                    print("Invalid size:", size)
+                    return False
+            except (ValueError, TypeError):
+                print("Invalid size data")
+                return False
+
+            # Check if it's a newer GIF (longer ID generally means newer)
+            gif_id = gif.get("id", "")
+            if len(gif_id) < 10:
+                print("Old GIF (short ID)")
+                return False
+
+            # Check trending status
+            if gif.get("is_trending"):
+                print("Currently trending")
+                return True
+
+            # Check recent trending status
+            trending_datetime = gif.get("trending_datetime")
+            if trending_datetime and trending_datetime != "0000-00-00 00:00:00":
+                try:
+                    trending_date = datetime.strptime(trending_datetime, "%Y-%m-%d %H:%M:%S")
+                    days_ago = (datetime.now() - trending_date).days
+                    if days_ago < 90:  # Recently trending
+                        print("Recently trending")
+                        return True
+                except:
+                    pass
+
+            return True
+
+        except Exception as error:
+            print(f"Quality check error: {error}")
             return False
 
     def get_gif(self, search_query: str) -> Optional[str]:
-        """Search GIPHY with validation for working GIFs"""
+        """Search and validate GIPHY GIFs"""
         try:
-            params = {
+            print(f"Searching for GIF: {search_query}")
+            
+            # Search parameters
+            parameters = {
                 'api_key': self.giphy_key,
                 'q': search_query,
                 'limit': 25,
                 'rating': 'pg-13',
-                'bundle': 'messaging_non_clips'
+                'bundle': 'messaging_non_clips',
+                'sort': 'relevant'
             }
             
             response = self.session.get(
                 "https://api.giphy.com/v1/gifs/search",
-                params=params,
+                params=parameters,
                 timeout=5
             )
             
             if response.status_code == 200:
                 data = response.json()
-                if data["data"]:
-                    gifs = list(data["data"])
-                    random.shuffle(gifs)
+                if data.get("data"):
+                    # Sort by ID length (newer GIFs first)
+                    gifs = sorted(
+                        data["data"],
+                        key=lambda x: len(x.get("id", "")),
+                        reverse=True
+                    )
                     
+                    print(f"Found {len(gifs)} GIFs, testing quality...")
+                    
+                    # Try each GIF until we find a good one
                     for gif in gifs:
                         if not self._is_good_quality_gif(gif):
                             continue
-                            
+                        
                         gif_url = gif["images"]["original"]["url"]
+                        print(f"Testing GIF URL: {gif_url}")
+                        
                         if self.verify_gif_url(gif_url):
+                            print("Found good GIF!")
                             return gif_url
+                        else:
+                            print("GIF validation failed")
                     
+                    print("No good GIFs found, trying trending...")
                     return self._get_trending_gif()
+                else:
+                    print("No GIFs found in search")
+            else:
+                print(f"Search failed with status {response.status_code}")
+            
             return None
             
         except Exception as error:
-            print(f"GIPHY error: {error}")
+            print(f"GIPHY search error: {error}")
             return None
 
     def _get_trending_gif(self) -> Optional[str]:
-        """Get a verified trending GIF as fallback"""
+        """Get a verified trending GIF"""
         try:
+            print("Fetching trending GIF...")
             response = self.session.get(
                 "https://api.giphy.com/v1/gifs/trending",
                 params={
@@ -111,34 +223,63 @@ class GifChatBot:
             
             if response.status_code == 200:
                 data = response.json()
-                if data["data"]:
+                if data.get("data"):
                     gifs = list(data["data"])
                     random.shuffle(gifs)
                     
+                    print(f"Testing {len(gifs)} trending GIFs...")
                     for gif in gifs:
+                        if not self._is_good_quality_gif(gif):
+                            continue
+                            
                         gif_url = gif["images"]["original"]["url"]
+                        print(f"Testing trending GIF: {gif_url}")
+                        
                         if self.verify_gif_url(gif_url):
+                            print("Found good trending GIF!")
                             return gif_url
+                        else:
+                            print("Trending GIF validation failed")
+            
+            print("No good trending GIFs found")
+            return None
                             
         except Exception as error:
             print(f"Error getting trending GIF: {error}")
-        return None
+            return None
 
-    def _is_good_quality_gif(self, gif: Dict) -> bool:
-        """Check if a GIF meets quality criteria"""
+        def setup_keys(self, openai_key: str, giphy_key: str) -> str:
+        """Initialize API clients with user's keys"""
         try:
-            if int(gif.get("images", {}).get("original", {}).get("frames", 50)) > 50:
-                return False
-            
-            if int(gif.get("images", {}).get("original", {}).get("size", 0)) > 2000000:
-                return False
-            
-            if not gif.get("images", {}).get("original", {}).get("url"):
-                return False
-            
-            return True
-        except:
-            return False
+            self.openai_client = OpenAI(api_key=openai_key)
+            self.giphy_key = giphy_key
+            self._test_giphy_key()
+            self._test_openai_key()
+            self.is_initialized = True
+            return "✅ Setup successful! Let's chat!"
+        except Exception as error:
+            self.is_initialized = False
+            return f"❌ Error setting up: {str(error)}"
+
+    def _test_giphy_key(self):
+        """Test if GIPHY key is valid"""
+        response = self.session.get(
+            "https://api.giphy.com/v1/gifs/trending",
+            params={"api_key": self.giphy_key, "limit": 1}
+        )
+        if response.status_code != 200:
+            raise Exception("Invalid GIPHY API key")
+
+    def _test_openai_key(self):
+        """Test if OpenAI key is valid"""
+        try:
+            self.openai_client.chat.completions.create(
+                model="gpt-4o-mini",
+                messages=[{"role": "user", "content": "test"}],
+                max_tokens=5
+            )
+        except Exception:
+            raise Exception("Invalid OpenAI API key")
 
     def reset_chat(self) -> Tuple[List[Dict[str, str]], str]:
         """Reset the chat history"""
@@ -158,7 +299,8 @@ class GifChatBot:
             return message, history, ""
 
         try:
-            system_message = """You are a supportive, empathetic friend who uses GIFs naturally in conversation. 
+            # System message for the AI
+            system_message = """You are a supportive, empathetic friend who uses GIFs naturally and proactively in conversation regardless of whether the user request it or not. 
             When using GIFs, keep search terms simple and contextual:
 
             Examples:
@@ -169,16 +311,19 @@ class GifChatBot:
             
             Keep your responses:
             1. Empathetic and natural
-            2. Context-aware
-            3. Use GIFs that match the emotion
+            2. Context-aware (reference previous messages when relevant)
+            3. Use GIFs that match the emotional context
             
-            Use 0-1 GIFs per message unless the moment really calls for more."""
+            Use 0-1 GIFs per message unless the moment really calls for more.
+            Keep search terms simple and universal for better GIF matching."""
 
+            # Prepare conversation history
             messages = [{"role": "system", "content": system_message}]
             for chat in history:
                 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,
@@ -186,6 +331,7 @@ class GifChatBot:
                 max_tokens=150
             )
 
+            # Process response and insert GIFs
             ai_message = response.choices[0].message.content
             final_response = ""
             
@@ -196,17 +342,23 @@ class GifChatBot:
                 gif_desc_end = part.find("]")
                 if gif_desc_end != -1:
                     gif_desc = part[:gif_desc_end].strip()
+                    print(f"Looking for GIF: {gif_desc}")
                     gif_url = self.get_gif(gif_desc)
                     if gif_url:
                         final_response += f"\n![GIF]({gif_url})\n"
+                        print(f"Added GIF: {gif_url}")
+                    else:
+                        print("No suitable GIF found")
                     final_response += part[gif_desc_end + 1:]
 
+            # Update history with new messages
             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)}"
+            print(f"Chat error: {error}")
             return message, history, error_message
 
 def create_interface():
@@ -283,6 +435,8 @@ def create_interface():
         - 💭 The conversation is context-aware
         - 🎯 GIFs are chosen to match the emotion
         - 🔄 Use 'Clear Chat' to start fresh
+        
+        Note: All GIFs are validated for quality and availability before being used!
         """)
     
     return interface