Skip to content

Commit 9d9926b

Browse files
jlangchjlangch
committed
refactoring
1 parent 1564511 commit 9d9926b

2 files changed

Lines changed: 44 additions & 40 deletions

File tree

‎src/main/java/com/github/jlangch/venice/util/openai/TokenUsage.java‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import com.openai.models.completions.CompletionUsage;
3434
import com.openai.models.completions.CompletionUsage.CompletionTokensDetails;
3535
import com.openai.models.images.ImagesResponse;
36+
import com.openai.models.images.ImagesResponse.Usage.InputTokensDetails;
3637
import com.openai.models.images.ImagesResponse.Usage.OutputTokensDetails;
3738

3839

@@ -98,17 +99,21 @@ public static TokenUsage of(final ImagesResponse response) {
9899
return new TokenUsage();
99100
}
100101
else {
101-
final OutputTokensDetails details = usage.outputTokensDetails().orElse(null);
102+
final InputTokensDetails in_details = usage.inputTokensDetails();
103+
final OutputTokensDetails out_details = usage.outputTokensDetails().orElse(null);
102104

103-
final long imageTokens = details == null ? 0 : details.imageTokens();
104-
final long textTokens = details == null ? 0 : details.textTokens();
105+
final long in_imageTokens = out_details == null ? 0 : in_details.imageTokens();
106+
final long in_textTokens = out_details == null ? 0 : in_details.textTokens();
107+
108+
final long out_imageTokens = out_details == null ? 0 : out_details.imageTokens();
109+
final long out_textTokens = out_details == null ? 0 : out_details.textTokens();
105110

106111
return new TokenUsage(
107112
usage.inputTokens(),
108113
usage.outputTokens(),
109114
usage.totalTokens(),
110-
0, 0, 0,
111-
0, imageTokens, 0, textTokens);
115+
in_imageTokens, 0, in_textTokens,
116+
0, out_imageTokens, 0, out_textTokens);
112117
}
113118
}
114119

@@ -137,8 +142,8 @@ public static TokenUsage of(final TranscriptionCreateResponse response) {
137142
tokens.inputTokens(),
138143
tokens.outputTokens(),
139144
tokens.totalTokens(),
140-
0, 0, 0,
141-
0, 0, audioTokens, textTokens);
145+
0, audioTokens, textTokens,
146+
0, 0, 0, 0);
142147
}
143148
}
144149

‎src/main/resources/com/github/jlangch/venice/openai-java.venice‎

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -987,11 +987,11 @@
987987
(openai-java/delete-file client "...file-id...")))
988988
""" )
989989
:see-also '(
990-
"openai-java/list-files"
991-
"openai-java/create-file"
992-
"openai-java/create-binary-file"
993-
"openai-java/retrieve-file"
994-
"openai-java/client") }
990+
"openai-java/list-files"
991+
"openai-java/create-file"
992+
"openai-java/create-binary-file"
993+
"openai-java/retrieve-file"
994+
"openai-java/client") }
995995

996996
delete-file [client id]
997997

@@ -1126,11 +1126,11 @@
11261126
(println "Image #1 saved to ./image-1.png")))
11271127
""")
11281128
:see-also '(
1129-
"openai-java/client"
1130-
"openai-java/edit-image"
1131-
"openai-java/usage"
1132-
"openai-java/image-binaries"
1133-
"openai-java/image-urls") }
1129+
"openai-java/client"
1130+
"openai-java/edit-image"
1131+
"openai-java/usage"
1132+
"openai-java/image-binaries"
1133+
"openai-java/image-urls") }
11341134

11351135
generate-image [client model prompt & options]
11361136

@@ -1281,11 +1281,11 @@
12811281
(println "Image #1 saved to ./sea-otter-edited.png"))))
12821282
""")
12831283
:see-also '(
1284-
"openai-java/client"
1285-
"openai-java/generate-image"
1286-
"openai-java/usage"
1287-
"openai-java/image-binaries"
1288-
"openai-java/image-urls") }
1284+
"openai-java/client"
1285+
"openai-java/generate-image"
1286+
"openai-java/usage"
1287+
"openai-java/image-binaries"
1288+
"openai-java/image-urls") }
12891289

12901290
edit-image [client image mimetype name model prompt & options]
12911291

@@ -1330,8 +1330,8 @@
13301330
Returns a list of image binaries in the response.
13311331
"""
13321332
:see-also '(
1333-
"openai-java/generate-image"
1334-
"openai-java/image-urls") }
1333+
"openai-java/generate-image"
1334+
"openai-java/image-urls") }
13351335

13361336
image-binaries [response]
13371337

@@ -1348,10 +1348,10 @@
13481348
"(image-urls response)" )
13491349
:doc """
13501350
Returns a list of image URLs in the response.
1351-
"""
1351+
"""
13521352
:see-also '(
1353-
"openai-java/generate-image"
1354-
"openai-java/image-binaries") }
1353+
"openai-java/generate-image"
1354+
"openai-java/image-binaries") }
13551355

13561356
image-urls [response]
13571357

@@ -1455,7 +1455,7 @@
14551455
(println "Playing audio supported on MacOS only!")))))
14561456
""")
14571457
:see-also '(
1458-
"openai-java/client") }
1458+
"openai-java/client") }
14591459

14601460
create-speech [client model input & options]
14611461

@@ -1554,9 +1554,9 @@
15541554
(println (openai-java/transcription-text response)))))
15551555
""")
15561556
:see-also '(
1557-
"openai-java/transcription-text"
1558-
"openai-java/usage"
1559-
"openai-java/client") }
1557+
"openai-java/transcription-text"
1558+
"openai-java/usage"
1559+
"openai-java/client") }
15601560

15611561
transcribe [client model file & options]
15621562

@@ -1577,7 +1577,6 @@
15771577
(when prompt (. params :prompt prompt))
15781578
(when response-format (. params :responseFormat (. :AudioResponseFormat response-format)))
15791579
(when temperature (. params :temperature temperature))
1580-
15811580
(-> (. client :audio)
15821581
(. :transcriptions)
15831582
(. :create (. params :build))))))
@@ -1590,7 +1589,7 @@
15901589
Returns the transcription text of transcription response.
15911590
"""
15921591
:see-also '(
1593-
"openai-java/transcribe") }
1592+
"openai-java/transcribe") }
15941593

15951594
transcription-text [response]
15961595

@@ -1620,8 +1619,8 @@
16201619
```
16211620
"""
16221621
:see-also '(
1623-
"openai-java/chat-completion"
1624-
"openai-java/generate-image") }
1622+
"openai-java/chat-completion"
1623+
"openai-java/generate-image") }
16251624

16261625
usage [response]
16271626

@@ -1722,7 +1721,7 @@
17221721
(openai-java/models))
17231722
""")
17241723
:see-also '(
1725-
"openai-java/chat-completion") }
1724+
"openai-java/chat-completion") }
17261725

17271726
models []
17281727

@@ -1778,8 +1777,8 @@
17781777
))
17791778
""" )
17801779
:see-also '(
1781-
"openai-java/chat-completion"
1782-
"openai-java/register-function") }
1780+
"openai-java/chat-completion"
1781+
"openai-java/register-function") }
17831782

17841783
create-function-registry []
17851784

@@ -1805,8 +1804,8 @@
18051804
))
18061805
""" )
18071806
:see-also '(
1808-
"openai-java/chat-completion"
1809-
"openai-java/create-function-registry") }
1807+
"openai-java/chat-completion"
1808+
"openai-java/create-function-registry") }
18101809

18111810
register-function [registry name function]
18121811

0 commit comments

Comments
 (0)