diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 8935e9328..b8dda9bfc 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "0.28.0" + ".": "0.29.0" } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index b08bc0a92..072ce4dc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,28 @@ # Changelog +## 0.29.0 (2025-02-26) + +Full Changelog: [v0.28.0...v0.29.0](https://github.com/openai/openai-java/compare/v0.28.0...v0.29.0) + +### Features + +* **client:** allow omitting params object when none required ([#249](https://github.com/openai/openai-java/issues/249)) ([e77a6c3](https://github.com/openai/openai-java/commit/e77a6c35a1940bd6f1ef37f08a524974b28f17ac)) + + +### Bug Fixes + +* **client:** add missing `@JvmStatic` ([#252](https://github.com/openai/openai-java/issues/252)) ([06231c2](https://github.com/openai/openai-java/commit/06231c26727f09fd2065f2ebe9670b8149fcee84)) + + +### Chores + +* **internal:** remove unused variable ([#251](https://github.com/openai/openai-java/issues/251)) ([b41bc4e](https://github.com/openai/openai-java/commit/b41bc4ebbe38a216e1276e0b15fd3fe54fe37353)) + + +### Documentation + +* switch to `.list()` without arguments in examples ([d1480f1](https://github.com/openai/openai-java/commit/d1480f1c85c0e2704c2095298525401b76cec2e5)) + ## 0.28.0 (2025-02-24) Full Changelog: [v0.27.0...v0.28.0](https://github.com/openai/openai-java/compare/v0.27.0...v0.28.0) diff --git a/README.md b/README.md index 89fbc6566..bd358f6ce 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ -[![Maven Central](https://img.shields.io/maven-central/v/com.openai/openai-java)](https://central.sonatype.com/artifact/com.openai/openai-java/0.28.0) -[![javadoc](https://javadoc.io/badge2/com.openai/openai-java/0.28.0/javadoc.svg)](https://javadoc.io/doc/com.openai/openai-java/0.28.0) +[![Maven Central](https://img.shields.io/maven-central/v/com.openai/openai-java)](https://central.sonatype.com/artifact/com.openai/openai-java/0.29.0) +[![javadoc](https://javadoc.io/badge2/com.openai/openai-java/0.29.0/javadoc.svg)](https://javadoc.io/doc/com.openai/openai-java/0.29.0) @@ -25,7 +25,7 @@ The REST API documentation can be found on [platform.openai.com](https://platfor ### Gradle ```kotlin -implementation("com.openai:openai-java:0.28.0") +implementation("com.openai:openai-java:0.29.0") ``` ### Maven @@ -34,7 +34,7 @@ implementation("com.openai:openai-java:0.28.0") com.openai openai-java - 0.28.0 + 0.29.0 ``` diff --git a/build.gradle.kts b/build.gradle.kts index e7f94828f..a7db5098b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ repositories { allprojects { group = "com.openai" - version = "0.28.0" // x-release-please-version + version = "0.29.0" // x-release-please-version } subprojects { diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BatchListParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BatchListParams.kt index 25d77a985..5997e0f58 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BatchListParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BatchListParams.kt @@ -49,6 +49,8 @@ private constructor( companion object { + @JvmStatic fun none(): BatchListParams = builder().build() + @JvmStatic fun builder() = Builder() } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantListParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantListParams.kt index 4cf51235c..985ad32a4 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantListParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantListParams.kt @@ -70,6 +70,8 @@ private constructor( companion object { + @JvmStatic fun none(): BetaAssistantListParams = builder().build() + @JvmStatic fun builder() = Builder() } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadCreateParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadCreateParams.kt index 1b38273f0..0c72cf4d9 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadCreateParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaThreadCreateParams.kt @@ -353,6 +353,8 @@ private constructor( companion object { + @JvmStatic fun none(): BetaThreadCreateParams = builder().build() + @JvmStatic fun builder() = Builder() } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreListParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreListParams.kt index 28d811609..7239e2a66 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreListParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/BetaVectorStoreListParams.kt @@ -70,6 +70,8 @@ private constructor( companion object { + @JvmStatic fun none(): BetaVectorStoreListParams = builder().build() + @JvmStatic fun builder() = Builder() } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FileListParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/FileListParams.kt index c200a4c41..41bc4505e 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FileListParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FileListParams.kt @@ -66,6 +66,8 @@ private constructor( companion object { + @JvmStatic fun none(): FileListParams = builder().build() + @JvmStatic fun builder() = Builder() } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListParams.kt index 6901ffa6f..14fa8e2aa 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/FineTuningJobListParams.kt @@ -42,6 +42,8 @@ private constructor( companion object { + @JvmStatic fun none(): FineTuningJobListParams = builder().build() + @JvmStatic fun builder() = Builder() } diff --git a/openai-java-core/src/main/kotlin/com/openai/models/ModelListParams.kt b/openai-java-core/src/main/kotlin/com/openai/models/ModelListParams.kt index 53facb684..fda00a0ad 100644 --- a/openai-java-core/src/main/kotlin/com/openai/models/ModelListParams.kt +++ b/openai-java-core/src/main/kotlin/com/openai/models/ModelListParams.kt @@ -30,6 +30,8 @@ private constructor( companion object { + @JvmStatic fun none(): ModelListParams = builder().build() + @JvmStatic fun builder() = Builder() } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/async/BatchServiceAsync.kt b/openai-java-core/src/main/kotlin/com/openai/services/async/BatchServiceAsync.kt index f66ddb0e3..f8fd8488f 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/async/BatchServiceAsync.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/async/BatchServiceAsync.kt @@ -32,10 +32,14 @@ interface BatchServiceAsync { /** List your organization's batches. */ @JvmOverloads fun list( - params: BatchListParams, + params: BatchListParams = BatchListParams.none(), requestOptions: RequestOptions = RequestOptions.none(), ): CompletableFuture + /** List your organization's batches. */ + fun list(requestOptions: RequestOptions): CompletableFuture = + list(BatchListParams.none(), requestOptions) + /** * Cancels an in-progress batch. The batch will be in status `cancelling` for up to 10 minutes, * before changing to `cancelled`, where it will have partial results (if any) available in the diff --git a/openai-java-core/src/main/kotlin/com/openai/services/async/BetaServiceAsyncImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/async/BetaServiceAsyncImpl.kt index 53ce7d8a5..c161ebc6c 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/async/BetaServiceAsyncImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/async/BetaServiceAsyncImpl.kt @@ -3,7 +3,6 @@ package com.openai.services.async import com.openai.core.ClientOptions -import com.openai.core.http.Headers import com.openai.services.async.beta.AssistantServiceAsync import com.openai.services.async.beta.AssistantServiceAsyncImpl import com.openai.services.async.beta.ThreadServiceAsync @@ -14,11 +13,6 @@ import com.openai.services.async.beta.VectorStoreServiceAsyncImpl class BetaServiceAsyncImpl internal constructor(private val clientOptions: ClientOptions) : BetaServiceAsync { - companion object { - - private val DEFAULT_HEADERS = Headers.builder().put("OpenAI-Beta", "assistants=v2").build() - } - private val vectorStores: VectorStoreServiceAsync by lazy { VectorStoreServiceAsyncImpl(clientOptions) } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/async/FileServiceAsync.kt b/openai-java-core/src/main/kotlin/com/openai/services/async/FileServiceAsync.kt index f33e3122e..2b6d3e55d 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/async/FileServiceAsync.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/async/FileServiceAsync.kt @@ -28,10 +28,14 @@ interface FileServiceAsync { /** Returns a list of files. */ @JvmOverloads fun list( - params: FileListParams, + params: FileListParams = FileListParams.none(), requestOptions: RequestOptions = RequestOptions.none(), ): CompletableFuture + /** Returns a list of files. */ + fun list(requestOptions: RequestOptions): CompletableFuture = + list(FileListParams.none(), requestOptions) + /** Delete a file. */ @JvmOverloads fun delete( diff --git a/openai-java-core/src/main/kotlin/com/openai/services/async/ModelServiceAsync.kt b/openai-java-core/src/main/kotlin/com/openai/services/async/ModelServiceAsync.kt index 8650cf2de..532abc29d 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/async/ModelServiceAsync.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/async/ModelServiceAsync.kt @@ -31,10 +31,17 @@ interface ModelServiceAsync { */ @JvmOverloads fun list( - params: ModelListParams, + params: ModelListParams = ModelListParams.none(), requestOptions: RequestOptions = RequestOptions.none(), ): CompletableFuture + /** + * Lists the currently available models, and provides basic information about each one such as + * the owner and availability. + */ + fun list(requestOptions: RequestOptions): CompletableFuture = + list(ModelListParams.none(), requestOptions) + /** * Delete a fine-tuned model. You must have the Owner role in your organization to delete a * model. diff --git a/openai-java-core/src/main/kotlin/com/openai/services/async/beta/AssistantServiceAsync.kt b/openai-java-core/src/main/kotlin/com/openai/services/async/beta/AssistantServiceAsync.kt index 98051e25a..c513e8634 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/async/beta/AssistantServiceAsync.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/async/beta/AssistantServiceAsync.kt @@ -41,10 +41,14 @@ interface AssistantServiceAsync { /** Returns a list of assistants. */ @JvmOverloads fun list( - params: BetaAssistantListParams, + params: BetaAssistantListParams = BetaAssistantListParams.none(), requestOptions: RequestOptions = RequestOptions.none(), ): CompletableFuture + /** Returns a list of assistants. */ + fun list(requestOptions: RequestOptions): CompletableFuture = + list(BetaAssistantListParams.none(), requestOptions) + /** Delete an assistant. */ @JvmOverloads fun delete( diff --git a/openai-java-core/src/main/kotlin/com/openai/services/async/beta/ThreadServiceAsync.kt b/openai-java-core/src/main/kotlin/com/openai/services/async/beta/ThreadServiceAsync.kt index c589fa9bb..ab22b9749 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/async/beta/ThreadServiceAsync.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/async/beta/ThreadServiceAsync.kt @@ -28,10 +28,14 @@ interface ThreadServiceAsync { /** Create a thread. */ @JvmOverloads fun create( - params: BetaThreadCreateParams, + params: BetaThreadCreateParams = BetaThreadCreateParams.none(), requestOptions: RequestOptions = RequestOptions.none(), ): CompletableFuture + /** Create a thread. */ + fun create(requestOptions: RequestOptions): CompletableFuture = + create(BetaThreadCreateParams.none(), requestOptions) + /** Retrieves a thread. */ @JvmOverloads fun retrieve( diff --git a/openai-java-core/src/main/kotlin/com/openai/services/async/beta/VectorStoreServiceAsync.kt b/openai-java-core/src/main/kotlin/com/openai/services/async/beta/VectorStoreServiceAsync.kt index 259448f76..3ad93d7ef 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/async/beta/VectorStoreServiceAsync.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/async/beta/VectorStoreServiceAsync.kt @@ -47,10 +47,14 @@ interface VectorStoreServiceAsync { /** Returns a list of vector stores. */ @JvmOverloads fun list( - params: BetaVectorStoreListParams, + params: BetaVectorStoreListParams = BetaVectorStoreListParams.none(), requestOptions: RequestOptions = RequestOptions.none(), ): CompletableFuture + /** Returns a list of vector stores. */ + fun list(requestOptions: RequestOptions): CompletableFuture = + list(BetaVectorStoreListParams.none(), requestOptions) + /** Delete a vector store. */ @JvmOverloads fun delete( diff --git a/openai-java-core/src/main/kotlin/com/openai/services/async/fineTuning/JobServiceAsync.kt b/openai-java-core/src/main/kotlin/com/openai/services/async/fineTuning/JobServiceAsync.kt index eed0c8a95..360d1f3ed 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/async/fineTuning/JobServiceAsync.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/async/fineTuning/JobServiceAsync.kt @@ -49,10 +49,14 @@ interface JobServiceAsync { /** List your organization's fine-tuning jobs */ @JvmOverloads fun list( - params: FineTuningJobListParams, + params: FineTuningJobListParams = FineTuningJobListParams.none(), requestOptions: RequestOptions = RequestOptions.none(), ): CompletableFuture + /** List your organization's fine-tuning jobs */ + fun list(requestOptions: RequestOptions): CompletableFuture = + list(FineTuningJobListParams.none(), requestOptions) + /** Immediately cancel a fine-tune job. */ @JvmOverloads fun cancel( diff --git a/openai-java-core/src/main/kotlin/com/openai/services/blocking/BatchService.kt b/openai-java-core/src/main/kotlin/com/openai/services/blocking/BatchService.kt index 207d7e155..f7ef23057 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/blocking/BatchService.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/blocking/BatchService.kt @@ -31,10 +31,14 @@ interface BatchService { /** List your organization's batches. */ @JvmOverloads fun list( - params: BatchListParams, + params: BatchListParams = BatchListParams.none(), requestOptions: RequestOptions = RequestOptions.none(), ): BatchListPage + /** List your organization's batches. */ + fun list(requestOptions: RequestOptions): BatchListPage = + list(BatchListParams.none(), requestOptions) + /** * Cancels an in-progress batch. The batch will be in status `cancelling` for up to 10 minutes, * before changing to `cancelled`, where it will have partial results (if any) available in the diff --git a/openai-java-core/src/main/kotlin/com/openai/services/blocking/BetaServiceImpl.kt b/openai-java-core/src/main/kotlin/com/openai/services/blocking/BetaServiceImpl.kt index e57968731..cc2973baa 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/blocking/BetaServiceImpl.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/blocking/BetaServiceImpl.kt @@ -3,7 +3,6 @@ package com.openai.services.blocking import com.openai.core.ClientOptions -import com.openai.core.http.Headers import com.openai.services.blocking.beta.AssistantService import com.openai.services.blocking.beta.AssistantServiceImpl import com.openai.services.blocking.beta.ThreadService @@ -13,11 +12,6 @@ import com.openai.services.blocking.beta.VectorStoreServiceImpl class BetaServiceImpl internal constructor(private val clientOptions: ClientOptions) : BetaService { - companion object { - - private val DEFAULT_HEADERS = Headers.builder().put("OpenAI-Beta", "assistants=v2").build() - } - private val vectorStores: VectorStoreService by lazy { VectorStoreServiceImpl(clientOptions) } private val assistants: AssistantService by lazy { AssistantServiceImpl(clientOptions) } diff --git a/openai-java-core/src/main/kotlin/com/openai/services/blocking/FileService.kt b/openai-java-core/src/main/kotlin/com/openai/services/blocking/FileService.kt index ba2129317..edcc81caf 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/blocking/FileService.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/blocking/FileService.kt @@ -27,10 +27,14 @@ interface FileService { /** Returns a list of files. */ @JvmOverloads fun list( - params: FileListParams, + params: FileListParams = FileListParams.none(), requestOptions: RequestOptions = RequestOptions.none(), ): FileListPage + /** Returns a list of files. */ + fun list(requestOptions: RequestOptions): FileListPage = + list(FileListParams.none(), requestOptions) + /** Delete a file. */ @JvmOverloads fun delete( diff --git a/openai-java-core/src/main/kotlin/com/openai/services/blocking/ModelService.kt b/openai-java-core/src/main/kotlin/com/openai/services/blocking/ModelService.kt index eef74f7f2..412ff7445 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/blocking/ModelService.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/blocking/ModelService.kt @@ -30,10 +30,17 @@ interface ModelService { */ @JvmOverloads fun list( - params: ModelListParams, + params: ModelListParams = ModelListParams.none(), requestOptions: RequestOptions = RequestOptions.none(), ): ModelListPage + /** + * Lists the currently available models, and provides basic information about each one such as + * the owner and availability. + */ + fun list(requestOptions: RequestOptions): ModelListPage = + list(ModelListParams.none(), requestOptions) + /** * Delete a fine-tuned model. You must have the Owner role in your organization to delete a * model. diff --git a/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/AssistantService.kt b/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/AssistantService.kt index 1151eafbe..e81e43458 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/AssistantService.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/AssistantService.kt @@ -40,10 +40,14 @@ interface AssistantService { /** Returns a list of assistants. */ @JvmOverloads fun list( - params: BetaAssistantListParams, + params: BetaAssistantListParams = BetaAssistantListParams.none(), requestOptions: RequestOptions = RequestOptions.none(), ): BetaAssistantListPage + /** Returns a list of assistants. */ + fun list(requestOptions: RequestOptions): BetaAssistantListPage = + list(BetaAssistantListParams.none(), requestOptions) + /** Delete an assistant. */ @JvmOverloads fun delete( diff --git a/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/ThreadService.kt b/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/ThreadService.kt index e5a1c1058..2c240b53d 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/ThreadService.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/ThreadService.kt @@ -28,10 +28,14 @@ interface ThreadService { /** Create a thread. */ @JvmOverloads fun create( - params: BetaThreadCreateParams, + params: BetaThreadCreateParams = BetaThreadCreateParams.none(), requestOptions: RequestOptions = RequestOptions.none(), ): Thread + /** Create a thread. */ + fun create(requestOptions: RequestOptions): Thread = + create(BetaThreadCreateParams.none(), requestOptions) + /** Retrieves a thread. */ @JvmOverloads fun retrieve( diff --git a/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/VectorStoreService.kt b/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/VectorStoreService.kt index acbe03b8a..ae9303dc3 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/VectorStoreService.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/VectorStoreService.kt @@ -46,10 +46,14 @@ interface VectorStoreService { /** Returns a list of vector stores. */ @JvmOverloads fun list( - params: BetaVectorStoreListParams, + params: BetaVectorStoreListParams = BetaVectorStoreListParams.none(), requestOptions: RequestOptions = RequestOptions.none(), ): BetaVectorStoreListPage + /** Returns a list of vector stores. */ + fun list(requestOptions: RequestOptions): BetaVectorStoreListPage = + list(BetaVectorStoreListParams.none(), requestOptions) + /** Delete a vector store. */ @JvmOverloads fun delete( diff --git a/openai-java-core/src/main/kotlin/com/openai/services/blocking/fineTuning/JobService.kt b/openai-java-core/src/main/kotlin/com/openai/services/blocking/fineTuning/JobService.kt index 0a570945b..a66c54ed2 100644 --- a/openai-java-core/src/main/kotlin/com/openai/services/blocking/fineTuning/JobService.kt +++ b/openai-java-core/src/main/kotlin/com/openai/services/blocking/fineTuning/JobService.kt @@ -48,10 +48,14 @@ interface JobService { /** List your organization's fine-tuning jobs */ @JvmOverloads fun list( - params: FineTuningJobListParams, + params: FineTuningJobListParams = FineTuningJobListParams.none(), requestOptions: RequestOptions = RequestOptions.none(), ): FineTuningJobListPage + /** List your organization's fine-tuning jobs */ + fun list(requestOptions: RequestOptions): FineTuningJobListPage = + list(FineTuningJobListParams.none(), requestOptions) + /** Immediately cancel a fine-tune job. */ @JvmOverloads fun cancel( diff --git a/openai-java-core/src/test/kotlin/com/openai/services/blocking/BatchServiceTest.kt b/openai-java-core/src/test/kotlin/com/openai/services/blocking/BatchServiceTest.kt index 6824cb96e..1aa8c4f9a 100644 --- a/openai-java-core/src/test/kotlin/com/openai/services/blocking/BatchServiceTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/services/blocking/BatchServiceTest.kt @@ -7,7 +7,6 @@ import com.openai.client.okhttp.OpenAIOkHttpClient import com.openai.core.JsonValue import com.openai.models.BatchCancelParams import com.openai.models.BatchCreateParams -import com.openai.models.BatchListParams import com.openai.models.BatchRetrieveParams import com.openai.models.Metadata import org.junit.jupiter.api.Test @@ -62,7 +61,7 @@ class BatchServiceTest { .apiKey("My API Key") .build() val batchService = client.batches() - val listBatchesResponse = batchService.list(BatchListParams.builder().build()) + val listBatchesResponse = batchService.list() println(listBatchesResponse) listBatchesResponse.data().forEach { it.validate() } } diff --git a/openai-java-core/src/test/kotlin/com/openai/services/blocking/FileServiceTest.kt b/openai-java-core/src/test/kotlin/com/openai/services/blocking/FileServiceTest.kt index 6c101c7a9..b05d66a7c 100644 --- a/openai-java-core/src/test/kotlin/com/openai/services/blocking/FileServiceTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/services/blocking/FileServiceTest.kt @@ -13,7 +13,6 @@ import com.openai.client.okhttp.OpenAIOkHttpClient import com.openai.core.http.HttpResponse import com.openai.models.FileContentParams import com.openai.models.FileDeleteParams -import com.openai.models.FileListParams import com.openai.models.FileRetrieveParams import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test @@ -45,7 +44,7 @@ class FileServiceTest { .apiKey("My API Key") .build() val fileService = client.files() - val listFilesResponse = fileService.list(FileListParams.builder().build()) + val listFilesResponse = fileService.list() println(listFilesResponse) listFilesResponse.data().forEach { it.validate() } } diff --git a/openai-java-core/src/test/kotlin/com/openai/services/blocking/ModelServiceTest.kt b/openai-java-core/src/test/kotlin/com/openai/services/blocking/ModelServiceTest.kt index 3f688337b..b6551e664 100644 --- a/openai-java-core/src/test/kotlin/com/openai/services/blocking/ModelServiceTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/services/blocking/ModelServiceTest.kt @@ -5,7 +5,6 @@ package com.openai.services.blocking import com.openai.TestServerExtension import com.openai.client.okhttp.OpenAIOkHttpClient import com.openai.models.ModelDeleteParams -import com.openai.models.ModelListParams import com.openai.models.ModelRetrieveParams import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith @@ -35,7 +34,7 @@ class ModelServiceTest { .apiKey("My API Key") .build() val modelService = client.models() - val listModelsResponse = modelService.list(ModelListParams.builder().build()) + val listModelsResponse = modelService.list() println(listModelsResponse) listModelsResponse.data().forEach { it.validate() } } diff --git a/openai-java-core/src/test/kotlin/com/openai/services/blocking/beta/AssistantServiceTest.kt b/openai-java-core/src/test/kotlin/com/openai/services/blocking/beta/AssistantServiceTest.kt index 28278b884..942506a6a 100644 --- a/openai-java-core/src/test/kotlin/com/openai/services/blocking/beta/AssistantServiceTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/services/blocking/beta/AssistantServiceTest.kt @@ -8,7 +8,6 @@ import com.openai.core.JsonValue import com.openai.models.AutoFileChunkingStrategyParam import com.openai.models.BetaAssistantCreateParams import com.openai.models.BetaAssistantDeleteParams -import com.openai.models.BetaAssistantListParams import com.openai.models.BetaAssistantRetrieveParams import com.openai.models.BetaAssistantUpdateParams import com.openai.models.ChatModel @@ -153,8 +152,7 @@ class AssistantServiceTest { .apiKey("My API Key") .build() val assistantService = client.beta().assistants() - val listAssistantsResponse = - assistantService.list(BetaAssistantListParams.builder().build()) + val listAssistantsResponse = assistantService.list() println(listAssistantsResponse) listAssistantsResponse.data().forEach { it.validate() } } diff --git a/openai-java-core/src/test/kotlin/com/openai/services/blocking/beta/VectorStoreServiceTest.kt b/openai-java-core/src/test/kotlin/com/openai/services/blocking/beta/VectorStoreServiceTest.kt index abad6668b..96b75b094 100644 --- a/openai-java-core/src/test/kotlin/com/openai/services/blocking/beta/VectorStoreServiceTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/services/blocking/beta/VectorStoreServiceTest.kt @@ -8,7 +8,6 @@ import com.openai.core.JsonValue import com.openai.models.AutoFileChunkingStrategyParam import com.openai.models.BetaVectorStoreCreateParams import com.openai.models.BetaVectorStoreDeleteParams -import com.openai.models.BetaVectorStoreListParams import com.openai.models.BetaVectorStoreRetrieveParams import com.openai.models.BetaVectorStoreUpdateParams import com.openai.models.Metadata @@ -97,8 +96,7 @@ class VectorStoreServiceTest { .apiKey("My API Key") .build() val vectorStoreService = client.beta().vectorStores() - val listVectorStoresResponse = - vectorStoreService.list(BetaVectorStoreListParams.builder().build()) + val listVectorStoresResponse = vectorStoreService.list() println(listVectorStoresResponse) listVectorStoresResponse.data().forEach { it.validate() } } diff --git a/openai-java-core/src/test/kotlin/com/openai/services/blocking/fineTuning/JobServiceTest.kt b/openai-java-core/src/test/kotlin/com/openai/services/blocking/fineTuning/JobServiceTest.kt index f2a9723f6..47bfcb29b 100644 --- a/openai-java-core/src/test/kotlin/com/openai/services/blocking/fineTuning/JobServiceTest.kt +++ b/openai-java-core/src/test/kotlin/com/openai/services/blocking/fineTuning/JobServiceTest.kt @@ -7,7 +7,6 @@ import com.openai.client.okhttp.OpenAIOkHttpClient import com.openai.models.FineTuningJobCancelParams import com.openai.models.FineTuningJobCreateParams import com.openai.models.FineTuningJobListEventsParams -import com.openai.models.FineTuningJobListParams import com.openai.models.FineTuningJobRetrieveParams import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith @@ -112,8 +111,7 @@ class JobServiceTest { .apiKey("My API Key") .build() val jobService = client.fineTuning().jobs() - val listPaginatedFineTuningJobsResponse = - jobService.list(FineTuningJobListParams.builder().build()) + val listPaginatedFineTuningJobsResponse = jobService.list() println(listPaginatedFineTuningJobsResponse) listPaginatedFineTuningJobsResponse.data().forEach { it.validate() } } diff --git a/openai-java-example/src/main/java/com/openai/example/ModelListAsyncExample.java b/openai-java-example/src/main/java/com/openai/example/ModelListAsyncExample.java index 9df7af64f..0489ab0b7 100644 --- a/openai-java-example/src/main/java/com/openai/example/ModelListAsyncExample.java +++ b/openai-java-example/src/main/java/com/openai/example/ModelListAsyncExample.java @@ -3,7 +3,6 @@ import com.openai.client.OpenAIClientAsync; import com.openai.client.okhttp.OpenAIOkHttpClientAsync; import com.openai.models.ModelListPageAsync; -import com.openai.models.ModelListParams; import java.util.concurrent.CompletableFuture; public final class ModelListAsyncExample { @@ -15,9 +14,7 @@ public static void main(String[] args) { // - The `AZURE_OPENAI_ENDPOINT` and `AZURE_OPENAI_KEY` environment variables OpenAIClientAsync client = OpenAIOkHttpClientAsync.fromEnv(); - CompletableFuture pageFuture = - // TODO: Update this example once we support `.list()` without arguments. - client.models().list(ModelListParams.builder().build()); + CompletableFuture pageFuture = client.models().list(); pageFuture .thenComposeAsync(page -> page.autoPager() .forEach( diff --git a/openai-java-example/src/main/java/com/openai/example/ModelListExample.java b/openai-java-example/src/main/java/com/openai/example/ModelListExample.java index 93bb7c19f..ce5ddb67d 100644 --- a/openai-java-example/src/main/java/com/openai/example/ModelListExample.java +++ b/openai-java-example/src/main/java/com/openai/example/ModelListExample.java @@ -13,10 +13,6 @@ public static void main(String[] args) { // - The `AZURE_OPENAI_ENDPOINT` and `AZURE_OPENAI_KEY` environment variables OpenAIClient client = OpenAIOkHttpClient.fromEnv(); - client.models() - // TODO: Update this example once we support `.list()` without arguments. - .list(ModelListParams.builder().build()) - .autoPager() - .forEach(model -> System.out.println(model.id())); + client.models().list().autoPager().forEach(model -> System.out.println(model.id())); } }