bug fix

app.py

@@ -84,25 +84,30 @@ def get_depth_map(image):
     return image
 
 
-def upload_to_s3(image, region, access_key, secret_key, bucket_name):
+def upload_to_s3(image, account_id, access_key, secret_key, bucket_name):
+
+    connectionUrl = f"https://{account_id}.r2.cloudflarestorage.com"
+
     s3 = boto3.client(
         's3',
-        region_name=region,
+        endpoint_url=connectionUrl,
+        region_name='auto',
         aws_access_key_id=access_key,
         aws_secret_access_key=secret_key
     )
-    image_key = f"generated_images/{random.randint(0, MAX_SEED)}.png"
+    image_file = f"generated_images/{random.randint(0, MAX_SEED)}.png"
     buffer = BytesIO()
     image.save(buffer, "PNG")
     buffer.seek(0)
-    
-    s3.upload_fileobj(buffer, bucket_name, image_key)
-    return image_key
+    print("start to upload")
+    s3.upload_fileobj(buffer, bucket_name, image_file)
+    print("upload finish", image_file)
+    return image_file
 
 
 
 @spaces.GPU(enable_queue=True)
-def process(image, image_url, prompt, n_prompt, num_steps, guidance_scale, control_strength, seed, upload_to_s3, region, access_key, secret_key, progress=gr.Progress()):
+def process(image, image_url, prompt, n_prompt, num_steps, guidance_scale, control_strength, seed, upload_to_s3, account_id, access_key, secret_key, progress=gr.Progress()):
 
     if image_url:
         orginal_image = load_image(image_url)
@@ -126,7 +131,7 @@ def process(image, image_url, prompt, n_prompt, num_steps, guidance_scale, contr
     ).images[0]
 
     if upload_to_s3:
-        url = upload_to_s3(generated_image, region, access_key, secret_key, bucket)
+        url = upload_to_s3(generated_image, account_id, access_key, secret_key, bucket)
         result = {"status": "success", "url": url}
     else:
         result = {"status": "success", "message": "Image generated but not uploaded"}
@@ -154,11 +159,11 @@ with gr.Blocks() as demo:
                     value="longbody, lowres, bad anatomy, bad hands, missing fingers, extra digit, fewer digits, cropped, worst quality, low quality",
                 )
 
-                upload_to_s3 = gr.Checkbox(label="Upload to S3", value=False)
-                region = gr.Textbox(label="S3 Region", placeholder="Enter S3 region here")
-                access_key = gr.Textbox(label="Access Key", placeholder="Enter S3 access key here")
-                secret_key = gr.Textbox(label="Secret Key", placeholder="Enter S3 secret key here")
-                bucket = gr.Textbox(label="Bucket Name", placeholder="Enter S3 bucket name here")
+                upload_to_s3 = gr.Checkbox(label="Upload to R2", value=False)
+                account_id = gr.Textbox(label="Account Id", placeholder="Enter R2 account id")
+                access_key = gr.Textbox(label="Access Key", placeholder="Enter R2 access key here")
+                secret_key = gr.Textbox(label="Secret Key", placeholder="Enter R2 secret key here")
+                bucket = gr.Textbox(label="Bucket Name", placeholder="Enter R2 bucket name here")
         
 
         with gr.Column():
@@ -175,7 +180,7 @@ with gr.Blocks() as demo:
         control_strength,
         seed,
         upload_to_s3,
-        region,
+        account_id,
         access_key,
         secret_key,
         bucket