From ffd145102487857d42fd8f3c4b7ae087ea5ab8e8 Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Fri, 18 Oct 2024 22:25:38 +0200 Subject: [PATCH] - added info.is_delta to indicate delta record. First record has is_delat=False - fixed eval_records to care for delta records --- arielle.py | 2 +- eval_records.py | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/arielle.py b/arielle.py index 04d2146..e8ea8b6 100644 --- a/arielle.py +++ b/arielle.py @@ -80,7 +80,7 @@ def main(): vehicle_data_last = vehicle_data # Put vehicle data difference onto record list - record_list.append({'info': {'record_id': record_id, 'timestamp': timestamp}, 'data': vehicle_data_diff}) + record_list.append({'info': {'record_id': record_id, 'timestamp': timestamp, 'is_delta': (record_id > 0)}, 'data': vehicle_data_diff}) # Store record list print(f"{timestamp}: Store record #{record_id:04d}") diff --git a/eval_records.py b/eval_records.py index 1a52805..bc0f7dd 100644 --- a/eval_records.py +++ b/eval_records.py @@ -1,12 +1,13 @@ import json import os from datetime import datetime +from deep_diff import deep_merge BASE = "results" VIN = 'WVWZZZE1ZMP010760' YEAR = 2024 MONTH = 10 -DAY = "18" +DAY = ['18'] class Endpoint: @@ -113,6 +114,13 @@ for day in day_list: with open(file_path, "r") as fp: records = json.load(fp) for record in records: + try: + if record['info']['is_delta']: + record = deep_merge(last, record['data']) + except KeyError: + pass + + last = record try: for end_point in end_points: end_point.assign(record)