Skip to content

Commit 0298225

Browse files
stainless-app[bot]stainless-app[bot]
committed
fix(client): remove duplicate types (#341)
1 parent ec07d69 commit 0298225

File tree

2 files changed

+28
-98
lines changed

2 files changed

+28
-98
lines changed

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

Lines changed: 22 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -26,51 +26,35 @@ class AllModels
2626
private constructor(
2727
private val string: String? = null,
2828
private val chatModel: ChatModel? = null,
29-
private val string: String? = null,
30-
private val chatModel: ChatModel? = null,
31-
private val unionMember4: UnionMember4? = null,
29+
private val unionMember2: UnionMember2? = null,
3230
private val _json: JsonValue? = null,
3331
) {
3432

3533
fun string(): Optional<String> = Optional.ofNullable(string)
3634

3735
fun chatModel(): Optional<ChatModel> = Optional.ofNullable(chatModel)
3836

39-
fun string(): Optional<String> = Optional.ofNullable(string)
40-
41-
fun chatModel(): Optional<ChatModel> = Optional.ofNullable(chatModel)
42-
43-
fun unionMember4(): Optional<UnionMember4> = Optional.ofNullable(unionMember4)
44-
45-
fun isString(): Boolean = string != null
46-
47-
fun isChatModel(): Boolean = chatModel != null
37+
fun unionMember2(): Optional<UnionMember2> = Optional.ofNullable(unionMember2)
4838

4939
fun isString(): Boolean = string != null
5040

5141
fun isChatModel(): Boolean = chatModel != null
5242

53-
fun isUnionMember4(): Boolean = unionMember4 != null
43+
fun isUnionMember2(): Boolean = unionMember2 != null
5444

5545
fun asString(): String = string.getOrThrow("string")
5646

5747
fun asChatModel(): ChatModel = chatModel.getOrThrow("chatModel")
5848

59-
fun asString(): String = string.getOrThrow("string")
60-
61-
fun asChatModel(): ChatModel = chatModel.getOrThrow("chatModel")
62-
63-
fun asUnionMember4(): UnionMember4 = unionMember4.getOrThrow("unionMember4")
49+
fun asUnionMember2(): UnionMember2 = unionMember2.getOrThrow("unionMember2")
6450

6551
fun _json(): Optional<JsonValue> = Optional.ofNullable(_json)
6652

6753
fun <T> accept(visitor: Visitor<T>): T {
6854
return when {
6955
string != null -> visitor.visitString(string)
7056
chatModel != null -> visitor.visitChatModel(chatModel)
71-
string != null -> visitor.visitString(string)
72-
chatModel != null -> visitor.visitChatModel(chatModel)
73-
unionMember4 != null -> visitor.visitUnionMember4(unionMember4)
57+
unionMember2 != null -> visitor.visitUnionMember2(unionMember2)
7458
else -> visitor.unknown(_json)
7559
}
7660
}
@@ -88,11 +72,7 @@ private constructor(
8872

8973
override fun visitChatModel(chatModel: ChatModel) {}
9074

91-
override fun visitString(string: String) {}
92-
93-
override fun visitChatModel(chatModel: ChatModel) {}
94-
95-
override fun visitUnionMember4(unionMember4: UnionMember4) {}
75+
override fun visitUnionMember2(unionMember2: UnionMember2) {}
9676
}
9777
)
9878
validated = true
@@ -103,18 +83,16 @@ private constructor(
10383
return true
10484
}
10585

106-
return /* spotless:off */ other is AllModels && string == other.string && chatModel == other.chatModel && string == other.string && chatModel == other.chatModel && unionMember4 == other.unionMember4 /* spotless:on */
86+
return /* spotless:off */ other is AllModels && string == other.string && chatModel == other.chatModel && unionMember2 == other.unionMember2 /* spotless:on */
10787
}
10888

109-
override fun hashCode(): Int = /* spotless:off */ Objects.hash(string, chatModel, string, chatModel, unionMember4) /* spotless:on */
89+
override fun hashCode(): Int = /* spotless:off */ Objects.hash(string, chatModel, unionMember2) /* spotless:on */
11090

