Merge branch 'embedding' of github.com:cookieY/lobe-chat into embedding

* 'embedding' of github.com:cookieY/lobe-chat: ♻️refactor: delete unused environment variables 📝 docs: Update DEFAULT_FILES_CONFIG ✨ feat: 支持用户自行定义 embedding model 目前支持 zhipu/openai/github/ollama/bedrock add rerank todo 🔨 chore: embedding model use DEFAULT_FILES_CONFIG env Not finished changing 🐛 fix: fix zhipuAI embedding issue 📝 docs(bot): Auto sync agents & plugin to readme ✨feat: add zhifu embedding provider 🔨 chore: ollama embed multiple texts 📝 docs(bot): Auto sync agents & plugin to readme ✨feat: add ollama embedding provider ✨ feat: customized embedding model support 📝 docs(bot): Auto sync agents & plugin to readme 📝 docs(bot): Auto sync agents & plugin to readme 🔨 chore: support bedrock Claude 3.x function calling
lobehub · Oct 14, 2024 · c0cf123 · c0cf123
2 parents 7650430 + f7791d3
commit c0cf123
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/config/modelProviders/openrouter.ts b/src/config/modelProviders/openrouter.ts
@@ -167,7 +167,8 @@ const OpenRouter: ModelProviderCard = {
  tokens: 128_000,
  },
  {
- description: 'LLaMA 3.2 旨在处理结合视觉和文本数据的任务。它在图像描述和视觉问答等任务中表现出色，跨越了语言生成和视觉推理之间的鸿沟。',
+ description:
+ 'LLaMA 3.2 旨在处理结合视觉和文本数据的任务。它在图像描述和视觉问答等任务中表现出色，跨越了语言生成和视觉推理之间的鸿沟。',
  displayName: 'Llama 3.2 11B Vision',
  enabled: true,
  id: 'meta-llama/llama-3.2-11b-vision-instruct',
@@ -179,7 +180,8 @@ const OpenRouter: ModelProviderCard = {
  vision: true,
  },
  {
- description: 'LLaMA 3.2 旨在处理结合视觉和文本数据的任务。它在图像描述和视觉问答等任务中表现出色，跨越了语言生成和视觉推理之间的鸿沟。',
+ description:
+ 'LLaMA 3.2 旨在处理结合视觉和文本数据的任务。它在图像描述和视觉问答等任务中表现出色，跨越了语言生成和视觉推理之间的鸿沟。',
  displayName: 'Llama 3.2 90B Vision',
  enabled: true,
  id: 'meta-llama/llama-3.2-90b-vision-instruct',

diff --git a/src/server/routers/async/ragEval.ts b/src/server/routers/async/ragEval.ts
@@ -13,6 +13,7 @@ import {
  EvaluationRecordModel,
 } from '@/database/server/models/ragEval';
 import { asyncAuthedProcedure, asyncRouter as router } from '@/libs/trpc/async';
+import { getServerGlobalConfig } from '@/server/globalConfig';
 import { initAgentRuntimeWithUserPayload } from '@/server/modules/AgentRuntime';
 import { ChunkService } from '@/server/services/chunk';
 import { AsyncTaskError } from '@/types/asyncTask';

diff --git a/src/server/routers/lambda/chunk.ts b/src/server/routers/lambda/chunk.ts
@@ -10,6 +10,7 @@ import { MessageModel } from '@/database/server/models/message';
 import { knowledgeBaseFiles } from '@/database/server/schemas/lobechat';
 import { authedProcedure, router } from '@/libs/trpc';
 import { keyVaults } from '@/libs/trpc/middleware/keyVaults';
+import { getServerGlobalConfig } from '@/server/globalConfig';
 import { initAgentRuntimeWithUserPayload } from '@/server/modules/AgentRuntime';
 import { ChunkService } from '@/server/services/chunk';
 import { SemanticSearchSchema } from '@/types/rag';

diff --git a/src/utils/server/jwt.ts b/src/utils/server/jwt.ts
@@ -1,10 +1,6 @@
 import { importJWK, jwtVerify } from 'jose';
 
-import {
- JWTPayload,
- JWT_SECRET_KEY,
- NON_HTTP_PREFIX,
-} from '@/const/auth';
+import { JWTPayload, JWT_SECRET_KEY, NON_HTTP_PREFIX } from '@/const/auth';
 
 export const getJWTPayload = async (token: string): Promise<JWTPayload> => {
  //如果是 HTTP 协议发起的请求，直接解析 token
@@ -29,4 +25,4 @@ export const getJWTPayload = async (token: string): Promise<JWTPayload> => {
  const { payload } = await jwtVerify(token, jwkSecretKey);
 
  return payload as JWTPayload;
-};
+};