npm - @lobehub/chat - Versions diffs - 0.147.14 → 0.147.16 - Mend

@lobehub/chat 0.147.14 → 0.147.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (32) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -2,6 +2,56 @@
 # Changelog
+### [Version 0.147.16](https://github.com/lobehub/lobe-chat/compare/v0.147.15...v0.147.16)
+<sup>Released on **2024-04-14**</sup>
+#### ♻ Code Refactoring
+- **misc**: Refactor the auth.
+<br/>
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+#### Code refactoring
+- **misc**: Refactor the auth, closes [#2043](https://github.com/lobehub/lobe-chat/issues/2043) ([37ecb41](https://github.com/lobehub/lobe-chat/commit/37ecb41))
+</details>
+<div align="right">
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+</div>
+### [Version 0.147.15](https://github.com/lobehub/lobe-chat/compare/v0.147.14...v0.147.15)
+<sup>Released on **2024-04-14**</sup>
+#### 🐛 Bug Fixes
+- **misc**: Fix tool call error with gpt-4-turbo.
+<br/>
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+#### What's fixed
+- **misc**: Fix tool call error with gpt-4-turbo, closes [#2042](https://github.com/lobehub/lobe-chat/issues/2042) ([63d91b8](https://github.com/lobehub/lobe-chat/commit/63d91b8))
+</details>
+<div align="right">
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+</div>
 ### [Version 0.147.14](https://github.com/lobehub/lobe-chat/compare/v0.147.13...v0.147.14)
 <sup>Released on **2024-04-14**</sup>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.147.14",
+  "version": "0.147.16",
   "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/api/auth/[...nextauth]/route.ts CHANGED Viewed

@@ -1,3 +1,3 @@
-export { GET, POST } from '../next-auth';
+export { GET, POST } from '@/libs/next-auth';
 export const runtime = 'edge'; // optional

package/src/app/chat/(desktop)/features/ChatInput/Footer/index.tsx CHANGED Viewed

@@ -56,7 +56,11 @@ const useStyles = createStyles(({ css, prefixCls, token }) => {
 const isMac = isMacOS();
-const Footer = memo<{ setExpand?: (expand: boolean) => void }>(({ setExpand }) => {
+interface FooterProps {
+  setExpand?: (expand: boolean) => void;
+}
+const Footer = memo<FooterProps>(({ setExpand }) => {
   const { t } = useTranslation('chat');
   const { theme, styles } = useStyles();
@@ -193,4 +197,6 @@ const Footer = memo<{ setExpand?: (expand: boolean) => void }>(({ setExpand }) =
   );
 });
+Footer.displayName = 'Footer';
 export default Footer;

package/src/app/chat/(desktop)/features/ChatInput/TextArea.tsx CHANGED Viewed

@@ -31,7 +31,11 @@ const useStyles = createStyles(({ css }) => {
   };
 });
-const InputArea = memo<{ setExpand?: (expand: boolean) => void }>(({ setExpand }) => {
+interface InputAreaProps {
+  setExpand?: (expand: boolean) => void;
+}
+const InputArea = memo<InputAreaProps>(({ setExpand }) => {
   const { t } = useTranslation('chat');
   const { styles } = useStyles();
   const ref = useRef<TextAreaRef>(null);
@@ -119,4 +123,6 @@ const InputArea = memo<{ setExpand?: (expand: boolean) => void }>(({ setExpand }
   );
 });
+InputArea.displayName = 'InputArea';
 export default InputArea;

package/src/app/layout.tsx CHANGED Viewed

@@ -7,8 +7,8 @@ import { isRtlLang } from 'rtl-detect';
 import Analytics from '@/components/Analytics';
 import { DEFAULT_LANG, LOBE_LOCALE_COOKIE } from '@/const/locale';
 import AuthProvider from '@/layout/AuthProvider';
-import GlobalLayout from '@/layout/GlobalLayout';
 import GlobalProvider from '@/layout/GlobalProvider';
+import LayoutRoutes from '@/layout/routes';
 import { isMobileDevice } from '@/utils/responsive';
 const RootLayout = async ({ children }: PropsWithChildren) => {
@@ -22,7 +22,7 @@ const RootLayout = async ({ children }: PropsWithChildren) => {
       <body>
         <GlobalProvider>
           <AuthProvider>
-            <GlobalLayout>{children}</GlobalLayout>
+            <LayoutRoutes>{children}</LayoutRoutes>
           </AuthProvider>
         </GlobalProvider>
         <Analytics />

package/src/config/modelProviders/openai.ts CHANGED Viewed

@@ -102,7 +102,7 @@ const OpenAI: ModelProviderCard = {
     },
     {
       description: 'GPT-4 Turbo 视觉版',
-      displayName: 'GPT-4 Turbo Vision',
+      displayName: 'GPT-4 Turbo',
       enabled: true,
       functionCall: true,
       id: 'gpt-4-turbo',

package/src/config/server/app.ts CHANGED Viewed

@@ -57,24 +57,6 @@ export const getAppConfig = () => {
     PLUGIN_SETTINGS: process.env.PLUGIN_SETTINGS,
-    ENABLE_OAUTH_SSO: !!process.env.ENABLE_OAUTH_SSO,
-    SSO_PROVIDERS: process.env.SSO_PROVIDERS || 'auth0',
-    AUTH0_CLIENT_ID: process.env.AUTH0_CLIENT_ID || '',
-    AUTH0_CLIENT_SECRET: process.env.AUTH0_CLIENT_SECRET || '',
-    AUTH0_ISSUER: process.env.AUTH0_ISSUER || '',
-    GITHUB_CLIENT_ID: process.env.GITHUB_CLIENT_ID || '',
-    GITHUB_CLIENT_SECRET: process.env.GITHUB_CLIENT_SECRET || '',
-    AZURE_AD_CLIENT_ID: process.env.AZURE_AD_CLIENT_ID || '',
-    AZURE_AD_CLIENT_SECRET: process.env.AZURE_AD_CLIENT_SECRET || '',
-    AZURE_AD_TENANT_ID: process.env.AZURE_AD_TENANT_ID || '',
-    AUTHENTIK_CLIENT_ID: process.env.AUTHENTIK_CLIENT_ID || '',
-    AUTHENTIK_CLIENT_SECRET: process.env.AUTHENTIK_CLIENT_SECRET || '',
-    AUTHENTIK_ISSUER: process.env.AUTHENTIK_ISSUER || '',
-    ZITADEL_CLIENT_ID: process.env.ZITADEL_CLIENT_ID || '',
-    ZITADEL_CLIENT_SECRET: process.env.ZITADEL_CLIENT_SECRET || '',
-    ZITADEL_ISSUER: process.env.ZITADEL_ISSUER || '',
-    NEXTAUTH_SECRET: process.env.NEXTAUTH_SECRET || '',
     ENABLE_LANGFUSE: process.env.ENABLE_LANGFUSE === '1',
     LANGFUSE_SECRET_KEY: process.env.LANGFUSE_SECRET_KEY || '',
     LANGFUSE_PUBLIC_KEY: process.env.LANGFUSE_PUBLIC_KEY || '',

package/src/config/server/auth.ts ADDED Viewed

@@ -0,0 +1,71 @@
+/* eslint-disable sort-keys-fix/sort-keys-fix , typescript-sort-keys/interface */
+declare global {
+  // eslint-disable-next-line @typescript-eslint/no-namespace
+  namespace NodeJS {
+    interface ProcessEnv {
+      ENABLE_OAUTH_SSO?: string;
+      SSO_PROVIDERS?: string;
+      AUTH0_CLIENT_ID?: string;
+      AUTH0_CLIENT_SECRET?: string;
+      AUTH0_ISSUER?: string;
+      // Github
+      GITHUB_CLIENT_ID?: string;
+      GITHUB_CLIENT_SECRET?: string;
+      // Azure AD
+      AZURE_AD_CLIENT_ID?: string;
+      AZURE_AD_CLIENT_SECRET?: string;
+      AZURE_AD_TENANT_ID?: string;
+      // AUTHENTIK
+      AUTHENTIK_CLIENT_ID?: string;
+      AUTHENTIK_CLIENT_SECRET?: string;
+      AUTHENTIK_ISSUER?: string;
+      // ZITADEL
+      ZITADEL_CLIENT_ID?: string;
+      ZITADEL_CLIENT_SECRET?: string;
+      ZITADEL_ISSUER?: string;
+      NEXTAUTH_SECRET?: string;
+    }
+  }
+}
+export const getAuthConfig = () => {
+  if (typeof process === 'undefined') {
+    throw new Error('[Server Config] you are importing a server-only module outside of server');
+  }
+  return {
+    ENABLE_OAUTH_SSO: !!process.env.ENABLE_OAUTH_SSO,
+    SSO_PROVIDERS: process.env.SSO_PROVIDERS || 'auth0',
+    // Auth0
+    AUTH0_CLIENT_ID: process.env.AUTH0_CLIENT_ID || '',
+    AUTH0_CLIENT_SECRET: process.env.AUTH0_CLIENT_SECRET || '',
+    AUTH0_ISSUER: process.env.AUTH0_ISSUER || '',
+    // Github
+    GITHUB_CLIENT_ID: process.env.GITHUB_CLIENT_ID || '',
+    GITHUB_CLIENT_SECRET: process.env.GITHUB_CLIENT_SECRET || '',
+    // Azure AD
+    AZURE_AD_CLIENT_ID: process.env.AZURE_AD_CLIENT_ID || '',
+    AZURE_AD_CLIENT_SECRET: process.env.AZURE_AD_CLIENT_SECRET || '',
+    AZURE_AD_TENANT_ID: process.env.AZURE_AD_TENANT_ID || '',
+    // AUTHENTIK
+    AUTHENTIK_CLIENT_ID: process.env.AUTHENTIK_CLIENT_ID || '',
+    AUTHENTIK_CLIENT_SECRET: process.env.AUTHENTIK_CLIENT_SECRET || '',
+    AUTHENTIK_ISSUER: process.env.AUTHENTIK_ISSUER || '',
+    // ZITADEL
+    ZITADEL_CLIENT_ID: process.env.ZITADEL_CLIENT_ID || '',
+    ZITADEL_CLIENT_SECRET: process.env.ZITADEL_CLIENT_SECRET || '',
+    ZITADEL_ISSUER: process.env.ZITADEL_ISSUER || '',
+    NEXTAUTH_SECRET: process.env.NEXTAUTH_SECRET || '',
+  };
+};

package/src/config/server/index.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 import { getAnalyticsConfig } from './analytics';
 import { getAppConfig } from './app';
+import { getAuthConfig } from './auth';
 import { getProviderConfig } from './provider';
 export const getServerConfig = () => {
@@ -9,7 +10,8 @@ export const getServerConfig = () => {
   const provider = getProviderConfig();
   const app = getAppConfig();
+  const auth = getAuthConfig();
   const analytics = getAnalyticsConfig();
-  return { ...provider, ...app, ...analytics };
+  return { ...provider, ...app, ...analytics, ...auth };
 };

package/src/layout/AuthProvider/NextAuth/index.tsx ADDED Viewed

@@ -0,0 +1,10 @@
+import { SessionProvider } from 'next-auth/react';
+import { PropsWithChildren } from 'react';
+import { API_ENDPOINTS } from '@/services/_url';
+const NextAuth = ({ children }: PropsWithChildren) => {
+  return <SessionProvider basePath={API_ENDPOINTS.oauth}>{children}</SessionProvider>;
+};
+export default NextAuth;

package/src/layout/AuthProvider/index.tsx CHANGED Viewed

@@ -1,16 +1,12 @@
-import { SessionProvider } from 'next-auth/react';
 import { PropsWithChildren } from 'react';
 import { getServerConfig } from '@/config/server';
-import { API_ENDPOINTS } from '@/services/_url';
+import NextAuth from './NextAuth';
 const { ENABLE_OAUTH_SSO = false } = getServerConfig();
 const AuthProvider = ({ children }: PropsWithChildren) =>
-  ENABLE_OAUTH_SSO ? (
-    <SessionProvider basePath={API_ENDPOINTS.oauth}>{children}</SessionProvider>
-  ) : (
-    children
-  );
+  ENABLE_OAUTH_SSO ? <NextAuth>{children}</NextAuth> : children;
 export default AuthProvider;

package/src/layout/DefaultLayout/Desktop/SideBar/Avatar.tsx ADDED Viewed

@@ -0,0 +1,11 @@
+import { memo } from 'react';
+import AvatarWithUpload from '@/features/AvatarWithUpload';
+const Avatar = memo(() => {
+  return <AvatarWithUpload id={'avatar'} />;
+});
+Avatar.displayName = 'Avatar';
+export default Avatar;

package/src/layout/{GlobalLayout → DefaultLayout}/Desktop/SideBar/index.tsx RENAMED Viewed

@@ -1,9 +1,9 @@
 import { SideNav } from '@lobehub/ui';
 import { memo } from 'react';
-import AvatarWithUpload from '@/features/AvatarWithUpload';
 import { SidebarTabKey } from '@/store/global/initialState';
+import Avatar from './Avatar';
 import BottomActions from './BottomActions';
 import TopActions from './TopActions';
@@ -14,7 +14,7 @@ interface Props {
 export default memo<Props>(({ sidebarKey }) => {
   return (
     <SideNav
-      avatar={<AvatarWithUpload id={'avatar'} />}
+      avatar={<Avatar />}
       bottomActions={<BottomActions tab={sidebarKey} />}
       style={{ height: '100%' }}
       topActions={<TopActions tab={sidebarKey} />}

package/src/layout/{GlobalLayout/Mobile/Client.tsx → DefaultLayout/Mobile/index.tsx} RENAMED Viewed

@@ -1,3 +1,5 @@
+'use client';
 import { type MobileNavBarTitleProps } from '@lobehub/ui';
 import { createStyles } from 'antd-style';
 import dynamic from 'next/dynamic';

package/src/layout/DefaultLayout/index.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ export { default as DefaultLayoutDesktop } from './Desktop';
2	+ export { default as DefaultLayoutMobile } from './Mobile';

package/src/layout/{GlobalLayout/Desktop/index.tsx → routes/Desktop.tsx} RENAMED Viewed

@@ -3,14 +3,16 @@
 import { usePathname } from 'next/navigation';
 import { PropsWithChildren, memo } from 'react';
-import Client from './Client';
+import { DefaultLayoutDesktop } from '@/layout/DefaultLayout';
+const defaultLayoutRoutes = new Set(['/']);
 const DesktopLayout = memo<PropsWithChildren>(({ children }) => {
   const pathname = usePathname();
-  if (pathname === '/') return children;
+  if (defaultLayoutRoutes.has(pathname)) return children;
-  return <Client>{children}</Client>;
+  return <DefaultLayoutDesktop>{children}</DefaultLayoutDesktop>;
 });
 export default DesktopLayout;

package/src/layout/{GlobalLayout/Mobile/index.tsx → routes/Mobile.tsx} RENAMED Viewed

@@ -5,8 +5,7 @@ import { PropsWithChildren, memo } from 'react';
 import { useActiveTabKey } from '@/hooks/useActiveTabKey';
 import { useIsSubSlug } from '@/hooks/useIsSubSlug';
-import Layout from './Client';
+import { DefaultLayoutMobile } from '@/layout/DefaultLayout';
 const MobileLayout = memo<PropsWithChildren>(({ children }) => {
   const pathname = usePathname();
@@ -16,9 +15,9 @@ const MobileLayout = memo<PropsWithChildren>(({ children }) => {
   if (pathname === '/') return children;
   return (
-    <Layout showTabBar={!isSubPath} tabBarKey={tabBarKey}>
+    <DefaultLayoutMobile showTabBar={!isSubPath} tabBarKey={tabBarKey}>
       {children}
-    </Layout>
+    </DefaultLayoutMobile>
   );
 });

package/src/layout/{GlobalLayout → routes}/index.tsx RENAMED Viewed

@@ -3,6 +3,6 @@ import ServerLayout from '@/components/server/ServerLayout';
 import Desktop from './Desktop';
 import Mobile from './Mobile';
-const GlobalLayout = ServerLayout({ Desktop, Mobile });
+const LayoutRoutes = ServerLayout({ Desktop, Mobile });
-export default GlobalLayout;
+export default LayoutRoutes;

package/src/{app/api/auth/next-auth.ts → libs/next-auth/index.ts} RENAMED Viewed

@@ -32,7 +32,7 @@ const nextAuth = NextAuth({
     async session({ session, token }) {
       // Pick userid from token
       if (session.user) {
-        session.user.id = token.userId ?? session.user.id;
+        session.user.id = (token.userId ?? session.user.id) as string;
       }
       return session;
     },

package/src/middleware.ts CHANGED Viewed

@@ -1,8 +1,8 @@
 import { NextResponse } from 'next/server';
 import { getServerConfig } from '@/config/server';
+import { auth } from '@/libs/next-auth';
-import { auth } from './app/api/auth/next-auth';
 import { OAUTH_AUTHORIZED } from './const/auth';
 export const config = {

package/src/store/tool/selectors/tool.test.ts CHANGED Viewed

@@ -34,7 +34,14 @@ const mockState = {
       identifier: 'plugin-3',
       manifest: {
         identifier: 'plugin-3',
-        api: [{ name: 'api-3' }],
+        api: [
+          {
+            name: 'api-3',
+            url: 'bac',
+            description: '123123',
+            parameters: { type: 'object', properties: { a: { type: 'string' } } },
+          },
+        ],
       },
       type: 'customPlugin',
     },
@@ -132,6 +139,25 @@ describe('toolSelectors', () => {
       const result = toolSelectors.enabledSchema([])(mockState);
       expect(result).toEqual([]);
     });
+    // fix https://github.com/lobehub/lobe-chat/issues/2036
+    it('should not contain url', () => {
+      const result = toolSelectors.enabledSchema(['plugin-3'])(mockState);
+      expect(result[0].function).toEqual({
+        description: '123123',
+        name: 'plugin-3____api-3',
+        parameters: {
+          properties: {
+            a: {
+              type: 'string',
+            },
+          },
+          type: 'object',
+        },
+      });
+      expect(result[0].function).not.toHaveProperty('url');
+    });
   });
   describe('getPluginManifestLoadingStatus', () => {

package/src/store/tool/selectors/tool.ts CHANGED Viewed

@@ -40,8 +40,9 @@ const enabledSchema =
       .filter((m) => tools.includes(m?.identifier))
       .flatMap((manifest) =>
         manifest.api.map((m) => ({
-          ...m,
+          description: m.description,
           name: getAPIName(manifest.identifier, m.name, manifest.type),
+          parameters: m.parameters,
         })),
       );

/package/src/layout/{GlobalLayout → DefaultLayout}/Desktop/SideBar/BottomActions.tsx RENAMED Viewed

File without changes

/package/src/layout/{GlobalLayout → DefaultLayout}/Desktop/SideBar/TopActions.tsx RENAMED Viewed

File without changes

/package/src/layout/{GlobalLayout/Desktop/Client.tsx → DefaultLayout/Desktop/index.tsx} RENAMED Viewed

File without changes

/package/src/{app/api/auth → libs/next-auth}/sso-providers/auth0.ts RENAMED Viewed

File without changes

/package/src/{app/api/auth → libs/next-auth}/sso-providers/authentik.ts RENAMED Viewed

File without changes

/package/src/{app/api/auth → libs/next-auth}/sso-providers/azure-ad.ts RENAMED Viewed

File without changes

/package/src/{app/api/auth → libs/next-auth}/sso-providers/github.ts RENAMED Viewed

File without changes

/package/src/{app/api/auth → libs/next-auth}/sso-providers/index.ts RENAMED Viewed

File without changes

/package/src/{app/api/auth → libs/next-auth}/sso-providers/zitadel.ts RENAMED Viewed

File without changes