Skip to content

Commit f6a38d0

Browse files
added new case in bash and change the index name
1 parent 17f7518 commit f6a38d0

File tree

2 files changed

+62
-11
lines changed

2 files changed

+62
-11
lines changed

infra/main.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1620,7 +1620,7 @@ module avmStorageAccount 'br/public:avm/res/storage/storage-account:0.20.0' = {
16201620
// ========== Search Service ========== //
16211621

16221622
var searchServiceName = 'srch-${solutionSuffix}'
1623-
var aiSearchIndexNameForLegalContract = 'sample-dataset-index'
1623+
var aiSearchIndexNameForLegalContract = 'legal-doc-index'
16241624
var aiSearchIndexNameForRetailCustomer = 'macae-retail-customer-index'
16251625
var aiSearchIndexNameForRetailOrder = 'macae-retail-order-index'
16261626
var aiSearchIndexNameForRFP = 'macae-rfp-index'

infra/scripts/selecting_team_config_and_data.sh

Lines changed: 61 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@ storageAccount=""
2222
blobContainerForRetailCustomer=""
2323
blobContainerForRetailOrder=""
2424
blobContainerForRFP=""
25+
blobContainerForLegalContract=""
2526
aiSearch=""
2627
aiSearchIndexForRetailCustomer=""
2728
aiSearchIndexForRetailOrder=""
2829
aiSearchIndexForRFP=""
30+
aiSearchIndexForLegalContract=""
2931
azSubscriptionId=""
3032

3133
function test_azd_installed() {
@@ -50,10 +52,12 @@ function get_values_from_azd_env() {
5052
blobContainerForRetailCustomer=$(azd env get-value AZURE_STORAGE_CONTAINER_NAME_RETAIL_CUSTOMER)
5153
blobContainerForRetailOrder=$(azd env get-value AZURE_STORAGE_CONTAINER_NAME_RETAIL_ORDER)
5254
blobContainerForRFP=$(azd env get-value AZURE_STORAGE_CONTAINER_NAME_RFP)
55+
blobContainerForLegalContract=$(azd env get-value AZURE_STORAGE_CONTAINER_NAME_LEGAL_CONTRACT)
5356
aiSearch=$(azd env get-value AZURE_AI_SEARCH_NAME)
5457
aiSearchIndexForRetailCustomer=$(azd env get-value AZURE_AI_SEARCH_INDEX_NAME_RETAIL_CUSTOMER)
5558
aiSearchIndexForRetailOrder=$(azd env get-value AZURE_AI_SEARCH_INDEX_NAME_RETAIL_ORDER)
5659
aiSearchIndexForRFP=$(azd env get-value AZURE_AI_SEARCH_INDEX_NAME_RFP)
60+
aiSearchIndexForLegalContract=$(azd env get-value AZURE_AI_SEARCH_INDEX_NAME_LEGAL_CONTRACT)
5761
ResourceGroup=$(azd env get-value AZURE_RESOURCE_GROUP)
5862

5963
# Validate that we got all required values
@@ -90,9 +94,11 @@ function get_values_from_az_deployment() {
9094
blobContainerForRetailCustomer=$(echo "$deploymentOutputs" | jq -r '.azurE_STORAGE_CONTAINER_NAME_RETAIL_CUSTOMER.value')
9195
blobContainerForRetailOrder=$(echo "$deploymentOutputs" | jq -r '.azurE_STORAGE_CONTAINER_NAME_RETAIL_ORDER.value')
9296
blobContainerForRFP=$(echo "$deploymentOutputs" | jq -r '.azurE_STORAGE_CONTAINER_NAME_RFP.value')
97+
blobContainerForLegalContract=$(echo "$deploymentOutputs" | jq -r '.azurE_STORAGE_CONTAINER_NAME_LEGAL_CONTRACT.value')
9398
aiSearchIndexForRetailCustomer=$(echo "$deploymentOutputs" | jq -r '.azurE_AI_SEARCH_INDEX_NAME_RETAIL_CUSTOMER.value')
9499
aiSearchIndexForRetailOrder=$(echo "$deploymentOutputs" | jq -r '.azurE_AI_SEARCH_INDEX_NAME_RETAIL_ORDER.value')
95100
aiSearchIndexForRFP=$(echo "$deploymentOutputs" | jq -r '.azurE_AI_SEARCH_INDEX_NAME_RFP.value')
101+
aiSearchIndexForLegalContract=$(echo "$deploymentOutputs" | jq -r '.azurE_AI_SEARCH_INDEX_NAME_LEGAL_CONTRACT.value')
96102
aiSearch=$(echo "$deploymentOutputs" | jq -r '.azurE_AI_SEARCH_NAME.value')
97103
backendUrl=$(echo "$deploymentOutputs" | jq -r '.backenD_URL.value')
98104

@@ -206,7 +212,8 @@ echo "1. RFP Evaluation"
206212
echo "2. Retail Customer Satisfaction"
207213
echo "3. HR Employee Onboarding"
208214
echo "4. Marketing Press Release"
209-
echo "5. All"
215+
echo "5. Legal Contract Review"
216+
echo "6. All"
210217
echo "==============================================="
211218
echo ""
212219

@@ -216,7 +223,7 @@ while [[ "$useCaseValid" != true ]]; do
216223
read -p "Please enter the number of the use case you would like to install: " useCaseSelection
217224

218225
# Handle both numeric and text input for 'all'
219-
if [[ "$useCaseSelection" == "all" || "$useCaseSelection" == "5" ]]; then
226+
if [[ "$useCaseSelection" == "all" || "$useCaseSelection" == "6" ]]; then
220227
selectedUseCase="All"
221228
useCaseValid=true
222229
echo "Selected: All use cases will be installed."
@@ -240,9 +247,14 @@ while [[ "$useCaseValid" != true ]]; do
240247
useCaseValid=true
241248
echo "Selected: Marketing Press Release"
242249
echo "Note: If you choose to install a single use case, installation of other use cases will require re-running this script."
250+
elif [[ "$useCaseSelection" == "5" ]]; then
251+
selectedUseCase="Legal Contract Review"
252+
useCaseValid=true
253+
echo "Selected: Legal Contract Review"
254+
echo "Note: If you choose to install a single use case, installation of other use cases will require re-running this script."
243255
else
244256
useCaseValid=false
245-
echo -e "\033[31mInvalid selection. Please enter a number from 1-5.\033[0m"
257+
echo -e "\033[31mInvalid selection. Please enter a number from 1-6.\033[0m"
246258
fi
247259
done
248260

@@ -316,7 +328,7 @@ isSampleDataFailed=false
316328
failedTeamConfigs=0
317329

318330
# Use Case 3 - HR Employee Onboarding
319-
if [[ "$useCaseSelection" == "3" || "$useCaseSelection" == "all" || "$useCaseSelection" == "5" ]]; then
331+
if [[ "$useCaseSelection" == "3" || "$useCaseSelection" == "all" || "$useCaseSelection" == "6" ]]; then
320332
echo "Uploading Team Configuration for HR Employee Onboarding..."
321333
directoryPath="data/agent_teams"
322334
teamId="00000000-0000-0000-0000-000000000001"
@@ -331,7 +343,7 @@ if [[ "$useCaseSelection" == "3" || "$useCaseSelection" == "all" || "$useCaseSel
331343
fi
332344

333345
# Use Case 4 - Marketing Press Release
334-
if [[ "$useCaseSelection" == "4" || "$useCaseSelection" == "all" || "$useCaseSelection" == "5" ]]; then
346+
if [[ "$useCaseSelection" == "4" || "$useCaseSelection" == "all" || "$useCaseSelection" == "6" ]]; then
335347
echo "Uploading Team Configuration for Marketing Press Release..."
336348
directoryPath="data/agent_teams"
337349
teamId="00000000-0000-0000-0000-000000000002"
@@ -349,7 +361,7 @@ stIsPublicAccessDisabled=false
349361
srchIsPublicAccessDisabled=false
350362

351363
# Enable public access for resources
352-
if [[ "$useCaseSelection" == "1" || "$useCaseSelection" == "2" || "$useCaseSelection" == "all" || "$useCaseSelection" == "5" ]]; then
364+
if [[ "$useCaseSelection" == "1" || "$useCaseSelection" == "2" || "$useCaseSelection" == "5" || "$useCaseSelection" == "all" || "$useCaseSelection" == "6" ]]; then
353365
if [[ -n "$ResourceGroup" ]]; then
354366
stPublicAccess=$(az storage account show --name "$storageAccount" --resource-group "$ResourceGroup" --query "publicNetworkAccess" -o tsv)
355367
if [[ "$stPublicAccess" == "Disabled" ]]; then
@@ -380,7 +392,7 @@ if [[ "$useCaseSelection" == "1" || "$useCaseSelection" == "2" || "$useCaseSelec
380392
fi
381393

382394
# Use Case 1 - RFP Evaluation
383-
if [[ "$useCaseSelection" == "1" || "$useCaseSelection" == "all" || "$useCaseSelection" == "5" ]]; then
395+
if [[ "$useCaseSelection" == "1" || "$useCaseSelection" == "all" || "$useCaseSelection" == "6" ]]; then
384396
echo "Uploading Team Configuration for RFP Evaluation..."
385397
directoryPath="data/agent_teams"
386398
teamId="00000000-0000-0000-0000-000000000004"
@@ -413,8 +425,42 @@ if [[ "$useCaseSelection" == "1" || "$useCaseSelection" == "all" || "$useCaseSel
413425
fi
414426
fi
415427

428+
# Use Case 5 - Legal Contract Review
429+
if [[ "$useCaseSelection" == "5" || "$useCaseSelection" == "all" || "$useCaseSelection" == "6" ]]; then
430+
echo "Uploading Team Configuration for Legal Contract..."
431+
directoryPath="data/agent_teams"
432+
teamId="00000000-0000-0000-0000-000000000005"
433+
434+
if $pythonCmd infra/scripts/upload_team_config.py "$backendUrl" "$directoryPath" "$userPrincipalId" "$teamId"; then
435+
echo "Uploaded Team Configuration for Legal Contract..."
436+
else
437+
echo "Error: Team configuration for Legal Contract upload failed."
438+
((failedTeamConfigs++))
439+
isTeamConfigFailed=true
440+
fi
441+
442+
directoryPath="data/datasets/legal_contract"
443+
# Upload sample files to blob storage
444+
echo "Uploading sample files to blob storage for Legal Contract..."
445+
if ! az storage blob upload-batch --account-name "$storageAccount" --destination "$blobContainerForLegalContract" --source "$directoryPath" --auth-mode login --pattern "*" --overwrite --output none; then
446+
echo "Error: Failed to upload files to blob storage."
447+
isSampleDataFailed=true
448+
exit 1
449+
fi
450+
echo "Files uploaded successfully to blob storage."
451+
452+
# Run the Python script to index data
453+
echo "Running the python script to index data for Legal Contract"
454+
if $pythonCmd infra/scripts/index_datasets.py "$storageAccount" "$blobContainerForLegalContract" "$aiSearch" "$aiSearchIndexForLegalContract"; then
455+
echo "Python script to index data for Legal Contract successfully executed."
456+
else
457+
echo "Error: Indexing python script execution failed."
458+
isSampleDataFailed=true
459+
fi
460+
fi
461+
416462
# Use Case 2 - Retail Customer Satisfaction
417-
if [[ "$useCaseSelection" == "2" || "$useCaseSelection" == "all" || "$useCaseSelection" == "5" ]]; then
463+
if [[ "$useCaseSelection" == "2" || "$useCaseSelection" == "all" || "$useCaseSelection" == "6" ]]; then
418464
echo "Uploading Team Configuration for Retail Customer Satisfaction..."
419465
directoryPath="data/agent_teams"
420466
teamId="00000000-0000-0000-0000-000000000003"
@@ -486,6 +532,11 @@ if [[ "$isTeamConfigFailed" == true || "$isSampleDataFailed" == true ]]; then
486532
echo "One or more tasks failed. Please check the error messages above."
487533
exit 1
488534
else
489-
echo ""
490-
echo "Team configuration upload and sample data processing completed successfully."
535+
if [[ "$useCaseSelection" == "1" || "$useCaseSelection" == "2" || "$useCaseSelection" == "5" || "$useCaseSelection" == "all" || "$useCaseSelection" == "6" ]]; then
536+
echo ""
537+
echo "Team configuration upload and sample data processing completed successfully."
538+
else
539+
echo ""
540+
echo "Team configuration upload completed successfully."
541+
fi
491542
fi

0 commit comments

Comments
 (0)