Skip to content

Commit 557c071

Browse files
stainless-app[bot]stainless-app[bot]
committed
chore: simplify examples involving lists (#118)
1 parent 627cb56 commit 557c071

File tree

60 files changed

+1874
-2438
lines changed

Some content is hidden

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

60 files changed

+1874
-2438
lines changed

‎README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,12 @@ import com.openai.models.ChatCompletionCreateParams;
9595
import com.openai.models.ChatCompletionMessageParam;
9696
import com.openai.models.ChatCompletionUserMessageParam;
9797
import com.openai.models.ChatModel;
98-
import java.util.List;
9998

10099
ChatCompletionCreateParams params = ChatCompletionCreateParams.builder()
101-
.messages(List.of(ChatCompletionMessageParam.ofChatCompletionUserMessageParam(ChatCompletionUserMessageParam.builder()
100+
.addMessage(ChatCompletionMessageParam.ofChatCompletionUserMessageParam(ChatCompletionUserMessageParam.builder()
102101
.role(ChatCompletionUserMessageParam.Role.USER)
103102
.content(ChatCompletionUserMessageParam.Content.ofTextContent("Say this is a test"))
104-
.build())))
103+
.build()))
105104
.model(ChatModel.O1)
106105
.build();
107106
ChatCompletion chatCompletion = client.chat().completions().create(params);

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

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,11 @@ class AssistantTest {
2020
.model("model")
2121
.name("name")
2222
.object_(Assistant.Object.ASSISTANT)
23-
.tools(
24-
listOf(
25-
AssistantTool.ofCodeInterpreterTool(
26-
CodeInterpreterTool.builder()
27-
.type(CodeInterpreterTool.Type.CODE_INTERPRETER)
28-
.build()
29-
)
23+
.addTool(
24+
AssistantTool.ofCodeInterpreterTool(
25+
CodeInterpreterTool.builder()
26+
.type(CodeInterpreterTool.Type.CODE_INTERPRETER)
27+
.build()
3028
)
3129
)
3230
.responseFormat(
@@ -39,12 +37,12 @@ class AssistantTest {
3937
Assistant.ToolResources.builder()
4038
.codeInterpreter(
4139
Assistant.ToolResources.CodeInterpreter.builder()
42-
.fileIds(listOf("string"))
40+
.addFileId("string")
4341
.build()
4442
)
4543
.fileSearch(
4644
Assistant.ToolResources.FileSearch.builder()
47-
.vectorStoreIds(listOf("string"))
45+
.addVectorStoreId("string")
4846
.build()
4947
)
5048
.build()
@@ -80,12 +78,12 @@ class AssistantTest {
8078
Assistant.ToolResources.builder()
8179
.codeInterpreter(
8280
Assistant.ToolResources.CodeInterpreter.builder()
83-
.fileIds(listOf("string"))
81+
.addFileId("string")
8482
.build()
8583
)
8684
.fileSearch(
8785
Assistant.ToolResources.FileSearch.builder()
88-
.vectorStoreIds(listOf("string"))
86+
.addVectorStoreId("string")
8987
.build()
9088
)
9189
.build()

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

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,13 @@ class BatchTest {
2525
.errorFileId("error_file_id")
2626
.errors(
2727
Batch.Errors.builder()
28-
.data(
29-
listOf(
30-
BatchError.builder()
31-
.code("code")
32-
.line(0L)
33-
.message("message")
34-
.param("param")
35-
.build()
36-
)
28+
.addData(
29+
BatchError.builder()
30+
.code("code")
31+
.line(0L)
32+
.message("message")
33+
.param("param")
34+
.build()
3735
)
3836
.object_("object")
3937
.build()
@@ -64,15 +62,13 @@ class BatchTest {
6462
assertThat(batch.errors())
6563
.contains(
6664
Batch.Errors.builder()
67-
.data(
68-
listOf(
69-
BatchError.builder()
70-
.code("code")
71-
.line(0L)
72-
.message("message")
73-
.param("param")
74-
.build()
75-
)
65+
.addData(
66+
BatchError.builder()
67+
.code("code")
68+
.line(0L)
69+
.message("message")
70+
.param("param")
71+
.build()
7672
)
7773
.object_("object")
7874
.build()

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

Lines changed: 56 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -26,42 +26,35 @@ class BetaAssistantCreateParamsTest {
2626
BetaAssistantCreateParams.ToolResources.builder()
2727
.codeInterpreter(
2828
BetaAssistantCreateParams.ToolResources.CodeInterpreter.builder()
29-
.fileIds(listOf("string"))
29+
.addFileId("string")
3030
.build()
3131
)
3232
.fileSearch(
3333
BetaAssistantCreateParams.ToolResources.FileSearch.builder()
34-
.vectorStoreIds(listOf("string"))
35-
.vectorStores(
36-
listOf(
37-
BetaAssistantCreateParams.ToolResources.FileSearch.VectorStore
38-
.builder()
39-
.chunkingStrategy(
40-
FileChunkingStrategyParam
41-
.ofAutoFileChunkingStrategyParam(
42-
AutoFileChunkingStrategyParam.builder()
43-
.type(
44-
AutoFileChunkingStrategyParam.Type.AUTO
45-
)
46-
.build()
47-
)
34+
.addVectorStoreId("string")
35+
.addVectorStore(
36+
BetaAssistantCreateParams.ToolResources.FileSearch.VectorStore
37+
.builder()
38+
.chunkingStrategy(
39+
FileChunkingStrategyParam.ofAutoFileChunkingStrategyParam(
40+
AutoFileChunkingStrategyParam.builder()
41+
.type(AutoFileChunkingStrategyParam.Type.AUTO)
42+
.build()
4843
)
49-
.fileIds(listOf("string"))
50-
.metadata(JsonValue.from(mapOf<String, Any>()))
51-
.build()
52-
)
44+
)
45+
.addFileId("string")
46+
.metadata(JsonValue.from(mapOf<String, Any>()))
47+
.build()
5348
)
5449
.build()
5550
)
5651
.build()
5752
)
58-
.tools(
59-
listOf(
60-
AssistantTool.ofCodeInterpreterTool(
61-
CodeInterpreterTool.builder()
62-
.type(CodeInterpreterTool.Type.CODE_INTERPRETER)
63-
.build()
64-
)
53+
.addTool(
54+
AssistantTool.ofCodeInterpreterTool(
55+
CodeInterpreterTool.builder()
56+
.type(CodeInterpreterTool.Type.CODE_INTERPRETER)
57+
.build()
6558
)
6659
)
6760
.topP(1.0)
@@ -87,44 +80,38 @@ class BetaAssistantCreateParamsTest {
8780
BetaAssistantCreateParams.ToolResources.builder()
8881
.codeInterpreter(
8982
BetaAssistantCreateParams.ToolResources.CodeInterpreter.builder()
90-
.fileIds(listOf("string"))
83+
.addFileId("string")
9184
.build()
9285
)
9386
.fileSearch(
9487
BetaAssistantCreateParams.ToolResources.FileSearch.builder()
95-
.vectorStoreIds(listOf("string"))
96-
.vectorStores(
97-
listOf(
98-
BetaAssistantCreateParams.ToolResources.FileSearch
99-
.VectorStore
100-
.builder()
101-
.chunkingStrategy(
102-
FileChunkingStrategyParam
103-
.ofAutoFileChunkingStrategyParam(
104-
AutoFileChunkingStrategyParam.builder()
105-
.type(
106-
AutoFileChunkingStrategyParam.Type
107-
.AUTO
108-
)
109-
.build()
110-
)
111-
)
112-
.fileIds(listOf("string"))
113-
.metadata(JsonValue.from(mapOf<String, Any>()))
114-
.build()
115-
)
88+
.addVectorStoreId("string")
89+
.addVectorStore(
90+
BetaAssistantCreateParams.ToolResources.FileSearch.VectorStore
91+
.builder()
92+
.chunkingStrategy(
93+
FileChunkingStrategyParam
94+
.ofAutoFileChunkingStrategyParam(
95+
AutoFileChunkingStrategyParam.builder()
96+
.type(
97+
AutoFileChunkingStrategyParam.Type.AUTO
98+
)
99+
.build()
100+
)
101+
)
102+
.addFileId("string")
103+
.metadata(JsonValue.from(mapOf<String, Any>()))
104+
.build()
116105
)
117106
.build()
118107
)
119108
.build()
120109
)
121-
.tools(
122-
listOf(
123-
AssistantTool.ofCodeInterpreterTool(
124-
CodeInterpreterTool.builder()
125-
.type(CodeInterpreterTool.Type.CODE_INTERPRETER)
126-
.build()
127-
)
110+
.addTool(
111+
AssistantTool.ofCodeInterpreterTool(
112+
CodeInterpreterTool.builder()
113+
.type(CodeInterpreterTool.Type.CODE_INTERPRETER)
114+
.build()
128115
)
129116
)
130117
.topP(1.0)
@@ -148,30 +135,25 @@ class BetaAssistantCreateParamsTest {
148135
BetaAssistantCreateParams.ToolResources.builder()
149136
.codeInterpreter(
150137
BetaAssistantCreateParams.ToolResources.CodeInterpreter.builder()
151-
.fileIds(listOf("string"))
138+
.addFileId("string")
152139
.build()
153140
)
154141
.fileSearch(
155142
BetaAssistantCreateParams.ToolResources.FileSearch.builder()
156-
.vectorStoreIds(listOf("string"))
157-
.vectorStores(
158-
listOf(
159-
BetaAssistantCreateParams.ToolResources.FileSearch.VectorStore
160-
.builder()
161-
.chunkingStrategy(
162-
FileChunkingStrategyParam
163-
.ofAutoFileChunkingStrategyParam(
164-
AutoFileChunkingStrategyParam.builder()
165-
.type(
166-
AutoFileChunkingStrategyParam.Type.AUTO
167-
)
168-
.build()
169-
)
143+
.addVectorStoreId("string")
144+
.addVectorStore(
145+
BetaAssistantCreateParams.ToolResources.FileSearch.VectorStore
146+
.builder()
147+
.chunkingStrategy(
148+
FileChunkingStrategyParam.ofAutoFileChunkingStrategyParam(
149+
AutoFileChunkingStrategyParam.builder()
150+
.type(AutoFileChunkingStrategyParam.Type.AUTO)
151+
.build()
170152
)
171-
.fileIds(listOf("string"))
172-
.metadata(JsonValue.from(mapOf<String, Any>()))
173-
.build()
174-
)
153+
)
154+
.addFileId("string")
155+
.metadata(JsonValue.from(mapOf<String, Any>()))
156+
.build()
175157
)
176158
.build()
177159
)

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

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,21 @@ class BetaAssistantUpdateParamsTest {
2727
BetaAssistantUpdateParams.ToolResources.builder()
2828
.codeInterpreter(
2929
BetaAssistantUpdateParams.ToolResources.CodeInterpreter.builder()
30-
.fileIds(listOf("string"))
30+
.addFileId("string")
3131
.build()
3232
)
3333
.fileSearch(
3434
BetaAssistantUpdateParams.ToolResources.FileSearch.builder()
35-
.vectorStoreIds(listOf("string"))
35+
.addVectorStoreId("string")
3636
.build()
3737
)
3838
.build()
3939
)
40-
.tools(
41-
listOf(
42-
AssistantTool.ofCodeInterpreterTool(
43-
CodeInterpreterTool.builder()
44-
.type(CodeInterpreterTool.Type.CODE_INTERPRETER)
45-
.build()
46-
)
40+
.addTool(
41+
AssistantTool.ofCodeInterpreterTool(
42+
CodeInterpreterTool.builder()
43+
.type(CodeInterpreterTool.Type.CODE_INTERPRETER)
44+
.build()
4745
)
4846
)
4947
.topP(1.0)
@@ -70,23 +68,21 @@ class BetaAssistantUpdateParamsTest {
7068
BetaAssistantUpdateParams.ToolResources.builder()
7169
.codeInterpreter(
7270
BetaAssistantUpdateParams.ToolResources.CodeInterpreter.builder()
73-
.fileIds(listOf("string"))
71+
.addFileId("string")
7472
.build()
7573
)
7674
.fileSearch(
7775
BetaAssistantUpdateParams.ToolResources.FileSearch.builder()
78-
.vectorStoreIds(listOf("string"))
76+
.addVectorStoreId("string")
7977
.build()
8078
)
8179
.build()
8280
)
83-
.tools(
84-
listOf(
85-
AssistantTool.ofCodeInterpreterTool(
86-
CodeInterpreterTool.builder()
87-
.type(CodeInterpreterTool.Type.CODE_INTERPRETER)
88-
.build()
89-
)
81+
.addTool(
82+
AssistantTool.ofCodeInterpreterTool(
83+
CodeInterpreterTool.builder()
84+
.type(CodeInterpreterTool.Type.CODE_INTERPRETER)
85+
.build()
9086
)
9187
)
9288
.topP(1.0)
@@ -110,12 +106,12 @@ class BetaAssistantUpdateParamsTest {
110106
BetaAssistantUpdateParams.ToolResources.builder()
111107
.codeInterpreter(
112108
BetaAssistantUpdateParams.ToolResources.CodeInterpreter.builder()
113-
.fileIds(listOf("string"))
109+
.addFileId("string")
114110
.build()
115111
)
116112
.fileSearch(
117113
BetaAssistantUpdateParams.ToolResources.FileSearch.builder()
118-
.vectorStoreIds(listOf("string"))
114+
.addVectorStoreId("string")
119115
.build()
120116
)
121117
.build()

0 commit comments

Comments
 (0)