Skip to content

Commit cb3e21c

Browse files
authored
Merge pull request #278895 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents ee46cab + fd5c707 commit cb3e21c

File tree

3 files changed

+26
-6
lines changed

3 files changed

+26
-6
lines changed

articles/azure-resource-manager/management/manage-resource-groups-portal.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,13 @@ Learn how to use the [Azure portal](https://portal.azure.com) with [Azure Resour
1616

1717
A resource group is a container that holds related resources for an Azure solution. The resource group can include all the resources for the solution, or only those resources that you want to manage as a group. You decide how you want to allocate resources to resource groups based on what makes the most sense for your organization. Generally, add resources that share the same lifecycle to the same resource group so you can easily deploy, update, and delete them as a group.
1818

19-
The resource group stores metadata about the resources. Therefore, when you specify a location for the resource group, you are specifying where that metadata is stored. For compliance reasons, you may need to ensure that your data is stored in a particular region. Note that resources inside a resource group can be of different regions.
19+
The resource group scope is also used throughout the Azure portal to create views that span across multiple resources. For example:
20+
- Metrics blade provides metrics information (CPU, resources) to users.
21+
- Deployments blade shows the history of ARM Template or Bicep deployments targeted to that Resource Group (which includes Portal deployments).
22+
- Policy blade provides information related to the policies enforced on the resource group.
23+
- Diagnostics settings blade provides the ability to diagnose errors or review warnings.
24+
25+
The resource group stores metadata about the resources. Therefore, when you specify a location for the resource group, you are specifying where that metadata is stored. For compliance reasons, you might need to ensure that your data is stored in a particular region. Note that resources inside a resource group can be of different regions.
2026

2127

2228
## Create resource groups

articles/machine-learning/how-to-access-data-batch-endpoints-jobs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -890,7 +890,7 @@ The following example shows how to change the location where an output named `sc
890890

891891
```python
892892
data_path = "batch-jobs/my-unique-path"
893-
output = Output(type=AssetTypes.URI_FOLDER, path=f"{default_ds.id}/paths/{data_path})
893+
output = Output(type=AssetTypes.URI_FILE, path=f"{default_ds.id}/paths/{data_path})
894894
```
895895

896896
For completeness, let's also create a data input:

articles/search/hybrid-search-how-to-query.md

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ api-key: {{admin-api-key}}
203203

204204
**Key points:**
205205

206-
+ Semantic ranking accepts up to 50 results from the merged response. Set "k" and "top" to 50 for equal representation of both queries.
206+
+ Semantic ranking accepts up to 50 results from the merged response.
207207

208208
+ "queryType" and "semanticConfiguration" are required.
209209

@@ -338,14 +338,28 @@ The examples in this article used a "select" statement to specify text (nonvecto
338338
339339
### Number of results
340340

341-
A query might match to any number of documents, as many as all of them if the search criteria are weak (for example "search=*" for a null query). Because it's seldom practical to return unbounded results, you should specify a maximum for the response:
341+
A query might match to any number of documents, as many as all of them if the search criteria are weak (for example "search=*" for a null query). Because it's seldom practical to return unbounded results, you should specify a maximum for the *overall response*:
342342

343+
+ `"top": n` results for keyword-only queries (no vector)
343344
+ `"k": n` results for vector-only queries
344-
+ `"top": n` results for hybrid queries that include a "search" parameter
345+
+ `"top": n` results for hybrid queries (with or without semantic) that include a "search" parameter
345346

346347
Both "k" and "top" are optional. Unspecified, the default number of results in a response is 50. You can set "top" and "skip" to [page through more results](search-pagination-page-layout.md#paging-results) or change the default.
347348

348-
If you're using semantic ranking, it's a best practice to set both "k" and "top" to at least 50. The semantic ranker can take up to 50 results. By specifying 50 for each query, you get equal representation from both search subsystems.
349+
> [!NOTE]
350+
> If you're using hybrid search in 2024-05-01-preview API, you can control the number of results from the keyword query using [maxTextRecallSize](#set-maxtextrecallsize-and-countandfacetmode-preview). Combine this with a setting for "k" to control the representation from each search subsystem (keyword and vector).
351+
352+
#### Semantic ranker results
353+
354+
> [!NOTE]
355+
> The semantic ranker can take up to 50 results.
356+
357+
If you're using semantic ranking in 2024-05-01-preview API, it's a best practice to set "k" and "maxTextRecallSize" to sum to at least 50 total. You can then restrict the results returned to the user with the "top" parameter.
358+
359+
If you're using semantic ranking in previous APIs do the following:
360+
361+
+ if doing keyword-only search (no vector) set "top" to 50
362+
+ if doing hybrid search set "k" to 50, to ensure that the semantic ranker gets at least 50 results.
349363

350364
### Ranking
351365

0 commit comments

Comments
 (0)