AI/ragflow
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/infiniflow/ragflow.git synced 2025-08-20 19:59:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bugs (#3535)

Browse Source 
### What problem does this PR solve?

1. system monitor icon and text missing
2. Team knowledge base can't be search

### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)

---------

Signed-off-by: jinhai <haijin.chn@gmail.com>
This commit is contained in:
Jin Hai 2024-11-20 19:45:50 +08:00 committed by Yingfeng Zhang
parent 9b9afa9d6e
commit 8930bfcff8
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/apps/chunk_app.py
View File

@ -255,6 +255,7 @@ def retrieval_test():
similarity_threshold = float(req.get("similarity_threshold", 0.0)) similarity_threshold = float(req.get("similarity_threshold", 0.0))
vector_similarity_weight = float(req.get("vector_similarity_weight", 0.3)) vector_similarity_weight = float(req.get("vector_similarity_weight", 0.3))
top = int(req.get("top_k", 1024)) top = int(req.get("top_k", 1024))
tenant_ids = []
try: try:
tenants = UserTenantService.query(user_id=current_user.id) tenants = UserTenantService.query(user_id=current_user.id)
@ -262,6 +263,7 @@ def retrieval_test():
for tenant in tenants: for tenant in tenants:
if KnowledgebaseService.query( if KnowledgebaseService.query(
tenant_id=tenant.tenant_id, id=kb_id): tenant_id=tenant.tenant_id, id=kb_id):
tenant_ids.append(tenant.tenant_id)
break break
else: else:
return get_json_result( return get_json_result(
@ -283,7 +285,7 @@ def retrieval_test():
question += keyword_extraction(chat_mdl, question) question += keyword_extraction(chat_mdl, question)
retr = settings.retrievaler if kb.parser_id != ParserType.KG else settings.kg_retrievaler retr = settings.retrievaler if kb.parser_id != ParserType.KG else settings.kg_retrievaler
ranks = retr.retrieval(question, embd_mdl, kb.tenant_id, kb_ids, page, size, ranks = retr.retrieval(question, embd_mdl, tenant_ids, kb_ids, page, size,
similarity_threshold, vector_similarity_weight, top, similarity_threshold, vector_similarity_weight, top,
doc_ids, rerank_mdl=rerank_mdl, highlight=req.get("highlight")) doc_ids, rerank_mdl=rerank_mdl, highlight=req.get("highlight"))
for c in ranks["chunks"]: for c in ranks["chunks"]:

3
api/db/services/dialog_service.py
View File

@ -594,6 +594,7 @@ def tts(tts_mdl, text):
def ask(question, kb_ids, tenant_id): def ask(question, kb_ids, tenant_id):
kbs = KnowledgebaseService.get_by_ids(kb_ids) kbs = KnowledgebaseService.get_by_ids(kb_ids)
tenant_ids = [kb.tenant_id for kb in kbs]
embd_nms = list(set([kb.embd_id for kb in kbs])) embd_nms = list(set([kb.embd_id for kb in kbs]))
is_kg = all([kb.parser_id == ParserType.KG for kb in kbs]) is_kg = all([kb.parser_id == ParserType.KG for kb in kbs])
@ -603,7 +604,7 @@ def ask(question, kb_ids, tenant_id):
chat_mdl = LLMBundle(tenant_id, LLMType.CHAT) chat_mdl = LLMBundle(tenant_id, LLMType.CHAT)
max_tokens = chat_mdl.max_length max_tokens = chat_mdl.max_length
kbinfos = retr.retrieval(question, embd_mdl, tenant_id, kb_ids, 1, 12, 0.1, 0.3, aggs=False) kbinfos = retr.retrieval(question, embd_mdl, tenant_ids, kb_ids, 1, 12, 0.1, 0.3, aggs=False)
knowledges = [ck["content_with_weight"] for ck in kbinfos["chunks"]] knowledges = [ck["content_with_weight"] for ck in kbinfos["chunks"]]
used_token_count = 0 used_token_count = 0

4
web/src/pages/user-setting/setting-system/index.tsx
View File

@ -24,7 +24,7 @@ enum Status {
} }
const TitleMap = { const TitleMap = {
es: 'Elasticsearch', doc_store: 'Elasticsearch',
storage: 'Object Storage', storage: 'Object Storage',
redis: 'Redis', redis: 'Redis',
database: 'Database', database: 'Database',
@ -33,7 +33,7 @@ const TitleMap = {
const IconMap = { const IconMap = {
es: 'es', es: 'es',
storage: 'storage', doc_store: 'storage',
redis: 'redis', redis: 'redis',
database: 'database', database: 'database',
}; };