debug

app.py

@@ -512,27 +512,38 @@ try:
             st.session_state.ragpTA = ragPrompt
             userPrompt = pprompt + "\n" + 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. " \
-                           + "Question or Instruction: " \
-                               + pprompt + "\n" \
-                           + "Retrieve the relevant information from the knowledge base: " \
-                           + "<knowledge_base>" \
-                               + ragPrompt \
-                           + "</knowledge_base>" \
-                           + "</prompt>"
+            #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. " \
+            #               + "Question or Instruction: " \
+            #                   + pprompt + 7" " \
+            #               + "Retrieve the relevant information from the knowledge base: " \
+            #               + "<knowledge_base>" \
+            #                   + ragPrompt \
+            #               + "</knowledge_base>" \
+            #               + "</prompt>"
+            
+            userPrompt = pprompt + " " \
+                           + "Also, combine the following information with information in the LLM itself. " \
+                           + "Use the combined information to generate the response. " \
+                           + ragPrompt + " "
                          
         else:
             userPrompt = pprompt
         
-        fullPrompt = [
-          {"role": "system", "content": st.session_state.sysTA},
-          {
-              "role": "user",
-              "content": userPrompt
-          }
-        ]
+        #fullPrompt = [
+        #  {"role": "system", "content": st.session_state.sysTA},
+        #  {
+        #      "role": "user",
+        #      "content": userPrompt
+        #  }
+        #]
+        
+        fullPrompt = {
+          "prompt": userPrompt,
+          "system_prompt": st.session_state.sysTA
+        }
+          
         logger.debug(f"### userPrompt: {userPrompt}")
         logger.info("setPrompt exited.")
         return fullPrompt
@@ -544,8 +555,10 @@ try:
     def prettyPrint(text):
         try:
             logger.info("### prettyPrint entered.")
+            logger.info(f"### text: {text}")
+            text = text.replace("\\n", "\n")
             outstr = io.StringIO()
-            pprint.pprint(object=text,stream=outstr,indent=1,width=30)
+            pprint.pprint(object=text,stream=outstr,indent=1,width=60)
             prettyText = outstr.getvalue()
             logger.info("### prettyPrint exited.")
             return prettyText