Skip to content

Commit b6b3531

Browse files
committed
fix: add fallback question for asking missing environment variables
1 parent b1810e8 commit b6b3531

File tree

5 files changed

+209
-211
lines changed

5 files changed

+209
-211
lines changed

packages/fx-core/resource/package.nls.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -857,6 +857,7 @@
857857
"driver.file.createOrUpdateEnvironmentFile.OpenAIDeploymentName.validation": "Azure OpenAI deployment name cannot be empty.",
858858
"driver.file.createOrUpdateEnvironmentFile.OpenAIAssistantID.validation": "OpenAI assistant ID cannot be empty.",
859859
"driver.file.createOrUpdateEnvironmentFile.OpenAIEmbeddingDeploymentName.validation": "Azure OpenAI embedding deployment name cannot be empty.",
860+
"driver.file.createOrUpdateEnvironmentFile.genericEnvVar.validation": "Environment variable value cannot be empty.",
860861
"driver.file.createOrUpdateJsonFile.description": "Create or update JSON file.",
861862
"driver.file.createOrUpdateJsonFile.summary": "Json file has been successfully generated to %s.",
862863
"driver.file.progressBar.appsettings": "Generating json file...",

packages/fx-core/src/component/configManager/lifecycle.ts

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import {
2424
} from "./interface";
2525
import { MissingEnvironmentVariablesError } from "../../error";
2626
import { setErrorContext } from "../../common/globalVars";
27-
import { OpenAIEnvironmentVariables } from "../constants";
2827

2928
function resolveDriverDef(
3029
def: DriverDefinition,
@@ -102,24 +101,8 @@ export function resolveString(
102101
resolved.push(envVar);
103102
newVal = newVal.replace(matches[0], envVal);
104103
}
105-
} else if (
106-
envVar === OpenAIEnvironmentVariables.SECRET_AZURE_OPENAI_API_KEY ||
107-
envVar === OpenAIEnvironmentVariables.AZURE_OPENAI_ENDPOINT ||
108-
envVar === OpenAIEnvironmentVariables.AZURE_OPENAI_DEPLOYMENT_NAME ||
109-
envVar === OpenAIEnvironmentVariables.SECRET_OPENAI_API_KEY ||
110-
envVar === OpenAIEnvironmentVariables.AZURE_OPENAI_MODEL_DEPLOYMENT_NAME ||
111-
envVar === OpenAIEnvironmentVariables.OPENAI_ASSISTANT_ID ||
112-
envVar === OpenAIEnvironmentVariables.AZURE_OPENAI_ASSISTANT_ID ||
113-
envVar === OpenAIEnvironmentVariables.AZURE_OPENAI_EMBEDDING_DEPLOYMENT
114-
) {
115-
if (envVal) {
116-
resolved.push(envVar);
117-
newVal = newVal.replace(matches[0], envVal);
118-
}
119104
} else {
120-
if (!envVal) {
121-
unresolved.push(envVar);
122-
} else {
105+
if (envVal) {
123106
resolved.push(envVar);
124107
newVal = newVal.replace(matches[0], envVal);
125108
}

packages/fx-core/src/component/constants.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,4 +128,5 @@ export const OpenAIEnvironmentVariables = {
128128
OPENAI_ASSISTANT_ID: "OPENAI_ASSISTANT_ID",
129129
AZURE_OPENAI_ASSISTANT_ID: "AZURE_OPENAI_ASSISTANT_ID",
130130
AZURE_OPENAI_EMBEDDING_DEPLOYMENT: "AZURE_OPENAI_EMBEDDING_DEPLOYMENT",
131+
AZURE_OPENAI_EMBEDDING_DEPLOYMENT_NAME: "AZURE_OPENAI_EMBEDDING_DEPLOYMENT_NAME",
131132
};

0 commit comments

Comments
 (0)