pengjunjie/ragflow
1
0
Fork 1
mirror of https://github.com/infiniflow/ragflow.git synced 2025-12-08 20:42:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Handle infinity empty response (#3627)

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

Handle infinity empty response. Close #3623
Show version in docker build log

### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)
This commit is contained in:
Zhichang Yu
2024-11-25 14:09:42 +08:00
committed by GitHub
parent a0e9b62de5
commit 9348616659
4 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rag/utils/infinity_conn.py
View File

@ -48,6 +48,17 @@ def equivalent_condition_to_str(condition: dict) -> str:
return " AND ".join(cond)
def concat_dataframes(df_list: list[pl.DataFrame], selectFields: list[str]) -> pl.DataFrame:
"""
Concatenate multiple dataframes into one.
"""
if df_list:
return pl.concat(df_list)
schema = dict()
for fieldnm in selectFields:
schema[fieldnm] = str
return pl.DataFrame(schema=schema)
@singleton
class InfinityConnection(DocStoreConnection):
def __init__(self):
@ -289,7 +300,7 @@ class InfinityConnection(DocStoreConnection):
kb_res = builder.to_pl()
df_list.append(kb_res)
self.connPool.release_conn(inf_conn)
res = pl.concat(df_list)
res = concat_dataframes(df_list, selectFields)
logging.debug("INFINITY search tables: " + str(table_list))
return res
@ -306,7 +317,7 @@ class InfinityConnection(DocStoreConnection):
kb_res = table_instance.output(["*"]).filter(f"id = '{chunkId}'").to_pl()
df_list.append(kb_res)
self.connPool.release_conn(inf_conn)
res = pl.concat(df_list)
res = concat_dataframes(df_list, ["id"])
res_fields = self.getFields(res, res.columns)
return res_fields.get(chunkId, None)