@@ -11,14 +11,10 @@ import com.cjcrafter.openai.gson.ChatUserAdapter
11
11
import com.cjcrafter.openai.gson.FinishReasonAdapter
12
12
import com.google.gson.Gson
13
13
import com.google.gson.GsonBuilder
14
- import com.google.gson.JsonObject
15
- import com.google.gson.JsonParser
16
14
import okhttp3.*
17
15
import okhttp3.MediaType.Companion.toMediaType
18
16
import okhttp3.RequestBody.Companion.toRequestBody
19
17
import java.io.IOException
20
- import java.lang.IllegalStateException
21
- import java.util.ArrayList
22
18
import java.util.function.Consumer
23
19
24
20
/* *
@@ -101,7 +97,7 @@ class OpenAI @JvmOverloads constructor(
101
97
try {
102
98
val httpResponse = client.newCall(httpRequest).execute();
103
99
lateinit var response: CompletionResponse
104
- MyCallback (true , { throw it }) {
100
+ OpenAICallback (true , { throw it }) {
105
101
response = gson.fromJson(it, CompletionResponse ::class .java)
106
102
}.onResponse(httpResponse)
107
103
@@ -139,7 +135,7 @@ class OpenAI @JvmOverloads constructor(
139
135
request.stream = false // use streamCompletionAsync for stream=true
140
136
val httpRequest = buildRequest(request, COMPLETIONS_ENDPOINT )
141
137
142
- client.newCall(httpRequest).enqueue(MyCallback (false , onFailure) {
138
+ client.newCall(httpRequest).enqueue(OpenAICallback (false , onFailure) {
143
139
val response = gson.fromJson(it, CompletionResponse ::class .java)
144
140
onResponse.accept(response)
145
141
})
@@ -178,7 +174,7 @@ class OpenAI @JvmOverloads constructor(
178
174
179
175
try {
180
176
val httpResponse = client.newCall(httpRequest).execute()
181
- MyCallback (true , onFailure) {
177
+ OpenAICallback (true , onFailure) {
182
178
val response = gson.fromJson(it, CompletionResponseChunk ::class .java)
183
179
onResponse.accept(response)
184
180
}.onResponse(httpResponse)
@@ -217,7 +213,7 @@ class OpenAI @JvmOverloads constructor(
217
213
request.stream = true // use createCompletionAsync for stream=false
218
214
val httpRequest = buildRequest(request, COMPLETIONS_ENDPOINT )
219
215
220
- client.newCall(httpRequest).enqueue(MyCallback (true , onFailure) {
216
+ client.newCall(httpRequest).enqueue(OpenAICallback (true , onFailure) {
221
217
val response = gson.fromJson(it, CompletionResponseChunk ::class .java)
222
218
onResponse.accept(response)
223
219
})
@@ -251,7 +247,7 @@ class OpenAI @JvmOverloads constructor(
251
247
try {
252
248
val httpResponse = client.newCall(httpRequest).execute()
253
249
lateinit var response: ChatResponse
254
- MyCallback (true , { throw it }) {
250
+ OpenAICallback (true , { throw it }) {
255
251
response = gson.fromJson(it, ChatResponse ::class .java)
256
252
}.onResponse(httpResponse)
257
253
@@ -290,7 +286,7 @@ class OpenAI @JvmOverloads constructor(
290
286
request.stream = false // use streamChatCompletionAsync for stream=true
291
287
val httpRequest = buildRequest(request, CHAT_ENDPOINT )
292
288
293
- client.newCall(httpRequest).enqueue(MyCallback (false , onFailure) {
289
+ client.newCall(httpRequest).enqueue(OpenAICallback (false , onFailure) {
294
290
val response = gson.fromJson(it, ChatResponse ::class .java)
295
291
onResponse.accept(response)
296
292
})
@@ -332,7 +328,7 @@ class OpenAI @JvmOverloads constructor(
332
328
try {
333
329
val httpResponse = client.newCall(httpRequest).execute()
334
330
var response: ChatResponseChunk ? = null
335
- MyCallback (true , onFailure) {
331
+ OpenAICallback (true , onFailure) {
336
332
if (response == null )
337
333
response = gson.fromJson(it, ChatResponseChunk ::class .java)
338
334
else
@@ -378,7 +374,7 @@ class OpenAI @JvmOverloads constructor(
378
374
val httpRequest = buildRequest(request, CHAT_ENDPOINT )
379
375
380
376
var response: ChatResponseChunk ? = null
381
- client.newCall(httpRequest).enqueue(MyCallback (true , onFailure) {
377
+ client.newCall(httpRequest).enqueue(OpenAICallback (true , onFailure) {
382
378
if (response == null )
383
379
response = gson.fromJson(it, ChatResponseChunk ::class .java)
384
380
else
0 commit comments