Pull request #27: npe

Merge in SPM/langchain4j-gigachat from bugfix/1 to master

Squashed commit of the following:

commit fb2ad18859a5f4e119eec089ae754bcf698e5ff4
Author: Бочарова Дарья Михайловна <[email protected]>
Date:   Mon Apr 14 20:17:27 2025 +0300

    fix

commit cd36e5f9cd2bbf674aa1a2d99a38038f8b9e0586
Author: Бочарова Дарья Михайловна <[email protected]>
Date:   Mon Apr 14 18:19:23 2025 +0300

    npe

Author: Бочарова Дарья Михайловна

README.md

@@ -21,7 +21,7 @@ langchain4j-gigachat это имплементация [GigaChat](https://develo
 ### Gradle
 
 ```kotlin
-implementation("chat.giga:langchain4j-gigachat:0.1.0")
+implementation("chat.giga:langchain4j-gigachat:0.1.1")
 ```
 
 ### Maven
@@ -31,6 +31,6 @@ implementation("chat.giga:langchain4j-gigachat:0.1.0")
 <dependency>
     <groupId>chat.giga</groupId>
     <artifactId>langchain4j-gigachat</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
 </dependency>
 ```

build.gradle.kts

@@ -10,7 +10,7 @@ java {
 
 allprojects {
     group = "chat.giga"
-    version = "0.1.0"
+    version = "0.1.1"
 
     repositories {
         mavenCentral()
@@ -23,8 +23,6 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter")
 }
 
-
-
 tasks.test {
     useJUnitPlatform()
 }

langchain4j-gigachat/src/main/java/chat/giga/langchain4j/utils/GigaChatHelper.java

@@ -50,29 +50,31 @@ private static List<ChatMessage> convertChatMessages(List<dev.langchain4j.data.m
     }
 
     private static chat.giga.model.completion.ChatMessage convertMessage(dev.langchain4j.data.message.ChatMessage message, GigaChatChatRequestParameters parameters) {
-        if (message instanceof UserMessage) {
+        if (message instanceof UserMessage userMessage) {
             return chat.giga.model.completion.ChatMessage.builder()
                     .role(ChatMessage.Role.USER)
-                    .content(((UserMessage) message).contents().stream()
+                    .content(userMessage.contents().stream()
                             .map(content -> content instanceof TextContent ? ((TextContent) content).text() : null)
                             .toList().get(0))
                     .attachments(getOrDefault(parameters.getAttachments(), List.of()))
                     .build();
-        } else if (message instanceof SystemMessage) {
+        } else if (message instanceof SystemMessage systemMessage) {
             return chat.giga.model.completion.ChatMessage.builder()
                     .role(ChatMessage.Role.SYSTEM)
-                    .content(((SystemMessage) message).text())
+                    .content(systemMessage.text())
                     .build();
-        } else if (message instanceof AiMessage) {
+        } else if (message instanceof AiMessage aiMessage) {
+            var id = aiMessage.toolExecutionRequests() != null ?
+            aiMessage.toolExecutionRequests().get(0).id() : null;
             return chat.giga.model.completion.ChatMessage.builder()
                     .role(ChatMessage.Role.ASSISTANT)
-                    .functionsStateId(((AiMessage) message).toolExecutionRequests().get(0).id())
-                    .content(((AiMessage) message).text())
+                    .functionsStateId(id)
+                    .content(aiMessage.text())
                     .build();
-        } else if (message instanceof ToolExecutionResultMessage) {
+        } else if (message instanceof ToolExecutionResultMessage toolExecutionResultMessage) {
             return chat.giga.model.completion.ChatMessage.builder()
                     .role(ChatMessage.Role.FUNCTION)
-                    .content(((ToolExecutionResultMessage) message).text())
+                    .content(toolExecutionResultMessage.text())
                     .build();
         } else {
             throw new IllegalArgumentException("Unsupported message type: " + message.getClass().getName());