Skip to content

Commit 144f2b1

Browse files
committed
Merge branch 'main' into release-ignite-document-intelligence-v4
2 parents 83ec1ef + 8557609 commit 144f2b1

File tree

3 files changed

+43
-41
lines changed

3 files changed

+43
-41
lines changed

articles/ai-services/openai/azure-government.md

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: challenp
66
ms.service: azure-ai-openai
77
ms.topic: how-to
88
ms.custom: references_regions, azuregovernment
9-
ms.date: 8/29/2024
9+
ms.date: 12/11/2024
1010
recommendations: false
1111
---
1212

@@ -22,21 +22,25 @@ Learn more about the different capabilities of each model in [Azure OpenAI Servi
2222
The following sections show model availability by region and deployment type.
2323

2424
### Standard deployment model availability
25-
26-
| **Region** | **gpt-35-turbo**, **1106** | **gpt-35-turbo**, **0125** | **gpt-4**, **1106-Preview** | **gpt-4o**, **2024-05-13** | **text-embedding-ada-002** |
27-
|:--------------|:--------------------------:|:--------------------------:|:---------------------------:|:--------------------------:|:--------------------------:|
28-
| usgovarizona | - |||||
29-
| usgovvirginia |||| - ||
30-
31-
To request quota increases for the pay-as-you-go consumption model, apply at [https://aka.ms/AOAIGovQuota](https://aka.ms/AOAIGovQuota)
25+
| **Region** | **gpt-4o**, **2024-05-13** | **gpt-4o-mini**, **2024-07-18** | **gpt-4**, **1106-Preview** | **gpt-35-turbo**, **0125** | **gpt-35-turbo**, **1106** | **text-embedding-3-large**, **1** | **text-embedding-ada-002**, **2** |
26+
|:--------------|:--------------------------:|:-------------------------------:|:---------------------------:|:--------------------------:|:--------------------------:|:---------------------------------:|:---------------------------------:|
27+
| usgovarizona ||||| - |||
28+
| usgovvirginia || - |||| - ||
29+
30+
#### Standard quota limits in tokens per minute (TPM):
31+
| **gpt-4o** | **gpt-4o-mini** | **gpt-4** | **gpt-35-turbo** | **text-embedding-3-large** | **text-embedding-ada-002**|
32+
|:----------:|:---------------:|:---------:|:----------------:|:--------------------------:|:-------------------------:|
33+
| 300k | 600k | 200k | 500k | 700k | 600k |
34+
35+
To request quota increases up to these maximum values, submit a request at [https://aka.ms/AOAIGovQuota](https://aka.ms/AOAIGovQuota).
3236

3337
### Provisioned deployment model availability
34-
| **Region** | **gpt-35-turbo**, **1106** | **gpt-35-turbo**, **0125** | **gpt-4**, **1106-Preview** | **gpt-4o**, **2024-05-13** |
35-
|:--------------|:--------------------------:|:--------------------------:|:---------------------------:|:--------------------------:|
36-
| usgovarizona | - | | - ||
37-
| usgovvirginia | - | || |
38+
| **Region** | **gpt-4o**, **2024-05-13** | **gpt-4o-mini**, **2024-07-18** | **gpt-4**, **1106-Preview** | **gpt-35-turbo**, **0125** | **gpt-35-turbo**, **1106** |
39+
|:--------------|:--------------------------:|:-------------------------------:|:---------------------------:|:--------------------------:|:--------------------------:|
40+
| usgovarizona | | - | - | | - |
41+
| usgovvirginia | | - | - || - |
3842

39-
> [!NOTE]
43+
[NOTE]
4044
> Provisioned Throughput Units (PTUs) are different from standard quota in Azure OpenAI and are not available by default in Azure Government. To learn more about this offering contact your Microsoft Account Team.
4145
4246
<br>

articles/ai-services/translator/containers/install-run.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: laujan
77
manager: nitinme
88
ms.service: azure-ai-translator
99
ms.topic: how-to
10-
ms.date: 11/13/2024
10+
ms.date: 12/09/2024
1111
ms.author: lajanuar
1212
recommendations: false
1313
keywords: on-premises, Docker, container, identify
@@ -644,11 +644,12 @@ Usage charges are calculated based upon the `quantity` value.
644644
}
645645
```
646646

647-
The aggregated value of `billedUnit` for the following meters is counted towards the characters you licensed for your disconnected container usage:
647+
The aggregated value of `billedUnit` for the following meters is counted towards the `quantity` you licensed for your disconnected container usage:
648648

649-
* `CognitiveServices.TextTranslation.Container.OneDocumentTranslatedCharacters`
650-
651-
* `CognitiveServices.TextTranslation.Container.TranslatedCharacters`
649+
|Operation|Meter name|Billed unit|
650+
|---|---|---|
651+
|Text translation|`CognitiveServices.TextTranslation.Container.TranslatedCharacters`|`quantity`: **1 character equals 1** `billedUnit`|
652+
|Document translation|`CognitiveServices.TextTranslation.Container.OneDocumentTranslatedCharacters`|`quantity`: **1 character equals 1.5** `billedUnit`|
652653

653654
---
654655

articles/search/index-similarity-and-scoring.md

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ ms.service: azure-ai-search
99
ms.custom:
1010
- ignite-2023
1111
ms.topic: conceptual
12-
ms.date: 05/06/2024
12+
ms.date: 12/10/2024
1313
---
1414

1515
# Relevance in keyword search (BM25 scoring)
1616

17-
This article explains the BM25 relevance scoring algorithm used to compute search scores for [full text search](search-lucene-query-architecture.md). BM25 relevance is exclusive to full text search. Filter queries, autocomplete and suggested queries, wildcard search or fuzzy search queries aren't scored or ranked for relevance.
17+
This article explains the BM25 relevance scoring algorithm used to compute search scores for [full text search](search-lucene-query-architecture.md). BM25 relevance is exclusive to full text search. Filter queries, autocomplete and suggested queries, wildcard search, and fuzzy search queries aren't scored or ranked for relevance.
1818

1919
## Scoring algorithms used in full text search
2020

@@ -23,39 +23,36 @@ Azure AI Search provides the following scoring algorithms for full text search:
2323
| Algorithm | Usage | Range |
2424
|-----------|-------------|-------|
2525
| `BM25Similarity` | Fixed algorithm on all search services created after July 2020. You can configure this algorithm, but you can't switch to an older one (classic). | Unbounded. |
26-
|`ClassicSimilarity` | Present on older search services. You can [opt-in for BM25](index-ranking-similarity.md) and choose an algorithm on a per-index basis. | 0 < 1.00 |
26+
|`ClassicSimilarity` | Default on older search services that predate July 2020. On older services, you can [opt-in for BM25](index-ranking-similarity.md#enable-bm25-scoring-on-older-services) and choose a the BM25 algorithm on a per-index basis. | 0 < 1.00 |
2727

28-
Both BM25 and Classic are TF-IDF-like retrieval functions that use the term frequency (TF) and the inverse document frequency (IDF) as variables to calculate relevance scores for each document-query pair, which is then used for ranking results. While conceptually similar to classic, BM25 is rooted in probabilistic information retrieval that produces more intuitive matches, as measured by user research.
28+
Both BM25 and Classic are TF-IDF-like retrieval functions that use the term frequency (TF) and the inverse document frequency (IDF) as variables to calculate relevance scores for each document-query pair, which is then used for ranking results. While conceptually similar to classic, BM25 is rooted in probabilistic information retrieval that produces more intuitive matches, as measured by user research.
2929

30-
BM25 offers advanced customization options, such as allowing the user to decide how the relevance score scales with the term frequency of matched terms. For more information, see [Configure the scoring algorithm](index-ranking-similarity.md).
31-
32-
> [!NOTE]
33-
> If you're using a search service that was created before July 2020, the scoring algorithm is most likely the previous default, `ClassicSimilarity`, which you can upgrade on a per-index basis. See [Enable BM25 scoring on older services](index-ranking-similarity.md#enable-bm25-scoring-on-older-services) for details.
34-
35-
The following video segment fast-forwards to an explanation of the generally available ranking algorithms used in Azure AI Search. You can watch the full video for more background.
36-
37-
> [!VIDEO https://www.youtube.com/embed/Y_X6USgvB1g?version=3&start=322&end=643]
30+
BM25 offers [advanced customization options](index-ranking-similarity.md), such as allowing the user to decide how the relevance score scales with the term frequency of matched terms.
3831

3932
## How BM25 ranking works
4033

41-
Relevance scoring refers to the computation of a search score (**@search.score**) that serves as an indicator of an item's relevance in the context of the current query. The range is unbounded. However, the higher the score, the more relevant the item.
34+
Relevance scoring refers to the computation of a search score (**@search.score**) that serves as an indicator of an item's relevance in the context of the current query. The range is unbounded. However, the higher the score, the more relevant the item.
4235

4336
The search score is computed based on statistical properties of the string input and the query itself. Azure AI Search finds documents that match on search terms (some or all, depending on [searchMode](/rest/api/searchservice/documents/search-post#searchrequest)), favoring documents that contain many instances of the search term. The search score goes up even higher if the term is rare across the data index, but common within the document. The basis for this approach to computing relevance is known as *TF-IDF or* term frequency-inverse document frequency.
4437

4538
Search scores can be repeated throughout a result set. When multiple hits have the same search score, the ordering of the same scored items is undefined and not stable. Run the query again, and you might see items shift position, especially if you're using the free service or a billable service with multiple replicas. Given two items with an identical score, there's no guarantee that one appears first.
4639

47-
To break the tie among repeating scores, you can add an **$orderby** clause to first order by score, then order by another sortable field (for example, `$orderby=search.score() desc,Rating desc`). For more information, see [$orderby](search-query-odata-orderby.md).
40+
To break the tie among repeating scores, you can add an [**$orderby** clause](search-query-odata-orderby.md) to first order by score, then order by another sortable field (for example, `$orderby=search.score() desc,Rating desc`).
4841

4942
Only fields marked as `searchable` in the index, or `searchFields` in the query, are used for scoring. Only fields marked as `retrievable`, or fields specified in `select` in the query, are returned in search results, along with their search score.
5043

5144
> [!NOTE]
5245
> A `@search.score = 1` indicates an un-scored or un-ranked result set. The score is uniform across all results. Un-scored results occur when the query form is fuzzy search, wildcard or regex queries, or an empty search (`search=*`, sometimes paired with filters, where the filter is the primary means for returning a match).
5346
47+
The following video segment fast-forwards to an explanation of the generally available ranking algorithms used in Azure AI Search. You can watch the full video for more background.
48+
49+
> [!VIDEO https://www.youtube.com/embed/Y_X6USgvB1g?version=3&start=322&end=643]
50+
5451
## Scores in a text results
5552

56-
Whenever results are ranked, **`@search.score`** property contains the value used to order the results.
53+
Whenever results are ranked, **`@search.score`** property contains the value used to order the results.
5754

58-
The following table identifies the scoring property returned on each match, algorithm, and range.
55+
The following table identifies the scoring property, algorithm, and range.
5956

6057
| Search method | Parameter | Scoring algorithm | Range |
6158
|---------------|-----------|-------------------|-------|
@@ -91,7 +88,7 @@ The diagram above is only one example. Many combinations of partitions and repli
9188
9289
<a name="scoring-statistics"></a>
9390

94-
### Scoring statistics and sticky sessions
91+
## Scoring statistics and sticky sessions
9592

9693
For scalability, Azure AI Search distributes each index horizontally through a sharding process, which means that [portions of an index are physically separate](#sharding-effects-on-query-results).
9794

@@ -107,7 +104,7 @@ POST https://[service name].search.windows.net/indexes/hotels/docs/search?api-ve
107104
}
108105
```
109106

110-
Using `scoringStatistics` will ensure that all shards in the same replica provide the same results. That said, different replicas may be slightly different from one another as they're always getting updated with the latest changes to your index. In some scenarios, you may want your users to get more consistent results during a "query session". In such scenarios, you can provide a `sessionId` as part of your queries. The `sessionId` is a unique string that you create to refer to a unique user session.
107+
Using `scoringStatistics` will ensure that all shards in the same replica provide the same results. That said, different replicas can be slightly different from one another as they're always getting updated with the latest changes to your index. In some scenarios, you might want your users to get more consistent results during a "query session". In such scenarios, you can provide a `sessionId` as part of your queries. The `sessionId` is a unique string that you create to refer to a unique user session.
111108

112109
```http
113110
POST https://[service name].search.windows.net/indexes/hotels/docs/search?api-version=2024-07-01
@@ -124,12 +121,12 @@ As long as the same `sessionId` is used, a best-effort attempt is made to target
124121
125122
## Relevance tuning
126123

127-
In Azure AI Search, you can configure BM25 algorithm parameters, and tune search relevance and boost search scores through these mechanisms:
124+
In Azure AI Search, for keyword search and the text portion of a hybrid query, you can configure BM25 algorithm parameters plus tune search relevance and boost search scores through the following mechanisms.
128125

129126
| Approach | Implementation | Description |
130127
|----------|----------------|-------------|
131-
| [Scoring algorithm configuration](index-ranking-similarity.md) | Search index | |
132-
| [Scoring profiles](index-add-scoring-profiles.md) | Search index | Provide criteria for boosting the search score of a match based on content characteristics. For example, you might want to boost matches based on their revenue potential, promote newer items, or perhaps boost items that have been in inventory too long. A scoring profile is part of the index definition, composed of weighted fields, functions, and parameters. You can update an existing index with scoring profile changes, without incurring an index rebuild.|
128+
| [BM25 algorithm configuration](index-ranking-similarity.md) | Search index | Configure how document length and term frequency affect the relevance score. |
129+
| [Scoring profiles](index-add-scoring-profiles.md) | Search index | Provide criteria for boosting the search score of a match based on content characteristics. For example, you can boost matches based on their revenue potential, promote newer items, or perhaps boost items that have been in inventory too long. A scoring profile is part of the index definition, composed of weighted fields, functions, and parameters. You can update an existing index with scoring profile changes, without incurring an index rebuild.|
133130
| [Semantic ranking](semantic-search-overview.md) | Query request | Applies machine reading comprehension to search results, promoting more semantically relevant results to the top. |
134131
| [featuresMode parameter](#featuresmode-parameter-preview) | Query request | This parameter is mostly used for unpacking a BM25-ranked score, but it can be used for in code that provides a [custom scoring solution](https://github.com/Azure-Samples/search-ranking-tutorial). |
135132

@@ -173,9 +170,9 @@ The featuresMode parameter isn't documented in the REST APIs, but you can use it
173170

174171
## Number of ranked results in a full text query response
175172

176-
By default, if you aren't using pagination, the search engine returns the top 50 highest ranking matches for full text search. You can use the `top` parameter to return a smaller or larger number of items (up to 1000 in a single response). Full text search is subject to a maximum limit of 1,000 matches (see [API response limits](search-limits-quotas-capacity.md#api-response-limits)). Once 1,000 matches are found, the search engine no longer looks for more.
173+
By default, if you aren't using pagination, the search engine returns the top 50 highest ranking matches for full text search. You can use the `top` parameter to return a smaller or larger number of items (up to 1,000 in a single response). You can use `skip` and `next` to page results. Paging determines the number of results on each logical page and supports content navigation. For more information, see [Shape search results](search-pagination-page-layout.md).
177174

178-
To return more or less results, use the paging parameters `top`, `skip`, and `next`. Paging is how you determine the number of results on each logical page and navigate through the full payload. For more information, see [How to work with search results](search-pagination-page-layout.md).
175+
Full text search is subject to a maximum limit of 1,000 matches (see [API response limits](search-limits-quotas-capacity.md#api-response-limits)). Once 1,000 matches are found, the search engine no longer looks for more.
179176

180177
## See also
181178

0 commit comments

Comments
 (0)