Update app.py

app.py

@@ -562,6 +562,35 @@ async function uploadFile(file, element) {
     except Exception as e:
         raise HTTPException(status_code=400, detail=str(e))
 
+@app.post("/upload/")
+async def upload_image(file: UploadFile = File(...)):
+    if not file:
+        raise HTTPException(status_code=400, detail="No file uploaded")
+    
+    if not file.content_type.startswith('image/'):
+        raise HTTPException(status_code=400, detail="File must be an image")
+
+    try:
+        contents = await file.read()
+        
+        # Generate unique path
+        unique_path = generate_unique_filename(file.filename)
+
+        # Upload to HuggingFace
+        response = api.upload_file(
+            path_or_fileobj=contents,
+            path_in_repo=f"images/{unique_path}",
+            repo_id=hf_dataset_id,
+            repo_type="dataset",
+            token=hf_token
+        )
+
+        # 修改返回URL格式
+        image_url = f"https://{PROXY_DOMAIN}/datasets/{hf_dataset_id}/resolve/main/images/{unique_path}"
+        return {"url": image_url}
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))
+
 @app.post("/fetch-url/")
 async def fetch_url(request: Request):
     try:
@@ -581,16 +610,13 @@ async def fetch_url(request: Request):
         if not content_type.startswith('image/'):
             raise HTTPException(status_code=400, detail="URL does not point to an image")
 
-        # Get original filename
         original_filename = url.split('/')[-1]
         if not original_filename or '.' not in original_filename:
             ext = get_image_extension(content_type)
             original_filename = f"downloaded_image.{ext}"
 
-        # Generate unique path
         unique_path = generate_unique_filename(original_filename)
 
-        # Upload to HuggingFace with the new path
         response = api.upload_file(
             path_or_fileobj=response.content,
             path_in_repo=f"images/{unique_path}",
@@ -599,38 +625,11 @@ async def fetch_url(request: Request):
             token=hf_token
         )
 
-        image_url = f"https://{PROXY_DOMAIN}/images/{unique_path}"
+        # 修改返回URL格式
+        image_url = f"https://{PROXY_DOMAIN}/datasets/{hf_dataset_id}/resolve/main/images/{unique_path}"
         return {"url": image_url, "filename": original_filename}
     except Exception as e:
         raise HTTPException(status_code=500, detail=str(e))
 
-@app.post("/upload/")
-async def upload_image(file: UploadFile = File(...)):
-    if not file:
-        raise HTTPException(status_code=400, detail="No file uploaded")
-    
-    if not file.content_type.startswith('image/'):
-        raise HTTPException(status_code=400, detail="File must be an image")
-
-    try:
-        contents = await file.read()
-        
-        # Generate unique path
-        unique_path = generate_unique_filename(file.filename)
-
-        # Upload to HuggingFace with the new path
-        response = api.upload_file(
-            path_or_fileobj=contents,
-            path_in_repo=f"images/{unique_path}",
-            repo_id=hf_dataset_id,
-            repo_type="dataset",
-            token=hf_token
-        )
-
-        image_url = f"https://{PROXY_DOMAIN}/images/{unique_path}"
-        return {"url": image_url}
-    except Exception as e:
-        raise HTTPException(status_code=500, detail=str(e))
-
 if __name__ == "__main__":
     uvicorn.run(app, host="0.0.0.0", port=7860)