chore: better place for calculateInputTokens utility function

smallcloudai · Feb 21, 2025 · fc475d4 · fc475d4
1 parent 4c44946
commit fc475d4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/refact-agent/gui/src/components/ChatContent/UsageCounter/UsageCounter.tsx b/refact-agent/gui/src/components/ChatContent/UsageCounter/UsageCounter.tsx
@@ -1,10 +1,12 @@
 import React from "react";
 import { Card, Flex, HoverCard, Text } from "@radix-ui/themes";
 import { ArrowDownIcon, ArrowUpIcon } from "@radix-ui/react-icons";
+
 import { ScrollArea } from "../../ScrollArea";
-import { Usage } from "../../../services/refact";
+import { calculateUsageInputTokens } from "../../../utils/calculateUsageInputTokens";
+import type { Usage } from "../../../services/refact";
+
 import styles from "./UsageCounter.module.css";
-import { calculateInputTokens } from "./UsageCounter.utils";
 
 type UsageCounterProps = {
   usage: Usage;
@@ -31,12 +33,12 @@ const TokenDisplay: React.FC<{ label: string; value: number }> = ({
 );
 
 export const UsageCounter: React.FC<UsageCounterProps> = ({ usage }) => {
-  const inputTokens = calculateInputTokens(usage, [
+  const inputTokens = calculateUsageInputTokens(usage, [
     "prompt_tokens",
     "cache_creation_input_tokens",
     "cache_read_input_tokens",
   ]);
-  const outputTokens = calculateInputTokens(usage, ["completion_tokens"]);
+  const outputTokens = calculateUsageInputTokens(usage, ["completion_tokens"]);
 
   return (
     <HoverCard.Root>

diff --git a/refact-agent/gui/src/features/Chat/Thread/reducer.ts b/refact-agent/gui/src/features/Chat/Thread/reducer.ts
@@ -43,7 +43,7 @@ import {
   isToolCallMessage,
   validateToolCall,
 } from "../../../services/refact";
-import { calculateInputTokens } from "../../../components/ChatContent/UsageCounter/UsageCounter.utils";
+import { calculateUsageInputTokens } from "../../../utils/calculateUsageInputTokens";
 
 const RECOMMENDED_MAXIMUM_PROMPT_TOKENS_AMOUNT = 30000;
 
@@ -228,7 +228,7 @@ export const chatReducer = createReducer(initialState, (builder) => {
     const { usage } = action.payload;
     state.thread.usage = usage;
 
-    const inputTokensAmount = calculateInputTokens(usage, [
+    const inputTokensAmount = calculateUsageInputTokens(usage, [
       "prompt_tokens",
       "cache_creation_input_tokens",
       "cache_read_input_tokens",

diff --git a/...ontent/UsageCounter/UsageCounter.utils.ts → ...ui/src/utils/calculateUsageInputTokens.ts b/...ontent/UsageCounter/UsageCounter.utils.ts → ...ui/src/utils/calculateUsageInputTokens.ts
@@ -1,6 +1,6 @@
-import { Usage } from "../../../services/refact";
+import { Usage } from "../services/refact";
 
-export const calculateInputTokens = (
+export const calculateUsageInputTokens = (
   usage: Usage,
   keys: (keyof Usage)[],
 ): number =>