Skip to content

Commit

Permalink
added new GPT-4 Omni Mini model
Browse files Browse the repository at this point in the history
  • Loading branch information
DevEmperor committed Jul 24, 2024
1 parent c1e667c commit 273a70c
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -258,9 +258,9 @@ private void query(String query) throws JSONException, IOException {
saveResetBtn.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.twotone_change_circle_24_off));
}

String model = sp.getString("net.devemperor.wristassist.model", "gpt-3.5-turbo");
String model = sp.getString("net.devemperor.wristassist.model", "gpt-4o-mini");
if (sp.getBoolean("net.devemperor.wristassist.custom_server", false)) {
model = sp.getString("net.devemperor.wristassist.custom_server_model", "gpt-3.5-turbo");
model = sp.getString("net.devemperor.wristassist.custom_server_model", "gpt-4o-mini");
}
ChatCompletionRequest ccr = ChatCompletionRequest.builder()
.model(model)
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/java/net/devemperor/wristassist/util/Util.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ public static double calcCostChat(String model, long promptTokens, long completi
inputPrice = 0.0005;
outputPrice = 0.0015;
break;
case "gpt-4o-mini":
inputPrice = 0.00015;
outputPrice = 0.0006;
break;
case "gpt-4-turbo-preview":
inputPrice = 0.01;
outputPrice = 0.03;
Expand Down Expand Up @@ -89,6 +93,8 @@ public static String translate(Context context, String origin) {
switch (origin) {
case "gpt-3.5-turbo":
return "GPT-3.5 Turbo";
case "gpt-4o-mini":
return "GPT-4 Omni Mini";
case "gpt-4-turbo-preview":
return "GPT-4 Turbo";
case "gpt-4":
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values/arrays.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@
<resources>
<string-array name="models_chat">
<item name="gpt-3.5-turbo">GPT-3.5 Turbo</item>
<item name="gpt-4o-mini">GPT-4 Omni Mini</item>
<item name="gpt-4o">GPT-4 Omni</item>
<item name="gpt-4-turbo">GPT-4 Turbo</item>
<item name="gpt-4">GPT-4</item>
<item name="gpt-4-32k">GPT-4 32K</item>
</string-array>
<string-array name="models_chat_values">
<item name="gpt-3.5-turbo">gpt-3.5-turbo</item>
<item name="gpt-4o-mini">gpt-4o-mini</item>
<item name="gpt-4o">gpt-4o</item>
<item name="gpt-4-turbo">gpt-4-turbo-preview</item>
<item name="gpt-4">gpt-4</item>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<string name="wristassist_custom_host">Custom host</string>
<string name="wristassist_custom_host_hint" translatable="false">https://api.example.com/</string>
<string name="wristassist_custom_model">Custom model</string>
<string name="wristassist_custom_model_hint" translatable="false">gpt-3.5-turbo</string>
<string name="wristassist_custom_model_hint" translatable="false">gpt-4o-mini</string>
<string name="wristassist_custom_server">Custom API server</string>
<string name="wristassist_invalid_host">Invalid URL format</string>
<string name="wristassist_ai">AI</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/xml/fragment_preferences.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<ListPreference
app:key="net.devemperor.wristassist.model"
app:title="@string/wristassist_select_model"
android:defaultValue="gpt-3.5-turbo"
android:defaultValue="gpt-4o-mini"
app:negativeButtonText="@string/wristassist_cancel"
app:entries="@array/models_chat"
app:entryValues="@array/models_chat_values"
Expand Down

0 comments on commit 273a70c

Please sign in to comment.