|
@@ -20,15 +20,16 @@ except ImportError:
|
|
|
|
|
|
def _fetch_parsing_data_by_request(request_id: str) -> List[str]:
|
|
|
"""从 knowledge_extraction_content 表中根据 request_id 获取 data 字段"""
|
|
|
- sql = "SELECT data, content_id FROM knowledge_extraction_content WHERE request_id = %s"
|
|
|
+ sql = "SELECT data, content_id, parsing_id FROM knowledge_extraction_content WHERE request_id = %s"
|
|
|
rows = MysqlHelper.get_values(sql, (request_id,)) or []
|
|
|
|
|
|
results = []
|
|
|
for row in rows:
|
|
|
data = row[0] # 获取 data 字段
|
|
|
content_id = row[1] # 获取 content_id 字段
|
|
|
+ parsing_id = row[2] # 获取 parsing_id 字段
|
|
|
if data:
|
|
|
- results.append({"data": data, "content_id": content_id})
|
|
|
+ results.append({"data": data, "content_id": content_id, "parsing_id": parsing_id})
|
|
|
|
|
|
print(f"Final results: {len(results)} items")
|
|
|
return results
|
|
@@ -171,8 +172,8 @@ def execute_expand_agent_with_api(requestId: str, query: str = "") -> Dict[str,
|
|
|
# 针对每条 parsing_data 分别生成与入库
|
|
|
insert_sql = """
|
|
|
INSERT INTO knowledge_expand_content
|
|
|
- (request_id, create_time, expand_querys, query, content_id)
|
|
|
- VALUES (%s, NOW(), %s, %s, %s)
|
|
|
+ (request_id, create_time, expand_querys, query, content_id, parsing_id)
|
|
|
+ VALUES (%s, NOW(), %s, %s, %s, %s)
|
|
|
"""
|
|
|
for sample in data_samples:
|
|
|
total += 1
|
|
@@ -184,7 +185,7 @@ def execute_expand_agent_with_api(requestId: str, query: str = "") -> Dict[str,
|
|
|
expanded = _heuristic_expand(query)
|
|
|
try:
|
|
|
expand_querys_json = json.dumps(expanded, ensure_ascii=False)
|
|
|
- MysqlHelper.insert_and_get_id(insert_sql, (requestId, expand_querys_json, query, sample["content_id"]))
|
|
|
+ MysqlHelper.insert_and_get_id(insert_sql, (requestId, expand_querys_json, query, sample["content_id"], sample["parsing_id"]))
|
|
|
success += 1
|
|
|
except Exception as ie:
|
|
|
logger.error(f"单条扩展结果入库失败: requestId={requestId}, error={ie}")
|