Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Search] Move GA-Related Changes from Feature Branch to Main #39813

Merged
merged 2 commits into from
Nov 7, 2023

Conversation

ShivangiReja
Copy link
Member

This pull request is intended to merge GA-related changes developed in the feature branch into the main branch.

Feature Branch:

Changes:

@azure-sdk
Copy link
Collaborator

API change check

APIView has identified API level changes in this PR and created following API reviews.

Azure.Search.Documents

Copy link
Member

@heaths heaths left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Verified no significant diffs like so:

git fetch upstream # pulled down @ShivangiReja's old feature branch
git fetch git fetch https://github.com/ShivangiReja/azure-sdk-for-net SearchGA-2023-11-01 # pulled down her PR merge branch
git diff upstream/feature/ShivangiReja/search2023-11-01..FETCH_HEAD -- sdk/search # compared old and new

Found only the following:

diff --git a/sdk/search/Azure.Search.Documents/README.md b/sdk/search/Azure.Search.Documents/README.md
index 030e638b5ee..4d5cff6b45f 100644
--- a/sdk/search/Azure.Search.Documents/README.md
+++ b/sdk/search/Azure.Search.Documents/README.md
@@ -208,7 +208,7 @@ Semantic search enhances the quality of search results for text-based queries. B
 - It applies secondary ranking to the initial result set, promoting the most semantically relevant results to the top.
 - It extracts and returns captions and answers in the response, which can be displayed on a search page to enhance the user's search experience.
 
