@lobehub/chat 1.96.20 → 1.97.1

package/src/types/tool/index.ts

@@ -7,7 +7,17 @@ export interface LobeTool {
   customParams?: CustomPluginParams | null;
   identifier: string;
   manifest?: LobeChatPluginManifest | null;
+  /**
+   * use for runtime
+   */
+  runtimeType?: 'mcp' | 'default' | 'markdown' | 'standalone';
   settings?: any;
+  // TODO: remove type and then make it required
+  source?: LobeToolType;
+  /**
+   * need to be replaced with source
+   * @deprecated
+   */
   type: LobeToolType;
 }
 

package/src/types/tool/plugin.ts

@@ -7,6 +7,7 @@ export type PluginManifestMap = Record<string, LobeChatPluginManifest>;
 export interface CustomPluginMetadata {
   avatar?: string;
   description?: string;
+  name?: string;
 }
 
 export interface CustomPluginParams {
@@ -40,12 +41,12 @@ export interface LobeToolCustomPlugin {
   type: 'customPlugin';
 }
 
-export interface InstallPluginMeta {
+export interface InstallPluginMeta extends Partial<Meta> {
   author?: string;
   createdAt?: string;
   homepage?: string;
   identifier: string;
-  meta?: Meta;
+  runtimeType?: 'mcp' | 'default' | 'markdown' | 'standalone' | undefined;
   type: LobeToolType;
 }
 

package/src/types/tool/tool.ts

@@ -2,9 +2,12 @@ import { MetaData } from '@/types/meta';
 
 export type LobeToolType = 'builtin' | 'customPlugin' | 'plugin';
 
-export interface LobeToolMeta {
+export interface LobeToolMeta extends MetaData {
   author?: string;
   identifier: string;
+  /**
+   * @deprecated
+   */
   meta: MetaData;
   type: LobeToolType;
 }

package/src/utils/client/cookie.ts

@@ -5,7 +5,7 @@ import { COOKIE_CACHE_DAYS } from '@/const/settings';
 export const setCookie = (
   key: string,
   value: string | undefined,
-  expireDays = COOKIE_CACHE_DAYS,
+  expireDays: string | number = COOKIE_CACHE_DAYS,
 ) => {
   if (typeof value === 'undefined') {
     // Set the expiration time to yesterday (expire immediately)
@@ -14,7 +14,10 @@ export const setCookie = (
     // eslint-disable-next-line unicorn/no-document-cookie
     document.cookie = `${key}=; expires=${expiredDate}; path=/;`;
   } else {
-    const expires = dayjs().add(expireDays, 'day').toDate().toUTCString();
+    const expires =
+      typeof expireDays === 'string'
+        ? expireDays
+        : dayjs().add(expireDays, 'day').toDate().toUTCString();
 
     // eslint-disable-next-line unicorn/no-document-cookie
     document.cookie = `${key}=${value};expires=${expires};path=/;`;

package/src/utils/locale.ts

@@ -5,7 +5,7 @@ import { Locales, locales, normalizeLocale } from '@/locales/resources';
 import { RouteVariants } from '@/utils/server/routeVariants';
 
 export const getAntdLocale = async (lang?: string) => {
-  let normalLang = normalizeLocale(lang);
+  let normalLang: any = normalizeLocale(lang);
 
   // due to antd only have ar-EG locale, we need to convert ar to ar-EG
   // refs: https://ant.design/docs/react/i18n
@@ -47,8 +47,8 @@ export const parseBrowserLanguage = (headers: Headers, defaultLang: string = DEF
 };
 
 /**
- * Parse the page locale from the URL and search params
- * @param props
+ * Parse the page locale from the URL and search
+ * used in cloud
  */
 export const parsePageLocale = async (props: {
   params: Promise<{ variants: string }>;

package/src/utils/object.ts

@@ -0,0 +1,10 @@
+import { isNil, omitBy } from 'lodash-es';
+
+/**
+ * 清理对象中的空值（undefined、null、空字符串）
+ * @param obj 要清理的对象
+ * @returns 清理后的对象
+ */
+export const cleanObject = <T extends Record<string, any>>(obj: T): T => {
+  return omitBy(obj, (value) => isNil(value) || value === '') as T;
+};

package/src/utils/server/pageProps.ts

@@ -0,0 +1,9 @@
+import { translation } from '@/server/translation';
+import { DynamicLayoutProps } from '@/types/next';
+import { RouteVariants } from '@/utils/server/routeVariants';
+
+export const parsePageMetaProps = async (props: DynamicLayoutProps) => {
+  const { locale: hl, isMobile } = await RouteVariants.getVariantsFromProps(props);
+  const { t, locale } = await translation('metadata', hl);
+  return { isMobile, locale, t };
+};

package/src/utils/toolCall.ts

@@ -2,6 +2,10 @@ import { Md5 } from 'ts-md5';
 
 import { PLUGIN_SCHEMA_API_MD5_PREFIX, PLUGIN_SCHEMA_SEPARATOR } from '@/const/plugin';
 
+// OpenAI GPT function_call name can't be longer than 64 characters
+// So we need to use md5 to shorten the name
+export const genToolCallShortMD5Hash = (name: string) => Md5.hashStr(name).toString().slice(0, 16);
+
 export const genToolCallingName = (identifier: string, name: string, type: string = 'default') => {
   const pluginType = type && type !== 'default' ? `${PLUGIN_SCHEMA_SEPARATOR + type}` : '';
 
@@ -12,7 +16,7 @@ export const genToolCallingName = (identifier: string, name: string, type: strin
   // So we need to use md5 to shorten the name
   // and then find the correct apiName in response by md5
   if (apiName.length >= 64) {
-    const md5Content = PLUGIN_SCHEMA_API_MD5_PREFIX + Md5.hashStr(name).toString();
+    const md5Content = PLUGIN_SCHEMA_API_MD5_PREFIX + genToolCallShortMD5Hash(name);
 
     apiName = identifier + PLUGIN_SCHEMA_SEPARATOR + md5Content + pluginType;
   }

package/src/utils/toolManifest.ts

@@ -89,7 +89,6 @@ export const getToolManifest = async (
   }
 
   // 2. 发送请求
-
   let data = await fetchJSON<LobeChatPluginManifest>(url, useProxy);
 
   // @ts-ignore
@@ -98,7 +97,6 @@ export const getToolManifest = async (
   if (data['description_for_model']) {
     data = convertOpenAIManifestToLobeManifest(data as any);
   }
-
   // 3. 校验插件文件格式规范
   const parser = pluginManifestSchema.safeParse(data);
 
@@ -115,6 +113,7 @@ export const getToolManifest = async (
 
       const convertor = new OpenAPIConvertor(openapiJson);
       const openAPIs = await convertor.convertOpenAPIToPluginSchema();
+
       data.api = [...data.api, ...openAPIs];
 
       data.settings = await convertor.convertAuthToSettingsSchema(data.settings);

package/vercel.json

@@ -1,4 +1,4 @@
 {
-  "buildCommand": "NODE_OPTIONS=--max-old-space-size=6144 bun run build", 
+  "buildCommand": "bun run build",
   "installCommand": "bun install"
 }

package/src/app/[variants]/(main)/discover/(detail)/assistant/[slug]/features/Actions.tsx

@@ -1,35 +0,0 @@
-'use client';
-
-import { memo } from 'react';
-import { Flexbox, FlexboxProps } from 'react-layout-kit';
-import urlJoin from 'url-join';
-
-import { OFFICIAL_URL } from '@/const/url';
-import { DiscoverAssistantItem } from '@/types/discover';
-
-import ShareButton from '../../../features/ShareButton';
-import AddAgent from './AddAgent';
-
-interface AssistantActionProps extends FlexboxProps {
-  data: DiscoverAssistantItem;
-  identifier: string;
-}
-
-const AssistantAction = memo<AssistantActionProps>(({ identifier, data }) => {
-  return (
-    <Flexbox align={'center'} gap={8} horizontal>
-      <AddAgent data={data} />
-      <ShareButton
-        meta={{
-          avatar: data.meta.avatar,
-          desc: data.meta.description,
-          hashtags: data.meta.tags,
-          title: data.meta.title,
-          url: urlJoin(OFFICIAL_URL, '/discover/assistant', identifier),
-        }}
-      />
-    </Flexbox>
-  );
-});
-
-export default AssistantAction;

package/src/app/[variants]/(main)/discover/(detail)/assistant/[slug]/features/ConversationExample/TopicList.tsx

@@ -1,75 +0,0 @@
-import { createStyles } from 'antd-style';
-import { memo, useState } from 'react';
-import { Flexbox } from 'react-layout-kit';
-
-import { ExampleTopic } from '@/types/discover';
-
-const useStyles = createStyles(({ css, token }) => ({
-  active: css`
-    border-inline-start: 4px solid ${token.colorFill};
-    background: ${token.colorBgElevated};
-    box-shadow: 0 0 0 1px ${token.colorFillSecondary} inset;
-  `,
-  container: css`
-    overflow: auto hidden;
-  `,
-  desc: css`
-    line-height: 1.2;
-    color: ${token.colorTextDescription};
-  `,
-  item: css`
-    cursor: pointer;
-
-    border-inline-start: 4px solid transparent;
-    border-radius: ${token.borderRadiusLG}px;
-
-    background: ${token.colorFillTertiary};
-
-    transition: all 0.2s ${token.motionEaseInOut};
-
-    &:hover {
-      border-inline-start: 4px solid ${token.colorFill};
-      background: ${token.colorBgElevated};
-      box-shadow: 0 0 0 1px ${token.colorFillSecondary} inset;
-    }
-  `,
-  title: css`
-    font-weight: 500;
-    line-height: 1.2;
-  `,
-}));
-
-interface TopicListProps {
-  data: ExampleTopic[];
-  onChoose?: (id: string) => void;
-}
-
-const TopicList = memo<TopicListProps>(({ data, onChoose }) => {
-  const { cx, styles } = useStyles();
-  const [active, setActive] = useState(data[0].id);
-
-  return (
-    <Flexbox className={styles.container} gap={8} horizontal padding={8}>
-      {data.map((topic) => {
-        const isActive = active === topic.id;
-        return (
-          <Flexbox
-            className={cx(styles.item, isActive && styles.active)}
-            gap={4}
-            key={topic.id}
-            onClick={() => {
-              setActive(topic.id);
-              onChoose?.(topic.id);
-            }}
-            padding={12}
-          >
-            <div className={styles.title}>{topic.title}</div>
-            <div className={styles.desc}>{topic.description}</div>
-          </Flexbox>
-        );
-      })}
-    </Flexbox>
-  );
-});
-
-export default TopicList;

package/src/app/[variants]/(main)/discover/(detail)/assistant/[slug]/features/ConversationExample/index.tsx

@@ -1,105 +0,0 @@
-'use client';
-
-import { Icon } from '@lobehub/ui';
-import { ChatList } from '@lobehub/ui/chat';
-import { ChatInputArea, ChatSendButton } from '@lobehub/ui/mobile';
-import { useTheme } from 'antd-style';
-import { BotMessageSquare, LoaderCircle } from 'lucide-react';
-import { memo } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Center, Flexbox, FlexboxProps } from 'react-layout-kit';
-
-import { DiscoverAssistantItem } from '@/types/discover';
-
-import HighlightBlock from '../../../../features/HighlightBlock';
-import TopicList from './TopicList';
-
-interface ConversationExampleProps extends FlexboxProps {
-  data?: DiscoverAssistantItem;
-  identifier: string;
-  mobile?: boolean;
-}
-
-const ConversationExample = memo<ConversationExampleProps>(({ data }) => {
-  const { t } = useTranslation('discover');
-  const theme = useTheme();
-
-  return (
-    <HighlightBlock
-      avatar={data?.meta.avatar}
-      height={720}
-      icon={BotMessageSquare}
-      justify={'space-between'}
-      style={{ background: theme.colorFillQuaternary }}
-      title={t('assistants.try')}
-    >
-      {!data ? (
-        <Center flex={1} width={'100%'}>
-          <Icon icon={LoaderCircle} size={'large'} spin />
-        </Center>
-      ) : (
-        <Flexbox
-          flex={1}
-          paddingBlock={16}
-          style={{ overflowX: 'hidden', overflowY: 'auto' }}
-          width={'100%'}
-        >
-          <ChatList
-            data={[
-              {
-                content: [t('assistants.conversation.l1', { name: data.meta.title }), '😎😋'].join(
-                  ' ',
-                ),
-                createAt: 1_686_437_950_084,
-                id: '1',
-                meta: {
-                  avatar: data.meta.avatar,
-                  title: data.meta.title,
-                },
-                role: 'assistant',
-                updateAt: 1_686_437_950_084,
-              },
-              {
-                content: [t('assistants.conversation.l2') + data.meta.description].join(' '),
-                createAt: 1_686_437_950_084,
-                id: '2',
-                meta: {
-                  avatar: data.meta.avatar,
-                  title: data.meta.title,
-                },
-                role: 'assistant',
-                updateAt: 1_686_437_950_084,
-              },
-              {
-                content: [t('assistants.conversation.l3'), '👇✨'].join(' '),
-                createAt: 1_686_437_950_084,
-                id: '3',
-                meta: {
-                  avatar: data.meta.avatar,
-                  title: data.meta.title,
-                },
-                role: 'assistant',
-                updateAt: 1_686_437_950_084,
-              },
-            ]}
-            renderActions={{
-              default: () => null,
-            }}
-            renderMessages={{
-              default: ({ id, editableContent }) => <div id={id}>{editableContent}</div>,
-            }}
-          />
-        </Flexbox>
-      )}
-      <Flexbox flex={'none'}>
-        {data?.examples && data.examples?.length > 0 && <TopicList data={data?.examples} />}
-        <ChatInputArea
-          style={{ background: 'none', border: 'none' }}
-          textAreaRightAddons={<ChatSendButton />}
-        />
-      </Flexbox>
-    </HighlightBlock>
-  );
-});
-
-export default ConversationExample;

package/src/app/[variants]/(main)/discover/(detail)/assistant/[slug]/features/Header.tsx

@@ -1,115 +0,0 @@
-'use client';
-
-import { Avatar, Button, Icon, Tag } from '@lobehub/ui';
-import { createStyles } from 'antd-style';
-import { startCase } from 'lodash-es';
-import { ChevronRight } from 'lucide-react';
-import Link from 'next/link';
-import qs from 'query-string';
-import { memo } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Flexbox } from 'react-layout-kit';
-import urlJoin from 'url-join';
-
-import { DiscoverAssistantItem } from '@/types/discover';
-
-import GitHubAvatar from '../../../../components/GitHubAvatar';
-import Back from '../../../features/Back';
-
-export const useStyles = createStyles(({ css, token }) => ({
-  tag: css`
-    border: none;
-    color: ${token.colorTextSecondary};
-    background: ${token.colorFillSecondary};
-  `,
-  time: css`
-    font-size: 12px;
-    color: ${token.colorTextDescription};
-  `,
-  title: css`
-    margin-block: 0;
-    font-size: 18px;
-    font-weight: bold;
-    line-height: 1.2;
-  `,
-}));
-
-interface HeaderProps {
-  data: DiscoverAssistantItem;
-  identifier: string;
-  mobile?: boolean;
-}
-
-const Header = memo<HeaderProps>(({ identifier, data, mobile }) => {
-  const { styles, theme } = useStyles();
-  const { t } = useTranslation('discover');
-
-  return (
-    <Flexbox gap={12} width={'100%'}>
-      {!mobile && <Back href={'/discover/assistants'} />}
-      <Flexbox align={'center'} gap={8} horizontal justify={'space-between'} width={'100%'}>
-        <Flexbox align={'center'} gap={16} horizontal justify={'flex-start'}>
-          <Avatar
-            alt={identifier}
-            animation
-            avatar={data.meta.avatar}
-            background={data?.meta.backgroundColor || theme.colorFillTertiary}
-            size={48}
-            style={{ flex: 'none' }}
-          />
-          <Flexbox gap={6}>
-            <h1 className={styles.title}>{data.meta.title}</h1>
-            <Flexbox align={'center'} gap={12} horizontal>
-              <Link href={data.homepage} target={'_blank'}>
-                <Flexbox align={'center'} gap={6} horizontal style={{ fontSize: 12 }}>
-                  <GitHubAvatar size={18} username={data.author} />
-                  <span>{data.author}</span>
-                </Flexbox>
-              </Link>
-              <time className={styles.time} dateTime={new Date(data.createdAt).toISOString()}>
-                {data.createdAt}
-              </time>
-            </Flexbox>
-          </Flexbox>
-        </Flexbox>
-        {!mobile && (
-          <Flexbox align={'center'} gap={4} horizontal justify={'flex-end'}>
-            <Link href={'/discover/assistants'}>
-              <Button className={styles.tag} shape={'round'} size={'small'}>
-                {t('tab.assistants')}
-              </Button>
-            </Link>
-            {data.meta?.category && (
-              <>
-                <Icon color={theme.colorTextSecondary} icon={ChevronRight} />
-                <Link href={urlJoin('/discover/assistants', data.meta.category)}>
-                  <Button className={styles.tag} shape={'round'} size={'small'}>
-                    {t(`category.assistant.${data.meta.category}`)}
-                  </Button>
-                </Link>
-              </>
-            )}
-          </Flexbox>
-        )}
-      </Flexbox>
-      <div>{data.meta.description}</div>
-      {data.meta.tags && (
-        <Flexbox gap={4} horizontal wrap={'wrap'}>
-          {data.meta.tags.map((tag) => (
-            <Link
-              href={qs.stringifyUrl({
-                query: { q: tag, type: 'assistants' },
-                url: '/discover/search',
-              })}
-              key={tag}
-            >
-              <Tag key={tag}>{startCase(tag).trim()}</Tag>
-            </Link>
-          ))}
-        </Flexbox>
-      )}
-    </Flexbox>
-  );
-});
-
-export default Header;

package/src/app/[variants]/(main)/discover/(detail)/assistant/[slug]/features/InfoSidebar/SuggestionItem.tsx

@@ -1,62 +0,0 @@
-import { Avatar } from '@lobehub/ui';
-import { Typography } from 'antd';
-import { createStyles } from 'antd-style';
-import { memo } from 'react';
-import { Flexbox, FlexboxProps } from 'react-layout-kit';
-
-import { DiscoverAssistantItem } from '@/types/discover';
-
-const { Paragraph, Title } = Typography;
-
-const useStyles = createStyles(({ css, token, isDarkMode }) => ({
-  banner: css`
-    opacity: ${isDarkMode ? 0.9 : 0.4};
-  `,
-  container: css`
-    cursor: pointer;
-    position: relative;
-    overflow: hidden;
-    height: 100%;
-  `,
-  desc: css`
-    margin-block-end: 0 !important;
-    color: ${token.colorTextDescription};
-  `,
-  title: css`
-    margin-block-end: 0 !important;
-    font-size: 16px !important;
-    font-weight: 500 !important;
-  `,
-}));
-
-export interface SuggestionItemProps
-  extends Omit<DiscoverAssistantItem, 'suggestions' | 'socialData' | 'category' | 'config'>,
-    FlexboxProps {}
-
-const SuggestionItem = memo<SuggestionItemProps>(({ className, meta, identifier }) => {
-  const { avatar, title, description, backgroundColor } = meta;
-
-  const { cx, styles, theme } = useStyles();
-
-  return (
-    <Flexbox className={cx(styles.container, className)} gap={12} key={identifier}>
-      <Flexbox align={'center'} gap={12} horizontal width={'100%'}>
-        <Avatar
-          alt={title}
-          avatar={avatar}
-          background={backgroundColor || theme.colorFillTertiary}
-          size={36}
-          title={title}
-        />
-        <Title className={styles.title} ellipsis={{ rows: 1, tooltip: title }} level={3}>
-          {title}
-        </Title>
-      </Flexbox>
-      <Paragraph className={styles.desc} ellipsis={{ rows: 2 }}>
-        {description}
-      </Paragraph>
-    </Flexbox>
-  );
-});
-
-export default SuggestionItem;

package/src/app/[variants]/(main)/discover/(detail)/assistant/[slug]/features/InfoSidebar/ToolItem.tsx

@@ -1,19 +0,0 @@
-import { Avatar } from '@lobehub/ui';
-import { useTheme } from 'antd-style';
-import { memo } from 'react';
-import { Flexbox } from 'react-layout-kit';
-
-import { DiscoverPlugintem } from '@/types/discover';
-
-const ToolItem = memo<DiscoverPlugintem>(({ meta }) => {
-  const theme = useTheme();
-
-  return (
-    <Flexbox align={'center'} gap={12} horizontal>
-      <Avatar avatar={meta?.avatar || '🧩'} background={theme.colorFillTertiary} size={36} />
-      <span style={{ fontSize: 16, fontWeight: 500 }}>{meta?.title}</span>
-    </Flexbox>
-  );
-});
-
-export default ToolItem;

package/src/app/[variants]/(main)/discover/(detail)/assistant/[slug]/features/InfoSidebar/index.tsx

@@ -1,60 +0,0 @@
-'use client';
-
-import { Skeleton } from 'antd';
-import Link from 'next/link';
-import { memo } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Flexbox } from 'react-layout-kit';
-import urlJoin from 'url-join';
-
-import { DiscoverAssistantItem, DiscoverPlugintem } from '@/types/discover';
-
-import Block from '../../../../features/Block';
-import SuggestionItem from './SuggestionItem';
-import ToolItem from './ToolItem';
-
-interface InfoSidebarProps {
-  data: DiscoverAssistantItem;
-  identifier: string;
-  pluginData?: DiscoverPlugintem[];
-}
-
-const InfoSidebar = memo<InfoSidebarProps>(({ pluginData, data }) => {
-  const { t } = useTranslation('discover');
-
-  return (
-    <Flexbox gap={48} style={{ position: 'relative' }} width={'100%'}>
-      {pluginData && pluginData?.length > 0 && (
-        <Block gap={12} title={t('assistants.plugins')}>
-          {pluginData.map((item) => (
-            <Link
-              href={urlJoin('/discover/plugin', item.identifier)}
-              key={item.identifier}
-              style={{ color: 'inherit' }}
-            >
-              <ToolItem {...item} />
-            </Link>
-          ))}
-        </Block>
-      )}
-      <Block
-        gap={24}
-        more={t('assistants.more')}
-        moreLink={urlJoin('/discover/assistants', data.meta?.category || '')}
-        title={t('assistants.suggestions')}
-      >
-        {data?.suggestions?.length > 0 ? (
-          data?.suggestions.map((item) => (
-            <Link href={urlJoin('/discover/assistant', item.identifier)} key={item.identifier}>
-              <SuggestionItem {...item} />
-            </Link>
-          ))
-        ) : (
-          <Skeleton active paragraph={{ rows: 5 }} title={false} />
-        )}
-      </Block>
-    </Flexbox>
-  );
-});
-
-export default InfoSidebar;