Skip to content

Commit 7770482

Browse files
committed
Merge branch 'main' into release-agents-foundry
2 parents 1a0ee19 + c5ed116 commit 7770482

31 files changed

+105
-258
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@
3939
"source_path_from_root": "/articles/ai-services/openai/how-to/use-your-data-securely.md",
4040
"redirect_url": "/azure/ai-services/openai/how-to/on-your-data-configuration",
4141
"redirect_document_id": false
42+
},
43+
{
44+
"source_path_from_root": "/articles/ai-services/openai/references/azure-machine-learning.md",
45+
"redirect_url": "/azure/ai-services/openai/concepts/use-your-data",
46+
"redirect_document_id": false
4247
}
4348
]
4449
}

articles/ai-foundry/model-inference/reference/reference-model-inference-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Learn about how to use the Azure AI Model Inference API
55
manager: scottpolly
66
ms.service: azure-ai-studio
77
ms.topic: conceptual
8-
ms.date: 5/21/2024
8+
ms.date: 01/31/2025
99
ms.reviewer: fasantia
1010
reviewer: santiagxf
1111
ms.author: mopeakande

articles/ai-services/cognitive-services-virtual-networks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: nitinme
88
ms.service: azure-ai-services
99
ms.custom: devx-track-azurepowershell, devx-track-azurecli
1010
ms.topic: how-to
11-
ms.date: 06/13/2024
11+
ms.date: 01/31/2025
1212
ms.author: aahi
1313
---
1414

articles/ai-services/commitment-tier.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.custom:
99
- ignite-2023
1010
ms.service: azure-ai-services
1111
ms.topic: conceptual
12-
ms.date: 01/22/2024
12+
ms.date: 01/31/2025
1313
---
1414

1515
# Purchase commitment tier pricing

