Fix infinite loop with robust error handling in agent.py

agent.py

@@ -13,7 +13,6 @@ logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
 def get_file_hash(filepath):
-    """Calculates MD5 hash of file to prevent duplicate uploads."""
     hash_md5 = hashlib.md5()
     with open(filepath, "rb") as f:
         for chunk in iter(lambda: f.read(4096), b""):
@@ -21,7 +20,6 @@ def get_file_hash(filepath):
     return hash_md5.hexdigest()
 
 def get_or_upload_file(client, filepath):
-    """Uploads file only if it doesn't already exist in Gemini (deduplication)."""
     file_hash = get_file_hash(filepath)
     try:
         for f in client.files.list(config={'page_size': 50}):
@@ -46,7 +44,6 @@ def analyze_only(path_a, path_c, job_id=None):
             time.sleep(2)
             file_a = client.files.get(name=file_a.name)
             file_c = client.files.get(name=file_c.name)
-            
         prompt = """
         You are a VFX Director. Analyze Video A and Video C.
         Return a JSON object with exactly these keys:
@@ -55,19 +52,17 @@ def analyze_only(path_a, path_c, job_id=None):
             "analysis_c": "Brief description of Video C's lighting, subject, and camera movement.",
             "visual_prompt_b": "A surreal, seamless morphing prompt that transforms A into C. DO NOT use words like 'dissolve' or 'cut'. Focus on shape and texture transformation."
         }
-        DO NOT use markdown code blocks. Return RAW JSON only.
         """
         update_job_status(job_id, "analyzing", 30, "Director drafting creative morph...")
         
-        # Request JSON output
         res = client.models.generate_content(
             model="gemini-2.0-flash-exp", 
             contents=[prompt, file_a, file_c],
             config=types.GenerateContentConfig(response_mime_type="application/json")
         )
         
-        # Robust JSON Cleaning
         text = res.text.strip()
+        # Robust markdown stripping
         if text.startswith("```json"): text = text[7:]
         elif text.startswith("```"): text = text[3:]
         if text.endswith("```"): text = text[:-3]
@@ -75,10 +70,8 @@ def analyze_only(path_a, path_c, job_id=None):
         
         try:
             data = json.loads(text)
-            # CRITICAL FIX: Handle list response
             if isinstance(data, list):
                 data = data[0] if len(data) > 0 else {}
-                
         except json.JSONDecodeError:
             logger.warning("JSON Decode failed, using raw text fallback")
             return {
@@ -87,11 +80,10 @@ def analyze_only(path_a, path_c, job_id=None):
                 "prompt": text,
                 "status": "success"
             }
-            
         return {
             "analysis_a": data.get("analysis_a", ""),
             "analysis_c": data.get("analysis_c", ""),
-            "prompt": data.get("visual_prompt_b", text), # Fallback to full text if key missing
+            "prompt": data.get("visual_prompt_b", text),
             "status": "success"
         }
     except Exception as e:
@@ -104,6 +96,7 @@ def generate_only(prompt, path_a, path_c, job_id, style, audio, neg, guidance, m
     if neg:
         full_prompt += f" --no {neg}"
 
+    job_failed = False
     try:
         if Settings.GCP_PROJECT_ID:
             client = genai.Client(vertexai=True, project=Settings.GCP_PROJECT_ID, location=Settings.GCP_LOCATION)
@@ -133,9 +126,25 @@ def generate_only(prompt, path_a, path_c, job_id, style, audio, neg, guidance, m
                         update_job_status(job_id, "completed", 100, "Done!", video_url=bridge_path, merged_video_url=final_output)
                     except Exception as e:
                         logger.error(f"Stitch error: {e}")
+                        # Still mark as completed, just without the merged video
                         update_job_status(job_id, "completed", 100, "Stitch failed, showing bridge.", video_url=bridge_path)
-                    return
+                    return # Exit successfully
+            else:
+                raise Exception("No video generated by Veo model.")
+        else:
+             raise Exception("GCP_PROJECT_ID is not set in environment variables.")
     except Exception as e:
+        logger.error(f"Generation failed: {e}")
         update_job_status(job_id, "error", 0, f"Error: {e}")
-        return
-    update_job_status(job_id, "error", 0, "Generation failed.")
+        job_failed = True
+    finally:
+        # Ensure job is not left in a non-terminal state if it didn't complete successfully
+        if not job_failed:
+            # Check if status was set to 'completed'
+            try:
+                with open(f"outputs/{job_id}.json", "r") as f:
+                    status_data = json.load(f)
+                    if status_data.get("status") != "completed":
+                        update_job_status(job_id, "error", 0, "Job finished without completion status.")
+            except FileNotFoundError:
+                 update_job_status(job_id, "error", 0, "Job file lost during processing.")