11191
override fun toString(): String =
11292
when {
11393
string != null -> "AllModels{string=$string}"
11494
chatModel != null -> "AllModels{chatModel=$chatModel}"
115-
string != null -> "AllModels{string=$string}"
116-
chatModel != null -> "AllModels{chatModel=$chatModel}"
117-
unionMember4 != null -> "AllModels{unionMember4=$unionMember4}"
95+
unionMember2 != null -> "AllModels{unionMember2=$unionMember2}"
11896
_json != null -> "AllModels{_unknown=$_json}"
11997
else -> throw IllegalStateException("Invalid AllModels")
12098
}
@@ -125,12 +103,8 @@ private constructor(
125103

126104
@JvmStatic fun ofChatModel(chatModel: ChatModel) = AllModels(chatModel = chatModel)
127105

128-
@JvmStatic fun ofString(string: String) = AllModels(string = string)
129-
130-
@JvmStatic fun ofChatModel(chatModel: ChatModel) = AllModels(chatModel = chatModel)
131-
132106
@JvmStatic
133-
fun ofUnionMember4(unionMember4: UnionMember4) = AllModels(unionMember4 = unionMember4)
107+
fun ofUnionMember2(unionMember2: UnionMember2) = AllModels(unionMember2 = unionMember2)
134108
}
135109

136110
/** An interface that defines how to map each variant of [AllModels] to a value of type [T]. */
@@ -140,11 +114,7 @@ private constructor(
140114

141115
fun visitChatModel(chatModel: ChatModel): T
142116

143-
fun visitString(string: String): T
144-
145-
fun visitChatModel(chatModel: ChatModel): T
146-
147-
fun visitUnionMember4(unionMember4: UnionMember4): T
117+
fun visitUnionMember2(unionMember2: UnionMember2): T
148118

149119
/**
150120
* Maps an unknown variant of [AllModels] to a value of type [T].
@@ -171,14 +141,8 @@ private constructor(
171141
tryDeserialize(node, jacksonTypeRef<ChatModel>())?.let {
172142
return AllModels(chatModel = it, _json = json)
173143
}
174-
tryDeserialize(node, jacksonTypeRef<String>())?.let {
175-
return AllModels(string = it, _json = json)
176-
}
177-
tryDeserialize(node, jacksonTypeRef<ChatModel>())?.let {
178-
return AllModels(chatModel = it, _json = json)
179-
}
180-
tryDeserialize(node, jacksonTypeRef<UnionMember4>())?.let {
181-
return AllModels(unionMember4 = it, _json = json)
144+
tryDeserialize(node, jacksonTypeRef<UnionMember2>())?.let {
145+
return AllModels(unionMember2 = it, _json = json)
182146
}
183147

184148
return AllModels(_json = json)
@@ -195,16 +159,14 @@ private constructor(
195159
when {
196160
value.string != null -> generator.writeObject(value.string)
197161
value.chatModel != null -> generator.writeObject(value.chatModel)
198-
value.string != null -> generator.writeObject(value.string)
199-
value.chatModel != null -> generator.writeObject(value.chatModel)
200-
value.unionMember4 != null -> generator.writeObject(value.unionMember4)
162+
value.unionMember2 != null -> generator.writeObject(value.unionMember2)
201163
value._json != null -> generator.writeObject(value._json)
202164
else -> throw IllegalStateException("Invalid AllModels")
203165
}
204166
}
205167
}
206168

207-
class UnionMember4 @JsonCreator private constructor(private val value: JsonField<String>) :
169+
class UnionMember2 @JsonCreator private constructor(private val value: JsonField<String>) :
208170
Enum {
209171

210172
/**
@@ -227,10 +189,10 @@ private constructor(
227189

228190
@JvmField val COMPUTER_USE_PREVIEW_2025_03_11 = of("computer-use-preview-2025-03-11")
229191

230-
@JvmStatic fun of(value: String) = UnionMember4(JsonField.of(value))
192+
@JvmStatic fun of(value: String) = UnionMember2(JsonField.of(value))
231193
}
232194

233-
/** An enum containing [UnionMember4]'s known values. */
195+
/** An enum containing [UnionMember2]'s known values. */
234196
enum class Known {
235197
O1_PRO,
236198
O1_PRO_2025_03_19,
@@ -239,9 +201,9 @@ private constructor(
239201
}
240202

241203
/**
242-
* An enum containing [UnionMember4]'s known values, as well as an [_UNKNOWN] member.
204+
* An enum containing [UnionMember2]'s known values, as well as an [_UNKNOWN] member.
243205
*
244-
* An instance of [UnionMember4] can contain an unknown value in a couple of cases:
206+
* An instance of [UnionMember2] can contain an unknown value in a couple of cases:
245207
* - It was deserialized from data that doesn't match any known member. For example, if the
246208
* SDK is on an older version than the API, then the API may respond with new members that
247209
* the SDK is unaware of.
@@ -253,7 +215,7 @@ private constructor(
253215
COMPUTER_USE_PREVIEW,
254216
COMPUTER_USE_PREVIEW_2025_03_11,
255217
/**
256-
* An enum member indicating that [UnionMember4] was instantiated with an unknown value.
218+
* An enum member indicating that [UnionMember2] was instantiated with an unknown value.
257219
*/
258220
_UNKNOWN,
259221
}
@@ -289,7 +251,7 @@ private constructor(
289251
O1_PRO_2025_03_19 -> Known.O1_PRO_2025_03_19
290252
COMPUTER_USE_PREVIEW -> Known.COMPUTER_USE_PREVIEW
291253
COMPUTER_USE_PREVIEW_2025_03_11 -> Known.COMPUTER_USE_PREVIEW_2025_03_11
292-
else -> throw OpenAIInvalidDataException("Unknown UnionMember4: $value")
254+
else -> throw OpenAIInvalidDataException("Unknown UnionMember2: $value")
293255
}
294256

295257
/**
@@ -309,7 +271,7 @@ private constructor(
309271
return true
310272
}
311273

312-
return /* spotless:off */ other is UnionMember4 && value == other.value /* spotless:on */
274+
return /* spotless:off */ other is UnionMember2 && value == other.value /* spotless:on */
313275
}
314276

