From dc20713cad5e7444944d344def079e3788cf29dc Mon Sep 17 00:00:00 2001 From: alex Date: Sun, 27 Jul 2025 19:25:42 +0200 Subject: [PATCH] gestione GD --- utils/csv/data_preparation.py | 9 ++++++--- utils/database/__init__.py | 1 + utils/database/loader_action.py | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/utils/csv/data_preparation.py b/utils/csv/data_preparation.py index a449366..3d84b67 100644 --- a/utils/csv/data_preparation.py +++ b/utils/csv/data_preparation.py @@ -205,16 +205,19 @@ async def make_gd_matrix(cfg: object, id: int, pool: object) -> list: for riga in [riga for riga in righe if ';|;' in riga and 'No RX' not in riga and '.-' not in riga and 'File Creation' not in riga and riga.isprintable()]: timestamp, rilevazioni = riga.split(';|;',1) EventDate, EventTime = timestamp.split(' ') - logger.info(f"GD id {id}: {pattern} {rilevazioni}") + #logger.debug(f"GD id {id}: {pattern} {rilevazioni}") if re.search(pattern, rilevazioni): batlevel, temperature, rssi = rilevazioni.split(';') - logger.info(f"GD id {id}: {EventDate}, {EventTime}, {batlevel}, {temperature}, {rssi}") + #logger.debug(f"GD id {id}: {EventDate}, {EventTime}, {batlevel}, {temperature}, {rssi}") + matrice_valori.append([UnitName, ToolNameID, 1, date_check.conforma_data(EventDate), EventTime, batlevel, temperature] + [rssi] + ([None] * 18)) elif all(char == ';' for char in rilevazioni): pass elif ';|;' in rilevazioni: unit_metrics, data = rilevazioni.split(';|;') batlevel, temperature = unit_metrics.split(';') - logger.info(f"GD id {id}: {EventDate}, {EventTime}, {batlevel}, {temperature}, {data}") + #logger.debug(f"GD id {id}: {EventDate}, {EventTime}, {batlevel}, {temperature}, {data}") + valori = data.split(';') + matrice_valori.append([UnitName, ToolNameID.replace("GD", "DT"), 2, date_check.conforma_data(EventDate), EventTime, batlevel, temperature] + valori + ([None] * (19 - len(valori)))) else: logger.warning(f"GD id {id}: dati non trattati - {rilevazioni}") diff --git a/utils/database/__init__.py b/utils/database/__init__.py index 818b46e..9c43f9a 100644 --- a/utils/database/__init__.py +++ b/utils/database/__init__.py @@ -15,4 +15,5 @@ FLAG_TO_TIMESTAMP = { WorkflowFlags.SENT_ELAB_DATA: "sent_elab_at" } +# Dimensione degli split della matrice per il caricamento BATCH_SIZE = 1000 \ No newline at end of file diff --git a/utils/database/loader_action.py b/utils/database/loader_action.py index a016118..c640bf4 100644 --- a/utils/database/loader_action.py +++ b/utils/database/loader_action.py @@ -84,7 +84,7 @@ async def load_data(cfg: object, matrice_valori: list, pool: object) -> bool: except Exception as e: await conn.rollback() logger.error(f"Error: {e}.") - logger.error(f"Matrice valori da inserire: {batch}.") + # logger.error(f"Matrice valori da inserire: {batch}.") if e.args[0] == 1213: # Deadlock detected logger.warning(