Skip to content

Commit 87f2b9d

Browse files
authored
Refactoring of prepdocs for easier integration with user upload feature (#1407)
* Changes to prepare for upload * All pass except multilang * Made mypy happy * Fix the arguments * Unit tests for code changes * 3.9 compatibility * Remove unused args from prepdocs * Address feedback * Ignore typing error after reporting to SDK team
1 parent 334047d commit 87f2b9d

20 files changed

+529
-387
lines changed

scripts/prepdocs.ps1

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,11 @@ if ($env:AZURE_SEARCH_ANALYZER_NAME) {
3030
if ($env:AZURE_VISION_ENDPOINT) {
3131
$visionEndpointArg = "--visionendpoint $env:AZURE_VISION_ENDPOINT"
3232
}
33-
if ($env:AZURE_VISION_KEY) {
34-
$visionKeyArg = "--visionkey $env:AZURE_VISION_KEY"
35-
}
3633

37-
# If vision keys are stored in keyvault provide the keyvault name and secret name
34+
# If any keys are stored in keyvault provide the keyvault name and secret name
3835
if ($env:AZURE_KEY_VAULT_NAME) {
3936
$keyVaultName = "--keyvaultname $env:AZURE_KEY_VAULT_NAME"
4037
}
41-
if ($env:VISION_SECRET_NAME) {
42-
$visionSecretNameArg = "--visionsecretname $env:VISION_SECRET_NAME"
43-
}
4438
if ($env:AZURE_SEARCH_SECRET_NAME) {
4539
$searchSecretNameArg = "--searchsecretname $env:AZURE_SEARCH_SECRET_NAME"
4640
}
@@ -81,7 +75,7 @@ $argumentList = "./scripts/prepdocs.py $dataArg --verbose " + `
8175
"--openaiservice `"$env:AZURE_OPENAI_SERVICE`" --openaideployment `"$env:AZURE_OPENAI_EMB_DEPLOYMENT`" " + `
8276
"--openaikey `"$env:OPENAI_API_KEY`" --openaiorg `"$env:OPENAI_ORGANIZATION`" " + `
8377
"--documentintelligenceservice $env:AZURE_DOCUMENTINTELLIGENCE_SERVICE " + `
84-
"$searchImagesArg $visionEndpointArg $visionKeyArg $visionSecretNameArg " + `
78+
"$searchImagesArg $visionEndpointArg " + `
8579
"$adlsGen2StorageAccountArg $adlsGen2FilesystemArg $adlsGen2FilesystemPathArg " + `
8680
"$tenantArg $aclArg " + `
8781
"$disableVectorsArg $localPdfParserArg $localHtmlParserArg " + `

0 commit comments

Comments
 (0)