@lobehub/chat 0.150.3 → 0.150.5

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # Changelog
 
+### [Version 0.150.5](https://github.com/lobehub/lobe-chat/compare/v0.150.4...v0.150.5)
+
+<sup>Released on **2024-04-27**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix the plugin string env and search error.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix the plugin string env and search error, closes [#2239](https://github.com/lobehub/lobe-chat/issues/2239) ([74b1ae0](https://github.com/lobehub/lobe-chat/commit/74b1ae0))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 0.150.4](https://github.com/lobehub/lobe-chat/compare/v0.150.3...v0.150.4)
+
+<sup>Released on **2024-04-27**</sup>
+
+#### 💄 Styles
+
+- **misc**: Hide default model tag and show ollama provider by default.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Styles
+
+- **misc**: Hide default model tag and show ollama provider by default, closes [#2238](https://github.com/lobehub/lobe-chat/issues/2238) ([baa4780](https://github.com/lobehub/lobe-chat/commit/baa4780))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 0.150.3](https://github.com/lobehub/lobe-chat/compare/v0.150.2...v0.150.3)
 
 <sup>Released on **2024-04-27**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.150.3",
+  "version": "0.150.5",
   "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/chat/features/SessionListContent/List/Item/index.tsx

@@ -3,6 +3,7 @@ import { Flexbox } from 'react-layout-kit';
 import { shallow } from 'zustand/shallow';
 
 import ModelTag from '@/components/ModelTag';
+import { useAgentStore } from '@/store/agent';
 import { useChatStore } from '@/store/chat';
 import { useSessionStore } from '@/store/session';
 import { sessionHelpers } from '@/store/session/helpers';
@@ -19,6 +20,7 @@ interface SessionItemProps {
 const SessionItem = memo<SessionItemProps>(({ id }) => {
   const [open, setOpen] = useState(false);
   const [createGroupModalOpen, setCreateGroupModalOpen] = useState(false);
+  const [defaultModel] = useAgentStore((s) => [s.defaultAgentConfig.model]);
 
   const [active] = useSessionStore((s) => [s.activeId === id]);
   const [loading] = useChatStore((s) => [!!s.chatLoadingId && id === s.activeId]);
@@ -40,6 +42,8 @@ const SessionItem = memo<SessionItemProps>(({ id }) => {
       ];
     });
 
+  const showModel = model !== defaultModel;
+
   const actions = useMemo(
     () => (
       <Actions
@@ -54,12 +58,12 @@ const SessionItem = memo<SessionItemProps>(({ id }) => {
 
   const addon = useMemo(
     () =>
-      model && (
+      !showModel ? undefined : (
         <Flexbox gap={4} horizontal style={{ flexWrap: 'wrap' }}>
           <ModelTag model={model} />
         </Flexbox>
       ),
-    [model],
+    [showModel, model],
   );
 
   return (

package/src/app/chat/features/SessionSearchBar/index.tsx

@@ -8,9 +8,10 @@ import { useSessionStore } from '@/store/session';
 const SessionSearchBar = memo<{ mobile?: boolean }>(({ mobile: controlledMobile }) => {
   const { t } = useTranslation('chat');
 
-  const [keywords, useSearchSessions] = useSessionStore((s) => [
+  const [keywords, useSearchSessions, updateSearchKeywords] = useSessionStore((s) => [
     s.sessionSearchKeywords,
     s.useSearchSessions,
+    s.updateSearchKeywords,
   ]);
 
   const { isValidating } = useSearchSessions(keywords);
@@ -24,12 +25,7 @@ const SessionSearchBar = memo<{ mobile?: boolean }>(({ mobile: controlledMobile
       enableShortKey={!mobile}
       loading={isValidating}
       onChange={(e) => {
-        const newKeywords = e.target.value;
-
-        useSessionStore.setState({
-          isSearching: !!newKeywords,
-          sessionSearchKeywords: newKeywords,
-        });
+        updateSearchKeywords(e.target.value);
       }}
       placeholder={t('searchAgentPlaceholder')}
       shortKey={'k'}

package/src/app/settings/agent/Agent.tsx

@@ -3,11 +3,13 @@ import { memo } from 'react';
 
 import { INBOX_SESSION_ID } from '@/const/session';
 import AgentSetting from '@/features/AgentSetting';
+import { useAgentStore } from '@/store/agent';
+import { agentSelectors } from '@/store/agent/selectors';
 import { useGlobalStore } from '@/store/global';
 import { settingsSelectors } from '@/store/global/selectors';
 
 const Agent = memo(() => {
-  const config = useGlobalStore(settingsSelectors.defaultAgentConfig, isEqual);
+  const config = useAgentStore(agentSelectors.defaultAgentConfig, isEqual);
   const meta = useGlobalStore(settingsSelectors.defaultAgentMeta, isEqual);
   const [updateAgent] = useGlobalStore((s) => [s.updateDefaultAgent]);
 

package/src/app/settings/llm/OpenAI/index.tsx

@@ -13,6 +13,7 @@ const OpenAIProvider = memo(() => {
       modelList={{ showModelFetcher: true }}
       provider={'openai'}
       showApiKey={showOpenAIApiKey}
+      showBrowserRequest
       showEndpoint={showOpenAIProxyUrl}
       title={<OpenAI.Combine size={24} />}
     />

package/src/app/settings/llm/index.tsx

@@ -30,8 +30,8 @@ export default memo(() => {
     <>
       <PageTitle title={t('tab.llm')} />
       <OpenAI />
-      <Azure />
       <Ollama />
+      <Azure />
       <Google />
       <Anthropic />
       <Bedrock />

package/src/config/server/provider.ts

@@ -71,8 +71,8 @@ declare global {
       AWS_SECRET_ACCESS_KEY?: string;
 
       // Ollama Provider;
+      ENABLE_OLLAMA?: string;
       OLLAMA_PROXY_URL?: string;
-
       OLLAMA_MODEL_LIST?: string;
 
       /**
@@ -119,8 +119,6 @@ export const getProviderConfig = () => {
 
   const TOGETHERAI_API_KEY = process.env.TOGETHERAI_API_KEY || '';
 
-  const OLLAMA_PROXY_URL = process.env.OLLAMA_PROXY_URL || '';
-
   // region format: iad1,sfo1
   let regions: string[] = [];
   if (process.env.OPENAI_FUNCTION_REGIONS) {
@@ -200,8 +198,8 @@ export const getProviderConfig = () => {
     AWS_ACCESS_KEY_ID: AWS_ACCESS_KEY_ID,
     AWS_SECRET_ACCESS_KEY: process.env.AWS_SECRET_ACCESS_KEY || '',
 
-    ENABLE_OLLAMA: !!OLLAMA_PROXY_URL,
-    OLLAMA_PROXY_URL: OLLAMA_PROXY_URL,
+    ENABLE_OLLAMA: process.env.ENABLE_OLLAMA as unknown as boolean,
+    OLLAMA_PROXY_URL: process.env.OLLAMA_PROXY_URL || '',
     OLLAMA_MODEL_LIST: process.env.OLLAMA_MODEL_LIST || process.env.OLLAMA_CUSTOM_MODELS,
   };
 };

package/src/const/settings/index.ts

@@ -101,7 +101,7 @@ export const DEFAULT_LLM_CONFIG: GlobalLLMConfig = {
     enabledModels: filterEnabledModels(MoonshotProviderCard),
   },
   ollama: {
-    enabled: false,
+    enabled: true,
     enabledModels: filterEnabledModels(OllamaProviderCard),
     endpoint: '',
     fetchOnClient: true,

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

@@ -81,15 +81,15 @@ class _SessionModel extends BaseModel {
   async queryByKeyword(keyword: string): Promise<LobeSessions> {
     if (!keyword) return [];
 
-    console.time('queryByKeyword');
+    const startTime = Date.now();
     const keywordLowerCase = keyword.toLowerCase();
 
     // First, filter sessions by title and description
     const matchingSessionsPromise = this.table
       .filter((session) => {
         return (
-          session.meta.title.toLowerCase().includes(keywordLowerCase) ||
-          session.meta.description.toLowerCase().includes(keywordLowerCase)
+          session.meta.title?.toLowerCase().includes(keywordLowerCase) ||
+          session.meta.description?.toLowerCase().includes(keywordLowerCase)
         );
       })
       .toArray();
@@ -112,7 +112,7 @@ class _SessionModel extends BaseModel {
     //  match topics
     const matchingTopicsPromise = this.db.topics
       .filter((topic) => {
-        return topic.title.toLowerCase().includes(keywordLowerCase);
+        return topic.title?.toLowerCase().includes(keywordLowerCase);
       })
       .toArray();
 
@@ -139,7 +139,7 @@ class _SessionModel extends BaseModel {
       .anyOf([...combinedSessionIds])
       .toArray();
 
-    console.timeEnd('queryByKeyword');
+    console.log(`检索到 ${items.length} 项，耗时 ${Date.now() - startTime}ms`);
     return this.mapToAgentSessions(items);
   }
 

package/src/server/routers/config/parseDefaultAgent.test.ts

@@ -110,6 +110,20 @@ describe('parseAgentConfig', () => {
       };
       expect(parseAgentConfig(envStr)).toEqual(expected);
     });
+
+    it('should parsers plugins correctly', () => {
+      const envStr =
+        'enableAutoCreateTopic=true;model=gemini-pro;provider=google;plugins=lobe-image-designer';
+
+      const expected = {
+        enableAutoCreateTopic: true,
+        model: 'gemini-pro',
+        plugins: ['lobe-image-designer'],
+        provider: 'google',
+      };
+
+      expect(parseAgentConfig(envStr)).toEqual(expected);
+    });
   });
 
   describe('Error Boundary', () => {

package/src/server/routers/config/parseDefaultAgent.ts

@@ -35,6 +35,11 @@ export const parseAgentConfig = (envStr: string) => {
       finalValue = array.map((item) => (isNaN(item as any) ? item : Number(item)));
     }
 
+    // handle plugins if it's a string
+    if (key === 'plugins') {
+      finalValue = typeof finalValue === 'string' ? [finalValue] : finalValue;
+    }
+
     set(config, key, finalValue);
   }
 

package/src/store/agent/slices/chat/__snapshots__/selectors.test.ts.snap

@@ -0,0 +1,28 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`agentSelectors > defaultAgentConfig > should merge DEFAULT_AGENT_CONFIG and defaultAgent(s).config correctly 1`] = `
+{
+  "autoCreateTopicThreshold": 2,
+  "displayMode": "chat",
+  "enableAutoCreateTopic": true,
+  "historyCount": 1,
+  "model": "gpt-3.5-turbo",
+  "params": {
+    "frequency_penalty": 0,
+    "presence_penalty": 0,
+    "temperature": 0.7,
+    "top_p": 1,
+  },
+  "plugins": [],
+  "provider": "openai",
+  "systemRole": "user",
+  "tts": {
+    "showAllLocaleVoice": false,
+    "sttLocale": "auto",
+    "ttsService": "openai",
+    "voice": {
+      "openai": "alloy",
+    },
+  },
+}
+`;

package/src/store/agent/slices/chat/selectors.test.ts

@@ -3,6 +3,9 @@ import { describe, expect, it } from 'vitest';
 import { INBOX_SESSION_ID } from '@/const/session';
 import { DEFAULT_AGENT_CONFIG, DEFAUTT_AGENT_TTS_CONFIG } from '@/const/settings';
 import { AgentStore } from '@/store/agent';
+import { GlobalStore } from '@/store/global';
+import { settingsSelectors } from '@/store/global/slices/settings/selectors';
+import { LobeAgentConfig } from '@/types/agent';
 
 import { agentSelectors } from './selectors';
 
@@ -16,6 +19,24 @@ const mockSessionStore = {
 } as AgentStore;
 
 describe('agentSelectors', () => {
+  describe('defaultAgentConfig', () => {
+    it('should merge DEFAULT_AGENT_CONFIG and defaultAgent(s).config correctly', () => {
+      const s = {
+        defaultAgentConfig: {
+          systemRole: 'user',
+          model: 'gpt-3.5-turbo',
+          params: {
+            temperature: 0.7,
+          },
+        },
+      } as unknown as AgentStore;
+
+      const result = agentSelectors.defaultAgentConfig(s);
+
+      expect(result).toMatchSnapshot();
+    });
+  });
+
   describe('currentAgentConfig', () => {
     it('should return the merged default and session-specific agent config', () => {
       const config = agentSelectors.currentAgentConfig(mockSessionStore);

package/src/store/agent/slices/chat/selectors.ts

@@ -1,7 +1,7 @@
 import { VoiceList } from '@lobehub/tts';
 
 import { INBOX_SESSION_ID } from '@/const/session';
-import { DEFAUTT_AGENT_TTS_CONFIG } from '@/const/settings';
+import { DEFAULT_AGENT_CONFIG, DEFAUTT_AGENT_TTS_CONFIG } from '@/const/settings';
 import { AgentStore } from '@/store/agent';
 import { LobeAgentConfig, LobeAgentTTSConfig } from '@/types/agent';
 import { merge } from '@/utils/merge';
@@ -9,6 +9,9 @@ import { merge } from '@/utils/merge';
 const isInboxSession = (s: AgentStore) => s.activeId === INBOX_SESSION_ID;
 
 // ==========   Config   ============== //
+
+const defaultAgentConfig = (s: AgentStore) => merge(DEFAULT_AGENT_CONFIG, s.defaultAgentConfig);
+
 const currentAgentConfig = (s: AgentStore): LobeAgentConfig =>
   merge(s.defaultAgentConfig, s.agentConfig);
 
@@ -77,6 +80,7 @@ export const agentSelectors = {
   currentAgentSystemRole,
   currentAgentTTS,
   currentAgentTTSVoice,
+  defaultAgentConfig,
   hasSystemRole,
   isInboxSession,
 };

package/src/store/global/slices/settings/actions/llm.test.ts

@@ -138,8 +138,8 @@ describe('LLMSettingsSliceAction', () => {
       const enabledProviders = modelProviderSelectors.modelProviderListForModelSelect(
         result.current,
       );
-      expect(enabledProviders).toHaveLength(2);
-      expect(enabledProviders[1].id).toBe('perplexity');
+      expect(enabledProviders).toHaveLength(3);
+      expect(enabledProviders.at(-1)!.id).toBe('perplexity');
     });
   });
 });

package/src/store/global/slices/settings/selectors/__snapshots__/selectors.test.ts.snap

@@ -99,33 +99,6 @@ exports[`settingsSelectors > defaultAgent > should merge DEFAULT_AGENT and s.set
 }
 `;
 
-exports[`settingsSelectors > defaultAgentConfig > should merge DEFAULT_AGENT_CONFIG and defaultAgent(s).config correctly 1`] = `
-{
-  "autoCreateTopicThreshold": 2,
-  "displayMode": "chat",
-  "enableAutoCreateTopic": true,
-  "historyCount": 1,
-  "model": "gpt-3.5-turbo",
-  "params": {
-    "frequency_penalty": 0,
-    "presence_penalty": 0,
-    "temperature": 0.7,
-    "top_p": 1,
-  },
-  "plugins": [],
-  "provider": "openai",
-  "systemRole": "user",
-  "tts": {
-    "showAllLocaleVoice": false,
-    "sttLocale": "auto",
-    "ttsService": "openai",
-    "voice": {
-      "openai": "alloy",
-    },
-  },
-}
-`;
-
 exports[`settingsSelectors > defaultAgentMeta > should merge DEFAULT_AGENT_META and defaultAgent(s).meta correctly 1`] = `
 {
   "avatar": "agent-avatar.jpg",

package/src/store/global/slices/settings/selectors/selectors.test.ts

@@ -79,28 +79,6 @@ describe('settingsSelectors', () => {
     });
   });
 
-  describe('defaultAgentConfig', () => {
-    it('should merge DEFAULT_AGENT_CONFIG and defaultAgent(s).config correctly', () => {
-      const s = {
-        settings: {
-          defaultAgent: {
-            config: {
-              systemRole: 'user',
-              model: 'gpt-3.5-turbo',
-              params: {
-                temperature: 0.7,
-              },
-            },
-          },
-        },
-      } as unknown as GlobalStore;
-
-      const result = settingsSelectors.defaultAgentConfig(s);
-
-      expect(result).toMatchSnapshot();
-    });
-  });
-
   describe('defaultAgentMeta', () => {
     it('should merge DEFAULT_AGENT_META and defaultAgent(s).meta correctly', () => {
       const s = {

package/src/store/global/slices/settings/selectors/settings.ts

@@ -1,6 +1,6 @@
 import { DEFAULT_LANG } from '@/const/locale';
 import { DEFAULT_AGENT_META } from '@/const/meta';
-import { DEFAULT_AGENT, DEFAULT_AGENT_CONFIG, DEFAULT_TTS_CONFIG } from '@/const/settings';
+import { DEFAULT_AGENT, DEFAULT_TTS_CONFIG } from '@/const/settings';
 import { Locales } from '@/locales/resources';
 import { GeneralModelProviderConfig, GlobalLLMProviderKey, GlobalSettings } from '@/types/settings';
 import { isOnServerSide } from '@/utils/env';
@@ -22,8 +22,6 @@ const currentTTS = (s: GlobalStore) => merge(DEFAULT_TTS_CONFIG, currentSettings
 
 const defaultAgent = (s: GlobalStore) => merge(DEFAULT_AGENT, currentSettings(s).defaultAgent);
 
-const defaultAgentConfig = (s: GlobalStore) => merge(DEFAULT_AGENT_CONFIG, defaultAgent(s).config);
-
 const defaultAgentMeta = (s: GlobalStore) => merge(DEFAULT_AGENT_META, defaultAgent(s).meta);
 
 // TODO: Maybe we can also export settings difference
@@ -55,7 +53,6 @@ export const settingsSelectors = {
   currentTTS,
   dalleConfig,
   defaultAgent,
-  defaultAgentConfig,
   defaultAgentMeta,
   exportSettings,
   isDalleAutoGenerating,

package/src/store/session/slices/session/action.ts

@@ -70,6 +70,8 @@ export interface SessionAction {
    */
   removeSession: (id: string) => Promise<void>;
 
+  updateSearchKeywords: (keywords: string) => void;
+
   useFetchSessions: () => SWRResponse<ChatSessionList>;
   useSearchSessions: (keyword?: string) => SWRResponse<any>;
 
@@ -169,6 +171,13 @@ export const createSessionSlice: StateCreator<
     }
   },
 
+  updateSearchKeywords: (keywords) => {
+    set(
+      { isSearching: !!keywords, sessionSearchKeywords: keywords },
+      false,
+      n('updateSearchKeywords'),
+    );
+  },
   updateSessionGroupId: async (sessionId, group) => {
     await get().internal_updateSession(sessionId, { group });
   },