Skip to content

Commit ba7d51c

Browse files
TaojunshenTaojunshen
authored
Merge pull request #1869 from MicrosoftDocs/main
12/6/2024 AM Publish
2 parents cbb91f9 + c26514b commit ba7d51c

File tree

5 files changed

+66
-43
lines changed

5 files changed

+66
-43
lines changed

‎articles/ai-services/openai/includes/model-matrix/datazone-provisioned-managed.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@ ms.topic: include
88
ms.date: 12/05/2024
99
---
1010

11-
| **Region** | **gpt-4o**, **2024-05-13** | **gpt-4o**, **2024-08-06** | **gpt-4o-mini**, **2024-07-18** |
12-
|:-----------------|:--------------------------:|:--------------------------:|:-------------------------------:|
13-
| eastus2 | ✅ | ✅ | ✅ |
14-
| spaincentral | ✅ | ✅ | ✅ |
15-
| westeurope | ✅ | ✅ | ✅ |
16-
| westus3 | ✅ | ✅ | ✅ |
11+
| **Region** | **gpt-4o**, **2024-05-13** | **gpt-4o**, **2024-08-06** | **gpt-4o-mini**, **2024-07-18** |
12+
|:-------------------|:--------------------------:|:--------------------------:|:-------------------------------:|
13+
| eastus2 | ✅ | ✅ | ✅ |
14+
| francecentral | ✅ | ✅ | ✅ |
15+
| germanywestcentral | ✅ | ✅ | ✅ |
16+
| northcentralus | ✅ | ✅ | ✅ |
17+
| southcentralus | ✅ | ✅ | ✅ |
18+
| spaincentral | ✅ | ✅ | ✅ |
19+
| westeurope | ✅ | ✅ | ✅ |
20+
| westus3 | ✅ | ✅ | ✅ |

‎articles/ai-services/openai/includes/model-matrix/global-batch.md

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,26 @@ ms.date: 11/07/2024
99
---
1010

1111

12-
| **Region** | **gpt-4o**, **2024-05-13** | **gpt-4o**, **2024-08-06** | **gpt-4o-mini**, **2024-07-18** | **gpt-4**, **0613** | **gpt-4**, **turbo-2024-04-09** | **gpt-35-turbo**, **0613** | **gpt-35-turbo**, **1106** | **gpt-35-turbo**, **0125** |
13-
|:-----------------|:--------------------------:|:--------------------------:|:-------------------------------:|:-------------------:|:-------------------------------:|:--------------------------:|:--------------------------:|:--------------------------:|
14-
| australiaeast | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
15-
| canadaeast | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
16-
| eastus | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
17-
| eastus2 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
18-
| francecentral | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
19-
| japaneast | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
20-
| koreacentral | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
21-
| northcentralus | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
22-
| norwayeast | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
23-
| southcentralus | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
24-
| southindia | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
25-
| swedencentral | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
26-
| switzerlandnorth | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
27-
| uksouth | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
28-
| westeurope | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
29-
| westus | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
30-
| westus3 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
12+
| **Region** | **gpt-4o**, **2024-05-13** | **gpt-4o**, **2024-08-06** | **gpt-4o-mini**, **2024-07-18** | **gpt-4**, **0613** | **gpt-4**, **turbo-2024-04-09** | **gpt-35-turbo**, **0613** | **gpt-35-turbo**, **1106** | **gpt-35-turbo**, **0125** |
13+
|:-------------------|:--------------------------:|:--------------------------:|:-------------------------------:|:-------------------:|:-------------------------------:|:--------------------------:|:--------------------------:|:--------------------------:|
14+
| australiaeast | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
15+
| brazilsouth | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
16+
| canadaeast | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
17+
| eastus | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
18+
| eastus2 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
19+
| francecentral | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
20+
| germanywestcentral | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
21+
| japaneast | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
22+
| koreacentral | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
23+
| northcentralus | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
24+
| norwayeast | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
25+
| polandcentral | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
26+
| southafricanorth | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
27+
| southcentralus | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
28+
| southindia | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
29+
| swedencentral | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
30+
| switzerlandnorth | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
31+
| uksouth | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
32+
| westeurope | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
33+
| westus | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
34+
| westus3 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |

‎articles/ai-studio/how-to/develop/simulator-interaction-data.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ The `AdversarialSimulator` supports a range of scenarios, hosted in the service,
398398
| Grounded Content Generation (single turn only) | `ADVERSARIAL_CONTENT_GEN_GROUNDED` |475 |Hateful and unfair content, Sexual content, Violent content, Self-harm-related content, Direct Attack (UPIA) Jailbreak |
399399
| Protected Material (single turn only) | `ADVERSARIAL_PROTECTED_MATERIAL` | 306 | Protected Material |
400400

401-
- For testing groundedness scenarios (single or multi-turn), see the section on [simulating and evaluating for groundendess](#simulating-and-evaluating-for-groundendess).
401+
- For testing groundedness scenarios (single or multi-turn), see the section on [simulating and evaluating for groundedness](#simulating-and-evaluating-for-groundendess).
402402
- For simulating direct attack (UPIA) and indirect attack (XPIA) scenarios, see section on [simulating jailbreak attacks](#simulating-jailbreak-attacks).
403403

404404
### Simulating jailbreak attacks
@@ -510,13 +510,17 @@ Using the [ISO standard](https://www.andiamo.co.uk/resources/iso-language-codes/
510510
| Simplified Chinese | zh-cn |
511511
| German | de |
512512

513+
The language options can be passed in as an optional parameter to the `AdversarialSimulator` class using the [`SupportedLanguages` class](/python/api/azure-ai-evaluation/azure.ai.evaluation.simulator.supportedlanguages).
514+
513515
Usage example below:
514516

515517
```python
518+
from azure.ai.evaluation.simulator import SupportedLanguages
519+
516520
outputs = await simulator(
517521
scenario=scenario, # required, adversarial scenario to simulate
518522
target=callback, # required, callback function to simulate against
519-
language=es # optional, default english
523+
language=SupportedLanguages.Spanish # optional, default english
520524
)
521525
```
522526

‎articles/machine-learning/how-to-deploy-online-endpoints.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ The [workspace](concept-workspace.md) is the top-level resource for Azure Machin
134134
ManagedOnlineDeployment,
135135
Model,
136136
Environment,
137-
CodeConfiguration,
137+
CodeConfiguration
138138
)
139139
from azure.identity import DefaultAzureCredential
140140
```

0 commit comments

Comments
 (0)