Skip to content

Commit 0be4215

Browse files
stainless-app[bot]stainless-app[bot]
committed
feat(api): manual updates
1 parent 03d143b commit 0be4215

70 files changed

Lines changed: 142 additions & 841 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.stats.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
configured_endpoints: 122
22
openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/langsmith/langsmith-api-b1c4148f81f631fe48d32c386271b85cd24bb23efec0a0cad994fbf270cee837.yml
33
openapi_spec_hash: 8ddfa7a9b6e3e59bc668a5479a1a6344
4-
config_hash: 710f81ad1c90555e99c612170ad2c312
4+
config_hash: 57e1c5d2f7d3f4c50121dda73a181670

‎README.md‎

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ import com.langchain.smith.client.LangsmithClient;
5050
import com.langchain.smith.client.okhttp.LangsmithOkHttpClient;
5151
import com.langchain.smith.models.runs.RunQueryParams;
5252

53-
// Configures using the `langchain.langsmithApiKey`, `langchain.langsmithTenantId`, `langchain.langsmithBearerToken`, `langchain.langsmithOrganizationId` and `langchain.baseUrl` system properties
54-
// Or configures using the `LANGSMITH_API_KEY`, `LANGSMITH_TENANT_ID`, `LANGSMITH_BEARER_TOKEN`, `LANGSMITH_ORGANIZATION_ID` and `LANGSMITH_ENDPOINT` environment variables
53+
// Configures using the `langchain.langsmithApiKey`, `langchain.langsmithTenantId` and `langchain.baseUrl` system properties
54+
// Or configures using the `LANGSMITH_API_KEY`, `LANGSMITH_TENANT_ID` and `LANGSMITH_ENDPOINT` environment variables
5555
LangsmithClient client = LangsmithOkHttpClient.fromEnv();
5656

5757
RunQueryParams params = RunQueryParams.builder()
@@ -103,8 +103,8 @@ Configure the client using system properties or environment variables:
103103
import com.langchain.smith.client.LangsmithClient;
104104
import com.langchain.smith.client.okhttp.LangsmithOkHttpClient;
105105

106-
// Configures using the `langchain.langsmithApiKey`, `langchain.langsmithTenantId`, `langchain.langsmithBearerToken`, `langchain.langsmithOrganizationId` and `langchain.baseUrl` system properties
107-
// Or configures using the `LANGSMITH_API_KEY`, `LANGSMITH_TENANT_ID`, `LANGSMITH_BEARER_TOKEN`, `LANGSMITH_ORGANIZATION_ID` and `LANGSMITH_ENDPOINT` environment variables
106+
// Configures using the `langchain.langsmithApiKey`, `langchain.langsmithTenantId` and `langchain.baseUrl` system properties
107+
// Or configures using the `LANGSMITH_API_KEY`, `LANGSMITH_TENANT_ID` and `LANGSMITH_ENDPOINT` environment variables
108108
LangsmithClient client = LangsmithOkHttpClient.fromEnv();
109109
```
110110

@@ -117,7 +117,6 @@ import com.langchain.smith.client.okhttp.LangsmithOkHttpClient;
117117
LangsmithClient client = LangsmithOkHttpClient.builder()
118118
.apiKey("My API Key")
119119
.tenantId("My Tenant ID")
120-
.organizationId("My Organization ID")
121120
.build();
122121
```
123122

@@ -128,22 +127,20 @@ import com.langchain.smith.client.LangsmithClient;
128127
import com.langchain.smith.client.okhttp.LangsmithOkHttpClient;
129128

