diff --git a/.github/sync-config.yml b/.github/sync-config.yml index 417ed83b..db016367 100644 --- a/.github/sync-config.yml +++ b/.github/sync-config.yml @@ -5,8 +5,8 @@ sync: dest: resources/nltk_data/ - source: resources/examples/ dest: resources/examples/ - - source: resources/images/logo.png - dest: resources/images/logo.png + - source: assets/logo.png + dest: assets/logo.png - source: webui/ dest: webui/ - source: webui/app.py diff --git a/README.md b/README.md index 15dde4e7..1b51d680 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

- +

@@ -315,7 +315,7 @@ See [analysis](https://deepwiki.com/open-sciencelab/GraphGen) by deepwiki for a ### Workflow -![workflow](resources/images/flow.png) +![workflow](assets/flow.png) ## 🍀 Acknowledgements diff --git a/README_zh.md b/README_zh.md index 9c38e9e7..9ed66fed 100644 --- a/README_zh.md +++ b/README_zh.md @@ -1,5 +1,5 @@

- +

@@ -313,7 +313,7 @@ GraphGen 首先根据源文本构建细粒度的知识图谱，然后利用期 ### 工作流程 -![workflow](resources/images/flow.png) +![workflow](assets/flow.png) ## 🍀 致谢 diff --git a/resources/images/flow.png b/assets/flow.png similarity index 100% rename from resources/images/flow.png rename to assets/flow.png diff --git a/resources/images/logo.png b/assets/logo.png similarity index 100% rename from resources/images/logo.png rename to assets/logo.png diff --git a/examples/evaluate/evaluate_qa/qa_evaluation_config.yaml b/examples/evaluate/evaluate_qa/qa_evaluation_config.yaml index 459f9fad..3e875143 100644 --- a/examples/evaluate/evaluate_qa/qa_evaluation_config.yaml +++ b/examples/evaluate/evaluate_qa/qa_evaluation_config.yaml @@ -92,7 +92,7 @@ nodes: metrics: - qa_length - qa_mtld - - qa_reward_score - - qa_uni_score + # - qa_reward_score + # - qa_uni_score mtld_params: threshold: 0.7 diff --git a/resources/README.md b/examples/output_examples/README.md similarity index 100% rename from resources/README.md rename to examples/output_examples/README.md diff --git a/resources/nltk_data/corpora/stopwords/chinese b/graphgen/resources/nltk_data/corpora/stopwords/chinese similarity index 100% rename from resources/nltk_data/corpora/stopwords/chinese rename to graphgen/resources/nltk_data/corpora/stopwords/chinese diff --git a/resources/nltk_data/corpora/stopwords/english b/graphgen/resources/nltk_data/corpora/stopwords/english similarity index 100% rename from resources/nltk_data/corpora/stopwords/english rename to graphgen/resources/nltk_data/corpora/stopwords/english diff --git a/resources/nltk_data/tokenizers/punkt_tab/english/abbrev_types.txt b/graphgen/resources/nltk_data/tokenizers/punkt_tab/english/abbrev_types.txt similarity index 100% rename from resources/nltk_data/tokenizers/punkt_tab/english/abbrev_types.txt rename to graphgen/resources/nltk_data/tokenizers/punkt_tab/english/abbrev_types.txt diff --git a/resources/nltk_data/tokenizers/punkt_tab/english/collocations.tab b/graphgen/resources/nltk_data/tokenizers/punkt_tab/english/collocations.tab similarity index 100% rename from resources/nltk_data/tokenizers/punkt_tab/english/collocations.tab rename to graphgen/resources/nltk_data/tokenizers/punkt_tab/english/collocations.tab diff --git a/resources/nltk_data/tokenizers/punkt_tab/english/ortho_context.tab b/graphgen/resources/nltk_data/tokenizers/punkt_tab/english/ortho_context.tab similarity index 100% rename from resources/nltk_data/tokenizers/punkt_tab/english/ortho_context.tab rename to graphgen/resources/nltk_data/tokenizers/punkt_tab/english/ortho_context.tab diff --git a/resources/nltk_data/tokenizers/punkt_tab/english/sent_starters.txt b/graphgen/resources/nltk_data/tokenizers/punkt_tab/english/sent_starters.txt similarity index 100% rename from resources/nltk_data/tokenizers/punkt_tab/english/sent_starters.txt rename to graphgen/resources/nltk_data/tokenizers/punkt_tab/english/sent_starters.txt diff --git a/tests/e2e_tests/evaluate/test_evaluate_kg.py b/tests/e2e_tests/evaluate/test_evaluate_kg.py new file mode 100644 index 00000000..571dcbd7 --- /dev/null +++ b/tests/e2e_tests/evaluate/test_evaluate_kg.py @@ -0,0 +1,9 @@ +from pathlib import Path + +from tests.e2e_tests.conftest import run_generate_test + + +def test_evaluate_kg(tmp_path: Path): + run_generate_test( + tmp_path, "examples/evaluate/evaluate_kg/kg_evaluation_config.yaml" + ) diff --git a/tests/e2e_tests/evaluate/test_evaluate_qa.py b/tests/e2e_tests/evaluate/test_evaluate_qa.py new file mode 100644 index 00000000..ea3ac8d6 --- /dev/null +++ b/tests/e2e_tests/evaluate/test_evaluate_qa.py @@ -0,0 +1,9 @@ +from pathlib import Path + +from tests.e2e_tests.conftest import run_generate_test + + +def test_evaluate_qa(tmp_path: Path): + run_generate_test( + tmp_path, "examples/evaluate/evaluate_qa/qa_evaluation_config.yaml" + ) diff --git a/tests/e2e_tests/extract/test_extract_schema_guided.py b/tests/e2e_tests/extract/test_extract_schema_guided.py new file mode 100644 index 00000000..6e8f8b2e --- /dev/null +++ b/tests/e2e_tests/extract/test_extract_schema_guided.py @@ -0,0 +1,10 @@ +from pathlib import Path + +from tests.e2e_tests.conftest import run_generate_test + + +def test_extract_schema_guided(tmp_path: Path): + run_generate_test( + tmp_path, + "examples/extract/extract_schema_guided/schema_guided_extraction_config.yaml", + ) diff --git a/tests/e2e_tests/test_generate_aggregated.py b/tests/e2e_tests/generate/test_generate_aggregated.py similarity index 77% rename from tests/e2e_tests/test_generate_aggregated.py rename to tests/e2e_tests/generate/test_generate_aggregated.py index f8c046b6..ffd5e355 100644 --- a/tests/e2e_tests/test_generate_aggregated.py +++ b/tests/e2e_tests/generate/test_generate_aggregated.py @@ -1,6 +1,6 @@ from pathlib import Path -from .conftest import run_generate_test +from tests.e2e_tests.conftest import run_generate_test def test_generate_aggregated(tmp_path: Path): diff --git a/tests/e2e_tests/test_generate_atomic.py b/tests/e2e_tests/generate/test_generate_atomic.py similarity index 76% rename from tests/e2e_tests/test_generate_atomic.py rename to tests/e2e_tests/generate/test_generate_atomic.py index 62b46fec..5a2fe373 100644 --- a/tests/e2e_tests/test_generate_atomic.py +++ b/tests/e2e_tests/generate/test_generate_atomic.py @@ -1,6 +1,6 @@ from pathlib import Path -from .conftest import run_generate_test +from tests.e2e_tests.conftest import run_generate_test def test_generate_atomic(tmp_path: Path): diff --git a/tests/e2e_tests/test_generate_cot.py b/tests/e2e_tests/generate/test_generate_cot.py similarity index 73% rename from tests/e2e_tests/test_generate_cot.py rename to tests/e2e_tests/generate/test_generate_cot.py index a7b61251..cce3951d 100644 --- a/tests/e2e_tests/test_generate_cot.py +++ b/tests/e2e_tests/generate/test_generate_cot.py @@ -1,6 +1,6 @@ from pathlib import Path -from .conftest import run_generate_test +from tests.e2e_tests.conftest import run_generate_test def test_generate_cot(tmp_path: Path): diff --git a/tests/e2e_tests/generate/test_generate_fill_in_blank.py b/tests/e2e_tests/generate/test_generate_fill_in_blank.py new file mode 100644 index 00000000..6a3280d5 --- /dev/null +++ b/tests/e2e_tests/generate/test_generate_fill_in_blank.py @@ -0,0 +1,9 @@ +from pathlib import Path + +from tests.e2e_tests.conftest import run_generate_test + + +def test_generate_fill_in_blank(tmp_path: Path): + run_generate_test( + tmp_path, "examples/generate/generate_fill_in_blank_qa/fill_in_blank_config.yaml" + ) diff --git a/tests/e2e_tests/generate/test_generate_multi_answer.py b/tests/e2e_tests/generate/test_generate_multi_answer.py new file mode 100644 index 00000000..dcb59366 --- /dev/null +++ b/tests/e2e_tests/generate/test_generate_multi_answer.py @@ -0,0 +1,9 @@ +from pathlib import Path + +from tests.e2e_tests.conftest import run_generate_test + + +def test_generate_multi_answer(tmp_path: Path): + run_generate_test( + tmp_path, "examples/generate/generate_multi_answer_qa/multi_answer_config.yaml" + ) diff --git a/tests/e2e_tests/generate/test_generate_multi_choice.py b/tests/e2e_tests/generate/test_generate_multi_choice.py new file mode 100644 index 00000000..578a961f --- /dev/null +++ b/tests/e2e_tests/generate/test_generate_multi_choice.py @@ -0,0 +1,9 @@ +from pathlib import Path + +from tests.e2e_tests.conftest import run_generate_test + + +def test_generate_multi_choice(tmp_path: Path): + run_generate_test( + tmp_path, "examples/generate/generate_multi_choice_qa/multi_choice_config.yaml" + ) diff --git a/tests/e2e_tests/test_generate_multi_hop.py b/tests/e2e_tests/generate/test_generate_multi_hop.py similarity index 76% rename from tests/e2e_tests/test_generate_multi_hop.py rename to tests/e2e_tests/generate/test_generate_multi_hop.py index 2f9cab71..8802de4f 100644 --- a/tests/e2e_tests/test_generate_multi_hop.py +++ b/tests/e2e_tests/generate/test_generate_multi_hop.py @@ -1,6 +1,6 @@ from pathlib import Path -from .conftest import run_generate_test +from tests.e2e_tests.conftest import run_generate_test def test_generate_multi_hop(tmp_path: Path): diff --git a/tests/e2e_tests/generate/test_generate_true_false.py b/tests/e2e_tests/generate/test_generate_true_false.py new file mode 100644 index 00000000..831c7fb7 --- /dev/null +++ b/tests/e2e_tests/generate/test_generate_true_false.py @@ -0,0 +1,9 @@ +from pathlib import Path + +from tests.e2e_tests.conftest import run_generate_test + + +def test_generate_true_false(tmp_path: Path): + run_generate_test( + tmp_path, "examples/generate/generate_true_false_qa/true_false_config.yaml" + ) diff --git a/tests/e2e_tests/test_generate_vqa.py b/tests/e2e_tests/generate/test_generate_vqa.py similarity index 73% rename from tests/e2e_tests/test_generate_vqa.py rename to tests/e2e_tests/generate/test_generate_vqa.py index f51a9f87..b9d7152b 100644 --- a/tests/e2e_tests/test_generate_vqa.py +++ b/tests/e2e_tests/generate/test_generate_vqa.py @@ -1,6 +1,6 @@ from pathlib import Path -from .conftest import run_generate_test +from tests.e2e_tests.conftest import run_generate_test def test_generate_vqa(tmp_path: Path): diff --git a/webui/app.py b/webui/app.py index 140122e4..3258f952 100644 --- a/webui/app.py +++ b/webui/app.py @@ -227,7 +227,7 @@ def run_graphgen(params: WebuiParams, progress=gr.Progress()): with gr.Blocks(title="GraphGen Demo", theme=gr.themes.Glass(), css=css) as demo: # Header gr.Image( - value=os.path.join(root_dir, "resources", "images", "logo.png"), + value=os.path.join(root_dir, "assets", "logo.png"), label="GraphGen Banner", elem_id="banner", interactive=False,