Skip to content

Commit 85c2871

Browse files
committed
refactor(TokenCount): get max tokens from models object
1 parent 09be187 commit 85c2871

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

app/components/TokenCount.tsx

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ import { atom, useAtom, useAtomValue } from 'jotai';
33
import { atomWithStorage } from 'jotai/utils';
44
import { memo, useEffect, useMemo } from 'react';
55

6+
import { modelFromName } from '@/app/utils/models';
67
import { getTokenCount } from '@/app/utils/tokens';
78

89
import { parametersAtom } from '@/app/components/Parameters';
910

10-
const systemMessageMaxTokens = 400;
11+
const systemMessageMaxTokens = 4096;
1112

1213
export const tokensAtom = atomWithStorage('tokens', {
1314
input: 0,
@@ -20,15 +21,11 @@ export const tokensAtom = atomWithStorage('tokens', {
2021
interface TokenCountProps {
2122
input?: string;
2223
systemMessage: string;
23-
display?: "input" | "systemMessage";
24+
display?: 'input' | 'systemMessage';
2425
}
2526

2627
export const TokenCount = memo(
27-
({
28-
input = '',
29-
systemMessage,
30-
display = 'input'
31-
}: TokenCountProps) => {
28+
({ input = '', systemMessage, display = 'input' }: TokenCountProps) => {
3229
const inputTokensAtom = atom(0);
3330
const systemMessageTokensAtom = atom(0);
3431
const remainingTokensAtom = atom(16384);
@@ -43,7 +40,8 @@ export const TokenCount = memo(
4340
remainingSystemTokensAtom
4441
);
4542
const parameters = useAtomValue(parametersAtom);
46-
const maxTokens = parameters.model.includes('gpt-4') ? 128000 : 16384;
43+
const model = modelFromName(parameters.model);
44+
const maxTokens = model?.maxInputTokens || 16384;
4745
const [tokens, setTokens] = useAtom(tokensAtom);
4846

4947
useEffect(() => {

0 commit comments

Comments
 (0)