Update main.py

main.py

@@ -466,56 +466,48 @@ def generate_sozo_report(project_id):
         })
         return jsonify({'error': str(e)}), 500
 
+# In app.py
+
 @app.route('/api/sozo/projects/<string:project_id>/generate-video', methods=['POST'])
 def generate_sozo_video(project_id):
-    logger.info(f"Endpoint /generate-video POST for project {project_id}")
     try:
         token = request.headers.get('Authorization', '').split(' ')[1]
         uid = verify_token(token)
         if not uid: return jsonify({'error': 'Unauthorized'}), 401
-        logger.info(f"Token verified for user {uid} for video script generation.")
-
+        
         project_ref = db.reference(f'sozo_projects/{project_id}')
         project_data = project_ref.get()
-        if not project_data or project_data.get('uid') != uid:
-            logger.warning(f"User {uid} failed to generate video script: Project {project_id} not found or not owned.")
-            return jsonify({'error': 'Project not found or unauthorized'}), 404
-
+        if not project_data or project_data.get('uid') != uid: return jsonify({'error': 'Project not found or unauthorized'}), 404
+        
         data = request.get_json()
         voice_model = data.get('voice_model', 'aura-2-andromeda-en')
+        if voice_model not in ['aura-2-andromeda-en', 'aura-2-orpheus-en']: return jsonify({'error': 'Invalid voice model specified'}), 400
         
-        logger.info(f"User {uid}: Ownership verified for project {project_id}. Starting video script generation with voice {voice_model}.")
-        project_ref.update({'status': 'generating_video', 'updatedAt': datetime.utcnow().isoformat()})
-
-        blob_path = f"sozo_projects/{uid}/{project_id}/data{Path(project_data['originalFilename']).suffix}"
-        logger.info(f"User {uid}: Downloading data from {blob_path}")
+        project_ref.update({'status': 'generating_video'})
+        
+        blob_path = "/".join(project_data['originalDataUrl'].split('/')[4:])
         blob = bucket.blob(blob_path)
         file_bytes = blob.download_as_bytes()
         df = load_dataframe_safely(io.BytesIO(file_bytes), project_data['originalFilename'])
         
-        logger.info(f"User {uid}: Calling core logic to generate video script for project {project_id}.")
-        video_script = generate_video_from_project(df, project_data.get('report_content', {}).get('raw_md', ''), voice_model)
-
-        logger.info(f"User {uid}: Uploading generated audio files to storage for project {project_id}.")
-        for scene in video_script.get("scenes", []):
-            if scene.get("audio_content"):
-                audio_bytes = scene.pop("audio_content")
-                audio_blob_name = f"sozo_projects/{uid}/{project_id}/audio/{scene['scene_id']}.mp3"
-                audio_blob = bucket.blob(audio_blob_name)
-                audio_blob.upload_from_string(audio_bytes, content_type="audio/mpeg")
-                scene["audio_storage_path"] = audio_blob.public_url
+        # --- THIS IS THE CORRECTED FUNCTION CALL ---
+        video_url = generate_video_from_project(
+            df,
+            project_data.get('rawMarkdown', ''), # Use the correct key for the markdown
+            uid,                                # ADDED missing uid
+            project_id,                         # ADDED missing project_id
+            voice_model,                        # Now in the correct position
+            bucket                              # ADDED missing bucket
+        )
         
-        logger.info(f"User {uid}: Saving video script specification to database for project {project_id}.")
-        project_ref.child('video_script').set(video_script)
-        project_ref.update({'status': 'video_script_complete', 'updatedAt': datetime.utcnow().isoformat()})
+        if not video_url: raise Exception("Video generation failed in core function.")
+        
+        project_ref.update({'status': 'video_complete', 'videoUrl': video_url})
+        return jsonify({'success': True, 'video_url': video_url}), 200
         
-        full_project_data = project_ref.get()
-        logger.info(f"User {uid}: Video script generation for project {project_id} complete.")
-        return jsonify({'success': True, 'project': full_project_data}), 200
-
     except Exception as e:
-        db.reference(f'sozo_projects/{project_id}').update({'status': 'failed', 'error': str(e), 'updatedAt': datetime.utcnow().isoformat()})
-        logger.error(f"CRITICAL ERROR generating video for {project_id}: {traceback.format_exc()}")
+        db.reference(f'sozo_projects/{project_id}').update({'status': 'failed', 'error': str(e)})
+        traceback.print_exc()
         return jsonify({'error': str(e)}), 500
 
 @app.route('/api/sozo/projects/<string:project_id>/charts', methods=['POST'])