Merge pull request #29 from microsoft/byc-version2-changes

build your own copilot v2 changes

Author: nchandhi

ClientAdvisor/App/.devcontainer/devcontainer.json

@@ -0,0 +1,33 @@
+{
+    "name": "Azure Developer CLI",
+    "image": "mcr.microsoft.com/devcontainers/python:3.10",
+    "features": {
+        "ghcr.io/devcontainers/features/node:1": {
+            "version": "16",
+            "nodeGypDependencies": false
+        },
+        "ghcr.io/devcontainers/features/azure-cli:1.0.8": {},
+        "ghcr.io/azure/azure-dev/azd:latest": {}
+    },
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "ms-azuretools.azure-dev",
+                "ms-azuretools.vscode-bicep",
+                "ms-python.python"
+            ]
+        },
+        "codespaces": {
+            "openFiles": [
+              "README.md"
+            ]
+        }
+    },
+    "forwardPorts": [
+        5000
+    ],
+    "remoteUser": "vscode",
+    "hostRequirements": {
+        "memory": "8gb"
+    }
+}

ClientAdvisor/App/.env.sample

@@ -0,0 +1,129 @@
+# Chat
+DEBUG=True
+AZURE_OPENAI_RESOURCE=
+AZURE_OPENAI_MODEL=gpt-35-turbo-16k
+AZURE_OPENAI_KEY=
+AZURE_OPENAI_MODEL_NAME=gpt-35-turbo-16k
+AZURE_OPENAI_TEMPERATURE=0
+AZURE_OPENAI_TOP_P=1.0
+AZURE_OPENAI_MAX_TOKENS=1000
+AZURE_OPENAI_STOP_SEQUENCE=
+AZURE_OPENAI_SEED=
+AZURE_OPENAI_CHOICES_COUNT=1
+AZURE_OPENAI_PRESENCE_PENALTY=0.0
+AZURE_OPENAI_FREQUENCY_PENALTY=0.0
+AZURE_OPENAI_LOGIT_BIAS=
+AZURE_OPENAI_USER=
+AZURE_OPENAI_TOOLS=
+AZURE_OPENAI_TOOL_CHOICE=
+AZURE_OPENAI_SYSTEM_MESSAGE=You are an AI assistant that helps people find information.
+AZURE_OPENAI_PREVIEW_API_VERSION=2024-05-01-preview
+AZURE_OPENAI_STREAM=True
+AZURE_OPENAI_ENDPOINT=
+AZURE_OPENAI_EMBEDDING_NAME=text-embedding-ada-002
+AZURE_OPENAI_EMBEDDING_ENDPOINT=
+AZURE_OPENAI_EMBEDDING_KEY=
+# User Interface
+UI_TITLE=
+UI_LOGO=
+UI_CHAT_LOGO=
+UI_CHAT_TITLE=
+UI_CHAT_DESCRIPTION=
+UI_FAVICON=
+# Chat history
+AZURE_COSMOSDB_ACCOUNT=
+AZURE_COSMOSDB_DATABASE=db_conversation_history
+AZURE_COSMOSDB_CONVERSATIONS_CONTAINER=conversations
+AZURE_COSMOSDB_ACCOUNT_KEY=
+AZURE_COSMOSDB_ENABLE_FEEDBACK=True
+# Chat with data: common settings
+SEARCH_TOP_K=5
+SEARCH_STRICTNESS=3
+SEARCH_ENABLE_IN_DOMAIN=True
+# Chat with data: Azure AI Search
+AZURE_SEARCH_SERVICE=
+AZURE_SEARCH_INDEX=
+AZURE_SEARCH_KEY=
+AZURE_SEARCH_SEMANTIC_SEARCH_CONFIG=
+AZURE_SEARCH_INDEX_IS_PRECHUNKED=False
+AZURE_SEARCH_TOP_K=5
+AZURE_SEARCH_ENABLE_IN_DOMAIN=True
+AZURE_SEARCH_CONTENT_COLUMNS=content
+AZURE_SEARCH_FILENAME_COLUMN=sourceurl
+AZURE_SEARCH_TITLE_COLUMN=client_id
+AZURE_SEARCH_URL_COLUMN=sourceurl
+AZURE_SEARCH_VECTOR_COLUMNS=
+AZURE_SEARCH_QUERY_TYPE=simple
+AZURE_SEARCH_PERMITTED_GROUPS_COLUMN=
+AZURE_SEARCH_STRICTNESS=3
+# Chat with data: Azure CosmosDB Mongo VCore
+AZURE_COSMOSDB_MONGO_VCORE_CONNECTION_STRING=
+AZURE_COSMOSDB_MONGO_VCORE_DATABASE=
+AZURE_COSMOSDB_MONGO_VCORE_CONTAINER=
+AZURE_COSMOSDB_MONGO_VCORE_INDEX=
+AZURE_COSMOSDB_MONGO_VCORE_INDEX=
+AZURE_COSMOSDB_MONGO_VCORE_TOP_K=
+AZURE_COSMOSDB_MONGO_VCORE_STRICTNESS=
+AZURE_COSMOSDB_MONGO_VCORE_ENABLE_IN_DOMAIN=
+AZURE_COSMOSDB_MONGO_VCORE_CONTENT_COLUMNS=
+AZURE_COSMOSDB_MONGO_VCORE_FILENAME_COLUMN=
+AZURE_COSMOSDB_MONGO_VCORE_TITLE_COLUMN=
+AZURE_COSMOSDB_MONGO_VCORE_URL_COLUMN=
+AZURE_COSMOSDB_MONGO_VCORE_VECTOR_COLUMNS=
+# Chat with data: Elasticsearch
+ELASTICSEARCH_ENDPOINT=
+ELASTICSEARCH_ENCODED_API_KEY=
+ELASTICSEARCH_INDEX=
+ELASTICSEARCH_QUERY_TYPE=
+ELASTICSEARCH_TOP_K=
+ELASTICSEARCH_ENABLE_IN_DOMAIN= 
+ELASTICSEARCH_CONTENT_COLUMNS= 
+ELASTICSEARCH_FILENAME_COLUMN=
+ELASTICSEARCH_TITLE_COLUMN=
+ELASTICSEARCH_URL_COLUMN=
+ELASTICSEARCH_VECTOR_COLUMNS=
+ELASTICSEARCH_STRICTNESS=
+ELASTICSEARCH_EMBEDDING_MODEL_ID= 
+# Chat with data: Pinecone
+PINECONE_ENVIRONMENT=
+PINECONE_API_KEY=
+PINECONE_INDEX_NAME=
+PINECONE_TOP_K=
+PINECONE_STRICTNESS=
+PINECONE_ENABLE_IN_DOMAIN=
+PINECONE_CONTENT_COLUMNS=
+PINECONE_FILENAME_COLUMN=
+PINECONE_TITLE_COLUMN=
+PINECONE_URL_COLUMN=
+PINECONE_VECTOR_COLUMNS= 
+# Chat with data: Azure Machine Learning MLIndex
+AZURE_MLINDEX_NAME=
+AZURE_MLINDEX_VERSION=
+AZURE_ML_PROJECT_RESOURCE_ID=
+AZURE_MLINDEX_TOP_K= 
+AZURE_MLINDEX_STRICTNESS= 
+AZURE_MLINDEX_ENABLE_IN_DOMAIN=
+AZURE_MLINDEX_CONTENT_COLUMNS= 
+AZURE_MLINDEX_FILENAME_COLUMN=
+AZURE_MLINDEX_TITLE_COLUMN= 
+AZURE_MLINDEX_URL_COLUMN= 
+AZURE_MLINDEX_VECTOR_COLUMNS=
+AZURE_MLINDEX_QUERY_TYPE=
+# Chat with data: Prompt flow API
+USE_PROMPTFLOW=False
+PROMPTFLOW_ENDPOINT=
+PROMPTFLOW_API_KEY=
+PROMPTFLOW_RESPONSE_TIMEOUT=120
+PROMPTFLOW_REQUEST_FIELD_NAME=query
+PROMPTFLOW_RESPONSE_FIELD_NAME=reply
+PROMPTFLOW_CITATIONS_FIELD_NAME=documents
+STREAMING_AZUREFUNCTION_ENDPOINT=
+USE_AZUREFUNCTION=True
+SQL_CONNECTION=
+SQLDB_CONNECTION_STRING=
+SQLDB_SERVER=
+SQLDB_DATABASE=
+SQLDB_USERNAME=
+SQLDB_PASSWORD=
+SQLDB_DRIVER=
+VITE_POWERBI_EMBED_URL=

