|
25 | 25 | ENV_OPENAI_TEST_MODE = "OPENAI_TEST_MODE"
|
26 | 26 |
|
27 | 27 | # for pytest.parametrize
|
28 |
| -ALL = ["azure", "azuread", "openai"] |
29 | 28 | AZURE = "azure"
|
30 | 29 | OPENAI = "openai"
|
31 | 30 | AZURE_AD = "azuread"
|
| 31 | +ALL = [AZURE, AZURE_AD, OPENAI] |
32 | 32 | WHISPER_AZURE = "whisper_azure"
|
33 | 33 | WHISPER_AZURE_AD = "whisper_azuread"
|
34 |
| -WHISPER_ALL = ["whisper_azure", "whisper_azuread", "openai"] |
| 34 | +WHISPER_ALL = [WHISPER_AZURE, WHISPER_AZURE_AD, OPENAI] |
| 35 | +TTS_OPENAI = "tts_openai" |
| 36 | +TTS_AZURE = "tts_azure" |
| 37 | +TTS_AZURE_AD = "tts_azuread" |
| 38 | +TTS_ALL = [TTS_AZURE, TTS_AZURE_AD, TTS_OPENAI] |
35 | 39 | DALLE_AZURE = "dalle_azure"
|
36 | 40 | DALLE_AZURE_AD = "dalle_azuread"
|
37 |
| -DALLE_ALL = ["dalle_azure", "dalle_azuread", "openai"] |
| 41 | +DALLE_ALL = [DALLE_AZURE, DALLE_AZURE_AD, OPENAI] |
38 | 42 | GPT_4_AZURE = "gpt_4_azure"
|
39 | 43 | GPT_4_AZURE_AD = "gpt_4_azuread"
|
40 | 44 | GPT_4_OPENAI = "gpt_4_openai"
|
41 |
| -GPT_4_ALL = ["gpt_4_azure", "gpt_4_azuread", "gpt_4_openai"] |
| 45 | +GPT_4_ALL = [GPT_4_AZURE, GPT_4_AZURE_AD, GPT_4_OPENAI] |
42 | 46 | ASST_AZURE = "asst_azure"
|
43 | 47 | ASST_AZUREAD = "asst_azuread"
|
44 |
| -ASST_ALL = ["asst_azure", "asst_azuread", "gpt_4_openai"] |
| 48 | +ASST_ALL = [ASST_AZURE, ASST_AZUREAD, GPT_4_OPENAI] |
45 | 49 |
|
46 | 50 | # Environment variable keys
|
47 | 51 | ENV_AZURE_OPENAI_ENDPOINT = "AZ_OPENAI_ENDPOINT"
|
|
65 | 69 | ENV_AZURE_OPENAI_AUDIO_NAME = "whisper"
|
66 | 70 | ENV_AZURE_OPENAI_DALLE_NAME = "dall-e-3"
|
67 | 71 | ENV_AZURE_OPENAI_CHAT_COMPLETIONS_GPT4_NAME = "gpt-4-1106-preview"
|
| 72 | +ENV_AZURE_OPENAI_TTS_NAME = "tts" |
68 | 73 |
|
69 | 74 | ENV_OPENAI_KEY = "OPENAI_KEY"
|
70 | 75 | ENV_OPENAI_COMPLETIONS_MODEL = "gpt-3.5-turbo-instruct"
|
|
73 | 78 | ENV_OPENAI_AUDIO_MODEL = "whisper-1"
|
74 | 79 | ENV_OPENAI_DALLE_MODEL = "dall-e-3"
|
75 | 80 | ENV_OPENAI_CHAT_COMPLETIONS_GPT4_MODEL = "gpt-4-1106-preview"
|
| 81 | +ENV_OPENAI_TTS_MODEL = "tts-1" |
76 | 82 |
|
77 | 83 | # Fake values
|
78 | 84 | TEST_ENDPOINT = "https://test-resource.openai.azure.com/"
|
@@ -140,17 +146,17 @@ def client(api_type):
|
140 | 146 | azure_ad_token_provider=get_bearer_token_provider(DefaultAzureCredential(), "https://cognitiveservices.azure.com/.default"),
|
141 | 147 | api_version=ENV_AZURE_OPENAI_API_VERSION,
|
142 | 148 | )
|
143 |
| - elif api_type == "openai" or api_type == "gpt_4_openai": |
| 149 | + elif api_type in ["openai", "gpt_4_openai", "tts_openai"]: |
144 | 150 | client = openai.OpenAI(
|
145 | 151 | api_key=os.getenv(ENV_OPENAI_KEY)
|
146 | 152 | )
|
147 |
| - elif api_type == "whisper_azure": |
| 153 | + elif api_type in ["whisper_azure", "tts_azure"]: |
148 | 154 | client = openai.AzureOpenAI(
|
149 | 155 | azure_endpoint=os.getenv(ENV_AZURE_OPENAI_NORTHCENTRALUS_ENDPOINT),
|
150 | 156 | api_key=os.getenv(ENV_AZURE_OPENAI_NORTHCENTRALUS_KEY),
|
151 | 157 | api_version=ENV_AZURE_OPENAI_API_VERSION,
|
152 | 158 | )
|
153 |
| - elif api_type == "whisper_azuread": |
| 159 | + elif api_type in ["whisper_azuread", "tts_azuread"]: |
154 | 160 | client = openai.AzureOpenAI(
|
155 | 161 | azure_endpoint=os.getenv(ENV_AZURE_OPENAI_NORTHCENTRALUS_ENDPOINT),
|
156 | 162 | azure_ad_token_provider=get_bearer_token_provider(DefaultAzureCredential(), "https://cognitiveservices.azure.com/.default"),
|
@@ -187,17 +193,17 @@ def client_async(api_type):
|
187 | 193 | azure_ad_token_provider=get_bearer_token_provider_async(AsyncDefaultAzureCredential(), "https://cognitiveservices.azure.com/.default"),
|
188 | 194 | api_version=ENV_AZURE_OPENAI_API_VERSION,
|
189 | 195 | )
|
190 |
| - elif api_type == "openai" or api_type == "gpt_4_openai": |
| 196 | + elif api_type in ["openai", "gpt_4_openai", "tts_openai"]: |
191 | 197 | client = openai.AsyncOpenAI(
|
192 | 198 | api_key=os.getenv(ENV_OPENAI_KEY)
|
193 | 199 | )
|
194 |
| - elif api_type == "whisper_azure": |
| 200 | + elif api_type in ["whisper_azure", "tts_azure"]: |
195 | 201 | client = openai.AsyncAzureOpenAI(
|
196 | 202 | azure_endpoint=os.getenv(ENV_AZURE_OPENAI_NORTHCENTRALUS_ENDPOINT),
|
197 | 203 | api_key=os.getenv(ENV_AZURE_OPENAI_NORTHCENTRALUS_KEY),
|
198 | 204 | api_version=ENV_AZURE_OPENAI_API_VERSION,
|
199 | 205 | )
|
200 |
| - elif api_type == "whisper_azuread": |
| 206 | + elif api_type in ["whisper_azuread", "tts_azuread"]: |
201 | 207 | client = openai.AsyncAzureOpenAI(
|
202 | 208 | azure_endpoint=os.getenv(ENV_AZURE_OPENAI_NORTHCENTRALUS_ENDPOINT),
|
203 | 209 | azure_ad_token_provider=get_bearer_token_provider_async(AsyncDefaultAzureCredential(), "https://cognitiveservices.azure.com/.default"),
|
@@ -225,6 +231,10 @@ def build_kwargs(args, api_type):
|
225 | 231 | return {"model": ENV_AZURE_OPENAI_AUDIO_NAME}
|
226 | 232 | elif api_type == "openai":
|
227 | 233 | return {"model": ENV_OPENAI_AUDIO_MODEL}
|
| 234 | + elif api_type == "tts_openai": |
| 235 | + return {"model": ENV_OPENAI_TTS_MODEL} |
| 236 | + elif api_type in ["tts_azure", "tts_azuread"]: |
| 237 | + return {"model": ENV_AZURE_OPENAI_TTS_NAME} |
228 | 238 | if test_feature.startswith("test_chat_completions") \
|
229 | 239 | or test_feature.startswith(("test_client", "test_models")):
|
230 | 240 | if api_type in ["azure", "azuread", "asst_azure"]:
|
|
0 commit comments