stainless copy

Author: Riandy

llama-stack-client-kotlin-client-okhttp/src/main/kotlin/com/llama/llamastack/client/okhttp/LlamaStackClientOkHttpClient.kt

@@ -163,13 +163,7 @@ class LlamaStackClientOkHttpClient private constructor() {
         fun build(): LlamaStackClientClient =
             LlamaStackClientClientImpl(
                 clientOptions
-                    .httpClient(
-                        OkHttpClient.builder()
-                            .baseUrl(clientOptions.baseUrl())
-                            .timeout(timeout)
-                            .proxy(proxy)
-                            .build()
-                    )
+                    .httpClient(OkHttpClient.builder().timeout(timeout).proxy(proxy).build())
                     .build()
             )
     }

llama-stack-client-kotlin-client-okhttp/src/main/kotlin/com/llama/llamastack/client/okhttp/LlamaStackClientOkHttpClientAsync.kt

@@ -164,13 +164,7 @@ class LlamaStackClientOkHttpClientAsync private constructor() {
         fun build(): LlamaStackClientClientAsync =
             LlamaStackClientClientAsyncImpl(
                 clientOptions
-                    .httpClient(
-                        OkHttpClient.builder()
-                            .baseUrl(clientOptions.baseUrl())
-                            .timeout(timeout)
-                            .proxy(proxy)
-                            .build()
-                    )
+                    .httpClient(OkHttpClient.builder().timeout(timeout).proxy(proxy).build())
                     .build()
             )
     }

llama-stack-client-kotlin-client-okhttp/src/main/kotlin/com/llama/llamastack/client/okhttp/OkHttpClient.kt

@@ -2,7 +2,6 @@ package com.llama.llamastack.client.okhttp
 
 import com.llama.llamastack.core.RequestOptions
 import com.llama.llamastack.core.Timeout
-import com.llama.llamastack.core.checkRequired
 import com.llama.llamastack.core.http.Headers
 import com.llama.llamastack.core.http.HttpClient
 import com.llama.llamastack.core.http.HttpMethod
@@ -17,7 +16,6 @@ import java.time.Duration
 import kotlinx.coroutines.suspendCancellableCoroutine
 import okhttp3.Call
 import okhttp3.Callback
-import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.MediaType
 import okhttp3.MediaType.Companion.toMediaType
@@ -28,8 +26,7 @@ import okhttp3.Response
 import okhttp3.logging.HttpLoggingInterceptor
 import okio.BufferedSink
 
