2222import lombok .RequiredArgsConstructor ;
2323import lombok .val ;
2424import org .springframework .ai .chat .messages .AssistantMessage ;
25+ import org .springframework .ai .chat .messages .AssistantMessage .ToolCall ;
2526import org .springframework .ai .chat .messages .Message ;
2627import org .springframework .ai .chat .messages .ToolResponseMessage ;
27- import org .springframework .ai .chat .messages .AssistantMessage .ToolCall ;
2828import org .springframework .ai .chat .model .ChatModel ;
2929import org .springframework .ai .chat .model .ChatResponse ;
3030import org .springframework .ai .chat .model .Generation ;
@@ -50,14 +50,11 @@ public ChatResponse call(@Nonnull final Prompt prompt) {
5050 throw new IllegalArgumentException (
5151 "Please add OpenAiChatOptions to the Prompt: new Prompt(\" message\" , new OpenAiChatOptions(config))" );
5252 }
53- System .out .println ("I entered OpenAiChatModel.call() with tools: " + options .getTools ());
5453 val openAiRequest = toOpenAiRequest (prompt );
5554 val request = new OpenAiChatCompletionRequest (openAiRequest ).withTools (options .getTools ());
5655 val result = client .chatCompletion (request );
5756 val response = new ChatResponse (toGenerations (result ));
5857
59- System .out .println ("I entered OpenAiChatModel.call() with response: " + response );
60-
6158 if (isInternalToolExecutionEnabled (prompt .getOptions ()) && response .hasToolCalls ()) {
6259 val toolExecutionResult = toolCallingManager .executeToolCalls (prompt , response );
6360 // Send the tool execution result back to the model.
@@ -83,7 +80,7 @@ private List<OpenAiMessage> toOpenAiRequest(final Prompt prompt) {
8380 return result ;
8481 }
8582
86- private static OpenAiAssistantMessage toAssistantMessage (AssistantMessage message ) {
83+ private static OpenAiAssistantMessage toAssistantMessage (final AssistantMessage message ) {
8784 if (!message .hasToolCalls ()) {
8885 return OpenAiMessage .assistant (message .getText ());
8986 }
@@ -94,7 +91,7 @@ private static OpenAiAssistantMessage toAssistantMessage(AssistantMessage messag
9491 return new OpenAiAssistantMessage (content , calls );
9592 }
9693
97- private static List <? extends OpenAiMessage > toToolMessages (ToolResponseMessage message ) {
94+ private static List <? extends OpenAiMessage > toToolMessages (final ToolResponseMessage message ) {
9895 return message .getResponses ().stream ().map (r -> tool (r .responseData (), r .id ())).toList ();
9996 }
10097
0 commit comments