From 9bd1857ca523d2888bca45a514d26f78adcf615c Mon Sep 17 00:00:00 2001 From: Jake Tae Date: Mon, 6 Dec 2021 18:49:40 +0000 Subject: [PATCH 1/9] fix: raise error on nonexistent datasets --- promptsource/templates.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/promptsource/templates.py b/promptsource/templates.py index 52425f266..5846157b8 100644 --- a/promptsource/templates.py +++ b/promptsource/templates.py @@ -380,7 +380,11 @@ def read_from_file(self) -> Dict: """ if not os.path.exists(self.yaml_path): - return {} + raise ValueError( + f"Dataset {self.dataset_name}, subset {self.subset_name} not found" + if self.subset_name + else f"Dataset {self.dataset_name} not found" + ) yaml_dict = yaml.load(open(self.yaml_path, "r"), Loader=yaml.FullLoader) return yaml_dict[self.TEMPLATES_KEY] From e97fe14b634b6871a6d05023eed68594e227bce0 Mon Sep 17 00:00:00 2001 From: Jake Tae Date: Mon, 6 Dec 2021 21:06:02 +0000 Subject: [PATCH 2/9] style: run linters --- promptsource/templates.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/promptsource/templates.py b/promptsource/templates.py index 5846157b8..704a8c5b5 100644 --- a/promptsource/templates.py +++ b/promptsource/templates.py @@ -381,8 +381,8 @@ def read_from_file(self) -> Dict: if not os.path.exists(self.yaml_path): raise ValueError( - f"Dataset {self.dataset_name}, subset {self.subset_name} not found" - if self.subset_name + f"Dataset {self.dataset_name}, subset {self.subset_name} not found" + if self.subset_name else f"Dataset {self.dataset_name} not found" ) yaml_dict = yaml.load(open(self.yaml_path, "r"), Loader=yaml.FullLoader) From 7964879429832898a92955b230e19579d594c8ac Mon Sep 17 00:00:00 2001 From: Jake Tae Date: Fri, 28 Jan 2022 05:28:59 +0900 Subject: [PATCH 3/9] fix: warn instead of returning --- promptsource/templates.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/promptsource/templates.py b/promptsource/templates.py index 704a8c5b5..378bf9b46 100644 --- a/promptsource/templates.py +++ b/promptsource/templates.py @@ -5,6 +5,7 @@ from shutil import rmtree from typing import Dict, List, Optional, Tuple +import logger import pandas as pd import pkg_resources import yaml @@ -380,10 +381,9 @@ def read_from_file(self) -> Dict: """ if not os.path.exists(self.yaml_path): - raise ValueError( - f"Dataset {self.dataset_name}, subset {self.subset_name} not found" - if self.subset_name - else f"Dataset {self.dataset_name} not found" + logger.warning( + f"Tried instantiating `DatasetTemplates` for {self.dataset_name}, but no prompts found." + "Please ignore this warning if you are creating new prompts for this datset." ) yaml_dict = yaml.load(open(self.yaml_path, "r"), Loader=yaml.FullLoader) return yaml_dict[self.TEMPLATES_KEY] From 70395624b92ab3634ae9f01a50db580cf8b7817d Mon Sep 17 00:00:00 2001 From: Jake Tae Date: Fri, 28 Jan 2022 05:33:35 +0900 Subject: [PATCH 4/9] fix: `logger` -> `logging` --- promptsource/templates.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/promptsource/templates.py b/promptsource/templates.py index 378bf9b46..7aab20809 100644 --- a/promptsource/templates.py +++ b/promptsource/templates.py @@ -5,7 +5,7 @@ from shutil import rmtree from typing import Dict, List, Optional, Tuple -import logger +import logging import pandas as pd import pkg_resources import yaml @@ -381,7 +381,7 @@ def read_from_file(self) -> Dict: """ if not os.path.exists(self.yaml_path): - logger.warning( + logging.warning( f"Tried instantiating `DatasetTemplates` for {self.dataset_name}, but no prompts found." "Please ignore this warning if you are creating new prompts for this datset." ) From 880eb2224c68dac0d38b7513bebdbc33d9dc8144 Mon Sep 17 00:00:00 2001 From: Jake Tae Date: Fri, 28 Jan 2022 06:47:01 +0900 Subject: [PATCH 5/9] style: run linter --- promptsource/templates.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/promptsource/templates.py b/promptsource/templates.py index 7aab20809..1311a5dbf 100644 --- a/promptsource/templates.py +++ b/promptsource/templates.py @@ -1,3 +1,4 @@ +import logging import os import random import uuid @@ -5,7 +6,6 @@ from shutil import rmtree from typing import Dict, List, Optional, Tuple -import logging import pandas as pd import pkg_resources import yaml From 889cb5bc88f7c0b9dfd2561299296d29d06e81a6 Mon Sep 17 00:00:00 2001 From: Jake Tae Date: Fri, 28 Jan 2022 06:49:12 +0900 Subject: [PATCH 6/9] chore: fix typo --- promptsource/templates.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/promptsource/templates.py b/promptsource/templates.py index 1311a5dbf..2ffaa404e 100644 --- a/promptsource/templates.py +++ b/promptsource/templates.py @@ -383,7 +383,7 @@ def read_from_file(self) -> Dict: if not os.path.exists(self.yaml_path): logging.warning( f"Tried instantiating `DatasetTemplates` for {self.dataset_name}, but no prompts found." - "Please ignore this warning if you are creating new prompts for this datset." + "Please ignore this warning if you are creating new prompts for this dataset." ) yaml_dict = yaml.load(open(self.yaml_path, "r"), Loader=yaml.FullLoader) return yaml_dict[self.TEMPLATES_KEY] From baadaba9d79d159a54419bf8a765161424bea3f8 Mon Sep 17 00:00:00 2001 From: Jake Tae Date: Fri, 28 Jan 2022 06:51:18 +0900 Subject: [PATCH 7/9] fix: specify subset name if possible --- promptsource/templates.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/promptsource/templates.py b/promptsource/templates.py index 2ffaa404e..e5275de7f 100644 --- a/promptsource/templates.py +++ b/promptsource/templates.py @@ -381,8 +381,9 @@ def read_from_file(self) -> Dict: """ if not os.path.exists(self.yaml_path): + dataset_name = f"{self.dataset_name} {self.subset_name}" if self.subset_name else self.dataset_name logging.warning( - f"Tried instantiating `DatasetTemplates` for {self.dataset_name}, but no prompts found." + f"Tried instantiating `DatasetTemplates` for {dataset_name}, but no prompts found." "Please ignore this warning if you are creating new prompts for this dataset." ) yaml_dict = yaml.load(open(self.yaml_path, "r"), Loader=yaml.FullLoader) From ba97965464939cae37f6de4b1515ea200ed051cf Mon Sep 17 00:00:00 2001 From: Victor SANH Date: Fri, 4 Feb 2022 11:35:51 -0500 Subject: [PATCH 8/9] Update promptsource/templates.py --- promptsource/templates.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/promptsource/templates.py b/promptsource/templates.py index e5275de7f..ac5a6c72b 100644 --- a/promptsource/templates.py +++ b/promptsource/templates.py @@ -383,9 +383,10 @@ def read_from_file(self) -> Dict: if not os.path.exists(self.yaml_path): dataset_name = f"{self.dataset_name} {self.subset_name}" if self.subset_name else self.dataset_name logging.warning( - f"Tried instantiating `DatasetTemplates` for {dataset_name}, but no prompts found." + f"Tried instantiating `DatasetTemplates` for {dataset_name}, but no prompts found. " "Please ignore this warning if you are creating new prompts for this dataset." ) + return {} yaml_dict = yaml.load(open(self.yaml_path, "r"), Loader=yaml.FullLoader) return yaml_dict[self.TEMPLATES_KEY] From 99dd469bbdf93e5d1d58b679b767262992cc2f1a Mon Sep 17 00:00:00 2001 From: Victor Sanh Date: Fri, 4 Feb 2022 16:50:02 +0000 Subject: [PATCH 9/9] quick fix for the tests (black dependency) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 29044fdfc..94d3b160c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -black +black<=21.12b0 datasets>=1.7.0 flake8 isort==5.8.0