feat(api): update via SDK Studio (#11)

braintrustdata · May 10, 2024 · b8c236b · b8c236b
1 parent b8e3d56
commit b8c236b
Show file tree

Hide file tree

Showing 16 changed files with 79 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -38,18 +38,19 @@ implementation("com.braintrust.api:braintrust-kotlin:0.1.0")
 
 ### Configure the client
 
-Use `BraintrustOkHttpClient.builder()` to configure the client. At a minimum you need to set `.apiKey()`:
+Use `BraintrustOkHttpClient.builder()` to configure the client. At a minimum you need to set `.apiKey()` and `.baseUrl()`:
 
 ```kotlin
 import com.braintrust.api.client.BraintrustClient
 import com.braintrust.api.client.okhttp.BraintrustOkHttpClient
 
 val client = BraintrustOkHttpClient.builder()
     .apiKey("My API Key")
+    .baseUrl("My Base URL")
     .build()
 ```
 
-Alternately, set the environment with `BRAINTRUST_API_KEY`, and use `BraintrustOkHttpClient.fromEnv()` to read from the environment.
+Alternately, set the environment with `BRAINTRUST_API_KEY` or `BRAINTRUST_APP_URL`, and use `BraintrustOkHttpClient.fromEnv()` to read from the environment.
 
 ```kotlin
 val client = BraintrustOkHttpClient.fromEnv()
@@ -64,6 +65,7 @@ val client = BraintrustOkHttpClient.builder()
 | Property | Environment variable | Required | Default value |
 | -------- | -------------------- | -------- | ------------- |
 | apiKey   | `BRAINTRUST_API_KEY` | true     | —             |
+| baseUrl  | `BRAINTRUST_APP_URL` | true     | —             |
 
 Read the documentation for more configuration options.
 

diff --git a/...-client-okhttp/src/main/kotlin/com/braintrust/api/client/okhttp/BraintrustOkHttpClient.kt b/...-client-okhttp/src/main/kotlin/com/braintrust/api/client/okhttp/BraintrustOkHttpClient.kt
@@ -64,6 +64,8 @@ class BraintrustOkHttpClient private constructor() {
 
         fun apiKey(apiKey: String) = apply { clientOptions.apiKey(apiKey) }
 
+        fun baseUrl(baseUrl: String) = apply { clientOptions.baseUrl(baseUrl) }
+
         fun fromEnv() = apply { clientOptions.fromEnv() }
 
         fun build(): BraintrustClient {

diff --git a/...nt-okhttp/src/main/kotlin/com/braintrust/api/client/okhttp/BraintrustOkHttpClientAsync.kt b/...nt-okhttp/src/main/kotlin/com/braintrust/api/client/okhttp/BraintrustOkHttpClientAsync.kt
@@ -64,6 +64,8 @@ class BraintrustOkHttpClientAsync private constructor() {
 
         fun apiKey(apiKey: String) = apply { clientOptions.apiKey(apiKey) }
 
+        fun baseUrl(baseUrl: String) = apply { clientOptions.baseUrl(baseUrl) }
+
         fun fromEnv() = apply { clientOptions.fromEnv() }
 
         fun build(): BraintrustClientAsync {

diff --git a/braintrust-kotlin-core/src/main/kotlin/com/braintrust/api/core/ClientOptions.kt b/braintrust-kotlin-core/src/main/kotlin/com/braintrust/api/core/ClientOptions.kt
@@ -16,6 +16,7 @@ private constructor(
     val clock: Clock,
     val baseUrl: String,
     val apiKey: String,
+    val baseUrl: String,
     val headers: ListMultimap<String, String>,
     val responseValidation: Boolean,
 ) {
@@ -39,6 +40,7 @@ private constructor(
         private var responseValidation: Boolean = false
         private var maxRetries: Int = 2
         private var apiKey: String? = null
+        private var baseUrl: String? = null
 
         fun httpClient(httpClient: HttpClient) = apply { this.httpClient = httpClient }
 
@@ -75,11 +77,17 @@ private constructor(
 
         fun apiKey(apiKey: String) = apply { this.apiKey = apiKey }
 
-        fun fromEnv() = apply { System.getenv("BRAINTRUST_API_KEY")?.let { apiKey(it) } }
+        fun baseUrl(baseUrl: String) = apply { this.baseUrl = baseUrl }
+
+        fun fromEnv() = apply {
+            System.getenv("BRAINTRUST_API_KEY")?.let { apiKey(it) }
+            System.getenv("BRAINTRUST_APP_URL")?.let { baseUrl(it) }
+        }
 
         fun build(): ClientOptions {
             checkNotNull(httpClient) { "`httpClient` is required but was not set" }
             checkNotNull(apiKey) { "`apiKey` is required but was not set" }
+            checkNotNull(baseUrl) { "`baseUrl` is required but was not set" }
 
             val headers = ArrayListMultimap.create<String, String>()
             headers.put("X-Stainless-Lang", "kotlin")
@@ -103,6 +111,7 @@ private constructor(
                 clock,
                 baseUrl,
                 apiKey!!,
+                baseUrl!!,
                 headers.toUnmodifiable(),
                 responseValidation,
             )

diff --git a/braintrust-kotlin-core/src/test/kotlin/com/braintrust/api/services/ErrorHandlingTest.kt b/braintrust-kotlin-core/src/test/kotlin/com/braintrust/api/services/ErrorHandlingTest.kt
@@ -52,6 +52,7 @@ class ErrorHandlingTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(wmRuntimeInfo.getHttpBaseUrl())
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
     }
 

diff --git a/braintrust-kotlin-core/src/test/kotlin/com/braintrust/api/services/ServiceParamsTest.kt b/braintrust-kotlin-core/src/test/kotlin/com/braintrust/api/services/ServiceParamsTest.kt
@@ -37,6 +37,7 @@ class ServiceParamsTest {
         client =
             BraintrustOkHttpClient.builder()
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .baseUrl(wmRuntimeInfo.getHttpBaseUrl())
                 .build()
     }

diff --git a/...ntrust-kotlin-core/src/test/kotlin/com/braintrust/api/services/blocking/AclServiceTest.kt b/...ntrust-kotlin-core/src/test/kotlin/com/braintrust/api/services/blocking/AclServiceTest.kt
@@ -18,6 +18,7 @@ class AclServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val aclService = client.acl()
         val acl =
@@ -50,6 +51,7 @@ class AclServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val aclService = client.acl()
         val acl =
@@ -66,6 +68,7 @@ class AclServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val aclService = client.acl()
         val response =
@@ -85,6 +88,7 @@ class AclServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val aclService = client.acl()
         val acl =
@@ -101,6 +105,7 @@ class AclServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val aclService = client.acl()
         val acl =

diff --git a/...st-kotlin-core/src/test/kotlin/com/braintrust/api/services/blocking/DatasetServiceTest.kt b/...st-kotlin-core/src/test/kotlin/com/braintrust/api/services/blocking/DatasetServiceTest.kt
@@ -19,6 +19,7 @@ class DatasetServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val datasetService = client.dataset()
         val dataset =
@@ -39,6 +40,7 @@ class DatasetServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val datasetService = client.dataset()
         val dataset =
@@ -57,6 +59,7 @@ class DatasetServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val datasetService = client.dataset()
         val dataset =
@@ -77,6 +80,7 @@ class DatasetServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val datasetService = client.dataset()
         val response = datasetService.list(DatasetListParams.builder().build())
@@ -90,6 +94,7 @@ class DatasetServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val datasetService = client.dataset()
         val dataset =
@@ -108,6 +113,7 @@ class DatasetServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val datasetService = client.dataset()
         datasetService.feedback(
@@ -133,6 +139,7 @@ class DatasetServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val datasetService = client.dataset()
         val datasetFetchResponse =
@@ -155,6 +162,7 @@ class DatasetServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val datasetService = client.dataset()
         val datasetFetchPostResponse =
@@ -187,6 +195,7 @@ class DatasetServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val datasetService = client.dataset()
         val datasetInsertResponse =
@@ -225,6 +234,7 @@ class DatasetServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val datasetService = client.dataset()
         val dataset =
@@ -245,6 +255,7 @@ class DatasetServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val datasetService = client.dataset()
         val datasetSummarizeResponse =

diff --git a/...kotlin-core/src/test/kotlin/com/braintrust/api/services/blocking/ExperimentServiceTest.kt b/...kotlin-core/src/test/kotlin/com/braintrust/api/services/blocking/ExperimentServiceTest.kt
@@ -19,6 +19,7 @@ class ExperimentServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val experimentService = client.experiment()
         val experiment =
@@ -58,6 +59,7 @@ class ExperimentServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val experimentService = client.experiment()
         val experiment =
@@ -76,6 +78,7 @@ class ExperimentServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val experimentService = client.experiment()
         val experiment =
@@ -114,6 +117,7 @@ class ExperimentServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val experimentService = client.experiment()
         val response = experimentService.list(ExperimentListParams.builder().build())
@@ -127,6 +131,7 @@ class ExperimentServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val experimentService = client.experiment()
         val experiment =
@@ -145,6 +150,7 @@ class ExperimentServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val experimentService = client.experiment()
         experimentService.feedback(
@@ -172,6 +178,7 @@ class ExperimentServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val experimentService = client.experiment()
         val experimentFetchResponse =
@@ -194,6 +201,7 @@ class ExperimentServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val experimentService = client.experiment()
         val experimentFetchPostResponse =
@@ -226,6 +234,7 @@ class ExperimentServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val experimentService = client.experiment()
         val experimentInsertResponse =
@@ -307,6 +316,7 @@ class ExperimentServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val experimentService = client.experiment()
         val experiment =
@@ -346,6 +356,7 @@ class ExperimentServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val experimentService = client.experiment()
         val experimentSummarizeResponse =

diff --git a/...rust-kotlin-core/src/test/kotlin/com/braintrust/api/services/blocking/GroupServiceTest.kt b/...rust-kotlin-core/src/test/kotlin/com/braintrust/api/services/blocking/GroupServiceTest.kt
@@ -18,6 +18,7 @@ class GroupServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val groupService = client.group()
         val group =
@@ -40,6 +41,7 @@ class GroupServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val groupService = client.group()
         val group =
@@ -58,6 +60,7 @@ class GroupServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val groupService = client.group()
         val group =
@@ -80,6 +83,7 @@ class GroupServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val groupService = client.group()
         val response = groupService.list(GroupListParams.builder().build())
@@ -93,6 +97,7 @@ class GroupServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val groupService = client.group()
         val group =
@@ -109,6 +114,7 @@ class GroupServiceTest {
             BraintrustOkHttpClient.builder()
                 .baseUrl(TestServerExtension.BASE_URL)
                 .apiKey("My API Key")
+                .baseUrl("My Base URL")
                 .build()
         val groupService = client.group()
         val group =