remove json_stripper

main.py

@@ -4,6 +4,7 @@ from ffmpeg import input, output, run
 from botocore.exceptions import ClientError
 import ffmpeg
 import boto3
+import json
 import os
 
 app = FastAPI()
@@ -24,29 +25,6 @@ class CutRequest(BaseModel):
     news_name: str
     news_id: int
 
-async def json_stripper(request: CutRequest):
-    raw_body = await request.body()
-    try:
-        # Decode the raw body
-        body_str = raw_body.decode('utf-8')
-    
-        # Remove any surrounding quotes if present
-        body_str = body_str.strip('"')
-        
-        # Unescape the JSON string
-        body_str = body_str.replace('\\"', '"')
-        
-        # Parse the JSON
-        body = json.loads(body_str)
-        
-        return body
-    except json.JSONDecodeError as e:
-        print(f"JSON Decode Error: {e}")
-        raise HTTPException(status_code=400, detail=f"Invalid JSON: {str(e)}")
-    except Exception as e:
-        print(f"Error: {e}")
-        raise HTTPException(status_code=400, detail=str(e))
-
 def download_file(news_name: str, quote_filename: str, new_filename: str = "source.mp3"):
     s3_directory = f'{aws_env}/{news_name}'
     s3_object_key = f'{s3_directory}/{quote_filename}'
@@ -72,36 +50,33 @@ def download_file(news_name: str, quote_filename: str, new_filename: str = "sour
 
 
 @app.post("/cut-audio")
-async def cut_audio(request: CutRequest):
-    # Use json_stripper to parse the request body
-    body = await json_stripper(request)
-    
-    # Validate the body against CutRequest model
+async def cut_audio(request: CutRequest = Body(...)):
     try:
-        cut_request = CutRequest(**body)
+        cut_request = request
+
+        download_file(cut_request.news_name, cut_request.quote_filename)
+        for i, segment in enumerate(cut_request.segments):
+            start, end = segment
+            output_file = f"/tmp/cut_quote_{i}.mp3"
+            try:
+                (
+                    ffmpeg
+                    .input('/tmp/source.mp3', ss=start, to=end)
+                    .output(output_file)
+                    .run()
+                )
+            except ffmpeg.Error as e:
+                raise HTTPException(status_code=500, detail=str(e))
+            try:
+                s3_output_key = f'{aws_env}/{cut_request.news_id}/genBase_segment_{i}.mp3' 
+                s3_client.upload_file(output_file, s3_bucket_name, s3_output_key)
+            except Exception as e:
+                raise HTTPException(status_code=500, detail=f"Failed to upload file to S3: {e}")
+
+        return {"message": "Audio cut successfully"}
+    
     except ValueError as e:
-        raise HTTPException(status_code=400, detail=str(e))
-
-    # Now you can use cut_request in your function
-    download_file(cut_request.news_name, cut_request.quote_filename)
-    for i, (start, end) in enumerate(cut_request.segments):
-        output_file = f"/tmp/cut_quote_{i}.mp3"
-        try:
-            (
-                ffmpeg
-                .input('/tmp/source.mp3', ss=start, to=end)
-                .output(output_file)
-                .run()
-            )
-        except ffmpeg.Error as e:
-            raise HTTPException(status_code=500, detail=str(e))
-        try:
-            s3_output_key = f'{aws_env}/{cut_request.news_id}/genBase_segment_{i}.mp3' 
-            s3_client.upload_file(output_file, s3_bucket_name, s3_output_key)
-        except Exception as e:
-            raise HTTPException(status_code=500, detail=f"Failed to upload file to S3: {e}")
-
-    return {"message": "Audio cut successfully"}
+        raise HTTPException(status_code=422, detail=str(e))
 
 @app.post("/merge_audio/{output_key}")
 async def merge_audio(output_key: str):