#83 | передача functions_state_id через metadata из choice ответа модели в последующие запросы (#84)

Co-authored-by: Слободской Евгений Геннадьевич <Slobodskoy.E.Ge@sberbank.ru>

Author: Slobevg

spring-ai-gigachat/src/main/java/chat/giga/springai/GigaChatModel.java

@@ -328,6 +328,9 @@ private CompletionRequest createRequest(Prompt prompt, boolean stream) {
                                     .functionCall(new CompletionResponse.FunctionCall()
                                             .setName(toolCall.name())
                                             .setArguments(toolCall.arguments()));
+                        } else if (message.getMetadata().containsKey("functions_state_id")) {
+                            messageBuilder.functionsStateId(
+                                    (String) message.getMetadata().get("functions_state_id"));
                         }
                         return List.of(messageBuilder.build());
                     } else if (message instanceof ToolResponseMessage toolResponseMessage) {
@@ -476,18 +479,17 @@ private ChatResponse toChatResponse(CompletionResponse completionResponse, Usage
     private Generation buildGeneration(String id, CompletionResponse.Choice choice, boolean streaming) {
         CompletionResponse.MessagesRes message = streaming ? choice.getDelta() : choice.getMessage();
         String finishReason = choice.getFinishReason() != null ? choice.getFinishReason() : "";
-        Map<String, Object> metadata = Map.of(
-                "id",
-                id,
-                "index",
-                choice.getIndex(),
-                "role",
-                message.getRole() != null ? message.getRole().name() : "",
-                "finishReason",
-                finishReason);
+        String functionsStateId = message.getFunctionsStateId();
+        Map<String, Object> metadata = new HashMap<>();
+        metadata.put("id", id);
+        metadata.put("index", choice.getIndex());
+        metadata.put("role", message.getRole() != null ? message.getRole().name() : "");
+        metadata.put("finishReason", finishReason);
+        if (functionsStateId != null) {
+            metadata.put("functions_state_id", functionsStateId);
+        }
         List<AssistantMessage.ToolCall> toolCalls;
         if (CompletionResponse.FinishReason.FUNCTION_CALL.equals(finishReason)) {
-            String functionsStateId = message.getFunctionsStateId();
             AssistantMessage.ToolCall toolCall = new AssistantMessage.ToolCall(
                     functionsStateId,
                     "function",
@@ -500,7 +502,7 @@ private Generation buildGeneration(String id, CompletionResponse.Choice choice,
         var assistantMessage = AssistantMessage.builder()
                 .content(message.getContent())
                 .toolCalls(toolCalls)
-                .properties(metadata)
+                .properties(Collections.unmodifiableMap(metadata))
                 .build();
         var generationMetadata = ChatGenerationMetadata.builder()
                 .finishReason(choice.getFinishReason())

spring-ai-gigachat/src/test/java/chat/giga/springai/GigaChatModelTest.java

@@ -100,6 +100,30 @@ void testGigaChatOptions_withFunctionCallParam() {
         assertEquals(functionCallParam, requestFunctionCallParam);
     }
 
+    @Test
+    void testGigaChatOptions_withFunctionsStateIdAndFinishReasonStop() {
+        var functionCallback = GigaTools.from(new TestTool());
+
+        var prompt = new Prompt(
+                List.of(new UserMessage("Hello")),
+                GigaChatOptions.builder()
+                        .model(GigaChatApi.ChatModel.GIGA_CHAT)
+                        .toolCallbacks(List.of(functionCallback))
+                        .build());
+
+        when(gigaChatApi.chatCompletionEntity(any(), any()))
+                .thenReturn(new ResponseEntity<>(response, HttpStatusCode.valueOf(200)));
+
+        when(response.getChoices())
+                .thenReturn(List.of(new CompletionResponse.Choice()
+                        .setMessage(new CompletionResponse.MessagesRes().setFunctionsStateId("uuid"))));
+
+        ChatResponse chatResponse = gigaChatModel.internalCall(prompt, null);
+
+        assertTrue(chatResponse.getResult().getOutput().getMetadata().containsKey("functions_state_id"));
+        assertEquals("uuid", chatResponse.getResult().getOutput().getMetadata().get("functions_state_id"));
+    }
+
     @Test
     void testGigaChatOptions_withFunctionCallEmptyAndTool() {
         var functionCallback = GigaTools.from(new TestTool());