@lobehub/chat 0.154.7 → 0.155.1

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # Changelog
 
+### [Version 0.155.1](https://github.com/lobehub/lobe-chat/compare/v0.155.0...v0.155.1)
+
+<sup>Released on **2024-05-07**</sup>
+
+#### 💄 Styles
+
+- **misc**: Improve llm list when all closed.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Styles
+
+- **misc**: Improve llm list when all closed, closes [#2409](https://github.com/lobehub/lobe-chat/issues/2409) ([1eb20c7](https://github.com/lobehub/lobe-chat/commit/1eb20c7))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+## [Version 0.155.0](https://github.com/lobehub/lobe-chat/compare/v0.154.7...v0.155.0)
+
+<sup>Released on **2024-05-07**</sup>
+
+#### ✨ Features
+
+- **misc**: Add DataStatistics.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's improved
+
+- **misc**: Add DataStatistics ([cf474bb](https://github.com/lobehub/lobe-chat/commit/cf474bb))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 0.154.7](https://github.com/lobehub/lobe-chat/compare/v0.154.6...v0.154.7)
 
 <sup>Released on **2024-05-07**</sup>

package/locales/ar/common.json

@@ -12,6 +12,12 @@
   "copy": "نسخ",
   "copyFail": "فشل في النسخ",
   "copySuccess": "تم النسخ بنجاح",
+  "dataStatistics": {
+    "messages": "رسائل",
+    "sessions": "جلسات",
+    "today": "اليوم",
+    "topics": "مواضيع"
+  },
   "defaultAgent": "مساعد افتراضي",
   "defaultSession": "جلسة افتراضية",
   "delete": "حذف",

package/locales/bg-BG/common.json

@@ -12,6 +12,12 @@
   "copy": "Копирай",
   "copyFail": "Копирането не е успешно",
   "copySuccess": "Копирано успешно",
+  "dataStatistics": {
+    "messages": "Съобщения",
+    "sessions": "Сесии",
+    "today": "Днес",
+    "topics": "Теми"
+  },
   "defaultAgent": "Агент по подразбиране",
   "defaultSession": "Агент по подразбиране",
   "delete": "Изтрий",

package/locales/de-DE/common.json

@@ -12,6 +12,12 @@
   "copy": "Kopieren",
   "copyFail": "Kopieren fehlgeschlagen",
   "copySuccess": "Kopieren erfolgreich",
+  "dataStatistics": {
+    "messages": "Nachrichten",
+    "sessions": "Sitzungen",
+    "today": "Heute",
+    "topics": "Themen"
+  },
   "defaultAgent": "Standardassistent",
   "defaultSession": "Standardassistent",
   "delete": "Löschen",

package/locales/en-US/common.json

@@ -12,6 +12,12 @@
   "copy": "Copy",
   "copyFail": "Copy failed",
   "copySuccess": "Copied successfully",
+  "dataStatistics": {
+    "messages": "Messages",
+    "sessions": "Assistants",
+    "today": "Today's New",
+    "topics": "Topics"
+  },
   "defaultAgent": "Default Agent",
   "defaultSession": "Default Agent",
   "delete": "Delete",

package/locales/es-ES/common.json

@@ -12,6 +12,12 @@
   "copy": "Copiar",
   "copyFail": "Fallo al copiar",
   "copySuccess": "¡Copia exitosa!",
+  "dataStatistics": {
+    "messages": "Mensajes",
+    "sessions": "Sesiones",
+    "today": "Hoy",
+    "topics": "Temas"
+  },
   "defaultAgent": "Asistente predeterminado",
   "defaultSession": "Sesión predeterminada",
   "delete": "Eliminar",

package/locales/fr-FR/common.json

@@ -12,6 +12,12 @@
   "copy": "Copier",
   "copyFail": "Échec de la copie",
   "copySuccess": "Copie réussie",
+  "dataStatistics": {
+    "messages": "Messages",
+    "sessions": "Sessions",
+    "today": "Aujourd'hui",
+    "topics": "Sujets"
+  },
   "defaultAgent": "Agent par défaut",
   "defaultSession": "Session par défaut",
   "delete": "Supprimer",

package/locales/it-IT/common.json

@@ -12,6 +12,12 @@
   "copy": "Copia",
   "copyFail": "Copia non riuscita",
   "copySuccess": "Copia riuscita",
+  "dataStatistics": {
+    "messages": "Messaggi",
+    "sessions": "Sessioni",
+    "today": "Oggi",
+    "topics": "Argomenti"
+  },
   "defaultAgent": "Assistente predefinito",
   "defaultSession": "Sessione predefinita",
   "delete": "Elimina",

package/locales/ja-JP/common.json

@@ -12,6 +12,12 @@
   "copy": "コピー",
   "copyFail": "コピーに失敗しました",
   "copySuccess": "コピーが成功しました",
+  "dataStatistics": {
+    "messages": "メッセージ",
+    "sessions": "セッション",
+    "today": "今日の追加",
+    "topics": "トピック"
+  },
   "defaultAgent": "デフォルトエージェント",
   "defaultSession": "デフォルトセッション",
   "delete": "削除",

package/locales/ko-KR/common.json

@@ -12,6 +12,12 @@
   "copy": "복사",
   "copyFail": "복사 실패",
   "copySuccess": "복사 성공",
+  "dataStatistics": {
+    "messages": "메시지",
+    "sessions": "세션",
+    "today": "오늘",
+    "topics": "주제"
+  },
   "defaultAgent": "기본 에이전트",
   "defaultSession": "기본 세션",
   "delete": "삭제",

package/locales/nl-NL/common.json

@@ -12,6 +12,12 @@
   "copy": "Kopiëren",
   "copyFail": "Kopiëren mislukt",
   "copySuccess": "Kopiëren gelukt",
+  "dataStatistics": {
+    "messages": "Berichten",
+    "sessions": "Sessies",
+    "today": "Vandaag",
+    "topics": "Onderwerpen"
+  },
   "defaultAgent": "Standaard assistent",
   "defaultSession": "Standaard assistent",
   "delete": "Verwijderen",

package/locales/pl-PL/common.json

@@ -12,6 +12,12 @@
   "copy": "Kopiuj",
   "copyFail": "Nie udało się skopiować",
   "copySuccess": "Skopiowano pomyślnie",
+  "dataStatistics": {
+    "messages": "Wiadomości",
+    "sessions": "Sesje",
+    "today": "Dzisiaj",
+    "topics": "Tematy"
+  },
   "defaultAgent": "Domyślny asystent",
   "defaultSession": "Domyślna sesja",
   "delete": "Usuń",

package/locales/pt-BR/common.json

@@ -12,6 +12,12 @@
   "copy": "Copiar",
   "copyFail": "Falha ao copiar",
   "copySuccess": "Cópia bem-sucedida",
+  "dataStatistics": {
+    "messages": "Mensagens",
+    "sessions": "Sessões",
+    "today": "Hoje",
+    "topics": "Tópicos"
+  },
   "defaultAgent": "Assistente padrão",
   "defaultSession": "Sessão padrão",
   "delete": "Excluir",

package/locales/ru-RU/common.json

@@ -12,6 +12,12 @@
   "copy": "Копировать",
   "copyFail": "Не удалось скопировать",
   "copySuccess": "Успешно скопировано",
+  "dataStatistics": {
+    "messages": "Сообщения",
+    "sessions": "Сессии",
+    "today": "Сегодня",
+    "topics": "Темы"
+  },
   "defaultAgent": "Пользовательский агент",
   "defaultSession": "Пользовательский агент",
   "delete": "Удалить",

package/locales/tr-TR/common.json

@@ -12,6 +12,12 @@
   "copy": "Kopyala",
   "copyFail": "Kopyalama başarısız oldu",
   "copySuccess": "Kopyalama Başarılı",
+  "dataStatistics": {
+    "messages": "Mesajlar",
+    "sessions": "Oturumlar",
+    "today": "Bugün",
+    "topics": "Konular"
+  },
   "defaultAgent": "Varsayılan Asistan",
   "defaultSession": "Varsayılan Asistan",
   "delete": "Sil",

package/locales/vi-VN/common.json

@@ -12,6 +12,12 @@
   "copy": "Sao chép",
   "copyFail": "Sao chép thất bại",
   "copySuccess": "Sao chép thành công",
+  "dataStatistics": {
+    "messages": "Tin nhắn",
+    "sessions": "Phiên làm việc",
+    "today": "Hôm nay",
+    "topics": "Chủ đề"
+  },
   "defaultAgent": "Trợ lý mặc định",
   "defaultSession": "Phiên mặc định",
   "delete": "Xóa",

package/locales/zh-CN/common.json

@@ -12,6 +12,12 @@
   "copy": "复制",
   "copyFail": "复制失败",
   "copySuccess": "复制成功",
+  "dataStatistics": {
+    "messages": "消息",
+    "sessions": "助手",
+    "today": "今日新增",
+    "topics": "话题"
+  },
   "defaultAgent": "自定义助手",
   "defaultSession": "自定义助手",
   "delete": "删除",

package/locales/zh-TW/common.json

@@ -12,6 +12,12 @@
   "copy": "複製",
   "copyFail": "複製失敗",
   "copySuccess": "複製成功",
+  "dataStatistics": {
+    "messages": "消息",
+    "sessions": "助手",
+    "today": "今日新增",
+    "topics": "話題"
+  },
   "defaultAgent": "預設助手",
   "defaultSession": "預設助手",
   "delete": "刪除",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.154.7",
+  "version": "0.155.1",
   "description": "Lobe Chat - an open-source, high-performance chatbot framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",

package/src/app/(main)/(mobile)/me/features/AvatarBanner.tsx

@@ -4,13 +4,12 @@ import { PropsWithChildren, memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
 import UserAvatar from '@/features/User/UserAvatar';
-import UserInfo from '@/features/User/UserInfo';
 
 import { useStyles } from './style';
 
 export const AVATAR_SIZE = 80;
 
-const AvatarBanner = memo<PropsWithChildren>(() => {
+const AvatarBanner = memo<PropsWithChildren>(({ children }) => {
   const { styles } = useStyles();
 
   return (
@@ -20,7 +19,7 @@ const AvatarBanner = memo<PropsWithChildren>(() => {
           <UserAvatar shape={'square'} size={AVATAR_SIZE} />
         </div>
       </Flexbox>
-      <UserInfo className={styles.info} />
+      <Flexbox className={styles.info}>{children}</Flexbox>
     </>
   );
 });

package/src/app/(main)/(mobile)/me/loading.tsx

@@ -4,6 +4,7 @@ import { Skeleton } from 'antd';
 import { memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
+import Divider from '@/components/Cell/Divider';
 import SkeletonLoading from '@/components/SkeletonLoading';
 
 import { useStyles } from './features/style';
@@ -22,9 +23,25 @@ const Loading = memo(() => {
         paddingInline={12}
       >
         <Skeleton.Avatar active shape={'circle'} size={48} />
-        <Skeleton active paragraph={{ rows: 1 }} title={false} />
+        <Skeleton.Button active block />
       </Flexbox>
-      <SkeletonLoading active paragraph={{ rows: 8 }} title={false} />
+      <Flexbox gap={4} horizontal paddingBlock={12} paddingInline={16}>
+        <Skeleton.Button active block />
+        <Skeleton.Button active block />
+        <Skeleton.Button active block />
+      </Flexbox>
+      <Divider />
+      <SkeletonLoading
+        active
+        paragraph={{ rows: 6, style: { marginBottom: 0 }, width: '100%' }}
+        title={false}
+      />
+      <Divider />
+      <SkeletonLoading
+        active
+        paragraph={{ rows: 3, style: { marginBottom: 0 }, width: '100%' }}
+        title={false}
+      />
     </>
   );
 });

package/src/app/(main)/(mobile)/me/page.tsx

@@ -3,6 +3,8 @@ import { Center } from 'react-layout-kit';
 
 import BrandWatermark from '@/components/BrandWatermark';
 import Divider from '@/components/Cell/Divider';
+import DataStatistics from '@/features/User/DataStatistics';
+import UserInfo from '@/features/User/UserInfo';
 import { isMobileDevice } from '@/utils/responsive';
 
 import AvatarBanner from './features/AvatarBanner';
@@ -16,7 +18,10 @@ const Page = () => {
 
   return (
     <>
-      <AvatarBanner />
+      <AvatarBanner>
+        <UserInfo />
+        <DataStatistics paddingInline={16} />
+      </AvatarBanner>
       <Divider />
       <Cate />
       <ExtraCate />

package/src/app/(main)/settings/llm/index.tsx

@@ -21,7 +21,7 @@ import Footer from './components/Footer';
 
 const Page = () => {
   return (
-    <Flexbox gap={24}>
+    <Flexbox gap={24} width={'100%'}>
       <OpenAI />
       <Ollama />
       <Azure />

package/src/database/client/models/topic.ts

@@ -118,6 +118,10 @@ class _TopicModel extends BaseModel {
     return this.table.get(id);
   }
 
+  async count() {
+    return this.table.count();
+  }
+
   // **************** Create *************** //
 
   async create({ title, favorite, sessionId, messages }: CreateTopicParams, id = nanoid()) {

package/src/features/User/DataStatistics.tsx

@@ -0,0 +1,153 @@
+'use client';
+
+import { Icon, Tooltip } from '@lobehub/ui';
+import { Badge } from 'antd';
+import { createStyles } from 'antd-style';
+import { isNumber } from 'lodash-es';
+import { LoaderCircle } from 'lucide-react';
+import { memo, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Flexbox, FlexboxProps } from 'react-layout-kit';
+import useSWR from 'swr';
+
+import { messageService } from '@/services/message';
+import { sessionService } from '@/services/session';
+import { topicService } from '@/services/topic';
+
+const useStyles = createStyles(({ css, token }) => ({
+  card: css`
+    padding: 6px 8px;
+    background: ${token.colorFillTertiary};
+    border-radius: ${token.borderRadius}px;
+  `,
+  count: css`
+    font-size: 16px;
+    font-weight: bold;
+    line-height: 1.2;
+  `,
+  title: css`
+    font-size: 12px;
+    line-height: 1.2;
+    color: ${token.colorTextDescription};
+  `,
+  today: css`
+    font-size: 12px;
+  `,
+}));
+
+const formatNumber = (num: any) => {
+  if (!isNumber(num)) return num;
+  // 使用Intl.NumberFormat来添加千分号
+  const formattedWithComma = new Intl.NumberFormat('en-US').format(num);
+
+  // 格式化为 K 或 M
+  if (num >= 10_000_000) {
+    return (num / 1_000_000).toFixed(1) + 'M';
+  } else if (num >= 10_000) {
+    return (num / 1000).toFixed(1) + 'K';
+  } else if (num === 0) {
+    return 0;
+  } else {
+    return formattedWithComma;
+  }
+};
+
+const DataStatistics = memo<Omit<FlexboxProps, 'children'>>(({ style, ...rest }) => {
+  // sessions
+  const { data: sessions, isLoading: sessionsLoading } = useSWR(
+    'count-sessions',
+    sessionService.countSessions,
+  );
+  // topics
+  const { data: topics, isLoading: topicsLoading } = useSWR(
+    'count-topics',
+    topicService.countTopics,
+  );
+  // messages
+  const { data: messages, isLoading: messagesLoading } = useSWR(
+    'count-messages',
+    messageService.countMessages,
+  );
+  const { data: messagesToday } = useSWR('today-messages', messageService.countTodayMessages);
+
+  const { styles, theme } = useStyles();
+  const { t } = useTranslation('common');
+
+  const loading = useMemo(() => <Icon icon={LoaderCircle} spin />, []);
+
+  const items = [
+    {
+      count: sessionsLoading ? loading : sessions,
+      key: 'sessions',
+      title: t('dataStatistics.sessions'),
+    },
+    {
+      count: topicsLoading ? loading : topics,
+      key: 'topics',
+      title: t('dataStatistics.topics'),
+    },
+    {
+      count: messagesLoading ? loading : messages,
+      countToady: messagesToday,
+      key: 'messages',
+      title: t('dataStatistics.messages'),
+    },
+  ];
+
+  return (
+    <Flexbox
+      align={'center'}
+      gap={4}
+      horizontal
+      paddingInline={8}
+      style={{ marginBottom: 8, ...style }}
+      width={'100%'}
+      {...rest}
+    >
+      {items.map((item) => {
+        if (item.key === 'messages') {
+          const showBadge = Boolean(item.countToady && item.countToady > 0);
+          return (
+            <Flexbox
+              align={'center'}
+              className={styles.card}
+              flex={showBadge ? 2 : 1}
+              gap={4}
+              horizontal
+              justify={'space-between'}
+              key={item.key}
+            >
+              <Flexbox gap={2}>
+                <div className={styles.count}>{formatNumber(item.count)}</div>
+                <div className={styles.title}>{item.title}</div>
+              </Flexbox>
+              {showBadge && (
+                <Tooltip title={t('dataStatistics.today')}>
+                  <Badge
+                    count={`+${item.countToady}`}
+                    style={{
+                      background: theme.colorSuccess,
+                      color: theme.colorSuccessBg,
+                      cursor: 'pointer',
+                    }}
+                  />
+                </Tooltip>
+              )}
+            </Flexbox>
+          );
+        }
+
+        return (
+          <Flexbox className={styles.card} flex={1} gap={2} key={item.key}>
+            <Flexbox horizontal>
+              <div className={styles.count}>{formatNumber(item.count)}</div>
+            </Flexbox>
+            <div className={styles.title}>{item.title}</div>
+          </Flexbox>
+        );
+      })}
+    </Flexbox>
+  );
+});
+
+export default DataStatistics;

package/src/features/User/UserPanel/PanelContent.tsx

@@ -8,6 +8,7 @@ import { enableAuth } from '@/const/auth';
 import { useUserStore } from '@/store/user';
 import { authSelectors } from '@/store/user/selectors';
 
+import DataStatistics from '../DataStatistics';
 import UserInfo from '../UserInfo';
 import UserLoginOrSignup from '../UserLoginOrSignup';
 import LangButton from './LangButton';
@@ -50,6 +51,7 @@ const PanelContent = memo<{ closePopover: () => void }>(({ closePopover }) => {
       ) : (
         <UserLoginOrSignup onClick={handleSignIn} />
       )}
+      <DataStatistics />
       <Menu items={mainItems} onClick={closePopover} />
       <Flexbox
         align={'center'}

package/src/locales/default/common.ts

@@ -11,8 +11,13 @@ export default {
   close: '关闭',
   copy: '复制',
   copyFail: '复制失败',
-
   copySuccess: '复制成功',
+  dataStatistics: {
+    messages: '消息',
+    sessions: '助手',
+    today: '今日新增',
+    topics: '话题',
+  },
   defaultAgent: '自定义助手',
   defaultSession: '自定义助手',
   delete: '删除',

package/src/services/message/client.ts

@@ -1,3 +1,5 @@
+import dayjs from 'dayjs';
+
 import { MessageModel } from '@/database/client/models/message';
 import { DB_Message } from '@/database/client/schemas/message';
 import { ChatMessage, ChatMessageError, ChatPluginPayload } from '@/types/message';
@@ -27,6 +29,13 @@ export class ClientService implements IMessageService {
     return MessageModel.count();
   }
 
+  async countTodayMessages() {
+    const topics = await MessageModel.queryAll();
+    return topics.filter(
+      (item) => dayjs(item.createdAt).format('YYYY-MM-DD') === dayjs().format('YYYY-MM-DD'),
+    ).length;
+  }
+
   async getAllMessagesInSession(sessionId: string) {
     return MessageModel.queryBySessionId(sessionId);
   }

package/src/services/session/client.ts

@@ -79,6 +79,7 @@ export class ClientService implements ISessionService {
   async countSessions() {
     return SessionModel.count();
   }
+
   async hasSessions() {
     return (await this.countSessions()) !== 0;
   }

package/src/services/topic/client.test.ts

@@ -1,5 +1,6 @@
 import { Mock, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
 
+import { SessionModel } from '@/database/client/models/session';
 import { CreateTopicParams, TopicModel } from '@/database/client/models/topic';
 import { ChatTopic } from '@/types/topic';
 
@@ -13,6 +14,7 @@ vi.mock('@/database/client/models/topic', () => {
       create: vi.fn(),
       query: vi.fn(),
       delete: vi.fn(),
+      count: vi.fn(),
       batchDeleteBySessionId: vi.fn(),
       batchDelete: vi.fn(),
       clearTable: vi.fn(),
@@ -214,4 +216,30 @@ describe('TopicService', () => {
       expect(result).toBe(mockTopics);
     });
   });
+
+  describe('countTopics', () => {
+    it('should return false if no topics exist', async () => {
+      // Setup
+      (TopicModel.count as Mock).mockResolvedValue(0);
+
+      // Execute
+      const result = await topicService.countTopics();
+
+      // Assert
+      expect(TopicModel.count).toHaveBeenCalled();
+      expect(result).toBe(0);
+    });
+
+    it('should return true if topics exist', async () => {
+      // Setup
+      (TopicModel.count as Mock).mockResolvedValue(1);
+
+      // Execute
+      const result = await topicService.countTopics();
+
+      // Assert
+      expect(TopicModel.count).toHaveBeenCalled();
+      expect(result).toBe(1);
+    });
+  });
 });

package/src/services/topic/client.ts

@@ -34,6 +34,10 @@ export class ClientService implements ITopicService {
     return TopicModel.queryAll();
   }
 
+  async countTopics() {
+    return TopicModel.count();
+  }
+
   async updateTopicFavorite(id: string, favorite?: boolean) {
     return this.updateTopic(id, { favorite });
   }