@lobehub/chat 0.162.23 → 0.162.24

package/src/features/Conversation/Error/OllamaBizError/SetupGuide.tsx

@@ -7,6 +7,8 @@ import { memo } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
+import { ErrorActionContainer } from '@/features/Conversation/Error/style';
+
 const useStyles = createStyles(({ css, prefixCls, token }) => ({
   steps: css`
     margin-top: 32px;
@@ -30,187 +32,189 @@ const SetupGuide = memo(() => {
   const { styles } = useStyles();
   const { t } = useTranslation('modelProvider');
   return (
-    <TabsNav
-      items={[
-        {
-          children: (
-            <Steps
-              className={styles.steps}
-              direction={'vertical'}
-              items={[
-                {
-                  description: (
-                    <Trans i18nKey={'ollama.setup.install.description'} ns={'modelProvider'}>
-                      请确认你已经开启 Ollama ，如果没有安装 Ollama ，请前往官网
-                      <Link href={'https://ollama.com/download'}>下载</Link>
-                    </Trans>
-                  ),
-                  status: 'process',
-                  title: t('ollama.setup.install.title'),
-                },
-                {
-                  description: (
-                    <Flexbox gap={8}>
-                      {t('ollama.setup.cors.description')}
+    <ErrorActionContainer style={{ paddingBlock: 0 }}>
+      <TabsNav
+        items={[
+          {
+            children: (
+              <Steps
+                className={styles.steps}
+                direction={'vertical'}
+                items={[
+                  {
+                    description: (
+                      <Trans i18nKey={'ollama.setup.install.description'} ns={'modelProvider'}>
+                        请确认你已经开启 Ollama ，如果没有安装 Ollama ，请前往官网
+                        <Link href={'https://ollama.com/download'}>下载</Link>
+                      </Trans>
+                    ),
+                    status: 'process',
+                    title: t('ollama.setup.install.title'),
+                  },
+                  {
+                    description: (
+                      <Flexbox gap={8}>
+                        {t('ollama.setup.cors.description')}
 
+                        <Flexbox gap={8}>
+                          {t('ollama.setup.cors.macos')}
+                          <Snippet language={'bash'}>
+                            {/* eslint-disable-next-line react/no-unescaped-entities */}
+                            launchctl setenv OLLAMA_ORIGINS "*"
+                          </Snippet>
+                          {t('ollama.setup.cors.reboot')}
+                        </Flexbox>
+                      </Flexbox>
+                    ),
+                    status: 'process',
+                    title: t('ollama.setup.cors.title'),
+                  },
+                ]}
+                size={'small'}
+              />
+            ),
+            key: 'macos',
+            label: 'macOS',
+          },
+          {
+            children: (
+              <Steps
+                className={styles.steps}
+                direction={'vertical'}
+                items={[
+                  {
+                    description: (
+                      <Trans i18nKey={'ollama.setup.install.description'} ns={'modelProvider'}>
+                        请确认你已经开启 Ollama ，如果没有安装 Ollama ，请前往官网
+                        <Link href={'https://ollama.com/download'}>下载</Link>
+                      </Trans>
+                    ),
+                    status: 'process',
+                    title: t('ollama.setup.install.title'),
+                  },
+                  {
+                    description: (
+                      <Flexbox gap={8}>
+                        {t('ollama.setup.cors.description')}
+                        <div>{t('ollama.setup.cors.windows')}</div>
+                        <div>{t('ollama.setup.cors.reboot')}</div>
+                      </Flexbox>
+                    ),
+                    status: 'process',
+                    title: t('ollama.setup.cors.title'),
+                  },
+                ]}
+                size={'small'}
+              />
+            ),
+            key: 'windows',
+            label: t('ollama.setup.install.windowsTab'),
+          },
+          {
+            children: (
+              <Steps
+                className={styles.steps}
+                direction={'vertical'}
+                items={[
+                  {
+                    description: (
                       <Flexbox gap={8}>
-                        {t('ollama.setup.cors.macos')}
+                        {t('ollama.setup.install.linux.command')}
                         <Snippet language={'bash'}>
-                          {/* eslint-disable-next-line react/no-unescaped-entities */}
-                          launchctl setenv OLLAMA_ORIGINS "*"
+                          curl -fsSL https://ollama.com/install.sh | sh
                         </Snippet>
-                        {t('ollama.setup.cors.reboot')}
+                        <div>
+                          <Trans i18nKey={'ollama.setup.install.linux.manual'} ns={'modelProvider'}>
+                            或者，你也可以参考
+                            <Link href={'https://github.com/ollama/ollama/blob/main/docs/linux.md'}>
+                              Linux 手动安装指南
+                            </Link>
+                            。
+                          </Trans>
+                        </div>
                       </Flexbox>
-                    </Flexbox>
-                  ),
-                  status: 'process',
-                  title: t('ollama.setup.cors.title'),
-                },
-              ]}
-              size={'small'}
-            />
-          ),
-          key: 'macos',
-          label: 'macOS',
-        },
-        {
-          children: (
-            <Steps
-              className={styles.steps}
-              direction={'vertical'}
-              items={[
-                {
-                  description: (
-                    <Trans i18nKey={'ollama.setup.install.description'} ns={'modelProvider'}>
-                      请确认你已经开启 Ollama ，如果没有安装 Ollama ，请前往官网
-                      <Link href={'https://ollama.com/download'}>下载</Link>
-                    </Trans>
-                  ),
-                  status: 'process',
-                  title: t('ollama.setup.install.title'),
-                },
-                {
-                  description: (
-                    <Flexbox gap={8}>
-                      {t('ollama.setup.cors.description')}
-                      <div>{t('ollama.setup.cors.windows')}</div>
-                      <div>{t('ollama.setup.cors.reboot')}</div>
-                    </Flexbox>
-                  ),
-                  status: 'process',
-                  title: t('ollama.setup.cors.title'),
-                },
-              ]}
-              size={'small'}
-            />
-          ),
-          key: 'windows',
-          label: t('ollama.setup.install.windowsTab'),
-        },
-        {
-          children: (
-            <Steps
-              className={styles.steps}
-              direction={'vertical'}
-              items={[
-                {
-                  description: (
-                    <Flexbox gap={8}>
-                      {t('ollama.setup.install.linux.command')}
-                      <Snippet language={'bash'}>
-                        curl -fsSL https://ollama.com/install.sh | sh
-                      </Snippet>
-                      <div>
-                        <Trans i18nKey={'ollama.setup.install.linux.manual'} ns={'modelProvider'}>
-                          或者，你也可以参考
-                          <Link href={'https://github.com/ollama/ollama/blob/main/docs/linux.md'}>
-                            Linux 手动安装指南
-                          </Link>
-                          。
-                        </Trans>
-                      </div>
-                    </Flexbox>
-                  ),
-                  status: 'process',
-                  title: t('ollama.setup.install.title'),
-                },
-                {
-                  description: (
-                    <Flexbox gap={8}>
-                      <div>{t('ollama.setup.cors.description')}</div>
+                    ),
+                    status: 'process',
+                    title: t('ollama.setup.install.title'),
+                  },
+                  {
+                    description: (
+                      <Flexbox gap={8}>
+                        <div>{t('ollama.setup.cors.description')}</div>
 
-                      <div>{t('ollama.setup.cors.linux.systemd')}</div>
-                      {/* eslint-disable-next-line react/no-unescaped-entities */}
-                      <Snippet language={'bash'}> sudo systemctl edit ollama.service</Snippet>
-                      {t('ollama.setup.cors.linux.env')}
-                      <Highlighter
-                        // eslint-disable-next-line react/no-children-prop
-                        children={`[Service]
+                        <div>{t('ollama.setup.cors.linux.systemd')}</div>
+                        {/* eslint-disable-next-line react/no-unescaped-entities */}
+                        <Snippet language={'bash'}> sudo systemctl edit ollama.service</Snippet>
+                        {t('ollama.setup.cors.linux.env')}
+                        <Highlighter
+                          // eslint-disable-next-line react/no-children-prop
+                          children={`[Service]
 
 Environment="OLLAMA_ORIGINS=*"`}
-                        fileName={'ollama.service'}
-                        fullFeatured
-                        language={'bash'}
-                        showLanguage
-                      />
-                      {t('ollama.setup.cors.linux.reboot')}
-                    </Flexbox>
-                  ),
-                  status: 'process',
-                  title: t('ollama.setup.cors.title'),
-                },
-              ]}
-              size={'small'}
-            />
-          ),
-          key: 'linux',
-          label: 'Linux',
-        },
-        {
-          children: (
-            <Steps
-              className={styles.steps}
-              direction={'vertical'}
-              items={[
-                {
-                  description: (
-                    <Flexbox gap={8}>
-                      {t('ollama.setup.install.description')}
-                      <div>{t('ollama.setup.install.docker')}</div>
-                      <Snippet language={'bash'}>docker pull ollama/ollama</Snippet>
-                    </Flexbox>
-                  ),
-                  status: 'process',
-                  title: t('ollama.setup.install.title'),
-                },
-                {
-                  description: (
-                    <Flexbox gap={8}>
-                      {t('ollama.setup.cors.description')}
-                      <Highlighter
-                        fileName={'ollama.service'}
-                        fullFeatured
-                        language={'bash'}
-                        showLanguage
-                      >
-                        {/* eslint-disable-next-line react/no-unescaped-entities */}
-                        docker run -d --gpus=all -v ollama:/root/.ollama -e OLLAMA_ORIGINS="*" -p
-                        11434:11434 --name ollama ollama/ollama
-                      </Highlighter>
-                    </Flexbox>
-                  ),
-                  status: 'process',
-                  title: t('ollama.setup.cors.title'),
-                },
-              ]}
-              size={'small'}
-            />
-          ),
-          key: 'docker',
-          label: 'Docker',
-        },
-      ]}
-    />
+                          fileName={'ollama.service'}
+                          fullFeatured
+                          language={'bash'}
+                          showLanguage
+                        />
+                        {t('ollama.setup.cors.linux.reboot')}
+                      </Flexbox>
+                    ),
+                    status: 'process',
+                    title: t('ollama.setup.cors.title'),
+                  },
+                ]}
+                size={'small'}
+              />
+            ),
+            key: 'linux',
+            label: 'Linux',
+          },
+          {
+            children: (
+              <Steps
+                className={styles.steps}
+                direction={'vertical'}
+                items={[
+                  {
+                    description: (
+                      <Flexbox gap={8}>
+                        {t('ollama.setup.install.description')}
+                        <div>{t('ollama.setup.install.docker')}</div>
+                        <Snippet language={'bash'}>docker pull ollama/ollama</Snippet>
+                      </Flexbox>
+                    ),
+                    status: 'process',
+                    title: t('ollama.setup.install.title'),
+                  },
+                  {
+                    description: (
+                      <Flexbox gap={8}>
+                        {t('ollama.setup.cors.description')}
+                        <Highlighter
+                          fileName={'ollama.service'}
+                          fullFeatured
+                          language={'bash'}
+                          showLanguage
+                        >
+                          {/* eslint-disable-next-line react/no-unescaped-entities */}
+                          docker run -d --gpus=all -v ollama:/root/.ollama -e OLLAMA_ORIGINS="*" -p
+                          11434:11434 --name ollama ollama/ollama
+                        </Highlighter>
+                      </Flexbox>
+                    ),
+                    status: 'process',
+                    title: t('ollama.setup.cors.title'),
+                  },
+                ]}
+                size={'small'}
+              />
+            ),
+            key: 'docker',
+            label: 'Docker',
+          },
+        ]}
+      />
+    </ErrorActionContainer>
   );
 });
 

