Azdevify chat-with-your-data-solution-accelerator. #2

zedy-wj · 2023-11-05T04:21:44Z

This pr is all changes to convert chat-with-your-data-solution-accelerator application into an Azd template.

You can currently deploy this application using azd by following the steps below:

Execute the command: azd init -t zedy-wj/chat-with-your-data-solution-accelerator-azdevify -b azdevify
Execute the command: azd up
Wait a moment for the resource deployment to complete, click the Website endpoint and you will see:

@jongio - for notification.

azure.yaml

infra/app/function.bicep

infra/app/websiteadmin.bicep

zedy-wj · 2023-11-07T16:24:44Z

@jongio - Updated according to your comments, please re-review it, thanks!

infra/app/adminweb.bicep

infra/app/function.bicep

infra/app/resources.bicep

infra/app/storage.bicep

infra/main.bicep

infra/app/storage.bicep

zedy-wj · 2023-11-10T08:57:19Z

@jongio - Updated according to your comments, please re-review this pr. Thanks!

jongio · 2023-11-13T19:14:19Z

Execute the command: azd init -t https://github.com/zedy-wj/chat-with-your-data-solution-accelerator-azdevify.git -b azdevify

You don't need the full URL, azd init -t zedy-wj/chat-with-your-data-solution-accelerator-azdevify -b azdevify works

README.md

infra/app/function.bicep

infra/app/web.bicep

infra/core/ai/cognitiveservices.bicep

infra/main.bicep

jongio · 2023-11-17T16:44:12Z

Execute the command: azd init -t zedy-wj/chat-with-your-data-solution-accelerator-azdevify.git -b azdevify

FYI - You don't need ".git" in the name

jongio · 2023-11-17T16:50:29Z

infra/app/adminweb.bicep

+ AZURE_OPENAI_KEY: listKeys('Microsoft.CognitiveServices/accounts/${azureOpenAIName}', '2023-05-01').key1
+ AZURE_SEARCH_KEY: listAdminKeys('Microsoft.Search/searchServices/${azureCognitiveSearchName}', '2021-04-01-preview').primaryKey


We really shouldn't be using KEYS and instead use RBAC like we do in all the other samples.

Example:

You assign the right roles to the service principal of the azure resources that need to access those services and don't use KEYs in app settings at all.

Add a parameter to the main.bicep that allows the user to either use RBAC or KEYS. Call it AUTH_TYPE and default it to rbac. And set @Allowed to 'rbac' or 'keys'

If the auth type is rbac, then use roles. If auth type is keys, then use keys.

Use this as example for how to use RBAC https://github.com/Azure-Samples/azure-search-openai-demo/blob/main/infra/main.bicep#L353

For 'keys'
You can look up the keys with this listKeys method. Example for storage.

listKeys(resourceId(subscription().subscriptionId, rgName, 'Microsoft.Storage/storageAccounts', storageAccountName), '2021-09-01').keys[0].value

It's like what you had before, but you also include the subscriptionId and RgName

infra/app/function.bicep

add keyvault option to get secret keys remove invalid changes add param useKeyVault

jongio · 2023-11-30T20:57:56Z

@zedy-wj Please LMK when ready for re-review. Thanks

zedy-wj · 2023-12-01T02:41:44Z

@jongio If using KeyVault or KEYS, the code is now ready for re-review. If want to use RBAC or KEYS, there are currently some difficulties in obtaining the search key. For details, please refer to the comment here.

Which method do you prefer, RBAC or KeyVault?

jongio · 2023-12-05T18:24:41Z

@zedy-wj - Please move forward to using the search SDK instead of REST calls.

zedy-wj · 2024-01-11T09:34:49Z

@jongio - We have updated all the code based on your comments, and updated infra/core to be consistent with azure-dev, please re-review it, thanks!

README.md

jongio · 2024-01-11T19:27:47Z

.devcontainer/devcontainer.json

