Skip to content

Commit 7cfcf51

Browse files
JinHai-CNJinHai-CN
committed
Fix typos: retrievaler -> retriever
Signed-off-by: Jin Hai <haijin.chn@gmail.com>
1 parent 1775793 commit 7cfcf51

File tree

17 files changed

+43
-43
lines changed

17 files changed

+43
-43
lines changed

‎agent/tools/retrieval.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ def _invoke(self, **kwargs):
121121

122122
if kbs:
123123
query = re.sub(r"^user[:：\s]*", "", query, flags=re.IGNORECASE)
124-
kbinfos = settings.retrievaler.retrieval(
124+
kbinfos = settings.retriever.retrieval(
125125
query,
126126
embd_mdl,
127127
[kb.tenant_id for kb in kbs],
@@ -135,7 +135,7 @@ def _invoke(self, **kwargs):
135135
rank_feature=label_question(query, kbs),
136136
)
137137
if self._param.use_kg:
138-
ck = settings.kg_retrievaler.retrieval(query,
138+
ck = settings.kg_retriever.retrieval(query,
139139
[kb.tenant_id for kb in kbs],
140140
kb_ids,
141141
embd_mdl,
@@ -146,7 +146,7 @@ def _invoke(self, **kwargs):
146146
kbinfos = {"chunks": [], "doc_aggs": []}
147147

148148
if self._param.use_kg and kbs:
149-
ck = settings.kg_retrievaler.retrieval(query, [kb.tenant_id for kb in kbs], filtered_kb_ids, embd_mdl, LLMBundle(kbs[0].tenant_id, LLMType.CHAT))
149+
ck = settings.kg_retriever.retrieval(query, [kb.tenant_id for kb in kbs], filtered_kb_ids, embd_mdl, LLMBundle(kbs[0].tenant_id, LLMType.CHAT))
150150
if ck["content_with_weight"]:
151151
ck["content"] = ck["content_with_weight"]
152152
del ck["content_with_weight"]

‎api/apps/api_app.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ def list_chunks():
536536
)
537537
kb_ids = KnowledgebaseService.get_kb_ids(tenant_id)
538538

539-
res = settings.retrievaler.chunk_list(doc_id, tenant_id, kb_ids)
539+
res = settings.retriever.chunk_list(doc_id, tenant_id, kb_ids)
540540
res = [
541541
{
542542
"content": res_item["content_with_weight"],
@@ -884,7 +884,7 @@ def retrieval():
884884
if req.get("keyword", False):
885885
chat_mdl = LLMBundle(kbs[0].tenant_id, LLMType.CHAT)
886886
question += keyword_extraction(chat_mdl, question)
887-
ranks = settings.retrievaler.retrieval(question, embd_mdl, kbs[0].tenant_id, kb_ids, page, size,
887+
ranks = settings.retriever.retrieval(question, embd_mdl, kbs[0].tenant_id, kb_ids, page, size,
888888
similarity_threshold, vector_similarity_weight, top,
889889
doc_ids, rerank_mdl=rerank_mdl, highlight= highlight,
890890
rank_feature=label_question(question, kbs))

‎api/apps/chunk_app.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def list_chunk():
6060
}
6161
if "available_int" in req:
6262
query["available_int"] = int(req["available_int"])
63-
sres = settings.retrievaler.search(query, search.index_name(tenant_id), kb_ids, highlight=True)
63+
sres = settings.retriever.search(query, search.index_name(tenant_id), kb_ids, highlight=True)
6464
res = {"total": sres.total, "chunks": [], "doc": doc.to_dict()}
6565
for id in sres.ids:
6666
d = {
@@ -346,15 +346,15 @@ def retrieval_test():
346346
question += keyword_extraction(chat_mdl, question)
347347

348348
labels = label_question(question, [kb])
349-
ranks = settings.retrievaler.retrieval(question, embd_mdl, tenant_ids, kb_ids, page, size,
349+
ranks = settings.retriever.retrieval(question, embd_mdl, tenant_ids, kb_ids, page, size,
350350
float(req.get("similarity_threshold", 0.0)),
351351
float(req.get("vector_similarity_weight", 0.3)),
352352
top,
353353
doc_ids, rerank_mdl=rerank_mdl, highlight=req.get("highlight"),
354354
rank_feature=labels
355355
)
356356
if use_kg:
357-
ck = settings.kg_retrievaler.retrieval(question,
357+
ck = settings.kg_retriever.retrieval(question,
358358
tenant_ids,
359359
kb_ids,
360360
embd_mdl,
@@ -384,7 +384,7 @@ def knowledge_graph():
384384
"doc_ids": [doc_id],
385385
"knowledge_graph_kwd": ["graph", "mind_map"]
386386
}
387-
sres = settings.retrievaler.search(req, search.index_name(tenant_id), kb_ids)
387+
sres = settings.retriever.search(req, search.index_name(tenant_id), kb_ids)
388388
obj = {"graph": {}, "mind_map": {}}
389389
for id in sres.ids[:2]:
390390
ty = sres.field[id]["knowledge_graph_kwd"]

‎api/apps/kb_app.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ def list_tags(kb_id):
251251
tenants = UserTenantService.get_tenants_by_user_id(current_user.id)
252252
tags = []
253253
for tenant in tenants:
254-
tags += settings.retrievaler.all_tags(tenant["tenant_id"], [kb_id])
254+
tags += settings.retriever.all_tags(tenant["tenant_id"], [kb_id])
255255
return get_json_result(data=tags)
256256

257257

@@ -270,7 +270,7 @@ def list_tags_from_kbs():
270270
tenants = UserTenantService.get_tenants_by_user_id(current_user.id)
271271
tags = []
272272
for tenant in tenants:
273-
tags += settings.retrievaler.all_tags(tenant["tenant_id"], kb_ids)
273+
tags += settings.retriever.all_tags(tenant["tenant_id"], kb_ids)
274274
return get_json_result(data=tags)
275275

276276

@@ -331,7 +331,7 @@ def knowledge_graph(kb_id):
331331
obj = {"graph": {}, "mind_map": {}}
332332
if not settings.docStoreConn.indexExist(search.index_name(kb.tenant_id), kb_id):
333333
return get_json_result(data=obj)
334-
sres = settings.retrievaler.search(req, search.index_name(kb.tenant_id), [kb_id])
334+
sres = settings.retriever.search(req, search.index_name(kb.tenant_id), [kb_id])
335335
if not len(sres.ids):
336336
return get_json_result(data=obj)
337337

‎api/apps/sdk/dataset.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ def knowledge_graph(tenant_id,dataset_id):
491491
obj = {"graph": {}, "mind_map": {}}
492492
if not settings.docStoreConn.indexExist(search.index_name(kb.tenant_id), dataset_id):
493493
return get_result(data=obj)
494-
sres = settings.retrievaler.search(req, search.index_name(kb.tenant_id), [dataset_id])
494+
sres = settings.retriever.search(req, search.index_name(kb.tenant_id), [dataset_id])
495495
if not len(sres.ids):
496496
return get_result(data=obj)
497497

‎api/apps/sdk/dify_retrieval.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def retrieval(tenant_id):
5555
print("doc_ids",doc_ids)
5656
if not doc_ids and metadata_condition is not None:
5757
doc_ids = ['-999']
58-
ranks = settings.retrievaler.retrieval(
58+
ranks = settings.retriever.retrieval(
5959
question,
6060
embd_mdl,
6161
kb.tenant_id,
@@ -70,7 +70,7 @@ def retrieval(tenant_id):
7070
)
7171

7272
if use_kg:
73-
ck = settings.kg_retrievaler.retrieval(question,
73+
ck = settings.kg_retriever.retrieval(question,
7474
[tenant_id],
7575
[kb_id],
7676
embd_mdl,

‎api/apps/sdk/doc.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -982,7 +982,7 @@ def list_chunks(tenant_id, dataset_id, document_id):
982982
_ = Chunk(**final_chunk)
983983

984984
elif settings.docStoreConn.indexExist(search.index_name(tenant_id), dataset_id):
985-
sres = settings.retrievaler.search(query, search.index_name(tenant_id), [dataset_id], emb_mdl=None, highlight=True)
985+
sres = settings.retriever.search(query, search.index_name(tenant_id), [dataset_id], emb_mdl=None, highlight=True)
986986
res["total"] = sres.total
987987
for id in sres.ids:
988988
d = {
@@ -1446,7 +1446,7 @@ def retrieval_test(tenant_id):
14461446
chat_mdl = LLMBundle(kb.tenant_id, LLMType.CHAT)
14471447
question += keyword_extraction(chat_mdl, question)
14481448

1449-
ranks = settings.retrievaler.retrieval(
1449+
ranks = settings.retriever.retrieval(
14501450
question,
14511451
embd_mdl,
14521452
tenant_ids,
@@ -1462,7 +1462,7 @@ def retrieval_test(tenant_id):
14621462
rank_feature=label_question(question, kbs),
14631463
)
14641464
if use_kg:
1465-
ck = settings.kg_retrievaler.retrieval(question, [k.tenant_id for k in kbs], kb_ids, embd_mdl, LLMBundle(kb.tenant_id, LLMType.CHAT))
1465+
ck = settings.kg_retriever.retrieval(question, [k.tenant_id for k in kbs], kb_ids, embd_mdl, LLMBundle(kb.tenant_id, LLMType.CHAT))
14661466
if ck["content_with_weight"]:
14671467
ranks["chunks"].insert(0, ck)
14681468

‎api/apps/sdk/session.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -998,11 +998,11 @@ def retrieval_test_embedded():
998998
question += keyword_extraction(chat_mdl, question)
999999

10001000
labels = label_question(question, [kb])
1001-
ranks = settings.retrievaler.retrieval(
1001+
ranks = settings.retriever.retrieval(
10021002
question, embd_mdl, tenant_ids, kb_ids, page, size, similarity_threshold, vector_similarity_weight, top, doc_ids, rerank_mdl=rerank_mdl, highlight=req.get("highlight"), rank_feature=labels
10031003
)
10041004
if use_kg:
1005-
ck = settings.kg_retrievaler.retrieval(question, tenant_ids, kb_ids, embd_mdl, LLMBundle(kb.tenant_id, LLMType.CHAT))
1005+
ck = settings.kg_retriever.retrieval(question, tenant_ids, kb_ids, embd_mdl, LLMBundle(kb.tenant_id, LLMType.CHAT))
10061006
if ck["content_with_weight"]:
10071007
ranks["chunks"].insert(0, ck)
10081008

‎api/db/services/dialog_service.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ def chat(dialog, messages, stream=True, **kwargs):
370370
chat_mdl.bind_tools(toolcall_session, tools)
371371
bind_models_ts = timer()
372372

373-
retriever = settings.retrievaler
373+
retriever = settings.retriever
374374
questions = [m["content"] for m in messages if m["role"] == "user"][-3:]
375375
attachments = kwargs["doc_ids"].split(",") if "doc_ids" in kwargs else []
376376
if "doc_ids" in messages[-1]:
@@ -472,7 +472,7 @@ def chat(dialog, messages, stream=True, **kwargs):
472472
kbinfos["chunks"].extend(tav_res["chunks"])
473473
kbinfos["doc_aggs"].extend(tav_res["doc_aggs"])
474474
if prompt_config.get("use_kg"):
475-
ck = settings.kg_retrievaler.retrieval(" ".join(questions), tenant_ids, dialog.kb_ids, embd_mdl,
475+
ck = settings.kg_retriever.retrieval(" ".join(questions), tenant_ids, dialog.kb_ids, embd_mdl,
476476
LLMBundle(dialog.tenant_id, LLMType.CHAT))
477477
if ck["content_with_weight"]:
478478
kbinfos["chunks"].insert(0, ck)
@@ -658,7 +658,7 @@ def get_table():
658658

659659
logging.debug(f"{question} get SQL(refined): {sql}")
660660
tried_times += 1
661-
return settings.retrievaler.sql_retrieval(sql, format="json"), sql
661+
return settings.retriever.sql_retrieval(sql, format="json"), sql
662662

663663
tbl, sql = get_table()
664664
if tbl is None:
@@ -752,7 +752,7 @@ def ask(question, kb_ids, tenant_id, chat_llm_name=None, search_config={}):
752752
embedding_list = list(set([kb.embd_id for kb in kbs]))
753753

754754
is_knowledge_graph = all([kb.parser_id == ParserType.KG for kb in kbs])
755-
retriever = settings.retrievaler if not is_knowledge_graph else settings.kg_retrievaler
755+
retriever = settings.retriever if not is_knowledge_graph else settings.kg_retriever
756756

757757
embd_mdl = LLMBundle(tenant_id, LLMType.EMBEDDING, embedding_list[0])
758758
chat_mdl = LLMBundle(tenant_id, LLMType.CHAT, chat_llm_name)
@@ -848,7 +848,7 @@ def gen_mindmap(question, kb_ids, tenant_id, search_config={}):
848848
if not doc_ids:
849849
doc_ids = None
850850

851-
ranks = settings.retrievaler.retrieval(
851+
ranks = settings.retriever.retrieval(
852852
question=question,
853853
embd_mdl=embd_mdl,
854854
tenant_ids=tenant_ids,

‎api/settings.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
DOC_ENGINE = None
6666
docStoreConn = None
6767

68-
retrievaler = None
69-
kg_retrievaler = None
68+
retriever = None
69+
kg_retriever = None
7070

7171
# user registration switch
7272
REGISTER_ENABLED = 1
@@ -174,7 +174,7 @@ def init_settings():
174174

175175
OAUTH_CONFIG = get_base_config("oauth", {})
176176

177-
global DOC_ENGINE, docStoreConn, retrievaler, kg_retrievaler
177+
global DOC_ENGINE, docStoreConn, retriever, kg_retriever
178178
DOC_ENGINE = os.environ.get("DOC_ENGINE", "elasticsearch")
179179
# DOC_ENGINE = os.environ.get('DOC_ENGINE', "opensearch")
180180
lower_case_doc_engine = DOC_ENGINE.lower()
@@ -187,10 +187,10 @@ def init_settings():
187187
else:
188188
raise Exception(f"Not supported doc engine: {DOC_ENGINE}")
189189

190-
retrievaler = search.Dealer(docStoreConn)
190+
retriever = search.Dealer(docStoreConn)
191191
from graphrag import search as kg_search
192192

193-
kg_retrievaler = kg_search.KGSearch(docStoreConn)
193+
kg_retriever = kg_search.KGSearch(docStoreConn)
194194

195195
if int(os.environ.get("SANDBOX_ENABLED", "0")):
196196
global SANDBOX_HOST

0 commit comments

Comments
 (0)