package/src/features/Conversation/Error/style.tsx

@@ -1,7 +1,7 @@
 import { Avatar } from '@lobehub/ui';
 import { createStyles } from 'antd-style';
 import { ReactNode, memo } from 'react';
-import { Center, Flexbox } from 'react-layout-kit';
+import { Center, CenterProps, Flexbox } from 'react-layout-kit';
 
 export const useStyles = createStyles(({ css, token }) => ({
   container: css`
@@ -14,38 +14,63 @@ export const useStyles = createStyles(({ css, token }) => ({
     color: ${token.colorTextTertiary};
     text-align: center;
   `,
+  form: css`
+    width: 100%;
+    max-width: 300px;
+  `,
 }));
 
-export const ErrorActionContainer = memo<{ children: ReactNode }>(({ children }) => {
-  const { styles } = useStyles();
+export const ErrorActionContainer = memo<CenterProps>(
+  ({ children, className, gap = 24, padding = 24, ...rest }) => {
+    const { cx, styles } = useStyles();
 
-  return (
-    <Center className={styles.container} gap={24} padding={24}>
-      {children}
-    </Center>
-  );
-});
+    return (
+      <Center className={cx(styles.container, className)} gap={gap} padding={padding} {...rest}>
+        {children}
+      </Center>
+    );
+  },
+);
 
