Skip to content

Commit c195108

Browse files
authored
Idickers/2026 04 01 java sdk fix v2 (#48964)
* fix knowledgeBaseName param retrieve bug * regen + fix customizations and tests * tsp fix incorrect package + PR comments * fix whitespace issues
1 parent 2c4777a commit c195108

12 files changed

Lines changed: 167 additions & 205 deletions

File tree

sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/implementation/KnowledgeBaseRetrievalClientImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ Response<BinaryData> retrieveSync(@HostParam("endpoint") String endpoint,
236236
* ]
237237
* activity (Optional): [
238238
* (Optional){
239-
* type: String(searchIndex/azureBlob/indexedOneLake/web/agenticReasoning) (Required)
239+
* type: String(searchIndex/azureBlob/indexedOneLake/web/modelWebSummarization/agenticReasoning) (Required)
240240
* id: int (Required)
241241
* elapsedMs: Integer (Optional)
242242
* error (Optional): {
@@ -336,7 +336,7 @@ public Mono<Response<BinaryData>> retrieveWithResponseAsync(BinaryData retrieval
336336
* ]
337337
* activity (Optional): [
338338
* (Optional){
339-
* type: String(searchIndex/azureBlob/indexedOneLake/web/agenticReasoning) (Required)
339+
* type: String(searchIndex/azureBlob/indexedOneLake/web/modelWebSummarization/agenticReasoning) (Required)
340340
* id: int (Required)
341341
* elapsedMs: Integer (Optional)
342342
* error (Optional): {

sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/KnowledgeSourceIngestionPermissionOption.java

Lines changed: 0 additions & 64 deletions
This file was deleted.

sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/knowledgebases/KnowledgeBaseRetrievalAsyncClient.java

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ public SearchServiceVersion getServiceVersion() {
8080
* </table>
8181
* You can add these to a request with {@link RequestOptions#addHeader}
8282
*
83-
* @param knowledgeBaseName The name of the knowledge base.
8483
* @param retrievalRequest The retrieval request to process.
8584
* @param requestOptions The options to configure the HTTP request before HTTP client sends it.
8685
* @throws HttpResponseException thrown if the request is rejected by server.
@@ -91,8 +90,8 @@ public SearchServiceVersion getServiceVersion() {
9190
* {@link Mono}.
9291
*/
9392
@ServiceMethod(returns = ReturnType.SINGLE)
94-
public Mono<Response<KnowledgeBaseRetrievalResult>> retrieveWithResponse(String knowledgeBaseName,
95-
KnowledgeBaseRetrievalOptions retrievalRequest, RequestOptions requestOptions) {
93+
public Mono<Response<KnowledgeBaseRetrievalResult>>
94+
retrieveWithResponse(KnowledgeBaseRetrievalOptions retrievalRequest, RequestOptions requestOptions) {
9695
return mapResponse(
9796
this.serviceClient.retrieveWithResponseAsync(BinaryData.fromObject(retrievalRequest), requestOptions),
9897
KnowledgeBaseRetrievalResult.class);
@@ -143,7 +142,7 @@ public Mono<Response<KnowledgeBaseRetrievalResult>> retrieveWithResponse(String
143142
* ]
144143
* activity (Optional): [
145144
* (Optional){
146-
* type: String(searchIndex/azureBlob/indexedOneLake/web/agenticReasoning) (Required)
145+
* type: String(searchIndex/azureBlob/indexedOneLake/web/modelWebSummarization/agenticReasoning) (Required)
147146
* id: int (Required)
148147
* elapsedMs: Integer (Optional)
149148
* error (Optional): {
@@ -216,23 +215,4 @@ public Mono<KnowledgeBaseRetrievalResult> retrieve(KnowledgeBaseRetrievalOptions
216215
.flatMap(FluxUtil::toMono)
217216
.map(protocolMethodData -> protocolMethodData.toObject(KnowledgeBaseRetrievalResult.class));
218217
}
219-
220-
/**
221-
* KnowledgeBase retrieves relevant data from backing stores.
222-
*
223-
* @param knowledgeBaseName The name of the knowledge base.
224-
* @param retrievalRequest The retrieval request to process.
225-
* @throws IllegalArgumentException thrown if parameters fail the validation.
226-
* @throws HttpResponseException thrown if the request is rejected by server.
227-
* @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
228-
* @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
229-
* @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
230-
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
231-
* @return the output contract for the retrieval response on successful completion of {@link Mono}.
232-
*/
233-
@ServiceMethod(returns = ReturnType.SINGLE)
234-
public Mono<KnowledgeBaseRetrievalResult> retrieve(String knowledgeBaseName,
235-
KnowledgeBaseRetrievalOptions retrievalRequest) {
236-
return retrieveWithResponse(knowledgeBaseName, retrievalRequest, new RequestOptions()).map(Response::getValue);
237-
}
238218
}

sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/knowledgebases/KnowledgeBaseRetrievalClient.java

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ public SearchServiceVersion getServiceVersion() {
7878
* </table>
7979
* You can add these to a request with {@link RequestOptions#addHeader}
8080
*
81-
* @param knowledgeBaseName The name of the knowledge base.
8281
* @param retrievalRequest The retrieval request to process.
8382
* @param requestOptions The options to configure the HTTP request before HTTP client sends it.
8483
* @throws HttpResponseException thrown if the request is rejected by server.
@@ -88,8 +87,8 @@ public SearchServiceVersion getServiceVersion() {
8887
* @return the output contract for the retrieval response along with {@link Response}.
8988
*/
9089
@ServiceMethod(returns = ReturnType.SINGLE)
91-
public Response<KnowledgeBaseRetrievalResult> retrieveWithResponse(String knowledgeBaseName,
92-
KnowledgeBaseRetrievalOptions retrievalRequest, RequestOptions requestOptions) {
90+
public Response<KnowledgeBaseRetrievalResult> retrieveWithResponse(KnowledgeBaseRetrievalOptions retrievalRequest,
91+
RequestOptions requestOptions) {
9392
return convertResponse(
9493
this.serviceClient.retrieveWithResponse(BinaryData.fromObject(retrievalRequest), requestOptions),
9594
KnowledgeBaseRetrievalResult.class);
@@ -140,7 +139,7 @@ public Response<KnowledgeBaseRetrievalResult> retrieveWithResponse(String knowle
140139
* ]
141140
* activity (Optional): [
142141
* (Optional){
143-
* type: String(searchIndex/azureBlob/indexedOneLake/web/agenticReasoning) (Required)
142+
* type: String(searchIndex/azureBlob/indexedOneLake/web/modelWebSummarization/agenticReasoning) (Required)
144143
* id: int (Required)
145144
* elapsedMs: Integer (Optional)
146145
* error (Optional): {
@@ -211,23 +210,4 @@ public KnowledgeBaseRetrievalResult retrieve(KnowledgeBaseRetrievalOptions retri
211210
return hiddenGeneratedRetrieveWithResponse(BinaryData.fromObject(retrievalRequest), requestOptions).getValue()
212211
.toObject(KnowledgeBaseRetrievalResult.class);
213212
}
214-
215-
/**
216-
* KnowledgeBase retrieves relevant data from backing stores.
217-
*
218-
* @param knowledgeBaseName The name of the knowledge base.
219-
* @param retrievalRequest The retrieval request to process.
220-
* @throws IllegalArgumentException thrown if parameters fail the validation.
221-
* @throws HttpResponseException thrown if the request is rejected by server.
222-
* @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
223-
* @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
224-
* @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
225-
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
226-
* @return the output contract for the retrieval response.
227-
*/
228-
@ServiceMethod(returns = ReturnType.SINGLE)
229-
public KnowledgeBaseRetrievalResult retrieve(String knowledgeBaseName,
230-
KnowledgeBaseRetrievalOptions retrievalRequest) {
231-
return retrieveWithResponse(knowledgeBaseName, retrievalRequest, new RequestOptions()).getValue();
232-
}
233213
}

sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/knowledgebases/models/KnowledgeBaseActivityRecord.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,9 @@ public static KnowledgeBaseActivityRecord fromJson(JsonReader jsonReader) throws
160160
}
161161
}
162162
// Use the discriminator value to determine which subtype should be deserialized.
163-
if ("agenticReasoning".equals(discriminatorValue)) {
163+
if ("modelWebSummarization".equals(discriminatorValue)) {
164+
return KnowledgeBaseModelWebSummarizationActivityRecord.fromJson(readerToUse.reset());
165+
} else if ("agenticReasoning".equals(discriminatorValue)) {
164166
return KnowledgeBaseAgenticReasoningActivityRecord.fromJson(readerToUse.reset());
165167
} else {
166168
return fromJsonKnownDiscriminator(readerToUse.reset());

sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/knowledgebases/models/KnowledgeBaseActivityRecordType.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,10 @@ public static KnowledgeBaseActivityRecordType fromString(String name) {
7272
public static Collection<KnowledgeBaseActivityRecordType> values() {
7373
return values(KnowledgeBaseActivityRecordType.class);
7474
}
75+
76+
/**
77+
* LLM web summarization activity.
78+
*/
79+
@Generated
80+
public static final KnowledgeBaseActivityRecordType MODEL_WEB_SUMMARIZATION = fromString("modelWebSummarization");
7581
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT License.
3+
// Code generated by Microsoft (R) TypeSpec Code Generator.
4+
package com.azure.search.documents.knowledgebases.models;
5+
6+
import com.azure.core.annotation.Generated;
7+
import com.azure.core.annotation.Immutable;
8+
import com.azure.json.JsonReader;
9+
import com.azure.json.JsonToken;
10+
import com.azure.json.JsonWriter;
11+
import java.io.IOException;
12+
13+
/**
14+
* Represents an LLM web summarization activity record.
15+
*/
16+
@Immutable
17+
public final class KnowledgeBaseModelWebSummarizationActivityRecord extends KnowledgeBaseActivityRecord {
18+
19+
/*
20+
* The type of the activity record.
21+
*/
22+
@Generated
23+
private KnowledgeBaseActivityRecordType type = KnowledgeBaseActivityRecordType.MODEL_WEB_SUMMARIZATION;
24+
25+
/*
26+
* The number of input tokens for the LLM web summarization activity.
27+
*/
28+
@Generated
29+
private Integer inputTokens;
30+
31+
/*
32+
* The number of output tokens for the LLM web summarization activity.
33+
*/
34+
@Generated
35+
private Integer outputTokens;
36+
37+
/**
38+
* Creates an instance of KnowledgeBaseModelWebSummarizationActivityRecord class.
39+
*
40+
* @param id the id value to set.
41+
*/
42+
@Generated
43+
private KnowledgeBaseModelWebSummarizationActivityRecord(int id) {
44+
super(id);
45+
}
46+
47+
/**
48+
* Get the type property: The type of the activity record.
49+
*
50+
* @return the type value.
51+
*/
52+
@Generated
53+
@Override
54+
public KnowledgeBaseActivityRecordType getType() {
55+
return this.type;
56+
}
57+
58+
/**
59+
* Get the inputTokens property: The number of input tokens for the LLM web summarization activity.
60+
*
61+
* @return the inputTokens value.
62+
*/
63+
@Generated
64+
public Integer getInputTokens() {
65+
return this.inputTokens;
66+
}
67+
68+
/**
69+
* Get the outputTokens property: The number of output tokens for the LLM web summarization activity.
70+
*
71+
* @return the outputTokens value.
72+
*/
73+
@Generated
74+
public Integer getOutputTokens() {
75+
return this.outputTokens;
76+
}
77+
78+
/**
79+
* {@inheritDoc}
80+
*/
81+
@Generated
82+
@Override
83+
public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
84+
jsonWriter.writeStartObject();
85+
jsonWriter.writeIntField("id", getId());
86+
jsonWriter.writeNumberField("elapsedMs", getElapsedMs());
87+
jsonWriter.writeJsonField("error", getError());
88+
jsonWriter.writeStringField("type", this.type == null ? null : this.type.toString());
89+
jsonWriter.writeNumberField("inputTokens", this.inputTokens);
90+
jsonWriter.writeNumberField("outputTokens", this.outputTokens);
91+
return jsonWriter.writeEndObject();
92+
}
93+
94+
/**
95+
* Reads an instance of KnowledgeBaseModelWebSummarizationActivityRecord from the JsonReader.
96+
*
97+
* @param jsonReader The JsonReader being read.
98+
* @return An instance of KnowledgeBaseModelWebSummarizationActivityRecord if the JsonReader was pointing to an
99+
* instance of it, or null if it was pointing to JSON null.
100+
* @throws IllegalStateException If the deserialized JSON object was missing any required properties.
101+
* @throws IOException If an error occurs while reading the KnowledgeBaseModelWebSummarizationActivityRecord.
102+
*/
103+
@Generated
104+
public static KnowledgeBaseModelWebSummarizationActivityRecord fromJson(JsonReader jsonReader) throws IOException {
105+
return jsonReader.readObject(reader -> {
106+
int id = 0;
107+
Integer elapsedMs = null;
108+
KnowledgeBaseErrorDetail error = null;
109+
KnowledgeBaseActivityRecordType type = KnowledgeBaseActivityRecordType.MODEL_WEB_SUMMARIZATION;
110+
Integer inputTokens = null;
111+
Integer outputTokens = null;
112+
while (reader.nextToken() != JsonToken.END_OBJECT) {
113+
String fieldName = reader.getFieldName();
114+
reader.nextToken();
115+
if ("id".equals(fieldName)) {
116+
id = reader.getInt();
117+
} else if ("elapsedMs".equals(fieldName)) {
118+
elapsedMs = reader.getNullable(JsonReader::getInt);
119+
} else if ("error".equals(fieldName)) {
120+
error = KnowledgeBaseErrorDetail.fromJson(reader);
121+
} else if ("type".equals(fieldName)) {
122+
type = KnowledgeBaseActivityRecordType.fromString(reader.getString());
123+
} else if ("inputTokens".equals(fieldName)) {
124+
inputTokens = reader.getNullable(JsonReader::getInt);
125+
} else if ("outputTokens".equals(fieldName)) {
126+
outputTokens = reader.getNullable(JsonReader::getInt);
127+
} else {
128+
reader.skipChildren();
129+
}
130+
}
131+
KnowledgeBaseModelWebSummarizationActivityRecord deserializedKnowledgeBaseModelWebSummarizationActivityRecord
132+
= new KnowledgeBaseModelWebSummarizationActivityRecord(id);
133+
deserializedKnowledgeBaseModelWebSummarizationActivityRecord.setElapsedMs(elapsedMs);
134+
deserializedKnowledgeBaseModelWebSummarizationActivityRecord.setError(error);
135+
deserializedKnowledgeBaseModelWebSummarizationActivityRecord.type = type;
136+
deserializedKnowledgeBaseModelWebSummarizationActivityRecord.inputTokens = inputTokens;
137+
deserializedKnowledgeBaseModelWebSummarizationActivityRecord.outputTokens = outputTokens;
138+
return deserializedKnowledgeBaseModelWebSummarizationActivityRecord;
139+
});
140+
}
141+
}

0 commit comments

Comments
 (0)