Cleanup API responses

app/api/userchat.py

@@ -9,4 +9,9 @@ async def chat_with_llama(user_input: str = Body(..., embed=True), current_user:
     # Implement your logic to interact with LlamaV2 LLM here.
     # Example response, replace with actual chat logic
     chat_response = "Hello, how can I assist you today?"
-    return {"response": chat_response}
+    return {
+        "response": chat_response,
+        "user_id": current_user["user_id"],
+        "name": current_user["name"],
+        "role": current_user["role"]
+    }

app/api/userlogin.py

@@ -51,6 +51,14 @@ async def user_login(file: UploadFile = File(...)):
         # Store the token in TinyDB
         tinydb_helper.insert_token(user_id, access_token, expires_at)
 
-        return {"access_token": access_token, "token_type": "bearer"}
+        return {
+            "access_token": access_token,
+            "token_type": "bearer",
+            "user_id": user_id,
+            "name": metadata["name"],
+            "role": metadata["role"]
+        }
     else:
         raise HTTPException(status_code=400, detail="Face not recognized")
+    
+    os.remove(file_path)

app/api/userupload.py

@@ -1,11 +1,23 @@
-from fastapi import APIRouter, UploadFile, File
+from typing import Any
+from fastapi import APIRouter, Depends, UploadFile, File
+import os
+from app.dependencies import get_current_user
 
 router = APIRouter()
 
 @router.post("/user/upload")
-async def upload_file(file: UploadFile = File(...)):
-    file_location = f"/path/to/your/uploads/{file.filename}"
+async def upload_file(file: UploadFile = File(...), current_user: Any = Depends(get_current_user)):
+    upload_dir = "/home/user/data/uploads"
+    # Ensure the upload directory exists
+    os.makedirs(upload_dir, exist_ok=True)  # This creates the directory if it doesn't exist, does nothing otherwise
+    
+    file_location = f"{upload_dir}/{file.filename}"
     with open(file_location, "wb") as buffer:
         contents = await file.read()
         buffer.write(contents)
-    return {"filename": file.filename, "location": file_location}
+    return {
+        "status": "File uploaded successfully.",
+        "user_id": current_user["user_id"],
+        "name": current_user["name"],
+        "role": current_user["role"]
+    }

app/dependencies.py

@@ -6,20 +6,23 @@ from .utils.jwt_utils import SECRET_KEY, ALGORITHM  # Ensure these are defined i
 
 oauth2_scheme = OAuth2PasswordBearer(tokenUrl="token")
 
-async def get_current_user(token: str = Depends(oauth2_scheme)):
-    credentials_exception = HTTPException(
-        status_code=status.HTTP_401_UNAUTHORIZED,
-        detail="Could not validate credentials",
-        headers={"WWW-Authenticate": "Bearer"},
-    )
+def decode_access_token(token: str, credentials_exception) -> dict:
     try:
         payload = jwt.decode(token, SECRET_KEY, algorithms=[ALGORITHM])
         user_id: str = payload.get("sub")
-        if user_id is None:
-            raise credentials_exception
-        token_data = tinydb_helper.query_token(user_id, token)
-        if not token_data:
+        name: str = payload.get("name")
+        role: str = payload.get("role")
+        if user_id is None or name is None or role is None:
             raise credentials_exception
-        return token_data  # Or return a user model based on the token_data
-    except JWTError:
+        return {"user_id": user_id, "name": name, "role": role}
+    except jwt.PyJWTError:
         raise credentials_exception
+
+async def get_current_user(token: str = Depends(oauth2_scheme)) -> dict:
+    credentials_exception = HTTPException(
+        status_code=status.HTTP_401_UNAUTHORIZED,
+        detail="Could not validate credentials",
+        headers={"WWW-Authenticate": "Bearer"},
+    )
+    return decode_access_token(token, credentials_exception)
+

app/utils/jwt_utils.py

@@ -1,8 +1,8 @@
 from datetime import datetime, timedelta
 from jose import JWTError, jwt
 from typing import Any, Union
-from tinydb import TinyDB, Query
-from tinydb.storages import MemoryStorage
+#from tinydb import TinyDB, Query
+#from tinydb.storages import MemoryStorage
 
 
 # Secret key to encode JWT tokens. In production, use a more secure key and keep it secret!
@@ -10,23 +10,23 @@ SECRET_KEY = "a_very_secret_key"
 ALGORITHM = "HS256"
 ACCESS_TOKEN_EXPIRE_MINUTES = 30  # The expiration time for the access token
 
-db = TinyDB(storage=MemoryStorage)
-tokens_table = db.table('tokens')
-
-def insert_token(user_id: str, token: str, expires_in: timedelta):
-    expiration = datetime.utcnow() + expires_in
-    tokens_table.insert({'user_id': user_id, 'token': token, 'expires_at': expiration.isoformat()})
-
-def validate_token(user_id: str, token: str) -> bool:
-    User = Query()
-    result = tokens_table.search((User.user_id == user_id) & (User.token == token))
-    if not result:
-        return False
-    # Check token expiration
-    expires_at = datetime.fromisoformat(result[0]['expires_at'])
-    if datetime.utcnow() > expires_at:
-        return False
-    return True
+# db = TinyDB(storage=MemoryStorage)
+# tokens_table = db.table('tokens')
+
+# def insert_token(user_id: str, token: str, expires_in: timedelta):
+#     expiration = datetime.utcnow() + expires_in
+#     tokens_table.insert({'user_id': user_id, 'token': token, 'expires_at': expiration.isoformat()})
+
+# def validate_token(user_id: str, token: str) -> bool:
+#     User = Query()
+#     result = tokens_table.search((User.user_id == user_id) & (User.token == token))
+#     if not result:
+#         return False
+#     # Check token expiration
+#     expires_at = datetime.fromisoformat(result[0]['expires_at'])
+#     if datetime.utcnow() > expires_at:
+#         return False
+#     return True
 
 def create_access_token(data: dict, expires_delta: Union[timedelta, None] = None) -> str:
     """

docker-compose.yml

@@ -11,7 +11,6 @@ services:
       - HOME=/home/user
       - PATH=/home/user/.local/bin:$PATH
       - NAME=EduConnect
-      - EC_ADMIN_PWD=$2b$12$zybxm7XMoGCVV3ovNDcXt.r2QJUhtj7miYfEfuBw9UGqViTIRFg72
     user: "1000:1000"
     working_dir: /home/user/app
     env_file: