Fix Ollama client

Author: tiginamaria

integration-tests/src/jvmTest/kotlin/ai/koog/integration/tests/executor/ExecutorIntegrationTestBase.kt

@@ -74,7 +74,6 @@ import io.kotest.inspectors.shouldForAny
 import io.kotest.matchers.booleans.shouldBeTrue
 import io.kotest.matchers.booleans.shouldNotBeTrue
 import io.kotest.matchers.collections.shouldBeEmpty
-import io.kotest.matchers.collections.shouldContainAnyOf
 import io.kotest.matchers.collections.shouldNotBeEmpty
 import io.kotest.matchers.collections.shouldNotContainAnyOf
 import io.kotest.matchers.ints.shouldBeGreaterThan
@@ -86,7 +85,6 @@ import kotlinx.coroutines.cancel
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
-import org.assertj.core.error.ShouldContainAnyOf.shouldContainAnyOf
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.Assumptions.assumeFalse
 import org.junit.jupiter.api.Assumptions.assumeTrue
@@ -895,7 +893,7 @@ abstract class ExecutorIntegrationTestBase {
             user("Respond with a short message.")
         }
         with(getLLMClient(model).execute(prompt, model)) {
-            parts.shouldContainAnyOf(MessagePart.Text)
+            parts.shouldForAny { it is MessagePart.Text }
         }
     }
 

prompt/prompt-executor/prompt-executor-clients/prompt-executor-openai-client-base/src/commonMain/kotlin/ai/koog/prompt/executor/clients/openai/base/AbstractOpenAILLMClient.kt

@@ -290,7 +290,7 @@ public abstract class AbstractOpenAILLMClient<TResponse : OpenAIBaseLLMResponse,
                             add(
                                 OpenAIMessage.Tool(
                                     content = OpenAIContent.Text(part.output),
-                                    toolCallId = message.id ?: Uuid.random().toString()
+                                    toolCallId = part.id ?: Uuid.random().toString()
                                 )
                             )
                         }
@@ -314,12 +314,14 @@ public abstract class AbstractOpenAILLMClient<TResponse : OpenAIBaseLLMResponse,
                                 // FIXME: how to handle multiple reasoning messages
                                 reasoningContent = message.parts.filterIsInstance<MessagePart.Reasoning>()
                                     .firstOrNull()?.content?.firstOrNull(),
-                                toolCalls = message.parts.filterIsInstance<MessagePart.Tool.Call>().map {
-                                    OpenAIToolCall(
-                                        it.id ?: Uuid.random().toString(),
-                                        function = OpenAIFunction(it.tool, Json.encodeToString(it.args))
-                                    )
-                                }
+                                toolCalls = message.parts.filterIsInstance<MessagePart.Tool.Call>()
+                                    .takeIf { it.isNotEmpty() }
+                                    ?.map {
+                                        OpenAIToolCall(
+                                            it.id ?: Uuid.random().toString(),
+                                            function = OpenAIFunction(it.tool, Json.encodeToString(it.args))
+                                        )
+                                    }
                             )
                         )
                     }