-class OkHttpClient
-private constructor(private val okHttpClient: okhttp3.OkHttpClient, private val baseUrl: HttpUrl) :
+class OkHttpClient private constructor(private val okHttpClient: okhttp3.OkHttpClient) :
     HttpClient {
 
     override fun execute(request: HttpRequest, requestOptions: RequestOptions): HttpResponse {
@@ -148,11 +145,7 @@ private constructor(private val okHttpClient: okhttp3.OkHttpClient, private val
         }
 
     private fun HttpRequest.toUrl(): String {
-        url?.let {
-            return it
-        }
-
-        val builder = baseUrl.newBuilder()
+        val builder = baseUrl.toHttpUrl().newBuilder()
         pathSegments.forEach(builder::addPathSegment)
         queryParams.keys().forEach { key ->
             queryParams.values(key).forEach { builder.addQueryParameter(key, it) }
@@ -202,12 +195,9 @@ private constructor(private val okHttpClient: okhttp3.OkHttpClient, private val
 
     class Builder internal constructor() {
 
-        private var baseUrl: HttpUrl? = null
         private var timeout: Timeout = Timeout.default()
         private var proxy: Proxy? = null
 
-        fun baseUrl(baseUrl: String) = apply { this.baseUrl = baseUrl.toHttpUrl() }
-
         fun timeout(timeout: Timeout) = apply { this.timeout = timeout }
 
         fun timeout(timeout: Duration) = timeout(Timeout.builder().request(timeout).build())
@@ -222,8 +212,12 @@ private constructor(private val okHttpClient: okhttp3.OkHttpClient, private val
                     .writeTimeout(timeout.write())
                     .callTimeout(timeout.request())
                     .proxy(proxy)
-                    .build(),
-                checkRequired("baseUrl", baseUrl),
+                    .build()
+                    .apply {
+                        // We usually make all our requests to the same host so it makes sense to
+                        // raise the per-host limit to the overall limit.
+                        dispatcher.maxRequestsPerHost = dispatcher.maxRequests
+                    }
             )
     }
 }

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

@@ -2,16 +2,21 @@
 
 package com.llama.llamastack.client
 
+import com.llama.llamastack.core.ClientOptions
 import com.llama.llamastack.services.blocking.AgentService
-import com.llama.llamastack.services.blocking.BatchInferenceService
 import com.llama.llamastack.services.blocking.BenchmarkService
+import com.llama.llamastack.services.blocking.ChatService
+import com.llama.llamastack.services.blocking.CompletionService
 import com.llama.llamastack.services.blocking.DatasetService
+import com.llama.llamastack.services.blocking.EmbeddingService
 import com.llama.llamastack.services.blocking.EvalService
+import com.llama.llamastack.services.blocking.FileService
 import com.llama.llamastack.services.blocking.InferenceService
 import com.llama.llamastack.services.blocking.InspectService
 import com.llama.llamastack.services.blocking.ModelService
 import com.llama.llamastack.services.blocking.PostTrainingService
 import com.llama.llamastack.services.blocking.ProviderService
+import com.llama.llamastack.services.blocking.ResponseService
 import com.llama.llamastack.services.blocking.RouteService
 import com.llama.llamastack.services.blocking.SafetyService
 import com.llama.llamastack.services.blocking.ScoringFunctionService
@@ -24,6 +29,7 @@ import com.llama.llamastack.services.blocking.ToolService
 import com.llama.llamastack.services.blocking.ToolgroupService
 import com.llama.llamastack.services.blocking.VectorDbService
 import com.llama.llamastack.services.blocking.VectorIoService
+import com.llama.llamastack.services.blocking.VectorStoreService
 
 /**
  * A client for interacting with the Llama Stack Client REST API synchronously. You can also switch
@@ -54,15 +60,22 @@ interface LlamaStackClientClient {
      */
     fun withRawResponse(): WithRawResponse
 
+    /**
+     * Returns a view of this service with the given option modifications applied.
+     *
+     * The original service is not modified.
+     */
+    fun withOptions(modifier: (ClientOptions.Builder) -> Unit): LlamaStackClientClient
+
     fun toolgroups(): ToolgroupService
 
     fun tools(): ToolService
 
     fun toolRuntime(): ToolRuntimeService
 
-    fun agents(): AgentService
+    fun responses(): ResponseService
 
-    fun batchInference(): BatchInferenceService
+    fun agents(): AgentService
 
     fun datasets(): DatasetService
 
@@ -72,10 +85,18 @@ interface LlamaStackClientClient {
 
     fun inference(): InferenceService
 
+    fun embeddings(): EmbeddingService
+
+    fun chat(): ChatService
+
+    fun completions(): CompletionService
+
     fun vectorIo(): VectorIoService
 
     fun vectorDbs(): VectorDbService
 
+    fun vectorStores(): VectorStoreService
+
     fun models(): ModelService
 
     fun postTraining(): PostTrainingService
@@ -98,6 +119,8 @@ interface LlamaStackClientClient {
 
     fun benchmarks(): BenchmarkService
 
+    fun files(): FileService
+
     /**
      * Closes this client, relinquishing any underlying resources.
      *
@@ -117,15 +140,24 @@ interface LlamaStackClientClient {
      */
     interface WithRawResponse {
 
+        /**
+         * Returns a view of this service with the given option modifications applied.
+         *
+         * The original service is not modified.
+         */
+        fun withOptions(
+            modifier: (ClientOptions.Builder) -> Unit
+        ): LlamaStackClientClient.WithRawResponse
+
         fun toolgroups(): ToolgroupService.WithRawResponse
 
         fun tools(): ToolService.WithRawResponse
 
         fun toolRuntime(): ToolRuntimeService.WithRawResponse
 
-        fun agents(): AgentService.WithRawResponse
+        fun responses(): ResponseService.WithRawResponse
 
-        fun batchInference(): BatchInferenceService.WithRawResponse
+        fun agents(): AgentService.WithRawResponse
 
         fun datasets(): DatasetService.WithRawResponse
 
@@ -135,10 +167,18 @@ interface LlamaStackClientClient {
 
         fun inference(): InferenceService.WithRawResponse
 
+        fun embeddings(): EmbeddingService.WithRawResponse
+
+        fun chat(): ChatService.WithRawResponse
+
+        fun completions(): CompletionService.WithRawResponse
+
         fun vectorIo(): VectorIoService.WithRawResponse
 
         fun vectorDbs(): VectorDbService.WithRawResponse
 
+        fun vectorStores(): VectorStoreService.WithRawResponse
+
         fun models(): ModelService.WithRawResponse
 
         fun postTraining(): PostTrainingService.WithRawResponse
@@ -160,5 +200,7 @@ interface LlamaStackClientClient {
         fun scoringFunctions(): ScoringFunctionService.WithRawResponse
 
         fun benchmarks(): BenchmarkService.WithRawResponse
+
+        fun files(): FileService.WithRawResponse
     }
 }

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

@@ -2,16 +2,21 @@
 
 package com.llama.llamastack.client
 
+import com.llama.llamastack.core.ClientOptions
 import com.llama.llamastack.services.async.AgentServiceAsync
-import com.llama.llamastack.services.async.BatchInferenceServiceAsync
 import com.llama.llamastack.services.async.BenchmarkServiceAsync
+import com.llama.llamastack.services.async.ChatServiceAsync
+import com.llama.llamastack.services.async.CompletionServiceAsync
 import com.llama.llamastack.services.async.DatasetServiceAsync
+import com.llama.llamastack.services.async.EmbeddingServiceAsync
 import com.llama.llamastack.services.async.EvalServiceAsync
+import com.llama.llamastack.services.async.FileServiceAsync
 import com.llama.llamastack.services.async.InferenceServiceAsync
 import com.llama.llamastack.services.async.InspectServiceAsync
 import com.llama.llamastack.services.async.ModelServiceAsync
 import com.llama.llamastack.services.async.PostTrainingServiceAsync
 import com.llama.llamastack.services.async.ProviderServiceAsync
+import com.llama.llamastack.services.async.ResponseServiceAsync
 import com.llama.llamastack.services.async.RouteServiceAsync
 import com.llama.llamastack.services.async.SafetyServiceAsync
 import com.llama.llamastack.services.async.ScoringFunctionServiceAsync
@@ -24,6 +29,7 @@ import com.llama.llamastack.services.async.ToolServiceAsync
 import com.llama.llamastack.services.async.ToolgroupServiceAsync
 import com.llama.llamastack.services.async.VectorDbServiceAsync
 import com.llama.llamastack.services.async.VectorIoServiceAsync
+import com.llama.llamastack.services.async.VectorStoreServiceAsync
 
 /**
  * A client for interacting with the Llama Stack Client REST API asynchronously. You can also switch
@@ -54,15 +60,22 @@ interface LlamaStackClientClientAsync {
      */
     fun withRawResponse(): WithRawResponse
 
+    /**
+     * Returns a view of this service with the given option modifications applied.
+     *
+     * The original service is not modified.
+     */
+    fun withOptions(modifier: (ClientOptions.Builder) -> Unit): LlamaStackClientClientAsync
+
     fun toolgroups(): ToolgroupServiceAsync
 
     fun tools(): ToolServiceAsync
 
     fun toolRuntime(): ToolRuntimeServiceAsync
 
-    fun agents(): AgentServiceAsync
+    fun responses(): ResponseServiceAsync
 
-    fun batchInference(): BatchInferenceServiceAsync
+    fun agents(): AgentServiceAsync
 
     fun datasets(): DatasetServiceAsync
 
@@ -72,10 +85,18 @@ interface LlamaStackClientClientAsync {
 
     fun inference(): InferenceServiceAsync
 
+    fun embeddings(): EmbeddingServiceAsync
+
+    fun chat(): ChatServiceAsync
+
+    fun completions(): CompletionServiceAsync
+
     fun vectorIo(): VectorIoServiceAsync
 
     fun vectorDbs(): VectorDbServiceAsync
 
+    fun vectorStores(): VectorStoreServiceAsync
+
     fun models(): ModelServiceAsync
 
     fun postTraining(): PostTrainingServiceAsync
@@ -98,6 +119,8 @@ interface LlamaStackClientClientAsync {
 
     fun benchmarks(): BenchmarkServiceAsync
 
+    fun files(): FileServiceAsync
+
     /**
      * Closes this client, relinquishing any underlying resources.
      *
@@ -117,15 +140,24 @@ interface LlamaStackClientClientAsync {
      */
     interface WithRawResponse {
 
+        /**
+         * Returns a view of this service with the given option modifications applied.
+         *
+         * The original service is not modified.
+         */
+        fun withOptions(
+            modifier: (ClientOptions.Builder) -> Unit
+        ): LlamaStackClientClientAsync.WithRawResponse
+
         fun toolgroups(): ToolgroupServiceAsync.WithRawResponse
 
         fun tools(): ToolServiceAsync.WithRawResponse
 
         fun toolRuntime(): ToolRuntimeServiceAsync.WithRawResponse
 
-        fun agents(): AgentServiceAsync.WithRawResponse
+        fun responses(): ResponseServiceAsync.WithRawResponse
 
-        fun batchInference(): BatchInferenceServiceAsync.WithRawResponse
+        fun agents(): AgentServiceAsync.WithRawResponse
 
         fun datasets(): DatasetServiceAsync.WithRawResponse
 
@@ -135,10 +167,18 @@ interface LlamaStackClientClientAsync {
 
         fun inference(): InferenceServiceAsync.WithRawResponse
 
+        fun embeddings(): EmbeddingServiceAsync.WithRawResponse
+
+        fun chat(): ChatServiceAsync.WithRawResponse
+
+        fun completions(): CompletionServiceAsync.WithRawResponse
+
         fun vectorIo(): VectorIoServiceAsync.WithRawResponse
 
         fun vectorDbs(): VectorDbServiceAsync.WithRawResponse
 
+        fun vectorStores(): VectorStoreServiceAsync.WithRawResponse
+
         fun models(): ModelServiceAsync.WithRawResponse
 
         fun postTraining(): PostTrainingServiceAsync.WithRawResponse
@@ -160,5 +200,7 @@ interface LlamaStackClientClientAsync {
         fun scoringFunctions(): ScoringFunctionServiceAsync.WithRawResponse
 
         fun benchmarks(): BenchmarkServiceAsync.WithRawResponse
+
+        fun files(): FileServiceAsync.WithRawResponse
     }
 }