add routers

main.py

@@ -1,54 +1,7 @@
 from fastapi import FastAPI, Body
-import game_util
-
+from routers import root, snake, watermelon
 
 app = FastAPI()
-
-
-@app.get("/", tags=["home"])
-def root():
-    return {"message": "hi!"}
-
-##############################
-GAME = "sname"
-##############################
-@app.post(f"/games/{GAME}/nlp/c", tags=[GAME])
-def main_snake(code: str=Body(), command: str=Body()):
-    return game_util.create(GAME, code, command)
-
-
-@app.post(f"/games/{GAME}/nlp/r", tags=[GAME])
-def main_snake(code: str=Body(), command: str=Body()):
-    return game_util.read(GAME, code, command)
-
-
-@app.post(f"/games/{GAME}/nlp/u", tags=[GAME])
-def main_snake(code: str=Body(), command: str=Body()):
-    return game_util.update(GAME, code, command)
-
-
-@app.post(f"/games/{GAME}/nlp/d", tags=[GAME])
-def main_snake(code: str=Body(), command: str=Body()):
-    return game_util.delete(GAME, code, command)
-
-##############################
-GAME = "angrybird"
-##############################
-@app.post(f"/games/{GAME}/nlp/c", tags=[GAME])
-def main_snake(code: str=Body(), command: str=Body()):
-    return game_util.create(GAME, code, command)
-
-
-@app.post(f"/games/{GAME}/nlp/r", tags=[GAME])
-def main_snake(code: str=Body(), command: str=Body()):
-    return game_util.read(GAME, code, command)
-
-
-@app.post(f"/games/{GAME}/nlp/u", tags=[GAME])
-def main_snake(code: str=Body(), command: str=Body()):
-    return game_util.update(GAME, code, command)
-
-
-@app.post(f"/games/{GAME}/nlp/d", tags=[GAME])
-def main_snake(code: str=Body(), command: str=Body()):
-    return game_util.delete(GAME, code, command)
+app.include_router(root.router)
+app.include_router(snake.router)
+app.include_router(watermelon.router)

game_util.py → routers/game_util.py

@@ -16,14 +16,17 @@ def read(game: str, code: str, command: str):
         raise HTTPException(status.HTTP_511_NETWORK_AUTHENTICATION_REQUIRED)        
     
     url = f'https://{os.getenv("hfs_space")}.hf.space/games/{game}'
-    # url = 'http://127.0.0.1:8080/nlp'
+    print(url)
     myobj = {
         'command': command,
     }
     headers = {'Authorization': f'Bearer {os.getenv("hfs_token")}'}
 
     x = requests.post(url, json=myobj, headers=headers)
-    return json.loads(x.text)
+    if x.status_code == status.HTTP_200_OK:
+        return json.loads(x.text)
+    else:
+        raise HTTPException(status_code=x.status_code, detail=json.loads(x.text)['detail'])
 
 
 def update(game: str, code: str, command: str):

routers/root.py

@@ -0,0 +1,9 @@
+from fastapi import APIRouter
+
+
+router = APIRouter()
+
+
+@router.get("/", tags=["home"])
+def root():
+    return {"message": "hi!"}

routers/snake.py

@@ -0,0 +1,26 @@
+from fastapi import APIRouter, Body
+from . import game_util
+
+
+GAME = "snake"
+router = APIRouter(prefix=f"/games/{GAME}/nlp", tags=[GAME])
+
+
+@router.post("/c", tags=[GAME])
+def main_snake(code: str=Body(), command: str=Body()):
+    return game_util.create(GAME, code, command)
+
+
+@router.post("/r", tags=[GAME])
+def main_snake(code: str=Body(), command: str=Body()):
+    return game_util.read(GAME, code, command)
+
+
+@router.post("/u")
+def main_snake(code: str=Body(), command: str=Body()):
+    return game_util.update(GAME, code, command)
+
+
+@router.post("/d")
+def main_snake(code: str=Body(), command: str=Body()):
+    return game_util.delete(GAME, code, command)

routers/watermelon.py

@@ -0,0 +1,26 @@
+from fastapi import APIRouter, Body
+from . import game_util
+
+
+GAME = "watermelon"
+router = APIRouter(prefix=f"/games/{GAME}/nlp", tags=[GAME])
+
+
+@router.post("/c", tags=[GAME])
+def main_snake(code: str=Body(), command: str=Body()):
+    return game_util.create(GAME, code, command)
+
+
+@router.post("/r", tags=[GAME])
+def main_snake(code: str=Body(), command: str=Body()):
+    return game_util.read(GAME, code, command)
+
+
+@router.post("/u")
+def main_snake(code: str=Body(), command: str=Body()):
+    return game_util.update(GAME, code, command)
+
+
+@router.post("/d")
+def main_snake(code: str=Body(), command: str=Body()):
+    return game_util.delete(GAME, code, command)