style(internal): sort fields (#82)

Author: stainless-app[bot]

openai-java-core/src/main/kotlin/com/openai/models/Assistant.kt

@@ -21,38 +21,38 @@ class BatchError
 @JsonCreator
 private constructor(
     @JsonProperty("code") @ExcludeMissing private val code: JsonField<String> = JsonMissing.of(),
+    @JsonProperty("line") @ExcludeMissing private val line: JsonField<Long> = JsonMissing.of(),
     @JsonProperty("message")
     @ExcludeMissing
     private val message: JsonField<String> = JsonMissing.of(),
     @JsonProperty("param") @ExcludeMissing private val param: JsonField<String> = JsonMissing.of(),
-    @JsonProperty("line") @ExcludeMissing private val line: JsonField<Long> = JsonMissing.of(),
     @JsonAnySetter private val additionalProperties: Map<String, JsonValue> = immutableEmptyMap(),
 ) {
 
     /** An error code identifying the error type. */
     fun code(): Optional<String> = Optional.ofNullable(code.getNullable("code"))
 
+    /** The line number of the input file where the error occurred, if applicable. */
+    fun line(): Optional<Long> = Optional.ofNullable(line.getNullable("line"))
+
     /** A human-readable message providing more details about the error. */
     fun message(): Optional<String> = Optional.ofNullable(message.getNullable("message"))
 
     /** The name of the parameter that caused the error, if applicable. */
     fun param(): Optional<String> = Optional.ofNullable(param.getNullable("param"))
 
-    /** The line number of the input file where the error occurred, if applicable. */
-    fun line(): Optional<Long> = Optional.ofNullable(line.getNullable("line"))
-
     /** An error code identifying the error type. */
     @JsonProperty("code") @ExcludeMissing fun _code() = code
 
+    /** The line number of the input file where the error occurred, if applicable. */
+    @JsonProperty("line") @ExcludeMissing fun _line() = line
+
     /** A human-readable message providing more details about the error. */
     @JsonProperty("message") @ExcludeMissing fun _message() = message
 
     /** The name of the parameter that caused the error, if applicable. */
     @JsonProperty("param") @ExcludeMissing fun _param() = param
 
-    /** The line number of the input file where the error occurred, if applicable. */
-    @JsonProperty("line") @ExcludeMissing fun _line() = line
-
     @JsonAnyGetter
     @ExcludeMissing
     fun _additionalProperties(): Map<String, JsonValue> = additionalProperties
@@ -62,9 +62,9 @@ private constructor(
     fun validate(): BatchError = apply {
         if (!validated) {
             code()
+            line()
             message()
             param()
-            line()
             validated = true
         }
     }
@@ -79,17 +79,17 @@ private constructor(
     class Builder {
 
         private var code: JsonField<String> = JsonMissing.of()
+        private var line: JsonField<Long> = JsonMissing.of()
         private var message: JsonField<String> = JsonMissing.of()
         private var param: JsonField<String> = JsonMissing.of()
-        private var line: JsonField<Long> = JsonMissing.of()
         private var additionalProperties: MutableMap<String, JsonValue> = mutableMapOf()
 
         @JvmSynthetic
         internal fun from(batchError: BatchError) = apply {
             code = batchError.code
+            line = batchError.line
             message = batchError.message
             param = batchError.param
-            line = batchError.line
             additionalProperties = batchError.additionalProperties.toMutableMap()
         }
 
@@ -99,6 +99,12 @@ private constructor(
         /** An error code identifying the error type. */
         fun code(code: JsonField<String>) = apply { this.code = code }
 
+        /** The line number of the input file where the error occurred, if applicable. */
+        fun line(line: Long) = line(JsonField.of(line))
+
+        /** The line number of the input file where the error occurred, if applicable. */
+        fun line(line: JsonField<Long>) = apply { this.line = line }
+
         /** A human-readable message providing more details about the error. */
         fun message(message: String) = message(JsonField.of(message))
 
@@ -111,12 +117,6 @@ private constructor(
         /** The name of the parameter that caused the error, if applicable. */
         fun param(param: JsonField<String>) = apply { this.param = param }
 
-        /** The line number of the input file where the error occurred, if applicable. */
-        fun line(line: Long) = line(JsonField.of(line))
-
-        /** The line number of the input file where the error occurred, if applicable. */
-        fun line(line: JsonField<Long>) = apply { this.line = line }
-
         fun additionalProperties(additionalProperties: Map<String, JsonValue>) = apply {
             this.additionalProperties.clear()
             putAllAdditionalProperties(additionalProperties)
@@ -139,9 +139,9 @@ private constructor(
         fun build(): BatchError =
             BatchError(
                 code,
+                line,
                 message,
                 param,
-                line,
                 additionalProperties.toImmutable(),
             )
     }
@@ -151,15 +151,15 @@ private constructor(
             return true
         }
 
-        return /* spotless:off */ other is BatchError && code == other.code && message == other.message && param == other.param && line == other.line && additionalProperties == other.additionalProperties /* spotless:on */
+        return /* spotless:off */ other is BatchError && code == other.code && line == other.line && message == other.message && param == other.param && additionalProperties == other.additionalProperties /* spotless:on */
     }
 
     /* spotless:off */
-    private val hashCode: Int by lazy { Objects.hash(code, message, param, line, additionalProperties) }
+    private val hashCode: Int by lazy { Objects.hash(code, line, message, param, additionalProperties) }
     /* spotless:on */
 
     override fun hashCode(): Int = hashCode
 
     override fun toString() =
-        "BatchError{code=$code, message=$message, param=$param, line=$line, additionalProperties=$additionalProperties}"
+        "BatchError{code=$code, line=$line, message=$message, param=$param, additionalProperties=$additionalProperties}"
 }

openai-java-core/src/main/kotlin/com/openai/models/AssistantStreamEvent.kt

@@ -20,32 +20,32 @@ import java.util.Objects
 class BatchRequestCounts
 @JsonCreator
 private constructor(
-    @JsonProperty("total") @ExcludeMissing private val total: JsonField<Long> = JsonMissing.of(),
     @JsonProperty("completed")
     @ExcludeMissing
     private val completed: JsonField<Long> = JsonMissing.of(),
     @JsonProperty("failed") @ExcludeMissing private val failed: JsonField<Long> = JsonMissing.of(),
+    @JsonProperty("total") @ExcludeMissing private val total: JsonField<Long> = JsonMissing.of(),
     @JsonAnySetter private val additionalProperties: Map<String, JsonValue> = immutableEmptyMap(),
 ) {
 
-    /** Total number of requests in the batch. */
-    fun total(): Long = total.getRequired("total")
-
     /** Number of requests that have been completed successfully. */
     fun completed(): Long = completed.getRequired("completed")
 
     /** Number of requests that have failed. */
     fun failed(): Long = failed.getRequired("failed")
 
     /** Total number of requests in the batch. */
-    @JsonProperty("total") @ExcludeMissing fun _total() = total
+    fun total(): Long = total.getRequired("total")
 
     /** Number of requests that have been completed successfully. */
     @JsonProperty("completed") @ExcludeMissing fun _completed() = completed
 
     /** Number of requests that have failed. */
     @JsonProperty("failed") @ExcludeMissing fun _failed() = failed
 
+    /** Total number of requests in the batch. */
+    @JsonProperty("total") @ExcludeMissing fun _total() = total
+
     @JsonAnyGetter
     @ExcludeMissing
     fun _additionalProperties(): Map<String, JsonValue> = additionalProperties
@@ -54,9 +54,9 @@ private constructor(
 
     fun validate(): BatchRequestCounts = apply {
         if (!validated) {
-            total()
             completed()
             failed()
+            total()
             validated = true
         }
     }
@@ -70,25 +70,19 @@ private constructor(
 
     class Builder {
 
-        private var total: JsonField<Long> = JsonMissing.of()
         private var completed: JsonField<Long> = JsonMissing.of()
         private var failed: JsonField<Long> = JsonMissing.of()
+        private var total: JsonField<Long> = JsonMissing.of()
         private var additionalProperties: MutableMap<String, JsonValue> = mutableMapOf()
 
         @JvmSynthetic
         internal fun from(batchRequestCounts: BatchRequestCounts) = apply {
-            total = batchRequestCounts.total
             completed = batchRequestCounts.completed
             failed = batchRequestCounts.failed
+            total = batchRequestCounts.total
             additionalProperties = batchRequestCounts.additionalProperties.toMutableMap()
         }
 
-        /** Total number of requests in the batch. */
-        fun total(total: Long) = total(JsonField.of(total))
-
-        /** Total number of requests in the batch. */
-        fun total(total: JsonField<Long>) = apply { this.total = total }
-
         /** Number of requests that have been completed successfully. */
         fun completed(completed: Long) = completed(JsonField.of(completed))
 
@@ -101,6 +95,12 @@ private constructor(
         /** Number of requests that have failed. */
         fun failed(failed: JsonField<Long>) = apply { this.failed = failed }
 
+        /** Total number of requests in the batch. */
+        fun total(total: Long) = total(JsonField.of(total))
+
+        /** Total number of requests in the batch. */
+        fun total(total: JsonField<Long>) = apply { this.total = total }
+
         fun additionalProperties(additionalProperties: Map<String, JsonValue>) = apply {
             this.additionalProperties.clear()
             putAllAdditionalProperties(additionalProperties)
@@ -122,9 +122,9 @@ private constructor(
 
         fun build(): BatchRequestCounts =
             BatchRequestCounts(
-                total,
                 completed,
                 failed,
+                total,
                 additionalProperties.toImmutable(),
             )
     }
@@ -134,15 +134,15 @@ private constructor(
             return true
         }
 
-        return /* spotless:off */ other is BatchRequestCounts && total == other.total && completed == other.completed && failed == other.failed && additionalProperties == other.additionalProperties /* spotless:on */
+        return /* spotless:off */ other is BatchRequestCounts && completed == other.completed && failed == other.failed && total == other.total && additionalProperties == other.additionalProperties /* spotless:on */
     }
 
     /* spotless:off */
-    private val hashCode: Int by lazy { Objects.hash(total, completed, failed, additionalProperties) }
+    private val hashCode: Int by lazy { Objects.hash(completed, failed, total, additionalProperties) }
     /* spotless:on */
 
     override fun hashCode(): Int = hashCode
 
     override fun toString() =
-        "BatchRequestCounts{total=$total, completed=$completed, failed=$failed, additionalProperties=$additionalProperties}"
+        "BatchRequestCounts{completed=$completed, failed=$failed, total=$total, additionalProperties=$additionalProperties}"
 }

openai-java-core/src/main/kotlin/com/openai/models/Batch.kt

@@ -996,21 +996,14 @@ constructor(
             class VectorStore
             @JsonCreator
             private constructor(
-                @JsonProperty("file_ids") private val fileIds: List<String>?,
                 @JsonProperty("chunking_strategy")
                 private val chunkingStrategy: FileChunkingStrategyParam?,
+                @JsonProperty("file_ids") private val fileIds: List<String>?,
                 @JsonProperty("metadata") private val metadata: JsonValue?,
                 @JsonAnySetter
                 private val additionalProperties: Map<String, JsonValue> = immutableEmptyMap(),
             ) {
 
-                /**
-                 * A list of [file](https://platform.openai.com/docs/api-reference/files) IDs to add
-                 * to the vector store. There can be a maximum of 10000 files in a vector store.
-                 */
-                @JsonProperty("file_ids")
-                fun fileIds(): Optional<List<String>> = Optional.ofNullable(fileIds)
-
                 /**
                  * The chunking strategy used to chunk the file(s). If not set, will use the `auto`
                  * strategy. Only applicable if `file_ids` is non-empty.
@@ -1019,6 +1012,13 @@ constructor(
                 fun chunkingStrategy(): Optional<FileChunkingStrategyParam> =
                     Optional.ofNullable(chunkingStrategy)
 
+                /**
+                 * A list of [file](https://platform.openai.com/docs/api-reference/files) IDs to add
+                 * to the vector store. There can be a maximum of 10000 files in a vector store.
+                 */
+                @JsonProperty("file_ids")
+                fun fileIds(): Optional<List<String>> = Optional.ofNullable(fileIds)
+
                 /**
                  * Set of 16 key-value pairs that can be attached to a vector store. This can be
                  * useful for storing additional information about the vector store in a structured
@@ -1041,37 +1041,19 @@ constructor(
 
                 class Builder {
 
-                    private var fileIds: MutableList<String>? = null
                     private var chunkingStrategy: FileChunkingStrategyParam? = null
+                    private var fileIds: MutableList<String>? = null
                     private var metadata: JsonValue? = null
                     private var additionalProperties: MutableMap<String, JsonValue> = mutableMapOf()
 
                     @JvmSynthetic
                     internal fun from(vectorStore: VectorStore) = apply {
-                        fileIds = vectorStore.fileIds?.toMutableList()
                         chunkingStrategy = vectorStore.chunkingStrategy
+                        fileIds = vectorStore.fileIds?.toMutableList()
                         metadata = vectorStore.metadata
                         additionalProperties = vectorStore.additionalProperties.toMutableMap()
                     }
 
-                    /**
-                     * A list of [file](https://platform.openai.com/docs/api-reference/files) IDs to
-                     * add to the vector store. There can be a maximum of 10000 files in a vector
-                     * store.
-                     */
-                    fun fileIds(fileIds: List<String>) = apply {
-                        this.fileIds = fileIds.toMutableList()
-                    }
-
-                    /**
-                     * A list of [file](https://platform.openai.com/docs/api-reference/files) IDs to
-                     * add to the vector store. There can be a maximum of 10000 files in a vector
-                     * store.
-                     */
-                    fun addFileId(fileId: String) = apply {
-                        fileIds = (fileIds ?: mutableListOf()).apply { add(fileId) }
-                    }
-
                     /**
                      * The chunking strategy used to chunk the file(s). If not set, will use the
                      * `auto` strategy. Only applicable if `file_ids` is non-empty.
@@ -1102,6 +1084,24 @@ constructor(
                             )
                     }
 
+                    /**
+                     * A list of [file](https://platform.openai.com/docs/api-reference/files) IDs to
+                     * add to the vector store. There can be a maximum of 10000 files in a vector
+                     * store.
+                     */
+                    fun fileIds(fileIds: List<String>) = apply {
+                        this.fileIds = fileIds.toMutableList()
+                    }
+
+                    /**
+                     * A list of [file](https://platform.openai.com/docs/api-reference/files) IDs to
+                     * add to the vector store. There can be a maximum of 10000 files in a vector
+                     * store.
+                     */
+                    fun addFileId(fileId: String) = apply {
+                        fileIds = (fileIds ?: mutableListOf()).apply { add(fileId) }
+                    }
+
                     /**
                      * Set of 16 key-value pairs that can be attached to a vector store. This can be
                      * useful for storing additional information about the vector store in a
@@ -1134,8 +1134,8 @@ constructor(
 
                     fun build(): VectorStore =
                         VectorStore(
-                            fileIds?.toImmutable(),
                             chunkingStrategy,
+                            fileIds?.toImmutable(),
                             metadata,
                             additionalProperties.toImmutable(),
                         )
@@ -1146,17 +1146,17 @@ constructor(
                         return true
                     }
 
-                    return /* spotless:off */ other is VectorStore && fileIds == other.fileIds && chunkingStrategy == other.chunkingStrategy && metadata == other.metadata && additionalProperties == other.additionalProperties /* spotless:on */
+                    return /* spotless:off */ other is VectorStore && chunkingStrategy == other.chunkingStrategy && fileIds == other.fileIds && metadata == other.metadata && additionalProperties == other.additionalProperties /* spotless:on */
                 }
 
                 /* spotless:off */
-                private val hashCode: Int by lazy { Objects.hash(fileIds, chunkingStrategy, metadata, additionalProperties) }
+                private val hashCode: Int by lazy { Objects.hash(chunkingStrategy, fileIds, metadata, additionalProperties) }
                 /* spotless:on */
 
                 override fun hashCode(): Int = hashCode
 
                 override fun toString() =
-                    "VectorStore{fileIds=$fileIds, chunkingStrategy=$chunkingStrategy, metadata=$metadata, additionalProperties=$additionalProperties}"
+                    "VectorStore{chunkingStrategy=$chunkingStrategy, fileIds=$fileIds, metadata=$metadata, additionalProperties=$additionalProperties}"
             }
 
             override fun equals(other: Any?): Boolean {