Update app.py

app.py

@@ -144,97 +144,6 @@ def merge_audio_video(video_filename, audio_filename, output_filename, overlay_a
         overlay_audio_clip.close()
 
     return output_filename    
-# def merge_audio_video(video_filename, audio_filename, output_filename, overlay_audio_path=None):
-#     try:
-#         video_clip = VideoFileClip(video_filename)
-#         main_audio_clip = AudioFileClip(audio_filename)
-#     except Exception as e:
-#         print(f"Error loading video or main audio clip: {e}")
-#         return None
-
-#     # Create a list starting with the main audio clip
-#     audio_clips = [main_audio_clip]
-
-#     # If there's an overlay audio file, adjust its volume and add to the composite
-#     if overlay_audio_path and os.path.exists(overlay_audio_path):
-#         try:
-#             overlay_audio_clip = AudioFileClip(overlay_audio_path)
-#             # Adjust the overlay audio clip's volume to 20%
-#             overlay_audio_clip = overlay_audio_clip.volumex(0.2)
-#             audio_clips.append(overlay_audio_clip.set_duration(main_audio_clip.duration))
-#         except Exception as e:
-#             print(f"Error processing overlay audio clip: {e}")
-#             # Depending on your needs, you may choose to return None here or continue without the overlay
-
-#     # Combine the audio clips
-#     composite_audio_clip = CompositeAudioClip(audio_clips)
-
-#     # Ensure the composite audio clip does not exceed the video's duration
-#     if composite_audio_clip.duration > video_clip.duration:
-#         # Extend the video with the last frame if the audio is longer
-#         last_frame = video_clip.to_ImageClip(t=video_clip.duration - 1).set_duration(composite_audio_clip.duration - video_clip.duration)
-#         video_clip = concatenate_videoclips([video_clip, last_frame])
-
-#     # Set the composite audio as the video's audio and write the output file
-#     final_clip = video_clip.set_audio(composite_audio_clip)
-#     final_clip.write_videofile(output_filename, codec='libx264', audio_codec="aac")
-
-#     # Cleanup
-#     video_clip.close()
-#     main_audio_clip.close()
-#     if 'overlay_audio_clip' in locals():
-#         overlay_audio_clip.close()
-
-#     return output_filename
-    
-# def merge_audio_video(video_filename, audio_filename, output_filename, overlay_audio_file=None):
-#     try:
-#         video_clip = VideoFileClip(video_filename)
-#         audio_clip = AudioFileClip(audio_filename)
-#     except Exception as e:
-#         st.error(f"Error loading video or audio clip: {e}")
-#         return None
-
-#     audio_clips = [audio_clip]  # Start with the main audio clip
-
-#     # If there's an overlay audio file, add it to the composite
-#     overlay_audio_path = None
-#     if overlay_audio_file is not None:
-#         overlay_audio_path = save_temporary_audio_file(overlay_audio_file)
-#         if overlay_audio_path and os.path.exists(overlay_audio_path):
-#             try:
-#                 overlay_clip = AudioFileClip(overlay_audio_path).volumex(0.2)
-#                 audio_clips.append(overlay_clip.set_duration(audio_clip.duration))
-#             except Exception as e:
-#                 st.error(f"Error loading overlay audio clip: {e}")
-#                 # Optionally handle the error or continue without the overlay
-#         else:
-#             st.error("Overlay audio file does not exist or path is incorrect.")
-
-#     composite_audio_clip = CompositeAudioClip(audio_clips)
-
-#     if composite_audio_clip.duration > video_clip.duration:
-#         # Extend video with the last frame if audio is longer
-#         try:
-#             last_frame = video_clip.to_ImageClip(t=video_clip.duration-1).set_duration(composite_audio_clip.duration - video_clip.duration)
-#             video_clip = concatenate_videoclips([video_clip, last_frame])
-#         except Exception as e:
-#             st.error(f"Error extending video clip: {e}")
-#             return None
-
-#     try:
-#         final_clip = video_clip.set_audio(composite_audio_clip)
-#         final_clip.write_videofile(output_filename, codec='libx264', audio_codec="aac")
-#     except Exception as e:
-#         st.error(f"Error creating final video file: {e}")
-#         return None
-#     finally:
-#         video_clip.close()
-#         audio_clip.close()
-#         if overlay_audio_path:
-#             os.remove(overlay_audio_path)
-
-#     return output_filename
 
 def save_temporary_audio_file(uploaded_file):
     with tempfile.NamedTemporaryFile(delete=False, suffix=".wav") as tmpfile:
@@ -312,33 +221,27 @@ def main():
     if uploaded_video_file is not None and st.button("START PROCESSING"):
         with st.spinner("Processing..."):
             overlay_audio_path = None
-            if overlay_audio_file is not None:
-                # Reset the file pointer of the overlay audio file before processing
-                overlay_audio_file.seek(0)
-                overlay_audio_path = save_temporary_audio_file(overlay_audio_file)
+            if uploaded_audio_file is not None:
+                uploaded_audio_file.seek(0)
+                overlay_audio_path = save_temporary_audio_file(uploaded_audio_file)
 
-            # Reset the file pointer of the uploaded video file before processing
-            uploaded_file.seek(0)
-            base64Frame, video_filename, video_duration = video_to_frames(uploaded_file, frame_sampling_rate=1)
+            uploaded_video_file.seek(0)
+            base64Frame, video_filename, video_duration = video_to_frames(uploaded_video_file, frame_sampling_rate=1)
 
-            prompt_template = script_templates.get(selected_script_type, "Default prompt if script type not found")
-            prompt = prompt_template.format(selected_duration=selected_duration)
+            prompt = prompt_template
             text = frames_to_story(base64Frame, prompt, openai_key)
 
             audio_filename = text_to_audio(text, openai_key, voice_options[voice])
             output_video_filename = os.path.splitext(video_filename)[0] + "_output.mp4"
             final_video_filename = merge_audio_video(video_filename, audio_filename, output_video_filename, overlay_audio_path)
 
-            # Display the generated script to the user
             st.subheader("Generated Script")
             st.write(text)
 
             if final_video_filename:
-                # Display the final video with voiceover
                 st.subheader("Final Video with Voiceover")
                 st.video(final_video_filename)
 
-                # Cleanup temporary files
                 os.remove(video_filename)
                 os.remove(audio_filename)
                 if overlay_audio_path: