Fixed error in question prompt

app.py

@@ -565,20 +565,20 @@ def reword_query(query, guest, model_name='llama2-13b-chat', response_processing
     
     prompt_fields = {
         "you_are":f"You are an expert in linguistics and semantics, analyzing the question asked by a user to a vector search system, \
-                    and making sure that the question is well formulated and that the system can understand it.",
+                    and making sure that the question is well formulated and understandable by any average reader.",
 
-        "your_task":f"Your task is to detect if the name of the guest ({guest}) is mentioned in the user's question, \
-                    and if that is not the case, rewrite the question using the guest name, \
+        "your_task":f"Your task is to detect if the name of the guest ({guest}) is mentioned in the question '{query}', \
+                    If that is not the case, rewrite the question using the guest name, \
                     without changing the meaning of the question. \
                     Most of the time, the user will have used a pronoun to designate the guest, in which case, \
-                    simply replace the pronoun with the guest name.",
-
-        "question":f"If the user mentions the guest name ({guest}) in the following question '{query}', just return his question as is. \
-                    If the user does not mention the guest name, rewrite the question using the guest name.",
+                    simply replace the pronoun with the guest name. \
+                    If the guest name is already present in the question, return the original question as is.",
 
         "final_instruction":f"Only regenerate the requested rewritten question or the original, WITHOUT ANY COMMENT OR REPHRASING. \
                     Your answer must be as close as possible to the original question, \
                     and exactly identical, word for word, if the user mentions the guest name, i.e. {guest}.",
+                    
+        "question":f"{query}"
     }
 
     # prompt created by chatGPT :-) 
@@ -694,27 +694,20 @@ def reword_query(query, guest, model_name='llama2-13b-chat', response_processing
         """
         prompt = openai_prompt.format(**prompt_fields)
 
-        openai_prompt2 = """
-        {your_task}\n
-        ```
-        \n\n
-        {final_instruction} 
-        """
-        prompt2 = openai_prompt2.format(**{'your_task':prompt_fields['your_task'], 
-                                          'final_instruction':prompt_fields['final_instruction']})
-
         try:
             # https://platform.openai.com/docs/guides/text-generation/chat-completions-api
             resp = GPTllm.get_chat_completion(prompt=prompt,
                                             system_message=prompt_fields['you_are'],
-                                            user_message = None, #prompt_fields['question'],
+                                            user_message = None, 
                                             temperature=0.01,
                                             max_tokens=1500, # it's a long question...
                                             show_response=True,
                                             stream=False)
 
             if resp.choices[0].finish_reason == 'stop':
-                return {'rewritten_question': resp.choices[0].message.content,
+                if guest in resp.choices[0].message.content:
+                    new_question = resp.choices[0].message.content
+                return {'rewritten_question': new_question,
                         'changed': True, 'status': 'success'}
             else:
                 raise Exception("LLM did not stop")  # to go to the except block