Update app.py

app.py

@@ -11,7 +11,7 @@ import threading
 import socket
 import boto3
 import s3fs
-import os
+import os 
 
 # Define output directory
 output_dir = Path.cwd() / "output"
@@ -27,6 +27,9 @@ session = boto3.Session(
     region_name='us-east-1'
 )
 
+s3 = session.client('s3')
+fs = s3fs.S3FileSystem(anon=False, client_kwargs={'region_name': 'us-east-1'})
+
 logging.basicConfig(level=logging.INFO)
 
 standard_resolutions = [4320, 2160, 1440, 1080, 720, 480, 360, 240]
@@ -49,25 +52,23 @@ def get_ip_address():
         s.close()
     return IP
 
-def download_file(url, destination):
-    response = requests.get(url)
-    response.raise_for_status()
-    with open(destination, 'wb') as f:
-        f.write(response.content)
-
-def get_input_path(video_file, video_url):
-    if video_file is not None:
-        # Save the uploaded file to the output directory
-        input_path = output_dir / video_file.name
-        with open(input_path, "wb") as f:
-            f.write(video_file.getbuffer())
-        return input_path
+def upload_video_to_s3(video_file): # UPDATED CODE
+    s3_key = video_file.name
+    s3.upload_fileobj(video_file, AWS_S3_BUCKET, s3_key)
+    return f"s3://{AWS_S3_BUCKET}/{s3_key}"
+
+def download_s3_video_to_local(input_path): # UPDATED CODE
+    fs.download(input_path, str(output_dir / Path(input_path).name))
+
+def get_input_path(video_file=None, video_url=None): # UPDATED CODE
+    if video_file:
+        return upload_video_to_s3(video_file)
     elif video_url:
         url_path = urlparse(video_url).path
         file_name = Path(url_path).name
         destination = output_dir / file_name
         download_file(video_url, destination)
-        return destination
+        return upload_video_to_s3(destination)
     else:
         raise ValueError("No input was provided.")
 
@@ -90,48 +91,29 @@ def create_master_playlist(output_paths, input_filename):
             f.writelines(content)
     return master_playlist_path
 
-def upload_file_to_s3(local_path, s3_key):
-    s3 = boto3.client(
-        "s3",
-        aws_access_key_id=st.secrets["AWS_ACCESS_KEY_ID"],
-        aws_secret_access_key=st.secrets["AWS_SECRET_ACCESS_KEY"],
-        region_name=st.secrets["AWS_REGION"],
-    )
-
-    bucket_name = st.secrets["AWS_S3_BUCKET"]
-
-    with open(local_path, "rb") as file:
-        s3.upload_fileobj(file, bucket_name, s3_key)
-
-    return f"https://{bucket_name}.s3.amazonaws.com/{s3_key}"
-
-def convert_video(video_file, quality, aspect_ratio, video_url):
+def convert_video(video_file, quality, aspect_ratio, video_url): # UPDATED CODE
     # Ensure either a file or a URL is provided
     if not video_file and not video_url:
         raise ValueError("Please provide either a video file or a video URL.")
     
-    # Check file size
-    if video_file is not None and video_file.size > max_upload_size:
-        raise ValueError("Maximum file size exceeded. Please upload a smaller file.")
-    
+    # Get S3 path and download to local
     input_path = get_input_path(video_file, video_url)
-    st.write(f"Input file path: {input_path}")  # Added line to print input file path
-    video = VideoFileClip(str(input_path))
+    local_input_path = download_s3_video_to_local(input_path)
+
+    st.write(f"Input file path: {local_input_path}")  # Added line to print input file path
+    video = VideoFileClip(str(local_input_path))
 
     # Get the original height to avoid upscaling
     original_height = video.size[1]
-
     output_paths = []
+
     for res in reversed(standard_resolutions):
         if res > original_height:
             continue
-
         scale = "-1:" + str(res)
         output_path = get_output_path(input_path, str(res) + 'p')
-
-        # use a lower CRF value for better quality
         ffmpeg_command = [
-            "ffmpeg", "-i", str(input_path), "-c:v", "libx264", "-crf", str(quality),
+            "ffmpeg", "-i", str(local_input_path), "-c:v", "libx264", "-crf", str(quality),
             "-vf", f"scale={scale}:force_original_aspect_ratio=decrease,pad=ceil(iw/2)*2:ceil(ih/2)*2",
             "-hls_time", "10", "-hls_playlist_type", "vod", "-hls_segment_filename",
             str(output_dir / f"{output_path.stem}_%03d.ts"), str(output_path)
@@ -142,27 +124,30 @@ def convert_video(video_file, quality, aspect_ratio, video_url):
 
         output_paths.append(output_path)
 
-    master_playlist_path = create_master_playlist(output_paths, Path(input_path).stem)
+    master_playlist_path = create_master_playlist(output_paths, Path(local_input_path).stem)
     output_paths.append(master_playlist_path)
 
     output_links = []
     for path in output_paths:
-        s3_path = f"s3://{AWS_S3_BUCKET}/{Path(input_path).stem}/{Path(path).name}"
+        s3_path = f"s3://{AWS_S3_BUCKET}/{Path(local_input_path).stem}/{Path(path).name}"
         upload_file_to_s3(path, s3_path)
-        output_links.append(f'<a href="https://{AWS_S3_BUCKET}.s3.amazonaws.com/{Path(input_path).stem}/{quote_plus(Path(path).name)}" target="_blank">Download {Path(path).stem}</a>')
+        output_links.append(f'<a href="https://{AWS_S3_BUCKET}.s3.amazonaws.com/{Path(local_input_path).stem}/{quote_plus(Path(path).name)}" target="_blank">Download {Path(path).stem}</a>')
 
     # upload ts files to s3
-    for path in output_dir.glob(f"{Path(input_path).stem}_*p_*.ts"):
-        s3_path = f"s3://{AWS_S3_BUCKET}/{Path(input_path).stem}/{Path(path).name}"
+    for path in output_dir.glob(f"{Path(local_input_path).stem}_*p_*.ts"):
+        s3_path = f"s3://{AWS_S3_BUCKET}/{Path(local_input_path).stem}/{Path(path).name}"
         upload_file_to_s3(path, s3_path)
 
+    # Delete local downloaded file after job is done
+    os.remove(local_input_path)
+
     output_html = "<br>".join(output_links)
     return output_html
 
 st.title("NEAR Hub Video Transcoder to m3u8")
 st.markdown("Convert video files to m3u8 for VOD streaming in nearhub.club.")
 
-video_file = st.file_uploader("Your video file", type=["mp4", "mov"])
+video_file = st.file_uploader("Your video file")
 quality = st.slider("Quality (0: Highest Quality - 50: Fastest)", min_value=0, max_value=51, value=23)
 aspect_ratio = st.selectbox("Aspect Ratio", ["16:9", "4:3", "1:1", "3:4", "9:16", "1:1", "2:1", "1:2"], index=0)
 video_url = st.text_input("Video URL", "")