-export const FormAction = memo<{
-  avatar: ReactNode;
-  background?: string;
-  children: ReactNode;
-  description: string;
-  title: string;
-}>(({ children, background, title, description, avatar }) => {
-  const { styles, theme } = useStyles();
+export const FormAction = memo<
+  {
+    animation?: boolean;
+    avatar: ReactNode;
+    background?: string;
+    description: string;
+    title: string;
+  } & CenterProps
+>(
+  ({
+    children,
+    background,
+    title,
+    description,
+    avatar,
+    animation,
+    className,
+    gap = 16,
+    ...rest
+  }) => {
+    const { cx, styles, theme } = useStyles();
 
-  return (
-    <Center gap={16} style={{ maxWidth: 300, width: '100%' }}>
-      <Avatar
-        avatar={avatar}
-        background={background ?? theme.colorFillContent}
-        gap={12}
-        size={80}
-      />
-      <Flexbox style={{ fontSize: 20, textAlign: 'center' }}>{title}</Flexbox>
-      <Flexbox className={styles.desc}>{description}</Flexbox>
-      {children}
-    </Center>
-  );
-});
+    return (
+      <Center className={cx(styles.form, className)} gap={gap} {...rest}>
+        <Avatar
+          animation={animation}
+          avatar={avatar}
+          background={background ?? theme.colorFillContent}
+          gap={12}
+          size={80}
+        />
+        <Flexbox gap={8} width={'100%'}>
+          <Flexbox style={{ fontSize: 18, fontWeight: 'bold', textAlign: 'center' }}>
+            {title}
+          </Flexbox>
+          <Flexbox className={styles.desc}>{description}</Flexbox>
+        </Flexbox>
+        {children}
+      </Center>
+    );
+  },
+);

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

