From 89284fcc806b759748c4dae2ceec4c0629d641ba Mon Sep 17 00:00:00 2001 From: DevEmperor <56255079+devemperor@users.noreply.github.com> Date: Mon, 4 Nov 2024 15:12:21 +0100 Subject: [PATCH] feature: added o1 models --- .../net/devemperor/wristassist/adapters/UsageAdapter.java | 2 +- .../net/devemperor/wristassist/util/WristAssistUtil.java | 8 ++++++++ app/src/main/res/values/arrays.xml | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/net/devemperor/wristassist/adapters/UsageAdapter.java b/app/src/main/java/net/devemperor/wristassist/adapters/UsageAdapter.java index da3b4f5..2c2b49b 100644 --- a/app/src/main/java/net/devemperor/wristassist/adapters/UsageAdapter.java +++ b/app/src/main/java/net/devemperor/wristassist/adapters/UsageAdapter.java @@ -38,7 +38,7 @@ public View getView (int position, View convertView, @NonNull ViewGroup parent) modelNameTv.setText(WristAssistUtil.translate(context, dataProvider.getModelName())); TextView tokensTv = listItem.findViewById(R.id.item_usage_tokens_tv); - if (dataProvider.getModelName().startsWith("gpt")) { + if (dataProvider.getModelName().startsWith("gpt") || dataProvider.getModelName().startsWith("o1")) { tokensTv.setText(context.getString(R.string.wristassist_token_usage, String.format(Locale.getDefault(), "%,d", dataProvider.getTokens()))); } else if (dataProvider.getModelName().startsWith("dall-e")) { diff --git a/app/src/main/java/net/devemperor/wristassist/util/WristAssistUtil.java b/app/src/main/java/net/devemperor/wristassist/util/WristAssistUtil.java index 3d03ecd..0aba9d2 100644 --- a/app/src/main/java/net/devemperor/wristassist/util/WristAssistUtil.java +++ b/app/src/main/java/net/devemperor/wristassist/util/WristAssistUtil.java @@ -45,6 +45,14 @@ public static double calcCostChat(String model, long promptTokens, long completi inputPrice = 0.03; outputPrice = 0.06; break; + case "o1-preview": + inputPrice = 0.015; + outputPrice = 0.06; + break; + case "o1-mini": + inputPrice = 0.003; + outputPrice = 0.012; + break; case "gpt-3.5-turbo": inputPrice = 0.0005; outputPrice = 0.0015; diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 05d65d4..3789261 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -5,6 +5,8 @@ GPT-4 Omni GPT-4 Turbo GPT-4 + o1-preview + o1-mini GPT-3.5 Turbo @@ -12,6 +14,8 @@ gpt-4o gpt-4-turbo gpt-4 + o1-preview + o1-mini gpt-3.5-turbo