|
23 | 23 | import io.github.agentic.ai.api.chat.ChatClientCapabilities; |
24 | 24 | import io.github.agentic.ai.api.chat.ChatEvent; |
25 | 25 | import io.github.agentic.ai.api.chat.ChatMessage; |
| 26 | +import io.github.agentic.ai.api.chat.ChatRole; |
26 | 27 | import io.github.agentic.ai.api.chat.ChatRequest; |
27 | 28 | import io.github.agentic.ai.api.chat.ChatResponse; |
28 | 29 | import io.github.agentic.ai.api.chat.FinishReason; |
@@ -132,6 +133,165 @@ public ModelResponse interceptModel(ModelRequest request, ModelCallHandler next) |
132 | 133 | assertEquals(2, interceptorCalls.get()); |
133 | 134 | } |
134 | 135 |
|
| 136 | + // ------------------------------------------------------------------ |
| 137 | + // issue #270: interceptor-set system message reaches the model request |
| 138 | + // ------------------------------------------------------------------ |
| 139 | + |
| 140 | + @Test |
| 141 | + void interceptorSystemMessageReachesTheModelRequest() throws Exception { |
| 142 | + ScriptedClient client = new ScriptedClient(List.of(response(ChatMessage.assistant("answer"), List.of(), 1))); |
| 143 | + ModelInterceptor interceptor = new ModelInterceptor() { |
| 144 | + public String getName() { |
| 145 | + return "policy"; |
| 146 | + } |
| 147 | + |
| 148 | + public ModelResponse interceptModel(ModelRequest request, ModelCallHandler next) { |
| 149 | + return next.call(ModelRequest.builder(request).systemMessage(ChatMessage.system("required-policy")).build()); |
| 150 | + } |
| 151 | + }; |
| 152 | + ReActAgent agent = ReActAgent.builder(client).interceptors(List.of(interceptor)).build(); |
| 153 | + |
| 154 | + agent.invoke(request(), context()).get(3, TimeUnit.SECONDS); |
| 155 | + |
| 156 | + List<ChatMessage> sent = client.requests.get(0).messages(); |
| 157 | + assertEquals(ChatRole.SYSTEM, sent.get(0).role()); |
| 158 | + assertEquals("required-policy", sent.get(0).text()); |
| 159 | + } |
| 160 | + |
| 161 | + @Test |
| 162 | + void interceptorSystemMessageReplacesExistingSystemMessagesExactlyOnce() throws Exception { |
| 163 | + // A user-provided SYSTEM message in the conversation is replaced by the |
| 164 | + // interceptor-set one; exactly one SYSTEM entry is transmitted. |
| 165 | + AgentRequest withSystem = AgentRequest.messages(List.of( |
| 166 | + ChatMessage.system("user-provided-policy"), ChatMessage.user("hello"))); |
| 167 | + ScriptedClient client = new ScriptedClient(List.of(response(ChatMessage.assistant("answer"), List.of(), 1))); |
| 168 | + ModelInterceptor interceptor = new ModelInterceptor() { |
| 169 | + public String getName() { |
| 170 | + return "policy"; |
| 171 | + } |
| 172 | + |
| 173 | + public ModelResponse interceptModel(ModelRequest request, ModelCallHandler next) { |
| 174 | + return next.call(ModelRequest.builder(request).systemMessage(ChatMessage.system("interceptor-policy")).build()); |
| 175 | + } |
| 176 | + }; |
| 177 | + ReActAgent agent = ReActAgent.builder(client).interceptors(List.of(interceptor)).build(); |
| 178 | + |
| 179 | + agent.invoke(withSystem, context()).get(3, TimeUnit.SECONDS); |
| 180 | + |
| 181 | + List<ChatMessage> sent = client.requests.get(0).messages(); |
| 182 | + assertEquals(1, sent.stream().filter(message -> message.role() == ChatRole.SYSTEM).count()); |
| 183 | + assertEquals("interceptor-policy", sent.get(0).text()); |
| 184 | + assertTrue(sent.stream().anyMatch(message -> "hello".equals(message.text()))); |
| 185 | + } |
| 186 | + |
| 187 | + @Test |
| 188 | + void withoutInterceptorSystemMessageTheConversationIsUnchanged() throws Exception { |
| 189 | + AgentRequest withSystem = AgentRequest.messages(List.of( |
| 190 | + ChatMessage.system("user-provided-policy"), ChatMessage.user("hello"))); |
| 191 | + ScriptedClient client = new ScriptedClient(List.of(response(ChatMessage.assistant("answer"), List.of(), 1))); |
| 192 | + ReActAgent agent = ReActAgent.builder(client).build(); |
| 193 | + |
| 194 | + agent.invoke(withSystem, context()).get(3, TimeUnit.SECONDS); |
| 195 | + |
| 196 | + List<ChatMessage> sent = client.requests.get(0).messages(); |
| 197 | + assertEquals("user-provided-policy", sent.get(0).text()); |
| 198 | + assertEquals("hello", sent.get(1).text()); |
| 199 | + } |
| 200 | + |
| 201 | + @Test |
| 202 | + void systemMessageDoesNotAccumulateAcrossToolCallTurns() throws Exception { |
| 203 | + ToolCall call = new ToolCall("call-1", "lookup", "{}"); |
| 204 | + ScriptedClient client = new ScriptedClient(List.of(response(ChatMessage.assistant("use", List.of(call)), |
| 205 | + List.of(call), 1), response(ChatMessage.assistant("done"), List.of(), 1))); |
| 206 | + ModelInterceptor interceptor = new ModelInterceptor() { |
| 207 | + public String getName() { |
| 208 | + return "policy"; |
| 209 | + } |
| 210 | + |
| 211 | + public ModelResponse interceptModel(ModelRequest request, ModelCallHandler next) { |
| 212 | + return next.call(ModelRequest.builder(request).systemMessage(ChatMessage.system("required-policy")).build()); |
| 213 | + } |
| 214 | + }; |
| 215 | + Tool lookup = tool("lookup", "{}", (ignored, context) -> |
| 216 | + CompletableFuture.completedFuture(ToolResult.text("lookup result"))); |
| 217 | + ReActAgent agent = ReActAgent.builder(client).tools(new ToolRegistry(List.of(lookup))) |
| 218 | + .interceptors(List.of(interceptor)).build(); |
| 219 | + |
| 220 | + agent.invoke(request(), context()).get(3, TimeUnit.SECONDS); |
| 221 | + |
| 222 | + assertEquals(2, client.requests.size()); |
| 223 | + for (ChatRequest sent : client.requests) { |
| 224 | + assertEquals(1, sent.messages().stream() |
| 225 | + .filter(message -> message.role() == ChatRole.SYSTEM).count()); |
| 226 | + assertEquals("required-policy", sent.messages().get(0).text()); |
| 227 | + } |
| 228 | + } |
| 229 | + |
| 230 | + @Test |
| 231 | + void streamingRunAlsoReceivesTheInterceptorSystemMessage() throws Exception { |
| 232 | + StreamingClient client = new StreamingClient(); |
| 233 | + ModelInterceptor interceptor = new ModelInterceptor() { |
| 234 | + public String getName() { |
| 235 | + return "policy"; |
| 236 | + } |
| 237 | + |
| 238 | + public ModelResponse interceptModel(ModelRequest request, ModelCallHandler next) { |
| 239 | + return next.call(ModelRequest.builder(request).systemMessage(ChatMessage.system("required-policy")).build()); |
| 240 | + } |
| 241 | + }; |
| 242 | + ReActAgent agent = ReActAgent.builder(client).streamModel(true) |
| 243 | + .interceptors(List.of(interceptor)).build(); |
| 244 | + |
| 245 | + try (AgentExecutionContext context = context()) { |
| 246 | + CompletableFuture<AgentOutcome> outcome = new CompletableFuture<>(); |
| 247 | + agent.stream(request(), context).subscribe(new Flow.Subscriber<>() { |
| 248 | + public void onSubscribe(Flow.Subscription subscription) { |
| 249 | + subscription.request(Long.MAX_VALUE); |
| 250 | + } |
| 251 | + |
| 252 | + public void onNext(AgentEvent event) { |
| 253 | + if (event instanceof AgentEvent.Finished finished) { |
| 254 | + outcome.complete(finished.outcome()); |
| 255 | + } |
| 256 | + } |
| 257 | + |
| 258 | + public void onError(Throwable error) { |
| 259 | + outcome.completeExceptionally(error); |
| 260 | + } |
| 261 | + |
| 262 | + public void onComplete() { |
| 263 | + } |
| 264 | + }); |
| 265 | + outcome.get(3, TimeUnit.SECONDS); |
| 266 | + } |
| 267 | + List<ChatMessage> sent = client.requests.get(0).messages(); |
| 268 | + assertEquals(ChatRole.SYSTEM, sent.get(0).role()); |
| 269 | + assertEquals("required-policy", sent.get(0).text()); |
| 270 | + } |
| 271 | + |
| 272 | + @Test |
| 273 | + void nonSystemMessagesKeepTheirOrderAroundTheInjectedSystemMessage() throws Exception { |
| 274 | + AgentRequest multi = AgentRequest.messages(List.of( |
| 275 | + ChatMessage.user("first"), ChatMessage.assistant("reply"), ChatMessage.user("second"))); |
| 276 | + ScriptedClient client = new ScriptedClient(List.of(response(ChatMessage.assistant("answer"), List.of(), 1))); |
| 277 | + ModelInterceptor interceptor = new ModelInterceptor() { |
| 278 | + public String getName() { |
| 279 | + return "policy"; |
| 280 | + } |
| 281 | + |
| 282 | + public ModelResponse interceptModel(ModelRequest request, ModelCallHandler next) { |
| 283 | + return next.call(ModelRequest.builder(request).systemMessage(ChatMessage.system("required-policy")).build()); |
| 284 | + } |
| 285 | + }; |
| 286 | + ReActAgent agent = ReActAgent.builder(client).interceptors(List.of(interceptor)).build(); |
| 287 | + |
| 288 | + agent.invoke(multi, context()).get(3, TimeUnit.SECONDS); |
| 289 | + |
| 290 | + List<String> texts = client.requests.get(0).messages().stream() |
| 291 | + .map(ChatMessage::text).toList(); |
| 292 | + assertEquals(List.of("required-policy", "first", "reply", "second"), texts); |
| 293 | + } |
| 294 | + |
135 | 295 | @Test |
136 | 296 | void emitsStreamingDeltasAndSupportsDynamicTools() throws Exception { |
137 | 297 | Tool dynamic = tool("dynamic", "{\"type\":\"object\"}", |
|
0 commit comments