Skip to content
Snippets Groups Projects

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

Closed Bruno Duyé requested to merge dev into master
All threads resolved!
1 file
+ 12
12
Compare changes
  • Side-by-side
  • Inline
+ 12
12
@@ -55,8 +55,8 @@ log = logging.getLogger(__name__)
PROVIDER = dict(
name='WTO',
long_name='World Trade Organization',
code='WTO',
name='World Trade Organization',
region='World',
website='https://www.wto.org/',
terms_of_use='https://www.wto.org/english/tratop_e/trips_e/intel2_e.htm'
@@ -382,7 +382,7 @@ def create_dataset_and_series_from_csv(dataset, dataset_path):
for dimension_code, label in dimensions_key_labels_by_dimension_code.items()
]
series = {
'key': '-'.join(dimensions_key_values_codes),
'code': '-'.join(dimensions_key_values_codes),
'dimensions': dict(zip(dimensions_codes, dimensions_key_values_codes)),
}
@@ -406,19 +406,19 @@ def create_dataset_and_series_from_csv(dataset, dataset_path):
# prepare data to be written in dataset.json
dataset_json_data = {
'name': dataset['name'],
'dataset_code': dataset['code'],
'codelists': {
'code': dataset['code'],
'dimensions_values_labels': {
dimension_code: {
dimension_value_code: dimensions_values_labels[dimension_code][dimension_value_code]
for dimension_value_code in dimensions_values_labels_codes
}
for dimension_code, dimensions_values_labels_codes in found_dimensions_values_codes.items()
},
'concepts': {
'dimensions_labels': {
cached_slugify(dimension_label): dimension_label
for dimension_label in dimensions_labels
},
'dimension_keys': dimensions_codes,
'dimensions_codes_order': dimensions_codes,
}
dataset_json_data["series"] = list(sorted(series_directories_names))
dataset_json_data = assert_no_error(validate_dataset(dataset_json_data, format='json',
@@ -520,7 +520,7 @@ def create_dataset_and_series_from_xls(dataset, dataset_path):
generated_region_code = region_code or slugify(region_label)
regions_codes.add((region_label, generated_region_code))
series = dict(
key=series_directory_name,
code=series_directory_name,
dimensions=dict(
Flow=flow_code,
Region=generated_region_code
@@ -535,9 +535,9 @@ def create_dataset_and_series_from_xls(dataset, dataset_path):
dimension_codes = [slugify(label) for label in xls_constants['dimensions_labels']]
dataset_json_data = {
'name': dataset['name'],
'dataset_code': dataset['code'],
'dimension_keys': dimension_codes,
'codelists': {
'code': dataset['code'],
'dimensions_codes_order': dimension_codes,
'dimensions_values_labels': {
'flow': {
label_and_code[1]: label_and_code[0]
for label_and_code in xls_constants['flow_codes_and_names_by_sheet_names'].values()
@@ -547,7 +547,7 @@ def create_dataset_and_series_from_xls(dataset, dataset_path):
for region in regions_codes
}
},
'concepts': dict(zip(
'dimensions_labels': dict(zip(
dimension_codes,
xls_constants['dimensions_labels'],
)),