-To learn more about Semantic Search, you can refer to the [sample](https://github.com/Azure/azure-sdk-for-net/blob/feature/ShivangiReja/search2023-11-01/sdk/search/Azure.Search.Documents/samples/Sample08_SemanticSearch.md).
+To learn more about Semantic Search, you can refer to the [sample](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/search/Azure.Search.Documents/samples/Sample08_SemanticSearch.md).
 
 Additionally, for more comprehensive information about Semantic Search, including its concepts and usage, you can refer to the [documentation](https://learn.microsoft.com/azure/search/semantic-search-overview). The documentation provides in-depth explanations and guidance on leveraging the power of Semantic Search in Azure Cognitive Search.
 
@@ -216,7 +216,7 @@ Additionally, for more comprehensive information about Semantic Search, includin
 
 Vector Search is an information retrieval technique that overcomes the limitations of traditional keyword-based search. Instead of relying solely on lexical analysis and matching individual query terms, Vector Search utilizes machine learning models to capture the contextual meaning of words and phrases. It represents documents and queries as vectors in a high-dimensional space called an embedding. By understanding the intent behind the query, Vector Search can deliver more relevant results that align with the user's requirements, even if the exact terms are not present in the document. Moreover, Vector Search can be applied to various types of content, including images and videos, not just text.
 
-To learn how to index vector fields and perform vector search, you can refer to the [sample](https://github.com/Azure/azure-sdk-for-net/blob/feature/ShivangiReja/search2023-11-01/sdk/search/Azure.Search.Documents/samples/Sample07_VectorSearch.md). This sample provides detailed guidance on indexing vector fields and demonstrates how to perform vector search.
+To learn how to index vector fields and perform vector search, you can refer to the [sample](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/search/Azure.Search.Documents/samples/Sample07_VectorSearch.md). This sample provides detailed guidance on indexing vector fields and demonstrates how to perform vector search.
 
 Additionally, for more comprehensive information about Vector Search, including its concepts and usage, you can refer to the [documentation](https://learn.microsoft.com/azure/search/vector-search-overview). The documentation provides in-depth explanations and guidance on leveraging the power of Vector Search in Azure Cognitive Search.
 
diff --git a/sdk/search/Azure.Search.Documents/samples/README.md b/sdk/search/Azure.Search.Documents/samples/README.md
index b362a25c99d..5bdfeb2c999 100644
--- a/sdk/search/Azure.Search.Documents/samples/README.md
+++ b/sdk/search/Azure.Search.Documents/samples/README.md
@@ -17,4 +17,5 @@ description: Samples for the Azure.Search.Documents client library
 - Use [`[FieldBuilderIgnore]`](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/search/Azure.Search.Documents/samples/Sample04_FieldBuilderIgnore.md) to add fields for unsupported properties using `FieldBuilder`.
 - Learn about different ways to [index documents](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/search/Azure.Search.Documents/samples/Sample05_IndexingDocuments.md).
 - Use your own Key Vault key to [encrypt your data source connections, skillsets, indexers, and index](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/search/Azure.Search.Documents/samples/Sample06_EncryptedIndex.md).
-- Learn how to [index vector fields and perform vector search](https://github.com/Azure/azure-sdk-for-net/blob/feature/ShivangiReja/search2023-11-01/sdk/search/Azure.Search.Documents/samples/Sample07_VectorSearch.md).
+- Learn how to [index vector fields and perform vector search](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/search/Azure.Search.Documents/samples/Sample07_VectorSearch.md).
+- Learn how to [perform semantic search](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/search/Azure.Search.Documents/samples/Sample08_SemanticSearch.md).
diff --git a/sdk/search/Azure.Search.Documents/samples/Sample07_VectorSearch.md b/sdk/search/Azure.Search.Documents/samples/Sample07_VectorSearch.md
index 4875ff74834..fa56ededacf 100644
--- a/sdk/search/Azure.Search.Documents/samples/Sample07_VectorSearch.md
+++ b/sdk/search/Azure.Search.Documents/samples/Sample07_VectorSearch.md
@@ -8,11 +8,11 @@ Please refer the [documentation](https://learn.microsoft.com/azure/search/vector
 
 Here's the list of samples that will show you how to index the vector fields and perform vector search using .NET SDK.
 
-* [Vector Search Using Vectorized Query](https://github.com/Azure/azure-sdk-for-net/blob/feature/ShivangiReja/search2023-11-01/sdk/search/Azure.Search.Documents/samples/Sample07_VectorSearch_UsingVectorizedQuery.md#vector-search-using-vector-query)
-     * [Single Vector Search](https://github.com/Azure/azure-sdk-for-net/blob/feature/ShivangiReja/search2023-11-01/sdk/search/Azure.Search.Documents/samples/Sample07_VectorSearch_UsingVectorizedQuery.md#single-vector-search)
-     * [Single Vector Search With Filter](https://github.com/Azure/azure-sdk-for-net/blob/feature/ShivangiReja/search2023-11-01/sdk/search/Azure.Search.Documents/samples/Sample07_VectorSearch_UsingVectorizedQuery.md#single-vector-search-with-filter)
-     * [Hybrid Search](https://github.com/Azure/azure-sdk-for-net/blob/feature/ShivangiReja/search2023-11-01/sdk/search/Azure.Search.Documents/samples/Sample07_VectorSearch_UsingVectorizedQuery.md#hybrid-search)
-     * [Multi-Vector Search](https://github.com/Azure/azure-sdk-for-net/blob/feature/ShivangiReja/search2023-11-01/sdk/search/Azure.Search.Documents/samples/Sample07_VectorSearch_UsingVectorizedQuery.md#multi-vector-search)
-     * [Multi-Field Vector Search](https://github.com/Azure/azure-sdk-for-net/blob/feature/ShivangiReja/search2023-11-01/sdk/search/Azure.Search.Documents/samples/Sample07_VectorSearch_UsingVectorizedQuery.md#multi-field-vector-search)
-* [Vector Semantic Hybrid Search](https://github.com/Azure/azure-sdk-for-net/blob/feature/ShivangiReja/search2023-11-01/sdk/search/Azure.Search.Documents/samples/Sample07_VectorSearch_UsingSemanticHybridQuery.md)
-* [Vector Search Using Field Builder](https://github.com/Azure/azure-sdk-for-net/blob/feature/ShivangiReja/search2023-11-01/sdk/search/Azure.Search.Documents/samples/Sample07_VectorSearch_UsingFieldBuilder.md)
+* [Vector Search Using Vectorized Query](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/search/Azure.Search.Documents/samples/Sample07_VectorSearch_UsingVectorizedQuery.md#vector-search-using-vector-query)
+     * [Single Vector Search](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/search/Azure.Search.Documents/samples/Sample07_VectorSearch_UsingVectorizedQuery.md#single-vector-search)
+     * [Single Vector Search With Filter](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/search/Azure.Search.Documents/samples/Sample07_VectorSearch_UsingVectorizedQuery.md#single-vector-search-with-filter)
+     * [Hybrid Search](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/search/Azure.Search.Documents/samples/Sample07_VectorSearch_UsingVectorizedQuery.md#hybrid-search)
+     * [Multi-Vector Search](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/search/Azure.Search.Documents/samples/Sample07_VectorSearch_UsingVectorizedQuery.md#multi-vector-search)
+     * [Multi-Field Vector Search](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/search/Azure.Search.Documents/samples/Sample07_VectorSearch_UsingVectorizedQuery.md#multi-field-vector-search)
+* [Vector Semantic Hybrid Search](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/search/Azure.Search.Documents/samples/Sample07_VectorSearch_UsingSemanticHybridQuery.md)
+* [Vector Search Using Field Builder](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/search/Azure.Search.Documents/samples/Sample07_VectorSearch_UsingFieldBuilder.md)
diff --git a/sdk/search/Azure.Search.Documents/samples/Sample07_VectorSearch_UsingFieldBuilder.md b/sdk/search/Azure.Search.Documents/samples/Sample07_VectorSearch_UsingFieldBuilder.md
index ed51a7191f6..9f8e18eb259 100644
--- a/sdk/search/Azure.Search.Documents/samples/Sample07_VectorSearch_UsingFieldBuilder.md
+++ b/sdk/search/Azure.Search.Documents/samples/Sample07_VectorSearch_UsingFieldBuilder.md
@@ -61,4 +61,4 @@ SearchIndexClient indexClient = new(endpoint, credential);
 await indexClient.CreateIndexAsync(searchIndex);
 ```
 
-To perform vector search please refer to the [Vector Search Using Vector Query](https://github.com/Azure/azure-sdk-for-net/blob/feature/ShivangiReja/search2023-11-01/sdk/search/Azure.Search.Documents/samples/Sample07_VectorSearch_UsingVectorizedQuery.md) sample.
+To perform vector search please refer to the [Vector Search Using Vector Query](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/search/Azure.Search.Documents/samples/Sample07_VectorSearch_UsingVectorizedQuery.md) sample.

All seems expected.

@ShivangiReja ShivangiReja merged commit 096e731 into Azure:main Nov 7, 2023
21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants