diff --git a/deepdoc/parser/markdown_parser.py b/deepdoc/parser/markdown_parser.py index 900ef525cc..e911a22ac8 100644 --- a/deepdoc/parser/markdown_parser.py +++ b/deepdoc/parser/markdown_parser.py @@ -56,7 +56,7 @@ class RAGFlowMarkdownParser: """, re.VERBOSE, ) - working_text = replace_tables_with_rendered_html(border_table_pattern, tables) + working_text = replace_tables_with_rendered_html(border_table_pattern, tables, render=separate_tables) # Borderless Markdown table no_border_table_pattern = re.compile( @@ -68,7 +68,7 @@ class RAGFlowMarkdownParser: """, re.VERBOSE, ) - working_text = replace_tables_with_rendered_html(no_border_table_pattern, tables) + working_text = replace_tables_with_rendered_html(no_border_table_pattern, tables, render=separate_tables) # Replace any TAGS e.g. to
TAGS = ["table", "td", "tr", "th", "tbody", "thead", "div"] diff --git a/test/testcases/test_sdk_api/test_chunk_management_within_dataset/conftest.py b/test/testcases/test_sdk_api/test_chunk_management_within_dataset/conftest.py index 835662d7ae..225cfe45b1 100644 --- a/test/testcases/test_sdk_api/test_chunk_management_within_dataset/conftest.py +++ b/test/testcases/test_sdk_api/test_chunk_management_within_dataset/conftest.py @@ -15,7 +15,6 @@ # -from time import sleep import pytest from common import batch_add_chunks, delete_all_chunks @@ -32,6 +31,10 @@ def condition(_dataset: DataSet): return False return True +@wait_for(30, 1, "Chunk indexing timeout") +def chunks_visible(_document: Document, _chunk_ids: list[str]): + visible_ids = {chunk.id for chunk in _document.list_chunks(page_size=1000)} + return set(_chunk_ids).issubset(visible_ids) @pytest.fixture(scope="function") def add_chunks_func(request: FixtureRequest, add_document: tuple[DataSet, Document]) -> tuple[DataSet, Document, list[Chunk]]: @@ -47,6 +50,5 @@ def add_chunks_func(request: FixtureRequest, add_document: tuple[DataSet, Docume dataset.async_parse_documents([document.id]) condition(dataset) chunks = batch_add_chunks(document, 4) - # issues/6487 - sleep(1) + chunks_visible(document, [chunk.id for chunk in chunks]) return dataset, document, chunks