From bd9fe9b08665a8fcba514ce6659d87a08a7f9534 Mon Sep 17 00:00:00 2001 From: ivanzvonkov Date: Mon, 14 Nov 2022 14:29:07 -0500 Subject: [PATCH 1/4] Dataset verification in cli --- openmapflow/scripts/openmapflow | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/openmapflow/scripts/openmapflow b/openmapflow/scripts/openmapflow index 3f86de08..4f7180b6 100644 --- a/openmapflow/scripts/openmapflow +++ b/openmapflow/scripts/openmapflow @@ -17,11 +17,11 @@ case $1 in ;; "create-datasets") check_openmapflow_yaml - python3 -c "from datasets import datasets; from openmapflow.labeled_dataset import create_datasets; create_datasets(datasets)" "${@:2}" + python -c "from datasets import datasets; from openmapflow.labeled_dataset import create_datasets; create_datasets(datasets)" "${@:2}" ;; "datapath") check_openmapflow_yaml - python3 -c "from openmapflow.config import DataPaths; print(DataPaths.get('$2'))" + python -c "from openmapflow.config import DataPaths; print(DataPaths.get('$2'))" ;; "datasets") check_openmapflow_yaml @@ -35,11 +35,15 @@ case $1 in librarydir ;; "generate") - python3 "$(librarydir)/generate.py" + python "$(librarydir)/generate.py" ;; "ls") ls "$(librarydir)/$2" ;; + "verify") + check_openmapflow_yaml + python -c "from datasets import $2; from openmapflow.labeled_dataset import verify_df; verify_df($2().load_labels())" + ;; "version") version ;; @@ -59,6 +63,7 @@ case $1 in echo "openmapflow generate - generates an openmapflow project" echo "openmapflow help - outputs this message" echo "openmapflow ls - lists files in openmapflow library directory" + echo "openmapflow verify - verifies that the dataset in datasets.py is valid" echo "openmapflow version - package version" ;; esac From f5a97b99590197ca8eb5c2d3e18ea25307fabdd5 Mon Sep 17 00:00:00 2001 From: ivanzvonkov Date: Tue, 29 Nov 2022 07:22:59 -0500 Subject: [PATCH 2/4] dataset verify CLI --- openmapflow/labeled_dataset.py | 15 +++++++++++++++ openmapflow/scripts/openmapflow | 6 +++--- tests/test_CLI.py | 4 +++- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/openmapflow/labeled_dataset.py b/openmapflow/labeled_dataset.py index 70963d9d..c4071608 100644 --- a/openmapflow/labeled_dataset.py +++ b/openmapflow/labeled_dataset.py @@ -618,3 +618,18 @@ def create_datasets(datasets: List[LabeledDataset]) -> None: with (PROJECT_ROOT / dp.REPORT).open("w") as f: f.write(report) + + +def print_verification(dataset_name: str): + # Try importing + + try: + from datasets import dataset_name as dataset + except ImportError: + pass + try: + import dataset_name as dataset + except ImportError: + pass + + verify_df(dataset().load_labels()) diff --git a/openmapflow/scripts/openmapflow b/openmapflow/scripts/openmapflow index 4f7180b6..0f86a7c6 100644 --- a/openmapflow/scripts/openmapflow +++ b/openmapflow/scripts/openmapflow @@ -51,9 +51,9 @@ case $1 in version ;; *) - echo "---------------------------------------------------------------------------------" + echo "---------------------------------------------------------------------------------------------" echo " OpenMapFlow CLI" - echo "---------------------------------------------------------------------------------" + echo "---------------------------------------------------------------------------------------------" echo "openmapflow cp - copy a file or directory from the library" echo "openmapflow create-datasets - creates datasets for all datasets in datasets.py" echo "openmapflow datapath - outputs a relative path to the data directory" @@ -63,7 +63,7 @@ case $1 in echo "openmapflow generate - generates an openmapflow project" echo "openmapflow help - outputs this message" echo "openmapflow ls - lists files in openmapflow library directory" - echo "openmapflow verify - verifies that the dataset in datasets.py is valid" + echo "openmapflow verify - verifies a user declared LabeledDataset class in datasets.py" echo "openmapflow version - package version" ;; esac diff --git a/tests/test_CLI.py b/tests/test_CLI.py index 2b70f472..c1e28df5 100644 --- a/tests/test_CLI.py +++ b/tests/test_CLI.py @@ -59,8 +59,9 @@ def test_version(self): @skipIf(os.name == "nt", "Not yet available on Windows") def test_help(self): + self.maxDiff = None actual_output = check_output(["openmapflow", "help"]).decode().rstrip() - long_line = "-" * 81 + long_line = "-" * 93 expected_output = f"""{long_line} OpenMapFlow CLI\n{long_line} openmapflow cp - copy a file or directory from the library @@ -72,5 +73,6 @@ def test_help(self): openmapflow generate - generates an openmapflow project openmapflow help - outputs this message openmapflow ls - lists files in openmapflow library directory +openmapflow verify - verifies a user declared LabeledDataset class in datasets.py openmapflow version - package version""" self.assertEqual(actual_output, expected_output) From f6532b990989feaccae9cdf2f52f0c4efcf0b7e1 Mon Sep 17 00:00:00 2001 From: ivanzvonkov Date: Tue, 29 Nov 2022 07:25:16 -0500 Subject: [PATCH 3/4] revert function --- openmapflow/labeled_dataset.py | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/openmapflow/labeled_dataset.py b/openmapflow/labeled_dataset.py index c4071608..70963d9d 100644 --- a/openmapflow/labeled_dataset.py +++ b/openmapflow/labeled_dataset.py @@ -618,18 +618,3 @@ def create_datasets(datasets: List[LabeledDataset]) -> None: with (PROJECT_ROOT / dp.REPORT).open("w") as f: f.write(report) - - -def print_verification(dataset_name: str): - # Try importing - - try: - from datasets import dataset_name as dataset - except ImportError: - pass - try: - import dataset_name as dataset - except ImportError: - pass - - verify_df(dataset().load_labels()) From f93923e0abadc94d21bee75b18a1ac9053418128 Mon Sep 17 00:00:00 2001 From: ivanzvonkov Date: Tue, 29 Nov 2022 07:37:38 -0500 Subject: [PATCH 4/4] Update to 0.2.2 --- openmapflow/constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmapflow/constants.py b/openmapflow/constants.py index 50d4d35c..0c924336 100644 --- a/openmapflow/constants.py +++ b/openmapflow/constants.py @@ -13,7 +13,7 @@ TEMPLATE_README = TEMPLATES_DIR / "README.md" TEMPLATE_DEPLOY_YML = TEMPLATES_DIR / "github-deploy.yaml" TEMPLATE_TEST_YML = TEMPLATES_DIR / "github-test.yaml" -VERSION = "0.2.2rc2" +VERSION = "0.2.2" # -------------- Dataframe column names -------------------------------------- SOURCE = "source"