upload data

app.py

@@ -61,19 +61,21 @@ S3_SECRET_KEY = os.getenv("S3_SECRET_KEY")
 
 
 # Function to upload file to Cloudflare R2
-def upload_to_r2(file_path, bucket_name, object_name):
+def upload_data_to_r2(data, bucket_name, object_name, content_type='application/octet-stream'):
     """
-    Upload a file to a Cloudflare R2 bucket.
+    Upload data directly to a Cloudflare R2 bucket.
 
-    :param file_path: Path to the file to upload.
+    :param data: Data to upload (bytes or string).
     :param bucket_name: Name of the R2 bucket.
     :param object_name: Name of the object to save in the bucket.
-    :param r2_access_key: Cloudflare R2 access key.
-    :param r2_secret_key: Cloudflare R2 secret key.
-    :param r2_account_id: Cloudflare R2 account ID.
-    :return: True if file was uploaded, else False.
+    :param content_type: MIME type of the data.
+    :return: True if data was uploaded, else False.
     """
     try:
+        # Convert string to bytes if necessary
+        if isinstance(data, str):
+            data = data.encode('utf-8')
+        
         # Initialize a session using Cloudflare R2 credentials
         session = boto3.session.Session()
         s3 = session.client('s3',
@@ -81,21 +83,23 @@ def upload_to_r2(file_path, bucket_name, object_name):
             aws_access_key_id=S3_ACCESS_KEY,
             aws_secret_access_key=S3_SECRET_KEY,
             config = Config(s3={"addressing_style": "virtual"}, signature_version='s3v4'),
-            #region_name = 'auto'
+            region_name = 'auto'
         )
 
-        # Upload the file to R2 bucket
-        s3.upload_file(file_path, bucket_name, object_name)
-        print(f"File '{file_path}' uploaded to R2 bucket '{bucket_name}' as '{object_name}'")
+        # Upload the data to R2 bucket
+        s3.put_object(
+            Bucket=bucket_name, 
+            Key=object_name, 
+            Body=data,
+            ContentType=content_type
+        )
+        print(f"Data uploaded to R2 bucket '{bucket_name}' as '{object_name}'")
         return True
-    except FileNotFoundError:
-        print(f"The file {file_path} was not found")
-        return False
     except NoCredentialsError:
         print("Credentials not available")
         return False
     except ClientError as e:
-        print(f"Failed to upload file to R2 bucket: {e}")
+        print(f"Failed to upload data to R2 bucket: {e}")
         return False
     except Exception as e:
         print(f"An unexpected error occurred: {e}")
@@ -199,7 +203,7 @@ def prepare_and_save_audio_for_model(task: dict, out_dir: str) -> dict:
     """
     1) Decode chunk to mono 16k PCM.
     2) Run VAD to locate head/tail silence.
-    3) Trim only if head or tail silence >= 10s.
+    3) Trim only if head or tail >= 10s.
     4) Save the (possibly trimmed) WAV to local file.
     5) Return timing metadata, including 'trimmed_start_ms' to preserve global timestamps.
     """
@@ -728,7 +732,7 @@ class WhisperTranscriber:
             job_id = pre_meta["job_id"]
             task_id = pre_meta["chunk_idx"]
             filekey = f"ai-transcribe/split/{job_id}-{task_id}.json"
-            ret = upload_to_r2(json.dumps(result), "intermediate", filekey)
+            ret = upload_data_to_r2(json.dumps(result), "intermediate", filekey)
             if ret:
                 return {"filekey": filekey}
             else: