modularized code

Dockerfile

@@ -6,8 +6,6 @@ COPY requirements.txt .
 
 RUN pip install --no-cache-dir -r requirements.txt
 
-RUN apt-get update && apt-get install -y ffmpeg
-
 ENV MPLCONFIGDIR /tmp/matplotlib
 
 RUN mkdir /app/results_vc

app.py

@@ -1,12 +1,12 @@
 import os
+import re
 import threading
 import time
 from pathlib import Path
 
 import gradio as gr
 
-from utlis import (HHMMSS_to_sec, convert_video_format, molly_xlsx_to_table,
-                   table_to_ELAN_tsv, trim_media)
+from utlis import HHMMSS_to_sec, convert_video_format, molly_xlsx_to_table, xlsx_to_table, table_to_ELAN_tsv, trim_media
 
 
 def delete_files(files):
@@ -18,62 +18,102 @@ def delete_files(files):
             pass
     print("files deleted")
 
+def classify_input_format(input_string):
+    # check if the input string is empty
+    if not input_string:
+        return 0
+    
+    # check if the input string is a valid time in the format HH:MM:SS
+    hhmmss_pattern = re.compile('^\d{1,2}:\d{1,2}:\d{1,2}$')
+    if hhmmss_pattern.match(input_string):
+        return HHMMSS_to_sec(time_str=input_string)
+    
+    # check if the input string is a valid number in the format of seconds
+    try:
+        seconds = float(input_string)
+        return float(input_string)
+    except ValueError:
+        pass
+    
+    # if the input format is neither seconds nor HH:MM:SS, return None
+    return None
+
+def set_output_file(input_file, output_format, folder):
+    # Set output file name and extension
+    if not os.path.exists(folder):
+        os.makedirs(folder)
+    file_name = f"{Path(input_file.name).stem.partition('.')[0]}_trimmed.{output_format}"
+    output_file = os.path.join(folder, file_name)
+    print(f"Output folder: {folder}")
+    print(f"file_name: {file_name}")
+    print(f"Output file: {output_file}")
+    return output_file
+
+def trim_video_helper(input_file, output_file, start_time, end_time):
+    if start_time == "":
+        start_time = 0
+    if end_time == "":
+        end_time = 300 + HHMMSS_to_sec(time_str=start_time)
+    # Trim the video
+    print("start trimming")
+    start_time = classify_input_format(start_time)
+    end_time = classify_input_format(end_time)
+    print("start time: ", start_time)
+    print("end time: ", end_time)
+    output_file = trim_media(input_file.name, output_file, start_time, end_time)
+    print("finish trimming")
+    return output_file
+
+def convert_video_helper(input_file, output_file, output_format):
+    # convert video
+    print("start converting")
+    output_file = convert_video_format(input_file.name, output_file)
+    print("finish converting")
+    return output_file
+
+def convert_transcript_helper(input_transcript, output_transcript):
+    # convert transcript
+    print("start converting transcript")
+    table = xlsx_to_table(xl_file=input_transcript)
+    print("finish converting transcript to table")
+    output_file = table_to_ELAN_tsv(table, output_transcript)
+    print("finish converting transcript")
+    return output_file
+
 def trim_video_wt(input_file, input_transcript, output_format, start_time, end_time):
     # trim video with transcript
     try:
-        # Set output file name and extension
+        # set output file
         output_folder = f"{os.getcwd()}/results_wt/"
-        if not os.path.exists(output_folder):
-            os.makedirs(output_folder)
-        file_name = f"{Path(input_file.name).stem.partition('.')[0]}_trimmed.{output_format}"
-        output_file = os.path.join(output_folder, file_name)
-        print(f"Output folder: {output_folder}")
-        print(f"file_name: {file_name}")
-        print(f"Output file: {output_file}")
-        if start_time == "":
-            start_time = "00:00:00"
-        if end_time == "":
-            end_time = "00:05:00"
+        output_file = set_output_file(input_file, output_format, output_folder)
+        output_transcript = set_output_file(input_transcript, "tsv", output_folder)
+
         # Trim the video
-        print("start trimming")
-        output_file = trim_media(input_file.name, output_file, start_time, end_time)
-        
-        # trim transcript
-        print("start trimming transcript")
-        table = molly_xlsx_to_table(xl_file=input_transcript.name)
-        transcript_name = f"{Path(input_transcript.name).stem.partition('.')[0]}_trimmed.tsv"
-        transcript_file = os.path.join(output_folder, transcript_name)
-        table_to_ELAN_tsv(table, transcript_file)
+        output_file = trim_video_helper(input_file, output_file, start_time, end_time)
 
+        # convert transcript
+        path = input_transcript.name
+        output_transcript = convert_transcript_helper(path, output_transcript)
+        # output_transcript = output_file
         # remove file after 10 minutes for security
         print("start deleting files")
-        path_to_delete = [input_file.name, input_transcript.name, output_file, transcript_file]
+        path_to_delete = [input_file.name, input_transcript.name, output_file, output_transcript]
         threading.Thread(target=delete_files, args=([path_to_delete])).start()    
 
