Skip to content

Commit a53bbd1

Browse files
committed
Forwarding request timeout and adding more custom machters for tests
1 parent ce40dab commit a53bbd1

File tree

2 files changed

+19
-2
lines changed

2 files changed

+19
-2
lines changed

sdk/ai/azure-ai-agents/src/main/java/com/azure/ai/agents/implementation/http/HttpClientHelper.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import com.azure.core.util.CoreUtils;
1313
import com.azure.core.util.logging.ClientLogger;
1414
import com.openai.core.RequestOptions;
15+
import com.openai.core.Timeout;
1516
import com.openai.core.http.Headers;
1617
import com.openai.core.http.HttpClient;
1718
import com.openai.core.http.HttpRequest;
@@ -21,6 +22,7 @@
2122
import java.io.ByteArrayOutputStream;
2223
import java.io.IOException;
2324
import java.io.UncheckedIOException;
25+
import java.time.Duration;
2426
import java.util.List;
2527
import java.util.Objects;
2628
import java.util.concurrent.CompletableFuture;
@@ -94,7 +96,13 @@ public CompletableFuture<HttpResponse> executeAsync(HttpRequest request, Request
9496
return failedFuture(runtimeException);
9597
}
9698

97-
return this.httpPipeline.send(azureRequest, new Context("azure-eagerly-read-response", true))
99+
Context requestContext = new Context("azure-eagerly-read-response", true);
100+
Timeout timeout = requestOptions.getTimeout();
101+
if (timeout != null && !timeout.connect().isZero() && !timeout.connect().isNegative()) {
102+
requestContext.addData("azure-response-timeout", timeout.connect());
103+
}
104+
105+
return this.httpPipeline.send(azureRequest, requestContext)
98106
.map(response -> (HttpResponse) new AzureHttpResponseAdapter(response))
99107
// .onErrorMap(t -> {
100108
// // 2 or 3 from Azure Errors, should be mapped to Stainless Error.

sdk/ai/azure-ai-agents/src/test/java/com/azure/ai/agents/ClientTestBase.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,16 @@ private void addTestRecordCustomSanitizers() {
105105
}
106106

107107
private void addCustomMatchers() {
108-
interceptorManager.addMatchers(new CustomMatcher().setExcludedHeaders(Arrays.asList("Cookie", "Set-Cookie")));
108+
interceptorManager.addMatchers(new CustomMatcher().setExcludedHeaders(
109+
Arrays.asList("Cookie",
110+
"Set-Cookie",
111+
"X-Stainless-Arch",
112+
"X-Stainless-Lang",
113+
"X-Stainless-OS",
114+
"X-Stainless-OS-Version",
115+
"X-Stainless-Package-Version",
116+
"X-Stainless-Runtime",
117+
"X-Stainless-Runtime-Version")));
109118
}
110119

111120
protected void sleep(long millis) {

0 commit comments

Comments
 (0)