Merge pull request #9 from meta-llama/upgrade-sdk

Upgrade SDK to be compatible with 0.0.54 server version

Author: Riandy

build.gradle.kts

@@ -4,5 +4,5 @@ plugins {
 
 allprojects {
     group = "com.llama.llamastack"
-    version = "0.0.1-alpha.1"
+    version = "0.0.1-alpha.2"
 }

llama-stack-client-kotlin-core/build.gradle.kts

@@ -4,13 +4,13 @@ plugins {
 }
 
 dependencies {
-    api("com.fasterxml.jackson.core:jackson-core:2.14.3")
-    api("com.fasterxml.jackson.core:jackson-databind:2.14.3")
+    api("com.fasterxml.jackson.core:jackson-core:2.18.1")
+    api("com.fasterxml.jackson.core:jackson-databind:2.18.1")
 
-    implementation("com.fasterxml.jackson.core:jackson-annotations:2.14.3")
-    implementation("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.14.3")
-    implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.3")
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.14.3")
+    implementation("com.fasterxml.jackson.core:jackson-annotations:2.18.1")
+    implementation("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.1")
+    implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.1")
+    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.18.1")
     implementation("org.apache.httpcomponents.core5:httpcore5:5.2.4")
     implementation("org.apache.httpcomponents.client5:httpclient5:5.3.1")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0")
@@ -21,4 +21,7 @@ dependencies {
     testImplementation("org.assertj:assertj-core:3.25.3")
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.3")
     testImplementation("org.junit.jupiter:junit-jupiter-params:5.9.3")
+    testImplementation("org.mockito:mockito-core:5.14.2")
+    testImplementation("org.mockito:mockito-junit-jupiter:5.14.2")
+    testImplementation("org.mockito.kotlin:mockito-kotlin:4.1.0")
 }

llama-stack-client-kotlin-core/src/main/kotlin/com/llama/llamastack/client/LlamaStackClientClient.kt

@@ -11,7 +11,7 @@ interface LlamaStackClientClient {
 
     fun agents(): AgentService
 
-    fun batchInferences(): BatchInferenceService
+    fun batchInference(): BatchInferenceService
 
     fun datasets(): DatasetService
 

llama-stack-client-kotlin-core/src/main/kotlin/com/llama/llamastack/client/LlamaStackClientClientAsync.kt

@@ -11,7 +11,7 @@ interface LlamaStackClientClientAsync {
 
     fun agents(): AgentServiceAsync
 
-    fun batchInferences(): BatchInferenceServiceAsync
+    fun batchInference(): BatchInferenceServiceAsync
 
     fun datasets(): DatasetServiceAsync
 

llama-stack-client-kotlin-core/src/main/kotlin/com/llama/llamastack/client/LlamaStackClientClientAsyncImpl.kt

@@ -27,7 +27,7 @@ constructor(
         AgentServiceAsyncImpl(clientOptionsWithUserAgent)
     }
 
-    private val batchInferences: BatchInferenceServiceAsync by lazy {
+    private val batchInference: BatchInferenceServiceAsync by lazy {
         BatchInferenceServiceAsyncImpl(clientOptionsWithUserAgent)
     }
 
@@ -105,7 +105,7 @@ constructor(
 
     override fun agents(): AgentServiceAsync = agents
 
-    override fun batchInferences(): BatchInferenceServiceAsync = batchInferences
+    override fun batchInference(): BatchInferenceServiceAsync = batchInference
 
     override fun datasets(): DatasetServiceAsync = datasets
 

llama-stack-client-kotlin-core/src/main/kotlin/com/llama/llamastack/client/LlamaStackClientClientImpl.kt

@@ -27,7 +27,7 @@ constructor(
 
     private val agents: AgentService by lazy { AgentServiceImpl(clientOptionsWithUserAgent) }
 
-    private val batchInferences: BatchInferenceService by lazy {
+    private val batchInference: BatchInferenceService by lazy {
         BatchInferenceServiceImpl(clientOptionsWithUserAgent)
     }
 
@@ -89,7 +89,7 @@ constructor(
 
     override fun agents(): AgentService = agents
 
-    override fun batchInferences(): BatchInferenceService = batchInferences
+    override fun batchInference(): BatchInferenceService = batchInference
 
     override fun datasets(): DatasetService = datasets
 

llama-stack-client-kotlin-core/src/main/kotlin/com/llama/llamastack/core/PhantomReachable.kt

@@ -14,20 +14,29 @@ internal fun closeWhenPhantomReachable(observed: Any, closeable: AutoCloseable)
     check(observed !== closeable) {
         "`observed` cannot be the same object as `closeable` because it would never become phantom reachable"
     }
-    closeWhenPhantomReachable?.let { it(observed, closeable::close) }
+    closeWhenPhantomReachable(observed, closeable::close)
 }
 
-private val closeWhenPhantomReachable: ((Any, AutoCloseable) -> Unit)? by lazy {
+/**
+ * Calls [close] when [observed] becomes only phantom reachable.
+ *
+ * This is a wrapper around a Java 9+ [java.lang.ref.Cleaner], or a no-op in older Java versions.
+ */
+internal fun closeWhenPhantomReachable(observed: Any, close: () -> Unit) {
+    closeWhenPhantomReachable?.let { it(observed, close) }
+}
+
+private val closeWhenPhantomReachable: ((Any, () -> Unit) -> Unit)? by lazy {
     try {
         val cleanerClass = Class.forName("java.lang.ref.Cleaner")
         val cleanerCreate = cleanerClass.getMethod("create")
         val cleanerRegister =
             cleanerClass.getMethod("register", Any::class.java, Runnable::class.java)
         val cleanerObject = cleanerCreate.invoke(null);
 
-        { observed, closeable ->
+        { observed, close ->
             try {
-                cleanerRegister.invoke(cleanerObject, observed, Runnable { closeable.close() })
+                cleanerRegister.invoke(cleanerObject, observed, Runnable { close() })
             } catch (e: ReflectiveOperationException) {
                 if (e is InvocationTargetException) {
                     when (val cause = e.cause) {

llama-stack-client-kotlin-core/src/main/kotlin/com/llama/llamastack/errors/LlamaStackClientError.kt

@@ -17,20 +17,6 @@ private constructor(
     @JsonAnyGetter val additionalProperties: Map<String, JsonValue>,
 ) {
 
-    override fun equals(other: Any?): Boolean {
-        if (this === other) {
-            return true
-        }
-
-        return /* spotless:off */ other is LlamaStackClientError && this.additionalProperties == other.additionalProperties /* spotless:on */
-    }
-
-    override fun hashCode(): Int {
-        return /* spotless:off */ Objects.hash(additionalProperties) /* spotless:on */
-    }
-
-    override fun toString() = "LlamaStackClientError{additionalProperties=$additionalProperties}"
-
     fun toBuilder() = Builder().from(this)
 
     companion object {
@@ -69,4 +55,16 @@ private constructor(
         fun build(): LlamaStackClientError =
             LlamaStackClientError(additionalProperties.toImmutable())
     }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) {
+            return true
+        }
+
+        return /* spotless:off */ other is LlamaStackClientError && additionalProperties == other.additionalProperties /* spotless:on */
+    }
+
+    override fun hashCode(): Int = /* spotless:off */ Objects.hash(additionalProperties) /* spotless:on */
+
+    override fun toString() = "LlamaStackClientError{additionalProperties=$additionalProperties}"
 }

llama-stack-client-kotlin-core/src/main/kotlin/com/llama/llamastack/models/AgentConfig.kt

@@ -307,7 +307,7 @@ private constructor(
                 return true
             }
 
-            return /* spotless:off */ other is ToolChoice && this.value == other.value /* spotless:on */
+            return /* spotless:off */ other is ToolChoice && value == other.value /* spotless:on */
         }
 
         override fun hashCode() = value.hashCode()
@@ -364,7 +364,7 @@ private constructor(
                 return true
             }
 
-            return /* spotless:off */ other is ToolPromptFormat && this.value == other.value /* spotless:on */
+            return /* spotless:off */ other is ToolPromptFormat && value == other.value /* spotless:on */
         }
 
         override fun hashCode() = value.hashCode()
@@ -520,15 +520,13 @@ private constructor(
                 return true
             }
 
-            return /* spotless:off */ other is Tool && this.searchToolDefinition == other.searchToolDefinition && this.wolframAlphaToolDefinition == other.wolframAlphaToolDefinition && this.photogenToolDefinition == other.photogenToolDefinition && this.codeInterpreterToolDefinition == other.codeInterpreterToolDefinition && this.functionCallToolDefinition == other.functionCallToolDefinition && this.memoryToolDefinition == other.memoryToolDefinition /* spotless:on */
+            return /* spotless:off */ other is Tool && searchToolDefinition == other.searchToolDefinition && wolframAlphaToolDefinition == other.wolframAlphaToolDefinition && photogenToolDefinition == other.photogenToolDefinition && codeInterpreterToolDefinition == other.codeInterpreterToolDefinition && functionCallToolDefinition == other.functionCallToolDefinition && memoryToolDefinition == other.memoryToolDefinition /* spotless:on */
         }
 
-        override fun hashCode(): Int {
-            return /* spotless:off */ Objects.hash(searchToolDefinition, wolframAlphaToolDefinition, photogenToolDefinition, codeInterpreterToolDefinition, functionCallToolDefinition, memoryToolDefinition) /* spotless:on */
-        }
+        override fun hashCode(): Int = /* spotless:off */ Objects.hash(searchToolDefinition, wolframAlphaToolDefinition, photogenToolDefinition, codeInterpreterToolDefinition, functionCallToolDefinition, memoryToolDefinition) /* spotless:on */
 
-        override fun toString(): String {
-            return when {
+        override fun toString(): String =
+            when {
                 searchToolDefinition != null -> "Tool{searchToolDefinition=$searchToolDefinition}"
                 wolframAlphaToolDefinition != null ->
                     "Tool{wolframAlphaToolDefinition=$wolframAlphaToolDefinition}"
@@ -542,7 +540,6 @@ private constructor(
                 _json != null -> "Tool{_unknown=$_json}"
                 else -> throw IllegalStateException("Invalid Tool")
             }
-        }
 
         companion object {
 
@@ -661,17 +658,14 @@ private constructor(
             return true
         }
 
-        return /* spotless:off */ other is AgentConfig && this.enableSessionPersistence == other.enableSessionPersistence && this.inputShields == other.inputShields && this.instructions == other.instructions && this.maxInferIters == other.maxInferIters && this.model == other.model && this.outputShields == other.outputShields && this.samplingParams == other.samplingParams && this.toolChoice == other.toolChoice && this.toolPromptFormat == other.toolPromptFormat && this.tools == other.tools && this.additionalProperties == other.additionalProperties /* spotless:on */
+        return /* spotless:off */ other is AgentConfig && enableSessionPersistence == other.enableSessionPersistence && inputShields == other.inputShields && instructions == other.instructions && maxInferIters == other.maxInferIters && model == other.model && outputShields == other.outputShields && samplingParams == other.samplingParams && toolChoice == other.toolChoice && toolPromptFormat == other.toolPromptFormat && tools == other.tools && additionalProperties == other.additionalProperties /* spotless:on */
     }
 
-    private var hashCode: Int = 0
+    /* spotless:off */
+    private val hashCode: Int by lazy { Objects.hash(enableSessionPersistence, inputShields, instructions, maxInferIters, model, outputShields, samplingParams, toolChoice, toolPromptFormat, tools, additionalProperties) }
+    /* spotless:on */
 
-    override fun hashCode(): Int {
-        if (hashCode == 0) {
-            hashCode = /* spotless:off */ Objects.hash(enableSessionPersistence, inputShields, instructions, maxInferIters, model, outputShields, samplingParams, toolChoice, toolPromptFormat, tools, additionalProperties) /* spotless:on */
-        }
-        return hashCode
-    }
+    override fun hashCode(): Int = hashCode
 
     override fun toString() =
         "AgentConfig{enableSessionPersistence=$enableSessionPersistence, inputShields=$inputShields, instructions=$instructions, maxInferIters=$maxInferIters, model=$model, outputShields=$outputShields, samplingParams=$samplingParams, toolChoice=$toolChoice, toolPromptFormat=$toolPromptFormat, tools=$tools, additionalProperties=$additionalProperties}"

llama-stack-client-kotlin-core/src/main/kotlin/com/llama/llamastack/models/AgentCreateParams.kt

@@ -18,18 +18,28 @@ import java.util.Objects
 class AgentCreateParams
 constructor(
     private val agentConfig: AgentConfig,
+    private val xLlamaStackProviderData: String?,
     private val additionalHeaders: Headers,
     private val additionalQueryParams: QueryParams,
     private val additionalBodyProperties: Map<String, JsonValue>,
 ) {
 
     fun agentConfig(): AgentConfig = agentConfig
 
+    fun xLlamaStackProviderData(): String? = xLlamaStackProviderData
+
     internal fun getBody(): AgentCreateBody {
         return AgentCreateBody(agentConfig, additionalBodyProperties)
     }
 
-    internal fun getHeaders(): Headers = additionalHeaders
+    internal fun getHeaders(): Headers {
+        val headers = Headers.builder()
+        this.xLlamaStackProviderData?.let {
+            headers.put("X-LlamaStack-ProviderData", listOf(it.toString()))
+        }
+        headers.putAll(additionalHeaders)
+        return headers.build()
+    }
 
     internal fun getQueryParams(): QueryParams = additionalQueryParams
 
@@ -93,17 +103,14 @@ constructor(
                 return true
             }
 
-            return /* spotless:off */ other is AgentCreateBody && this.agentConfig == other.agentConfig && this.additionalProperties == other.additionalProperties /* spotless:on */
+            return /* spotless:off */ other is AgentCreateBody && agentConfig == other.agentConfig && additionalProperties == other.additionalProperties /* spotless:on */
         }
 
-        private var hashCode: Int = 0
+        /* spotless:off */
+        private val hashCode: Int by lazy { Objects.hash(agentConfig, additionalProperties) }
+        /* spotless:on */
 
-        override fun hashCode(): Int {
-            if (hashCode == 0) {
-                hashCode = /* spotless:off */ Objects.hash(agentConfig, additionalProperties) /* spotless:on */
-            }
-            return hashCode
-        }
+        override fun hashCode(): Int = hashCode
 
         override fun toString() =
             "AgentCreateBody{agentConfig=$agentConfig, additionalProperties=$additionalProperties}"
@@ -120,15 +127,13 @@ constructor(
             return true
         }
 
-        return /* spotless:off */ other is AgentCreateParams && this.agentConfig == other.agentConfig && this.additionalHeaders == other.additionalHeaders && this.additionalQueryParams == other.additionalQueryParams && this.additionalBodyProperties == other.additionalBodyProperties /* spotless:on */
+        return /* spotless:off */ other is AgentCreateParams && agentConfig == other.agentConfig && xLlamaStackProviderData == other.xLlamaStackProviderData && additionalHeaders == other.additionalHeaders && additionalQueryParams == other.additionalQueryParams && additionalBodyProperties == other.additionalBodyProperties /* spotless:on */
     }
 
-    override fun hashCode(): Int {
-        return /* spotless:off */ Objects.hash(agentConfig, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */
-    }
+    override fun hashCode(): Int = /* spotless:off */ Objects.hash(agentConfig, xLlamaStackProviderData, additionalHeaders, additionalQueryParams, additionalBodyProperties) /* spotless:on */
 
     override fun toString() =
-        "AgentCreateParams{agentConfig=$agentConfig, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}"
+        "AgentCreateParams{agentConfig=$agentConfig, xLlamaStackProviderData=$xLlamaStackProviderData, additionalHeaders=$additionalHeaders, additionalQueryParams=$additionalQueryParams, additionalBodyProperties=$additionalBodyProperties}"
 
     fun toBuilder() = Builder().from(this)
 
@@ -141,19 +146,25 @@ constructor(
     class Builder {
 
         private var agentConfig: AgentConfig? = null
+        private var xLlamaStackProviderData: String? = null
         private var additionalHeaders: Headers.Builder = Headers.builder()
         private var additionalQueryParams: QueryParams.Builder = QueryParams.builder()
         private var additionalBodyProperties: MutableMap<String, JsonValue> = mutableMapOf()
 
         internal fun from(agentCreateParams: AgentCreateParams) = apply {
             this.agentConfig = agentCreateParams.agentConfig
+            this.xLlamaStackProviderData = agentCreateParams.xLlamaStackProviderData
             additionalHeaders(agentCreateParams.additionalHeaders)
             additionalQueryParams(agentCreateParams.additionalQueryParams)
             additionalBodyProperties(agentCreateParams.additionalBodyProperties)
         }
 
         fun agentConfig(agentConfig: AgentConfig) = apply { this.agentConfig = agentConfig }
 
+        fun xLlamaStackProviderData(xLlamaStackProviderData: String) = apply {
+            this.xLlamaStackProviderData = xLlamaStackProviderData
+        }
+
         fun additionalHeaders(additionalHeaders: Headers) = apply {
             this.additionalHeaders.clear()
             putAllAdditionalHeaders(additionalHeaders)
@@ -277,6 +288,7 @@ constructor(
         fun build(): AgentCreateParams =
             AgentCreateParams(
                 checkNotNull(agentConfig) { "`agentConfig` is required but was not set" },
+                xLlamaStackProviderData,
                 additionalHeaders.build(),
                 additionalQueryParams.build(),
                 additionalBodyProperties.toImmutable(),