Kevin Hu
commited on
Commit
·
5bf0b15
1
Parent(s):
19806c7
fix LIGHTEN issue (#2806)
Browse files### What problem does this PR solve?
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
- api/apps/llm_app.py +1 -1
- api/settings.py +1 -1
- rag/nlp/__init__.py +0 -11
api/apps/llm_app.py
CHANGED
|
@@ -332,7 +332,7 @@ def my_llms():
|
|
| 332 |
@login_required
|
| 333 |
def list_app():
|
| 334 |
self_deploied = ["Youdao","FastEmbed", "BAAI", "Ollama", "Xinference", "LocalAI", "LM-Studio"]
|
| 335 |
-
weighted = ["Youdao","FastEmbed", "BAAI"] if LIGHTEN else []
|
| 336 |
model_type = request.args.get("model_type")
|
| 337 |
try:
|
| 338 |
objs = TenantLLMService.query(tenant_id=current_user.id)
|
|
|
|
| 332 |
@login_required
|
| 333 |
def list_app():
|
| 334 |
self_deploied = ["Youdao","FastEmbed", "BAAI", "Ollama", "Xinference", "LocalAI", "LM-Studio"]
|
| 335 |
+
weighted = ["Youdao","FastEmbed", "BAAI"] if not LIGHTEN else []
|
| 336 |
model_type = request.args.get("model_type")
|
| 337 |
try:
|
| 338 |
objs = TenantLLMService.query(tenant_id=current_user.id)
|
api/settings.py
CHANGED
|
@@ -123,7 +123,7 @@ if not LIGHTEN:
|
|
| 123 |
|
| 124 |
CHAT_MDL = default_llm[LLM_FACTORY]["chat_model"]
|
| 125 |
EMBEDDING_MDL = default_llm["BAAI"]["embedding_model"]
|
| 126 |
-
RERANK_MDL = default_llm["BAAI"]["rerank_model"]
|
| 127 |
ASR_MDL = default_llm[LLM_FACTORY]["asr_model"]
|
| 128 |
IMAGE2TEXT_MDL = default_llm[LLM_FACTORY]["image2text_model"]
|
| 129 |
else:
|
|
|
|
| 123 |
|
| 124 |
CHAT_MDL = default_llm[LLM_FACTORY]["chat_model"]
|
| 125 |
EMBEDDING_MDL = default_llm["BAAI"]["embedding_model"]
|
| 126 |
+
RERANK_MDL = default_llm["BAAI"]["rerank_model"]
|
| 127 |
ASR_MDL = default_llm[LLM_FACTORY]["asr_model"]
|
| 128 |
IMAGE2TEXT_MDL = default_llm[LLM_FACTORY]["image2text_model"]
|
| 129 |
else:
|
rag/nlp/__init__.py
CHANGED
|
@@ -501,17 +501,6 @@ def naive_merge(sections, chunk_token_num=128, delimiter="\n。;!?"):
|
|
| 501 |
|
| 502 |
for sec, pos in sections:
|
| 503 |
add_chunk(sec, pos)
|
| 504 |
-
continue
|
| 505 |
-
s, e = 0, 1
|
| 506 |
-
while e < len(sec):
|
| 507 |
-
if sec[e] in delimiter:
|
| 508 |
-
add_chunk(sec[s: e + 1], pos)
|
| 509 |
-
s = e + 1
|
| 510 |
-
e = s + 1
|
| 511 |
-
else:
|
| 512 |
-
e += 1
|
| 513 |
-
if s < e:
|
| 514 |
-
add_chunk(sec[s: e], pos)
|
| 515 |
|
| 516 |
return cks
|
| 517 |
|
|
|
|
| 501 |
|
| 502 |
for sec, pos in sections:
|
| 503 |
add_chunk(sec, pos)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 504 |
|
| 505 |
return cks
|
| 506 |
|