From 7146b9457c6843385e19645a9edfcf5077e53484 Mon Sep 17 00:00:00 2001 From: codingma Date: Mon, 15 Jul 2024 10:28:07 +0800 Subject: [PATCH 1/5] add IN_GITHUB_ACTIONS Former-commit-id: 32c3afdfa18dc9560009b324fdf4f2987fc739a9 --- tests/data/test_template.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/data/test_template.py b/tests/data/test_template.py index 1ce1b0d8..4a0dfaa8 100644 --- a/tests/data/test_template.py +++ b/tests/data/test_template.py @@ -26,6 +26,7 @@ if TYPE_CHECKING: HF_TOKEN = os.environ.get("HF_TOKEN", None) +IN_GITHUB_ACTIONS = os.getenv("GITHUB_ACTIONS") == "true" TINY_LLAMA = os.environ.get("TINY_LLAMA", "llamafactory/tiny-random-Llama-3") @@ -121,7 +122,7 @@ def test_jinja_template(use_fast: bool): assert tokenizer.apply_chat_template(MESSAGES) == ref_tokenizer.apply_chat_template(MESSAGES) -@pytest.mark.skipif(HF_TOKEN is None, reason="Gated model.") +@pytest.mark.skipif(IN_GITHUB_ACTIONS or HF_TOKEN is None, reason="Gated model.") def test_gemma_template(): prompt_str = ( "user\nHow are you\n" @@ -133,7 +134,7 @@ def test_gemma_template(): _check_template("google/gemma-2-9b-it", "gemma", prompt_str, answer_str, extra_str="\n") -@pytest.mark.skipif(HF_TOKEN is None, reason="Gated model.") +@pytest.mark.skipif(IN_GITHUB_ACTIONS or HF_TOKEN is None, reason="Gated model.") def test_llama3_template(): prompt_str = ( "<|begin_of_text|><|start_header_id|>user<|end_header_id|>\n\nHow are you<|eot_id|>" From f67ddc05d6c1cada9ea8d3ef89221e886f9fed7c Mon Sep 17 00:00:00 2001 From: hoshi-hiyouga Date: Mon, 15 Jul 2024 22:52:25 +0800 Subject: [PATCH 2/5] Update test_template.py Former-commit-id: 52a4256ad9aa866f6e1bcbe2c663c0f8ecfdb604 --- tests/data/test_template.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/data/test_template.py b/tests/data/test_template.py index 4a0dfaa8..13f9b7bc 100644 --- a/tests/data/test_template.py +++ b/tests/data/test_template.py @@ -26,7 +26,7 @@ if TYPE_CHECKING: HF_TOKEN = os.environ.get("HF_TOKEN", None) -IN_GITHUB_ACTIONS = os.getenv("GITHUB_ACTIONS") == "true" +print(HF_TOKEN) TINY_LLAMA = os.environ.get("TINY_LLAMA", "llamafactory/tiny-random-Llama-3") From c0493daa60eef73b23296059fcb9f86cd46ad029 Mon Sep 17 00:00:00 2001 From: hoshi-hiyouga Date: Mon, 15 Jul 2024 22:55:05 +0800 Subject: [PATCH 3/5] Update test_template.py Former-commit-id: 33420bab81cfc7db1dfd3cd4200b8681bf7de9e6 --- tests/data/test_template.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/data/test_template.py b/tests/data/test_template.py index 13f9b7bc..76bbdfd2 100644 --- a/tests/data/test_template.py +++ b/tests/data/test_template.py @@ -122,7 +122,7 @@ def test_jinja_template(use_fast: bool): assert tokenizer.apply_chat_template(MESSAGES) == ref_tokenizer.apply_chat_template(MESSAGES) -@pytest.mark.skipif(IN_GITHUB_ACTIONS or HF_TOKEN is None, reason="Gated model.") +@pytest.mark.skipif(HF_TOKEN is None, reason="Gated model.") def test_gemma_template(): prompt_str = ( "user\nHow are you\n" @@ -134,7 +134,7 @@ def test_gemma_template(): _check_template("google/gemma-2-9b-it", "gemma", prompt_str, answer_str, extra_str="\n") -@pytest.mark.skipif(IN_GITHUB_ACTIONS or HF_TOKEN is None, reason="Gated model.") +@pytest.mark.skipif(HF_TOKEN is None, reason="Gated model.") def test_llama3_template(): prompt_str = ( "<|begin_of_text|><|start_header_id|>user<|end_header_id|>\n\nHow are you<|eot_id|>" From c790997fbcdb916f535103fddc3fe176c8d535bf Mon Sep 17 00:00:00 2001 From: hoshi-hiyouga Date: Mon, 15 Jul 2024 23:00:27 +0800 Subject: [PATCH 4/5] Update test_template.py Former-commit-id: da990f76b881382b9ae6fcfef78dc7df8034947b --- tests/data/test_template.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/data/test_template.py b/tests/data/test_template.py index 76bbdfd2..56c57074 100644 --- a/tests/data/test_template.py +++ b/tests/data/test_template.py @@ -26,7 +26,7 @@ if TYPE_CHECKING: HF_TOKEN = os.environ.get("HF_TOKEN", None) -print(HF_TOKEN) +raise ValueError("test: " + str(HF_TOKEN)) TINY_LLAMA = os.environ.get("TINY_LLAMA", "llamafactory/tiny-random-Llama-3") From d63c3be556659775721f9ef5ce55f80b5ff91030 Mon Sep 17 00:00:00 2001 From: hoshi-hiyouga Date: Mon, 15 Jul 2024 23:04:39 +0800 Subject: [PATCH 5/5] Update test_template.py Former-commit-id: 10289eab158c2de13bdde2d5a7c644195e516201 --- tests/data/test_template.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/data/test_template.py b/tests/data/test_template.py index 56c57074..c1bc1b4b 100644 --- a/tests/data/test_template.py +++ b/tests/data/test_template.py @@ -26,7 +26,6 @@ if TYPE_CHECKING: HF_TOKEN = os.environ.get("HF_TOKEN", None) -raise ValueError("test: " + str(HF_TOKEN)) TINY_LLAMA = os.environ.get("TINY_LLAMA", "llamafactory/tiny-random-Llama-3") @@ -122,7 +121,7 @@ def test_jinja_template(use_fast: bool): assert tokenizer.apply_chat_template(MESSAGES) == ref_tokenizer.apply_chat_template(MESSAGES) -@pytest.mark.skipif(HF_TOKEN is None, reason="Gated model.") +@pytest.mark.skipif(not HF_TOKEN, reason="Gated model.") def test_gemma_template(): prompt_str = ( "user\nHow are you\n" @@ -134,7 +133,7 @@ def test_gemma_template(): _check_template("google/gemma-2-9b-it", "gemma", prompt_str, answer_str, extra_str="\n") -@pytest.mark.skipif(HF_TOKEN is None, reason="Gated model.") +@pytest.mark.skipif(not HF_TOKEN, reason="Gated model.") def test_llama3_template(): prompt_str = ( "<|begin_of_text|><|start_header_id|>user<|end_header_id|>\n\nHow are you<|eot_id|>"