baldator commited on
Commit
2569d41
·
1 Parent(s): 13ff01d

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +14 -6
app.py CHANGED
@@ -9,6 +9,7 @@ import http.server
9
  import socketserver
10
  import threading
11
  import socket
 
12
  import s3fs
13
  import os
14
 
@@ -20,12 +21,14 @@ output_dir.mkdir(exist_ok=True)
20
  AWS_S3_BUCKET = os.getenv("AWS_S3_BUCKET")
21
  AWS_ACCESS_KEY_ID = os.getenv("AWS_ACCESS_KEY_ID")
22
  AWS_SECRET_ACCESS_KEY = os.getenv("AWS_SECRET_ACCESS_KEY")
23
- print("AWS CONFIG:")
24
- print(AWS_S3_BUCKET)
25
- print(AWS_ACCESS_KEY_ID)
 
 
26
 
27
- storage_options = {"key": AWS_ACCESS_KEY_ID, "secret": AWS_SECRET_ACCESS_KEY}
28
- fs = s3fs.S3FileSystem(**storage_options)
29
 
30
  logging.basicConfig(level=logging.INFO)
31
 
@@ -116,8 +119,13 @@ def convert_video(video_file, quality, aspect_ratio, video_url):
116
  output_links = []
117
  for path in output_paths:
118
  output_links.append(f'<a href="http://{server_ip}:8000{path}" target="_blank">Download {Path(path).stem}</a>')
 
 
 
119
  print("Upload " + Path(path).stem + " to AWS")
120
- fs.mv(str(output_dir / f"{output_path.stem}_%03d.ts"), f"s3://{AWS_S3_BUCKET}/{Path(path).stem}",)
 
 
121
 
122
  output_html = "<br>".join(output_links)
123
  return output_html
 
9
  import socketserver
10
  import threading
11
  import socket
12
+ import boto3
13
  import s3fs
14
  import os
15
 
 
21
  AWS_S3_BUCKET = os.getenv("AWS_S3_BUCKET")
22
  AWS_ACCESS_KEY_ID = os.getenv("AWS_ACCESS_KEY_ID")
23
  AWS_SECRET_ACCESS_KEY = os.getenv("AWS_SECRET_ACCESS_KEY")
24
+ session = boto3.Session(
25
+ aws_access_key_id=AWS_ACCESS_KEY_ID,
26
+ aws_secret_access_key=AWS_SECRET_ACCESS_KEY,
27
+ region_name='us-east-1'
28
+ )
29
 
30
+ s3 = session.client('s3')
31
+ fs = s3fs.S3FileSystem(anon=False, client_kwargs={'region_name': 'us-east-1'})
32
 
33
  logging.basicConfig(level=logging.INFO)
34
 
 
119
  output_links = []
120
  for path in output_paths:
121
  output_links.append(f'<a href="http://{server_ip}:8000{path}" target="_blank">Download {Path(path).stem}</a>')
122
+ print("Read local file")
123
+ with open(path, 'rb') as file:
124
+ file_content = file.read()
125
  print("Upload " + Path(path).stem + " to AWS")
126
+ # fs.mv(str(output_dir / f"{output_path.stem}_%03d.ts"), f"s3://{AWS_S3_BUCKET}/{Path(path).stem}",)
127
+ with fs.open(f"s3://{AWS_S3_BUCKET}/{Path(path).stem}", 'wb') as file:
128
+ file.write(your_file_content)
129
 
130
  output_html = "<br>".join(output_links)
131
  return output_html