Fixing support for AzureOpenAI

autogpts/autogpt/autogpt/core/resource/model_providers/openai.py

@@ -330,7 +330,11 @@ def __init__(
 
             # API key and org (if configured) are passed, the rest of the required
             # credentials is loaded from the environment by the AzureOpenAI client.
-            self._client = AsyncAzureOpenAI(**self._credentials.get_api_access_kwargs())
+            args = self._credentials.get_api_access_kwargs()
+            for key in args:
+                if isinstance(args[key], SecretStr):
+                    args[key] = args[key].get_secret_value()
+            self._client = AsyncAzureOpenAI(**args)
         else:
             from openai import AsyncOpenAI
 

autogpts/autogpt/autogpt/llm/api_manager.py

@@ -3,8 +3,9 @@
 import logging
 from typing import List, Optional
 
-from openai import OpenAI
+from openai import OpenAI, AzureOpenAI
 from openai.types import Model
+from pydantic import SecretStr
 
 from autogpt.core.resource.model_providers.openai import (
     OPEN_AI_MODELS,
@@ -107,9 +108,18 @@ def get_models(self, openai_credentials: OpenAICredentials) -> List[Model]:
             list[Model]: List of available GPT models.
         """
         if self.models is None:
-            all_models = (
-                OpenAI(**openai_credentials.get_api_access_kwargs()).models.list().data
-            )
+            if openai_credentials.api_type == "azure":
+                args = openai_credentials.get_api_access_kwargs()
+                for key in args:
+                    if isinstance(args[key], SecretStr):
+                        args[key] = args[key].get_secret_value()
+                all_models = (
+                    AzureOpenAI(**args).models.list().data
+                )
+            else:
+                all_models = (
+                    OpenAI(**openai_credentials.get_api_access_kwargs()).models.list().data
+                )
             self.models = [model for model in all_models if "gpt" in model.id]
 
         return self.models