articles/ai-services/containers/azure-kubernetes-recipe.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: aahill
77
manager: nitinme
88
ms.service: azure-ai-language
99
ms.topic: conceptual
10-
ms.date: 02/26/2024
10+
ms.date: 01/31/2025
1111
ms.author: aahi
1212
ms.custom: devx-track-azurecli
1313
ms.devlang: azurecli
@@ -74,7 +74,7 @@ To deploy the container to the Azure Kubernetes Service, the container images ne
7474
az acr create --resource-group cogserv-container-rg --name pattyregistry --sku Basic
7575
```
7676
77-
Save the results to get the **loginServer** property. This will be part of the hosted container's address, used later in the `language.yml` file.
77+
Save the results to get the **loginServer** property. This is part of the hosted container's address, used later in the `language.yml` file.
7878
7979
```azurecli-interactive
8080
az acr create --resource-group cogserv-container-rg --name pattyregistry --sku Basic
@@ -101,7 +101,7 @@ To deploy the container to the Azure Kubernetes Service, the container images ne
101101
}
102102
```
103103
104-
1. Sign in to your container registry. You need to login before you can push images to your registry.
104+
1. Sign in to your container registry. You need to log in before you can push images to your registry.
105105
106106
```azurecli-interactive
107107
az acr login --name pattyregistry
@@ -125,13 +125,13 @@ To deploy the container to the Azure Kubernetes Service, the container images ne
125125
126126
To track the version on your container registry, add the tag with a version format, such as `v1`.
127127
128-
1. Push the image to your container registry. This may take a few minutes.
128+
1. Push the image to your container registry. This can take a few minutes.
129129
130130
```console
131131
docker push pattyregistry.azurecr.io/language-frontend:v1
132132
```
133133
134-
If you get an `unauthorized: authentication required` error, login with the `az acr login --name <your-container-registry-name>` command.
134+
If you get an `unauthorized: authentication required` error, sign in with the `az acr login --name <your-container-registry-name>` command.
135135
136136
When the process is done, the results should be similar to:
137137
@@ -148,7 +148,7 @@ To deploy the container to the Azure Kubernetes Service, the container images ne
148148
149149
## Get language detection Docker image
150150
151-
1. Pull the latest version of the Docker image to the local machine. This may take a few minutes. If there is a newer version of this container, change the value from `1.1.006770001-amd64-preview` to the newer version.
151+
1. Pull the latest version of the Docker image to the local machine. This can take a few minutes. If there is a newer version of this container, change the value from `1.1.006770001-amd64-preview` to the newer version.
152152
153153
```console
154154
docker pull mcr.microsoft.com/azure-cognitive-services/language:1.1.006770001-amd64-preview
@@ -160,7 +160,7 @@ To deploy the container to the Azure Kubernetes Service, the container images ne
160160
docker tag mcr.microsoft.com/azure-cognitive-services/language pattiyregistry.azurecr.io/language:1.1.006770001-amd64-preview
161161
```
162162
163-
1. Push the image to your container registry. This may take a few minutes.
163+
1. Push the image to your container registry. This can take a few minutes.
164164
165165
```console
166166
docker push pattyregistry.azurecr.io/language:1.1.006770001-amd64-preview
@@ -216,7 +216,7 @@ The following steps are needed to get the required information to connect your c
216216
az aks create --resource-group cogserv-container-rg --name patty-kube --node-count 2 --service-principal <appId> --client-secret <client-secret> --generate-ssh-keys
217217
```
218218
219-
This step may take a few minutes. The result is:
219+
This step can take a few minutes. The result is:
220220
221221
```output
222222
{
@@ -310,14 +310,14 @@ This section uses the **kubectl** CLI to talk with the Azure Kubernetes Service.
310310
Language-frontend deployment settings|Purpose|
311311
|--|--|
312312
|Line 32<br> `image` property|Image location for the frontend image in your Container Registry<br>`<container-registry-name>.azurecr.io/language-frontend:v1`|
313-
|Line 44<br> `name` property|Container Registry secret for the image, referred to as `<client-secret>` in a previous section.|
313+
|Line 44<br> `name` property|Container Registry secret for the image. Referred to as `<client-secret>` in a previous section.|
314314
315315
1. Change the language deployment lines of `language.yml` based on the following table to add your own container registry image names, client secret, and Language service settings.
316316
317317
|Language deployment settings|Purpose|
318318
|--|--|
319319
|Line 78<br> `image` property|Image location for the language image in your Container Registry<br>`<container-registry-name>.azurecr.io/language:1.1.006770001-amd64-preview`|
320-
|Line 95<br> `name` property|Container Registry secret for the image, referred to as `<client-secret>` in a previous section.|
320+
|Line 95<br> `name` property|Container Registry secret for the image. Referred to as `<client-secret>` in a previous section.|
321321
|Line 91<br> `apiKey` property|Your Language service resource key|
322322
|Line 92<br> `billing` property|The billing endpoint for your Language service resource.<br>`https://westus.api.cognitive.microsoft.com/text/analytics/v2.1`|
323323

