debug

app.py

@@ -510,8 +510,8 @@ try:
         if ragFlag:
             ragPrompt = getRagData(pprompt)
             st.session_state.ragpTA = ragPrompt
-            userPrompt = pprompt + " " + ragPrompt
-            prompt = userPrompt
+            #userPrompt = pprompt + " " + ragPrompt
+            #prompt = userPrompt
             #userPrompt = "<prompt>" \
             #               + "Answer the following question or carry out the following instruction and also supplement " \
             #               + "the LLM processing of the question or instruction using the retrieved information from the knowledge base. " \
@@ -531,18 +531,10 @@ try:
         else:
             userPrompt = pprompt
         
-        #fullPrompt = [
-        #  {"role": "system", "content": st.session_state.sysTA},
-        #  {
-        #      "role": "user",
-        #      "content": userPrompt
-        #  }
-        #]
-        
-        fullPrompt = {
-          "prompt": userPrompt,
-          "system_prompt": st.session_state.sysTA
-        }
+        fullPrompt = [
+          {"role": "system", "content": st.session_state.sysTA},
+          {"role": "user", "content": userPrompt}
+        ]
           
         logger.debug(f"### userPrompt: {userPrompt}")
         logger.info("setPrompt exited.")