Skip to content

Commit dec2d6b

Browse files
stainless-app[bot]stainless-bot
stainless-app[bot]
authored and
stainless-bot
committed
fix(client): add some missing validate() calls (#101)
chore(internal): refactor `validate` methods
1 parent f133735 commit dec2d6b

File tree

182 files changed

+3847
-2467
lines changed

Some content is hidden

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

182 files changed

+3847
-2467
lines changed

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

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ private constructor(
3232
private val _json: JsonValue? = null,
3333
) {
3434

35-
private var validated: Boolean = false
36-
3735
/**
3836
* A citation within the message that points to a specific quote from a specific File associated
3937
* with the assistant or the message. Generated when the assistant uses the "file_search" tool
@@ -78,15 +76,27 @@ private constructor(
7876
}
7977
}
8078

79+
private var validated: Boolean = false
80+
8181
fun validate(): Annotation = apply {
82-
if (!validated) {
83-
if (fileCitationAnnotation == null && filePathAnnotation == null) {
84-
throw OpenAIInvalidDataException("Unknown Annotation: $_json")
85-
}
86-
fileCitationAnnotation?.validate()
87-
filePathAnnotation?.validate()
88-
validated = true
82+
if (validated) {
83+
return@apply
8984
}
85+
86+
accept(
87+
object : Visitor<Unit> {
88+
override fun visitFileCitationAnnotation(
89+
fileCitationAnnotation: FileCitationAnnotation
90+
) {
91+
fileCitationAnnotation.validate()
92+
}
93+
94+
override fun visitFilePathAnnotation(filePathAnnotation: FilePathAnnotation) {
95+
filePathAnnotation.validate()
96+
}
97+
}
98+
)
99+
validated = true
90100
}
91101

92102
override fun equals(other: Any?): Boolean {

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

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ private constructor(
3232
private val _json: JsonValue? = null,
3333
) {
3434

35-
private var validated: Boolean = false
36-
3735
/**
3836
* A citation within the message that points to a specific quote from a specific File associated
3937
* with the assistant or the message. Generated when the assistant uses the "file_search" tool
@@ -80,15 +78,29 @@ private constructor(
8078
}
8179
}
8280

81+
private var validated: Boolean = false
82+
8383
fun validate(): AnnotationDelta = apply {
84-
if (!validated) {
85-
if (fileCitationDeltaAnnotation == null && filePathDeltaAnnotation == null) {
86-
throw OpenAIInvalidDataException("Unknown AnnotationDelta: $_json")
87-
}
88-
fileCitationDeltaAnnotation?.validate()
89-
filePathDeltaAnnotation?.validate()
90-
validated = true
84+
if (validated) {
85+
return@apply
9186
}
87+
88+
accept(
89+
object : Visitor<Unit> {
90+
override fun visitFileCitationDeltaAnnotation(
91+
fileCitationDeltaAnnotation: FileCitationDeltaAnnotation
92+
) {
93+
fileCitationDeltaAnnotation.validate()
94+
}
95+
96+
override fun visitFilePathDeltaAnnotation(
97+
filePathDeltaAnnotation: FilePathDeltaAnnotation
98+
) {
99+
filePathDeltaAnnotation.validate()
100+
}
101+
}
102+
)
103+
validated = true
92104
}
93105

94106
override fun equals(other: Any?): Boolean {

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

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -236,21 +236,23 @@ private constructor(
236236
private var validated: Boolean = false
237237

238238
fun validate(): Assistant = apply {
239-
if (!validated) {
240-
id()
241-
createdAt()
242-
description()
243-
instructions()
244-
model()
245-
name()
246-
object_()
247-
tools()
248-
responseFormat()
249-
temperature()
250-
toolResources().map { it.validate() }
251-
topP()
252-
validated = true
239+
if (validated) {
240+
return@apply
253241
}
242+
243+
id()
244+
createdAt()
245+
description()
246+
instructions()
247+
model()
248+
name()
249+
object_()
250+
tools().forEach { it.validate() }
251+
responseFormat().ifPresent { it.validate() }
252+
temperature()
253+
toolResources().ifPresent { it.validate() }
254+
topP()
255+
validated = true
254256
}
255257

256258
fun toBuilder() = Builder().from(this)
@@ -795,11 +797,13 @@ private constructor(
795797
private var validated: Boolean = false
796798

797799
fun validate(): ToolResources = apply {
798-
if (!validated) {
799-
codeInterpreter().map { it.validate() }
800-
fileSearch().map { it.validate() }
801-
validated = true
800+
if (validated) {
801+
return@apply
802802
}
803+
804+
codeInterpreter().ifPresent { it.validate() }
805+
fileSearch().ifPresent { it.validate() }
806+
validated = true
803807
}
804808

805809
fun toBuilder() = Builder().from(this)
@@ -897,10 +901,12 @@ private constructor(
897901
private var validated: Boolean = false
898902

899903
fun validate(): CodeInterpreter = apply {
900-
if (!validated) {
901-
fileIds()
902-
validated = true
904+
if (validated) {
905+
return@apply
903906
}
907+
908+
fileIds()
909+
validated = true
904910
}
905911

906912
fun toBuilder() = Builder().from(this)
@@ -1039,10 +1045,12 @@ private constructor(
10391045
private var validated: Boolean = false
10401046

10411047
fun validate(): FileSearch = apply {
1042-
if (!validated) {
1043-
vectorStoreIds()
1044-
validated = true
1048+
if (validated) {
1049+
return@apply
10451050
}
1051+
1052+
vectorStoreIds()
1053+
validated = true
10461054
}
10471055

10481056
fun toBuilder() = Builder().from(this)

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,14 @@ private constructor(
5050
private var validated: Boolean = false
5151

5252
fun validate(): AssistantDeleted = apply {
53-
if (!validated) {
54-
id()
55-
deleted()
56-
object_()
57-
validated = true
53+
if (validated) {
54+
return@apply
5855
}
56+
57+
id()
58+
deleted()
59+
object_()
60+
validated = true
5961
}
6062

6163
fun toBuilder() = Builder().from(this)

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

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ private constructor(
5151
private val _json: JsonValue? = null,
5252
) {
5353

54-
private var validated: Boolean = false
55-
5654
/** `auto` is the default value */
5755
fun behavior(): Optional<Behavior> = Optional.ofNullable(behavior)
5856

@@ -98,21 +96,35 @@ private constructor(
9896
}
9997
}
10098

99+
private var validated: Boolean = false
100+
101101
fun validate(): AssistantResponseFormatOption = apply {
102-
if (!validated) {
103-
if (
104-
behavior == null &&
105-
responseFormatText == null &&
106-
responseFormatJsonObject == null &&
107-
responseFormatJsonSchema == null
108-
) {
109-
throw OpenAIInvalidDataException("Unknown AssistantResponseFormatOption: $_json")
110-
}
111-
responseFormatText?.validate()
112-
responseFormatJsonObject?.validate()
113-
responseFormatJsonSchema?.validate()
114-
validated = true
102+
if (validated) {
103+
return@apply
115104
}
105+
106+
accept(
107+
object : Visitor<Unit> {
108+
override fun visitBehavior(behavior: Behavior) {}
109+
110+
override fun visitResponseFormatText(responseFormatText: ResponseFormatText) {
111+
responseFormatText.validate()
112+
}
113+
114+
override fun visitResponseFormatJsonObject(
115+
responseFormatJsonObject: ResponseFormatJsonObject
116+
) {
117+
responseFormatJsonObject.validate()
118+
}
119+
120+
override fun visitResponseFormatJsonSchema(
121+
responseFormatJsonSchema: ResponseFormatJsonSchema
122+
) {
123+
responseFormatJsonSchema.validate()
124+
}
125+
}
126+
)
127+
validated = true
116128
}
117129

118130
override fun equals(other: Any?): Boolean {

0 commit comments

Comments
 (0)