mirror of
https://git.mirrors.martin98.com/https://github.com/infiniflow/ragflow.git
synced 2025-08-14 02:55:55 +08:00
Handle infinity empty response (#3627)
### 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:
parent
a0e9b62de5
commit
9348616659
8
.github/workflows/tests.yml
vendored
8
.github/workflows/tests.yml
vendored
@ -42,19 +42,23 @@ jobs:
|
|||||||
- name: Ensure workspace ownership
|
- name: Ensure workspace ownership
|
||||||
run: echo "chown -R $USER $GITHUB_WORKSPACE" && sudo chown -R $USER $GITHUB_WORKSPACE
|
run: echo "chown -R $USER $GITHUB_WORKSPACE" && sudo chown -R $USER $GITHUB_WORKSPACE
|
||||||
|
|
||||||
|
# https://github.com/actions/checkout/issues/1781
|
||||||
- name: Check out code
|
- name: Check out code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
fetch-tags: true
|
||||||
|
|
||||||
- name: Build ragflow:dev-slim
|
- name: Build ragflow:dev-slim
|
||||||
run: |
|
run: |
|
||||||
RUNNER_WORKSPACE_PREFIX=${RUNNER_WORKSPACE_PREFIX:-$HOME}
|
RUNNER_WORKSPACE_PREFIX=${RUNNER_WORKSPACE_PREFIX:-$HOME}
|
||||||
cp -r ${RUNNER_WORKSPACE_PREFIX}/huggingface.co ${RUNNER_WORKSPACE_PREFIX}/nltk_data ${RUNNER_WORKSPACE_PREFIX}/libssl*.deb ${RUNNER_WORKSPACE_PREFIX}/tika-server*.jar* ${RUNNER_WORKSPACE_PREFIX}/chrome* ${RUNNER_WORKSPACE_PREFIX}/cl100k_base.tiktoken .
|
cp -r ${RUNNER_WORKSPACE_PREFIX}/huggingface.co ${RUNNER_WORKSPACE_PREFIX}/nltk_data ${RUNNER_WORKSPACE_PREFIX}/libssl*.deb ${RUNNER_WORKSPACE_PREFIX}/tika-server*.jar* ${RUNNER_WORKSPACE_PREFIX}/chrome* ${RUNNER_WORKSPACE_PREFIX}/cl100k_base.tiktoken .
|
||||||
sudo docker pull ubuntu:22.04
|
sudo docker pull ubuntu:22.04
|
||||||
sudo docker build -f Dockerfile.slim -t infiniflow/ragflow:dev-slim .
|
sudo docker build --progress=plain -f Dockerfile.slim -t infiniflow/ragflow:dev-slim .
|
||||||
|
|
||||||
- name: Build ragflow:dev
|
- name: Build ragflow:dev
|
||||||
run: |
|
run: |
|
||||||
sudo docker build -f Dockerfile -t infiniflow/ragflow:dev .
|
sudo docker build --progress=plain -f Dockerfile -t infiniflow/ragflow:dev .
|
||||||
|
|
||||||
- name: Start ragflow:dev-slim
|
- name: Start ragflow:dev-slim
|
||||||
run: |
|
run: |
|
||||||
|
@ -75,6 +75,7 @@ RUN current_commit=$(git rev-parse --short HEAD); \
|
|||||||
else \
|
else \
|
||||||
version_info="$version_info full"; \
|
version_info="$version_info full"; \
|
||||||
fi; \
|
fi; \
|
||||||
|
echo "RAGFlow version: $version_info"; \
|
||||||
echo $version_info > /ragflow/VERSION
|
echo $version_info > /ragflow/VERSION
|
||||||
|
|
||||||
COPY web web
|
COPY web web
|
||||||
|
@ -75,6 +75,7 @@ RUN current_commit=$(git rev-parse --short HEAD); \
|
|||||||
else \
|
else \
|
||||||
version_info="$version_info full"; \
|
version_info="$version_info full"; \
|
||||||
fi; \
|
fi; \
|
||||||
|
echo "RAGFlow version: $version_info"; \
|
||||||
echo $version_info > /ragflow/VERSION
|
echo $version_info > /ragflow/VERSION
|
||||||
|
|
||||||
COPY web web
|
COPY web web
|
||||||
|
@ -48,6 +48,17 @@ def equivalent_condition_to_str(condition: dict) -> str:
|
|||||||
return " AND ".join(cond)
|
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
|
@singleton
|
||||||
class InfinityConnection(DocStoreConnection):
|
class InfinityConnection(DocStoreConnection):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
@ -289,7 +300,7 @@ class InfinityConnection(DocStoreConnection):
|
|||||||
kb_res = builder.to_pl()
|
kb_res = builder.to_pl()
|
||||||
df_list.append(kb_res)
|
df_list.append(kb_res)
|
||||||
self.connPool.release_conn(inf_conn)
|
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))
|
logging.debug("INFINITY search tables: " + str(table_list))
|
||||||
return res
|
return res
|
||||||
|
|
||||||
@ -306,7 +317,7 @@ class InfinityConnection(DocStoreConnection):
|
|||||||
kb_res = table_instance.output(["*"]).filter(f"id = '{chunkId}'").to_pl()
|
kb_res = table_instance.output(["*"]).filter(f"id = '{chunkId}'").to_pl()
|
||||||
df_list.append(kb_res)
|
df_list.append(kb_res)
|
||||||
self.connPool.release_conn(inf_conn)
|
self.connPool.release_conn(inf_conn)
|
||||||
res = pl.concat(df_list)
|
res = concat_dataframes(df_list, ["id"])
|
||||||
res_fields = self.getFields(res, res.columns)
|
res_fields = self.getFields(res, res.columns)
|
||||||
return res_fields.get(chunkId, None)
|
return res_fields.get(chunkId, None)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user