From 7c3bb6537ecac784ab29e23776e01c24ec727121 Mon Sep 17 00:00:00 2001 From: Ben Watts Date: Sat, 24 Feb 2024 17:39:30 +0000 Subject: [PATCH 1/2] replace android link from firebase with google play store --- components/gb-live/terms-and-conditions/urls.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/components/gb-live/terms-and-conditions/urls.ts b/components/gb-live/terms-and-conditions/urls.ts index 8f8453e..ad9443c 100644 --- a/components/gb-live/terms-and-conditions/urls.ts +++ b/components/gb-live/terms-and-conditions/urls.ts @@ -5,7 +5,8 @@ export const urls = { testLinks: { // ios: "https://testflight.apple.com/join/ZRfgNtsL", ios: "https://apps.apple.com/us/app/kilowatts-grid/id6474467753", - // android: 'https://play.google.com/store/apps/details?id=com.benjaminwatts.kilowatts' - android: "https://appdistribution.firebase.dev/i/ac9baac6ed8aaa33" + android: + "https://play.google.com/store/apps/details?id=com.benjaminwatts.kilowatts" + // android: "https://appdistribution.firebase.dev/i/ac9baac6ed8aaa33" } }; From c1ab0cb2313fdd2d67c7b3ab257b00b72e465737 Mon Sep 17 00:00:00 2001 From: Ben Watts Date: Sun, 25 Feb 2024 08:17:49 +0000 Subject: [PATCH 2/2] add fix for value == "" --- backend/lambda/gb_snapshot/ng_dist/ng_dist.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/backend/lambda/gb_snapshot/ng_dist/ng_dist.py b/backend/lambda/gb_snapshot/ng_dist/ng_dist.py index a7a2089..365e9b9 100644 --- a/backend/lambda/gb_snapshot/ng_dist/ng_dist.py +++ b/backend/lambda/gb_snapshot/ng_dist/ng_dist.py @@ -100,7 +100,7 @@ class NationalGridDistributionNetwork(BaseModel): url: str def run(self): - logging.debug(f"running NationalGridDistributionNetwork for {self.name}...") + logging.info(f"running NationalGridDistributionNetwork for {self.name}...") resp = requests.get(self.url, headers={}) lines = resp.text.split("\r\n") @@ -108,7 +108,9 @@ def run(self): rows = [line.split(",") for line in lines[1:-1]] data = [] for row in rows: - data.append(dict(zip(columns, row))) + float_values = [float(x) if x != "" else None for x in row[1:]] + as_dict = dict(zip(columns[1:], float_values)) + data.append({"Timestamp": row[0], **as_dict}) df = pd.DataFrame(data) # set Timestamp as index df.set_index("Timestamp", inplace=True)