App/.gitattributes renamed to ClientAdvisor/App/.gitattributes

@@ -0,0 +1,24 @@
+# TeamsFx files
+env/.env.*.user
+env/.env.local
+.localConfigs
+appPackage/build
+
+# dependencies
+node_modules/
+
+# misc
+.env
+.deployment
+.DS_Store
+
+# build
+lib/
+
+.venv
+frontend/node_modules
+.env
+# static
+.azure/
+__pycache__/
+.ipynb_checkpoints/

ClientAdvisor/App/.gitignore

@@ -0,0 +1,25 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Python: Sample App Backend",
+      "type": "python",
+      "request": "launch",
+      "module": "quart",
+      "cwd": "${workspaceFolder}",
+      "env": {
+          "QUART_APP": "app:app",
+          "QUART_ENV": "development",
+          "QUART_DEBUG": "0"
+      },
+      "args": [
+          "run",
+          "--no-reload",
+          "-p 50505"
+      ],
+      "console": "integratedTerminal",
+      "justMyCode": false,
+      "envFile": "${workspaceFolder}/.env",
+  }
+  ]
+}

ClientAdvisor/App/.vscode/launch.json

@@ -0,0 +1,36 @@
+### Deploy from your local machine
+
+#### Local Setup: Basic Chat Experience
+1. Copy `.env.sample` to a new file called `.env` and update the values from your azure resource group.
+
+2. Start the app with `start.cmd`. This will build the frontend, install backend dependencies, and then start the app. Or, just run the backend in debug mode using the VSCode debug configuration in `.vscode/launch.json`.
+
+3. You can see the local running app at http://127.0.0.1:50505.
+
+
+#### Deploy with the Azure CLI
+**NOTE**: If you've made code changes, be sure to **build the app code** with `start.cmd` or `start.sh` before you deploy, otherwise your changes will not be picked up. If you've updated any files in the `frontend` folder, make sure you see updates to the files in the `static` folder before you deploy.
+
+You can use the [Azure CLI](https://learn.microsoft.com/en-us/cli/azure/install-azure-cli) to deploy the app from your local machine. Make sure you have version 2.48.1 or later.
+
+If this is your first time deploying the app, you can use [az webapp up](https://learn.microsoft.com/en-us/cli/azure/webapp?view=azure-cli-latest#az-webapp-up). Run the following two commands from the root folder of the repo, updating the placeholder values to your desired app name, resource group, location, and subscription. You can also change the SKU if desired.
+
+1. `az webapp up --runtime PYTHON:3.11 --sku B1 --name <new-app-name> --resource-group <resource-group-name> --location <azure-region> --subscription <subscription-name>`
+1. `az webapp config set --startup-file "python3 -m gunicorn app:app" --name <new-app-name>`
+
+If you've deployed the app previously, first run this command to update the appsettings to allow local code deployment:
+
+`az webapp config appsettings set -g <resource-group-name> -n <existing-app-name> --settings WEBSITE_WEBDEPLOY_USE_SCM=false`
+
+Check the runtime stack for your app by viewing the app service resource in the Azure Portal. If it shows "Python - 3.10", use `PYTHON:3.10` in the runtime argument below. If it shows "Python - 3.11", use `PYTHON:3.11` in the runtime argument below. 
+
+Check the SKU in the same way. Use the abbreviated SKU name in the argument below, e.g. for "Basic (B1)" the SKU is `B1`. 
+
+Then, use these commands to deploy your local code to the existing app:
+
+1. `az webapp up --runtime <runtime-stack> --sku <sku> --name <existing-app-name> --resource-group <resource-group-name>`
+1. `az webapp config set --startup-file "python3 -m gunicorn app:app" --name <existing-app-name>`
+
+Make sure that the app name and resource group match exactly for the app that was previously deployed.
+
+Deployment will take several minutes. When it completes, you should be able to navigate to your app at {app-name}.azurewebsites.net.

ClientAdvisor/App/Run_Deploy_App.md

@@ -0,0 +1,32 @@
+FROM node:20-alpine AS frontend  
+RUN mkdir -p /home/node/app/node_modules && chown -R node:node /home/node/app
+
+WORKDIR /home/node/app 
+COPY ./frontend/package*.json ./  
+USER node
+RUN npm ci  
+COPY --chown=node:node ./frontend/ ./frontend  
+COPY --chown=node:node ./static/ ./static  
+WORKDIR /home/node/app/frontend
+RUN npm run build
+  
+FROM python:3.11-alpine 
+RUN apk add --no-cache --virtual .build-deps \  
+    build-base \  
+    libffi-dev \  
+    openssl-dev \  
+    curl \  
+    && apk add --no-cache \  
+    libpq 
+    # python3 python3-dev g++ unixodbc-dev unixodbc libpq-dev
+  
+COPY requirements.txt /usr/src/app/  
+RUN pip install --no-cache-dir -r /usr/src/app/requirements.txt \  
+    && rm -rf /root/.cache  
+  
+COPY . /usr/src/app/  
+COPY --from=frontend /home/node/app/static  /usr/src/app/static/
+WORKDIR /usr/src/app  
+EXPOSE 80  
+
+CMD ["gunicorn"  , "-b", "0.0.0.0:80", "app:app"]