-        return output_file, transcript_file
+        return output_file, output_transcript
     except Exception as e:
         return f"Error: {str(e)}"
 
 def trim_video(input_file, output_format, start_time, end_time):
     try:
-        # Set output file name and extension
+        # Set output file
         output_folder = f"{os.getcwd()}/results_vt/"
-        if not os.path.exists(output_folder):
-            os.makedirs(output_folder)
-        file_name = f"{Path(input_file.name).stem.partition('.')[0]}_trimmed.{output_format}"
-        output_file = os.path.join(output_folder, file_name)
-        print(f"Output folder: {output_folder}")
-        print(f"file_name: {file_name}")
-        print(f"Output file: {output_file}")
-        if start_time == "":
-            start_time = "00:00:00"
-        if end_time == "":
-            end_time = "00:05:00"
+        output_file = set_output_file(input_file, output_format, output_folder)
+
         # Trim the video
-        print("start trimming")
-        output_file = trim_media(input_file.name, output_file, start_time, end_time)
+        output_file = trim_video_helper(input_file, output_file, start_time, end_time)
 
-        # remove file after 10 minutes for security
+        # Remove files after 10 minutes for security
         print("start deleting files")
         path_to_delete = [input_file.name, output_file]
         threading.Thread(target=delete_files, args=([path_to_delete])).start()
@@ -84,19 +124,13 @@ def trim_video(input_file, output_format, start_time, end_time):
 
 def convert_video(input_file, output_format):
     try:
-        # Set output file name and extension
-        output_folder = f"{os.getcwd()}/results_vc/"
-        if not os.path.exists(output_folder):
-            os.makedirs(output_folder)
-        file_name = f"{Path(input_file.name).stem.partition('.')[0]}_converted.{output_format}"
-        output_file = os.path.join(output_folder, file_name)
-        print(f"Output folder: {output_folder}")
-        print(f"file_name: {file_name}")
-        print(f"Output file: {output_file}")
-        # Convert the video
-        print("start converting")
-        output_file = convert_video_format(input_file.name, output_file)
-        
+        # Set output file
+        output_folder = f"{os.getcwd()}/results_cv/"
+        output_file = set_output_file(input_file, output_format, output_folder)
+
+        # Convert video
+        output_file = convert_video_helper(input_file, output_file, output_format)
+
         # remove file after 10 minutes for security 
         print("start deleting files")
         path_to_delete = [input_file.name, output_file]
@@ -121,7 +155,6 @@ interface_wt = gr.Interface(fn=trim_video_wt, inputs=[input_file_wt, input_trans
 
 # gr components for video trimmer
 input_file = gr.File(label="Select video file")
-# input_file.upload(show_progress=True)
 output_format = gr.Dropdown(choices=["mkv", "MOV", "mp4", "wav"], label="Select output format", value="mp4", )
 start_time = gr.Textbox(label="Start time (in seconds or HH:MM:SS). Leave blank to start at beginning.")
 end_time = gr.Textbox(label="End time (in seconds or HH:MM:SS). Leave blank to trim a  5-minute interval since start.")

requirements.txt

@@ -1,3 +1,4 @@
-gradio==3.23.0
+gradio==3.24.1
 moviepy==1.0.3
-pandas==1.1.3
+pandas==1.1.3
+xlrd==1.2.0

utlis.py

@@ -140,6 +140,39 @@ def molly_xlsx_to_table(xl_file):
 
     return table
 
+def xlsx_to_table(xl_file):
+    # read the first sheet of the Excel file into a DataFrame
+    print(f'...reading {xl_file}...')
+    breakpoint()
+    table = pd.read_excel(xl_file, sheet_name=0)
+    print(f'...done reading {xl_file}...')
+    # extract start and end time from the Timecode column
+    print(f'...splitting Timecode column into start and end time...')
+    timecodes = table['Timecode'].str.split(' - ', expand=True)
+    table['start_time'] = timecodes[0]
+    table['end_time'] = timecodes[1]
+    print(f'...done splitting Timecode column into start and end time...')
+    # convert start and end time to seconds using the HHMMSS_to_sec function
+    print(f'...converting start and end time to seconds...')
+    table['start_sec'] = table['start_time'].apply(HHMMSS_to_sec)
+    table['end_sec'] = table['end_time'].apply(HHMMSS_to_sec)
+    print(f'...done converting start and end time to seconds...')
+    # drop unnecessary columns
+    print(f'...dropping unnecessary columns...')
+    table.drop(['Timecode', 'Annotations', 'Error Type', 'Duration'], axis=1, inplace=True)
+
+    # rename columns
+    print(f'...renaming columns...')
+    table.rename(columns={'#': 'uttID', 'Speaker': 'speaker', 'Dialogue': 'transcript'}, inplace=True)
+
+    # reorder columns
+    print(f'...reordering columns...')
+    table = table[['uttID', 'speaker', 'transcript', 'start_sec', 'end_sec']]
+
+    return table
+
+
 def table_to_ELAN_tsv(table:pd.DataFrame, path:str):
     # write table to tsv compatible with ELAN import
-    table.to_csv(path, index=False, float_format='%.3f',sep='\t')
+    table.to_csv(path, index=False, float_format='%.3f',sep='\t')
+    return path