jack 1 month ago
parent
commit
79b4934e1d
1 changed files with 3 additions and 12 deletions
  1. 3 12
      app/services/file/impl/r2r_file.py

+ 3 - 12
app/services/file/impl/r2r_file.py

@@ -38,8 +38,6 @@ class R2RFileService(OSSFileService):
         #     return ext_file
         #     return ext_file
 
 
         file_key = f"{uuid.uuid4()}-{file.filename}"
         file_key = f"{uuid.uuid4()}-{file.filename}"
-        file_name = file.filename
-        """
         with tempfile.NamedTemporaryFile(
         with tempfile.NamedTemporaryFile(
             suffix="_" + file.filename, delete=True
             suffix="_" + file.filename, delete=True
         ) as temp_file:
         ) as temp_file:
@@ -49,22 +47,15 @@ class R2RFileService(OSSFileService):
                 while content := await file.read(1024):
                 while content := await file.read(1024):
                     await f.write(content)
                     await f.write(content)
 
 
-            # storage.save_from_path(filename=file_key, local_file_path=tmp_file_path)
+            storage.save_from_path(filename=file_key, local_file_path=tmp_file_path)
             await r2r.init()
             await r2r.init()
             await r2r.ingest_file(
             await r2r.ingest_file(
                 file_path=tmp_file_path, metadata={"file_key": file_key}
                 file_path=tmp_file_path, metadata={"file_key": file_key}
             )
             )
-        """
-        file.filename = file_key
-        print("#####AAAA########AAAA$$$$$AAA$$$$")
-        print(file.filename)
-        await r2r.init()
-        await r2r.ingest_fileinfo(file=UploadFile, metadata={"file_key": file_key})
+
         # 存储
         # 存储
-        print("#####AAAA########bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb")
-        print(file_name)
         db_file = File(
         db_file = File(
-            purpose=purpose, filename=file_name, bytes=file.size, key=file_key
+            purpose=purpose, filename=file.filename, bytes=file.size, key=file_key
         )
         )
         session.add(db_file)
         session.add(db_file)
         await session.commit()
         await session.commit()