@@ -0,0 +1,31 @@
+{


Sorry for the back and forth on this. Let's do this:

Default to using rbac.

If AUTH_TYPE is rbac, then assume the developer wants to also use key vault. Put the keys in keyvault and then read them from keyvault.

If the user sets AUTH_TYPE to keys, then read the keys from the environment and set the keys using listKeys function.

I think that will be cleaner.

infra/app/function.bicep

infra/app/storage.bicep

infra/app/storekeys.bicep

infra/main.bicep

zedy-wj · 2024-01-12T06:59:53Z

@jongio - Updated according to your comments. For some things that haven’t been changed yet, please see my reply to your comments above, thanks!

zedy-wj · 2024-01-17T02:46:50Z

@jongio - The relevant changes in output have been updated. We are still a little confused about AUTH_TYPE. For details, please refer to my comments here.

jongio · 2024-01-22T19:04:52Z

@zedy-wj - Are you ready for me to rereview this?

zedy-wj · 2024-01-23T01:52:29Z

@jongio - Yes, it's ready for re-review.

README.md

app.py

backend/utilities/helpers/EnvHelper.py

infra/main.bicepparam

app.py

jongio · 2024-01-26T21:44:29Z

@zedy-wj @v-xuto There have been a significant amount of changes to the main repo: https://github.com/Azure-Samples/chat-with-your-data-solution-accelerator, since we started this PR. They already implemented the RBAC / Keys solution in a different way. (SOrry, I didn't know this was happening).

I pulled in the latest from upstream/main to jongio/main so you can see the difference.

Can you please do the analysis to figure out how we can merge the two and what the differences are in implementation?

jongio · 2024-01-31T17:37:27Z

@zedy-wj - After the merge does the app now work?

zedy-wj · 2024-02-01T10:02:51Z

@jongio - The merged code works well during local deployment. Since the directory structure of the project has also changed, we are solving the deployment structure problem in the azure.yaml file.

zedy-wj · 2024-02-02T08:28:22Z

@jongio - We've updated the code and it's working fine so far, please re-review it, thanks!

azure.yaml

code/app/app.py

zedy-wj · 2024-02-05T09:27:28Z

@jongio - We removed hooks and replaced them with structural changes in the code folder. Since the three services of web, adminweb, and function all require the utilities folder, we placed it in the innermost layer to ensure that other services are available during azd deploy. Currently both local deployment and azd deployment are working well, please re-review it, thanks!

jongio · 2024-02-05T18:46:11Z

Thanks, I just updated main with latest from upstream, so there are merge conflicts now.

Can you give me an itemized list of the tests that you ran?

Like

With RBAC
With Keys
With Keyvault = true
etc

zedy-wj · 2024-02-06T08:06:18Z

@jongio - We resolved the conflict, and the update in upstream conflicts with our current code mainly in rbac. Since the upstream still uses an earlier version of OpenAI, this part retains the code in this PR.

Can you give me an itemized list of the tests that you ran?

At present, we have the following three tests in the list, and different parameters need to be configured:

With RBAC
- AZURE_AUTH_TYPE= rbac
- USE_KEY_VAULT= false
With Keys and not use Key Vault
- AZURE_AUTH_TYPE= keys
- USE_KEY_VAULT= false
With Keys and use Key Vault
- AZURE_AUTH_TYPE= keys
- USE_KEY_VAULT= true

Note: The current default values are: AZURE_AUTH_TYPE=keys and USE_KEY_VAULT=true.

zedy added 2 commits November 5, 2023 11:08

azdevify this sample and add azd new feature in devcontainer

24be759

instead parameters.json file with .bicepparam

fbfd9b7

zedy-wj marked this pull request as ready for review November 5, 2023 06:12

v-xuto mentioned this pull request Nov 5, 2023

azdevify chat sample #1

Closed

jongio reviewed Nov 6, 2023

View reviewed changes

zedy added 3 commits November 7, 2023 16:30

processing format

d32d977

keep consistent casing for params

552f254

move appsettings

c00f55a

jongio reviewed Nov 7, 2023

View reviewed changes

zedy added 6 commits November 9, 2023 10:14

remove some invalid changes

b2e62b2

fix format issues

b1a97b7

Remove depandsOn

625487e

remove resources file

65ac3c5

remov keys from output

43b09e7

remove existing reference in module

bd29d31

jongio requested changes Nov 13, 2023

View reviewed changes

update ReadMe

8587450

jongio requested changes Nov 17, 2023

View reviewed changes

Menghua1 mentioned this pull request Nov 20, 2023

Azdevify azure-sql-db-session-recommender. Azure-Samples/azure-sql-db-session-recommender#7

Merged

zedy added 4 commits November 22, 2023 14:31

add rgName in listkeys

afd3ca8

add use keyvault option

654762e

add keyvault option to get secret keys remove invalid changes add param useKeyVault

set default value in .bicepparam

cc3e957

fix some bugs

9dc6a78

zedy added 3 commits January 10, 2024 17:23

update KeyVault options

b25cce5

abstract auth type with define method

332402a

remove invalid infra/core

bd092df

jongio requested changes Jan 11, 2024

View reviewed changes

update readme and storage.bicep in infra/core

5406c5a

Update output format

d2145ec

default to use rbac

c83a409

jongio requested changes Jan 25, 2024

View reviewed changes

jongio reviewed Jan 25, 2024

View reviewed changes

app.py Outdated Show resolved Hide resolved

add some comments

aa86081

solve conflicts

06bb879

add readme and speech service related code in main.bicep

1a7303a

fix azd deploy problem

2c8abfb

jongio requested changes Feb 2, 2024

View reviewed changes

azure.yaml Outdated Show resolved Hide resolved

code/app/app.py Show resolved Hide resolved

Menghua1 mentioned this pull request Feb 4, 2024

Azdevify chat-copilot jongio/chat-copilot#1

Merged

move code folder structure

5dcf10c

fix conflict

779065f

jongio merged commit cf07644 into jongio:main Feb 6, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Azdevify chat-with-your-data-solution-accelerator. #2

Azdevify chat-with-your-data-solution-accelerator. #2

zedy-wj commented Nov 5, 2023 •

edited

Loading

zedy-wj commented Nov 7, 2023

zedy-wj commented Nov 10, 2023

jongio commented Nov 13, 2023

jongio commented Nov 17, 2023

jongio Nov 17, 2023 •

edited

Loading

jongio commented Nov 30, 2023

zedy-wj commented Dec 1, 2023 •

edited

Loading

jongio commented Dec 5, 2023

zedy-wj commented Jan 11, 2024

jongio Jan 11, 2024

zedy-wj commented Jan 12, 2024

zedy-wj commented Jan 17, 2024

jongio commented Jan 22, 2024

zedy-wj commented Jan 23, 2024

jongio commented Jan 26, 2024

jongio commented Jan 31, 2024

zedy-wj commented Feb 1, 2024

zedy-wj commented Feb 2, 2024

zedy-wj commented Feb 5, 2024

jongio commented Feb 5, 2024

zedy-wj commented Feb 6, 2024

		AZURE_OPENAI_KEY: listKeys('Microsoft.CognitiveServices/accounts/${azureOpenAIName}', '2023-05-01').key1
		AZURE_SEARCH_KEY: listAdminKeys('Microsoft.Search/searchServices/${azureCognitiveSearchName}', '2021-04-01-preview').primaryKey

Azdevify chat-with-your-data-solution-accelerator. #2

Azdevify chat-with-your-data-solution-accelerator. #2

Conversation

zedy-wj commented Nov 5, 2023 • edited Loading

zedy-wj commented Nov 7, 2023

zedy-wj commented Nov 10, 2023

jongio commented Nov 13, 2023

jongio commented Nov 17, 2023

jongio Nov 17, 2023 • edited Loading

Choose a reason for hiding this comment

jongio commented Nov 30, 2023

zedy-wj commented Dec 1, 2023 • edited Loading

jongio commented Dec 5, 2023

zedy-wj commented Jan 11, 2024

jongio Jan 11, 2024

Choose a reason for hiding this comment

zedy-wj commented Jan 12, 2024

zedy-wj commented Jan 17, 2024

jongio commented Jan 22, 2024

zedy-wj commented Jan 23, 2024

jongio commented Jan 26, 2024

jongio commented Jan 31, 2024

zedy-wj commented Feb 1, 2024

zedy-wj commented Feb 2, 2024

zedy-wj commented Feb 5, 2024

jongio commented Feb 5, 2024

zedy-wj commented Feb 6, 2024

zedy-wj commented Nov 5, 2023 •

edited

Loading

jongio Nov 17, 2023 •

edited

Loading

zedy-wj commented Dec 1, 2023 •

edited

Loading