Update app.py

app.py

@@ -40,7 +40,7 @@ user = []
 sessions = {}  # Format: {uid: {conv_id: [history_list]}}
 
 
-user_data = [] #[[name, gender, nationality, model name, model gender]]
+user_data = [] #[[email, name, gender, nationality, model name, model gender]]
 user_inst = [] #[[system prompt, About user, demanded tone, custum instruction]]
 
 
@@ -65,8 +65,8 @@ class UpdateSystemRequest(BaseModel):
     key: str
     value: str
 
-def update_details():
-    user_data.append(['','','','',''])
+def update_details(email, name):
+    user_data.append([email, name,'','','',''])
     user_inst.append(['','','',''])
     
     
@@ -81,28 +81,33 @@ def verify_access_token(auth: HTTPAuthorizationCredentials = Depends(security)):
     return token
     
     
+@app.post("/system/userInfo")
+async def returnUserInfo(token: str = Depends(verify_access_token)):
+    i = Tokens.index(token)
+    return {'user_email': user_data[i][0], 'user_name': user_data[i][1], 'user_gender': user_data[i][2], 'assistant_nickname': user_data[i][4], 'assistant_gender': user_data[i][5], 'about_user': user_inst[i][1], 'assistant_tone': user_inst[i][2], 'custom_instruction': user_inst[i][3]}
+    
 @app.post("/update/system/userInfo")
 async def update_Details(info: UpdateSystemRequest, token: str = Depends(verify_access_token)):
     i = Tokens.index(token)
     cat = info.key
     val = info.value
-    if cat == 'name':
-        user_data[i][0] = val
-    if cat == 'gender':
+    if cat == 'user_name':
         user_data[i][1] = val
-    if cat == 'country':
+    if cat == 'user_gender':
         user_data[i][2] = val
-    if cat == 'model_name':
+    if cat == 'country':
         user_data[i][3] = val
-    if cat == 'model_gender':
+    if cat == 'assistant_nickname':
         user_data[i][4] = val
+    if cat == 'assistant_gender':
+        user_data[i][5] = val
     if cat == 'system_prompt':
         user_inst[i][0] =val
     if cat == 'about_user':
         user_inst[i][1] =val
-    if cat == 'tone':
+    if cat == 'assistant_tone':
         user_inst[i][2] =val
-    if cat == 'custum_instruction':
+    if cat == 'custom_instruction':
         user_inst[i][3] =val
     else:
         raise HTTPException(status_code=401, detail="Invalid Data.")
@@ -112,6 +117,8 @@ async def update_Details(info: UpdateSystemRequest, token: str = Depends(verify_
 def check_token(data: VerifyRequest):
     decoded_token = auth.verify_id_token(data.idToken)
     uid = decoded_token['uid']
+    email = decoded_token['email']
+    name = decoded_token['name']
 
     if decoded_token['uid'] == data.uid and decoded_token['email_verified']:
         new_token = base64.urlsafe_b64encode(uuid.uuid4().bytes).rstrip(b'=').decode()
@@ -120,9 +127,10 @@ def check_token(data: VerifyRequest):
             user.append(uid)
             Tokens.append(new_token)
             sessions[uid] = {}
-            update_details()
+            update_details(email, name)
         else:
             idx = user.index(uid)
+            user_data[idx][0] = email
             Tokens[idx] = new_token
         return {"customToken": new_token}
     else: