feat: Add read and write timeout options to Java GenAI SDK.

FUTURE_COPYBARA_INTEGRATE_REVIEW=#602 from ed-irl:ed-irl/548-add-timeouts-for-all-http-client-settings fa66abb
PiperOrigin-RevId: 828551025

Author: ed-irl

src/main/java/com/google/genai/ApiClient.java

@@ -242,6 +242,12 @@ private OkHttpClient createHttpClient(
           Dispatcher dispatcher = new Dispatcher();
           options.maxConnections().ifPresent(dispatcher::setMaxRequests);
           options.maxConnectionsPerHost().ifPresent(dispatcher::setMaxRequestsPerHost);
+          options
+              .readTimeout()
+              .ifPresent(readTimeout -> builder.readTimeout(Duration.ofMillis(readTimeout)));
+          options
+              .writeTimeout()
+              .ifPresent(writeTimeout -> builder.writeTimeout(Duration.ofMillis(writeTimeout)));
           builder.dispatcher(dispatcher);
         });
 

src/main/java/com/google/genai/types/ClientOptions.java

@@ -38,6 +38,14 @@ public abstract class ClientOptions extends JsonSerializable {
   @JsonProperty("maxConnectionsPerHost")
   public abstract Optional<Integer> maxConnectionsPerHost();
 
+  /** The read timeout for the request in milliseconds. */
+  @JsonProperty("readTimeout")
+  public abstract Optional<Integer> readTimeout();
+
+  /** The write timeout for the request in milliseconds. */
+  @JsonProperty("writeTimeout")
+  public abstract Optional<Integer> writeTimeout();
+
   /** Instantiates a builder for ClientOptions. */
   @ExcludeFromGeneratedCoverageReport
   public static Builder builder() {
@@ -92,6 +100,42 @@ public Builder clearMaxConnectionsPerHost() {
       return maxConnectionsPerHost(Optional.empty());
     }
 
+    /**
+     * Setter for readTimeout.
+     *
+     * <p>readTimeout: The read timeout for the request in milliseconds.
+     */
+    @JsonProperty("readTimeout")
+    public abstract Builder readTimeout(Integer readTimeout);
+
+    @ExcludeFromGeneratedCoverageReport
+    abstract Builder readTimeout(Optional<Integer> readTimeout);
+
+    /** Clears the value of readTimeout field. */
+    @ExcludeFromGeneratedCoverageReport
+    @CanIgnoreReturnValue
+    public Builder clearReadTimeout() {
+      return readTimeout(Optional.empty());
+    }
+
+    /**
+     * Setter for writeTimeout.
+     *
+     * <p>writeTimeout: The write timeout for the request in milliseconds.
+     */
+    @JsonProperty("writeTimeout")
+    public abstract Builder writeTimeout(Integer writeTimeout);
+
+    @ExcludeFromGeneratedCoverageReport
+    abstract Builder writeTimeout(Optional<Integer> writeTimeout);
+
+    /** Clears the value of writeTimeout field. */
+    @ExcludeFromGeneratedCoverageReport
+    @CanIgnoreReturnValue
+    public Builder clearWriteTimeout() {
+      return writeTimeout(Optional.empty());
+    }
+
     public abstract ClientOptions build();
   }
 

src/test/java/com/google/genai/HttpApiClientTest.java

@@ -979,22 +979,25 @@ public void testHttpClientVertexWithRequestLevelRetryOptions() throws Exception
   @Test
   public void testHttpClientMldevCustomClientOptions() throws Exception {
     ClientOptions clientOptions =
-        ClientOptions.builder().maxConnections(64).maxConnectionsPerHost(16).build();
+        ClientOptions.builder().maxConnections(64).maxConnectionsPerHost(16).readTimeout(5000).writeTimeout(4000).build();
     HttpApiClient client =
         new HttpApiClient(Optional.of(API_KEY), Optional.empty(), Optional.of(clientOptions));
 
     Dispatcher dispatcher = client.httpClient().dispatcher();
+    OkHttpClient httpClient = client.httpClient();
 
     assertEquals(API_KEY, client.apiKey());
     assertFalse(client.vertexAI());
     assertEquals(64, dispatcher.getMaxRequests());
     assertEquals(16, dispatcher.getMaxRequestsPerHost());
+    assertEquals(5000, httpClient.readTimeoutMillis());
+    assertEquals(4000, httpClient.writeTimeoutMillis());
   }
 
   @Test
   public void testHttpClientVertexCustomClientOptions() throws Exception {
     ClientOptions clientOptions =
-        ClientOptions.builder().maxConnections(64).maxConnectionsPerHost(16).build();
+        ClientOptions.builder().maxConnections(64).maxConnectionsPerHost(16).readTimeout(5000).writeTimeout(4000).build();
     HttpApiClient client =
         new HttpApiClient(
             Optional.empty(),
@@ -1005,12 +1008,15 @@ public void testHttpClientVertexCustomClientOptions() throws Exception {
             Optional.of(clientOptions));
 
     Dispatcher dispatcher = client.httpClient().dispatcher();
+    OkHttpClient httpClient = client.httpClient();
 
     assertEquals(PROJECT, client.project());
     assertEquals(LOCATION, client.location());
     assertTrue(client.vertexAI());
     assertEquals(64, dispatcher.getMaxRequests());
     assertEquals(16, dispatcher.getMaxRequestsPerHost());
+    assertEquals(5000, httpClient.readTimeoutMillis());
+    assertEquals(4000, httpClient.writeTimeoutMillis());
   }
 
   @Test
@@ -1019,6 +1025,7 @@ public void testHttpClientMldevDefaultClientOptions() throws Exception {
         new HttpApiClient(Optional.of(API_KEY), Optional.empty(), Optional.empty());
 
     Dispatcher dispatcher = client.httpClient().dispatcher();
+    OkHttpClient httpClient = client.httpClient();
 
     // Default values for max connections and max connections per host are 64 and 5 respectively
     // (set by OkHttp). When maxConnectionsPerHost is not set, the dispatcher's maxRequestsPerHost
@@ -1027,6 +1034,8 @@ public void testHttpClientMldevDefaultClientOptions() throws Exception {
     assertEquals(5, dispatcher.getMaxRequestsPerHost());
     assertEquals(API_KEY, client.apiKey());
     assertFalse(client.vertexAI());
+    assertEquals(0, httpClient.readTimeoutMillis());
+    assertEquals(0, httpClient.writeTimeoutMillis());
   }
 
   @Test