From 2f98c2d54a3a4f4fbef105e1a3e4f3fc195ef565 Mon Sep 17 00:00:00 2001 From: Lucas Lavandeira <19612265+lucaslavandeira@users.noreply.github.com> Date: Mon, 26 Mar 2018 14:45:41 -0300 Subject: [PATCH] Agrego mensajes de error en lugares donde se levantan excepciones --- series_tiempo_ar_api/libs/indexing/indexer/operations.py | 7 +++++-- .../libs/indexing/report/report_generator.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/series_tiempo_ar_api/libs/indexing/indexer/operations.py b/series_tiempo_ar_api/libs/indexing/indexer/operations.py index 1c760c48..2a92f41c 100644 --- a/series_tiempo_ar_api/libs/indexing/indexer/operations.py +++ b/series_tiempo_ar_api/libs/indexing/indexer/operations.py @@ -89,7 +89,7 @@ def process_column(col, index): # Lista de intervalos temporales de pandas EN ORDEN freqs = constants.PANDAS_FREQS if orig_freq not in freqs: - raise ValueError + raise ValueError(u'Frecuencia inválida: {}'.format(str(orig_freq))) for freq in freqs: # Promedio @@ -125,7 +125,10 @@ def index_transform(col, transform_function, index, series_id, freq, name): if not len(transform_col): return pd.Series() - handle_missing_values(col, transform_col) + try: + handle_missing_values(col, transform_col) + except ValueError: + raise ValueError(u'Error borrando valores sobrantes durante la indexación') transform_df = generate_interval_transformations_df(transform_col, freq) result = transform_df.apply(elastic_index, axis='columns', diff --git a/series_tiempo_ar_api/libs/indexing/report/report_generator.py b/series_tiempo_ar_api/libs/indexing/report/report_generator.py index 141e1cd6..21dfe0f5 100644 --- a/series_tiempo_ar_api/libs/indexing/report/report_generator.py +++ b/series_tiempo_ar_api/libs/indexing/report/report_generator.py @@ -166,7 +166,7 @@ def calculate_dataset_indicators(self, node, data_json): indexable = Dataset.objects.filter(catalog=catalog, indexable=True).count() self.task.indicator_set.create(type=Indicator.DATASET_INDEXABLE, value=indexable, node=node) - not_indexable = total - indexable + not_indexable = Dataset.objects.filter(catalog=catalog, indexable=False).count() self.task.indicator_set.create(type=Indicator.DATASET_NOT_INDEXABLE, value=not_indexable, node=node) updated = Dataset.objects.filter(catalog=catalog, updated=True).count()