Merge branch 'main' of https://github.com/Azure-Samples/azure-search-…

…openai-solution-accelerator

backend/utilities/ConfigHelper.py

@@ -66,14 +66,19 @@ def get_default_config():
 {chat_history}
 Follow Up Input: {question}
 Standalone question:""",
-                "answering_prompt": """{summaries}
+                "answering_prompt": """Context:
+{summaries}
+
+Please reply to the question using only the information Context section above. If you can't answer a question using the context, reply politely that the information is not in the knowledge base. DO NOT make up your own answers. You detect the language of the question and answer in the same language.  If asked for enumerations list all of them and do not invent any.
+
+The context is structured like this:
 
-Please reply to the question using only the information present in the text above.
-If you can't find it, reply politely that the information is not in the knowledge base.
-Detect the language of the question and answer in the same language. 
-If asked for enumerations list all of them and do not invent any.
+Content:  <information>
+Source: [url/to/file.pdf](url/to/file.pdf_SAS_TOKEN_PLACEHOLDER_)
+<and more of them>
 
-Each source has a name followed by a colon and the actual information, always include the source name for each fact you use in the response. Always use double square brackets to reference the filename source, e.g. [[info1.pdf.txt]]. Don't combine sources, list each source separately, e.g. [[info1.pdf]][[info2.txt]].
+When you give your answer, you ALWAYS MUST include the source in your response in the following format: <answer> [[file.pdf]]
+Always use double square brackets to reference the filename source, e.g. [[file.pdf]]. When using multiple sources, list each source separately, e.g. [[file1.pdf]][[file2.pdf]].
 
 Question: {question}
 Answer:""",

backend/utilities/QuestionHandler.py

@@ -130,7 +130,7 @@ def get_answer_using_langchain(self, question, chat_history):
                     break
             doc = result["source_documents"][idx]
 
-            # Then update the citation object in the response
+            # Then update the citation object in the response, it needs to have filepath and chunk_id to render in the UI as a file
             messages[0]["content"]["citations"].append(
                 {
                     "content": doc.page_content,

frontend/src/components/Answer/Answer.tsx

@@ -38,7 +38,7 @@ export const Answer = ({
     const createCitationFilepath = (citation: Citation, index: number, truncate: boolean = false) => {
         let citationFilename = "";
 
-        if (citation.filepath && citation.chunk_id) {
+        if (citation.filepath && citation.chunk_id != null) {
             if (truncate && citation.filepath.length > filePathTruncationLimit) {
                 const citationLength = citation.filepath.length;
                 citationFilename = `${citation.filepath.substring(0, 20)}...${citation.filepath.substring(citationLength -20)} - Part ${parseInt(citation.chunk_id) + 1}`;