Update main.py

main.py

@@ -1,20 +1,20 @@
 from fastapi import FastAPI, HTTPException, Depends, Request
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.middleware.trustedhost import TrustedHostMiddleware
-from controller import LoginController, FileController, MySQLController, DefaultController, OTPController
+from controller import UserController, FileController, MySQLController, DefaultController, OTPController,AuthenticationController
 import firebase_admin
 from controller import ChatController
 from firebase_admin import credentials
 from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
-from service import MySQLService, LoginService, ChatService
-from request import RequestMySQL, RequestLogin, RequestDefault
+from service import MySQLService, UserService, ChatService
+from request import RequestMySQL, RequestUser, RequestDefault
 from auth.authentication import decodeJWT
 from repository import UserRepository
 from auth import authentication
 from datetime import datetime, timedelta
 from fastapi import Depends, HTTPException, Form, File, UploadFile
 from typing import List
-from service import FileService, DefaultService, LoginService
+from service import FileService, DefaultService, UserService,AuthService
 from request import RequestFile, RequestChat, RequestDefault
 from fastapi import FastAPI, Request, HTTPException
 from fastapi.responses import JSONResponse
@@ -41,7 +41,7 @@ app = FastAPI(
     }
 )
 origins = [
-    "https://kltn20133118-pychatbot.hf.space",
+    "http://localhost:8000",
 ]
 
 app.add_middleware(
@@ -71,17 +71,17 @@ class JWTBearer(HTTPBearer):
         credentials: HTTPAuthorizationCredentials = await super(JWTBearer, self).__call__(request)
         if credentials:
             if credentials.scheme != "Bearer":
-                raise HTTPException(status_code=403, detail="Invalid authentication scheme.")
+                raise HTTPException(status_code=401, detail="Invalid authentication scheme.")
             if not self.verify_accesstoken(credentials.credentials):
-                raise HTTPException(status_code=403, detail="Token does not exist")
+                raise HTTPException(status_code=401, detail="Token does not exist")
             if not self.verify_jwt(credentials.credentials):
-                raise HTTPException(status_code=403, detail="Invalid token or expired token.")
+                raise HTTPException(status_code=401, detail="Invalid token or expired token.")
             return credentials.credentials
         else:
             raise HTTPException(status_code=401, detail="Invalid authorization code.")
 
     def verify_accesstoken(self, jwtoken: str) -> bool:
-        check = LoginService.check_token_is_valid(jwtoken)
+        check = AuthService.check_token_is_valid(jwtoken)
         return check
 
     def verify_jwt(self, jwtoken: str) -> bool:
@@ -94,7 +94,6 @@ class JWTBearer(HTTPBearer):
             print(e)
             return False
 
-
 def get_current_user_email(credentials: str = Depends(JWTBearer())):
     try:
         payload = decodeJWT(credentials)
@@ -103,11 +102,11 @@ def get_current_user_email(credentials: str = Depends(JWTBearer())):
         return email
     except Exception as e:
         print(e)
-        raise HTTPException(status_code=403, detail="Invalid token or expired token.")
+        raise HTTPException(status_code=401, detail="Invalid token or expired token.")
 
 
-@app.get("/api/v1/mysql/render_chat_history", dependencies=[Depends(JWTBearer())], tags=["MySQL"])
-async def override_render_chat(user_id: Optional[str] = Query(None),
+@app.get("/api/v1/mysql/chat_history/{user_id}", dependencies=[Depends(JWTBearer())], tags=["MySQL"])
+async def override_render_chat(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:
@@ -115,8 +114,7 @@ async def override_render_chat(user_id: Optional[str] = Query(None),
     request = RequestMySQL.RequestRenderChatHistory(user_id=user_id)
     return MySQLService.render_chat_history(request)
 
-
-@app.put("/api/v1/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
@@ -131,8 +129,7 @@ async def override_edit_chat(request: RequestMySQL.RequestEditNameChat,
         raise HTTPException(status_code=400, detail="name_old field is required.")
     return MySQLService.edit_chat(request)
 
-
-@app.delete("/api/v1/mysql/delete_chat/", dependencies=[Depends(JWTBearer())], tags=["MySQL"])
+@app.delete("/api/v1/mysql/chat_history/delete", 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
@@ -144,9 +141,20 @@ async def override_delete_chat(request: RequestMySQL.RequestDeleteChat,
         raise HTTPException(status_code=400, detail="chat_name field is required.")
     return MySQLService.delete_chat(request)
 
+@app.delete("/api/v1/mysql/detail_chat/delete", dependencies=[Depends(JWTBearer())], tags=["MySQL"])
+async def override_delete_detail_chat_detail(request: RequestMySQL.RequestDeleteDetailChat,
+                               current_user_email: str = Depends(get_current_user_email)):
+    user_id = request.user_id
+    check = support_function.check_value_user_id(user_id, current_user_email)
+    if check is not True:
+        return check
+    id_chat_detail = request.id_chat_detail
+    if id_chat_detail is None or id_chat_detail.strip() == "":
+        raise HTTPException(status_code=400, detail="id_chat_detail field is required.")
+    return MySQLService.delete_chat_detail_by_id(request)
 
-@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),
+@app.get("/api/v1/mysql/detail_chat/{user_id}/{chat_id}", dependencies=[Depends(JWTBearer())], tags=["MySQL"])
+async def override_load_chat(chat_id: str, 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:
@@ -167,8 +175,8 @@ async def override_load_chat(chat_id: Optional[str] = Query(None), user_id: Opti
     return MySQLService.load_chat_history(request)
 
 
-@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)):
+@app.get("/api/v1/default/info_user/{user_id}", dependencies=[Depends(JWTBearer())], tags=["Default"])
+async def override_get_user(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:
         return check
@@ -177,7 +185,7 @@ async def override_get_user(user_id: str = Query(None), current_user_email: str
 
 
 @app.post("/api/v1/users/update_user_info", dependencies=[Depends(JWTBearer())], tags=["User"])
-async def override_update_user_info(request: RequestLogin.RequestUpdateUserInfo,
+async def override_update_user_info(request: RequestUser.RequestUpdateUserInfo,
                                     current_user_email: str = Depends(get_current_user_email)):
     user_id = request.user_id
     check = support_function.check_value_user_id(user_id, current_user_email)
@@ -198,11 +206,11 @@ async def override_update_user_info(request: RequestLogin.RequestUpdateUserInfo,
     if photo_url is None or photo_url.strip() == "":
         return res.ReponseError(status=400,
                                 data=res.Message(message="photo_url field is required."))
-    return LoginService.update_user_info(request)
+    return UserService.update_user_info(request)
 
 
 @app.put('/api/v1/users/change_password', dependencies=[Depends(JWTBearer())], tags=["User"])
-async def override_reset_password_firebase(request: RequestLogin.RequestChangePassword,
+async def override_reset_password_firebase(request: RequestUser.RequestChangePassword,
                                            current_user_email: str = Depends(get_current_user_email)):
     user_id = request.user_id
     check = support_function.check_value_user_id(user_id, current_user_email)
@@ -222,10 +230,9 @@ async def override_reset_password_firebase(request: RequestLogin.RequestChangePa
         return res.ReponseError(status=400,
                                 data=res.Message(message="confirm_new_password field is required."))
 
-    return LoginService.change_password(request)
-
+    return UserService.change_password(request)
 
-@app.delete("/api/v1/file/delete_all_file/", dependencies=[Depends(JWTBearer())], tags=["File"])
+@app.delete("/api/v1/file/delete", 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)
@@ -233,8 +240,7 @@ async def override_delete_folder(request: RequestFile.RequestDeleteAllFile,
         return check
     return FileService.deleteAllFile(request)
 
-
-@app.delete("/api/v1/file/delete_one_file/", dependencies=[Depends(JWTBearer())], tags=["File"])
+@app.delete("/api/v1/file/delete_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
@@ -248,7 +254,7 @@ async def override_delete_one_file(request: RequestFile.RequestDeleteFile,
     return FileService.deleteFile(request)
 
 
-@app.post("/api/v1/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
@@ -258,7 +264,7 @@ async def override_download_folder_from_dropbox(request: RequestFile.RequestDown
     return FileService.download_folder(request)
 
 
-@app.post("/api/v1/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
@@ -268,7 +274,7 @@ async def override_download_file_by_id(request: RequestFile.RequestDownLoadFile,
     return FileService.download_file(request)
 
 
-@app.post("/api/v1/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),
@@ -281,7 +287,7 @@ async def override_upload_files_dropbox(
     return FileService.upload_files(request)
 
 
-@app.post("/api/v1/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)):
@@ -293,7 +299,7 @@ async def override_handle_query2_upgrade_old(request: Request, user_id: str = Fo
     return ChatService.query2_upgrade_old(request)
 
 
-@app.get("/api/v1/chat/chatbot/extract_file/", dependencies=[Depends(JWTBearer())], tags=["Chatbot"])
+@app.get("/api/v1/chat/chatbot/extract_file/{user_id}", 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:
@@ -302,7 +308,7 @@ async def override_extract_file(user_id: str, current_user_email: str = Depends(
     return ChatService.extract_file(request)
 
 
-@app.get("/api/v1/chat/chatbot/generate_question/", dependencies=[Depends(JWTBearer())], tags=["Chatbot"])
+@app.get("/api/v1/chat/chatbot/generate_question/{user_id}", 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:
@@ -311,7 +317,7 @@ async def override_generate_question(user_id: str, current_user_email: str = Dep
     return ChatService.generate_question(request)
 
 
-@app.post("/api/v1/default/upload_image/", dependencies=[Depends(JWTBearer())], tags=["Default"])
+@app.post("/api/v1/default/upload_images", 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)
@@ -320,32 +326,31 @@ async def override_upload_image(user_id: str = Form(None), file: UploadFile = Fi
     request = RequestDefault.RequestUpLoadImage(user_id=user_id, files=file)
     return DefaultService.upload_image_service(request)
 
-
+app.include_router(AuthenticationController.router, tags=["Authentication"], prefix="/api/v1/auth")
 app.include_router(MySQLController.router, prefix="/api/v1/mysql")
-app.include_router(LoginController.router, prefix="/api/v1/users")
+app.include_router(UserController.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/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/mysql/chat_history/{user_id}": {"GET"},
+    "/api/v1/mysql/detail_chat/{user_id}/{chat_id}": {"GET"},
+    "/api/v1/mysql/edit_chat": {"PUT"},
+    "/api/v1/mysql/chat_history/delete": {"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"}
-
+    "/api/v1/file/delete": {"DELETE"},
+    "/api/v1/file/delete_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/chatbot/query": {"POST"},
+    "/api/v1/chat/chatbot/extract_file/{user_id}": {"GET"},
+    "/api/v1/chat/chatbot/generate_question/{user_id}": {"GET"},
+    "/api/v1/default/upload_images": {"POST"},
+    "/api/v1/default/info_user/{user_id}": {"GET"},
+    "/api/v1/mysql/detail_chat/delete":{"DELETE"}
 }
 
 app.router.routes = [
@@ -356,36 +361,38 @@ app.router.routes = [
     )
 ]
 
-app.add_api_route("/api/v1/mysql/render_chat_history", override_render_chat, methods=["GET"],
+app.add_api_route("/api/v1/mysql/chat_history/{user_id}", override_render_chat, methods=["GET"],
                   dependencies=[Depends(JWTBearer())], tags=["MySQL"])
-app.add_api_route("/api/v1/mysql/load_chat_history", override_load_chat, methods=["GET"],
+app.add_api_route("/api/v1/mysql/detail_chat/{user_id}/{chat_id}", override_load_chat, methods=["GET"],
                   dependencies=[Depends(JWTBearer())], tags=["MySQL"])
-app.add_api_route("/api/v1/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/v1/mysql/delete_chat/", override_delete_chat, methods=["DELETE"],
+app.add_api_route("/api/v1/mysql/chat_history/delete", override_delete_chat, methods=["DELETE"],
+                  dependencies=[Depends(JWTBearer())], tags=["MySQL"])
+app.add_api_route("/api/v1/mysql/detail_chat/delete", override_delete_detail_chat_detail, methods=["DELETE"],
                   dependencies=[Depends(JWTBearer())], tags=["MySQL"])
 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"],
+app.add_api_route("/api/v1/file/delete", override_delete_folder, methods=["DELETE"],
                   dependencies=[Depends(JWTBearer())], tags=["File"])
-app.add_api_route("/api/v1/file/delete_one_file/", override_delete_one_file, methods=["DELETE"],
+app.add_api_route("/api/v1/file/delete_file", override_delete_one_file, methods=["DELETE"],
                   dependencies=[Depends(JWTBearer())], tags=["File"])
-app.add_api_route("/api/v1/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/v1/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/v1/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/v1/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/v1/chat/chatbot/extract_file/", override_extract_file, methods=["GET"],
+app.add_api_route("/api/v1/chat/chatbot/extract_file/{user_id}", override_extract_file, methods=["GET"],
                   dependencies=[Depends(JWTBearer())], tags=["Chat"])
-app.add_api_route("/api/v1/chat/chatbot/generate_question/", override_generate_question, methods=["GET"],
+app.add_api_route("/api/v1/chat/chatbot/generate_question/{user_id}", override_generate_question, methods=["GET"],
                   dependencies=[Depends(JWTBearer())], tags=["Chat"])
-app.add_api_route("/api/v1/default/upload_image/", override_upload_image, methods=["POST"],
+app.add_api_route("/api/v1/default/upload_images", override_upload_image, methods=["POST"],
                   dependencies=[Depends(JWTBearer())], tags=["Default"])
-app.add_api_route("/api/v1/default/info_user", override_get_user, methods=["GET"], dependencies=[Depends(JWTBearer())],
+app.add_api_route("/api/v1/default/info_user/{user_id}", override_get_user, methods=["GET"], dependencies=[Depends(JWTBearer())],
                   tags=["Default"])
 app.include_router(OTPController.router, tags=["OTP"], prefix="/api/v1/otp")