From 4f8fb6e7e34b9a517be61137a440b648a861cee9 Mon Sep 17 00:00:00 2001
From: dantelmomsft <dantelmo@microsoft.com>
Date: Tue, 27 Aug 2024 12:42:43 +0200
Subject: [PATCH] documention fix. Default to function chaining in the UI (no
 SK dropdown box)

---
 app/frontend/src/pages/chat/Chat.tsx       |  8 +++++---
 app/frontend/src/pages/oneshot/OneShot.tsx |  6 ++++--
 docs/app-service/README-App-Service.md     | 16 ++++++++++------
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/app/frontend/src/pages/chat/Chat.tsx b/app/frontend/src/pages/chat/Chat.tsx
index bb876a3..cb86f51 100644
--- a/app/frontend/src/pages/chat/Chat.tsx
+++ b/app/frontend/src/pages/chat/Chat.tsx
@@ -258,7 +258,7 @@ const Chat = () => {
         },*/
         {
             key: Approaches.JAVA_SEMANTIC_KERNEL_PLANNER,
-            text: "Java Semantic Kernel - Orchestration"
+            text: "Java Semantic Kernel"
         }
     ];
 
@@ -385,7 +385,9 @@ const Chat = () => {
                             onChange={onPromptTemplateChange}
                         />
                     )}
-                    {(approach === Approaches.JAVA_SEMANTIC_KERNEL_PLANNER) && (
+                    
+                    { //pending implementation of vector stores
+                    /*(approach === Approaches.JAVA_SEMANTIC_KERNEL_PLANNER) && (
                         <Dropdown
                             className={styles.oneshotSettingsSeparator}
                             label="Semantic Kernel mode"
@@ -396,7 +398,7 @@ const Chat = () => {
                             required
                             onChange={onSKModeChange}
                         />
-                    )}
+                    )*/}
 
                     <SpinButton
                         className={styles.chatSettingsSeparator}
diff --git a/app/frontend/src/pages/oneshot/OneShot.tsx b/app/frontend/src/pages/oneshot/OneShot.tsx
index 203e2ca..65570d0 100644
--- a/app/frontend/src/pages/oneshot/OneShot.tsx
+++ b/app/frontend/src/pages/oneshot/OneShot.tsx
@@ -232,7 +232,9 @@ export function Component(): JSX.Element {
                     defaultSelectedKey={approach}
                     onChange={onApproachChange}
                 />
-                {(approach === Approaches.JAVA_SEMANTIC_KERNEL_PLANNER) && (
+                {//pending implementation of vector stores
+                    /*
+                (approach === Approaches.JAVA_SEMANTIC_KERNEL_PLANNER) && (
                     <Dropdown
                         className={styles.oneshotSettingsSeparator}
                         label="Semantic Kernel mode"
@@ -243,7 +245,7 @@ export function Component(): JSX.Element {
                         required
                         onChange={onSKModeChange}
                     />
-                )}
+                )*/}
                 {(approach === Approaches.JAVA_OPENAI_SDK || approach === Approaches.JAVA_SEMANTIC_KERNEL) && (
                 <TextField
                     className={styles.oneshotSettingsSeparator}
diff --git a/docs/app-service/README-App-Service.md b/docs/app-service/README-App-Service.md
index d0499a5..3e1b8dd 100644
--- a/docs/app-service/README-App-Service.md
+++ b/docs/app-service/README-App-Service.md
@@ -244,17 +244,21 @@ To then limit access to a specific set of users or groups, you can follow the st
 if you don't want to use azd to build and deploy the app, a GitHub automated CI pipeline is provided in `.github/workflows/app-ci.yml`. Some notes about the CI pipeline design:
 - It uses a "branch per environment approach". The deploy environment name is computed at 'runtime' based on a git branch. You can check branch/env-name mapping logic in the "set environment for branch" step (line 29). The current implemented logic maps everything to a dev like environment. Therefore, on each git push on the `main branch` the pipeline is triggered trying to deploy to an environment called `Development`. For more info about GitHub environments and how to set specific env variables and secrets read [here](https://docs.github.com/en/actions/deployment/targeting-different-environments/using-environments-for-deployment).
 - GitHub's environment variables and secrets are used to configure development environment specific configuration. They need to be configured manually in GitHub repository settings:
-    - `AZUREAPPSERVICE_PUBLISHPROFILE` is used to store the azure app service publish profile configuration securely.
-    - `AZUREAPPSERVICE_APP_NAME` is used to store the azure web app resource name generated during infra arm deployment.
+    - `AZURE_CREDENTIALS` is used to store the service principal json used by the github runner to securely deploy the java app.
+    - `AZUREAPPSERVICE_APP_NAME` is used to store the azure web app resource name generated during infra deployment.
 
 To properly configure automated build and deploy for both backend and frontend components follow below steps:
  
  1. Go to your forked repository in GitHub and create an [environment]((https://docs.github.com/en/actions/deployment/targeting-different-environments/using-environments-for-deployment)) called 'Development' (yes this is the exact name; don't change it). If you want to change the environment name (also adding new branches and environments, change the current branch/env mapping) you can do that, but make sure to change the pipeline code accordingly in `.github/workflows/app-ci.yml` (starting line 29)
- 2. Create 'Development' environment [secrets](https://docs.github.com/en/actions/security-guides/encrypted-secrets#creating-encrypted-secrets-for-a-repository) for the azure web app hosting both frontend and backend [publish profiles]((https://learn.microsoft.com/en-us/visualstudio/azure/how-to-get-publish-profile-from-azure-app-service?view=vs-2022)). You'll need to copy and paste the xml content from the .PublishSettings file into the secret value:
-     - Create a secret with name `AZUREAPPSERVICE_PUBLISHPROFILE` and set the Value field to publish profile of the azure web app
-3. Create 'Development' environment [variables](https://docs.github.com/en/actions/learn-github-actions/variables#creating-configuration-variables-for-an-environment) for azure web app resource name:
+ 2. Generate a service principal and assign contributor role at app service level. You can do that by running the following command:
+    ```shell
+    az ad sp create-for-rbac --name "java-ai-rag-dev-spi" --role contributor --scopes /subscriptions/<your-subscription-id>/resourceGroups/<your-resource-group-id>/providers/Microsoft.Web/sites/<your-appservice-name> --json-auth
+    ```
+    This command will output a json object with the service principal details. Copy the json output and save it in a safe place. You'll need to use it in the next step.
+ 3. Create 'Development' environment [secrets](https://docs.github.com/en/actions/security-guides/encrypted-secrets#creating-encrypted-secrets-for-a-repository) for the azure web app hosting both frontend and backend. Create a secret with name `AZURE_CREDENTIALS` and set the value field to json output from the service principal creation command.
+4. Create 'Development' environment [variables](https://docs.github.com/en/actions/learn-github-actions/variables#creating-configuration-variables-for-an-environment) for azure web app resource name:
     - Create a variable with name `AZUREAPPSERVICE_APP_NAME` and set the Value field to the azure web app resource name 
-4. For each commit you push check the status of the triggered pipeline in the GitHub Actions tab, you should see a pipeline has been triggered for the specific commit. If everything is ok you should see green checkmark on both build and deploy jobs in the pipeline detail like below:
+5. For each commit you push check the status of the triggered pipeline in the GitHub Actions tab, you should see a pipeline has been triggered for the specific commit. If everything is ok you should see green checkmark on both build and deploy jobs in the pipeline detail like below:
 
 ![pipeline success](github-actions-pipeline-success.png)