Skip to content

Commit a05011e

Browse files
authored
Regenerated azure-search-documents to include 2025-08-01-Preview changes (#46317)
* Update Swaggers and regen searchindex * Regen searchservice * Regen knowledgeagent * Make SearchIndexerStatus.name optional for backwards compatibility * Small API cleanup * Drop the name requirement in createOrUpdate for Knowledge Agent and Source * Checkpointing work on resource deployment * Add tests * Update tests to handle deployment supplied data * Update Swagger SHAs, add back missing features * Update tests to handle deployment supplied data * Finalize tests * Update CHANGELOG, prep for release
1 parent a79e5f8 commit a05011e

File tree

87 files changed

+9451
-1358
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+9451
-1358
lines changed

sdk/search/azure-search-documents/CHANGELOG.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
# Release History
22

3-
## 11.8.0-beta.8 (Unreleased)
3+
## 11.8.0-beta.8 (2025-09-05)
44

55
### Features Added
66

7-
### Breaking Changes
7+
- Support for `2025-08-01-Preview` service version.
8+
- Added support for Knowledge Agent knowledge sources.
9+
- Added support for Knowledge Agent answer synthesis.
10+
- Added `VectorFilterMode.STRICT_POST_FILTER`.
811

9-
### Bugs Fixed
12+
### Breaking Changes
1013

11-
### Other Changes
14+
- Dropped support for `2025-05-01-Preview` service version.
15+
- Knowledge Agent target indexes were removed as `2025-08-01-Preview` replaced that concept with knowledge sources,
16+
a richer concept that allows for knowledge agent to consume information from more than just Search indexes.
1217

1318
## 11.7.9 (2025-08-21)
1419

sdk/search/azure-search-documents/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ add the direct dependency to your project as follows.
7575
<dependency>
7676
<groupId>com.azure</groupId>
7777
<artifactId>azure-search-documents</artifactId>
78-
<version>11.8.0-beta.7</version>
78+
<version>11.8.0-beta.8</version>
7979
</dependency>
8080
```
8181
[//]: # ({x-version-update-end})

sdk/search/azure-search-documents/assets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"AssetsRepo": "Azure/azure-sdk-assets",
33
"AssetsRepoPrefixPath": "java",
44
"TagPrefix": "java/search/azure-search-documents",
5-
"Tag": "java/search/azure-search-documents_ab303259b0"
5+
"Tag": "java/search/azure-search-documents_b2580498bd"
66
}

sdk/search/azure-search-documents/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2525
<!-- Coverage used to be higher but between additional, unused generated client APIs and unused models' JSON serialization it has been lowered. -->
2626
<!-- In the future this will be cleaned up and coverage should be increased again. -->
27-
<jacoco.min.linecoverage>0.46</jacoco.min.linecoverage>
28-
<jacoco.min.branchcoverage>0.40</jacoco.min.branchcoverage>
27+
<jacoco.min.linecoverage>0.42</jacoco.min.linecoverage>
28+
<jacoco.min.branchcoverage>0.35</jacoco.min.branchcoverage>
2929
<!-- Configures the Java 9+ run to perform the required module exports, opens, and reads that are necessary for testing but shouldn't be part of the module-info. -->
3030
<javaModulesSurefireArgLine>
3131
--add-exports com.azure.core/com.azure.core.implementation.http=ALL-UNNAMED

sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/SearchAsyncClient.java

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1069,12 +1069,8 @@ Mono<Response<Long>> getDocumentCountWithResponse(Context context) {
10691069
* AtomicLong numberOfDocumentsReturned = new AtomicLong&#40;&#41;;
10701070
* searchPagedFlux.byPage&#40;&#41;
10711071
* .takeUntil&#40;page -&gt; &#123;
1072-
* if &#40;numberOfDocumentsReturned.addAndGet&#40;page.getValue&#40;&#41;.size&#40;&#41;&#41; &gt;= SEARCH_SKIP_LIMIT&#41; &#123;
1073-
* &#47;&#47; Reached the $skip limit, stop requesting more documents.
1074-
* return true;
1075-
* &#125;
1076-
*
1077-
* return false;
1072+
* &#47;&#47; Reached the $skip limit, stop requesting more documents.
1073+
* return numberOfDocumentsReturned.addAndGet&#40;page.getValue&#40;&#41;.size&#40;&#41;&#41; &gt;= SEARCH_SKIP_LIMIT;
10781074
* &#125;&#41;
10791075
* .subscribe&#40;resultResponse -&gt; &#123;
10801076
* for &#40;SearchResult result: resultResponse.getValue&#40;&#41;&#41; &#123;
@@ -1126,12 +1122,8 @@ public SearchPagedFlux search(String searchText) {
11261122
* AtomicLong numberOfDocumentsReturned = new AtomicLong&#40;&#41;;
11271123
* searchPagedFlux.byPage&#40;&#41;
11281124
* .takeUntil&#40;page -&gt; &#123;
1129-
* if &#40;numberOfDocumentsReturned.addAndGet&#40;page.getValue&#40;&#41;.size&#40;&#41;&#41; &gt;= SEARCH_SKIP_LIMIT&#41; &#123;
1130-
* &#47;&#47; Reached the $skip limit, stop requesting more documents.
1131-
* return true;
1132-
* &#125;
1133-
*
1134-
* return false;
1125+
* &#47;&#47; Reached the $skip limit, stop requesting more documents.
1126+
* return numberOfDocumentsReturned.addAndGet&#40;page.getValue&#40;&#41;.size&#40;&#41;&#41; &gt;= SEARCH_SKIP_LIMIT;
11351127
* &#125;&#41;
11361128
* .subscribe&#40;resultResponse -&gt; &#123;
11371129
* for &#40;SearchResult result: resultResponse.getValue&#40;&#41;&#41; &#123;
@@ -1186,12 +1178,8 @@ public SearchPagedFlux search(String searchText, String querySourceAuthorization
11861178
* AtomicLong numberOfDocumentsReturned = new AtomicLong&#40;&#41;;
11871179
* pagedFlux.byPage&#40;&#41;
11881180
* .takeUntil&#40;page -&gt; &#123;
1189-
* if &#40;numberOfDocumentsReturned.addAndGet&#40;page.getValue&#40;&#41;.size&#40;&#41;&#41; &gt;= SEARCH_SKIP_LIMIT&#41; &#123;
1190-
* &#47;&#47; Reached the $skip limit, stop requesting more documents.
1191-
* return true;
1192-
* &#125;
1193-
*
1194-
* return false;
1181+
* &#47;&#47; Reached the $skip limit, stop requesting more documents.
1182+
* return numberOfDocumentsReturned.addAndGet&#40;page.getValue&#40;&#41;.size&#40;&#41;&#41; &gt;= SEARCH_SKIP_LIMIT;
11951183
* &#125;&#41;
11961184
* .subscribe&#40;searchResultResponse -&gt; searchResultResponse.getValue&#40;&#41;.forEach&#40;searchDocument -&gt; &#123;
11971185
* for &#40;Map.Entry&lt;String, Object&gt; keyValuePair
@@ -1244,12 +1232,8 @@ public SearchPagedFlux search(String searchText, SearchOptions searchOptions) {
12441232
* AtomicLong numberOfDocumentsReturned = new AtomicLong&#40;&#41;;
12451233
* pagedFlux.byPage&#40;&#41;
12461234
* .takeUntil&#40;page -&gt; &#123;
1247-
* if &#40;numberOfDocumentsReturned.addAndGet&#40;page.getValue&#40;&#41;.size&#40;&#41;&#41; &gt;= SEARCH_SKIP_LIMIT&#41; &#123;
1248-
* &#47;&#47; Reached the $skip limit, stop requesting more documents.
1249-
* return true;
1250-
* &#125;
1251-
*
1252-
* return false;
1235+
* &#47;&#47; Reached the $skip limit, stop requesting more documents.
1236+
* return numberOfDocumentsReturned.addAndGet&#40;page.getValue&#40;&#41;.size&#40;&#41;&#41; &gt;= SEARCH_SKIP_LIMIT;
12531237
* &#125;&#41;
12541238
* .subscribe&#40;searchResultResponse -&gt; searchResultResponse.getValue&#40;&#41;.forEach&#40;searchDocument -&gt; &#123;
12551239
* for &#40;Map.Entry&lt;String, Object&gt; keyValuePair

sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/SearchServiceVersion.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ public enum SearchServiceVersion implements ServiceVersion {
2525
V2024_07_01("2024-07-01"),
2626

2727
/**
28-
* {@code 2024-11-01-preview} service version.
28+
* {@code 2025-08-01-preview} service version.
2929
*/
30-
V2025_05_01_PREVIEW("2025-05-01-preview");
30+
V2025_08_01_PREVIEW("2025-08-01-preview");
3131

3232
private final String version;
3333

@@ -49,6 +49,6 @@ public String getVersion() {
4949
* @return The latest version supported by this client library.
5050
*/
5151
public static SearchServiceVersion getLatest() {
52-
return V2025_05_01_PREVIEW;
52+
return V2025_08_01_PREVIEW;
5353
}
5454
}

sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/agents/models/KnowledgeAgentActivityRecord.java

Lines changed: 46 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
package com.azure.search.documents.agents.models;
88

9+
import com.azure.core.annotation.Fluent;
910
import com.azure.core.annotation.Generated;
10-
import com.azure.core.annotation.Immutable;
1111
import com.azure.json.JsonReader;
1212
import com.azure.json.JsonSerializable;
1313
import com.azure.json.JsonToken;
@@ -17,7 +17,7 @@
1717
/**
1818
* Base type for activity records.
1919
*/
20-
@Immutable
20+
@Fluent
2121
public class KnowledgeAgentActivityRecord implements JsonSerializable<KnowledgeAgentActivityRecord> {
2222
/*
2323
* The type of the activity record.
@@ -31,6 +31,12 @@ public class KnowledgeAgentActivityRecord implements JsonSerializable<KnowledgeA
3131
@Generated
3232
private final int id;
3333

34+
/*
35+
* The elapsed time in milliseconds for the retrieval activity.
36+
*/
37+
@Generated
38+
private Integer elapsedMs;
39+
3440
/**
3541
* Creates an instance of KnowledgeAgentActivityRecord class.
3642
*
@@ -61,6 +67,28 @@ public int getId() {
6167
return this.id;
6268
}
6369

70+
/**
71+
* Get the elapsedMs property: The elapsed time in milliseconds for the retrieval activity.
72+
*
73+
* @return the elapsedMs value.
74+
*/
75+
@Generated
76+
public Integer getElapsedMs() {
77+
return this.elapsedMs;
78+
}
79+
80+
/**
81+
* Set the elapsedMs property: The elapsed time in milliseconds for the retrieval activity.
82+
*
83+
* @param elapsedMs the elapsedMs value to set.
84+
* @return the KnowledgeAgentActivityRecord object itself.
85+
*/
86+
@Generated
87+
public KnowledgeAgentActivityRecord setElapsedMs(Integer elapsedMs) {
88+
this.elapsedMs = elapsedMs;
89+
return this;
90+
}
91+
6492
/**
6593
* {@inheritDoc}
6694
*/
@@ -70,6 +98,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
7098
jsonWriter.writeStartObject();
7199
jsonWriter.writeIntField("id", this.id);
72100
jsonWriter.writeStringField("type", this.type);
101+
jsonWriter.writeNumberField("elapsedMs", this.elapsedMs);
73102
return jsonWriter.writeEndObject();
74103
}
75104

@@ -99,12 +128,18 @@ public static KnowledgeAgentActivityRecord fromJson(JsonReader jsonReader) throw
99128
}
100129
}
101130
// Use the discriminator value to determine which subtype should be deserialized.
102-
if ("AzureSearchQuery".equals(discriminatorValue)) {
103-
return KnowledgeAgentSearchActivityRecord.fromJson(readerToUse.reset());
104-
} else if ("ModelQueryPlanning".equals(discriminatorValue)) {
131+
if ("KnowledgeAgentRetrievalActivityRecord".equals(discriminatorValue)) {
132+
return KnowledgeAgentRetrievalActivityRecord.fromJsonKnownDiscriminator(readerToUse.reset());
133+
} else if ("searchIndex".equals(discriminatorValue)) {
134+
return KnowledgeAgentSearchIndexActivityRecord.fromJson(readerToUse.reset());
135+
} else if ("azureBlob".equals(discriminatorValue)) {
136+
return KnowledgeAgentAzureBlobActivityRecord.fromJson(readerToUse.reset());
137+
} else if ("modelQueryPlanning".equals(discriminatorValue)) {
105138
return KnowledgeAgentModelQueryPlanningActivityRecord.fromJson(readerToUse.reset());
106-
} else if ("AzureSearchSemanticRanker".equals(discriminatorValue)) {
107-
return KnowledgeAgentSemanticRankerActivityRecord.fromJson(readerToUse.reset());
139+
} else if ("modelAnswerSynthesis".equals(discriminatorValue)) {
140+
return KnowledgeAgentModelAnswerSynthesisActivityRecord.fromJson(readerToUse.reset());
141+
} else if ("semanticReranker".equals(discriminatorValue)) {
142+
return KnowledgeAgentSemanticRerankerActivityRecord.fromJson(readerToUse.reset());
108143
} else {
109144
return fromJsonKnownDiscriminator(readerToUse.reset());
110145
}
@@ -118,6 +153,7 @@ static KnowledgeAgentActivityRecord fromJsonKnownDiscriminator(JsonReader jsonRe
118153
boolean idFound = false;
119154
int id = 0;
120155
String type = null;
156+
Integer elapsedMs = null;
121157
while (reader.nextToken() != JsonToken.END_OBJECT) {
122158
String fieldName = reader.getFieldName();
123159
reader.nextToken();
@@ -127,6 +163,8 @@ static KnowledgeAgentActivityRecord fromJsonKnownDiscriminator(JsonReader jsonRe
127163
idFound = true;
128164
} else if ("type".equals(fieldName)) {
129165
type = reader.getString();
166+
} else if ("elapsedMs".equals(fieldName)) {
167+
elapsedMs = reader.getNullable(JsonReader::getInt);
130168
} else {
131169
reader.skipChildren();
132170
}
@@ -135,6 +173,7 @@ static KnowledgeAgentActivityRecord fromJsonKnownDiscriminator(JsonReader jsonRe
135173
KnowledgeAgentActivityRecord deserializedKnowledgeAgentActivityRecord
136174
= new KnowledgeAgentActivityRecord(id);
137175
deserializedKnowledgeAgentActivityRecord.type = type;
176+
deserializedKnowledgeAgentActivityRecord.elapsedMs = elapsedMs;
138177

139178
return deserializedKnowledgeAgentActivityRecord;
140179
}
Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT License.
3+
//
4+
// Code generated by Microsoft (R) AutoRest Code Generator.
5+
// Changes may cause incorrect behavior and will be lost if the code is regenerated.
6+
7+
package com.azure.search.documents.agents.models;
8+
9+
import com.azure.core.annotation.Fluent;
10+
import com.azure.core.annotation.Generated;
11+
import com.azure.json.JsonReader;
12+
import com.azure.json.JsonSerializable;
13+
import com.azure.json.JsonToken;
14+
import com.azure.json.JsonWriter;
15+
import java.io.IOException;
16+
17+
/**
18+
* Represents the arguments the azure blob retrieval activity was run with.
19+
*/
20+
@Fluent
21+
public final class KnowledgeAgentAzureBlobActivityArguments
22+
implements JsonSerializable<KnowledgeAgentAzureBlobActivityArguments> {
23+
/*
24+
* The search string used to query blob contents.
25+
*/
26+
@Generated
27+
private String search;
28+
29+
/**
30+
* Creates an instance of KnowledgeAgentAzureBlobActivityArguments class.
31+
*/
32+
@Generated
33+
public KnowledgeAgentAzureBlobActivityArguments() {
34+
}
35+
36+
/**
37+
* Get the search property: The search string used to query blob contents.
38+
*
39+
* @return the search value.
40+
*/
41+
@Generated
42+
public String getSearch() {
43+
return this.search;
44+
}
45+
46+
/**
47+
* Set the search property: The search string used to query blob contents.
48+
*
49+
* @param search the search value to set.
50+
* @return the KnowledgeAgentAzureBlobActivityArguments object itself.
51+
*/
52+
@Generated
53+
public KnowledgeAgentAzureBlobActivityArguments setSearch(String search) {
54+
this.search = search;
55+
return this;
56+
}
57+
58+
/**
59+
* {@inheritDoc}
60+
*/
61+
@Generated
62+
@Override
63+
public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
64+
jsonWriter.writeStartObject();
65+
jsonWriter.writeStringField("search", this.search);
66+
return jsonWriter.writeEndObject();
67+
}
68+
69+
/**
70+
* Reads an instance of KnowledgeAgentAzureBlobActivityArguments from the JsonReader.
71+
*
72+
* @param jsonReader The JsonReader being read.
73+
* @return An instance of KnowledgeAgentAzureBlobActivityArguments if the JsonReader was pointing to an instance of
74+
* it, or null if it was pointing to JSON null.
75+
* @throws IOException If an error occurs while reading the KnowledgeAgentAzureBlobActivityArguments.
76+
*/
77+
@Generated
78+
public static KnowledgeAgentAzureBlobActivityArguments fromJson(JsonReader jsonReader) throws IOException {
79+
return jsonReader.readObject(reader -> {
80+
KnowledgeAgentAzureBlobActivityArguments deserializedKnowledgeAgentAzureBlobActivityArguments
81+
= new KnowledgeAgentAzureBlobActivityArguments();
82+
while (reader.nextToken() != JsonToken.END_OBJECT) {
83+
String fieldName = reader.getFieldName();
84+
reader.nextToken();
85+
86+
if ("search".equals(fieldName)) {
87+
deserializedKnowledgeAgentAzureBlobActivityArguments.search = reader.getString();
88+
} else {
89+
reader.skipChildren();
90+
}
91+
}
92+
93+
return deserializedKnowledgeAgentAzureBlobActivityArguments;
94+
});
95+
}
96+
}

0 commit comments

Comments
 (0)