Update app.py

app.py

@@ -183,20 +183,53 @@ def get_context(message):
 
 def get_ip_info(ip_address):
     """Get geolocation info for an IP address"""
-    if ip_address in ['127.0.0.1', 'localhost', '0.0.0.0']:
-        return {"country": "Local", "city": "Local"}
+    if not ip_address:
+        return {"country": "Unknown", "city": "Unknown", "region": "Unknown"}
+        
+    # Handle local/private IPs
+    if ip_address in ['127.0.0.1', 'localhost', '0.0.0.0'] or ip_address.startswith(('10.', '172.', '192.168.')):
+        return {"country": "Local Network", "city": "Local", "region": "Local"}
+    
     try:
-        response = requests.get(f'https://ipapi.co/{ip_address}/json/')
+        # Add user-agent to be a good API citizen
+        headers = {
+            'User-Agent': 'BAS-Website-Chat/1.0'
+        }
+        
+        response = requests.get(
+            f'https://ipapi.co/{ip_address}/json/',
+            headers=headers,
+            timeout=5  # 5 second timeout
+        )
+        
         if response.status_code == 200:
             data = response.json()
+            
+            # Check for error responses
+            if 'error' in data:
+                print(f"IP API error: {data.get('reason', 'Unknown error')}")
+                return {"country": "Unknown", "city": "Unknown", "region": "Unknown"}
+                
             return {
                 "country": data.get("country_name", "Unknown"),
                 "city": data.get("city", "Unknown"),
-                "region": data.get("region", "Unknown")
+                "region": data.get("region", "Unknown"),
+                "latitude": data.get("latitude"),
+                "longitude": data.get("longitude"),
+                "timezone": data.get("timezone"),
+                "org": data.get("org")
             }
-    except Exception as e:
+        else:
+            print(f"IP API returned status code: {response.status_code}")
+            
+    except requests.exceptions.Timeout:
+        print(f"Timeout getting IP info for {ip_address}")
+    except requests.exceptions.RequestException as e:
         print(f"Error getting IP info: {str(e)}")
-    return {"country": "Unknown", "city": "Unknown"}
+    except Exception as e:
+        print(f"Unexpected error getting IP info: {str(e)}")
+        
+    return {"country": "Unknown", "city": "Unknown", "region": "Unknown"}
 
 def log_conversation(timestamp, user_message, assistant_response, model_name, context, error=None, client_ip=None):
     """Log conversation details to JSON file - local directory or HuggingFace Dataset repository"""
@@ -306,8 +339,18 @@ def log_conversation(timestamp, user_message, assistant_response, model_name, co
 def chat_response(message, history, model_name, request: gr.Request):
     """Chat response function for Gradio interface"""
     try:
-        # Get client IP address
-        client_ip = request.client.host if request else None
+        # Get client IP address with better proxy handling
+        client_ip = None
+        if request:
+            # Try to get real IP from headers in order of reliability
+            client_ip = (
+                request.headers.get('X-Forwarded-For', '').split(',')[0].strip() or
+                request.headers.get('X-Real-IP') or
+                request.headers.get('CF-Connecting-IP') or  # Cloudflare
+                request.client.host
+            )
+            print(f"\nClient IP detected: {client_ip}")
+            print(f"Request headers: {request.headers}")
         
         # Append 'at BAS' to the user's message
         message += " at BAS"