From 466d1e75aeac8bddbe927ddccbfcd8cb8aa293f0 Mon Sep 17 00:00:00 2001
From: MartinRinas <martrin@microsoft.com>
Date: Sat, 28 Dec 2024 15:46:11 +0000
Subject: [PATCH 1/2] json timestamp

---
 packages/modules/vehicles/json/config.py |  2 ++
 packages/modules/vehicles/json/soc.py    | 37 ++++++++++++++++++++----
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/packages/modules/vehicles/json/config.py b/packages/modules/vehicles/json/config.py
index b557a34f3..1032f9399 100644
--- a/packages/modules/vehicles/json/config.py
+++ b/packages/modules/vehicles/json/config.py
@@ -9,12 +9,14 @@ def __init__(
             url: Optional[str] = None,
             soc_pattern: Optional[str] = None,
             range_pattern: Optional[str] = None,
+            timestamp_pattern: Optional[str] = None,
             timeout: Optional[int] = None,
             calculate_soc: bool = False
             ):
         self.url = url
         self.soc_pattern = soc_pattern
         self.range_pattern = range_pattern
+        self.timestamp_pattern = timestamp_pattern
         self.timeout = timeout
         self.calculate_soc = calculate_soc
 
diff --git a/packages/modules/vehicles/json/soc.py b/packages/modules/vehicles/json/soc.py
index 0272cb9bd..7b5f0480e 100644
--- a/packages/modules/vehicles/json/soc.py
+++ b/packages/modules/vehicles/json/soc.py
@@ -11,21 +11,37 @@
 from modules.common.configurable_vehicle import ConfigurableVehicle
 from modules.vehicles.json.config import JsonSocSetup, JsonSocConfiguration
 from typing import Any, Dict
+from datetime import datetime
 
 
 log = logging.getLogger(__name__)
 
 
+def extract_to_epoch(input_string: str) -> float:
+    # If already an integer, return it
+    if isinstance(input_string, int) or isinstance(input_string, float):
+        return int(input_string)
+
+    # Try parsing as UTC formatted time
+    try:
+        dt = datetime.strptime(input_string, "%Y-%m-%dT%H:%M:%SZ")
+        return int(dt.timestamp())
+    except ValueError:
+        log.exception(f"Kein UTC formatiertes Datum in '{input_string}' gefunden.")
+        return None
+
+
 def parse_data(data: Dict[str, Any], pattern: str) -> float:
     log.debug(f"parse_data: data='{data}' pattern='{pattern}'")
 
     if pattern == "":
-        raise ValueError("Please provide pattern to parse data")
+        raise ValueError("Kein Pattern zum extrahieren der Daten definiert. Bitte in der Konfiguration aktualisieren.")
 
     result = jq.compile(pattern).input(data).first()
     if result is None:
-        raise ValueError(f"Pattern {pattern} did not match any data in {data}")
+        raise ValueError(f"Pattern {pattern} hat keine Ergebnisse in '{data}' geliefert.")
 
+    log.debug(f"result='{result}'")
     return float(result)
 
 
@@ -33,10 +49,11 @@ def fetch_soc(config: JsonSocSetup) -> CarState:
     url = config.configuration.url
     soc_pattern = config.configuration.soc_pattern
     range_pattern = config.configuration.range_pattern
+    timestamp_pattern = config.configuration.timestamp_pattern
     timeout = config.configuration.timeout if isinstance(config.configuration.timeout, int) else None
 
     if url is None or url == "":
-        log.warning("url not defined, set soc to 0")
+        log.warning("URL nicht definiert, setze SOC auf 0")
         return CarState(0, 0)
     else:
         raw_data: Dict[str, Any] = req.get_http_session().get(url, timeout=timeout).json()
@@ -44,12 +61,20 @@ def fetch_soc(config: JsonSocSetup) -> CarState:
     soc = parse_data(raw_data, soc_pattern)
 
     if range_pattern is None or range_pattern == "":
-        log.warning("range_pattern not defined, set range to 0")
-        range = 0
+        log.debug("Kein Pattern für Range angegeben, setze Range auf None.")
+        range = None
     else:
         range = int(parse_data(raw_data, range_pattern))
 
-    return CarState(soc, range)
+    if timestamp_pattern is None or timestamp_pattern == "":
+        log.debug("Kein Pattern für Timestamp angegeben, setze Timestamp auf None.")
+        timestamp = None
+    else:
+        log.debug(f"timestamp_pattern='{timestamp_pattern}'")
+        timestamp = parse_data(raw_data, timestamp_pattern)
+        timestamp = extract_to_epoch(timestamp)
+
+    return CarState(soc=soc, range=range, soc_timestamp=timestamp)
 
 
 def create_vehicle(vehicle_config: JsonSocSetup, vehicle: int):

From ed9296f8a8af77ec25031fe7e46cddcdc6558934 Mon Sep 17 00:00:00 2001
From: MartinRinas <martrin@microsoft.com>
Date: Tue, 31 Dec 2024 10:11:58 +0000
Subject: [PATCH 2/2] change to .fromisoformat

---
 packages/modules/vehicles/json/soc.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/modules/vehicles/json/soc.py b/packages/modules/vehicles/json/soc.py
index 7b5f0480e..d988c862c 100644
--- a/packages/modules/vehicles/json/soc.py
+++ b/packages/modules/vehicles/json/soc.py
@@ -24,10 +24,10 @@ def extract_to_epoch(input_string: str) -> float:
 
     # Try parsing as UTC formatted time
     try:
-        dt = datetime.strptime(input_string, "%Y-%m-%dT%H:%M:%SZ")
+        dt = datetime.fromisoformat(input_string)
         return int(dt.timestamp())
     except ValueError:
-        log.exception(f"Kein UTC formatiertes Datum in '{input_string}' gefunden.")
+        log.exception(f"Kein ISO 8601 formatiertes Datum in '{input_string}' gefunden.")
         return None