Resolved merge conflicts and updated app

app.py

@@ -1,5 +1,5 @@
 import gradio as gr
-from utils import process_video  # Ensure this points to the updated utils.py
+from utils import process_video
 
 # Define supported languages
 language_map = {
@@ -16,43 +16,17 @@ language_map = {
     "Japanese": "Helsinki-NLP/opus-mt-en-jap"
 }
 
-<<<<<<< HEAD
-# Custom CSS for dark mode and animations
-css = """
-body { 
-    background-color: #1a1a1a;
-    color: #e0e0e0;
-    font-family: 'Arial', sans-serif;
-=======
-# Custom CSS for a Windows-like professional look
+# Custom CSS for a professional look
 css = """
 body {
     background-color: #1a1a1a;
     color: #e0e0e0;
     font-family: 'Segoe UI', sans-serif;
->>>>>>> e219dd283e6bfab4f30d250a687e17c1cc380d47
 }
 .gradio-container {
     max-width: 1200px;
     margin: 0 auto;
     padding: 20px;
-<<<<<<< HEAD
-    border-radius: 10px;
-    box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
-}
-.file-preview {
-    border: 2px dashed #6c757d;
-    padding: 20px;
-    border-radius: 10px;
-}
-.progress-text {
-    font-size: 16px;
-    color: #28a745;
-    animation: blink 1s infinite;
-}
-@keyframes blink {
-    50% { opacity: 0.5; }
-=======
     border-radius: 8px;
     background: #2d2d2d;
     box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
@@ -66,7 +40,6 @@ body {
     color: #00ff00;
     font-weight: bold;
     margin-top: 10px;
->>>>>>> e219dd283e6bfab4f30d250a687e17c1cc380d47
 }
 """
 
@@ -79,7 +52,7 @@ with gr.Blocks(theme=gr.themes.Monochrome(), css=css) as demo:
         with gr.Column(scale=2):
             video_input = gr.File(
                 label="Upload Video File",
-                file_types=["mp4", "mkv", "avi"],
+                file_types=["mp4", "mkv", "avi"],  # Extensions without leading dots
                 elem_classes=["file-preview"]
             )
         with gr.Column(scale=1):
@@ -89,15 +62,9 @@ with gr.Blocks(theme=gr.themes.Monochrome(), css=css) as demo:
                 value="English"
             )
 
-<<<<<<< HEAD
-    generate_button = gr.Button("Generate Subtitles 🚀")
-    progress_text = gr.Textbox(
-        label="Progress",
-=======
     generate_button = gr.Button("Generate Subtitles 🚀", elem_classes=["btn-primary"])
     progress_text = gr.Textbox(
         label="Status",
->>>>>>> e219dd283e6bfab4f30d250a687e17c1cc380d47
         interactive=False,
         elem_classes=["progress-text"]
     )
@@ -109,20 +76,6 @@ with gr.Blocks(theme=gr.themes.Monochrome(), css=css) as demo:
             if not video_file.name.lower().endswith(('.mp4', '.mkv', '.avi')):
                 return None, "❌ Invalid file type. Please upload an MP4, MKV, or AVI file."
 
-<<<<<<< HEAD
-            # Update progress
-            progress = "🔄 Processing video..."
-            yield None, progress  # Initial progress update
-
-            # Process video
-            srt_path = process_video(video_file.name, language)
-            if srt_path:
-                yield gr.File(srt_path), "✅ Subtitles generated successfully!"
-            else:
-                yield None, "❌ Error during processing. Check logs."
-        except Exception as e:
-            yield None, f"❌ Error: {str(e)}"
-=======
             # Initialize progress tracking
             progress = gr.Progress(track_tqdm=True)
 
@@ -139,7 +92,6 @@ with gr.Blocks(theme=gr.themes.Monochrome(), css=css) as demo:
         except Exception as e:
             progress(0, desc="❌ Error encountered.")
             return None, f"❌ Error: {str(e)}"
->>>>>>> e219dd283e6bfab4f30d250a687e17c1cc380d47
 
     generate_button.click(
         generate_subtitles,

utils.py

@@ -7,17 +7,6 @@ import subprocess
 # Load Whisper model
 model = whisper.load_model("base")
 
-<<<<<<< HEAD
-def process_video(video_path, language):
-    # Create a temporary directory
-    temp_dir = tempfile.gettempdir()
-    output_video_path = os.path.join(temp_dir, "converted_video.mp4")
-    srt_path = os.path.join(temp_dir, "subtitles.srt")
-
-    try:
-        # Convert video to MP4 using ffmpeg
-        print(f"Converting video: {video_path} to MP4...")
-=======
 def process_video(video_path, language, progress=None):
     output_video_path = os.path.join(tempfile.gettempdir(), "converted_video.mp4")
     srt_path = os.path.join(tempfile.gettempdir(), "subtitles.srt")
@@ -26,21 +15,12 @@ def process_video(video_path, language, progress=None):
         # Convert video to MP4 using ffmpeg
         if progress:
             progress(0.2, desc="🔄 Converting video to MP4...")
->>>>>>> e219dd283e6bfab4f30d250a687e17c1cc380d47
         subprocess.run(
             ["ffmpeg", "-i", video_path, "-c:v", "libx264", "-preset", "fast", output_video_path],
             check=True,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE
         )
-<<<<<<< HEAD
-        print("Video converted successfully!")
-
-        # Transcribe video
-        print("Transcribing video...")
-        result = model.transcribe(output_video_path, language="en")
-        print("Transcription completed!")
-=======
 
         # Transcribe video
         if progress:
@@ -48,7 +28,6 @@ def process_video(video_path, language, progress=None):
         result = model.transcribe(output_video_path, language="en")
         if progress:
             progress(0.6, desc="🌐 Translating subtitles...")
->>>>>>> e219dd283e6bfab4f30d250a687e17c1cc380d47
 
         # Translation logic
         segments = []
@@ -72,10 +51,6 @@ def process_video(video_path, language, progress=None):
                 return None
 
             # Load translation model
-<<<<<<< HEAD
-            print(f"Loading translation model: {model_name}")
-=======
->>>>>>> e219dd283e6bfab4f30d250a687e17c1cc380d47
             if language == "Telugu":
                 tokenizer = AutoTokenizer.from_pretrained(model_name)
                 translation_model = AutoModelForSeq2SeqLM.from_pretrained(model_name)
@@ -97,23 +72,16 @@ def process_video(video_path, language, progress=None):
                     segments.append({"text": translated_text, "start": segment["start"], "end": segment["end"]})
 
         # Create SRT file
-<<<<<<< HEAD
-=======
         if progress:
             progress(0.8, desc="📝 Generating SRT file...")
->>>>>>> e219dd283e6bfab4f30d250a687e17c1cc380d47
         with open(srt_path, "w", encoding="utf-8") as f:
             for i, segment in enumerate(segments, 1):
                 start = f"{segment['start']:.3f}".replace(".", ",")
                 end = f"{segment['end']:.3f}".replace(".", ",")
                 text = segment["text"].strip()
                 f.write(f"{i}\n00:00:{start} --> 00:00:{end}\n{text}\n\n")
-<<<<<<< HEAD
-        print(f"SRT file saved to {srt_path}")
-=======
         if progress:
             progress(1.0, desc="✅ Done!")
->>>>>>> e219dd283e6bfab4f30d250a687e17c1cc380d47
         return srt_path
 
     except subprocess.CalledProcessError as e: