[integration][openai] Align default parameters for openai chat model between java and python

integrations/chat-models/openai/src/main/java/org/apache/flink/agents/integrations/chatmodels/openai/AzureOpenAIChatModelConnection.java

@@ -46,6 +46,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 
 /**
@@ -66,10 +67,9 @@
  * <p>Optional connection arguments:
  *
  * <ul>
- *   <li><b>timeout</b> (Number): seconds before an API call times out; must be greater than 0,
- *       otherwise ignored (SDK default applies)
- *   <li><b>max_retries</b> (Number): retry attempts on failure; must be non-negative, otherwise
- *       ignored (SDK default applies)
+ *   <li><b>timeout</b> (Number): seconds before an API call times out; must be greater than 0
+ *       (default: 60)
+ *   <li><b>max_retries</b> (Number): retry attempts on failure; must be non-negative (default: 3)
  *   <li><b>azure_url_path_mode</b> (String): one of {@code "AUTO"}, {@code "LEGACY"}, or {@code
  *       "UNIFIED"} (default {@code "AUTO"}). Controls how the SDK constructs Azure OpenAI request
  *       URLs. In {@code AUTO} mode the SDK only treats the endpoint as Azure when its hostname
@@ -99,6 +99,8 @@ public class AzureOpenAIChatModelConnection extends BaseChatModelConnection {
             Set.of("model", "model_of_azure_deployment", "temperature", "max_tokens", "logprobs");
 
     private final OpenAIClient client;
+    private final int timeoutSeconds;
+    private final int maxRetries;
 
     public AzureOpenAIChatModelConnection(
             ResourceDescriptor descriptor, ResourceContext resourceContext) {
@@ -125,15 +127,21 @@ public AzureOpenAIChatModelConnection(
                         .credential(AzureApiKeyCredential.create(apiKey))
                         .azureServiceVersion(AzureOpenAIServiceVersion.fromString(apiVersion));
 
-        Integer timeoutSeconds = descriptor.getArgument("timeout");
-        if (timeoutSeconds != null && timeoutSeconds > 0) {
-            clientBuilder.timeout(Duration.ofSeconds(timeoutSeconds));
-        }
-
-        Integer maxRetries = descriptor.getArgument("max_retries");
-        if (maxRetries != null && maxRetries >= 0) {
-            clientBuilder.maxRetries(maxRetries);
-        }
+        int rawTimeout =
+                Optional.ofNullable(descriptor.<Number>getArgument("timeout"))
+                        .map(Number::intValue)
+                        .orElse(OpenAIChatCompletionsUtils.DEFAULT_TIMEOUT_SECONDS);
+        this.timeoutSeconds =
+                rawTimeout > 0 ? rawTimeout : OpenAIChatCompletionsUtils.DEFAULT_TIMEOUT_SECONDS;
+        clientBuilder.timeout(Duration.ofSeconds(this.timeoutSeconds));
+
+        int rawRetries =
+                Optional.ofNullable(descriptor.<Number>getArgument("max_retries"))
+                        .map(Number::intValue)
+                        .orElse(OpenAIChatCompletionsUtils.DEFAULT_MAX_RETRIES);
+        this.maxRetries =
+                rawRetries >= 0 ? rawRetries : OpenAIChatCompletionsUtils.DEFAULT_MAX_RETRIES;
+        clientBuilder.maxRetries(this.maxRetries);
 
         String azureUrlPathMode = descriptor.getArgument("azure_url_path_mode");
         if (azureUrlPathMode != null && !azureUrlPathMode.isBlank()) {
@@ -151,6 +159,16 @@ public AzureOpenAIChatModelConnection(
         this.client = clientBuilder.build();
     }
 
+    // visible for testing
+    int getTimeoutSeconds() {
+        return timeoutSeconds;
+    }
+
+    // visible for testing
+    int getMaxRetries() {
+        return maxRetries;
+    }
+
     @Override
     public ChatMessage chat(
             List<ChatMessage> messages, List<Tool> tools, Map<String, Object> modelParams) {

integrations/chat-models/openai/src/main/java/org/apache/flink/agents/integrations/chatmodels/openai/OpenAIChatCompletionsUtils.java

@@ -52,6 +52,12 @@ final class OpenAIChatCompletionsUtils {
 
     private OpenAIChatCompletionsUtils() {}
 
+    /** default timeout in seconds for openai api requests (aligned with python sdk). */
+    static final int DEFAULT_TIMEOUT_SECONDS = 60;
+
+    /** default max retries for openai api requests (aligned with python sdk). */
+    static final int DEFAULT_MAX_RETRIES = 3;
+
     private static final ObjectMapper mapper = new ObjectMapper();
     private static final TypeReference<Map<String, Object>> MAP_TYPE = new TypeReference<>() {};
 

