Merge branch 'main' into refactor/move-prompts-to-jinja-templates

jeannotdamoiseaux · web-flow · commit 40637672f38c · 2024-11-19T12:01:14.000+01:00
diff --git a/README.md b/README.md
@@ -76,17 +76,17 @@ The repo includes sample data so it's ready to try end to end. In this sample ap
 **IMPORTANT:** In order to deploy and run this example, you'll need:
 
 - **Azure account**. If you're new to Azure, [get an Azure account for free](https://azure.microsoft.com/free/cognitive-search/) and you'll get some free Azure credits to get started. See [guide to deploying with the free trial](docs/deploy_lowcost.md).
-- **Azure subscription with access enabled for the Azure OpenAI service**. You can request access with [this form](https://aka.ms/oaiapply). If your access request to Azure OpenAI service doesn't match the [acceptance criteria](https://learn.microsoft.com/legal/cognitive-services/openai/limited-access?context=%2Fazure%2Fcognitive-services%2Fopenai%2Fcontext%2Fcontext), you can use [OpenAI public API](https://platform.openai.com/docs/api-reference/introduction) instead. Learn [how to switch to an OpenAI instance](docs/deploy_existing.md#openaicom-openai).
 - **Azure account permissions**:
   - Your Azure account must have `Microsoft.Authorization/roleAssignments/write` permissions, such as [Role Based Access Control Administrator](https://learn.microsoft.com/azure/role-based-access-control/built-in-roles#role-based-access-control-administrator-preview), [User Access Administrator](https://learn.microsoft.com/azure/role-based-access-control/built-in-roles#user-access-administrator), or [Owner](https://learn.microsoft.com/azure/role-based-access-control/built-in-roles#owner). If you don't have subscription-level permissions, you must be granted [RBAC](https://learn.microsoft.com/azure/role-based-access-control/built-in-roles#role-based-access-control-administrator-preview) for an existing resource group and [deploy to that existing group](docs/deploy_existing.md#resource-group).
   - Your Azure account also needs `Microsoft.Resources/deployments/write` permissions on the subscription level.
 
 ### Cost estimation
 
 Pricing varies per region and usage, so it isn't possible to predict exact costs for your usage.
-However, you can try the [Azure pricing calculator](https://azure.com/e/a87a169b256e43c089015fda8182ca87) for the resources below.
+However, you can try the [Azure pricing calculator](https://azure.com/e/e3490de2372a4f9b909b0d032560e41b) for the resources below.
 
 - Azure Container Apps: Default host for app deployment as of 10/28/2024. See more details in [the ACA deployment guide](docs/azure_container_apps.md). Consumption plan with 1 CPU core, 2.0 GB RAM. Pricing with Pay-as-You-Go. [Pricing](https://azure.microsoft.com/pricing/details/container-apps/)
+- Azure Container Registry: Basic tier. [Pricing](https://azure.microsoft.com/pricing/details/container-registry/)
 - Azure App Service: Only provisioned if you deploy to Azure App Service following [the App Service deployment guide](docs/azure_app_service.md).  Basic Tier with 1 CPU core, 1.75 GB RAM. Pricing per hour. [Pricing](https://azure.microsoft.com/pricing/details/app-service/linux/)
 - Azure OpenAI: Standard tier, GPT and Ada models. Pricing per 1K tokens used, and at least 1K tokens are used per question. [Pricing](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/)
 - Azure AI Document Intelligence: SO (Standard) tier using pre-built layout. Pricing per document page, sample documents have 261 pages total. [Pricing](https://azure.microsoft.com/pricing/details/form-recognizer/)
diff --git a/app/backend/requirements.txt b/app/backend/requirements.txt
@@ -8,7 +8,7 @@ aiofiles==24.1.0
     # via quart
 aiohappyeyeballs==2.4.0
     # via aiohttp
-aiohttp==3.10.5
+aiohttp==3.10.11
     # via
     #   -r requirements.in
     #   microsoft-kiota-authentication-azure
@@ -328,6 +328,8 @@ portalocker==2.10.1
     # via msal-extensions
 priority==2.0.0
     # via hypercorn
+propcache==0.2.0
+    # via yarl
 psutil==5.9.8
     # via azure-monitor-opentelemetry-exporter
 pycparser==2.22
@@ -433,7 +435,7 @@ wrapt==1.16.0
     #   opentelemetry-instrumentation-urllib3
 wsproto==1.2.0
     # via hypercorn
-yarl==1.9.4
+yarl==1.17.2
     # via aiohttp
 zipp==3.20.0
     # via importlib-metadata
diff --git a/app/frontend/package-lock.json b/app/frontend/package-lock.json
diff --git a/app/frontend/package.json b/app/frontend/package.json
@@ -13,13 +13,13 @@
   },
   "dependencies": {
     "@azure/msal-browser": "^3.26.1",
-    "@azure/msal-react": "^2.0.21",
+    "@azure/msal-react": "^2.2.0",
     "@fluentui/react": "^8.112.5",
-    "@fluentui/react-components": "^9.55.1",
-    "@fluentui/react-icons": "^2.0.249",
+    "@fluentui/react-components": "^9.56.2",
+    "@fluentui/react-icons": "^2.0.265",
     "@react-spring/web": "^9.7.3",
     "dompurify": "^3.1.6",
-    "i18next": "^23.15.2",
+    "i18next": "^23.16.5",
     "i18next-browser-languagedetector": "^8.0.0",
     "i18next-http-backend": "^2.5.2",
     "idb": "^8.0.0",
@@ -38,13 +38,13 @@
   "devDependencies": {
     "@types/dom-speech-recognition": "^0.0.4",
     "@types/dompurify": "^3.0.5",
-    "@types/react": "^18.3.11",
+    "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
     "@types/react-syntax-highlighter": "^15.5.13",
     "@vitejs/plugin-react": "^4.3.3",
     "prettier": "^3.3.3",
     "typescript": "^5.6.3",
-    "vite": "^5.4.10",
+    "vite": "^5.4.11",
     "rollup-plugin-visualizer": "^5.12.0"
   }
 }
diff --git a/app/frontend/src/components/Answer/Answer.tsx b/app/frontend/src/components/Answer/Answer.tsx
@@ -1,4 +1,4 @@
-import { useMemo } from "react";
+import { useMemo, useState } from "react";
 import { Stack, IconButton } from "@fluentui/react";
 import { useTranslation } from "react-i18next";
 import DOMPurify from "dompurify";
@@ -46,13 +46,34 @@ export const Answer = ({
     const parsedAnswer = useMemo(() => parseAnswerToHtml(answer, isStreaming, onCitationClicked), [answer]);
     const { t } = useTranslation();
     const sanitizedAnswerHtml = DOMPurify.sanitize(parsedAnswer.answerHtml);
+    const [copied, setCopied] = useState(false);
+
+    const handleCopy = () => {
+        // Single replace to remove all HTML tags to remove the citations
+        const textToCopy = sanitizedAnswerHtml.replace(/<a [^>]*><sup>\d+<\/sup><\/a>|<[^>]+>/g, "");
+
+        navigator.clipboard
+            .writeText(textToCopy)
+            .then(() => {
+                setCopied(true);
+                setTimeout(() => setCopied(false), 2000);
+            })
+            .catch(err => console.error("Failed to copy text: ", err));
+    };
 
     return (
         <Stack className={`${styles.answerContainer} ${isSelected && styles.selected}`} verticalAlign="space-between">
             <Stack.Item>
                 <Stack horizontal horizontalAlign="space-between">
                     <AnswerIcon />
                     <div>
+                        <IconButton
+                            style={{ color: "black" }}
+                            iconProps={{ iconName: copied ? "CheckMark" : "Copy" }}
+                            title={copied ? t("tooltips.copied") : t("tooltips.copy")}
+                            ariaLabel={copied ? t("tooltips.copied") : t("tooltips.copy")}
+                            onClick={handleCopy}
+                        />
                         <IconButton
                             style={{ color: "black" }}
                             iconProps={{ iconName: "Lightbulb" }}
diff --git a/app/frontend/src/locales/da/translation.json b/app/frontend/src/locales/da/translation.json
@@ -59,7 +59,9 @@
         "showSupportingContent": "Vis understøttende indhold",
         "speakAnswer": "Afspil svar",
         "info": "Info",
-        "save": "Gem"
+        "save": "Gem",
+        "copy": "Kopier",
+        "copied": "Kopieret!"
     },
     "headerTexts": {
         "thoughtProcess": "Tankeproces",
diff --git a/app/frontend/src/locales/en/translation.json b/app/frontend/src/locales/en/translation.json
@@ -61,7 +61,9 @@
         "showSupportingContent": "Show supporting content",
         "speakAnswer": "Speak answer",
         "info": "Info",
-        "save": "Save"
+        "save": "Save",
+        "copy": "Copy",
+        "copied": "Copied!"
     },
 
     "headerTexts":{
diff --git a/app/frontend/src/locales/es/translation.json b/app/frontend/src/locales/es/translation.json
@@ -61,7 +61,9 @@
         "showSupportingContent": "Mostrar contenido de soporte",
         "speakAnswer": "Hablar respuesta",
         "info": "Información",
-        "save": "Guardar"
+        "save": "Guardar",
+        "copy": "Copiar",
+        "copied": "¡Copiado!"
     },
 
     "headerTexts":{
diff --git a/app/frontend/src/locales/fr/translation.json b/app/frontend/src/locales/fr/translation.json
@@ -61,7 +61,9 @@
         "showSupportingContent": "Montrer le contenu de soutien",
         "speakAnswer": "Parler réponse",
         "info": "Info",
-        "save": "Sauvegarder"
+        "save": "Sauvegarder",
+        "copy": "Copier",
+        "copied": "Copié!"
     },
 
     "headerTexts":{
diff --git a/app/frontend/src/locales/ja/translation.json b/app/frontend/src/locales/ja/translation.json
@@ -61,7 +61,9 @@
         "showSupportingContent": "サポート内容の表示",
         "speakAnswer": "音声による回答",
         "info": "情報",
-        "save": "保存"
+        "save": "保存",
+        "copy": "コピー",
+        "copied": "コピーしました！"
     },
 
     "headerTexts":{
diff --git a/app/frontend/src/locales/nl/translation.json b/app/frontend/src/locales/nl/translation.json
@@ -61,7 +61,9 @@
         "showSupportingContent": "Ondersteunende inhoud tonen",
         "speakAnswer": "Antwoord uitspreken",
         "info": "Info",
-        "save": "Opslaan"
+        "save": "Opslaan",
+        "copy": "Kopieer",
+        "copied": "Gekopieerd!"
     },
 
     "headerTexts": {
diff --git a/app/frontend/src/locales/ptBR/translation.json b/app/frontend/src/locales/ptBR/translation.json
@@ -61,7 +61,9 @@
         "showSupportingContent": "Mostrar conteúdo de suporte",
         "speakAnswer": "Falar a resposta",
         "info": "Info",
-        "save": "Save"
+        "save": "Save",
+        "copy": "Copiar",
+        "copied": "Copiado!"
     },
 
     "headerTexts":{
diff --git a/app/start.ps1 b/app/start.ps1
@@ -1,3 +1,6 @@
+# set the parent of the script as the current location.
+Set-Location $PSScriptRoot
+
 Write-Host ""
 Write-Host "Loading azd .env file from current environment"
 Write-Host ""
diff --git a/app/start.sh b/app/start.sh
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+# cd into the parent directory of the script, 
+# so that the script generates virtual environments always in the same path.
+cd "${0%/*}" || exit 1
+
 cd ../
 echo 'Creating python virtual environment ".venv"'
 python3 -m venv .venv
@@ -9,9 +13,10 @@ echo "Restoring backend python packages"
 echo ""
 
 ./.venv/bin/python -m pip install -r app/backend/requirements.txt
-if [ $? -ne 0 ]; then
+out=$?
+if [ $out -ne 0 ]; then
     echo "Failed to restore backend python packages"
-    exit $?
+    exit $out
 fi
 
 echo ""
@@ -20,19 +25,21 @@ echo ""
 
 cd app/frontend
 npm install
-if [ $? -ne 0 ]; then
+out=$?
+if [ $out -ne 0 ]; then
     echo "Failed to restore frontend npm packages"
-    exit $?
+    exit $out
 fi
 
 echo ""
 echo "Building frontend"
 echo ""
 
 npm run build
-if [ $? -ne 0 ]; then
+out=$?
+if [ $out -ne 0 ]; then
     echo "Failed to build frontend"
-    exit $?
+    exit $out
 fi
 
 echo ""
@@ -44,7 +51,8 @@ cd ../backend
 port=50505
 host=localhost
 ../../.venv/bin/python -m quart --app main:app run --port "$port" --host "$host" --reload
-if [ $? -ne 0 ]; then
+out=$?
+if [ $out -ne 0 ]; then
     echo "Failed to start backend"
-    exit $?
+    exit $out
 fi
