feat: 修改文件存储规则

api.py

@@ -58,15 +58,15 @@ def download_file(url: str):
 def read_root():
     return {"Hello": "World!"}
 
-@router.post("/upload/{userId}/{modelId}/{filename}")
-async def upload_file(userId: str, modelId: str, filename: str, file: UploadFile = File(...)):
-    file_location_folder = os.path.join(UPLOAD_DIRECTORY,userId)
+@router.post("/upload/{userId}/{modelId}/{modelVersionId}/{filename}")
+async def upload_file(userId: str, modelId: str, modelVersionId:str, filename: str, file: UploadFile = File(...)):
+    file_location_folder = os.path.join(UPLOAD_DIRECTORY,userId,modelId,modelVersionId)
     file_location = os.path.join(file_location_folder, filename)
     os.makedirs(file_location_folder, exist_ok=True)
     try:
         with open(file_location, "wb") as buffer:
             buffer.write(await file.read())
-        callback(modelId,'UPLOADING')
+        callback(modelVersionId,'UPLOADING')
         pathInRepo = f"{userId}/{filename}"
         huggingfaceApi = HfApi(token=HUGGINGFACE_API_TOKEN)
         huggingfaceApi.upload_file(
@@ -75,17 +75,17 @@ async def upload_file(userId: str, modelId: str, filename: str, file: UploadFile
             repo_id=REPO_ID,
             repo_type="model"
         )
-        callback(modelId,'UPLOADED')
+        callback(modelVersionId,'UPLOADED')
     except Exception as e:
         print(e)
-        callback(modelId,'FAIL')
+        callback(modelVersionId,'FAIL')
     os.remove(file_location)
-    return {'success': True, 'id': modelId}
+    return {'success': True, 'id': modelVersionId}
 
 
-@router.get("/download/{userId}/{filename}")
-def download(userId: str, filename: str):
-    pathInRepo = f"{userId}/{filename}"
+@router.get("/download/{userId}/{modelId}/{modelVersionId}/{filename}")
+def download(userId: str,modelId:str, modelVersionId:str, filename: str):
+    pathInRepo = f"{userId}/{modelId}/{modelVersionId}/{filename}"
     response = download_file(pathInRepo)
     # 创建流式响应
     return StreamingResponse(response.iter_content(chunk_size=1024), 
@@ -95,7 +95,7 @@ def download(userId: str, filename: str):
 
 
 
-def callback(modelId,status):
+def callback(modelVersionId,status):
     timestamp = int(time.time()) + 60
     rand = 0
     uid = 0
@@ -104,6 +104,6 @@ def callback(modelId,status):
     md5 = md5hash.hexdigest()
     res = requests.post(f"{os.environ.get('CALLBACK_DOMAIN')}{url}?auth_key={timestamp}-{rand}-{uid}-{md5}",json={
         'status': status,
-        'model_id': modelId
+        'model_version_id': modelVersionId
     })
     print(f"回调结果 {res.status_code}")