315277
override fun hashCode() = value.hashCode()

‎openai-java-core/src/test/kotlin/com/openai/models/AllModelsTest.kt‎

Lines changed: 6 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -15,35 +15,7 @@ internal class AllModelsTest {
1515

1616
assertThat(allModels.string()).contains(string)
1717
assertThat(allModels.chatModel()).isEmpty
18-
assertThat(allModels.string()).isEmpty
19-
assertThat(allModels.chatModel()).isEmpty
20-
assertThat(allModels.unionMember4()).isEmpty
21-
}
22-
23-
@Test
24-
fun ofChatModel() {
25-
val chatModel = ChatModel.O3_MINI
26-
27-
val allModels = AllModels.ofChatModel(chatModel)
28-
29-
assertThat(allModels.string()).isEmpty
30-
assertThat(allModels.chatModel()).contains(chatModel)
31-
assertThat(allModels.string()).isEmpty
32-
assertThat(allModels.chatModel()).isEmpty
33-
assertThat(allModels.unionMember4()).isEmpty
34-
}
35-
36-
@Test
37-
fun ofString() {
38-
val string = "string"
39-
40-
val allModels = AllModels.ofString(string)
41-
42-
assertThat(allModels.string()).isEmpty
43-
assertThat(allModels.chatModel()).isEmpty
44-
assertThat(allModels.string()).contains(string)
45-
assertThat(allModels.chatModel()).isEmpty
46-
assertThat(allModels.unionMember4()).isEmpty
18+
assertThat(allModels.unionMember2()).isEmpty
4719
}
4820

4921
@Test
@@ -52,23 +24,19 @@ internal class AllModelsTest {
5224

5325
val allModels = AllModels.ofChatModel(chatModel)
5426

55-
assertThat(allModels.string()).isEmpty
56-
assertThat(allModels.chatModel()).isEmpty
5727
assertThat(allModels.string()).isEmpty
5828
assertThat(allModels.chatModel()).contains(chatModel)
59-
assertThat(allModels.unionMember4()).isEmpty
29+
assertThat(allModels.unionMember2()).isEmpty
6030
}
6131

6232
@Test
63-
fun ofUnionMember4() {
64-
val unionMember4 = AllModels.UnionMember4.O1_PRO
33+
fun ofUnionMember2() {
34+
val unionMember2 = AllModels.UnionMember2.O1_PRO
6535

66-
val allModels = AllModels.ofUnionMember4(unionMember4)
36+
val allModels = AllModels.ofUnionMember2(unionMember2)
6737

6838
assertThat(allModels.string()).isEmpty
6939
assertThat(allModels.chatModel()).isEmpty
70-
assertThat(allModels.string()).isEmpty
71-
assertThat(allModels.chatModel()).isEmpty
72-
assertThat(allModels.unionMember4()).contains(unionMember4)
40+
assertThat(allModels.unionMember2()).contains(unionMember2)
7341
}
7442
}

0 commit comments

Comments
 (0)