Skip to content

Commit 9472378

Browse files
committed
rename MyCallback to OpenAICallback
1 parent d9ddc73 commit 9472378

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

src/main/kotlin/com/cjcrafter/openai/OpenAI.kt

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,10 @@ import com.cjcrafter.openai.gson.ChatUserAdapter
1111
import com.cjcrafter.openai.gson.FinishReasonAdapter
1212
import com.google.gson.Gson
1313
import com.google.gson.GsonBuilder
14-
import com.google.gson.JsonObject
15-
import com.google.gson.JsonParser
1614
import okhttp3.*
1715
import okhttp3.MediaType.Companion.toMediaType
1816
import okhttp3.RequestBody.Companion.toRequestBody
1917
import java.io.IOException
20-
import java.lang.IllegalStateException
21-
import java.util.ArrayList
2218
import java.util.function.Consumer
2319

2420
/**
@@ -101,7 +97,7 @@ class OpenAI @JvmOverloads constructor(
10197
try {
10298
val httpResponse = client.newCall(httpRequest).execute();
10399
lateinit var response: CompletionResponse
104-
MyCallback(true, { throw it }) {
100+
OpenAICallback(true, { throw it }) {
105101
response = gson.fromJson(it, CompletionResponse::class.java)
106102
}.onResponse(httpResponse)
107103

@@ -139,7 +135,7 @@ class OpenAI @JvmOverloads constructor(
139135
request.stream = false // use streamCompletionAsync for stream=true
140136
val httpRequest = buildRequest(request, COMPLETIONS_ENDPOINT)
141137

142-
client.newCall(httpRequest).enqueue(MyCallback(false, onFailure) {
138+
client.newCall(httpRequest).enqueue(OpenAICallback(false, onFailure) {
143139
val response = gson.fromJson(it, CompletionResponse::class.java)
144140
onResponse.accept(response)
145141
})
@@ -178,7 +174,7 @@ class OpenAI @JvmOverloads constructor(
178174

179175
try {
180176
val httpResponse = client.newCall(httpRequest).execute()
181-
MyCallback(true, onFailure) {
177+
OpenAICallback(true, onFailure) {
182178
val response = gson.fromJson(it, CompletionResponseChunk::class.java)
183179
onResponse.accept(response)
184180
}.onResponse(httpResponse)
@@ -217,7 +213,7 @@ class OpenAI @JvmOverloads constructor(
217213
request.stream = true // use createCompletionAsync for stream=false
218214
val httpRequest = buildRequest(request, COMPLETIONS_ENDPOINT)
219215

220-
client.newCall(httpRequest).enqueue(MyCallback(true, onFailure) {
216+
client.newCall(httpRequest).enqueue(OpenAICallback(true, onFailure) {
221217
val response = gson.fromJson(it, CompletionResponseChunk::class.java)
222218
onResponse.accept(response)
223219
})
@@ -251,7 +247,7 @@ class OpenAI @JvmOverloads constructor(
251247
try {
252248
val httpResponse = client.newCall(httpRequest).execute()
253249
lateinit var response: ChatResponse
254-
MyCallback(true, { throw it }) {
250+
OpenAICallback(true, { throw it }) {
255251
response = gson.fromJson(it, ChatResponse::class.java)
256252
}.onResponse(httpResponse)
257253

@@ -290,7 +286,7 @@ class OpenAI @JvmOverloads constructor(
290286
request.stream = false // use streamChatCompletionAsync for stream=true
291287
val httpRequest = buildRequest(request, CHAT_ENDPOINT)
292288

293-
client.newCall(httpRequest).enqueue(MyCallback(false, onFailure) {
289+
client.newCall(httpRequest).enqueue(OpenAICallback(false, onFailure) {
294290
val response = gson.fromJson(it, ChatResponse::class.java)
295291
onResponse.accept(response)
296292
})
@@ -332,7 +328,7 @@ class OpenAI @JvmOverloads constructor(
332328
try {
333329
val httpResponse = client.newCall(httpRequest).execute()
334330
var response: ChatResponseChunk? = null
335-
MyCallback(true, onFailure) {
331+
OpenAICallback(true, onFailure) {
336332
if (response == null)
337333
response = gson.fromJson(it, ChatResponseChunk::class.java)
338334
else
@@ -378,7 +374,7 @@ class OpenAI @JvmOverloads constructor(
378374
val httpRequest = buildRequest(request, CHAT_ENDPOINT)
379375

380376
var response: ChatResponseChunk? = null
381-
client.newCall(httpRequest).enqueue(MyCallback(true, onFailure) {
377+
client.newCall(httpRequest).enqueue(OpenAICallback(true, onFailure) {
382378
if (response == null)
383379
response = gson.fromJson(it, ChatResponseChunk::class.java)
384380
else

src/main/kotlin/com/cjcrafter/openai/MyCallback.kt renamed to src/main/kotlin/com/cjcrafter/openai/OpenAICallback.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import okhttp3.Response
1111
import java.io.IOException
1212
import java.util.function.Consumer
1313

14-
internal class MyCallback(
14+
internal class OpenAICallback(
1515
private val isStream: Boolean,
1616
private val onFailure: Consumer<OpenAIError>,
1717
private val onResponse: Consumer<JsonObject>

0 commit comments

Comments
 (0)