Add missing serial names on ImagesGenerationRequest (#65)

* fix: add serial names for images generation request
* style: spotless happiness
* refactor: apply suggestion on image size naming

Co-authored-by: Simon Vergauwen <[email protected]>
* refactor: apply suggestion on image size naming on rest of models

---------

Co-authored-by: Simon Vergauwen <[email protected]>

Author: realdavidvega

core/src/commonMain/kotlin/com/xebia/functional/xef/agents/ImageGenerationAgent.kt

@@ -14,7 +14,7 @@ class ImageGenerationAgent(
   private val context: VectorStore = VectorStore.EMPTY,
   private val user: String = "testing",
   private val numberImages: Int,
-  private val imageSize: String,
+  private val size: String,
   private val bringFromContext: Int = 10
 ) : Agent<Map<String, String>, ImagesGenerationResponse> {
 
@@ -48,7 +48,7 @@ class ImageGenerationAgent(
       ImagesGenerationRequest(
         prompt = prompt,
         numberImages = numberImages,
-        imageSize = imageSize,
+        size = size,
         user = user
       )
     return llm.createImages(request)

core/src/commonMain/kotlin/com/xebia/functional/xef/auto/AI.kt

@@ -230,22 +230,22 @@ class AIScope(
    * @param prompt a [PromptTemplate] describing the images you want to generate.
    * @param variables a map of variables to be replaced in the [prompt].
    * @param numberImages number of images to generate.
-   * @param imageSize size of the images to generate.
+   * @param size the size of the images to generate.
    */
   @AiDsl
   suspend fun images(
     prompt: PromptTemplate<String>,
     variables: Map<String, String>,
     numberImages: Int = 1,
-    imageSize: String = "1024x1024"
+    size: String = "1024x1024"
   ): ImagesGenerationResponse =
     with(
       ImageGenerationAgent(
         llm = openAIClient,
         template = prompt,
         context = context,
         numberImages = numberImages,
-        imageSize = imageSize
+        size = size
       )
     ) {
       call(variables)
@@ -257,30 +257,29 @@ class AIScope(
    *
    * @param prompt a [PromptTemplate] describing the images you want to generate.
    * @param numberImages number of images to generate.
-   * @param imageSize size of the images to generate.
+   * @param size the size of the images to generate.
    */
   @AiDsl
   suspend fun images(
     prompt: String,
     numberImages: Int = 1,
-    imageSize: String = "1024x1024"
-  ): ImagesGenerationResponse = images(PromptTemplate(prompt), emptyMap(), numberImages, imageSize)
+    size: String = "1024x1024"
+  ): ImagesGenerationResponse = images(PromptTemplate(prompt), emptyMap(), numberImages, size)
 
   /**
    * Run a [prompt] describes the images you want to generate within the context of [AIScope].
    * Produces a [ImagesGenerationResponse] which then gets serialized to [A] through [prompt].
    *
    * @param prompt a [PromptTemplate] describing the images you want to generate.
-   * @param n number of images to generate.
-   * @param imageSize size of the images to generate.
+   * @param size the size of the images to generate.
    */
   @AiDsl
   suspend inline fun <reified A> Raise<AIError>.image(
     prompt: String,
-    imageSize: String = "1024x1024",
+    size: String = "1024x1024",
     llmModel: LLMModel = LLMModel.GPT_3_5_TURBO
   ): A {
-    val imageResponse = images(prompt, 1, imageSize)
+    val imageResponse = images(prompt, 1, size)
     val url = imageResponse.data.firstOrNull() ?: raise(AIError.NoResponse)
     return either {
         PromptTemplate(

core/src/commonMain/kotlin/com/xebia/functional/xef/llm/openai/OpenAIClient.kt

@@ -8,7 +8,7 @@ import com.xebia.functional.xef.httpClient
 import io.ktor.client.HttpClient
 import io.ktor.client.call.body
 import io.ktor.client.engine.HttpClientEngine
-import io.ktor.client.plugins.*
+import io.ktor.client.plugins.timeout
 import io.ktor.client.request.post
 import io.ktor.client.statement.HttpResponse
 import io.ktor.http.path
@@ -25,8 +25,8 @@ interface OpenAIClient {
 @Serializable
 data class ImagesGenerationRequest(
   val prompt: String,
-  val numberImages: Int = 1,
-  val imageSize: String = "1024x1024",
+  @SerialName("n") val numberImages: Int = 1,
+  val size: String = "1024x1024",
   @SerialName("response_format") val responseFormat: String = "url",
   val user: String? = null
 )
@@ -39,8 +39,7 @@ data class ImagesGenerationResponse(val created: Long, val data: List<ImageGener
 suspend fun ResourceScope.KtorOpenAIClient(
   config: OpenAIConfig,
   engine: HttpClientEngine? = null
-): OpenAIClient =
-  com.xebia.functional.xef.llm.openai.KtorOpenAIClient(httpClient(engine, config.baseUrl), config)
+): OpenAIClient = KtorOpenAIClient(httpClient(engine, config.baseUrl), config)
 
 private class KtorOpenAIClient(
   private val httpClient: HttpClient,