Update app.py

app.py

@@ -23,11 +23,12 @@ torch.backends.cudnn.benchmark = False
 torch.backends.cuda.matmul.allow_tf32 = False
 torch.backends.cudnn.allow_tf32 = False
 
-# Data structures to track IP access
+# Data structures to track IP addresses
 ip_access_records = defaultdict(lambda: {
     'total_access_time': timedelta(),
     'blocked_until': None,
-    'session_start': None
+    'session_start': None,
+    'last_access_time': None
 })
 
 SESSION_TIMEOUT = timedelta(hours=1)
@@ -64,7 +65,8 @@ def update_ip_access_time(client_ip):
         record['session_start'] = now
 
     # Remove access times older than 24 hours
-    if 'last_access_time' in record and now - record['last_access_time'] > timedelta(hours=24):
+    last_access_time = record.get('last_access_time')
+    if last_access_time and now - last_access_time > timedelta(hours=24):
         record['total_access_time'] = timedelta()
 
     record['last_access_time'] = now
@@ -138,37 +140,33 @@ analyzer = backend.DeepfakeAnalyzer()
 def generate_captcha():
     return ''.join(random.choices(string.ascii_uppercase + string.digits, k=5))
 
-# Initial CAPTCHA
-captcha_solution = generate_captcha()
-
-def verify_captcha(user_input):
-    global captcha_solution
+# Function to verify CAPTCHA per user session
+def verify_captcha(user_input, captcha_solution):
     if user_input.strip() == captcha_solution:
-        return "Captcha verified. Video analysis will proceed.", True, captcha_solution
+        return "Captcha verified. Video analysis will proceed.", True
     else:
-        captcha_solution = generate_captcha()  # Reset CAPTCHA on failure
-        return f"Incorrect CAPTCHA. Please try again.", False, captcha_solution
+        return "Incorrect CAPTCHA. Please try again.", False
 
 @spaces.GPU(duration=1000)
-def analyze_video(video_file, captcha_input, request: gr.Request):
+def analyze_video(video_file, captcha_input, captcha_solution, request: gr.Request):
     client_ip = get_client_ip(request)
 
     # Check if IP is blocked
     if is_ip_blocked(client_ip):
-        log_api_access(successful_captcha=False, video_file=video_file.name if video_file else "N/A", client_ip=client_ip, blocked=True)
+        log_api_access(successful_captcha=False, video_file=os.path.basename(video_file) if video_file else "N/A", client_ip=client_ip, blocked=True)
         return {"error": "Your IP has been blocked due to excessive usage. Please try again later."}
 
     # Verify CAPTCHA
-    message, success, _ = verify_captcha(captcha_input)
+    message, success = verify_captcha(captcha_input, captcha_solution)
     if not success:
-        log_api_access(successful_captcha=False, video_file=video_file.name if video_file else "N/A", client_ip=client_ip)
+        log_api_access(successful_captcha=False, video_file=os.path.basename(video_file) if video_file else "N/A", client_ip=client_ip)
         return {"error": message}
 
     # Update IP access time
     update_ip_access_time(client_ip)
 
     # Log API access attempt with successful CAPTCHA
-    log_api_access(successful_captcha=True, video_file=video_file.name if video_file else "N/A", client_ip=client_ip)
+    log_api_access(successful_captcha=True, video_file=os.path.basename(video_file) if video_file else "N/A", client_ip=client_ip)
 
     try:
         # Video truncation and analysis
@@ -199,9 +197,12 @@ def main_interface():
         gr.Markdown("# AllMark - Deepfake Analyzer")
         gr.Markdown("Upload a video to proceed with analysis.")
 
-        # Video input
-        video_input = gr.Video(label="Upload Video")
-        captcha_text = gr.Textbox(label="CAPTCHA", value=captcha_solution, interactive=False, visible=False)
+        # State variables for per-session data
+        captcha_solution = gr.State()
+
+        # Video input with display size restriction
+        video_input = gr.Video(label="Upload Video", height=300)  # Adjust height as needed
+        captcha_text = gr.Textbox(label="CAPTCHA", interactive=False, visible=False)
         captcha_input = gr.Textbox(label="Enter CAPTCHA Here", visible=False)
         captcha_output = gr.Textbox(label="CAPTCHA Status", interactive=False, visible=False)
         analyze_button = gr.Button("Analyze Video", visible=False)
@@ -210,16 +211,34 @@ def main_interface():
         # Function to show CAPTCHA after video upload
         def show_captcha(video):
             if video is not None:
-                return gr.update(visible=True), gr.update(visible=True), gr.update(visible=True), gr.update(visible=True)
+                # Generate a new CAPTCHA for this session
+                new_captcha = generate_captcha()
+                return (
+                    gr.update(visible=True, value=new_captcha),
+                    gr.update(visible=True),
+                    gr.update(visible=True),
+                    gr.update(visible=True),
+                    new_captcha  # Update the session state
+                )
             else:
-                return gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False)
-
-        video_input.change(show_captcha, inputs=video_input, outputs=[captcha_text, captcha_input, captcha_output, analyze_button])
+                return (
+                    gr.update(visible=False),
+                    gr.update(visible=False),
+                    gr.update(visible=False),
+                    gr.update(visible=False),
+                    gr.no_update
+                )
+
+        video_input.change(
+            show_captcha,
+            inputs=video_input,
+            outputs=[captcha_text, captcha_input, captcha_output, analyze_button, captcha_solution]
+        )
 
         # Handle analysis
         analyze_button.click(
             analyze_video,
-            inputs=[video_input, captcha_input],
+            inputs=[video_input, captcha_input, captcha_solution],
             outputs=analysis_output
         )