@@ -20,7 +20,7 @@ import { Flexbox } from 'react-layout-kit';
 import urlJoin from 'url-join';
 
 import type { MenuProps } from '@/components/Menu';
-import { DISCORD, DOCUMENTS, EMAIL_SUPPORT, GITHUB_ISSUES } from '@/const/url';
+import { DISCORD, DOCUMENTS, EMAIL_SUPPORT, GITHUB_ISSUES, mailTo } from '@/const/url';
 import DataImporter from '@/features/DataImporter';
 import { useOpenSettings } from '@/hooks/useInterceptingRoutes';
 import { usePWAInstall } from '@/hooks/usePWAInstall';
@@ -190,7 +190,7 @@ export const useMenu = () => {
           icon: <Icon icon={Mail} />,
           key: 'email',
           label: (
-            <Link href={`mailto:${EMAIL_SUPPORT}`} target={'_blank'}>
+            <Link href={mailTo(EMAIL_SUPPORT)} target={'_blank'}>
               {t('userPanel.email')}
             </Link>
           ),

package/src/locales/default/common.ts

@@ -9,6 +9,7 @@ export default {
   cancel: '取消',
   changelog: '更新日志',
   close: '关闭',
+  contact: '联系我们',
   copy: '复制',
   copyFail: '复制失败',
   copySuccess: '复制成功',
@@ -35,8 +36,26 @@ export default {
   },
   feedback: '反馈与建议',
   follow: '在 {{name}} 上关注我们',
+  footer: {
+    action: {
+      feedback: '分享您宝贵的建议',
+      star: '在 GitHub 给添加星标',
+    },
+    and: '并',
+    feedback: {
+      action: '分享反馈',
+      desc: '您的每一个想法和建议对我们来说都弥足珍贵，我们迫不及待地想知道您的看法！欢迎联系我们提供产品功能和使用体验反馈，帮助我们将 LobeChat 建设得更好。',
+      title: '在 GitHub 分享您宝贵的反馈',
+    },
+    later: '稍后',
+    star: {
+      action: '点亮星标',
+      desc: '如果您喜爱我们的产品，并希望支持我们，可以去 GitHub 给我们点一颗星吗？这个小小的动作对我们来说意义重大，能激励我们为您持续提供特性体验。',
+      title: '在 GitHub 为我们点亮星标',
+    },
+    title: '喜欢我们的产品？',
+  },
   fullscreen: '全屏模式',
-
   historyRange: '历史范围',
   import: '导入配置',
   importModal: {
@@ -69,6 +88,7 @@ export default {
       speed: '上传速度',
     },
   },
+  information: '社区与资讯',
   installPWA: '安装浏览器应用 (PWA)',
   lang: {
     'ar': '阿拉伯语',
@@ -108,6 +128,11 @@ export default {
     'zh-TW': '繁体中文',
   },
   layoutInitializing: '正在加载布局...',
+  legal: '法律声明',
+  mail: {
+    business: '商务合作',
+    support: '邮件支持',
+  },
   noDescription: '暂无描述',
   oauth: 'SSO 登录',
   officialSite: '官方网站',
@@ -149,7 +174,6 @@ export default {
     title: '同步状态',
     unconnected: { tip: '信令服务器连接失败，将无法建立点对点通信频道，请检查网络后重试' },
   },
-
   tab: {
     chat: '会话',
     market: '发现',
@@ -188,4 +212,5 @@ export default {
     setting: '应用设置',
     usages: '用量统计',
   },
+  version: '版本',
 };

package/src/services/ollama.ts

@@ -42,8 +42,8 @@ export class OllamaService {
     this._client.abort();
   };
 
-  pullModel = async (model: string): Promise<AsyncGenerator<ProgressResponse>> => {
-    let response: Response | AsyncGenerator<ProgressResponse>;
+  pullModel = async (model: string): Promise<AsyncIterable<ProgressResponse>> => {
+    let response: Response | AsyncIterable<ProgressResponse>;
     try {
       response = await this.getOllamaClient().pull({ insecure: true, model, stream: true });
       return response;

package/src/app/(main)/settings/about/features/Item.tsx

@@ -1,50 +0,0 @@
-import { Icon, List } from '@lobehub/ui';
-import { createStyles, useResponsive } from 'antd-style';
-import { ChevronRight, type LucideIcon } from 'lucide-react';
-import { CSSProperties, ReactNode, memo } from 'react';
-
-const { Item } = List;
-
-const useStyles = createStyles(({ css, token, responsive }) => ({
-  container: css`
-    position: relative;
-    padding-top: 16px;
-    padding-bottom: 16px;
-    border-radius: ${token.borderRadius}px;
-    ${responsive.mobile} {
-      border-radius: 0;
-    }
-  `,
-  noHover: css`
-    pointer-events: none;
-  `,
-}));
-
-export interface ItemProps {
-  active?: boolean;
-  className?: string;
-  hoverable?: boolean;
-  icon: LucideIcon;
-  label: ReactNode;
-  style?: CSSProperties;
-}
-
-const SettingItem = memo<ItemProps>(
-  ({ label, icon, hoverable = true, active = false, style, className }) => {
-    const { cx, styles } = useStyles();
-    const { mobile } = useResponsive();
-    return (
-      <Item
-        active={active}
-        avatar={<Icon icon={icon} size={{ fontSize: 20 }} />}
-        className={cx(styles.container, !hoverable && styles.noHover, className)}
-        style={style}
-        title={label as string}
-      >
-        {mobile && <Icon icon={ChevronRight} size={{ fontSize: 16 }} />}
-      </Item>
-    );
-  },
-);
-
-export default SettingItem;