weiqingy commented on code in PR #1071: URL: https://github.com/apache/flink-agents/pull/1071#discussion_r3921843015
########## plan/src/test/java/org/apache/flink/agents/plan/actions/ChatModelInvokerTest.java: ########## @@ -0,0 +1,161 @@ +/* + * 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.AfterEach; +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 { + + @AfterEach + void clearInterruptStatus() { + // Prevents a leftover interrupt flag (e.g. if the assertion below the interruption test + // ever fails before consuming it) from failing an unrelated later test's real Thread.sleep + // backoff with a spurious InterruptedException. + Thread.interrupted(); + } + + @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"); + } + + @Test + void testChatWithRetriesRestoresInterruptFlagFromRetryBackoffSleep() 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)); + // The interrupt fires from within the retry backoff's Thread.sleep, not from the call + // itself: set the flag first so Thread.sleep throws immediately, at no wall-clock cost. + when(ctx.durableExecute(any())) + .thenAnswer( + invocation -> { + Thread.currentThread().interrupt(); + throw new RuntimeException("transient failure"); + }); + + assertThrows( + InterruptedException.class, + () -> + ChatModelInvoker.chatWithRetries( + UUID.randomUUID(), + "test-model", + "durable-call-id", + List.of(), + Map.of(), + null, + ctx, + Agent.ErrorHandlingStrategy.RETRY, + 1, + 1)); + + // Only the first attempt should have run: the sleep before the retry throws before a + // second call is made. + verify(ctx, times(1)).durableExecute(any()); + // This is the only assertion that distinguishes the fix from the pre-fix code: the + // ChatAttemptFailed/times(1) shape above passes either way, since Thread.sleep still Review Comment: nit: the comment says `ChatAttemptFailed`, but this test asserts `InterruptedException` (line 106). The only `ChatAttemptFailed` assertion is line 143, in `testChatWithRetriesRetriesOnOrdinaryFailure`, so the sentence points a reader at the wrong test. `InterruptedException/times(1)` if that reads better. -- 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]
