add lookup to 'uploads' in base s3 dir

main.py

@@ -33,45 +33,45 @@ class CutRequestInput(BaseModel):
     data: CutRequest
 
 def download_file(news_name: str, quote_filename: str, new_filename: str = "source.mp3"):
-    logger.debug(f"Downloading file: news_name={news_name}, quote_filename={quote_filename}")
-    s3_directory = f'{aws_env}/{news_name}'
+    # logger.debug(f"Downloading file: news_name={news_name}, quote_filename={quote_filename}")
+    s3_directory = f'uploads/{aws_env}/{news_name}'
     s3_object_key = f'{s3_directory}/{quote_filename}'
     local_file = os.path.join(temp_dir, new_filename)
 
     try:
         # Ensure the download directory exists
         os.makedirs(temp_dir, exist_ok=True)
-        logger.debug(f"Downloading from S3: bucket={s3_bucket_name}, key={s3_object_key}, local_file={local_file}")
+        # logger.debug(f"Downloading from S3: bucket={s3_bucket_name}, key={s3_object_key}, local_file={local_file}")
 
         s3_client.download_file(s3_bucket_name, s3_object_key, local_file)
-        logger.debug(f"File downloaded and saved as: {local_file}")
+        # logger.debug(f"File downloaded and saved as: {local_file}")
         
         # Return the local_file path
         return local_file
 
     except ClientError as e:
         if e.response['Error']['Code'] == "404":
-            logger.error(f"File not found in S3: {s3_object_key}")
+            # logger.error(f"File not found in S3: {s3_object_key}")
 
             raise HTTPException(status_code=404, detail=f"The file {quote_filename} does not exist in S3.")
         else:
-            logger.error(f"S3 download error: {str(e)}")
+            # logger.error(f"S3 download error: {str(e)}")
 
             raise HTTPException(status_code=500, detail=f"Failed to download file from S3: {str(e)}")
     except Exception as e:
-        logger.exception(f"Unexpected error in download_file: {str(e)}")
+        # logger.exception(f"Unexpected error in download_file: {str(e)}")
 
         raise HTTPException(status_code=500, detail=f"An unexpected error occurred: {str(e)}")
 
 
 @app.post("/cut-audio")
 async def cut_audio(request: CutRequestInput):
-    logger.debug(f"Received request: {request}")
+    # logger.debug(f"Received request: {request}")
 
     try:
         
         cut_request = request.data
-        logger.debug(f"Parsed cut_request: {cut_request}")
+        # logger.debug(f"Parsed cut_request: {cut_request}")
 
 
         print(f"Received request: {cut_request}")
@@ -79,7 +79,7 @@ async def cut_audio(request: CutRequestInput):
         download_file(cut_request.news_name, cut_request.quote_filename)
         for i, segment in enumerate(cut_request.segments):
             start, end = segment
-            logger.debug(f"Processing segment {i}: start={start}, end={end}")
+            # logger.debug(f"Processing segment {i}: start={start}, end={end}")
 
             output_file = f"/tmp/cut_quote_{i}_{cut_request.quote_filename}"
             try:
@@ -90,21 +90,21 @@ async def cut_audio(request: CutRequestInput):
                     .run()
                 )
             except ffmpeg.Error as e:
-                logger.error(f"FFMPEG Error: {str(e)}")
+                # logger.error(f"FFMPEG Error: {str(e)}")
 
                 raise HTTPException(status_code=500, detail=str(e))
             try:
                 s3_output_key = f'cut_outs/{aws_env}/{cut_request.news_id}/quote_segment_{i}.mp3'
                 s3_client.upload_file(output_file, s3_bucket_name, s3_output_key)
             except Exception as e:
-                logger.error(f"S3 Upload Error: {str(e)}")
+                # logger.error(f"S3 Upload Error: {str(e)}")
 
                 raise HTTPException(status_code=500, detail=f"Failed to upload file to S3: {e}")
 
         return {"message": "Audio cut successfully"}
     
     except Exception as e:
-        logger.exception("Unexpected error in cut_audio")
+        # logger.exception("Unexpected error in cut_audio")
         raise HTTPException(status_code=500, detail=f"Unexpected error: {str(e)}")
 
 @app.post("/merge_audio/{output_key}")