Update app.py

app.py

@@ -281,7 +281,7 @@ Stay {'Jiya' if user_data[i][4] == '' else user_data[i][4]}.
 - About User: {user_inst[i][1]}
 
 If information is missing, do not fabricate.
-Adapt tone dynamically based on known user preferences. These information is only for general idea about user, don't overuse it.
+Adapt tone dynamically based on known user preferences. These information is only for general idea about user, don't overuse user personal details.
 <USER PROFILE>'''
     return text #TODO: System Prompt builder later
 
@@ -301,18 +301,19 @@ async def handleNewConv(new_conv: NewConv, token: str = Depends(verify_access_to
     a = time.time()
     i = Tokens.index(token)
     convs = sessions.get(user[i])
+    sysPrompt = getSystemPrompt(i).rstrip()
     history = [
-        types.Content(role='model', parts=[types.Part(text=getSystemPrompt(i))]),
-        types.Content(role='user', parts=[types.Part(text= f'time {currentTime()}\n{new_conv.prompt}')])
+        types.Content(role='user', parts=[types.Part(text=sysPrompt)]),
+        types.Content(role='user', parts=[types.Part(text= f'time {currentTime()}\n{new_conv.prompt.rstrip()}')])
     ]
-    text = call_gemini(history)
+    text = call_gemini(history).rstrip()
     if text:
         conv_id = getConvId()
-        raw_history = [["model", getSystemPrompt(i)]]
+        raw_history = [["user", sysPrompt]]
         raw_history.append(["user", new_conv.prompt])
         raw_history.append(["model", text])
         convs[conv_id] = raw_history
-        return {"title": gen_title(new_conv.prompt,text), "text": text, "conv_id": conv_id}
+        return {"title": gen_title(new_conv.prompt.rstrip(),text), "text": text, "conv_id": conv_id}
 
 
 @app.post("/gen_resp")
@@ -329,10 +330,10 @@ async def handleChat(chat_request: ChatRequest, token: str = Depends(verify_acce
         types.Content(role=k[0], parts=[types.Part(text=k[1])]) 
         for k in raw_history
     ]
-    history.append(types.Content(role='user', parts=[types.Part(text= f'time {currentTime()}\n{chat_request.prompt}')]))
+    history.append(types.Content(role='user', parts=[types.Part(text= f'time {currentTime()}\n{chat_request.prompt.rstrip()}')]))
     # Generate response
-    text = call_gemini(history)
+    text = call_gemini(history).rstrip()
     if text:
-        raw_history.append(["user", chat_request.prompt])
+        raw_history.append(["user", chat_request.prompt.rstrip()])
         raw_history.append(["model", text])
         return {"text": text}