Remove deepseek options form openaiapi · spring-projects/spring-ai@59b36d1 (original) (raw)
`@@ -80,7 +80,7 @@ void whenTotalTokensIsNull() {
`
80
80
``
81
81
`@Test
`
82
82
`void whenPromptAndCompletionTokensDetailsIsNull() {
`
83
``
`-
OpenAiApi.Usage openAiUsage = new OpenAiApi.Usage(100, 200, 300, null, null, null, null);
`
``
83
`+
OpenAiApi.Usage openAiUsage = new OpenAiApi.Usage(100, 200, 300, null, null);
`
84
84
`DefaultUsage usage = getDefaultUsage(openAiUsage);
`
85
85
`assertThat(usage.getTotalTokens()).isEqualTo(300);
`
86
86
`OpenAiApi.Usage nativeUsage = (OpenAiApi.Usage) usage.getNativeUsage();
`
`@@ -90,7 +90,7 @@ void whenPromptAndCompletionTokensDetailsIsNull() {
`
90
90
``
91
91
`@Test
`
92
92
`void whenCompletionTokenDetailsIsNull() {
`
93
``
`-
OpenAiApi.Usage openAiUsage = new OpenAiApi.Usage(100, 200, 300, null, null, null, null);
`
``
93
`+
OpenAiApi.Usage openAiUsage = new OpenAiApi.Usage(100, 200, 300, null, null);
`
94
94
`DefaultUsage usage = getDefaultUsage(openAiUsage);
`
95
95
`assertThat(usage.getTotalTokens()).isEqualTo(300);
`
96
96
`OpenAiApi.Usage nativeUsage = (OpenAiApi.Usage) usage.getNativeUsage();
`
`@@ -100,7 +100,7 @@ void whenCompletionTokenDetailsIsNull() {
`
100
100
`@Test
`
101
101
`void whenReasoningTokensIsNull() {
`
102
102
`OpenAiApi.Usage openAiUsage = new OpenAiApi.Usage(100, 200, 300, null,
`
103
``
`-
new OpenAiApi.Usage.CompletionTokenDetails(null, null, null, null), null, null);
`
``
103
`+
new OpenAiApi.Usage.CompletionTokenDetails(null, null, null, null));
`
104
104
`DefaultUsage usage = getDefaultUsage(openAiUsage);
`
105
105
`OpenAiApi.Usage nativeUsage = (OpenAiApi.Usage) usage.getNativeUsage();
`
106
106
`assertThat(nativeUsage.completionTokenDetails().reasoningTokens()).isEqualTo(null);
`
`@@ -109,7 +109,7 @@ void whenReasoningTokensIsNull() {
`
109
109
`@Test
`
110
110
`void whenCompletionTokenDetailsIsPresent() {
`
111
111
`OpenAiApi.Usage openAiUsage = new OpenAiApi.Usage(100, 200, 300, null,
`
112
``
`-
new OpenAiApi.Usage.CompletionTokenDetails(50, null, null, null), null, null);
`
``
112
`+
new OpenAiApi.Usage.CompletionTokenDetails(50, null, null, null));
`
113
113
`DefaultUsage usage = getDefaultUsage(openAiUsage);
`
114
114
`OpenAiApi.Usage nativeUsage = (OpenAiApi.Usage) usage.getNativeUsage();
`
115
115
`assertThat(nativeUsage.completionTokenDetails().reasoningTokens()).isEqualTo(50);
`
`@@ -121,7 +121,7 @@ void whenCompletionTokenDetailsIsPresent() {
`
121
121
`@Test
`
122
122
`void whenAcceptedPredictionTokensIsPresent() {
`
123
123
`OpenAiApi.Usage openAiUsage = new OpenAiApi.Usage(100, 200, 300, null,
`
124
``
`-
new OpenAiApi.Usage.CompletionTokenDetails(null, 75, null, null), null, null);
`
``
124
`+
new OpenAiApi.Usage.CompletionTokenDetails(null, 75, null, null));
`
125
125
`DefaultUsage usage = getDefaultUsage(openAiUsage);
`
126
126
`OpenAiApi.Usage nativeUsage = (OpenAiApi.Usage) usage.getNativeUsage();
`
127
127
`assertThat(nativeUsage.completionTokenDetails().reasoningTokens()).isEqualTo(null);
`
`@@ -133,7 +133,7 @@ void whenAcceptedPredictionTokensIsPresent() {
`
133
133
`@Test
`
134
134
`void whenAudioTokensIsPresent() {
`
135
135
`OpenAiApi.Usage openAiUsage = new OpenAiApi.Usage(100, 200, 300, null,
`
136
``
`-
new OpenAiApi.Usage.CompletionTokenDetails(null, null, 125, null), null, null);
`
``
136
`+
new OpenAiApi.Usage.CompletionTokenDetails(null, null, 125, null));
`
137
137
`DefaultUsage usage = getDefaultUsage(openAiUsage);
`
138
138
`OpenAiApi.Usage nativeUsage = (OpenAiApi.Usage) usage.getNativeUsage();
`
139
139
`assertThat(nativeUsage.completionTokenDetails().reasoningTokens()).isEqualTo(null);
`
`@@ -145,7 +145,7 @@ void whenAudioTokensIsPresent() {
`
145
145
`@Test
`
146
146
`void whenRejectedPredictionTokensIsNull() {
`
147
147
`OpenAiApi.Usage openAiUsage = new OpenAiApi.Usage(100, 200, 300, null,
`
148
``
`-
new OpenAiApi.Usage.CompletionTokenDetails(null, null, null, null), null, null);
`
``
148
`+
new OpenAiApi.Usage.CompletionTokenDetails(null, null, null, null));
`
149
149
`DefaultUsage usage = getDefaultUsage(openAiUsage);
`
150
150
`OpenAiApi.Usage nativeUsage = (OpenAiApi.Usage) usage.getNativeUsage();
`
151
151
`assertThat(nativeUsage.completionTokenDetails().reasoningTokens()).isEqualTo(null);
`
`@@ -159,7 +159,7 @@ void whenRejectedPredictionTokensIsNull() {
`
159
159
`@Test
`
160
160
`void whenRejectedPredictionTokensIsPresent() {
`
161
161
`OpenAiApi.Usage openAiUsage = new OpenAiApi.Usage(100, 200, 300, null,
`
162
``
`-
new OpenAiApi.Usage.CompletionTokenDetails(null, null, null, 25), null, null);
`
``
162
`+
new OpenAiApi.Usage.CompletionTokenDetails(null, null, null, 25));
`
163
163
`DefaultUsage usage = getDefaultUsage(openAiUsage);
`
164
164
`OpenAiApi.Usage nativeUsage = (OpenAiApi.Usage) usage.getNativeUsage();
`
165
165
`assertThat(nativeUsage.completionTokenDetails().reasoningTokens()).isEqualTo(null);
`
`@@ -171,7 +171,7 @@ void whenRejectedPredictionTokensIsPresent() {
`
171
171
`@Test
`
172
172
`void whenCacheTokensIsNull() {
`
173
173
`OpenAiApi.Usage openAiUsage = new OpenAiApi.Usage(100, 200, 300,
`
174
``
`-
new OpenAiApi.Usage.PromptTokensDetails(null, null), null, null, null);
`
``
174
`+
new OpenAiApi.Usage.PromptTokensDetails(null, null), null);
`
175
175
`DefaultUsage usage = getDefaultUsage(openAiUsage);
`
176
176
`OpenAiApi.Usage nativeUsage = (OpenAiApi.Usage) usage.getNativeUsage();
`
177
177
`assertThat(nativeUsage.promptTokensDetails().audioTokens()).isEqualTo(null);
`
`@@ -181,7 +181,7 @@ void whenCacheTokensIsNull() {
`
181
181
`@Test
`
182
182
`void whenCacheTokensIsPresent() {
`
183
183
`OpenAiApi.Usage openAiUsage = new OpenAiApi.Usage(100, 200, 300,
`
184
``
`-
new OpenAiApi.Usage.PromptTokensDetails(99, 15), null, null, null);
`
``
184
`+
new OpenAiApi.Usage.PromptTokensDetails(99, 15), null);
`
185
185
`DefaultUsage usage = getDefaultUsage(openAiUsage);
`
186
186
`OpenAiApi.Usage nativeUsage = (OpenAiApi.Usage) usage.getNativeUsage();
`
187
187
`assertThat(nativeUsage.promptTokensDetails().audioTokens()).isEqualTo(99);
`
`@@ -191,25 +191,21 @@ void whenCacheTokensIsPresent() {
`
191
191
`@Test
`
192
192
`void whenPromptCacheHitTokensIsPresent() {
`
193
193
`OpenAiApi.Usage openAiUsage = new OpenAiApi.Usage(100, 200, 300,
`
194
``
`-
new OpenAiApi.Usage.PromptTokensDetails(99, 15), null, 150, null);
`
``
194
`+
new OpenAiApi.Usage.PromptTokensDetails(99, 15), null);
`
195
195
`DefaultUsage usage = getDefaultUsage(openAiUsage);
`
196
196
`OpenAiApi.Usage nativeUsage = (OpenAiApi.Usage) usage.getNativeUsage();
`
197
197
`assertThat(nativeUsage.promptTokensDetails().audioTokens()).isEqualTo(99);
`
198
198
`assertThat(nativeUsage.promptTokensDetails().cachedTokens()).isEqualTo(15);
`
199
``
`-
assertThat(nativeUsage.promptCacheHitTokens()).isEqualTo(150);
`
200
``
`-
assertThat(nativeUsage.promptCacheMissTokens()).isNull();
`
201
199
` }
`
202
200
``
203
201
`@Test
`
204
202
`void whenPromptCacheMissTokensIsPresent() {
`
205
203
`OpenAiApi.Usage openAiUsage = new OpenAiApi.Usage(100, 200, 300,
`
206
``
`-
new OpenAiApi.Usage.PromptTokensDetails(99, 15), null, null, 80);
`
``
204
`+
new OpenAiApi.Usage.PromptTokensDetails(99, 15), null);
`
207
205
`DefaultUsage usage = getDefaultUsage(openAiUsage);
`
208
206
`OpenAiApi.Usage nativeUsage = (OpenAiApi.Usage) usage.getNativeUsage();
`
209
207
`assertThat(nativeUsage.promptTokensDetails().audioTokens()).isEqualTo(99);
`
210
208
`assertThat(nativeUsage.promptTokensDetails().cachedTokens()).isEqualTo(15);
`
211
``
`-
assertThat(nativeUsage.promptCacheMissTokens()).isEqualTo(80);
`
212
``
`-
assertThat(nativeUsage.promptCacheHitTokens()).isNull();
`
213
209
` }
`
214
210
``
215
211
`}
`