@lobehub/chat 0.129.1 → 0.129.3

package/docs/usage/providers/ollama.mdx

@@ -0,0 +1,80 @@
+import { Callout, Steps, Tabs } from 'nextra/components';
+
+# Using Ollama in LobeChat
+
+<Image
+  alt={'Using Ollama in LobeChat'}
+  src={'https://github.com/lobehub/lobe-chat/assets/28616219/a2a091b8-ac45-4679-b5e0-21d711e17fef'}
+  cover
+/>
+
+Ollama is a powerful framework for running large language models (LLMs) locally, supporting various language models including Llama 2, Mistral, and more. Now, LobeChat supports integration with Ollama, meaning you can easily use the language models provided by Ollama to enhance your application within LobeChat.
+
+This document will guide you on how to use Ollama in LobeChat:
+
+<Steps>
+  ### Local Installation of Ollama
+
+First, you need to install Ollama, which supports macOS, Windows, and Linux systems. Depending on your operating system, choose one of the following installation methods:
+
+<Tabs items={['macOS', 'Linux', 'Windows (Preview)', 'Docker']}>
+<Tabs.Tab>[Download Ollama for macOS](https://ollama.com/download) and unzip it.</Tabs.Tab>
+<Tabs.Tab>
+
+````bash
+  Install using the following command:
+
+  ```bash
+  curl -fsSL https://ollama.com/install.sh | sh
+````
+
+Alternatively, you can refer to the [Linux manual installation guide](https://github.com/jmorganca/ollama/blob/main/docs/linux.md).
+
+</Tabs.Tab>
+<Tabs.Tab>[Download Ollama for Windows](https://ollama.com/download) and install it.</Tabs.Tab>
+<Tabs.Tab>
+
+If you prefer using Docker, Ollama also provides an official Docker image, which you can pull using the following command:
+
+```bash
+docker pull ollama/ollama
+```
+
+</Tabs.Tab>
+</Tabs>
+
+### Pulling Models to Local with Ollama
+
+After installing Ollama, you can install models locally, for example, llama2:
+
+```bash
+ollama pull llama2
+```
+
+Ollama supports various models, and you can view the available model list in the [Ollama Library](https://ollama.com/library) and choose the appropriate model based on your needs.
+
+</Steps>
+
+Next, you can start conversing with the local LLM using LobeChat.
+
+<Video
+  width={832}
+  height={468}
+  src="https://github.com/lobehub/lobe-chat/assets/28616219/063788c8-9fef-4c6b-b837-96668ad6bc41"
+/>
+
+<Callout type={'info'}>
+  You can visit [Integrating with Ollama](/en/self-hosting/examples/ollama) to learn how to deploy
+  LobeChat to meet the integration requirements with Ollama.
+</Callout>
+
+## Custom Configuration
+
+You can find Ollama's configuration options in `Settings` -> `Language Model`, where you can configure Ollama's proxy, model name, and more.
+
+<Image
+  alt={'Ollama Service Provider Settings'}
+  src={'https://github.com/lobehub/lobe-chat/assets/28616219/da0db930-78ce-4262-b648-2b9e43c565c3'}
+  width={832}
+  height={274}
+/>

package/docs/usage/providers/ollama.zh-CN.mdx

@@ -0,0 +1,80 @@
+import { Callout, Steps, Tabs } from 'nextra/components';
+
+# 在 LobeChat 中使用 Ollama
+
+<Image
+  alt={'在 LobeChat 中使用 Ollama'}
+  src={'https://github.com/lobehub/lobe-chat/assets/28616219/a2a091b8-ac45-4679-b5e0-21d711e17fef'}
+  cover
+/>
+
+Ollama 是一款强大的本地运行大型语言模型（LLM）的框架，支持多种语言模型，包括 Llama 2, Mistral 等。现在，LobeChat 已经支持与 Ollama 的集成，这意味着你可以在 LobeChat 中轻松使用 Ollama 提供的语言模型来增强你的应用。
+
+本文档将指导你如何在 LobeChat 中使用 Ollama：
+
+<Steps>
+  ### 本地安装 Ollama
+
+首先，你需要安装 Ollama，Ollama 支持 macOS、Windows 和 Linux 系统。 根据你的操作系统，选择以下安装方式之一：
+
+  <Tabs items={['macOS', 'Linux','Windows (预览版)','Docker']}>
+    <Tabs.Tab>[下载 Ollama for macOS](https://ollama.com/download) 并解压。</Tabs.Tab>
+    <Tabs.Tab>
+
+      通过以下命令安装：
+
+      ```bash
+      curl -fsSL https://ollama.com/install.sh | sh
+      ```
+
+      或者，你也可以参考 [Linux 手动安装指南](https://github.com/ollama/ollama/blob/main/docs/linux.md)。
+
+    </Tabs.Tab>
+    <Tabs.Tab>[下载 Ollama for Windows](https://ollama.com/download) 并安装。</Tabs.Tab>
+    <Tabs.Tab>
+
+      如果你更倾向于使用 Docker，Ollama 也提供了官方 Docker 镜像，你可以通过以下命令拉取：
+
+      ```bash
+      docker pull ollama/ollama
+      ```
+
+    </Tabs.Tab>
+
+  </Tabs>
+
+### 用 Ollama 拉取模型到本地
+
+在安装完成 Ollama 后，你可以通过以下命安装模型，以 llama2 为例：
+
+```bash
+ollama pull llama2
+```
+
+Ollama 支持多种模型，你可以在 [Ollama Library](https://ollama.com/library) 中查看可用的模型列表，并根据需求选择合适的模型。
+
+</Steps>
+
+接下来，你就可以使用 LobeChat 与本地 LLM 对话了。
+
+<Video
+  width={832}
+  height={468}
+  src="https://github.com/lobehub/lobe-chat/assets/28616219/95828c11-0ae5-4dfa-84ed-854124e927a6"
+/>
+
+<Callout type={'info'}>
+  你可以前往 [与 Ollama 集成](/zh/self-hosting/examples/ollama) 了解如何部署 LobeChat ，以满足与
+  Ollama 的集成需求。
+</Callout>
+
+## 自定义配置
+
+你可以在 `设置` -> `语言模型` 中找到 Ollama 的配置选项，你可以在这里配置 Ollama 的代理、模型名称等。
+
+<Image
+  alt={'Ollama 服务商设置'}
+  src={'https://github.com/lobehub/lobe-chat/assets/28616219/da0db930-78ce-4262-b648-2b9e43c565c3'}
+  width={832}
+  height={274}
+/>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.129.1",
+  "version": "0.129.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",
@@ -74,7 +74,7 @@
   },
   "dependencies": {
     "@ant-design/icons": "^5",
-    "@auth/core": "^0.26.3",
+    "@auth/core": "^0.27.0",
     "@aws-sdk/client-bedrock-runtime": "^3.503.1",
     "@azure/openai": "^1.0.0-beta.11",
     "@cfworker/json-schema": "^1",
@@ -82,7 +82,7 @@
     "@icons-pack/react-simple-icons": "^9",
     "@lobehub/chat-plugin-sdk": "latest",
     "@lobehub/chat-plugins-gateway": "latest",
-    "@lobehub/icons": "^1.11.1",
+    "@lobehub/icons": "^1.11.2",
     "@lobehub/tts": "latest",
     "@lobehub/ui": "^1.129.2",
     "@vercel/analytics": "^1",
@@ -107,7 +107,7 @@
     "modern-screenshot": "^4",
     "nanoid": "^5",
     "next": "^14.1",
-    "next-auth": "5.0.0-beta.11",
+    "next-auth": "beta",
     "next-sitemap": "^4.2.3",
     "numeral": "^2.0.6",
     "nuqs": "^1.15.4",

package/src/app/api/auth/next-auth.ts

@@ -6,10 +6,38 @@ import { getServerConfig } from '@/config/server';
 const { AUTH0_CLIENT_ID, ENABLE_OAUTH_SSO, AUTH0_CLIENT_SECRET, AUTH0_ISSUER, NEXTAUTH_SECRET } =
   getServerConfig();
 
+declare module '@auth/core/jwt' {
+  // Returned by the `jwt` callback and `auth`, when using JWT sessions
+  interface JWT {
+    userId?: string;
+  }
+}
+
 const nextAuth = NextAuth({
+  callbacks: {
+    // Note: Data processing order of callback: authorize --> jwt --> session
+    async jwt({ token, account }) {
+      // Auth.js will process the `providerAccountId` automatically
+      // ref: https://authjs.dev/reference/core/types#provideraccountid
+      if (account) {
+        token.userId = account.providerAccountId;
+      }
+      return token;
+    },
+    async session({ session, token }) {
+      // Pick userid from token
+      if (session.user) {
+        session.user.id = token.userId ?? session.user.id;
+      }
+      return session;
+    },
+  },
   providers: ENABLE_OAUTH_SSO
     ? [
         Auth0({
+          // Specify auth scope, at least include 'openid email'
+          // all scopes in Auth0 ref: https://auth0.com/docs/get-started/apis/scopes/openid-connect-scopes#standard-claims
+          authorization: { params: { scope: 'openid email profile' } },
           clientId: AUTH0_CLIENT_ID,
           clientSecret: AUTH0_CLIENT_SECRET,
           issuer: AUTH0_ISSUER,

package/src/components/ModelIcon/index.tsx

@@ -4,6 +4,7 @@ import {
   Baichuan,
   ChatGLM,
   Gemini,
+  Gemma,
   Meta,
   Minimax,
   Mistral,
@@ -29,6 +30,7 @@ const ModelIcon = memo<ModelProviderIconProps>(({ model, size = 12 }) => {
   if (model.includes('titan')) return <Aws.Avatar size={size} />;
   if (model.includes('llama')) return <Meta.Avatar size={size} />;
   if (model.includes('gemini')) return <Gemini.Avatar size={size} />;
+  if (model.includes('gemma')) return <Gemma.Avatar size={size} />;
   if (model.includes('qwen')) return <Tongyi.Avatar background={Tongyi.colorPrimary} size={size} />;
   if (model.includes('minmax')) return <Minimax.Avatar size={size} />;
   if (model.includes('moonshot')) return <Moonshot.Avatar size={size} />;

package/src/components/ModelTag/ModelIcon.tsx

@@ -4,6 +4,7 @@ import {
   Baichuan,
   ChatGLM,
   Gemini,
+  Gemma,
   Meta,
   Minimax,
   Mistral,
@@ -28,6 +29,7 @@ const ModelIcon = memo<ModelIconProps>(({ model, size = 12 }) => {
   if (model.includes('titan')) return <Aws size={size} />;
   if (model.includes('llama')) return <Meta size={size} />;
   if (model.includes('gemini')) return <Gemini size={size} />;
+  if (model.includes('gemma')) return <Gemma.Simple size={size} />;
   if (model.includes('moonshot')) return <Moonshot size={size} />;
   if (model.includes('qwen')) return <Tongyi size={size} />;
   if (model.includes('minmax')) return <Minimax size={size} />;

package/src/config/modelProviders/ollama.ts

@@ -2,6 +2,28 @@ import { ModelProviderCard } from '@/types/llm';
 
 const Ollama: ModelProviderCard = {
   chatModels: [
+    {
+      displayName: 'Gemma 7B',
+      functionCall: false,
+      id: 'gemma:7b',
+      tokens: 4000,
+      vision: false,
+    },
+    {
+      displayName: 'Gemma 2B',
+      functionCall: false,
+      id: 'gemma',
+      tokens: 4000,
+      vision: false,
+    },
+    {
+      displayName: 'Llama2 Chat 13B',
+      functionCall: false,
+      hidden: true,
+      id: 'llama2:13b',
+      tokens: 4000,
+      vision: false,
+    },
     {
       displayName: 'Llama2 Chat 7B',
       functionCall: false,