Update main.py

main.py

@@ -106,7 +106,7 @@ def get_current_user_email(credentials: str = Depends(JWTBearer())):
         raise HTTPException(status_code=403, detail="Invalid token or expired token.")
 
 
-@app.get("/api/mysql/render_chat_history", dependencies=[Depends(JWTBearer())], tags=["MySQL"])
+@app.get("/api/v1/mysql/render_chat_history", dependencies=[Depends(JWTBearer())], tags=["MySQL"])
 async def override_render_chat(user_id: Optional[str] = Query(None),
                                current_user_email: str = Depends(get_current_user_email)):
     check = support_function.check_value_user_id(user_id, current_user_email)
@@ -116,7 +116,7 @@ async def override_render_chat(user_id: Optional[str] = Query(None),
     return MySQLService.render_chat_history(request)
 
 
-@app.put("/api/mysql/edit_chat/", dependencies=[Depends(JWTBearer())], tags=["MySQL"])
+@app.put("/api/v1/mysql/edit_chat/", dependencies=[Depends(JWTBearer())], tags=["MySQL"])
 async def override_edit_chat(request: RequestMySQL.RequestEditNameChat,
                              current_user_email: str = Depends(get_current_user_email)):
     user_id = request.user_id
@@ -132,7 +132,7 @@ async def override_edit_chat(request: RequestMySQL.RequestEditNameChat,
     return MySQLService.edit_chat(request)
 
 
-@app.delete("/api/mysql/delete_chat/", dependencies=[Depends(JWTBearer())], tags=["MySQL"])
+@app.delete("/api/v1/mysql/delete_chat/", dependencies=[Depends(JWTBearer())], tags=["MySQL"])
 async def override_delete_chat(request: RequestMySQL.RequestDeleteChat,
                                current_user_email: str = Depends(get_current_user_email)):
     user_id = request.user_id
@@ -145,7 +145,7 @@ async def override_delete_chat(request: RequestMySQL.RequestDeleteChat,
     return MySQLService.delete_chat(request)
 
 
-@app.get("/api/mysql/load_chat_history", dependencies=[Depends(JWTBearer())], tags=["MySQL"])
+@app.get("/api/v1/mysql/load_chat_history", dependencies=[Depends(JWTBearer())], tags=["MySQL"])
 async def override_load_chat(chat_id: Optional[str] = Query(None), user_id: Optional[str] = Query(None),
                              current_user_email: str = Depends(get_current_user_email)):
     check = support_function.check_value_user_id(user_id, current_user_email)
@@ -167,7 +167,7 @@ async def override_load_chat(chat_id: Optional[str] = Query(None), user_id: Opti
     return MySQLService.load_chat_history(request)
 
 
-@app.get("/api/default/info_user", dependencies=[Depends(JWTBearer())], tags=["Default"])
+@app.get("/api/v1/default/info_user", dependencies=[Depends(JWTBearer())], tags=["Default"])
 async def override_get_user(user_id: str = Query(None), current_user_email: str = Depends(get_current_user_email)):
     check = support_function.check_value_user_id(user_id, current_user_email)
     if check is not True:
@@ -176,7 +176,7 @@ async def override_get_user(user_id: str = Query(None), current_user_email: str
     return DefaultService.info_user(request)
 
 
-@app.post("/api/users/update_user_info", dependencies=[Depends(JWTBearer())], tags=["Login"])
+@app.post("/api/v1/users/update_user_info", dependencies=[Depends(JWTBearer())], tags=["User"])
 async def override_update_user_info(request: RequestLogin.RequestUpdateUserInfo,
                                     current_user_email: str = Depends(get_current_user_email)):
     user_id = request.user_id
@@ -201,7 +201,7 @@ async def override_update_user_info(request: RequestLogin.RequestUpdateUserInfo,
     return LoginService.update_user_info(request)
 
 
-@app.put('/api/users/change_password', dependencies=[Depends(JWTBearer())], tags=["Login"])
+@app.put('/api/v1/users/change_password', dependencies=[Depends(JWTBearer())], tags=["User"])
 async def override_reset_password_firebase(request: RequestLogin.RequestChangePassword,
                                            current_user_email: str = Depends(get_current_user_email)):
     user_id = request.user_id
@@ -210,16 +210,22 @@ async def override_reset_password_firebase(request: RequestLogin.RequestChangePa
         return check
     new_password = request.new_password
     current_password = request.current_password
+    confirm_new_password = request.confirm_new_password
+
     if new_password is None or new_password.strip() == "":
         return res.ReponseError(status=400,
                                 data=res.Message(message="new_password field is required."))
     if current_password is None or current_password.strip() == "":
         return res.ReponseError(status=400,
                                 data=res.Message(message="current_password field is required."))
+    if confirm_new_password is None or confirm_new_password.strip() == "":
+        return res.ReponseError(status=400,
+                                data=res.Message(message="confirm_new_password field is required."))
+
     return LoginService.change_password(request)
 
 
-@app.delete("/api/file/delete_all_file/", dependencies=[Depends(JWTBearer())], tags=["File"])
+@app.delete("/api/v1/file/delete_all_file/", dependencies=[Depends(JWTBearer())], tags=["File"])
 async def override_delete_folder(request: RequestFile.RequestDeleteAllFile,
                                  current_user_email: str = Depends(get_current_user_email)):
     check = support_function.check_value_user_id(request.user_id, current_user_email)
@@ -228,7 +234,7 @@ async def override_delete_folder(request: RequestFile.RequestDeleteAllFile,
     return FileService.deleteAllFile(request)
 
 
-@app.delete("/api/file/delete_one_file/", dependencies=[Depends(JWTBearer())], tags=["File"])
+@app.delete("/api/v1/file/delete_one_file/", dependencies=[Depends(JWTBearer())], tags=["File"])
 async def override_delete_one_file(request: RequestFile.RequestDeleteFile,
                                    current_user_email: str = Depends(get_current_user_email)):
     user_id = request.user_id
@@ -242,7 +248,7 @@ async def override_delete_one_file(request: RequestFile.RequestDeleteFile,
     return FileService.deleteFile(request)
 
 
-@app.post("/api/file/chatbot/download_folder/", dependencies=[Depends(JWTBearer())], tags=["File"])
+@app.post("/api/v1/file/chatbot/download_folder/", dependencies=[Depends(JWTBearer())], tags=["File"])
 async def override_download_folder_from_dropbox(request: RequestFile.RequestDownLoadFolder,
                                                 current_user_email: str = Depends(get_current_user_email)):
     user_id = request.user_id
@@ -252,7 +258,7 @@ async def override_download_folder_from_dropbox(request: RequestFile.RequestDown
     return FileService.download_folder(request)
 
 
-@app.post("/api/file/chatbot/download_files/", dependencies=[Depends(JWTBearer())], tags=["File"])
+@app.post("/api/v1/file/chatbot/download_files/", dependencies=[Depends(JWTBearer())], tags=["File"])
 async def override_download_file_by_id(request: RequestFile.RequestDownLoadFile,
                                        current_user_email: str = Depends(get_current_user_email)):
     user_id = request.user_id
@@ -262,7 +268,7 @@ async def override_download_file_by_id(request: RequestFile.RequestDownLoadFile,
     return FileService.download_file(request)
 
 
-@app.post("/api/file/upload_files/", dependencies=[Depends(JWTBearer())], tags=["File"])
+@app.post("/api/v1/file/upload_files/", dependencies=[Depends(JWTBearer())], tags=["File"])
 async def override_upload_files_dropbox(
         user_id: str = Form(None),
         files: List[UploadFile] = File(None),
@@ -275,7 +281,7 @@ async def override_upload_files_dropbox(
     return FileService.upload_files(request)
 
 
-@app.post("/api/chat/chatbot/query/", dependencies=[Depends(JWTBearer())], tags=["Chatbot"])
+@app.post("/api/v1/chat/chatbot/query/", dependencies=[Depends(JWTBearer())], tags=["Chatbot"])
 async def override_handle_query2_upgrade_old(request: Request, user_id: str = Form(None), text_all: str = Form(...),
                                              question: str = Form(None), chat_name: str = Form(None),
                                              current_user_email: str = Depends(get_current_user_email)):
@@ -287,7 +293,7 @@ async def override_handle_query2_upgrade_old(request: Request, user_id: str = Fo
     return ChatService.query2_upgrade_old(request)
 
 
-@app.get("/api/chat/chatbot/extract_file/", dependencies=[Depends(JWTBearer())], tags=["Chatbot"])
+@app.get("/api/v1/chat/chatbot/extract_file/", dependencies=[Depends(JWTBearer())], tags=["Chatbot"])
 async def override_extract_file(user_id: str, current_user_email: str = Depends(get_current_user_email)):
     check = support_function.check_value_user_id(user_id, current_user_email)
     if check is not True:
@@ -296,7 +302,7 @@ async def override_extract_file(user_id: str, current_user_email: str = Depends(
     return ChatService.extract_file(request)
 
 
-@app.get("/api/chat/chatbot/generate_question/", dependencies=[Depends(JWTBearer())], tags=["Chatbot"])
+@app.get("/api/v1/chat/chatbot/generate_question/", dependencies=[Depends(JWTBearer())], tags=["Chatbot"])
 async def override_generate_question(user_id: str, current_user_email: str = Depends(get_current_user_email)):
     check = support_function.check_value_user_id(user_id, current_user_email)
     if check is not True:
@@ -305,7 +311,7 @@ async def override_generate_question(user_id: str, current_user_email: str = Dep
     return ChatService.generate_question(request)
 
 
-@app.post("/api/default/upload_image/", dependencies=[Depends(JWTBearer())], tags=["Default"])
+@app.post("/api/v1/default/upload_image/", dependencies=[Depends(JWTBearer())], tags=["Default"])
 async def override_upload_image(user_id: str = Form(None), file: UploadFile = File(...),
                                 current_user_email: str = Depends(get_current_user_email)):
     check = support_function.check_value_user_id(user_id, current_user_email)
@@ -315,30 +321,30 @@ async def override_upload_image(user_id: str = Form(None), file: UploadFile = Fi
     return DefaultService.upload_image_service(request)
 
 
-app.include_router(MySQLController.router, prefix="/api/mysql")
-app.include_router(LoginController.router, prefix="/api/users")
-app.include_router(FileController.router, prefix="/api/file")
-app.include_router(ChatController.router, prefix="/api/chat")
-app.include_router(DefaultController.router, prefix="/api/default")
+app.include_router(MySQLController.router, prefix="/api/v1/mysql")
+app.include_router(LoginController.router, prefix="/api/v1/users")
+app.include_router(FileController.router, prefix="/api/v1/file")
+app.include_router(ChatController.router, prefix="/api/v1/chat")
+app.include_router(DefaultController.router, prefix="/api/v1/default")
 
 routes_to_override = {
-    "/api/mysql/render_chat_history": {"GET"},
-    "/api/mysql/load_chat_history": {"GET"},
-    "/api/mysql/edit_chat/": {"PUT"},
-    "/api/mysql/delete_chat/": {"DELETE"},
-    "/api/users/update_user_info": {"POST"},
-    "/api/users/change_password": {"PUT"},
-    "/api/file/delete_all_file/": {"DELETE"},
-    "/api/file/delete_one_file/": {"DELETE"},
-    "/api/file/chatbot/download_folder/": {"POST"},
-    "/api/file/chatbot/download_files/": {"POST"},
-    "/api/file/upload_files/": {"POST"},
-    "/api/chat/query2_upgrade/": {"POST"},
-    "/api/chat/chatbot/query/": {"POST"},
-    "/api/chat/chatbot/extract_file/": {"GET"},
-    "/api/chat/chatbot/generate_question/": {"GET"},
-    "/api/default/upload_image/": {"POST"},
-    "/api/default/info_user": {"GET"}
+    "/api/v1/mysql/render_chat_history": {"GET"},
+    "/api/v1/mysql/load_chat_history": {"GET"},
+    "/api/v1/mysql/edit_chat/": {"PUT"},
+    "/api/v1/mysql/delete_chat/": {"DELETE"},
+    "/api/v1/users/update_user_info": {"POST"},
+    "/api/v1/users/change_password": {"PUT"},
+    "/api/v1/file/delete_all_file/": {"DELETE"},
+    "/api/v1/file/delete_one_file/": {"DELETE"},
+    "/api/v1/file/chatbot/download_folder/": {"POST"},
+    "/api/v1/file/chatbot/download_files/": {"POST"},
+    "/api/v1/file/upload_files/": {"POST"},
+    "/api/v1/chat/query2_upgrade/": {"POST"},
+    "/api/v1/chat/chatbot/query/": {"POST"},
+    "/api/v1/chat/chatbot/extract_file/": {"GET"},
+    "/api/v1/chat/chatbot/generate_question/": {"GET"},
+    "/api/v1/default/upload_image/": {"POST"},
+    "/api/v1/default/info_user": {"GET"}
 
 }
 
@@ -350,36 +356,36 @@ app.router.routes = [
     )
 ]
 
-app.add_api_route("/api/mysql/render_chat_history", override_render_chat, methods=["GET"],
+app.add_api_route("/api/v1/mysql/render_chat_history", override_render_chat, methods=["GET"],
                   dependencies=[Depends(JWTBearer())], tags=["MySQL"])
-app.add_api_route("/api/mysql/load_chat_history", override_load_chat, methods=["GET"],
+app.add_api_route("/api/v1/mysql/load_chat_history", override_load_chat, methods=["GET"],
                   dependencies=[Depends(JWTBearer())], tags=["MySQL"])
-app.add_api_route("/api/mysql/edit_chat/", override_edit_chat, methods=["PUT"], dependencies=[Depends(JWTBearer())],
+app.add_api_route("/api/v1/mysql/edit_chat/", override_edit_chat, methods=["PUT"], dependencies=[Depends(JWTBearer())],
                   tags=["MySQL"])
-app.add_api_route("/api/mysql/delete_chat/", override_delete_chat, methods=["DELETE"],
+app.add_api_route("/api/v1/mysql/delete_chat/", override_delete_chat, methods=["DELETE"],
                   dependencies=[Depends(JWTBearer())], tags=["MySQL"])
-app.add_api_route("/api/users/update_user_info", override_update_user_info, methods=["POST"],
-                  dependencies=[Depends(JWTBearer())], tags=["Login"])
-app.add_api_route("/api/users/change_password", override_reset_password_firebase, methods=["PUT"],
-                  dependencies=[Depends(JWTBearer())], tags=["Login"])
-app.add_api_route("/api/file/delete_all_file/", override_delete_folder, methods=["DELETE"],
+app.add_api_route("/api/v1/users/update_user_info", override_update_user_info, methods=["POST"],
+                  dependencies=[Depends(JWTBearer())], tags=["User"])
+app.add_api_route("/api/v1/users/change_password", override_reset_password_firebase, methods=["PUT"],
+                  dependencies=[Depends(JWTBearer())], tags=["User"])
+app.add_api_route("/api/v1/file/delete_all_file/", override_delete_folder, methods=["DELETE"],
                   dependencies=[Depends(JWTBearer())], tags=["File"])
-app.add_api_route("/api/file/delete_one_file/", override_delete_one_file, methods=["DELETE"],
+app.add_api_route("/api/v1/file/delete_one_file/", override_delete_one_file, methods=["DELETE"],
                   dependencies=[Depends(JWTBearer())], tags=["File"])
-app.add_api_route("/api/file/chatbot/download_folder/", override_download_folder_from_dropbox, methods=["POST"],
+app.add_api_route("/api/v1/file/chatbot/download_folder/", override_download_folder_from_dropbox, methods=["POST"],
                   dependencies=[Depends(JWTBearer())], tags=["File"])
-app.add_api_route("/api/file/chatbot/download_files/", override_download_file_by_id, methods=["POST"],
+app.add_api_route("/api/v1/file/chatbot/download_files/", override_download_file_by_id, methods=["POST"],
                   dependencies=[Depends(JWTBearer())], tags=["File"])
-app.add_api_route("/api/file/upload_files/", override_upload_files_dropbox, methods=["POST"],
+app.add_api_route("/api/v1/file/upload_files/", override_upload_files_dropbox, methods=["POST"],
                   dependencies=[Depends(JWTBearer())], tags=["File"])
-app.add_api_route("/api/chat/chatbot/query/", override_handle_query2_upgrade_old, methods=["POST"],
+app.add_api_route("/api/v1/chat/chatbot/query/", override_handle_query2_upgrade_old, methods=["POST"],
                   dependencies=[Depends(JWTBearer())], tags=["Chat"])
-app.add_api_route("/api/chat/chatbot/extract_file/", override_extract_file, methods=["GET"],
+app.add_api_route("/api/v1/chat/chatbot/extract_file/", override_extract_file, methods=["GET"],
                   dependencies=[Depends(JWTBearer())], tags=["Chat"])
-app.add_api_route("/api/chat/chatbot/generate_question/", override_generate_question, methods=["GET"],
+app.add_api_route("/api/v1/chat/chatbot/generate_question/", override_generate_question, methods=["GET"],
                   dependencies=[Depends(JWTBearer())], tags=["Chat"])
-app.add_api_route("/api/default/upload_image/", override_upload_image, methods=["POST"],
+app.add_api_route("/api/v1/default/upload_image/", override_upload_image, methods=["POST"],
                   dependencies=[Depends(JWTBearer())], tags=["Default"])
-app.add_api_route("/api/default/info_user", override_get_user, methods=["GET"], dependencies=[Depends(JWTBearer())],
+app.add_api_route("/api/v1/default/info_user", override_get_user, methods=["GET"], dependencies=[Depends(JWTBearer())],
                   tags=["Default"])
-app.include_router(OTPController.router, tags=["OTP"], prefix="/api/otp")
+app.include_router(OTPController.router, tags=["OTP"], prefix="/api/v1/otp")