feat: change token get

fix: file name lower case
feat: mock 4 button
2025-02-24 10:17:05 +08:00 · 2025-02-24 10:05:06 +08:00 · 2025-02-24 10:02:12 +08:00 · 2025-02-24 10:02:12 +08:00 · 2025-02-24 09:23:19 +08:00 · 2025-02-24 08:36:42 +08:00
11 changed files with 264 additions and 150 deletions
--- a/src/assets/locale/en/option.json
+++ b/src/assets/locale/en/option.json
@ -1,30 +1,30 @@
 {
-  "newChat": "New Chat",
-  "selectAPrompt": "Select a Prompt",
-  "githubRepository": "GitHub Repository",
-  "settings": "Settings",
-  "metering": "Metering",
-  "sidebarTitle": "Chat History",
-  "error": "Error",
-  "somethingWentWrong": "Something went wrong",
-  "validationSelectModel": "Please select a model to continue",
-  "deleteHistoryConfirmation": "Are you sure you want to delete this history?",
-  "editHistoryTitle": "Enter a new title",
-  "temporaryChat": "Temporary Chat",
-  "more": {
-    "copy": {
-      "group": "Copy",
-      "asText": "Copy as Text",
-      "asMarkdown": "Copy as Markdown",
-      "success": "Copied to clipboard!"
-    },
-    "download": {
-      "group": "Download",
-      "text": "Text File (.txt)",
-      "markdown": "Markdown (.md)",
-      "json": "JSON File (.json)",
-      "image": "Image (.png)"
-    },
-    "share": "Share"
-  }
-}
+    "newChat": "New Chat",
+    "selectAPrompt": "Select a Prompt",
+    "githubRepository": "GitHub Repository",
+    "settings": "Settings",
+    "metering": "Metering",
+    "sidebarTitle": "Chat History",
+    "error": "Error",
+    "somethingWentWrong": "Something went wrong",
+    "validationSelectModel": "Please select a model to continue",
+    "deleteHistoryConfirmation": "Are you sure you want to delete this history?",
+    "editHistoryTitle": "Enter a new title",
+    "temporaryChat": "Temporary Chat",
+    "more": {
+        "copy": {
+            "group": "Copy",
+            "asText": "Copy as Text",
+            "asMarkdown": "Copy as Markdown",
+            "success": "Copied to clipboard!"
+        },
+        "download": {
+            "group": "Download",
+            "text": "Text File (.txt)",
+            "markdown": "Markdown (.md)",
+            "json": "JSON File (.json)",
+            "image": "Image (.png)"
+        },
+        "share": "Share"
+    }
+}
--- a/src/assets/locale/zh/option.json
+++ b/src/assets/locale/zh/option.json
@ -1,29 +1,29 @@
 {
-  "newChat": "新聊天",
-  "selectAPrompt": "选择一个提示词",
-  "githubRepository": "GitHub 仓库",
-  "settings": "设置",
-  "metering": "计量",
-  "sidebarTitle": "聊天历史",
-  "error": "错误",
-  "somethingWentWrong": "出现了错误",
-  "validationSelectModel": "请选择一个模型以继续",
-  "deleteHistoryConfirmation": "你确定要删除这个历史记录吗？",
-  "editHistoryTitle": "输入一个新的标题",
-  "temporaryChat": "临时聊天",
-  "more": {
-    "copy": {
-      "group": "复制",
-      "asText": "复制为文本",
-      "asMarkdown": "复制为 Markdown",
-      "success": "已复制到剪贴板！"
-    },
-    "download": {
-      "group": "下载",
-      "text": "文本文件 (.txt)",
-      "markdown": "Markdown 文件 (.md)",
-      "json": "JSON 文件 (.json)"
-    },
-    "share": "分享"
-  }
-}
+    "newChat": "新聊天",
+    "selectAPrompt": "选择一个提示词",
+    "githubRepository": "GitHub 仓库",
+    "settings": "设置",
+    "metering": "计量",
+    "sidebarTitle": "聊天历史",
+    "error": "错误",
+    "somethingWentWrong": "出现了错误",
+    "validationSelectModel": "请选择一个模型以继续",
+    "deleteHistoryConfirmation": "你确定要删除这个历史记录吗？",
+    "editHistoryTitle": "输入一个新的标题",
+    "temporaryChat": "临时聊天",
+    "more": {
+        "copy": {
+            "group": "复制",
+            "asText": "复制为文本",
+            "asMarkdown": "复制为 Markdown",
+            "success": "已复制到剪贴板！"
+        },
+        "download": {
+            "group": "下载",
+            "text": "文本文件 (.txt)",
+            "markdown": "Markdown 文件 (.md)",
+            "json": "JSON 文件 (.json)"
+        },
+        "share": "分享"
+    }
+}
--- a/src/components/Common/Playground/Message.tsx
+++ b/src/components/Common/Playground/Message.tsx
@ -9,7 +9,12 @@ import {
  Pen,
  PlayIcon,
  RotateCcw,
-  Square
+  Square,
+  Star,
+  ThumbsUp,
+  ThumbsDown,
+  MessageSquareShare,
+  ArrowUpSquare
 } from "lucide-react"
 import { EditMessageForm } from "./EditMessageForm"
 import { useTranslation } from "react-i18next"
