add RequestMetaInfo and clock dependency to UserContentBuilder, update user message handling

Author: devcrocod

prompt/prompt-executor/prompt-executor-clients/prompt-executor-ollama-client/src/commonMain/kotlin/ai/koog/prompt/executor/ollama/client/dto/OllamaManagementConverters.kt

@@ -33,7 +33,7 @@ private fun List<OllamaShowModelResponseDTO.Capability>.toLLMCapabilities(): Lis
             OllamaShowModelResponseDTO.Capability.COMPLETION -> listOf(LLMCapability.Completion)
             OllamaShowModelResponseDTO.Capability.EMBEDDING -> listOf(LLMCapability.Embed)
             OllamaShowModelResponseDTO.Capability.INSERT -> listOf()
-            OllamaShowModelResponseDTO.Capability.VISION -> listOf(LLMCapability.Vision)
+            OllamaShowModelResponseDTO.Capability.VISION -> listOf(LLMCapability.Vision.Image)
             OllamaShowModelResponseDTO.Capability.TOOLS -> listOf(LLMCapability.Tools)
         }
     } + listOf(

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

@@ -40,6 +40,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.withContext
+import kotlinx.datetime.Clock
 import kotlinx.serialization.json.ClassDiscriminatorMode
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonElement
@@ -50,9 +51,6 @@ import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.buildJsonArray
 import kotlinx.serialization.json.buildJsonObject
 import kotlinx.serialization.json.put
-import kotlin.io.encoding.ExperimentalEncodingApi
-import kotlinx.datetime.Clock
-import kotlinx.serialization.json.*
 import kotlin.uuid.ExperimentalUuidApi
 import kotlin.uuid.Uuid
 

prompt/prompt-model/src/commonMain/kotlin/ai/koog/prompt/dsl/PromptBuilder.kt

@@ -112,7 +112,7 @@ public class PromptBuilder internal constructor(
      * @param body The initialization block for the UserContentBuilder.
      */
     public fun user(body: UserContentBuilder.() -> Unit) {
-        messages.addAll(UserContentBuilder().apply(body).build())
+        messages.addAll(UserContentBuilder(clock).apply(body).build())
     }
 
     /**

prompt/prompt-model/src/commonMain/kotlin/ai/koog/prompt/dsl/UserContentBuilder.kt

@@ -2,7 +2,9 @@ package ai.koog.prompt.dsl
 
 import ai.koog.prompt.message.MediaContent
 import ai.koog.prompt.message.Message
+import ai.koog.prompt.message.RequestMetaInfo
 import ai.koog.prompt.text.TextContentBuilder
+import kotlinx.datetime.Clock
 
 /**
  * A builder for constructing user messages with support for text and media content.
@@ -11,7 +13,7 @@ import ai.koog.prompt.text.TextContentBuilder
  * and document attachments. The builder pattern enables convenient construction of complex
  * message content with multiple components.
  */
-public class UserContentBuilder {
+public class UserContentBuilder(private val clock: Clock = Clock.System) {
     /**
      * Internal collection to accumulate user messages during the building process.
      *
@@ -26,7 +28,7 @@ public class UserContentBuilder {
      * @param text The text content to be included in the user message.
      */
     public fun text(text: String) {
-        messages.add(Message.User(text))
+        messages.add(Message.User(text, metaInfo = RequestMetaInfo.create(clock)))
     }
 
     /**
@@ -38,7 +40,7 @@ public class UserContentBuilder {
      * @param body A lambda function applied to a [TextContentBuilder] instance for constructing formatted text.
      */
     public fun text(body: TextContentBuilder.() -> Unit) {
-        messages.add(Message.User(TextContentBuilder().apply(body).build()))
+        text(TextContentBuilder().apply(body).build())
     }
 
     /**
@@ -50,7 +52,13 @@ public class UserContentBuilder {
      * @param source The path to the local image file or URL of the image.
      */
     public fun image(source: String) {
-        messages.add(Message.User("", mediaContent = MediaContent.Image(source)))
+        messages.add(
+            Message.User(
+                "",
+                metaInfo = RequestMetaInfo.create(clock),
+                mediaContent = MediaContent.Image(source)
+            )
+        )
     }
 
     /**
@@ -63,7 +71,13 @@ public class UserContentBuilder {
      * @param format The audio file format (e.g., "mp3", "wav").
      */
     public fun audio(data: ByteArray, format: String) {
-        messages.add(Message.User("", mediaContent = MediaContent.Audio(data = data, format = format)))
+        messages.add(
+            Message.User(
+                "",
+                metaInfo = RequestMetaInfo.create(clock),
+                mediaContent = MediaContent.Audio(data = data, format = format)
+            )
+        )
     }
 
     /**
@@ -75,7 +89,13 @@ public class UserContentBuilder {
      * @param source The local file path to the document.
      */
     public fun document(source: String) {
-        messages.add(Message.User("", mediaContent = MediaContent.File(source)))
+        messages.add(
+            Message.User(
+                "",
+                metaInfo = RequestMetaInfo.create(clock),
+                mediaContent = MediaContent.File(source)
+            )
+        )
     }
 
     /**

prompt/prompt-model/src/jvmTest/kotlin/ai/koog/prompt/PromptTest.kt

@@ -59,7 +59,13 @@ class PromptTest {
         val basicPrompt = Prompt.build("test", clock = testClock) {
             system(systemMessage)
             user(userMessage)
-            message(Message.Assistant(assistantMessage, testRespMetaInfo, finishReason))
+            message(
+                Message.Assistant(
+                    content = assistantMessage,
+                    metaInfo = testRespMetaInfo,
+                    finishReason = finishReason
+                )
+            )
             tool {
                 call(toolCallId, toolName, toolCallContent)
                 result(toolCallId, toolName, toolResultContent)
@@ -104,7 +110,7 @@ class PromptTest {
             user(userMessage)
             assistant(assistantMessage)
             tool {
-                call(toolCallId, toolName, toolContent,)
+                call(toolCallId, toolName, toolContent)
                 result(toolCallId, toolName, toolResult)
             }
         }