diff --git a/src/message.tsx b/src/message.tsx index 1d1f32a..1e95ac8 100644 --- a/src/message.tsx +++ b/src/message.tsx @@ -218,7 +218,7 @@ export default function Message(props: Props) { chatStore.history.splice(messageIndex, 1); chatStore.postBeginIndex = Math.max( chatStore.postBeginIndex - 1, - 0, + 0 ); //chatStore.totalTokens = chatStore.totalTokens = 0; diff --git a/src/pages/App.tsx b/src/pages/App.tsx index 7ce3b37..4cb1ca9 100644 --- a/src/pages/App.tsx +++ b/src/pages/App.tsx @@ -5,12 +5,14 @@ import "@/global.css"; import { calculate_token_length } from "@/chatgpt"; import { getDefaultParams } from "@/utils/getDefaultParam"; import ChatBOX from "@/pages/Chatbox"; +import { models } from "@/types/models"; import { DefaultModel } from "@/const"; import { Tr, langCodeContext, LANG_OPTIONS } from "@/translate"; import { ChatStore } from "@/types/chatstore"; import { newChatStore } from "@/types/newChatstore"; import { STORAGE_NAME, STORAGE_NAME_SELECTED } from "@/const"; import { upgrade } from "@/indexedDB/upgrade"; +import { getTotalCost } from "@/utils/totalCost"; import { Sidebar, @@ -41,8 +43,33 @@ import { AlertDialogTrigger, } from "@/components/ui/alert-dialog"; +import { + Menubar, + MenubarContent, + MenubarItem, + MenubarMenu, + MenubarSeparator, + MenubarShortcut, + MenubarTrigger, +} from "@/components/ui/menubar"; + +import { + Popover, + PopoverContent, + PopoverTrigger, +} from "@/components/ui/popover"; + import { useToast } from "@/hooks/use-toast"; import { Separator } from "@/components/ui/separator"; +import { + BoxesIcon, + ArrowUpDownIcon, + CircleDollarSignIcon, + ScissorsIcon, + WholeWordIcon, + EllipsisIcon, +} from "lucide-react"; +import { Badge } from "@/components/ui/badge"; export function App() { // init selected index @@ -284,7 +311,87 @@ export function App() {
+ Tokens: {chatStore.totalTokens}/{chatStore.maxTokens} +
++ Cut(s): {chatStore.postBeginIndex}/ + {chatStore.history.filter(({ hide }) => !hide).length} +
++ Cost: ${chatStore.cost.toFixed(4)} / $ + {getTotalCost().toFixed(2)} +
+