articles/ai-services/containers/container-faq.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
manager: nitinme
99
ms.service: azure-ai-services
1010
ms.topic: faq
11-
ms.date: 02/21/2024
11+
ms.date: 01/31/2025
1212
ms.author: aahi
1313
title: FAQ for Azure AI containers
1414
summary: |
@@ -82,7 +82,7 @@ sections:
8282
| `BillingEndpointBusy` | The billing endpoint is currently busy. Check the `Retry-After` value and wait for this period to end before you make more requests. |
8383
| `ContainerUseUnauthorized` | The provided API key isn't authorized for use with this container. You're likely using a gated container, so make sure your Azure subscription ID is approved by submitting an [online request](https://aka.ms/csgate). |
8484
| `[ERROR] Failed to download: context deadline exceeded` | The model file download request to our servers timed out. Make sure you have a strong internet connection to download all required files within one hour. Model downloads apply to Text Translation and some Speech service containers. |
85-
| `The provided license path was not found. Please ensure a volume is mounted and a directory exists at the location specified by Mounts:License` | **Disconnected containers only.** There is no license file stored locally at the location specified in your docker run command. You might have mounted the license volume incorrectly. Be sure to check your local file system and provide a valid filepath to the desired local storage location for the license file using the -v argument in your docker run command. |
85+
| `The provided license path was not found. Please ensure a volume is mounted and a directory exists at the location specified by Mounts:License` | **Disconnected containers only.** There is no license file stored locally at the location specified in your docker run command. You might have mounted the license volume incorrectly. Be sure to check your local file system and provide a valid filepath to the desired local storage location for the license file using the `-v` argument in your docker run command. |
8686
| `Unknown` | The server is currently unable to process billing requests. |
8787
8888
- question: How do I get support?

articles/ai-services/containers/container-reuse-recipe.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: aahill
77
manager: nitinme
88
ms.service: azure-ai-services
99
ms.topic: how-to
10-
ms.date: 02/22/2024
10+
ms.date: 01/31/2025
1111
ms.author: aahi
1212
#Customer intent: As a potential customer, I want to know how to configure containers so I can reuse them.
1313
---
@@ -23,7 +23,7 @@ Once you have this new layer of container (with settings), and you have tested i
2323
Any `docker run` examples in this document assume a Windows console with a `^` line continuation character. Consider the following for your own use:
2424

2525
* Do not change the order of the arguments unless you are very familiar with docker containers.
26-
* If you are using an operating system other than Windows, or a console other than Windows console, use the correct console/terminal, folder syntax for mounts, and line continuation character for your console and system. Because the Azure AI services container is a Linux operating system, the target mount uses a Linux-style folder syntax.
26+
* If you are using an operating system other than Windows, or a console other than Windows console, use the correct console/terminal, folder syntax for mounts, and line continuation character for your console and system. Because the Azure AI services container is a Linux operating system, the target mount uses a Linux-style folder syntax.
2727
* `docker run` examples use the directory off the `c:` drive to avoid any permission conflicts on Windows. If you need to use a specific directory as the input directory, you might need to grant the docker service permission.
2828

2929
## Store no configuration settings in image
@@ -123,7 +123,7 @@ Follow these steps to use the Dockerfile and place the new image in your private
123123
az acr login --name <my-registry>
124124
```
125125

126-
You can also sign in with docker login if you are assigned a service principal.
126+
You can also sign in with `docker login` if you are assigned a service principal.
127127

128128
```Bash
129129
docker login <my-registry>.azurecr.io

articles/ai-services/language-service/concepts/model-lifecycle.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Use the table below to find which model versions are supported by each feature:
4343
| Entity Linking | `latest*` | |
4444
| Named Entity Recognition (NER) | `latest*` | `2023-04-15-preview**` |
4545
| Personally Identifiable Information (PII) detection | `latest*` | `2023-04-15-preview**` |
46-
| PII detection for conversations | `latest*` | `2023-04-15-preview**` |
46+
| PII detection for conversations | `latest*` | `2024-11-01-preview**` |
4747
| Question answering | `latest*` | |
4848
| Text Analytics for health | `latest*` | `2022-08-15-preview`, `2023-01-01-preview**`|
4949
| Key phrase extraction | `latest*` | |

articles/ai-services/openai/concepts/legacy-models.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ titleSuffix: Azure OpenAI
44
description: Learn about the deprecated models in Azure OpenAI.
55
ms.service: azure-ai-openai
66
ms.topic: conceptual
7-
ms.date: 06/14/2024
7+
ms.date: 01/31/2025
88
ms.custom: references_regions, build-2023, build-2023-dataai
99
manager: nitinme
1010
author: mrbullwinkle

articles/ai-services/openai/concepts/models.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ titleSuffix: Azure OpenAI
44
description: Learn about the different model capabilities that are available with Azure OpenAI.
55
ms.service: azure-ai-openai
66
ms.topic: conceptual
7-
ms.date: 12/16/2024
7+
ms.date: 01/30/2025
88
ms.custom: references_regions, build-2023, build-2023-dataai, refefences_regions
99
manager: nitinme
1010
author: mrbullwinkle #ChrisHMSFT
@@ -18,7 +18,7 @@ Azure OpenAI Service is powered by a diverse set of models with different capabi
1818

1919
| Models | Description |
2020
|--|--|
21-
| [o1 & o1-mini](#o1-and-o1-mini-models) |[Reasoning models](../how-to/reasoning.md) with advanced problem-solving and increased focus and capability. |
21+
| [o-series models](#o-series-models) |[Reasoning models](../how-to/reasoning.md) with advanced problem-solving and increased focus and capability. |
2222
| [GPT-4o & GPT-4o mini & GPT-4 Turbo](#gpt-4o-and-gpt-4-turbo) | The latest most capable Azure OpenAI models with multimodal versions, which can accept both text and images as input. |
2323
| [GPT-4o audio](#gpt-4o-audio) | GPT-4o audio models that support either low-latency, "speech in, speech out" conversational interactions or audio generation. |
2424
| [GPT-4](#gpt-4) | A set of models that improve on GPT-3.5 and can understand and generate natural language and code. |
@@ -28,30 +28,32 @@ Azure OpenAI Service is powered by a diverse set of models with different capabi
2828
| [Whisper](#whisper-models) | A series of models in preview that can transcribe and translate speech to text. |
2929
| [Text to speech](#text-to-speech-models-preview) (Preview) | A series of models in preview that can synthesize text to speech. |
3030

31-
## o1 and o1-mini models
31+
## o-series models
3232

33-
The Azure OpenAI `o1` and `o1-mini` models are specifically designed to tackle reasoning and problem-solving tasks with increased focus and capability. These models spend more time processing and understanding the user's request, making them exceptionally strong in areas like science, coding, and math compared to previous iterations.
33+
The Azure OpenAI o<sup>&#42;</sup> series models are specifically designed to tackle reasoning and problem-solving tasks with increased focus and capability. These models spend more time processing and understanding the user's request, making them exceptionally strong in areas like science, coding, and math compared to previous iterations.
3434

3535
| Model ID | Description | Max Request (tokens) | Training Data (up to) |
3636
| --- | :--- |:--- |:---: |
37+
| `o3-mini` (2025-01-31) | The latest reasoning model, offering [enhanced reasoning abilities](../how-to/reasoning.md). <br> - Structured outputs<br> - Text-only processing <br> - Functions/Tools <br> <br> **Request access: [limited access model application](https://aka.ms/OAI/o1access)** | Input: 200,000 <br> Output: 100,000 | Oct 2023 |
3738
| `o1` (2024-12-17) | The most capable model in the o1 series, offering [enhanced reasoning abilities](../how-to/reasoning.md). <br> - Structured outputs<br> - Text, image processing <br> - Functions/Tools <br> <br> **Request access: [limited access model application](https://aka.ms/OAI/o1access)** | Input: 200,000 <br> Output: 100,000 | Oct 2023 |
3839
|`o1-preview` (2024-09-12) | Older preview version | Input: 128,000 <br> Output: 32,768 | Oct 2023 |
3940
| `o1-mini` (2024-09-12) | A faster and more cost-efficient option in the o1 series, ideal for coding tasks requiring speed and lower resource consumption.| Input: 128,000 <br> Output: 65,536 | Oct 2023 |
4041

4142
### Availability
4243

43-
The `o1` and `o1-mini` models are now available for API access and model deployment. **For access to `o1` registration is required, and access will be granted based on Microsoft's eligibility criteria**. Customers who previously applied and received access to `o1-preview`, don't need to reapply as they are automatically on the wait-list for the latest model.
44+
**For access to `o3-mini` and `o1` registration is required, and access will be granted based on Microsoft's eligibility criteria**. Customers who previously applied and received access to `o1-preview`, or `o1` don't need to reapply as they are automatically on the wait-list for the latest models in the o-series.
4445

4546
Request access: [limited access model application](https://aka.ms/OAI/o1access)
4647

47-
Once access has been granted, you will need to create a deployment for each model. If you have an existing `o1-preview` deployment in place upgrade is currently not supported, you will need to create a new deployment.
48+
Once access has been granted, you will need to create a deployment for each model.
4849

49-
To learn more about the advanced `o1` series models see, [getting started with o1 series reasoning models](../how-to/reasoning.md).
50+
To learn more about the advanced `o-series` models see, [getting started with reasoning models](../how-to/reasoning.md).
5051

5152
### Region availability
5253

5354
| Model | Region |
5455
|---|---|
56+
|`o3-mini` | East US2 (Global Standard) <br> Sweden Central (Global Standard) |
5557
|`o1` | East US2 (Global Standard) <br> Sweden Central (Global Standard) |
5658
| `o1-preview` | See the [models table](#global-standard-model-availability). |
5759
| `o1-mini` | See the [models table](#global-provisioned-managed-model-availability). |

0 commit comments

Comments
 (0)