Feat/#186 (#191)

* post

* post

* formatted

* reviewed

* get

* completed api

* completed api for couples table

* done issue #149

* modified after review

* get user by raspi_id

* the main code couldn't be pushed at last commit

* azure error

* create and delete container on azure blob storage

* lockファイル再作成

* modified after review

* upload file

* revision uploading file on azure blob storage

* download file

* modified after review

* download file

* マージ前の修正

* modified after review

* make format

* messages table

* chatgpt thread

* エラー解決

* chatgpt use created assistant

* return voice file

* change response name

* これでマージできる

---------

Co-authored-by: shun-harutaro <shun_harutaro@protonmail.com>
Co-authored-by: NOZAKI Shuntaro <60352276+shun-harutaro@users.noreply.github.com>

Author: harudra

api/v2/azure/storage.py

@@ -46,21 +46,19 @@ async def upload_blob_file(user_id: int, blob_service_client: BlobServiceClient,
     return {"id": user_id, "message": "メッセージをアップロードしました"}
 
 
-def download_blob_file(
-    user_id: int, boddy_id: str, blob_service_client: BlobServiceClient
-):
+def is_downloaded_blob(boddy_id: str, blob_service_client: BlobServiceClient):
     container_name = "message"
     blob_client = blob_service_client.get_blob_client(
         container=container_name, blob=str(boddy_id)
     )
     download_file_path = os.path.join(DOWNLOAD_DIR, f"{boddy_id}.wav")
 
     if not blob_client.exists():
-        return {"id": user_id, "message": "相方のファイルは見つかりませんでした"}
+        return False
 
     with open(file=download_file_path, mode="wb") as download_file:
         download_data = blob_client.download_blob()
         download_file.write(download_data.readall())
 
     blob_client.delete_blob()
-    return {"id": user_id, "message": "ダウンロードが完了しました"}
+    return True

api/v2/routers/raspi.py

@@ -14,8 +14,8 @@
 from v1.services.whisper import speech2text
 from v1.utils.logging import get_logger
 from v2.azure.storage import (
-    download_blob_file,
     get_blob_storage_account,
+    is_downloaded_blob,
     upload_blob_file,
 )
 from v2.services.gpt import generate_text
@@ -95,7 +95,7 @@ async def create_message(
         f.write(content)
 
     with open(file_location, "rb") as data:
-        response = await upload_blob_file(id, blob_service_client, db, data)
+        response = await upload_blob_file(id, blob_service_client, data)
     os.remove(file_location)
     return response
 
@@ -113,14 +113,22 @@ async def negotiate(id: int):
     "/{id}",
     tags=["raspi"],
     summary="同coupleのメッセージ取得",
-    response_model=raspi_schema.RaspiMessageResponse,
+    # response_model=Union[FileResponse, raspi_schema.RaspiMessageResponse],
 )
 async def get_message(id: int, db: AsyncSession = Depends(get_db)):
     # 同coupleのidを取得
     boddy_id = await get_user_id_same_couple(db, id)
     # 同coupleのファイルをダウンロード
-    response = download_blob_file(id, str(boddy_id), blob_service_client)
-    return response
+    is_downloaded = is_downloaded_blob(str(boddy_id), blob_service_client)
+
+    if is_downloaded:
+        current_dir = os.path.dirname(os.path.abspath(__file__))
+        file_path = os.path.join(current_dir, f"../../downloads/{boddy_id}.wav")
+        return FileResponse(
+            path=file_path, media_type="audio/wav", filename=f"{boddy_id}.wav"
+        )
+
+    return {"id": id, "message": "相方のファイルは見つかりませんでした"}
 
 
 @router.get(