KevinHuSh
commited on
Commit
·
da67205
1
Parent(s):
4c6dadf
refine docker layers (#606)
Browse files### What problem does this PR solve?
### Type of change
- [x] Performance Improvement
- api/utils/file_utils.py +9 -0
- rag/llm/embedding_model.py +3 -5
api/utils/file_utils.py
CHANGED
|
@@ -66,6 +66,15 @@ def get_rag_python_directory(*args):
|
|
| 66 |
return get_rag_directory("python", *args)
|
| 67 |
|
| 68 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 69 |
@cached(cache=LRUCache(maxsize=10))
|
| 70 |
def load_json_conf(conf_path):
|
| 71 |
if os.path.isabs(conf_path):
|
|
|
|
| 66 |
return get_rag_directory("python", *args)
|
| 67 |
|
| 68 |
|
| 69 |
+
def get_home_cache_dir():
|
| 70 |
+
dir = os.path.join(os.path.expanduser('~'), ".raglow")
|
| 71 |
+
try:
|
| 72 |
+
os.mkdir(dir)
|
| 73 |
+
except OSError as error:
|
| 74 |
+
pass
|
| 75 |
+
return dir
|
| 76 |
+
|
| 77 |
+
|
| 78 |
@cached(cache=LRUCache(maxsize=10))
|
| 79 |
def load_json_conf(conf_path):
|
| 80 |
if os.path.isabs(conf_path):
|
rag/llm/embedding_model.py
CHANGED
|
@@ -26,19 +26,17 @@ from FlagEmbedding import FlagModel
|
|
| 26 |
import torch
|
| 27 |
import numpy as np
|
| 28 |
|
| 29 |
-
from api.utils.file_utils import get_project_base_directory
|
| 30 |
from rag.utils import num_tokens_from_string
|
| 31 |
|
| 32 |
|
| 33 |
try:
|
| 34 |
-
flag_model = FlagModel(os.path.join(
|
| 35 |
-
get_project_base_directory(),
|
| 36 |
-
"rag/res/bge-large-zh-v1.5"),
|
| 37 |
query_instruction_for_retrieval="为这个句子生成表示以用于检索相关文章:",
|
| 38 |
use_fp16=torch.cuda.is_available())
|
| 39 |
except Exception as e:
|
| 40 |
model_dir = snapshot_download(repo_id="BAAI/bge-large-zh-v1.5",
|
| 41 |
-
local_dir=os.path.join(
|
| 42 |
local_dir_use_symlinks=False)
|
| 43 |
flag_model = FlagModel(model_dir,
|
| 44 |
query_instruction_for_retrieval="为这个句子生成表示以用于检索相关文章:",
|
|
|
|
| 26 |
import torch
|
| 27 |
import numpy as np
|
| 28 |
|
| 29 |
+
from api.utils.file_utils import get_project_base_directory, get_home_cache_dir
|
| 30 |
from rag.utils import num_tokens_from_string
|
| 31 |
|
| 32 |
|
| 33 |
try:
|
| 34 |
+
flag_model = FlagModel(os.path.join(get_home_cache_dir(), "bge-large-zh-v1.5"),
|
|
|
|
|
|
|
| 35 |
query_instruction_for_retrieval="为这个句子生成表示以用于检索相关文章:",
|
| 36 |
use_fp16=torch.cuda.is_available())
|
| 37 |
except Exception as e:
|
| 38 |
model_dir = snapshot_download(repo_id="BAAI/bge-large-zh-v1.5",
|
| 39 |
+
local_dir=os.path.join(get_home_cache_dir(), "bge-large-zh-v1.5"),
|
| 40 |
local_dir_use_symlinks=False)
|
| 41 |
flag_model = FlagModel(model_dir,
|
| 42 |
query_instruction_for_retrieval="为这个句子生成表示以用于检索相关文章:",
|