jinhai-2012 commited on
Commit
9c45d1e
·
1 Parent(s): 1b32c2b

Fix bugs (#3535)

Browse files

### 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>

api/apps/chunk_app.py CHANGED
@@ -255,6 +255,7 @@ def retrieval_test():
255
  similarity_threshold = float(req.get("similarity_threshold", 0.0))
256
  vector_similarity_weight = float(req.get("vector_similarity_weight", 0.3))
257
  top = int(req.get("top_k", 1024))
 
258
 
259
  try:
260
  tenants = UserTenantService.query(user_id=current_user.id)
@@ -262,6 +263,7 @@ def retrieval_test():
262
  for tenant in tenants:
263
  if KnowledgebaseService.query(
264
  tenant_id=tenant.tenant_id, id=kb_id):
 
265
  break
266
  else:
267
  return get_json_result(
@@ -283,7 +285,7 @@ def retrieval_test():
283
  question += keyword_extraction(chat_mdl, question)
284
 
285
  retr = settings.retrievaler if kb.parser_id != ParserType.KG else settings.kg_retrievaler
286
- ranks = retr.retrieval(question, embd_mdl, kb.tenant_id, kb_ids, page, size,
287
  similarity_threshold, vector_similarity_weight, top,
288
  doc_ids, rerank_mdl=rerank_mdl, highlight=req.get("highlight"))
289
  for c in ranks["chunks"]:
 
255
  similarity_threshold = float(req.get("similarity_threshold", 0.0))
256
  vector_similarity_weight = float(req.get("vector_similarity_weight", 0.3))
257
  top = int(req.get("top_k", 1024))
258
+ tenant_ids = []
259
 
260
  try:
261
  tenants = UserTenantService.query(user_id=current_user.id)
 
263
  for tenant in tenants:
264
  if KnowledgebaseService.query(
265
  tenant_id=tenant.tenant_id, id=kb_id):
266
+ tenant_ids.append(tenant.tenant_id)
267
  break
268
  else:
269
  return get_json_result(
 
285
  question += keyword_extraction(chat_mdl, question)
286
 
287
  retr = settings.retrievaler if kb.parser_id != ParserType.KG else settings.kg_retrievaler
288
+ ranks = retr.retrieval(question, embd_mdl, tenant_ids, kb_ids, page, size,
289
  similarity_threshold, vector_similarity_weight, top,
290
  doc_ids, rerank_mdl=rerank_mdl, highlight=req.get("highlight"))
291
  for c in ranks["chunks"]:
api/db/services/dialog_service.py CHANGED
@@ -594,6 +594,7 @@ def tts(tts_mdl, text):
594
 
595
  def ask(question, kb_ids, tenant_id):
596
  kbs = KnowledgebaseService.get_by_ids(kb_ids)
 
597
  embd_nms = list(set([kb.embd_id for kb in kbs]))
598
 
599
  is_kg = all([kb.parser_id == ParserType.KG for kb in kbs])
@@ -603,7 +604,7 @@ def ask(question, kb_ids, tenant_id):
603
  chat_mdl = LLMBundle(tenant_id, LLMType.CHAT)
604
  max_tokens = chat_mdl.max_length
605
 
606
- kbinfos = retr.retrieval(question, embd_mdl, tenant_id, kb_ids, 1, 12, 0.1, 0.3, aggs=False)
607
  knowledges = [ck["content_with_weight"] for ck in kbinfos["chunks"]]
608
 
609
  used_token_count = 0
 
594
 
595
  def ask(question, kb_ids, tenant_id):
596
  kbs = KnowledgebaseService.get_by_ids(kb_ids)
597
+ tenant_ids = [kb.tenant_id for kb in kbs]
598
  embd_nms = list(set([kb.embd_id for kb in kbs]))
599
 
600
  is_kg = all([kb.parser_id == ParserType.KG for kb in kbs])
 
604
  chat_mdl = LLMBundle(tenant_id, LLMType.CHAT)
605
  max_tokens = chat_mdl.max_length
606
 
607
+ kbinfos = retr.retrieval(question, embd_mdl, tenant_ids, kb_ids, 1, 12, 0.1, 0.3, aggs=False)
608
  knowledges = [ck["content_with_weight"] for ck in kbinfos["chunks"]]
609
 
610
  used_token_count = 0
web/src/pages/user-setting/setting-system/index.tsx CHANGED
@@ -24,7 +24,7 @@ enum Status {
24
  }
25
 
26
  const TitleMap = {
27
- es: 'Elasticsearch',
28
  storage: 'Object Storage',
29
  redis: 'Redis',
30
  database: 'Database',
@@ -33,7 +33,7 @@ const TitleMap = {
33
 
34
  const IconMap = {
35
  es: 'es',
36
- storage: 'storage',
37
  redis: 'redis',
38
  database: 'database',
39
  };
 
24
  }
25
 
26
  const TitleMap = {
27
+ doc_store: 'Elasticsearch',
28
  storage: 'Object Storage',
29
  redis: 'Redis',
30
  database: 'Database',
 
33
 
34
  const IconMap = {
35
  es: 'es',
36
+ doc_store: 'storage',
37
  redis: 'redis',
38
  database: 'database',
39
  };