update serve

constants.py

@@ -13,7 +13,7 @@ ROOT_PATH = os.getenv("ROOT_PATH", None)
 ELO_RESULTS_DIR = os.getenv("ELO_RESULTS_DIR", "./arena_elo/results/latest")
 
 LOG_SERVER = os.getenv("LOG_SERVER", "http://2.0.0.1:8800")
-LOG_SERVER_SUBDOAMIN = os.getenv("LOG_SERVER_SUBDIR", "GenAI-Arena-hf-logs")
+LOG_SERVER_SUBDOAMIN = os.getenv("LOG_SERVER_SUBDIR", "3DGen-Arena-hf-logs")
 LOG_SERVER_ADDR = os.getenv("LOG_SERVER_ADDR", f"{LOG_SERVER}/{LOG_SERVER_SUBDOAMIN}")
 # LOG SERVER API ENDPOINTS
 APPEND_JSON = "append_json"

serve/inference.py

@@ -405,7 +405,7 @@ def generate_t2s_multi_annoy(gen_func, render_func,
         }
     else:
         start_time = time.time()
-        shape_0, shape_1, model_name_0, model_name_1 = gen_func(text, model_name_0, model_name_1)
+        shape_0, shape_1, model_name_0, model_name_1 = gen_func(text, model_name_0, model_name_1, i2s_mode=False)
         generate_time = time.time() - start_time
 
         videos_0, videos_1 = render_func(shape_0, model_name_0, shape_1, model_name_1)

serve/log_server.py

@@ -3,14 +3,23 @@ from typing import Optional
 import json
 import os
 import aiofiles
+
+import sys
+sys.path.append('..')
+
 from log_utils import build_logger
 from constants import LOG_SERVER_SUBDOAMIN, APPEND_JSON, SAVE_IMAGE, SAVE_LOG
 
 logger = build_logger("log_server", "log_server.log", add_remote_handler=False)
 
-app = APIRouter(prefix=f"/{LOG_SERVER_SUBDOAMIN}")
+app = FastAPI()
+router = APIRouter(prefix=f"/{LOG_SERVER_SUBDOAMIN}")
+
+@router.get(f"/test")
+async def test():
+    return "Successfully"
 
-@app.post(f"/{APPEND_JSON}")
+@router.post(f"/{APPEND_JSON}")
 async def append_json(json_str: str = Form(...), file_name: str = Form(...)):
     """
     Appends a JSON string to a specified file.
@@ -25,7 +34,7 @@ async def append_json(json_str: str = Form(...), file_name: str = Form(...)):
     logger.info(f"Appended 1 JSON object to {file_name}")
     return {"message": "JSON data appended successfully"}
 
-@app.post(f"/{SAVE_IMAGE}")
+@router.post(f"/{SAVE_IMAGE}")
 async def save_image(image: UploadFile = File(...), image_path: str = Form(...)):
     """
     Saves an uploaded image to the specified path.
@@ -38,7 +47,7 @@ async def save_image(image: UploadFile = File(...), image_path: str = Form(...))
     logger.info(f"Image saved successfully at {image_path}")
     return {"message": f"Image saved successfully at {image_path}"}
 
-@app.post(f"/{SAVE_LOG}")
+@router.post(f"/{SAVE_LOG}")
 async def save_log(message: str = Form(...), log_path: str = Form(...)):
     """
     Save a log message to a specified log file on the server.
@@ -52,4 +61,12 @@ async def save_log(message: str = Form(...), log_path: str = Form(...)):
         await f.write(f"{message}\n")
     
     logger.info(f"Romote log message saved to {log_path}")
-    return {"message": f"Log message saved successfully to {log_path}"}
+    return {"message": f"Log message saved successfully to {log_path}"}
+
+
+app.include_router(router)
+
+if __name__ == "__main__":
+    import uvicorn
+ 
+    uvicorn.run(app, host="127.0.0.1", port=8000)