diff --git a/.env.template b/.env.template index 22bf8d74..53fe42ab 100644 --- a/.env.template +++ b/.env.template @@ -25,16 +25,7 @@ TEMPERATURE=1 USE_AZURE=False ### AZURE -# OPENAI_AZURE_API_BASE - OpenAI API base URL for Azure (Example: https://my-azure-openai-url.com) -# OPENAI_AZURE_API_VERSION - OpenAI API version for Azure (Example: v1) -# OPENAI_AZURE_DEPLOYMENT_ID - OpenAI deployment ID for Azure (Example: my-deployment-id) -# OPENAI_AZURE_CHAT_DEPLOYMENT_ID - OpenAI deployment ID for Azure Chat (Example: my-deployment-id-for-azure-chat) -# OPENAI_AZURE_EMBEDDINGS_DEPLOYMENT_ID - OpenAI deployment ID for Embedding (Example: my-deployment-id-for-azure-embeddigs) -OPENAI_AZURE_API_BASE=your-base-url-for-azure -OPENAI_AZURE_API_VERSION=api-version-for-azure -OPENAI_AZURE_DEPLOYMENT_ID=deployment-id-for-azure -OPENAI_AZURE_CHAT_DEPLOYMENT_ID=deployment-id-for-azure-chat -OPENAI_AZURE_EMBEDDINGS_DEPLOYMENT_ID=deployment-id-for-azure-embeddigs +# cleanup azure env as already moved to `azure.yaml.template` ################################################################################ ### LLM MODELS diff --git a/autogpt/config/config.py b/autogpt/config/config.py index 46764b9c..a51f4d20 100644 --- a/autogpt/config/config.py +++ b/autogpt/config/config.py @@ -127,15 +127,9 @@ class Config(metaclass=Singleton): config_params = yaml.load(file, Loader=yaml.FullLoader) except FileNotFoundError: config_params = {} - self.openai_api_type = os.getenv( - "OPENAI_API_TYPE", config_params.get("azure_api_type", "azure") - ) - self.openai_api_base = os.getenv( - "OPENAI_AZURE_API_BASE", config_params.get("azure_api_base", "") - ) - self.openai_api_version = os.getenv( - "OPENAI_AZURE_API_VERSION", config_params.get("azure_api_version", "") - ) + self.openai_api_type = config_params.get("azure_api_type") or "azure" + self.openai_api_base = config_params.get("azure_api_base") or "" + self.openai_api_version = config_params.get("azure_api_version") or "2023-03-15-preview" self.azure_model_to_deployment_id_map = config_params.get("azure_model_map", []) def set_continuous_mode(self, value: bool) -> None: