浏览代码

Merge branch 'dev' into buroa/hybrid-search

Steven Kreitzer 1 年之前
父节点
当前提交
d5f60b119c
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      backend/apps/web/routers/utils.py
  2. 1 1
      src/lib/components/chat/Settings/Chats.svelte

+ 1 - 1
backend/apps/web/routers/utils.py

@@ -11,7 +11,7 @@ import markdown
 from utils.utils import get_admin_user
 from utils.utils import get_admin_user
 from utils.misc import calculate_sha256, get_gravatar_url
 from utils.misc import calculate_sha256, get_gravatar_url
 
 
-from config import OLLAMA_BASE_URLS, DATA_DIR, UPLOAD_DIR
+from config import OLLAMA_BASE_URLS, DATA_DIR, UPLOAD_DIR, ENABLE_ADMIN_EXPORT
 from constants import ERROR_MESSAGES
 from constants import ERROR_MESSAGES
 from typing import List
 from typing import List
 
 

+ 1 - 1
src/lib/components/chat/Settings/Chats.svelte

@@ -2,7 +2,7 @@
 	import fileSaver from 'file-saver';
 	import fileSaver from 'file-saver';
 	const { saveAs } = fileSaver;
 	const { saveAs } = fileSaver;
 
 
-	import { config, chats, user } from '$lib/stores';
+	import { chats, user, config } from '$lib/stores';
 
 
 	import {
 	import {
 		createNewChat,
 		createNewChat,