浏览代码

Refactor. (#4487)

### What problem does this PR solve?

### Type of change

- [x] Refactoring
tags/v0.16.0
Kevin Hu 9 个月前
父节点
当前提交
e478586a8e
没有帐户链接到提交者的电子邮件
共有 5 个文件被更改,包括 6 次插入10 次删除
  1. 3
    1
      api/apps/kb_app.py
  2. 0
    5
      api/db/db_models.py
  3. 1
    1
      api/ragflow_server.py
  4. 1
    1
      deepdoc/parser/resume/entities/corporations.py
  5. 1
    2
      rag/utils/doc_store_conn.py

+ 3
- 1
api/apps/kb_app.py 查看文件

if not e: if not e:
return get_data_error_result( return get_data_error_result(
message="Database error (Knowledgebase rename)!") message="Database error (Knowledgebase rename)!")
kb = kb.to_dict()
kb.update(req)


return get_json_result(data=kb.to_json())
return get_json_result(data=kb)
except Exception as e: except Exception as e:
return server_error_response(e) return server_error_response(e)



+ 0
- 5
api/db/db_models.py 查看文件

) )
except Exception: except Exception:
pass pass
try:
DB.execute_sql('ALTER TABLE llm DROP PRIMARY KEY;')
DB.execute_sql('ALTER TABLE llm ADD PRIMARY KEY (llm_name,fid);')
except Exception:
pass
try: try:
migrate( migrate(
migrator.add_column('task', 'retry_count', IntegerField(default=0)) migrator.add_column('task', 'retry_count', IntegerField(default=0))

+ 1
- 1
api/ragflow_server.py 查看文件



def update_progress(): def update_progress():
while True: while True:
time.sleep(3)
time.sleep(6)
try: try:
DocumentService.update_progress() DocumentService.update_progress()
except Exception: except Exception:

+ 1
- 1
deepdoc/parser/resume/entities/corporations.py 查看文件



def corpNorm(nm, add_region=True): def corpNorm(nm, add_region=True):
global CORP_TKS global CORP_TKS
if not nm or isinstance(nm, str):
if not nm or not isinstance(nm, str):
return "" return ""
nm = rag_tokenizer.tradi2simp(rag_tokenizer.strQ2B(nm)).lower() nm = rag_tokenizer.tradi2simp(rag_tokenizer.strQ2B(nm)).lower()
nm = re.sub(r"&", "&", nm) nm = re.sub(r"&", "&", nm)

+ 1
- 2
rag/utils/doc_store_conn.py 查看文件

from abc import ABC, abstractmethod from abc import ABC, abstractmethod
from dataclasses import dataclass from dataclasses import dataclass
import numpy as np import numpy as np
import polars as pl


DEFAULT_MATCH_VECTOR_TOPN = 10 DEFAULT_MATCH_VECTOR_TOPN = 10
DEFAULT_MATCH_SPARSE_TOPN = 10 DEFAULT_MATCH_SPARSE_TOPN = 10
knowledgebaseIds: list[str], knowledgebaseIds: list[str],
aggFields: list[str] = [], aggFields: list[str] = [],
rank_feature: dict | None = None rank_feature: dict | None = None
) -> list[dict] | pl.DataFrame:
):
""" """
Search with given conjunctive equivalent filtering condition and return all fields of matched documents Search with given conjunctive equivalent filtering condition and return all fields of matched documents
""" """

正在加载...
取消
保存