@ -316,6 +321,51 @@ export const PlaygroundMessage = (props: Props) => {
                  </button>
                </Tooltip>
              )}
+              { (
+                <Tooltip title="收藏">
+                  <button
+                    aria-label="收藏"
+                    className="flex items-center justify-center w-6 h-6 rounded-full bg-gray-100 dark:bg-gray-800 hover:bg-gray-200 dark:hover:bg-gray-700 transition-colors duration-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-500">
+                    <Star className="w-3 h-3 text-gray-400 group-hover:text-gray-500" />
+                  </button>
+                </Tooltip>
+              )}
+              { (
+                <Tooltip title="发布语用">
+                  <button
+                    aria-label="发布语用"
+                    className="flex items-center justify-center w-6 h-6 rounded-full bg-gray-100 dark:bg-gray-800 hover:bg-gray-200 dark:hover:bg-gray-700 transition-colors duration-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-500">
+                    <ArrowUpSquare className="w-3 h-3 text-gray-400 group-hover:text-gray-500" />
+                  </button>
+                </Tooltip>
+              )}
+              { (
+                <Tooltip title="发布对话">
+                  <button
+                    aria-label="发布对话"
+                    className="flex items-center justify-center w-6 h-6 rounded-full bg-gray-100 dark:bg-gray-800 hover:bg-gray-200 dark:hover:bg-gray-700 transition-colors duration-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-500">
+                    <MessageSquareShare className="w-3 h-3 text-gray-400 group-hover:text-gray-500" />
+                  </button>
+                </Tooltip>
+              )}
+              { (
+                <Tooltip title="点赞">
+                  <button
+                    aria-label="点赞"
+                    className="flex items-center justify-center w-6 h-6 rounded-full bg-gray-100 dark:bg-gray-800 hover:bg-gray-200 dark:hover:bg-gray-700 transition-colors duration-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-500">
+                    <ThumbsUp className="w-3 h-3 text-gray-400 group-hover:text-gray-500" />
+                  </button>
+                </Tooltip>
+              )}
+              { (
+                <Tooltip title="点踩">
+                  <button
+                    aria-label="点踩"
+                    className="flex items-center justify-center w-6 h-6 rounded-full bg-gray-100 dark:bg-gray-800 hover:bg-gray-200 dark:hover:bg-gray-700 transition-colors duration-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-500">
+                    <ThumbsDown className="w-3 h-3 text-gray-400 group-hover:text-gray-500" />
+                  </button>
+                </Tooltip>
+              )}
            </div>
          ) : (
            // add invisible div to prevent layout shift
--- a/src/components/Layouts/Header.tsx
+++ b/src/components/Layouts/Header.tsx
@ -5,7 +5,7 @@ import {
  ChevronRight,
  CogIcon,
  ComputerIcon,
-  Slice,
+  GaugeCircle,
  GithubIcon,
  PanelLeftIcon,
  ZapIcon
@ -245,7 +245,7 @@ export const Header: React.FC<Props> = ({
              <NavLink
                to="/metering"
                className="!text-gray-500 dark:text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 transition-colors">
-                <Slice className="w-6 h-6" />
+                <GaugeCircle className="w-6 h-6" />
              </NavLink>
            </Tooltip>
          </div>
--- a/src/components/Option/Metering/detail.tsx
+++ b/src/components/Option/Metering/detail.tsx
@ -1,10 +1,10 @@
 import React, { useMemo } from "react"
-import { ChatMessage, useStoreMessageOption } from "@/store/option"
+import { MeteringEntry, useStoreMessageOption } from "@/store/option"
 import { Card, List, Table, Tag, Space, TableProps, Tooltip } from "antd"
 import { NavLink } from "react-router-dom"
 import { formatDate } from "@/utils/date"

-const columns: TableProps<ChatMessage>["columns"] = [
+const columns: TableProps<MeteringEntry>["columns"] = [
  {
    title: '序号',
    key: 'index',
@ -32,8 +32,8 @@ const columns: TableProps<ChatMessage>["columns"] = [
  },
  {
    title: "思维链",
-    key: "thinkingChain",
-    dataIndex: "thinkingChain",
+    key: "cot",
+    dataIndex: "cot",
    ellipsis: {
      showTitle: false
    },
@ -66,8 +66,8 @@ const columns: TableProps<ChatMessage>["columns"] = [
  },
  {
    title: "数联网token",
-    dataIndex: "iodDataTokenCount",
-    key: "iodDataTokenCount"
+    dataIndex: "iodTokenCount",
+    key: "iodTokenCount"
  },
  {
    title: "大模型token",
@ -108,17 +108,17 @@ const columns: TableProps<ChatMessage>["columns"] = [
 ]

 export const MeteringDetail = () => {
-  const { chatMessages } = useStoreMessageOption()
+  const { meteringEntries } = useStoreMessageOption()

  const data = useMemo(
    () => [
      {
        key: "对话数量",
-        value: chatMessages.length
+        value: meteringEntries.length
      },
      {
        key: "数联网输入token数",
-        value: chatMessages.reduce((acc, cur) => {
+        value: meteringEntries.reduce((acc, cur) => {
          for (const item of cur.iodKeywords) {
            acc += item.length
          }
@ -127,24 +127,24 @@ export const MeteringDetail = () => {
      },
      {
        key: "数联网输出token数",
-        value: chatMessages.reduce((acc, cur) => acc + cur.iodDataTokenCount, 0)
+        value: meteringEntries.reduce((acc, cur) => acc + cur.iodTokenCount, 0)
      },
      {
        key: "大模型输入token数",
-        value: chatMessages.reduce(
+        value: meteringEntries.reduce(
          (acc, cur) => acc + cur.modelInputTokenCount,
          0
        )
      },
      {
        key: "大模型输出token数",
-        value: chatMessages.reduce(
+        value: meteringEntries.reduce(
          (acc, cur) => acc + cur.modelOutputTokenCount,
          0
        )
      }
    ],
-    [chatMessages]
+    [meteringEntries]
  )
  return (
    <div className="p-4  pt-[4rem]">
@ -159,7 +159,7 @@ export const MeteringDetail = () => {
        )}
      />

-      <Table<ChatMessage> columns={columns} dataSource={chatMessages} />
+      <Table<MeteringEntry> columns={columns} dataSource={meteringEntries} />
    </div>
  )
 }
--- a/src/components/Option/Metering/listDetail.tsx
+++ b/src/components/Option/Metering/listDetail.tsx
@ -61,11 +61,11 @@ const columns: TableProps<DataType>["columns"] = [
 ]

 export const ListDetail = () => {
-  const { chatMessages } = useStoreMessageOption()
+  const { meteringEntries } = useStoreMessageOption()
  const { id } = useParams()
  const record = useMemo(
-    () => chatMessages.find((item) => item.id === id),
-    [chatMessages]
+    () => meteringEntries.find((item) => item.id === id),
+    [meteringEntries]
  )

  const modelData = useMemo(
--- a/src/hooks/useMessageOption.tsx
+++ b/src/hooks/useMessageOption.tsx
@ -8,7 +8,7 @@ import {
  promptForRag,
  systemPromptForNonRagOption
 } from "~/services/ollama"
-import { type ChatHistory, ChatMessage, type Message } from "~/store/option"
+import type { ChatHistory, Message, MeteringEntry } from "~/store/option"
 import { SystemMessage } from "@langchain/core/messages"
 import { useStoreMessageOption } from "~/store/option"
 import {
@ -55,8 +55,8 @@ export const useMessageOption = () => {
  const {
    history,
    setHistory,
-    chatMessages,
-    setChatMessages,
+    meteringEntries,
+    setMeteringEntries,
    setStreaming,
    streaming,
    setIsFirstMessage,
@ -114,23 +114,24 @@ export const useMessageOption = () => {
      setWebSearch(true)
    }
  }
-  // 从最后的结果中解析出 思维链 和 结果
+
+  // 从最后的结果中解析出 思维链 (Chain-of-Thought) 和 结果
  const responseResolver = (msg: string) => {
-    const thinkStart = msg.indexOf("<think>")
-    const thinkEnd = msg.indexOf("</think>")
-    let think = ""
+    const cotStart = msg.indexOf("<think>")
+    const cotEnd = msg.indexOf("</think>")
+    let cot = ""
    let content = ""
-    if (thinkStart > -1 && thinkEnd > -1) {
-      think = msg.substring(thinkStart + 7, thinkEnd)
-      content = msg.substring(thinkEnd + 8)
+    if (cotStart > -1 && cotEnd > -1) {
+      cot = msg.substring(cotStart + 7, cotEnd)
+      content = msg.substring(cotEnd + 8)
    } else {
      content = msg
    }
    // 去掉换行符
-    think = think.replace(/\n/g, "")
+    cot = cot.replace(/\n/g, "")
    content = content.replace(/\n/g, "")
    return {
-      think,
+      cot: cot,
      content
    }
  }
@ -190,11 +191,11 @@ export const useMessageOption = () => {
    })
    let newMessage: Message[] = []
    let generateMessageId = generateID()
-    const chatMessage: ChatMessage = {
+    const meter: MeteringEntry = {
      id: generateMessageId,
      queryContent: message,
      date: new Date()
-    } as ChatMessage
+    } as MeteringEntry

    if (!isRegenerate) {
      newMessage = [
@ -317,14 +318,14 @@ export const useMessageOption = () => {
          .map((k) => k.trim())
      }

-      const { prompt, webSources, iodSources, iodData, iodDataTokenCount } =
+      const { prompt, webSources, iodSources, iodSearchResults: iodData, iodTokenCount } =
        await getSystemPromptForWeb(query, keywords, webSearch, iodSearch)
      console.log("prompt:\n" + prompt)
      setIsSearchingInternet(false)
-      chatMessage.prompt = prompt
-      chatMessage.iodKeywords = keywords
-      chatMessage.iodData = iodData
-      chatMessage.iodDataTokenCount = iodDataTokenCount
+      meter.prompt = prompt
+      meter.iodKeywords = keywords
+      meter.iodData = iodData
+      meter.iodTokenCount = iodTokenCount

      //  message = message.trim().replaceAll("\n", " ")

@ -385,6 +386,7 @@ export const useMessageOption = () => {
        }
      )
      let count = 0
+      const chatStartTime = new Date()
      let reasoningStartTime: Date | undefined = undefined
      let reasoningEndTime: Date | undefined = undefined
      let apiReasoning = false
@ -485,16 +487,22 @@ export const useMessageOption = () => {
      setIsProcessing(false)
      setStreaming(false)

-      chatMessage.modelInputTokenCount = prompt.length
-      chatMessage.modelOutputTokenCount = fullText.length
-      chatMessage.model = ollama.modelName
-      chatMessage.relatedDataCount = iodData?.length ?? 0
-      chatMessage.timeTaken = new Date().getTime() - chatMessage.date.getTime()
-      const { think, content } = responseResolver(fullText)
-      chatMessage.thinkingChain = think
-      chatMessage.responseContent = content
-      chatMessage.modelResponseContent = fullText
-      setChatMessages([chatMessage, ...chatMessages])
+      // Save metering entry
+      const { cot, content } = responseResolver(fullText)
+      setMeteringEntries([ {
+        ...meter,
+        modelInputTokenCount: prompt.length,
+        modelOutputTokenCount: fullText.length,
+        model: ollama.modelName,
+        relatedDataCount: iodData?.length ?? 0,
+        timeTaken: new Date().getTime() - meter.date.getTime(),
+        date: chatStartTime,
+        cot,
+        responseContent: content,
+        modelResponseContent: fullText,
+      },
+        ...meteringEntries,
+      ])
    } catch (e) {
      const errorSave = await saveMessageOnError({
        e,
--- a/src/store/option.tsx
+++ b/src/store/option.tsx
@ -30,49 +30,13 @@ export type ChatHistory = {
  messageType?: string
 }[]

-export type ChatMessage = {
-  id: string
-  // 问题
-  queryContent: string
-  // 提示词全文
-  prompt: string
-  // 思维链(只有深度思考时有)
-  thinkingChain?: string
-  // 回答
-  responseContent: string
-  // 关联数据个数
-  relatedDataCount: number
-  // 数联网输入token
-  iodInputToken: string
-  // 数联网输出token
-  iodOutputToken: string
-  // 大模型输入token数量
-  modelInputTokenCount: number
-  // 大模型输出token数量
-  modelOutputTokenCount: number
-  // 日期
-  date: Date
-  // 耗时
-  timeTaken: number
-  // 大模型回答的全部内容
-  modelResponseContent: string
-  // iod的全部内容的token数量
-  iodDataTokenCount: number
-  // iod返回的数据
-  iodData: any[]
-  // iod keywords
-  iodKeywords: string[]
-  // 模型
-  model: string
-}
-
 type State = {
  messages: Message[]
  setMessages: (messages: Message[]) => void
  history: ChatHistory
  setHistory: (history: ChatHistory) => void
-  chatMessages: ChatMessage[]
-  setChatMessages: (chatMessages: ChatMessage[]) => void
+  meteringEntries: MeteringEntry[]
+  setMeteringEntries: (meteringEntries: MeteringEntry[]) => void
  streaming: boolean
  setStreaming: (streaming: boolean) => void
  isFirstMessage: boolean
@ -115,13 +79,49 @@ type State = {
  setUseOCR: (useOCR: boolean) => void
 }

+export type MeteringEntry = {
+  id: string
+  // 问题
+  queryContent: string
+  // 提示词全文
+  prompt: string
+  // 思维链(只有深度思考时有)
+  cot?: string
+  // 回答
+  responseContent: string
+  // 关联数据个数
+  relatedDataCount: number
+  // 数联网输入token
+  iodInputToken: string
+  // 数联网输出token
+  iodOutputToken: string
+  // 大模型输入token数量
+  modelInputTokenCount: number
+  // 大模型输出token数量
+  modelOutputTokenCount: number
+  // 日期
+  date: Date
+  // 耗时
+  timeTaken: number
+  // 大模型回答的全部内容
+  modelResponseContent: string
+  // iod的全部内容的token数量
+  iodTokenCount: number
+  // iod返回的数据
+  iodData: any[]
+  // iod keywords
+  iodKeywords: string[]
+  // 模型
+  model: string
+}
+
 export const useStoreMessageOption = create<State>((set) => ({
  messages: [],
  setMessages: (messages) => set({ messages }),
  history: [],
  setHistory: (history) => set({ history }),
-  chatMessages: [],
-  setChatMessages: (chatMessages) => set({ chatMessages }),
+  meteringEntries: [],
+  setMeteringEntries: (meteringEntries) => set({ meteringEntries }),
  streaming: false,
  setStreaming: (streaming) => set({ streaming }),
  isFirstMessage: true,
--- a/src/web/1.json
+++ b/src/web/1.json
@ -0,0 +1,21 @@
+{
+	"action": "executeContract",
+	"contractID": "BDBrowser",
+	"operation": "sendRequestDirectly",
+	"arg": {
+		"id": "670E241C9937B3537047C87053E3AA36",
+		"doipUrl": "tcp://reg01.public.internetofdata.cn:21037",
+		"op": "Search",
+		"attributes": {
+			"offset": 2100,
+			"count": 5,
+			"bodyBase64Encoded": false,
+			"searchMode": [
+				{ "key": "data_type", "type": "MUST", "value": "paper" },
+				{ "key": "title", "type": "MUST", "value": "Number_1" },
+				{ "key": "description", "type": "MUST", "value": "Number_1" }
+			]
+		},
+		"body": ""
+	}
+}
--- a/src/web/2.ts
+++ b/src/web/2.ts
@ -0,0 +1,33 @@
+const ollama = await pageAssistModel({
+  model: selectedModel!,
+  baseUrl: cleanUrl(url),
+  keepAlive:
+    currentChatModelSettings?.keepAlive ?? userDefaultModelSettings?.keepAlive,
+  temperature:
+    currentChatModelSettings?.temperature ??
+    userDefaultModelSettings?.temperature,
+  topK: currentChatModelSettings?.topK ?? userDefaultModelSettings?.topK,
+  topP: currentChatModelSettings?.topP ?? userDefaultModelSettings?.topP,
+  numCtx: currentChatModelSettings?.numCtx ?? userDefaultModelSettings?.numCtx,
+  seed: currentChatModelSettings?.seed,
+  numGpu: currentChatModelSettings?.numGpu ?? userDefaultModelSettings?.numGpu,
+  numPredict:
+    currentChatModelSettings?.numPredict ??
+    userDefaultModelSettings?.numPredict,
+  useMMap:
+    currentChatModelSettings?.useMMap ?? userDefaultModelSettings?.useMMap,
+  minP: currentChatModelSettings?.minP ?? userDefaultModelSettings?.minP,
+  repeatLastN:
+    currentChatModelSettings?.repeatLastN ??
+    userDefaultModelSettings?.repeatLastN,
+  repeatPenalty:
+    currentChatModelSettings?.repeatPenalty ??
+    userDefaultModelSettings?.repeatPenalty,
+  tfsZ: currentChatModelSettings?.tfsZ ?? userDefaultModelSettings?.tfsZ,
+  numKeep:
+    currentChatModelSettings?.numKeep ?? userDefaultModelSettings?.numKeep,
+  numThread:
+    currentChatModelSettings?.numThread ?? userDefaultModelSettings?.numThread,
+  useMlock:
+    currentChatModelSettings?.useMlock ?? userDefaultModelSettings?.useMlock
+})
--- a/src/web/web.ts
+++ b/src/web/web.ts
@ -101,8 +101,8 @@ export const getSystemPromptForWeb = async (
          name: res.name,
          url: res.url,
          data_space: res.data_space,
+          content: res.content || res.description,
          tokenCount: (res.content || res.description)?.length ?? 0,
-          content: res.content || res.description
        }))

    const iod_search_results = _iodSearchResults
@ -140,15 +140,17 @@ export const getSystemPromptForWeb = async (
        }
      }),
      iodSources: iodSearchResults,
-      iodData: _iodSearchResults,
-      iodDataTokenCount: _iodSearchResults.reduce((acc, cur) => (acc + cur.content.length), 0)
+      iodSearchResults: _iodSearchResults,
+      iodTokenCount: _iodSearchResults.reduce((acc, cur) => (acc + cur.content.length), 0)
    }
  } catch (e) {
    console.error(e)
    return {
      prompt: "",
      webSources: [],
-      iodSources: []
+      iodSources: [],
+      iodSearchResults: [],
+      iodTokenCount: 0,
    }
  }
 }
Author	SHA1	Message	Date
zhaoweijie	c5fa739a95	feat: change token get	2025-02-24 10:17:05 +08:00
CaiHQ	70d1f40333	fix: file name lower case	2025-02-24 10:05:06 +08:00
CaiHQ	2866bcc7af	feat: mock 4 button	2025-02-24 10:02:12 +08:00
CaiHQ	2a57034c9d	feat: change filename	2025-02-24 10:02:12 +08:00
Nex Zhu	79a03ab6fc	fix: file name case	2025-02-24 09:23:19 +08:00
Nex Zhu	50f9e4354f	fix	2025-02-24 08:36:42 +08:00
Nex Zhu	8f27ca2e4e	fix: fix no meteringEntry date when no cot, and style	2025-02-24 08:30:37 +08:00
Nex Zhu	ce333714b7	style: revert locale json format	2025-02-23 22:22:43 +08:00