Skip to content

Commit 3631d11

Browse files
pamelafoxpamelafox
committed
Update model used in tests
1 parent 76b98cf commit 3631d11

File tree

76 files changed

+153
-155
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+153
-155
lines changed

‎docs/agentic_retrieval.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ See the agentic retrieval documentation.
1010

1111
### Prerequisites
1212

13-
* A deployment of any of the supported agentic retrieval models in the [supported regions](https://learn.microsoft.com/azure/ai-services/openai/concepts/models#standard-deployment-model-availability). If you're not sure, try to create a gpt-4o-mini deployment from your Azure OpenAI deployments page.
13+
* A deployment of any of the supported agentic retrieval models in the [supported regions](https://learn.microsoft.com/azure/ai-services/openai/concepts/models#standard-deployment-model-availability). If you're not sure, try to create a gpt-4o deployment from your Azure OpenAI deployments page.
1414

1515
### Deployment
1616

@@ -24,7 +24,7 @@ See the agentic retrieval documentation.
2424

2525
2. **(Optional) Set the agentic retrieval model**
2626

27-
You can configure which model agentic retrieval uses. By default, gpt-4o-mini is used.
27+
You can configure which model agentic retrieval uses. By default, gpt-4o is used.
2828

2929
For gpt-4o:
3030

‎docs/deploy_features.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ You should typically enable these features before running `azd up`. Once you've
2424

2525
## Using different chat completion models
2626

27-
As of late March 2025, the default chat completion model is `gpt-4o-mini`. If you deployed this sample before that date, the default model is `gpt-3.5-turbo`. You can change the chat completion model to any Azure OpenAI chat model that's available in your Azure OpenAI resource region by following these steps:
27+
As of early June 2025, the default chat completion model is `gpt-4.1-mini`. If you deployed this sample before that date, the default model is `gpt-3.5-turbo` or `gpt-4o-mini`. You can change the chat completion model to any Azure OpenAI chat model that's available in your Azure OpenAI resource region by following these steps:
2828

2929
1. To set the name of the deployment, run this command with a unique name in your Azure OpenAI account. You can use any deployment name, as long as it's unique in your Azure OpenAI account. For convenience, many developers use the same deployment name as the model name, but this is not required.
3030

@@ -74,7 +74,7 @@ As of late March 2025, the default chat completion model is `gpt-4o-mini`. If yo
7474

7575
For gpt-4.1-mini:
7676

77-
```
77+
```bash
7878
azd env set AZURE_OPENAI_CHATGPT_DEPLOYMENT_VERSION 2025-04-14
7979
```
8080

‎infra/core/host/container-apps.bicep

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,7 @@ module containerAppsEnvironment 'br/public:avm/res/app/managed-environment:0.8.0
6161

6262
module containerRegistry 'br/public:avm/res/container-registry/registry:0.5.1' = {
6363
name: '${name}-container-registry'
64-
scope: !empty(containerRegistryResourceGroupName)
65-
? resourceGroup(containerRegistryResourceGroupName)
66-
: resourceGroup()
64+
scope: resourceGroup(!empty(containerRegistryResourceGroupName) ? containerRegistryResourceGroupName : resourceGroup().name)
6765
params: {
6866
name: containerRegistryName
6967
location: location

‎tests/conftest.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def mock_openai_chatcompletion(monkeypatch):
126126
class AsyncChatCompletionIterator:
127127
def __init__(self, answer: str, reasoning: bool, usage: dict[str, Any]):
128128
chunk_id = "test-id"
129-
model = "gpt-4o-mini" if not reasoning else "o3-mini"
129+
model = "gpt-4.1-mini" if not reasoning else "o3-mini"
130130
self.responses = [
131131
{"object": "chat.completion.chunk", "choices": [], "id": chunk_id, "model": model, "created": 1},
132132
{
@@ -373,11 +373,11 @@ def mock_blob_container_client(monkeypatch):
373373
{
374374
"OPENAI_HOST": "azure",
375375
"AZURE_OPENAI_SERVICE": "test-openai-service",
376-
"AZURE_OPENAI_CHATGPT_MODEL": "gpt-4o-mini",
377-
"AZURE_OPENAI_CHATGPT_DEPLOYMENT": "gpt-4o-mini",
376+
"AZURE_OPENAI_CHATGPT_MODEL": "gpt-4.1-mini",
377+
"AZURE_OPENAI_CHATGPT_DEPLOYMENT": "gpt-4.1-mini",
378378
"AZURE_OPENAI_EMB_DEPLOYMENT": "test-ada",
379-
"AZURE_OPENAI_SEARCHAGENT_MODEL": "gpt-4o-mini",
380-
"AZURE_OPENAI_SEARCHAGENT_DEPLOYMENT": "gpt-4o-mini",
379+
"AZURE_OPENAI_SEARCHAGENT_MODEL": "gpt-4.1-mini",
380+
"AZURE_OPENAI_SEARCHAGENT_DEPLOYMENT": "gpt-4.1-mini",
381381
"USE_AGENTIC_RETRIEVAL": "true",
382382
}
383383
]
@@ -386,11 +386,11 @@ def mock_blob_container_client(monkeypatch):
386386
{
387387
"OPENAI_HOST": "azure",
388388
"AZURE_OPENAI_SERVICE": "test-openai-service",
389-
"AZURE_OPENAI_CHATGPT_MODEL": "gpt-4o-mini",
390-
"AZURE_OPENAI_CHATGPT_DEPLOYMENT": "gpt-4o-mini",
389+
"AZURE_OPENAI_CHATGPT_MODEL": "gpt-4.1-mini",
390+
"AZURE_OPENAI_CHATGPT_DEPLOYMENT": "gpt-4.1-mini",
391391
"AZURE_OPENAI_EMB_DEPLOYMENT": "test-ada",
392-
"AZURE_OPENAI_SEARCHAGENT_MODEL": "gpt-4o-mini",
393-
"AZURE_OPENAI_SEARCHAGENT_DEPLOYMENT": "gpt-4o-mini",
392+
"AZURE_OPENAI_SEARCHAGENT_MODEL": "gpt-4.1-mini",
393+
"AZURE_OPENAI_SEARCHAGENT_DEPLOYMENT": "gpt-4.1-mini",
394394
"USE_AGENTIC_RETRIEVAL": "true",
395395
"AZURE_USE_AUTHENTICATION": "true",
396396
"AZURE_SERVER_APP_ID": "SERVER_APP",
@@ -415,7 +415,7 @@ def mock_env(monkeypatch, request):
415415
monkeypatch.setenv("AZURE_SEARCH_SERVICE", "test-search-service")
416416
monkeypatch.setenv("AZURE_SPEECH_SERVICE_ID", "test-id")
417417
monkeypatch.setenv("AZURE_SPEECH_SERVICE_LOCATION", "eastus")
418-
monkeypatch.setenv("AZURE_OPENAI_CHATGPT_MODEL", "gpt-4o-mini")
418+
monkeypatch.setenv("AZURE_OPENAI_CHATGPT_MODEL", "gpt-4.1-mini")
419419
monkeypatch.setenv("ALLOWED_ORIGIN", "https://frontend.com")
420420
for key, value in request.param.items():
421421
monkeypatch.setenv(key, value)
@@ -618,7 +618,7 @@ async def auth_client(
618618
monkeypatch.setenv("AZURE_STORAGE_CONTAINER", "test-storage-container")
619619
monkeypatch.setenv("AZURE_SEARCH_INDEX", "test-search-index")
620620
monkeypatch.setenv("AZURE_SEARCH_SERVICE", "test-search-service")
621-
monkeypatch.setenv("AZURE_OPENAI_CHATGPT_MODEL", "gpt-4o-mini")
621+
monkeypatch.setenv("AZURE_OPENAI_CHATGPT_MODEL", "gpt-4.1-mini")
622622
monkeypatch.setenv("USE_USER_UPLOAD", "true")
623623
monkeypatch.setenv("AZURE_USERSTORAGE_ACCOUNT", "test-userstorage-account")
624624
monkeypatch.setenv("AZURE_USERSTORAGE_CONTAINER", "test-userstorage-container")
@@ -657,7 +657,7 @@ async def auth_public_documents_client(
657657
monkeypatch.setenv("AZURE_STORAGE_CONTAINER", "test-storage-container")
658658
monkeypatch.setenv("AZURE_SEARCH_INDEX", "test-search-index")
659659
monkeypatch.setenv("AZURE_SEARCH_SERVICE", "test-search-service")
660-
monkeypatch.setenv("AZURE_OPENAI_CHATGPT_MODEL", "gpt-4o-mini")
660+
monkeypatch.setenv("AZURE_OPENAI_CHATGPT_MODEL", "gpt-4.1-mini")
661661
monkeypatch.setenv("USE_USER_UPLOAD", "true")
662662
monkeypatch.setenv("AZURE_USERSTORAGE_ACCOUNT", "test-userstorage-account")
663663
monkeypatch.setenv("AZURE_USERSTORAGE_CONTAINER", "test-userstorage-container")

‎tests/e2e.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def run_server(port: int):
5656
"AZURE_SPEECH_SERVICE_ID": "test-id",
5757
"AZURE_SPEECH_SERVICE_LOCATION": "eastus",
5858
"AZURE_OPENAI_SERVICE": "test-openai-service",
59-
"AZURE_OPENAI_CHATGPT_MODEL": "gpt-4o-mini",
59+
"AZURE_OPENAI_CHATGPT_MODEL": "gpt-4.1-mini",
6060
"AZURE_OPENAI_EMB_MODEL_NAME": "text-embedding-3-large",
6161
"AZURE_OPENAI_EMB_DIMENSIONS": "3072",
6262
},

‎tests/snapshots/test_app/test_ask_prompt_template/client0/result.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
}
6767
],
6868
"props": {
69-
"model": "gpt-4o-mini",
69+
"model": "gpt-4.1-mini",
7070
"token_usage": {
7171
"completion_tokens": 896,
7272
"prompt_tokens": 23,

‎tests/snapshots/test_app/test_ask_prompt_template/client1/result.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
],
6868
"props": {
6969
"deployment": "test-chatgpt",
70-
"model": "gpt-4o-mini",
70+
"model": "gpt-4.1-mini",
7171
"token_usage": {
7272
"completion_tokens": 896,
7373
"prompt_tokens": 23,

‎tests/snapshots/test_app/test_ask_prompt_template_concat/client0/result.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
}
6767
],
6868
"props": {
69-
"model": "gpt-4o-mini",
69+
"model": "gpt-4.1-mini",
7070
"token_usage": {
7171
"completion_tokens": 896,
7272
"prompt_tokens": 23,

‎tests/snapshots/test_app/test_ask_prompt_template_concat/client1/result.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
],
6868
"props": {
6969
"deployment": "test-chatgpt",
70-
"model": "gpt-4o-mini",
70+
"model": "gpt-4.1-mini",
7171
"token_usage": {
7272
"completion_tokens": 896,
7373
"prompt_tokens": 23,

‎tests/snapshots/test_app/test_ask_rtr_hybrid/client0/result.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
}
6767
],
6868
"props": {
69-
"model": "gpt-4o-mini",
69+
"model": "gpt-4.1-mini",
7070
"token_usage": {
7171
"completion_tokens": 896,
7272
"prompt_tokens": 23,

‎tests/snapshots/test_app/test_ask_rtr_hybrid/client1/result.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
],
6868
"props": {
6969
"deployment": "test-chatgpt",
70-
"model": "gpt-4o-mini",
70+
"model": "gpt-4.1-mini",
7171
"token_usage": {
7272
"completion_tokens": 896,
7373
"prompt_tokens": 23,

‎tests/snapshots/test_app/test_ask_rtr_text/client0/result.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
}
6767
],
6868
"props": {
69-
"model": "gpt-4o-mini",
69+
"model": "gpt-4.1-mini",
7070
"token_usage": {
7171
"completion_tokens": 896,
7272
"prompt_tokens": 23,

‎tests/snapshots/test_app/test_ask_rtr_text/client1/result.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
],
6868
"props": {
6969
"deployment": "test-chatgpt",
70-
"model": "gpt-4o-mini",
70+
"model": "gpt-4.1-mini",
7171
"token_usage": {
7272
"completion_tokens": 896,
7373
"prompt_tokens": 23,

‎tests/snapshots/test_app/test_ask_rtr_text_agent/agent_client0/result.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
}
4141
],
4242
"props": {
43-
"deployment": "gpt-4o-mini",
44-
"model": "gpt-4o-mini",
43+
"deployment": "gpt-4.1-mini",
44+
"model": "gpt-4.1-mini",
4545
"query_plan": [
4646
{
4747
"elapsed_ms": 200,
@@ -84,8 +84,8 @@
8484
}
8585
],
8686
"props": {
87-
"deployment": "gpt-4o-mini",
88-
"model": "gpt-4o-mini",
87+
"deployment": "gpt-4.1-mini",
88+
"model": "gpt-4.1-mini",
8989
"token_usage": {
9090
"completion_tokens": 896,
9191
"prompt_tokens": 23,

‎tests/snapshots/test_app/test_ask_rtr_text_agent_filter/agent_auth_client0/result.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
}
4141
],
4242
"props": {
43-
"deployment": "gpt-4o-mini",
44-
"model": "gpt-4o-mini",
43+
"deployment": "gpt-4.1-mini",
44+
"model": "gpt-4.1-mini",
4545
"query_plan": [
4646
{
4747
"elapsed_ms": 200,
@@ -84,8 +84,8 @@
8484
}
8585
],
8686
"props": {
87-
"deployment": "gpt-4o-mini",
88-
"model": "gpt-4o-mini",
87+
"deployment": "gpt-4.1-mini",
88+
"model": "gpt-4.1-mini",
8989
"token_usage": {
9090
"completion_tokens": 896,
9191
"prompt_tokens": 23,

‎tests/snapshots/test_app/test_ask_rtr_text_filter/auth_client0/result.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
],
6868
"props": {
6969
"deployment": "test-chatgpt",
70-
"model": "gpt-4o-mini",
70+
"model": "gpt-4.1-mini",
7171
"token_usage": {
7272
"completion_tokens": 896,
7373
"prompt_tokens": 23,

‎tests/snapshots/test_app/test_ask_rtr_text_filter_public_documents/auth_public_documents_client0/result.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
],
6868
"props": {
6969
"deployment": "test-chatgpt",
70-
"model": "gpt-4o-mini",
70+
"model": "gpt-4.1-mini",
7171
"token_usage": {
7272
"completion_tokens": 896,
7373
"prompt_tokens": 23,

‎tests/snapshots/test_app/test_ask_rtr_text_semanticcaptions/client0/result.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
}
6767
],
6868
"props": {
69-
"model": "gpt-4o-mini",
69+
"model": "gpt-4.1-mini",
7070
"token_usage": {
7171
"completion_tokens": 896,
7272
"prompt_tokens": 23,

‎tests/snapshots/test_app/test_ask_rtr_text_semanticcaptions/client1/result.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
],
6868
"props": {
6969
"deployment": "test-chatgpt",
70-
"model": "gpt-4o-mini",
70+
"model": "gpt-4.1-mini",
7171
"token_usage": {
7272
"completion_tokens": 896,
7373
"prompt_tokens": 23,

‎tests/snapshots/test_app/test_ask_rtr_text_semanticranker/client0/result.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
}
6767
],
6868
"props": {
69-
"model": "gpt-4o-mini",
69+
"model": "gpt-4.1-mini",
7070
"token_usage": {
7171
"completion_tokens": 896,
7272
"prompt_tokens": 23,

‎tests/snapshots/test_app/test_ask_rtr_text_semanticranker/client1/result.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
],
6868
"props": {
6969
"deployment": "test-chatgpt",
70-
"model": "gpt-4o-mini",
70+
"model": "gpt-4.1-mini",
7171
"token_usage": {
7272
"completion_tokens": 896,
7373
"prompt_tokens": 23,

‎tests/snapshots/test_app/test_ask_vision/client0/result.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
}
6767
],
6868
"props": {
69-
"model": "gpt-4o-mini",
69+
"model": "gpt-4.1-mini",
7070
"token_usage": {
7171
"completion_tokens": 896,
7272
"prompt_tokens": 23,

‎tests/snapshots/test_app/test_chat_followup/client0/result.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
}
3939
],
4040
"props": {
41-
"model": "gpt-4o-mini",
41+
"model": "gpt-4.1-mini",
4242
"token_usage": {
4343
"completion_tokens": 896,
4444
"prompt_tokens": 23,
@@ -98,7 +98,7 @@
9898
}
9999
],
100100
"props": {
101-
"model": "gpt-4o-mini",
101+
"model": "gpt-4.1-mini",
102102
"token_usage": {
103103
"completion_tokens": 896,
104104
"prompt_tokens": 23,

‎tests/snapshots/test_app/test_chat_followup/client1/result.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
],
4040
"props": {
4141
"deployment": "test-chatgpt",
42-
"model": "gpt-4o-mini",
42+
"model": "gpt-4.1-mini",
4343
"token_usage": {
4444
"completion_tokens": 896,
4545
"prompt_tokens": 23,
@@ -100,7 +100,7 @@
100100
],
101101
"props": {
102102
"deployment": "test-chatgpt",
103-
"model": "gpt-4o-mini",
103+
"model": "gpt-4.1-mini",
104104
"token_usage": {
105105
"completion_tokens": 896,
106106
"prompt_tokens": 23,

‎tests/snapshots/test_app/test_chat_hybrid/client0/result.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
}
3737
],
3838
"props": {
39-
"model": "gpt-4o-mini",
39+
"model": "gpt-4.1-mini",
4040
"token_usage": {
4141
"completion_tokens": 896,
4242
"prompt_tokens": 23,
@@ -96,7 +96,7 @@
9696
}
9797
],
9898
"props": {
99-
"model": "gpt-4o-mini",
99+
"model": "gpt-4.1-mini",
100100
"token_usage": {
101101
"completion_tokens": 896,
102102
"prompt_tokens": 23,

‎tests/snapshots/test_app/test_chat_hybrid/client1/result.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
],
3838
"props": {
3939
"deployment": "test-chatgpt",
40-
"model": "gpt-4o-mini",
40+
"model": "gpt-4.1-mini",
4141
"token_usage": {
4242
"completion_tokens": 896,
4343
"prompt_tokens": 23,
@@ -98,7 +98,7 @@
9898
],
9999
"props": {
100100
"deployment": "test-chatgpt",
101-
"model": "gpt-4o-mini",
101+
"model": "gpt-4.1-mini",
102102
"token_usage": {
103103
"completion_tokens": 896,
104104
"prompt_tokens": 23,

‎tests/snapshots/test_app/test_chat_hybrid_semantic_captions/client0/result.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
}
3737
],
3838
"props": {
39-
"model": "gpt-4o-mini",
39+
"model": "gpt-4.1-mini",
4040
"token_usage": {
4141
"completion_tokens": 896,
4242
"prompt_tokens": 23,
@@ -96,7 +96,7 @@
9696
}
9797
],
9898
"props": {
99-
"model": "gpt-4o-mini",
99+
"model": "gpt-4.1-mini",
100100
"token_usage": {
101101
"completion_tokens": 896,
102102
"prompt_tokens": 23,

0 commit comments

Comments
 (0)