fix: Retain compatibility with existing deployments by using previous…

… environment variables if new ones are unavailable (#1356)

Co-authored-by: Pavan Kumar <v-kupavan.microsoft.com>

code/backend/batch/utilities/helpers/env_helper.py

@@ -93,18 +93,22 @@ def __load_config(self, **kwargs) -> None:
 
         self.AZURE_AUTH_TYPE = os.getenv("AZURE_AUTH_TYPE", "keys")
         # Azure OpenAI
-        # Default model info
-        default_azure_openai_model_info = '{"model":"gpt-35-turbo-16k","modelName":"gpt-35-turbo-16k","modelVersion":"0613"}'
-        default_azure_openai_embedding_model_info = '{"model":"text-embedding-ada-002","modelName":"text-embedding-ada-002","modelVersion":"2"}'
-
         self.AZURE_OPENAI_RESOURCE = os.getenv("AZURE_OPENAI_RESOURCE", "")
+        # Fetch AZURE_OPENAI_MODEL_INFO from environment
+        azure_openai_model_info = self.get_info_from_env("AZURE_OPENAI_MODEL_INFO", "")
 
-        # Fetch and assign model info
-        azure_openai_model_info = self.get_info_from_env(
-            "AZURE_OPENAI_MODEL_INFO", default_azure_openai_model_info
-        )
-        self.AZURE_OPENAI_MODEL = azure_openai_model_info.get("model")
-        self.AZURE_OPENAI_MODEL_NAME = azure_openai_model_info.get("modelName")
+        if azure_openai_model_info:
+            # If AZURE_OPENAI_MODEL_INFO exists
+            self.AZURE_OPENAI_MODEL = azure_openai_model_info.get("model", "")
+            self.AZURE_OPENAI_MODEL_NAME = azure_openai_model_info.get("modelName", "")
+        else:
+            # Otherwise, fallback to individual environment variables
+            self.AZURE_OPENAI_MODEL = os.getenv(
+                "AZURE_OPENAI_MODEL", "gpt-35-turbo-16k"
+            )
+            self.AZURE_OPENAI_MODEL_NAME = os.getenv(
+                "AZURE_OPENAI_MODEL_NAME", "gpt-35-turbo-16k"
+            )
 
         self.AZURE_OPENAI_VISION_MODEL = os.getenv("AZURE_OPENAI_VISION_MODEL", "gpt-4")
         self.AZURE_OPENAI_TEMPERATURE = os.getenv("AZURE_OPENAI_TEMPERATURE", "0")
@@ -120,14 +124,20 @@ def __load_config(self, **kwargs) -> None:
         )
         self.AZURE_OPENAI_STREAM = os.getenv("AZURE_OPENAI_STREAM", "true")
 
-        # Fetch and assign embedding model info
+        # Fetch AZURE_OPENAI_EMBEDDING_MODEL_INFO from environment
         azure_openai_embedding_model_info = self.get_info_from_env(
-            "AZURE_OPENAI_EMBEDDING_MODEL_INFO",
-            default_azure_openai_embedding_model_info,
-        )
-        self.AZURE_OPENAI_EMBEDDING_MODEL = azure_openai_embedding_model_info.get(
-            "model"
+            "AZURE_OPENAI_EMBEDDING_MODEL_INFO", ""
         )
+        if azure_openai_embedding_model_info:
+            # If AZURE_OPENAI_EMBEDDING_MODEL_INFO exists
+            self.AZURE_OPENAI_EMBEDDING_MODEL = azure_openai_embedding_model_info.get(
+                "model", ""
+            )
+        else:
+            # Otherwise, fallback to individual environment variable
+            self.AZURE_OPENAI_EMBEDDING_MODEL = os.getenv(
+                "AZURE_OPENAI_EMBEDDING_MODEL", "text-embedding-ada-002"
+            )
 
         self.SHOULD_STREAM = (
             True if self.AZURE_OPENAI_STREAM.lower() == "true" else False