JAICF-421: add HttpClientSpec.kt and update README.md

a.popov · a.popov · commit bc3880ab63e0 · 2025-10-30T12:15:43.000+03:00
diff --git a/gradle-plugins/caila-publish-plugin/README.md b/gradle-plugins/caila-publish-plugin/README.md
@@ -83,6 +83,13 @@ Configure the plugin to build and push Docker images automatically:
 
 ```kotlin
 cailaPublish {
+    httpClient {
+        logLevel.set("INFO")
+        connectTimeoutMs.set(10_000)
+        requestTimeoutMs.set(35_000)
+        keepAliveTimeMs.set(35_000)
+    }
+
     docker {
         registryCredentials {
             url.set("https://index.docker.io/v1/")
@@ -101,17 +108,17 @@ cailaPublish {
     }
     
     image {
-        name.set("my-caila-image")              // Required - image name on CAILA
+        name.set("my-caila-image")              // Required
         accessMode.set(AccessMode.PRIVATE.mode)
     }
     
     model {
-        modelName.set("my-model")               // Required - model name on CALIA
+        modelName.set("my-model")               // Required
         taskType.set(TaskType.CUSTOM.tag)
         
         httpSettings {
-            httpPort.set(8080)                  // Required when httpSettings used - port that the application web server listens on
-            mainPageEndpoint.set("/health")     // Required when httpSettings used - path for availability check (healthcheck endpoint)
+            httpPort.set(8080)                  // Required when httpSettings used
+            mainPageEndpoint.set("/health")     // Required when httpSettings used
         }
         
         publicSettings {
@@ -168,6 +175,19 @@ cailaPublish {
 
 ## Configuration Reference
 
+### HTTP Client Configuration
+
+Configure HTTP client settings for CAILA API requests:
+
+```kotlin
+httpClient {
+    logLevel.set("INFO")           // HTTP log level: ALL, HEADERS, BODY, INFO, NONE. Default: ALL
+    connectTimeoutMs.set(10_000)   // Connection timeout in milliseconds. Default: 10000
+    requestTimeoutMs.set(35_000)   // Request timeout in milliseconds. Default: 35000
+    keepAliveTimeMs.set(35_000)    // Keep-alive time in milliseconds. Default: 35000
+}
+```
+
 ### Image Configuration
 
 ```kotlin
