WIP: #45 - WTO: Write datasets in JSON repo for "annually" category

Merge request for management#45 (closed)

wto_to_dbnomics.py

@@ -44,7 +44,7 @@ import xlrd
 from docopt import docopt
 from slugify import slugify
 
-from dbnomics_converters.base import verified_value, to_float
+from dbnomics_converters.base import assert_no_error, to_float
 from dbnomics_converters.datasets import validate_dataset
 from dbnomics_converters.providers import validate_provider
 from dbnomics_converters.series import validate_series
@@ -213,7 +213,7 @@ def main():
     # Create provider.json
     provider_json_data = PROVIDER
     provider_json_data['categories'] = [category['name'] for category in CATEGORIES]
-    provider_json_data = verified_value(validate_provider(provider_json_data, format='json'))
+    provider_json_data = assert_no_error(validate_provider(provider_json_data, format='json'))
     write_json_file(os.path.join(target_dir, 'provider.json'), provider_json_data)
 
     for category in CATEGORIES:
@@ -242,7 +242,7 @@ def create_directories_subtree(category_or_dataset, parent_category_path):
             ],
             'category_code': category['code']
         }
-        # category_json_data = verified_value(validate_category(category_json_data, format='json', used_categories_code=used_categories_code))
+        # category_json_data = assert_no_error(validate_category(category_json_data, format='json', used_categories_code=used_categories_code))
         write_json_file(os.path.join(category_path, element_dirname, 'category.json'), category_json_data)
 
     element_type = category_or_dataset['type']
@@ -400,7 +400,7 @@ def create_dataset_and_series_from_csv(dataset, dataset_path):
         )
 
         # Create series.json
-        series = verified_value(validate_series(series, format='json'))
+        series = assert_no_error(validate_series(series, format='json'))
         write_json_file(os.path.join(series_dir_path, 'series.json'), series)
 
     # prepare data to be written in dataset.json
@@ -421,7 +421,7 @@ def create_dataset_and_series_from_csv(dataset, dataset_path):
         'dimension_keys': dimensions_codes,
     }
     dataset_json_data["series"] = list(sorted(series_directories_names))
-    dataset_json_data = verified_value(validate_dataset(dataset_json_data, format='json',
+    dataset_json_data = assert_no_error(validate_dataset(dataset_json_data, format='json',
                                                         skip_series_duplicates_check=True))
     write_json_file(os.path.join(dataset_path, 'dataset.json'), dataset_json_data)
 
@@ -464,7 +464,7 @@ def create_dataset_and_series_from_xls(dataset, dataset_path):
         series_dir_path = os.path.join(dataset_path, series_directory_name)
         os.mkdir(series_dir_path)
         # Create series.json
-        series = verified_value(validate_series(series, format='json'))
+        series = assert_no_error(validate_series(series, format='json'))
         write_json_file(os.path.join(series_dir_path, 'series.json'), series)
         # Write series observations
         write_series_tsv_file(series_dir_path, observations, unit)
@@ -554,7 +554,7 @@ def create_dataset_and_series_from_xls(dataset, dataset_path):
     }
     # Finaly, write dataset.json
     dataset_json_data["series"] = list(sorted(series_directories_names))
-    dataset_json_data = verified_value(validate_dataset(dataset_json_data, format='json'))
+    dataset_json_data = assert_no_error(validate_dataset(dataset_json_data, format='json'))
     write_json_file(os.path.join(dataset_path, 'dataset.json'), dataset_json_data)