integrations/chat-models/openai/src/main/java/org/apache/flink/agents/integrations/chatmodels/openai/OpenAICompletionsConnection.java

@@ -43,6 +43,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * A chat model integration for the OpenAI Chat Completions service using the official Java SDK.
@@ -53,8 +54,8 @@
  *   <li><b>api_key</b> (required): OpenAI API key
  *   <li><b>api_base_url</b> (optional): Base URL for OpenAI API (defaults to
  *       https://api.openai.com/v1)
- *   <li><b>timeout</b> (optional): Timeout in seconds for API requests
- *   <li><b>max_retries</b> (optional): Maximum number of retry attempts (default: 2)
+ *   <li><b>timeout</b> (optional): Timeout in seconds for API requests (default: 60)
+ *   <li><b>max_retries</b> (optional): Maximum number of retry attempts (default: 3)
  *   <li><b>default_headers</b> (optional): Map of default headers to include in all requests
  *   <li><b>model</b> (optional): Default model to use if not specified in setup
  * </ul>
@@ -81,6 +82,8 @@ public class OpenAICompletionsConnection extends BaseChatModelConnection {
     private static final ObjectMapper mapper = new ObjectMapper();
     private final OpenAIClient client;
     private final String defaultModel;
+    private final int timeoutSeconds;
+    private final int maxRetries;
 
     public OpenAICompletionsConnection(
             ResourceDescriptor descriptor, ResourceContext resourceContext) {
@@ -98,15 +101,21 @@ public OpenAICompletionsConnection(
             builder.baseUrl(apiBaseUrl);
         }
 
-        Integer timeoutSeconds = descriptor.getArgument("timeout");
-        if (timeoutSeconds != null && timeoutSeconds > 0) {
-            builder.timeout(Duration.ofSeconds(timeoutSeconds));
-        }
-
-        Integer maxRetries = descriptor.getArgument("max_retries");
-        if (maxRetries != null && maxRetries >= 0) {
-            builder.maxRetries(maxRetries);
-        }
+        int rawTimeout =
+                Optional.ofNullable(descriptor.<Number>getArgument("timeout"))
+                        .map(Number::intValue)
+                        .orElse(OpenAIChatCompletionsUtils.DEFAULT_TIMEOUT_SECONDS);
+        this.timeoutSeconds =
+                rawTimeout > 0 ? rawTimeout : OpenAIChatCompletionsUtils.DEFAULT_TIMEOUT_SECONDS;
+        builder.timeout(Duration.ofSeconds(this.timeoutSeconds));
+
+        int rawRetries =
+                Optional.ofNullable(descriptor.<Number>getArgument("max_retries"))
+                        .map(Number::intValue)
+                        .orElse(OpenAIChatCompletionsUtils.DEFAULT_MAX_RETRIES);
+        this.maxRetries =
+                rawRetries >= 0 ? rawRetries : OpenAIChatCompletionsUtils.DEFAULT_MAX_RETRIES;
+        builder.maxRetries(this.maxRetries);
 
         Map<String, String> defaultHeaders = descriptor.getArgument("default_headers");
         if (defaultHeaders != null && !defaultHeaders.isEmpty()) {
@@ -119,6 +128,16 @@ public OpenAICompletionsConnection(
         this.client = builder.build();
     }
 
+    // visible for testing
+    int getTimeoutSeconds() {
+        return timeoutSeconds;
+    }
+
+    // visible for testing
+    int getMaxRetries() {
+        return maxRetries;
+    }
+
     @Override
     public ChatMessage chat(
             List<ChatMessage> messages, List<Tool> tools, Map<String, Object> modelParams) {

integrations/chat-models/openai/src/test/java/org/apache/flink/agents/integrations/chatmodels/openai/AzureOpenAIChatModelConnectionTest.java

@@ -98,6 +98,39 @@ void testConstructorAllRequiredArgs() {
         assertThat(conn).isInstanceOf(BaseChatModelConnection.class);
     }
 
+    @Test
+    @DisplayName("Defaults resolve to timeout=60 and max_retries=3 when not specified")
+    void testDefaultTimeoutAndMaxRetries() {
+        ResourceDescriptor desc =
+                connectionDescriptor()
+                        .addInitialArgument("api_key", "test-key")
+                        .addInitialArgument("api_version", "2024-02-01")
+                        .addInitialArgument("azure_endpoint", "https://example.openai.azure.com")
+                        .build();
+        AzureOpenAIChatModelConnection conn = new AzureOpenAIChatModelConnection(desc, NOOP);
+
+        assertThat(conn.getTimeoutSeconds())
+                .isEqualTo(OpenAIChatCompletionsUtils.DEFAULT_TIMEOUT_SECONDS);
+        assertThat(conn.getMaxRetries()).isEqualTo(OpenAIChatCompletionsUtils.DEFAULT_MAX_RETRIES);
+    }
+
+    @Test
+    @DisplayName("Explicit timeout and max_retries override the defaults")
+    void testExplicitTimeoutAndMaxRetriesOverride() {
+        ResourceDescriptor desc =
+                connectionDescriptor()
+                        .addInitialArgument("api_key", "test-key")
+                        .addInitialArgument("api_version", "2024-02-01")
+                        .addInitialArgument("azure_endpoint", "https://example.openai.azure.com")
+                        .addInitialArgument("timeout", 120)
+                        .addInitialArgument("max_retries", 5)
+                        .build();
+        AzureOpenAIChatModelConnection conn = new AzureOpenAIChatModelConnection(desc, NOOP);
+
+        assertThat(conn.getTimeoutSeconds()).isEqualTo(120);
+        assertThat(conn.getMaxRetries()).isEqualTo(5);
+    }
+
     @Test
     @DisplayName("chat() rejects additional_kwargs that collide with reserved typed fields")
     void testChatRejectsReservedKeyInAdditionalKwargs() {

integrations/chat-models/openai/src/test/java/org/apache/flink/agents/integrations/chatmodels/openai/OpenAICompletionsConnectionTest.java

@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.agents.integrations.chatmodels.openai;
+
+import org.apache.flink.agents.api.chat.model.BaseChatModelConnection;
+import org.apache.flink.agents.api.resource.ResourceContext;
+import org.apache.flink.agents.api.resource.ResourceDescriptor;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+/**
+ * Unit tests for {@link OpenAICompletionsConnection} — constructor validation and default
+ * resolution only, no network access.
+ */
+class OpenAICompletionsConnectionTest {
+
+    private static final ResourceContext NOOP = ResourceContext.fromGetResource((a, b) -> null);
+
+    private static ResourceDescriptor.Builder connectionDescriptor() {
+        return ResourceDescriptor.Builder.newBuilder(OpenAICompletionsConnection.class.getName());
+    }
+
+    @Test
+    @DisplayName("Constructor throws when api_key is missing")
+    void testConstructorMissingApiKey() {
+        ResourceDescriptor desc = connectionDescriptor().build();
+        assertThatThrownBy(() -> new OpenAICompletionsConnection(desc, NOOP))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessageContaining("api_key");
+    }
+
+    @Test
+    @DisplayName("Constructor succeeds with api_key only (no network call)")
+    void testConstructorMinimal() {
+        ResourceDescriptor desc =
+                connectionDescriptor().addInitialArgument("api_key", "test-key").build();
+        OpenAICompletionsConnection conn = new OpenAICompletionsConnection(desc, NOOP);
+        assertThat(conn).isInstanceOf(BaseChatModelConnection.class);
+    }
+
+    @Test
+    @DisplayName("Defaults resolve to timeout=60 and max_retries=3 when not specified")
+    void testDefaultTimeoutAndMaxRetries() {
+        ResourceDescriptor desc =
+                connectionDescriptor().addInitialArgument("api_key", "test-key").build();
+        OpenAICompletionsConnection conn = new OpenAICompletionsConnection(desc, NOOP);
+
+        assertThat(conn.getTimeoutSeconds())
+                .isEqualTo(OpenAIChatCompletionsUtils.DEFAULT_TIMEOUT_SECONDS);
+        assertThat(conn.getMaxRetries()).isEqualTo(OpenAIChatCompletionsUtils.DEFAULT_MAX_RETRIES);
+    }
+
+    @Test
+    @DisplayName("Explicit timeout and max_retries override the defaults")
+    void testExplicitOverrides() {
+        ResourceDescriptor desc =
+                connectionDescriptor()
+                        .addInitialArgument("api_key", "test-key")
+                        .addInitialArgument("timeout", 120)
+                        .addInitialArgument("max_retries", 5)
+                        .build();
+        OpenAICompletionsConnection conn = new OpenAICompletionsConnection(desc, NOOP);
+
+        assertThat(conn.getTimeoutSeconds()).isEqualTo(120);
+        assertThat(conn.getMaxRetries()).isEqualTo(5);
+    }
+}

python/flink_agents/integrations/chat_models/openai/tests/test_openai_chat_model.py

@@ -121,3 +121,12 @@ def test_default_model_when_omitted() -> None:
     """Verify per-integration default applies when `model` is omitted from __init__."""
     setup = OpenAIChatModelSetup(connection="conn")
     assert setup.model == DEFAULT_OPENAI_MODEL
+
+
+def test_connection_default_timeout_and_max_retries() -> None:
+    """Pin canonical connection defaults to prevent silent drift."""
+    conn = OpenAIChatModelConnection(
+        name="test", api_key="fake", api_base_url="http://localhost"
+    )
+    assert conn.timeout == 60.0
+    assert conn.max_retries == 3