diff --git a/gradle-plugins/caila-publish-plugin/src/main/kotlin/com/justai/jaicf/plugins/caila/publish/CailaPublishPlugin.kt b/gradle-plugins/caila-publish-plugin/src/main/kotlin/com/justai/jaicf/plugins/caila/publish/CailaPublishPlugin.kt
@@ -29,6 +29,7 @@ class CailaPublishPlugin : Plugin<Project> {
 
         val imageFromDockerTask = project.tasks.register("publishCailaImageFromDocker", PublishCailaImageFromDockerTask::class.java) {
             spec.set(extension.image)
+            httpClientSpec.set(extension.httpClient)
 
             dockerImageName.convention(
                 project.provider {
@@ -43,18 +44,21 @@ class CailaPublishPlugin : Plugin<Project> {
 
         val imageFromRegistryTask = project.tasks.register("publishCailaImageFromRegistry", PublishCailaImageFromRegistryTask::class.java) {
             spec.set(extension.image)
+            httpClientSpec.set(extension.httpClient)
             cailaBaseUrl.convention(extension.url)
         }
 
         val modelFromDockerTask = project.tasks.register("publishCailaModelFromDocker", CailaModelTask::class.java) {
             spec.set(extension.model)
+            httpClientSpec.set(extension.httpClient)
             imageId.set(imageFromDockerTask.flatMap { it.publishedImageId })
             cailaBaseUrl.convention(extension.url)
             dependsOn(imageFromDockerTask)
         }
 
         val modelFromRegistryTask = project.tasks.register("publishCailaModelFromRegistry", CailaModelTask::class.java) {
             spec.set(extension.model)
+            httpClientSpec.set(extension.httpClient)
             imageId.set(imageFromRegistryTask.flatMap { it.publishedImageId })
             cailaBaseUrl.convention(extension.url)
             dependsOn(imageFromRegistryTask)
diff --git a/gradle-plugins/caila-publish-plugin/src/main/kotlin/com/justai/jaicf/plugins/caila/publish/extension/CailaPublishExtension.kt b/gradle-plugins/caila-publish-plugin/src/main/kotlin/com/justai/jaicf/plugins/caila/publish/extension/CailaPublishExtension.kt
@@ -16,18 +16,18 @@ open class CailaPublishExtension @Inject constructor(
 ) {
     val url: Property<String> = objectFactory.property<String>().convention(CAILA_BASE_URL)
 
-    val httpLogLevel: Property<String> = objectFactory.property<String>().convention("ALL")
-    val connectTimeoutMs: Property<Int> = objectFactory.property<Int>().convention(10_000)
-    val requestTimeoutMs: Property<Int> = objectFactory.property<Int>().convention(35_000)
-    val keepAliveTimeMs: Property<Int> = objectFactory.property<Int>().convention(35_000)
-
+    val httpClient: HttpClientSpec = objectFactory.newInstance(HttpClientSpec::class.java)
     val image: CailaImageSpec = objectFactory.newInstance(CailaImageSpec::class.java)
     val model: CailaModelSpec = objectFactory.newInstance(CailaModelSpec::class.java)
 
     fun docker(configuration: DockerExtension.() -> Unit) {
         project.extensions.configure(DockerExtension::class.java, configuration)
     }
 
+    fun httpClient(action: Action<HttpClientSpec>) {
+        action.execute(httpClient)
+    }
+
     fun image(action: Action<CailaImageSpec>) {
         action.execute(image)
     }
diff --git a/gradle-plugins/caila-publish-plugin/src/main/kotlin/com/justai/jaicf/plugins/caila/publish/extension/HttpClientSpec.kt b/gradle-plugins/caila-publish-plugin/src/main/kotlin/com/justai/jaicf/plugins/caila/publish/extension/HttpClientSpec.kt
@@ -0,0 +1,15 @@
+package com.justai.jaicf.plugins.caila.publish.extension
+
+import org.gradle.api.model.ObjectFactory
+import org.gradle.api.provider.Property
+import org.gradle.kotlin.dsl.property
+import javax.inject.Inject
+
+open class HttpClientSpec @Inject constructor(
+    objectFactory: ObjectFactory
+) {
+    val logLevel: Property<String> = objectFactory.property<String>().convention("ALL")
+    val connectTimeoutMs: Property<Int> = objectFactory.property<Int>().convention(10_000)
+    val requestTimeoutMs: Property<Int> = objectFactory.property<Int>().convention(35_000)
+    val keepAliveTimeMs: Property<Int> = objectFactory.property<Int>().convention(35_000)
+}
diff --git a/gradle-plugins/caila-publish-plugin/src/main/kotlin/com/justai/jaicf/plugins/caila/publish/internal/client/CailaApiClient.kt b/gradle-plugins/caila-publish-plugin/src/main/kotlin/com/justai/jaicf/plugins/caila/publish/internal/client/CailaApiClient.kt
@@ -1,14 +1,12 @@
 package com.justai.jaicf.plugins.caila.publish.internal.client
 
-import com.justai.jaicf.plugins.caila.publish.internal.http.HttpClientFactory
 import com.justai.jaicf.plugins.caila.publish.model.GetImageResponse
 import com.justai.jaicf.plugins.caila.publish.model.GetModelResponse
 import com.justai.jaicf.plugins.caila.publish.model.PublishImageRequestDto
 import com.justai.jaicf.plugins.caila.publish.model.PublishImageResponseDto
 import com.justai.jaicf.plugins.caila.publish.model.PublishModelRequestDto
 import io.ktor.client.HttpClient
 import io.ktor.client.call.body
-import io.ktor.client.plugins.logging.LogLevel
 import io.ktor.client.request.delete
 import io.ktor.client.request.get
 import io.ktor.client.request.headers
@@ -23,7 +21,7 @@ import kotlinx.coroutines.runBlocking
 class CailaApiClient(
     private val accessToken: String,
     val baseUrl: String,
-    val httpClient: HttpClient = HttpClientFactory.create(LogLevel.ALL),
+    val httpClient: HttpClient,
 ) {
     suspend fun publishImage(accountId: Int, body: PublishImageRequestDto): PublishImageResponseDto {
         return httpClient.post("$baseUrl/account/$accountId/image") {
diff --git a/gradle-plugins/caila-publish-plugin/src/main/kotlin/com/justai/jaicf/plugins/caila/publish/task/AbstractPublishCailaImageTask.kt b/gradle-plugins/caila-publish-plugin/src/main/kotlin/com/justai/jaicf/plugins/caila/publish/task/AbstractPublishCailaImageTask.kt
@@ -2,8 +2,11 @@ package com.justai.jaicf.plugins.caila.publish.task
 
 import com.justai.jaicf.plugins.caila.publish.extension.CAILA_BASE_URL
 import com.justai.jaicf.plugins.caila.publish.extension.CailaImageSpec
+import com.justai.jaicf.plugins.caila.publish.extension.HttpClientSpec
 import com.justai.jaicf.plugins.caila.publish.internal.client.CailaApiClient
+import com.justai.jaicf.plugins.caila.publish.internal.http.HttpClientFactory
 import com.justai.jaicf.plugins.caila.publish.model.PublishImageRequestDto
+import io.ktor.client.plugins.logging.LogLevel
 import org.gradle.api.DefaultTask
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Input
@@ -18,6 +21,9 @@ abstract class AbstractPublishCailaImageTask : DefaultTask() {
     @get:Nested
     abstract val spec: Property<CailaImageSpec>
 
+    @get:Nested
+    abstract val httpClientSpec: Property<HttpClientSpec>
+
     @get:Input
     @get:Optional
     abstract val cailaApiToken: Property<String>
@@ -61,7 +67,14 @@ abstract class AbstractPublishCailaImageTask : DefaultTask() {
         logger.lifecycle("Caila image name: $cailaImageName")
 
         try {
-            val client = CailaApiClient(token, baseUrl)
+            val httpSpec = httpClientSpec.get()
+            val httpClient = HttpClientFactory.create(
+                logLevel = LogLevel.valueOf(httpSpec.logLevel.get()),
+                connectTimeoutMs = httpSpec.connectTimeoutMs.get(),
+                requestTimeoutMs = httpSpec.requestTimeoutMs.get(),
+                keepAliveTimeMs = httpSpec.keepAliveTimeMs.get(),
+            )
+            val client = CailaApiClient(token, baseUrl, httpClient)
             val request = PublishImageRequestDto(
                 name = cailaImageName,
                 image = dockerImage,
diff --git a/gradle-plugins/caila-publish-plugin/src/main/kotlin/com/justai/jaicf/plugins/caila/publish/task/CailaModelTask.kt b/gradle-plugins/caila-publish-plugin/src/main/kotlin/com/justai/jaicf/plugins/caila/publish/task/CailaModelTask.kt
@@ -2,9 +2,11 @@ package com.justai.jaicf.plugins.caila.publish.task
 
 import com.justai.jaicf.plugins.caila.publish.extension.CAILA_BASE_URL
 import com.justai.jaicf.plugins.caila.publish.extension.CailaModelSpec
+import com.justai.jaicf.plugins.caila.publish.extension.HttpClientSpec
 import com.justai.jaicf.plugins.caila.publish.internal.client.CailaApiClient
+import com.justai.jaicf.plugins.caila.publish.internal.http.HttpClientFactory
 import com.justai.jaicf.plugins.caila.publish.model.PublishModelRequestDto
-import kotlinx.coroutines.runBlocking
+import io.ktor.client.plugins.logging.LogLevel
 import org.gradle.api.DefaultTask
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Input
@@ -18,6 +20,9 @@ abstract class CailaModelTask : DefaultTask() {
     @get:Nested
     abstract val spec: Property<CailaModelSpec>
 
+    @get:Nested
+    abstract val httpClientSpec: Property<HttpClientSpec>
+
     @get:Input
     abstract val imageId: Property<Int>
 
@@ -60,7 +65,14 @@ abstract class CailaModelTask : DefaultTask() {
         logger.lifecycle("Image ID: $image")
 
         try {
-            val client = CailaApiClient(token, baseUrl)
+            val httpSpec = httpClientSpec.get()
+            val httpClient = HttpClientFactory.create(
+                logLevel = LogLevel.valueOf(httpSpec.logLevel.get()),
+                connectTimeoutMs = httpSpec.connectTimeoutMs.get(),
+                requestTimeoutMs = httpSpec.requestTimeoutMs.get(),
+                keepAliveTimeMs = httpSpec.keepAliveTimeMs.get(),
+            )
+            val client = CailaApiClient(token, baseUrl, httpClient)
             val request = PublishModelRequestDto(
                 imageId = image,
                 imageAccountId = accountId,
