Skip to content

Commit adaec7e

Browse files
Merge pull request #5885 from MicrosoftDocs/main
Merged by Learn.Build PR Management system
2 parents 3866070 + 4154357 commit adaec7e

File tree

4 files changed

+23
-13
lines changed

4 files changed

+23
-13
lines changed

articles/ai-foundry/concepts/ai-red-teaming-agent.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ The AI Red Teaming Agent leverages Microsoft's open-source framework for Python
2727

2828
Together these components (scanning, evaluating, and reporting) help teams understand how AI systems respond to common attacks, ultimately guiding a comprehensive risk management strategy.
2929

30-
[!INCLUDE [uses-hub-only](../includes/uses-hub-only.md )]
31-
3230
## When to use the AI Red Teaming Agent's scans
3331

3432
When thinking about AI-related safety risks developing trustworthy AI systems, Microsoft uses NIST's framework to mitigate risk effectively: Govern, Map, Measure, Manage. We'll focus on the last three parts in relation to the generative AI development lifecycle:

articles/ai-services/translator/document-translation/how-to-guides/use-rest-api-programmatically.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ The following headers are included with each Document translation API request:
246246
"inProgress": 1,
247247
"notYetStarted": 0,
248248
"cancelled": 0,
249-
"totalCharacterCharged": 0,
249+
"totalCharacterCharged": 1355,
250250
"totalImageScansSucceeded": 2,
251251
"totalImageScansFailed": 0
252252
}

articles/search/includes/quickstarts/search-get-started-vector-python.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ In the next sections, we run queries against the `hotels-vector-quickstart` inde
343343
- [Single vector search](#single-vector-search)
344344
- [Single vector search with filter](#single-vector-search-with-filter)
345345
- [Hybrid search](#hybrid-search)
346-
- [Semantic hybrid search with filter](#semantic-hybrid-search-with-a-filter)
346+
- [Semantic hybrid search](#semantic-hybrid-search)
347347

348348
### Create the vector query string
349349

@@ -674,9 +674,9 @@ Hybrid search consists of keyword queries and vector queries in a single search
674674
]
675675
```
676676

677-
### Semantic hybrid search with a filter
677+
### Semantic hybrid search
678678

679-
Here's the last query in the collection. This hybrid query with semantic ranking is filtered to show only the hotels within a 500-kilometer radius of Washington D.C. You can set `vectorFilterMode` to null, which is equivalent to the default (`preFilter` for newer indexes and `postFilter` for older ones).
679+
Here's the last query in the collection. This hybrid query specifies the semantic query type and a semantic configuration, demonstrating that you can build a hybrid query that uses semantic reranking.
680680

681681
- Find the cell below section titled "Semantic hybrid search" and execute the cell. This code block contains the request to query the search index.
682682

@@ -721,9 +721,9 @@ Here's the last query in the collection. This hybrid query with semantic ranking
721721
print("No vector loaded, skipping search.")
722722
```
723723

724-
Review the output below the cell. The response is three hotels, which are filtered by location and faceted by `StateProvince` and semantically reranked to promote results that are closest to the search string query (`historic hotel walk to restaurants and shopping`).
724+
Review the output below the cell.
725725

726-
The Swirling Currents Hotel now moves into the top spot. Without semantic ranking, Nordick's Valley Motel is number one. With semantic ranking, the machine comprehension models recognize that `historic` applies to "hotel, within walking distance to dining (restaurants) and shopping."
726+
With semantic ranking, the Swirling Currents Hotel now moves into the top spot. W
727727

728728
```output
729729
Total semantic hybrid results: 7
@@ -759,13 +759,15 @@ Here's the last query in the collection. This hybrid query with semantic ranking
759759
Category: Suite
760760
```
761761

762-
Key takeaways:
762+
You can think of the semantic ranking as a way to improve the relevance of search results by understanding the meaning behind the words in the query and the content of the documents. In this case, the semantic ranking helps to identify hotels that are not only relevant to the keywords but also match the intent of the query:
763763

764-
- Vector search is specified through the `vectors.value` property. Keyword search is specified through the `search` property.
764+
Key takeaways:
765765

766-
- In a hybrid search, you can integrate vector search with full-text search over keywords. Filters, spell check, and semantic ranking apply to textual content only, and not vectors. In this final query, there's no semantic `answer` because the system didn't produce one that was sufficiently strong.
766+
- Vector search is specified through the `vectors.value` property. Keyword search is specified through the `search` property.
767767

768-
- Actual results include more detail, including semantic captions and highlights. Results were modified for readability. To get the full structure of the response, run the request in the REST client.
768+
- In a hybrid search, you can integrate vector search with full-text search over keywords. Filters, spell check, and semantic ranking apply to textual content only, and not vectors. In this final query, there's no semantic `answer` because the system didn't produce one that was sufficiently strong.
769+
770+
- Actual results include more detail, including semantic captions and highlights. Results were modified for readability. To get the full structure of the response, run the request in the REST client.
769771

770772
## Clean up
771773

articles/search/search-indexer-access-control-lists-and-role-based-access.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,5 +288,15 @@ Choose one of the following mechanisms, depending on how many items changed:
288288

289289
## Deletion tracking
290290

291-
To effectively manage blob deletion, ensure that you have enabled [deletion tracking](search-howto-index-changed-deleted-blobs.md) before your indexer runs for the first time. This feature allows the system to detect deleted blobs from your source and have them deleted from the index.
291+
To effectively manage blob deletion, ensure that you have enabled [deletion tracking](search-howto-index-changed-deleted-blobs.md) before your indexer runs for the first time. This feature allows the system to detect deleted blobs from your source and have them deleted from the index.
292292

293+
## Supported ADLS Gen2 permission features
294+
295+
This section compares document-level access control features between ADLS Gen2 and Azure AI Search. It highlights which ADLS Gen2 access control mechanisms are supported or mapped when integrating with AI Search, helping you understand how permissions are enforced at the document level.
296+
297+
| ADLS Gen2 Feature | Description | Supported | Notes |
298+
|-|-|-|-|
299+
| [RBAC](/azure/storage/blobs/data-lake-storage-access-control-model#role-based-access-control-azure-rbac) | Coarse-grained access at container level | Yes | AI Search honors RBAC for access to all documents in the entire container. |
300+
| [ABAC](/azure/storage/blobs/data-lake-storage-access-control-model#attribute-based-access-control-azure-abac) | Attribute-based conditions on top of RBAC | No | AI Search does not evaluate ABAC conditions for document-level access. |
301+
| [ACL](/azure/storage/blobs/data-lake-storage-access-control-model#access-control-lists-acls) | Fine-grained permissions at directory/file (document) level | Yes | AI Search uses document-level ACLs for [permission filters](./search-query-access-control-rbac-enforcement.md). |
302+
| [Security Groups](/azure/storage/blobs/data-lake-storage-access-control-model#security-groups) | Group-based permission assignments | Yes | Supported if security groups are mapped inside the document-level ACL. |

0 commit comments

Comments
 (0)