Ashfaqbs commented on code in PR #1071:
URL: https://github.com/apache/flink-agents/pull/1071#discussion_r3892235409
##########
plan/src/main/java/org/apache/flink/agents/plan/actions/ChatModelInvoker.java:
##########
@@ -182,6 +182,12 @@ public ChatMessage call() throws Exception {
}
return new ChatAttemptResult(
model, chatModel, response, actualRetryCount,
totalWaitTimeSec);
+ } catch (InterruptedException e) {
+ // A cancellation signal, not a model failure: restore the
interrupt status and
+ // propagate immediately so task shutdown isn't delayed by
retry backoff or an
+ // extra model call, regardless of the configured
error-handling strategy.
+ Thread.currentThread().interrupt();
+ throw e;
} catch (Exception e) {
Review Comment:
Confirmed, good catch — the sleep sits in the sibling `catch (Exception e)`
block, not the `InterruptedException` handler above it, so it wasn't covered by
that fix. Wrapped it the same way (restore flag, rethrow) in c30ba894.
##########
plan/src/test/java/org/apache/flink/agents/plan/actions/ChatModelInvokerTest.java:
##########
@@ -0,0 +1,109 @@
+/*
+ * 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.plan.actions;
+
+import org.apache.flink.agents.api.agents.Agent;
+import org.apache.flink.agents.api.agents.AgentExecutionOptions;
+import org.apache.flink.agents.api.chat.model.BaseChatModelSetup;
+import org.apache.flink.agents.api.configuration.ReadableConfiguration;
+import org.apache.flink.agents.api.context.RunnerContext;
+import org.apache.flink.agents.api.metrics.FlinkAgentsMetricGroup;
+import org.apache.flink.agents.api.resource.ResourceType;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/** Tests for {@link ChatModelInvoker}. */
+class ChatModelInvokerTest {
+
+ @Test
+ void testChatWithRetriesDoesNotRetryOnInterruption() throws Exception {
+ RunnerContext ctx = mock(RunnerContext.class);
+ BaseChatModelSetup chatModel = mock(BaseChatModelSetup.class);
+ ReadableConfiguration config = mock(ReadableConfiguration.class);
+ when(ctx.getConfig()).thenReturn(config);
+ when(config.get(AgentExecutionOptions.CHAT_ASYNC)).thenReturn(false);
+ when(ctx.getResource("test-model",
ResourceType.CHAT_MODEL)).thenReturn(chatModel);
+
when(ctx.getActionMetricGroup()).thenReturn(mock(FlinkAgentsMetricGroup.class));
+ when(ctx.durableExecute(any())).thenThrow(new
InterruptedException("cancelled"));
+
+ // Clear any interrupt status left over from a previous test before
asserting on it below.
+ Thread.interrupted();
+
+ assertThrows(
+ InterruptedException.class,
+ () ->
+ ChatModelInvoker.chatWithRetries(
+ UUID.randomUUID(),
+ "test-model",
+ "durable-call-id",
+ List.of(),
+ Map.of(),
+ null,
+ ctx,
+ Agent.ErrorHandlingStrategy.RETRY,
+ 3,
+ 0));
+
+ // Only the first attempt should have run: retry backoff must not
consume more attempts
+ // after a cancellation interrupts the call.
+ verify(ctx, times(1)).durableExecute(any());
+ assertTrue(Thread.interrupted(), "interrupt status should be restored
on the thread");
Review Comment:
Confirmed — assertTrue only consumes the flag when it passes, so a failing
assertion here would leave it set on the JUnit thread. Added an @AfterEach in
both this test class and RunnerContextImplDurableExecuteTest to clear it
unconditionally, in c30ba894.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