130129
LangsmithClient client = LangsmithOkHttpClient.builder()
131-
// Configures using the `langchain.langsmithApiKey`, `langchain.langsmithTenantId`, `langchain.langsmithBearerToken`, `langchain.langsmithOrganizationId` and `langchain.baseUrl` system properties
132-
// Or configures using the `LANGSMITH_API_KEY`, `LANGSMITH_TENANT_ID`, `LANGSMITH_BEARER_TOKEN`, `LANGSMITH_ORGANIZATION_ID` and `LANGSMITH_ENDPOINT` environment variables
130+
// Configures using the `langchain.langsmithApiKey`, `langchain.langsmithTenantId` and `langchain.baseUrl` system properties
131+
// Or configures using the `LANGSMITH_API_KEY`, `LANGSMITH_TENANT_ID` and `LANGSMITH_ENDPOINT` environment variables
133132
.fromEnv()
134133
.apiKey("My API Key")
135134
.build();
136135
```
137136

138137
See this table for the available options:
139138

140-
| Setter | System property | Environment variable | Required | Default value |
141-
| ---------------- | ----------------------------------- | --------------------------- | -------- | ------------------------------------ |
142-
| `apiKey` | `langchain.langsmithApiKey` | `LANGSMITH_API_KEY` | false | - |
143-
| `tenantId` | `langchain.langsmithTenantId` | `LANGSMITH_TENANT_ID` | false | - |
144-
| `bearerToken` | `langchain.langsmithBearerToken` | `LANGSMITH_BEARER_TOKEN` | false | - |
145-
| `organizationId` | `langchain.langsmithOrganizationId` | `LANGSMITH_ORGANIZATION_ID` | false | - |
146-
| `baseUrl` | `langchain.baseUrl` | `LANGSMITH_ENDPOINT` | true | `"https://api.smith.langchain.com/"` |
139+
| Setter | System property | Environment variable | Required | Default value |
140+
| ---------- | ----------------------------- | --------------------- | -------- | ------------------------------------ |
141+
| `apiKey` | `langchain.langsmithApiKey` | `LANGSMITH_API_KEY` | false | - |
142+
| `tenantId` | `langchain.langsmithTenantId` | `LANGSMITH_TENANT_ID` | false | - |
143+
| `baseUrl` | `langchain.baseUrl` | `LANGSMITH_ENDPOINT` | true | `"https://api.smith.langchain.com/"` |
147144

148145
System properties take precedence over environment variables.
149146

@@ -192,8 +189,8 @@ import com.langchain.smith.models.sessions.CustomChartsSectionRequest;
192189
import com.langchain.smith.models.sessions.SessionDashboardParams;
193190
import java.util.concurrent.CompletableFuture;
194191

195-
// Configures using the `langchain.langsmithApiKey`, `langchain.langsmithTenantId`, `langchain.langsmithBearerToken`, `langchain.langsmithOrganizationId` and `langchain.baseUrl` system properties
196-
// Or configures using the `LANGSMITH_API_KEY`, `LANGSMITH_TENANT_ID`, `LANGSMITH_BEARER_TOKEN`, `LANGSMITH_ORGANIZATION_ID` and `LANGSMITH_ENDPOINT` environment variables
192+
// Configures using the `langchain.langsmithApiKey`, `langchain.langsmithTenantId` and `langchain.baseUrl` system properties
193+
// Or configures using the `LANGSMITH_API_KEY`, `LANGSMITH_TENANT_ID` and `LANGSMITH_ENDPOINT` environment variables
197194
LangsmithClient client = LangsmithOkHttpClient.fromEnv();
198195

199196
SessionDashboardParams params = SessionDashboardParams.builder()
@@ -213,8 +210,8 @@ import com.langchain.smith.models.sessions.CustomChartsSectionRequest;
213210
import com.langchain.smith.models.sessions.SessionDashboardParams;
214211
import java.util.concurrent.CompletableFuture;
215212

216-
// Configures using the `langchain.langsmithApiKey`, `langchain.langsmithTenantId`, `langchain.langsmithBearerToken`, `langchain.langsmithOrganizationId` and `langchain.baseUrl` system properties
217-
// Or configures using the `LANGSMITH_API_KEY`, `LANGSMITH_TENANT_ID`, `LANGSMITH_BEARER_TOKEN`, `LANGSMITH_ORGANIZATION_ID` and `LANGSMITH_ENDPOINT` environment variables
213+
// Configures using the `langchain.langsmithApiKey`, `langchain.langsmithTenantId` and `langchain.baseUrl` system properties
214+
// Or configures using the `LANGSMITH_API_KEY`, `LANGSMITH_TENANT_ID` and `LANGSMITH_ENDPOINT` environment variables
218215
LangsmithClientAsync client = LangsmithOkHttpClientAsync.fromEnv();
219216

220217
SessionDashboardParams params = SessionDashboardParams.builder()

‎langsmith-java-client-okhttp/src/main/kotlin/com/langchain/smith/client/okhttp/LangsmithOkHttpClient.kt‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -291,23 +291,6 @@ class LangsmithOkHttpClient private constructor() {
291291
/** Alias for calling [Builder.tenantId] with `tenantId.orElse(null)`. */
292292
fun tenantId(tenantId: Optional<String>) = tenantId(tenantId.getOrNull())
293293

294-
/**
295-
* Bearer tokens are used to authenticate from the UI. Must also specify x-tenant-id or
296-
* x-organization-id (for org scoped apis).
297-
*/
298-
fun bearerToken(bearerToken: String?) = apply { clientOptions.bearerToken(bearerToken) }
299-
300-
/** Alias for calling [Builder.bearerToken] with `bearerToken.orElse(null)`. */
301-
fun bearerToken(bearerToken: Optional<String>) = bearerToken(bearerToken.getOrNull())
302-
303-
fun organizationId(organizationId: String?) = apply {
304-
clientOptions.organizationId(organizationId)
305-
}
306-
307-
/** Alias for calling [Builder.organizationId] with `organizationId.orElse(null)`. */
308-
fun organizationId(organizationId: Optional<String>) =
309-
organizationId(organizationId.getOrNull())
310-
311294
fun headers(headers: Headers) = apply { clientOptions.headers(headers) }
312295

313296
fun headers(headers: Map<String, Iterable<String>>) = apply {

‎langsmith-java-client-okhttp/src/main/kotlin/com/langchain/smith/client/okhttp/LangsmithOkHttpClientAsync.kt‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -291,23 +291,6 @@ class LangsmithOkHttpClientAsync private constructor() {
291291
/** Alias for calling [Builder.tenantId] with `tenantId.orElse(null)`. */
292292
fun tenantId(tenantId: Optional<String>) = tenantId(tenantId.getOrNull())
293293

294-
/**
295-
* Bearer tokens are used to authenticate from the UI. Must also specify x-tenant-id or
296-
* x-organization-id (for org scoped apis).
297-
*/
298-
fun bearerToken(bearerToken: String?) = apply { clientOptions.bearerToken(bearerToken) }
299-
300-
/** Alias for calling [Builder.bearerToken] with `bearerToken.orElse(null)`. */
301-
fun bearerToken(bearerToken: Optional<String>) = bearerToken(bearerToken.getOrNull())
302-
303-
fun organizationId(organizationId: String?) = apply {
304-
clientOptions.organizationId(organizationId)
305-
}
306-
307-
/** Alias for calling [Builder.organizationId] with `organizationId.orElse(null)`. */
308-
fun organizationId(organizationId: Optional<String>) =
309-
organizationId(organizationId.getOrNull())
310-
311294
fun headers(headers: Headers) = apply { clientOptions.headers(headers) }
312295

313296
fun headers(headers: Map<String, Iterable<String>>) = apply {

‎langsmith-java-client-okhttp/src/main/kotlin/com/langchain/smith/client/okhttp/OkHttpClient.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,6 @@ internal constructor(@JvmSynthetic internal val okHttpClient: okhttp3.OkHttpClie
9898
HttpLoggingInterceptor().setLevel(logLevel).apply {
9999
redactHeader("X-API-Key")
100100
redactHeader("X-Tenant-Id")
101-
redactHeader("Authorization")
102-
redactHeader("X-Organization-Id")
103101
}
104102
)
105103
}

‎langsmith-java-core/src/main/kotlin/com/langchain/smith/core/ClientOptions.kt‎

Lines changed: 5 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ private constructor(
111111
@get:JvmName("autoBatchTracing") val autoBatchTracing: Boolean,
112112
private val apiKey: String?,
113113
private val tenantId: String?,
114-
private val bearerToken: String?,
115-
private val organizationId: String?,
116114
) {
117115

118116
init {
@@ -132,14 +130,6 @@ private constructor(
132130

133131
fun tenantId(): Optional<String> = Optional.ofNullable(tenantId)
134132

135-
/**
136-
* Bearer tokens are used to authenticate from the UI. Must also specify x-tenant-id or
137-
* x-organization-id (for org scoped apis).
138-
*/
139-
fun bearerToken(): Optional<String> = Optional.ofNullable(bearerToken)
140-
141-
fun organizationId(): Optional<String> = Optional.ofNullable(organizationId)
142-
143133
fun toBuilder() = Builder().from(this)
144134

145135
companion object {
@@ -182,8 +172,6 @@ private constructor(
182172
private var autoBatchTracing: Boolean = true
183173
private var apiKey: String? = null
184174
private var tenantId: String? = null
185-
private var bearerToken: String? = null
186-
private var organizationId: String? = null
187175

188176
@JvmSynthetic
189177
internal fun from(clientOptions: ClientOptions) = apply {
@@ -202,8 +190,6 @@ private constructor(
202190
autoBatchTracing = clientOptions.autoBatchTracing
203191
apiKey = clientOptions.apiKey
204192
tenantId = clientOptions.tenantId
205-
bearerToken = clientOptions.bearerToken
206-
organizationId = clientOptions.organizationId
207193
}
208194

209195
/**
@@ -344,21 +330,6 @@ private constructor(
344330
/** Alias for calling [Builder.tenantId] with `tenantId.orElse(null)`. */
345331
fun tenantId(tenantId: Optional<String>) = tenantId(tenantId.getOrNull())
346332

347-
/**
348-
* Bearer tokens are used to authenticate from the UI. Must also specify x-tenant-id or
349-
* x-organization-id (for org scoped apis).
350-
*/
351-
fun bearerToken(bearerToken: String?) = apply { this.bearerToken = bearerToken }
352-
353-
/** Alias for calling [Builder.bearerToken] with `bearerToken.orElse(null)`. */
354-
fun bearerToken(bearerToken: Optional<String>) = bearerToken(bearerToken.getOrNull())
355-
356-
fun organizationId(organizationId: String?) = apply { this.organizationId = organizationId }
357-
358-
/** Alias for calling [Builder.organizationId] with `organizationId.orElse(null)`. */
359-
fun organizationId(organizationId: Optional<String>) =
360-
organizationId(organizationId.getOrNull())
361-
362333
fun headers(headers: Headers) = apply {
363334
this.headers.clear()
364335
putAllHeaders(headers)
@@ -446,13 +417,11 @@ private constructor(
446417
*
447418
* See this table for the available options:
448419
*
449-
* |Setter |System property |Environment variable |Required|Default value |
450-
* |----------------|-----------------------------------|---------------------------|--------|------------------------------------|
451-
* |`apiKey` |`langchain.langsmithApiKey` |`LANGSMITH_API_KEY` |false |- |
452-
* |`tenantId` |`langchain.langsmithTenantId` |`LANGSMITH_TENANT_ID` |false |- |
453-
* |`bearerToken` |`langchain.langsmithBearerToken` |`LANGSMITH_BEARER_TOKEN` |false |- |
454-
* |`organizationId`|`langchain.langsmithOrganizationId`|`LANGSMITH_ORGANIZATION_ID`|false |- |
455-
* |`baseUrl` |`langchain.baseUrl` |`LANGSMITH_ENDPOINT` |true |`"https://api.smith.langchain.com/"`|
420+
* |Setter |System property |Environment variable |Required|Default value |
421+
* |----------|-----------------------------|---------------------|--------|------------------------------------|
422+
* |`apiKey` |`langchain.langsmithApiKey` |`LANGSMITH_API_KEY` |false |- |
423+
* |`tenantId`|`langchain.langsmithTenantId`|`LANGSMITH_TENANT_ID`|false |- |
424+
* |`baseUrl` |`langchain.baseUrl` |`LANGSMITH_ENDPOINT` |true |`"https://api.smith.langchain.com/"`|
456425
*
457426
* System properties take precedence over environment variables.
458427
*/
@@ -465,12 +434,6 @@ private constructor(
465434
(System.getProperty("langchain.langsmithTenantId")
466435
?: System.getenv("LANGSMITH_TENANT_ID"))
467436
?.let { tenantId(it) }
468-
(System.getProperty("langchain.langsmithBearerToken")
469-
?: System.getenv("LANGSMITH_BEARER_TOKEN"))
470-
?.let { bearerToken(it) }
471-
(System.getProperty("langchain.langsmithOrganizationId")
472-
?: System.getenv("LANGSMITH_ORGANIZATION_ID"))
473-
?.let { organizationId(it) }
474437
System.getenv("LANGCHAIN_CUSTOM_HEADERS")?.let { customHeadersEnv ->
475438
for (line in customHeadersEnv.split("\n")) {
476439
val colon = line.indexOf(':')
@@ -538,16 +501,6 @@ private constructor(
538501
headers.replace("X-Tenant-Id", it)
539502
}
540503
}
541-
bearerToken?.let {
542-
if (!it.isEmpty()) {
543-
headers.replace("Authorization", "Bearer $it")
544-
}
545-
}
546-
organizationId?.let {
547-
if (!it.isEmpty()) {
548-
headers.replace("X-Organization-Id", it)
549-
}
550-
}
551504

552505
return ClientOptions(
553506
httpClient,
@@ -571,8 +524,6 @@ private constructor(
571524
autoBatchTracing,
572525
apiKey,
573526
tenantId,
574-
bearerToken,
575-
organizationId,
576527
)
577528
}
578529
}

‎langsmith-java-core/src/test/kotlin/com/langchain/smith/core/ClientOptionsTest.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ internal class ClientOptionsTest {
2424
.putHeader("User-Agent", "My User Agent")
2525
.apiKey("My API Key")
2626
.tenantId("My Tenant ID")
27-
.organizationId("My Organization ID")
2827
.build()
2928

3029
assertThat(clientOptions.headers.values("User-Agent")).containsExactly("My User Agent")
@@ -37,7 +36,6 @@ internal class ClientOptionsTest {
3736
.httpClient(httpClient)
3837
.apiKey("My API Key")
3938
.tenantId("My Tenant ID")
40-
.organizationId("My Organization ID")
4139
.build()
4240

4341
clientOptions = clientOptions.toBuilder().apiKey("another My API Key").build()
@@ -52,7 +50,6 @@ internal class ClientOptionsTest {
5250
.httpClient(httpClient)
5351
.apiKey("My API Key")
5452
.tenantId("My Tenant ID")
55-
.organizationId("My Organization ID")
5653
.build()
5754
verify(httpClient, never()).close()
5855

‎langsmith-java-core/src/test/kotlin/com/langchain/smith/services/ErrorHandlingTest.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ internal class ErrorHandlingTest {
6060
.baseUrl(wmRuntimeInfo.httpBaseUrl)
6161
.apiKey("My API Key")
6262
.tenantId("My Tenant ID")
63-
.organizationId("My Organization ID")
6463
.build()
6564
}
6665

‎langsmith-java-core/src/test/kotlin/com/langchain/smith/services/ServiceParamsTest.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ internal class ServiceParamsTest {
3636
.baseUrl(wmRuntimeInfo.httpBaseUrl)
3737
.apiKey("My API Key")
3838
.tenantId("My Tenant ID")
39-
.organizationId("My Organization ID")
4039
.build()
4140
}
4241

0 commit comments

Comments
 (0)