@lobehub/chat 1.47.1 → 1.47.3

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # Changelog
 
+### [Version 1.47.3](https://github.com/lobehub/lobe-chat/compare/v1.47.2...v1.47.3)
+
+<sup>Released on **2025-01-18**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix hydration error.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix hydration error, closes [#5502](https://github.com/lobehub/lobe-chat/issues/5502) ([cbe469a](https://github.com/lobehub/lobe-chat/commit/cbe469a))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 1.47.2](https://github.com/lobehub/lobe-chat/compare/v1.47.1...v1.47.2)
+
+<sup>Released on **2025-01-17**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix api key in api key form.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix api key in api key form, closes [#5498](https://github.com/lobehub/lobe-chat/issues/5498) ([b4a160b](https://github.com/lobehub/lobe-chat/commit/b4a160b))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 1.47.1](https://github.com/lobehub/lobe-chat/compare/v1.47.0...v1.47.1)
 
 <sup>Released on **2025-01-17**</sup>

package/changelog/v1.json

@@ -1,4 +1,22 @@
 [
+  {
+    "children": {
+      "fixes": [
+        "Fix hydration error."
+      ]
+    },
+    "date": "2025-01-18",
+    "version": "1.47.3"
+  },
+  {
+    "children": {
+      "fixes": [
+        "Fix api key in api key form."
+      ]
+    },
+    "date": "2025-01-17",
+    "version": "1.47.2"
+  },
   {
     "children": {},
     "date": "2025-01-17",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.47.1",
+  "version": "1.47.3",
   "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",
@@ -39,7 +39,7 @@
     "db:push-test": "NODE_ENV=test drizzle-kit push",
     "db:studio": "drizzle-kit studio",
     "db:z-pull": "drizzle-kit introspect",
-    "dev": "next dev --turbo -p 3010",
+    "dev": "next dev --turbopack -p 3010",
     "docs:i18n": "lobe-i18n md && npm run lint:md && npm run lint:mdx",
     "docs:seo": "lobe-seo && npm run lint:mdx",
     "i18n": "npm run workflow:i18n && lobe-i18n",

package/src/features/Conversation/Error/APIKeyForm/ProviderApiKeyForm.tsx

@@ -6,11 +6,10 @@ import { useTranslation } from 'react-i18next';
 
 import { useProviderName } from '@/hooks/useProviderName';
 import { featureFlagsSelectors, useServerConfigStore } from '@/store/serverConfig';
-import { useUserStore } from '@/store/user';
-import { keyVaultsConfigSelectors } from '@/store/user/selectors';
 import { GlobalLLMProviderKey } from '@/types/user/settings';
 
 import { FormAction } from '../style';
+import { useApiKey } from './useApiKey';
 
 interface ProviderApiKeyFormProps {
   apiKeyPlaceholder?: string;
@@ -25,11 +24,7 @@ const ProviderApiKeyForm = memo<ProviderApiKeyFormProps>(
     const { t: errorT } = useTranslation('error');
     const [showProxy, setShow] = useState(false);
 
-    const [apiKey, proxyUrl, setConfig] = useUserStore((s) => [
-      keyVaultsConfigSelectors.getVaultByProvider(provider)(s)?.apiKey,
-      keyVaultsConfigSelectors.getVaultByProvider(provider)(s)?.baseURL,
-      s.updateKeyVaultConfig,
-    ]);
+    const { apiKey, baseURL, setConfig } = useApiKey(provider);
     const { showOpenAIProxyUrl } = useServerConfigStore(featureFlagsSelectors);
     const providerName = useProviderName(provider);
 
@@ -58,7 +53,7 @@ const ProviderApiKeyForm = memo<ProviderApiKeyFormProps>(
               }}
               placeholder={'https://api.openai.com/v1'}
               type={'block'}
-              value={proxyUrl}
+              value={baseURL}
             />
           ) : (
             <Button

package/src/features/Conversation/Error/APIKeyForm/useApiKey.ts

@@ -0,0 +1,34 @@
+import isEqual from 'fast-deep-equal';
+
+import { isDeprecatedEdition } from '@/const/version';
+import { aiProviderSelectors, useAiInfraStore } from '@/store/aiInfra';
+import { useUserStore } from '@/store/user';
+import { keyVaultsConfigSelectors } from '@/store/user/selectors';
+
+export const useApiKey = (provider: string) => {
+  const [apiKey, baseURL, setConfig] = useUserStore((s) => [
+    keyVaultsConfigSelectors.getVaultByProvider(provider as any)(s)?.apiKey,
+    keyVaultsConfigSelectors.getVaultByProvider(provider as any)(s)?.baseURL,
+    s.updateKeyVaultConfig,
+  ]);
+
+  const updateAiProviderConfig = useAiInfraStore((s) => s.updateAiProviderConfig);
+  const data = useAiInfraStore(aiProviderSelectors.providerConfigById(provider), isEqual);
+
+  // TODO: remove this in V2
+  if (isDeprecatedEdition) return { apiKey, baseURL, setConfig };
+  //
+
+  return {
+    apiKey: data?.keyVaults.apiKey,
+    baseURL: data?.keyVaults?.baseURL,
+    setConfig: async (id: string, params: Record<string, string>) => {
+      await updateAiProviderConfig(id, {
+        keyVaults: {
+          ...data?.keyVaults,
+          ...params,
+        },
+      });
+    },
+  };
+};

package/src/hooks/useInterceptingRoutes.ts

@@ -4,8 +4,7 @@ import urlJoin from 'url-join';
 import { INBOX_SESSION_ID } from '@/const/session';
 import { useIsMobile } from '@/hooks/useIsMobile';
 import { useQueryRoute } from '@/hooks/useQueryRoute';
-import { useGlobalStore } from '@/store/global';
-import { ChatSettingsTabs, SettingsTabs, SidebarTabKey } from '@/store/global/initialState';
+import { ChatSettingsTabs, SettingsTabs } from '@/store/global/initialState';
 import { useSessionStore } from '@/store/session';
 
 export const useOpenChatSettings = (tab: ChatSettingsTabs = ChatSettingsTabs.Meta) => {
@@ -15,9 +14,6 @@ export const useOpenChatSettings = (tab: ChatSettingsTabs = ChatSettingsTabs.Met
 
   return useMemo(() => {
     if (activeId === INBOX_SESSION_ID) {
-      useGlobalStore.setState({
-        sidebarKey: SidebarTabKey.Setting,
-      });
       return () => router.push(urlJoin('/settings', SettingsTabs.Agent));
     }
     if (mobile) {

package/src/libs/trpc/client/lambda.ts

@@ -2,8 +2,6 @@ import { createTRPCClient, httpBatchLink } from '@trpc/client';
 import { createTRPCReact } from '@trpc/react-query';
 import superjson from 'superjson';
 
-import { fetchErrorNotification } from '@/components/Error/fetchErrorNotification';
-import { loginRequired } from '@/components/Error/loginRequiredNotification';
 import { ModelProvider } from '@/libs/agent-runtime';
 import type { LambdaRouter } from '@/server/routers/lambda';
 
@@ -17,6 +15,9 @@ const links = [
 
       const errorRes: ErrorResponse = await response.clone().json();
 
+      const { loginRequired } = await import('@/components/Error/loginRequiredNotification');
+      const { fetchErrorNotification } = await import('@/components/Error/fetchErrorNotification');
+
       errorRes.forEach((item) => {
         const errorData = item.error.json;
 

package/src/store/aiInfra/slices/aiProvider/selectors.ts

@@ -37,6 +37,17 @@ const isActiveProviderApiKeyNotEmpty = (s: AIProviderStoreState) => {
   return !!vault?.apiKey || !!vault?.accessKeyId || !!vault?.secretAccessKey;
 };
 
+const providerConfigById =
+  (id: string) =>
+  (s: AIProviderStoreState): AiProviderRuntimeConfig | undefined => {
+    if (!id) return undefined;
+
+    return s.aiProviderRuntimeConfig?.[id];
+  };
+
+const isProviderConfigUpdating = (id: string) => (s: AIProviderStoreState) =>
+  s.aiProviderConfigUpdatingIds.includes(id);
+
 /**
  * @description The conditions to enable client fetch
  * 1. If no baseUrl and apikey input, force on Server.
@@ -46,7 +57,7 @@ const isActiveProviderApiKeyNotEmpty = (s: AIProviderStoreState) => {
  */
 const isProviderFetchOnClient =
   (provider: GlobalLLMProviderKey | string) => (s: AIProviderStoreState) => {
-    const config = activeProviderConfig(s);
+    const config = providerConfigById(provider)(s);
 
     // If the provider already disable broswer request in model config, force on Server.
     if (isProviderDisableBroswerRequest(provider)) return false;
@@ -56,8 +67,8 @@ const isProviderFetchOnClient =
       return config?.fetchOnClient;
 
     // 1. If no baseUrl and apikey input, force on Server.
-    const isProviderEndpointNotEmpty = isActiveProviderEndpointNotEmpty(s);
-    const isProviderApiKeyNotEmpty = isActiveProviderApiKeyNotEmpty(s);
+    const isProviderEndpointNotEmpty = !!config?.keyVaults.baseURL;
+    const isProviderApiKeyNotEmpty = !!config?.keyVaults.apiKey;
     if (!isProviderEndpointNotEmpty && !isProviderApiKeyNotEmpty) return false;
 
     // 2. If only contains baseUrl, force on Client
@@ -76,17 +87,6 @@ const providerKeyVaults = (provider: string | undefined) => (s: AIProviderStoreS
   return s.aiProviderRuntimeConfig?.[provider]?.keyVaults;
 };
 
-const providerConfigById =
-  (id: string) =>
-  (s: AIProviderStoreState): AiProviderRuntimeConfig | undefined => {
-    if (!id) return undefined;
-
-    return s.aiProviderRuntimeConfig?.[id];
-  };
-
-const isProviderConfigUpdating = (id: string) => (s: AIProviderStoreState) =>
-  s.aiProviderConfigUpdatingIds.includes(id);
-
 export const aiProviderSelectors = {
   activeProviderConfig,
   disabledAiProviderList,

package/src/types/aiProvider.ts

@@ -201,7 +201,7 @@ export interface EnabledAiModel {
 
 export interface AiProviderRuntimeConfig {
   fetchOnClient?: boolean;
-  keyVaults: Record<string, object>;
+  keyVaults: Record<string, string>;
   settings: AiProviderSettings;
 }