Skip to content

feat(pagination): avoid fetching when has_more: false #209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 6, 2025
Merged

feat(pagination): avoid fetching when has_more: false #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .stats.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
configured_endpoints: 61
openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/openai-7c699d4503077d06a4a44f52c0c1f902d19a87c766b8be75b97c8dfd484ad4aa.yml
openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/openai-dfb00c627f58e5180af7a9b29ed2f2aa0764a3b9daa6a32a1cc45bc8e48dfe15.yml
29 changes: 25 additions & 4 deletions openai-java-core/src/main/kotlin/com/openai/models/BatchListPage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ private constructor(

fun data(): List<Batch> = response().data()

fun hasMore(): Optional<Boolean> = response().hasMore()

override fun equals(other: Any?): Boolean {
if (this === other) {
return true
Expand Down Expand Up @@ -78,15 +80,21 @@ private constructor(
@JsonCreator
constructor(
@JsonProperty("data") private val data: JsonField<List<Batch>> = JsonMissing.of(),
@JsonProperty("has_more") private val hasMore: JsonField<Boolean> = JsonMissing.of(),
@JsonAnySetter
private val additionalProperties: Map<String, JsonValue> = immutableEmptyMap(),
) {

fun data(): List<Batch> = data.getNullable("data") ?: listOf()

fun hasMore(): Optional<Boolean> = Optional.ofNullable(hasMore.getNullable("has_more"))

@JsonProperty("data")
fun _data(): Optional<JsonField<List<Batch>>> = Optional.ofNullable(data)

@JsonProperty("has_more")
fun _hasMore(): Optional<JsonField<Boolean>> = Optional.ofNullable(hasMore)

@JsonAnyGetter
@ExcludeMissing
fun _additionalProperties(): Map<String, JsonValue> = additionalProperties
Expand All @@ -99,6 +107,7 @@ private constructor(
}

data().map { it.validate() }
hasMore()
validated = true
}

Expand All @@ -109,12 +118,13 @@ private constructor(
return true
}

return /* spotless:off */ other is Response && data == other.data && additionalProperties == other.additionalProperties /* spotless:on */
return /* spotless:off */ other is Response && data == other.data && hasMore == other.hasMore && additionalProperties == other.additionalProperties /* spotless:on */
}

override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, additionalProperties) /* spotless:on */
override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, hasMore, additionalProperties) /* spotless:on */

override fun toString() = "Response{data=$data, additionalProperties=$additionalProperties}"
override fun toString() =
"Response{data=$data, hasMore=$hasMore, additionalProperties=$additionalProperties}"

companion object {

Expand All @@ -124,23 +134,34 @@ private constructor(
class Builder {

private var data: JsonField<List<Batch>> = JsonMissing.of()
private var hasMore: JsonField<Boolean> = JsonMissing.of()
private var additionalProperties: MutableMap<String, JsonValue> = mutableMapOf()

@JvmSynthetic
internal fun from(page: Response) = apply {
this.data = page.data
this.hasMore = page.hasMore
this.additionalProperties.putAll(page.additionalProperties)
}

fun data(data: List<Batch>) = data(JsonField.of(data))

fun data(data: JsonField<List<Batch>>) = apply { this.data = data }

fun hasMore(hasMore: Boolean) = hasMore(JsonField.of(hasMore))

fun hasMore(hasMore: JsonField<Boolean>) = apply { this.hasMore = hasMore }

fun putAdditionalProperty(key: String, value: JsonValue) = apply {
this.additionalProperties.put(key, value)
}

fun build() = Response(data, additionalProperties.toImmutable())
fun build() =
Response(
data,
hasMore,
additionalProperties.toImmutable(),
)
}
}

Expand Down
29 changes: 25 additions & 4 deletions openai-java-core/src/main/kotlin/com/openai/models/BatchListPageAsync.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ private constructor(

fun data(): List<Batch> = response().data()

fun hasMore(): Optional<Boolean> = response().hasMore()

override fun equals(other: Any?): Boolean {
if (this === other) {
return true
Expand Down Expand Up @@ -81,15 +83,21 @@ private constructor(
@JsonCreator
constructor(
@JsonProperty("data") private val data: JsonField<List<Batch>> = JsonMissing.of(),
@JsonProperty("has_more") private val hasMore: JsonField<Boolean> = JsonMissing.of(),
@JsonAnySetter
private val additionalProperties: Map<String, JsonValue> = immutableEmptyMap(),
) {

fun data(): List<Batch> = data.getNullable("data") ?: listOf()

fun hasMore(): Optional<Boolean> = Optional.ofNullable(hasMore.getNullable("has_more"))

@JsonProperty("data")
fun _data(): Optional<JsonField<List<Batch>>> = Optional.ofNullable(data)

@JsonProperty("has_more")
fun _hasMore(): Optional<JsonField<Boolean>> = Optional.ofNullable(hasMore)

@JsonAnyGetter
@ExcludeMissing
fun _additionalProperties(): Map<String, JsonValue> = additionalProperties
Expand All @@ -102,6 +110,7 @@ private constructor(
}

data().map { it.validate() }
hasMore()
validated = true
}

Expand All @@ -112,12 +121,13 @@ private constructor(
return true
}

return /* spotless:off */ other is Response && data == other.data && additionalProperties == other.additionalProperties /* spotless:on */
return /* spotless:off */ other is Response && data == other.data && hasMore == other.hasMore && additionalProperties == other.additionalProperties /* spotless:on */
}

override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, additionalProperties) /* spotless:on */
override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, hasMore, additionalProperties) /* spotless:on */

override fun toString() = "Response{data=$data, additionalProperties=$additionalProperties}"
override fun toString() =
"Response{data=$data, hasMore=$hasMore, additionalProperties=$additionalProperties}"

companion object {

Expand All @@ -127,23 +137,34 @@ private constructor(
class Builder {

private var data: JsonField<List<Batch>> = JsonMissing.of()
private var hasMore: JsonField<Boolean> = JsonMissing.of()
private var additionalProperties: MutableMap<String, JsonValue> = mutableMapOf()

@JvmSynthetic
internal fun from(page: Response) = apply {
this.data = page.data
this.hasMore = page.hasMore
this.additionalProperties.putAll(page.additionalProperties)
}

fun data(data: List<Batch>) = data(JsonField.of(data))

fun data(data: JsonField<List<Batch>>) = apply { this.data = data }

fun hasMore(hasMore: Boolean) = hasMore(JsonField.of(hasMore))

fun hasMore(hasMore: JsonField<Boolean>) = apply { this.hasMore = hasMore }

fun putAdditionalProperty(key: String, value: JsonValue) = apply {
this.additionalProperties.put(key, value)
}

fun build() = Response(data, additionalProperties.toImmutable())
fun build() =
Response(
data,
hasMore,
additionalProperties.toImmutable(),
)
}
}

Expand Down
29 changes: 25 additions & 4 deletions openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantListPage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ private constructor(

fun data(): List<Assistant> = response().data()

fun hasMore(): Optional<Boolean> = response().hasMore()

override fun equals(other: Any?): Boolean {
if (this === other) {
return true
Expand Down Expand Up @@ -84,15 +86,21 @@ private constructor(
@JsonCreator
constructor(
@JsonProperty("data") private val data: JsonField<List<Assistant>> = JsonMissing.of(),
@JsonProperty("has_more") private val hasMore: JsonField<Boolean> = JsonMissing.of(),
@JsonAnySetter
private val additionalProperties: Map<String, JsonValue> = immutableEmptyMap(),
) {

fun data(): List<Assistant> = data.getNullable("data") ?: listOf()

fun hasMore(): Optional<Boolean> = Optional.ofNullable(hasMore.getNullable("has_more"))

@JsonProperty("data")
fun _data(): Optional<JsonField<List<Assistant>>> = Optional.ofNullable(data)

@JsonProperty("has_more")
fun _hasMore(): Optional<JsonField<Boolean>> = Optional.ofNullable(hasMore)

@JsonAnyGetter
@ExcludeMissing
fun _additionalProperties(): Map<String, JsonValue> = additionalProperties
Expand All @@ -105,6 +113,7 @@ private constructor(
}

data().map { it.validate() }
hasMore()
validated = true
}

Expand All @@ -115,12 +124,13 @@ private constructor(
return true
}

return /* spotless:off */ other is Response && data == other.data && additionalProperties == other.additionalProperties /* spotless:on */
return /* spotless:off */ other is Response && data == other.data && hasMore == other.hasMore && additionalProperties == other.additionalProperties /* spotless:on */
}

override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, additionalProperties) /* spotless:on */
override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, hasMore, additionalProperties) /* spotless:on */

override fun toString() = "Response{data=$data, additionalProperties=$additionalProperties}"
override fun toString() =
"Response{data=$data, hasMore=$hasMore, additionalProperties=$additionalProperties}"

companion object {

Expand All @@ -130,23 +140,34 @@ private constructor(
class Builder {

private var data: JsonField<List<Assistant>> = JsonMissing.of()
private var hasMore: JsonField<Boolean> = JsonMissing.of()
private var additionalProperties: MutableMap<String, JsonValue> = mutableMapOf()

@JvmSynthetic
internal fun from(page: Response) = apply {
this.data = page.data
this.hasMore = page.hasMore
this.additionalProperties.putAll(page.additionalProperties)
}

fun data(data: List<Assistant>) = data(JsonField.of(data))

fun data(data: JsonField<List<Assistant>>) = apply { this.data = data }

fun hasMore(hasMore: Boolean) = hasMore(JsonField.of(hasMore))

fun hasMore(hasMore: JsonField<Boolean>) = apply { this.hasMore = hasMore }

fun putAdditionalProperty(key: String, value: JsonValue) = apply {
this.additionalProperties.put(key, value)
}

fun build() = Response(data, additionalProperties.toImmutable())
fun build() =
Response(
data,
hasMore,
additionalProperties.toImmutable(),
)
}
}

Expand Down
29 changes: 25 additions & 4 deletions openai-java-core/src/main/kotlin/com/openai/models/BetaAssistantListPageAsync.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ private constructor(

fun data(): List<Assistant> = response().data()

fun hasMore(): Optional<Boolean> = response().hasMore()

override fun equals(other: Any?): Boolean {
if (this === other) {
return true
Expand Down Expand Up @@ -87,15 +89,21 @@ private constructor(
@JsonCreator
constructor(
@JsonProperty("data") private val data: JsonField<List<Assistant>> = JsonMissing.of(),
@JsonProperty("has_more") private val hasMore: JsonField<Boolean> = JsonMissing.of(),
@JsonAnySetter
private val additionalProperties: Map<String, JsonValue> = immutableEmptyMap(),
) {

fun data(): List<Assistant> = data.getNullable("data") ?: listOf()

fun hasMore(): Optional<Boolean> = Optional.ofNullable(hasMore.getNullable("has_more"))

@JsonProperty("data")
fun _data(): Optional<JsonField<List<Assistant>>> = Optional.ofNullable(data)

@JsonProperty("has_more")
fun _hasMore(): Optional<JsonField<Boolean>> = Optional.ofNullable(hasMore)

@JsonAnyGetter
@ExcludeMissing
fun _additionalProperties(): Map<String, JsonValue> = additionalProperties
Expand All @@ -108,6 +116,7 @@ private constructor(
}

data().map { it.validate() }
hasMore()
validated = true
}

Expand All @@ -118,12 +127,13 @@ private constructor(
return true
}

return /* spotless:off */ other is Response && data == other.data && additionalProperties == other.additionalProperties /* spotless:on */
return /* spotless:off */ other is Response && data == other.data && hasMore == other.hasMore && additionalProperties == other.additionalProperties /* spotless:on */
}

override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, additionalProperties) /* spotless:on */
override fun hashCode(): Int = /* spotless:off */ Objects.hash(data, hasMore, additionalProperties) /* spotless:on */

override fun toString() = "Response{data=$data, additionalProperties=$additionalProperties}"
override fun toString() =
"Response{data=$data, hasMore=$hasMore, additionalProperties=$additionalProperties}"

companion object {

Expand All @@ -133,23 +143,34 @@ private constructor(
class Builder {

private var data: JsonField<List<Assistant>> = JsonMissing.of()
private var hasMore: JsonField<Boolean> = JsonMissing.of()
private var additionalProperties: MutableMap<String, JsonValue> = mutableMapOf()

@JvmSynthetic
internal fun from(page: Response) = apply {
this.data = page.data
this.hasMore = page.hasMore
this.additionalProperties.putAll(page.additionalProperties)
}

fun data(data: List<Assistant>) = data(JsonField.of(data))

fun data(data: JsonField<List<Assistant>>) = apply { this.data = data }

fun hasMore(hasMore: Boolean) = hasMore(JsonField.of(hasMore))

fun hasMore(hasMore: JsonField<Boolean>) = apply { this.hasMore = hasMore }

fun putAdditionalProperty(key: String, value: JsonValue) = apply {
this.additionalProperties.put(key, value)
}

fun build() = Response(data, additionalProperties.toImmutable())
fun build() =
Response(
data,
hasMore,
additionalProperties.toImmutable(),
)
}
}

Expand Down
Loading