Feat/#194 ping (#196)

* ping実装完了

* tagの更新

* GET /v2/raspis/{}/messages/{}の実装

Author: shun-harutaro

api/main.py

@@ -1,4 +1,5 @@
 from contextlib import asynccontextmanager
+from datetime import datetime
 from typing import Union
 
 from fastapi import FastAPI
@@ -27,13 +28,26 @@ async def lifespan(app: FastAPI):
 
 tags_metadata = [
     {
-        "name": "raspi",
+        "name": "futarin-raspi",
         "description": "[futairn-raspi]()から使用するエンドポイント",
     },
     {
         "name": "sandbox",
         "description": "デバッグ用",
     },
+    {
+        "name": "raspis",
+    },
+    {
+        "name": "users",
+    },
+    {
+        "name": "couples",
+    },
+    {
+        "name": "v1",
+        "description": "**Deprecated (非推奨)**",
+    },
     {
         "name": "v0 (deprecated)",
         "description": "**Deprecated (非推奨)** URI変更なし",
@@ -75,6 +89,11 @@ def read_item(item_id: int, q: Union[str, None] = None):
     return {"item_id": item_id, "q": q}
 
 
+@app.get("/ping")
+def ping():
+    return {"message": "pong", "timestamp": datetime.now()}
+
+
 @app.post("/push")
 def push():
     return push_id(1)

api/v1/routers/raspi.py

@@ -19,7 +19,7 @@
 
 @router.post(
     "/",
-    tags=["raspi"],
+    tags=["v1"],
     summary="一連の動作全て",
     response_class=FileResponse,
     responses={

api/v1/routers/sandbox.py

@@ -14,7 +14,7 @@
 
 @router.post(
     "/transcript",
-    tags=["sandbox"],
+    tags=["sandbox", "v1"],
     summary="whisperによる文字起こし",
     response_model=TextResponse,
 )
@@ -34,7 +34,7 @@ async def transcript(file: UploadFile = File(...)) -> TextResponse:
 
 @router.post(
     "/gpt",
-    tags=["sandbox"],
+    tags=["sandbox", "v1"],
     summary="chatGPTによる文章生成",
     response_model=TextResponse,
 )

api/v2/routers/raspi.py

@@ -20,7 +20,7 @@
 )
 from v2.services.gpt import generate_text
 from v2.services.pubsub import get_service
-from v2.utils.query import get_thread_id, get_user_id_same_couple
+from v2.utils.query import get_thread_id
 
 router = APIRouter()
 logger = get_logger()
@@ -34,7 +34,7 @@
 
 @router.post(
     "/{id}",
-    tags=["raspi"],
+    tags=["futarin-raspi"],
     summary="一連の動作全て",
     response_class=FileResponse,
     responses={
@@ -82,7 +82,7 @@ async def all(
 
 @router.post(
     "/{id}/messages",
-    tags=["raspi"],
+    tags=["futarin-raspi"],
     summary="メッセージ送信",
     response_model=raspi_schema.RaspiMessageResponse,
 )
@@ -100,7 +100,7 @@ async def create_message(
     return response
 
 
-@router.post("/{id}/negotiate", tags=["raspi"], summary="websocketsのURL発行")
+@router.post("/{id}/negotiate", tags=["futarin-raspi"], summary="websocketsのURL発行")
 async def negotiate(id: int):
     if not id:
         return "missing user id", 400
@@ -110,30 +110,33 @@ async def negotiate(id: int):
 
 
 @router.get(
-    "/{id}",
-    tags=["raspi"],
+    "/{raspi_id}/messages/{message_id}",
+    tags=["futarin-raspi"],
     summary="同coupleのメッセージ取得",
     # response_model=Union[FileResponse, raspi_schema.RaspiMessageResponse],
 )
-async def get_message(id: int, db: AsyncSession = Depends(get_db)):
+async def get_message(
+    raspi_id: int,
+    message_id: int,
+):
     # 同coupleのidを取得
-    boddy_id = await get_user_id_same_couple(db, id)
+    # boddy_id = await get_user_id_same_couple(db, id)
     # 同coupleのファイルをダウンロード
-    is_downloaded = is_downloaded_blob(str(boddy_id), blob_service_client)
+    is_downloaded = is_downloaded_blob(str(message_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")
+        file_path = os.path.join(current_dir, f"../../downloads/{message_id}.wav")
         return FileResponse(
-            path=file_path, media_type="audio/wav", filename=f"{boddy_id}.wav"
+            path=file_path, media_type="audio/wav", filename=f"{message_id}.wav"
         )
 
-    return {"id": id, "message": "相方のファイルは見つかりませんでした"}
+    return {"id": raspi_id, "message": "相方のファイルは見つかりませんでした"}
 
 
 @router.get(
     "/",
-    tags=["raspi"],
+    tags=["raspis"],
     summary="ラズパイ一覧の取得",
     response_model=List[raspi_schema.RaspiResponse],
 )
@@ -143,7 +146,7 @@ async def list_raspi(db: AsyncSession = Depends(get_db)):
 
 @router.post(
     "/",
-    tags=["raspi"],
+    tags=["raspis"],
     summary="新規ラズパイの作成",
     response_model=raspi_schema.RaspiResponse,
 )
@@ -155,7 +158,7 @@ async def create_raspi(
 
 @router.put(
     "/{id}",
-    tags=["raspi"],
+    tags=["raspis"],
     summary="ラズパイの更新",
     response_model=raspi_schema.RaspiResponse,
 )
@@ -168,7 +171,7 @@ async def update_raspi(
     return await raspi_crud.update_raspi(db, raspi_body, original=raspi)
 
 
-@router.delete("/{id}", tags=["raspi"], summary="ラズパイの削除", response_model=None)
+@router.delete("/{id}", tags=["raspis"], summary="ラズパイの削除", response_model=None)
 async def delete_raspi(id: int, db: AsyncSession = Depends(get_db)):
     raspi = await raspi_crud.get_raspi(db, raspi_id=id)
     if raspi is None: