From ce719b5f0491339c70f4c47f5f3f2271c27ad6b2 Mon Sep 17 00:00:00 2001 From: James Fulton Date: Fri, 31 May 2024 13:36:03 +0000 Subject: [PATCH 1/4] update model --- pvnet_app/app.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pvnet_app/app.py b/pvnet_app/app.py index 6dde2b2..5f6ec50 100644 --- a/pvnet_app/app.py +++ b/pvnet_app/app.py @@ -69,7 +69,7 @@ # Huggingfacehub model repo and commit for PVNet (GSP-level model) "pvnet": { "name": "openclimatefix/pvnet_uk_region", - "version": "849f19b0c774a1a3fe10e20f901e225131f5645b", + "version": "9989666ae3792a576dbc16872e152985c950a42e", }, # Huggingfacehub model repo and commit for PVNet summation (GSP sum to national model) # If summation_model_name is set to None, a simple sum is computed instead @@ -86,6 +86,21 @@ }, # Extra models which will be run on dev only + "pvnet_v2-sat0min-v8-batches": { + "pvnet": { + "name": "openclimatefix/pvnet_uk_region", + "version": "849f19b0c774a1a3fe10e20f901e225131f5645b", + }, + "summation": { + "name": "openclimatefix/pvnet_v2_summation", + "version": "22a264a55babcc2f1363b3985cede088a6b08977", + }, + "use_adjuster": False, + "save_gsp_sum": False, + "verbose": False, + }, + + "pvnet_v2-sat60min-v8-batches": { "pvnet": { "name": "openclimatefix/pvnet_uk_region", From e1a361ca22dc4de5399e06dc11cf86dd373053a2 Mon Sep 17 00:00:00 2001 From: James Fulton Date: Fri, 31 May 2024 13:43:19 +0000 Subject: [PATCH 2/4] remove extra model --- pvnet_app/app.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pvnet_app/app.py b/pvnet_app/app.py index 5f6ec50..c1bf285 100644 --- a/pvnet_app/app.py +++ b/pvnet_app/app.py @@ -100,20 +100,6 @@ "verbose": False, }, - - "pvnet_v2-sat60min-v8-batches": { - "pvnet": { - "name": "openclimatefix/pvnet_uk_region", - "version": "9989666ae3792a576dbc16872e152985c950a42e", - }, - "summation": { - "name": "openclimatefix/pvnet_v2_summation", - "version": "22a264a55babcc2f1363b3985cede088a6b08977", - }, - "use_adjuster": False, - "save_gsp_sum": False, - "verbose": False, - }, } # Remove extra models if not configured to run them From c772f72a2c2c89b17ac4baaebdee00e9a1c239b1 Mon Sep 17 00:00:00 2001 From: James Fulton Date: Fri, 31 May 2024 13:47:54 +0000 Subject: [PATCH 3/4] update reqs --- pvnet_app/utils.py | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pvnet_app/utils.py b/pvnet_app/utils.py index 65b8f09..07ca432 100644 --- a/pvnet_app/utils.py +++ b/pvnet_app/utils.py @@ -13,8 +13,8 @@ from nowcasting_datamodel.read.read import ( get_latest_input_data_last_updated, get_location, - get_model, ) +from nowcasting_datamodel.read.read_models import get_models from datetime import timezone, datetime diff --git a/requirements.txt b/requirements.txt index 8c70049..11d27bd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ torch[cpu]==2.2.0 PVNet-summation==0.1.4 pvnet==3.0.25 ocf_datapipes==3.3.19 -nowcasting_datamodel>=1.5.41 +nowcasting_datamodel>=1.5.43 fsspec[s3] xarray zarr From 9af7a8e9978358b33d7ecc2ed3c877162ff76f6e Mon Sep 17 00:00:00 2001 From: James Fulton Date: Fri, 31 May 2024 14:09:26 +0000 Subject: [PATCH 4/4] fix bug --- pvnet_app/utils.py | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pvnet_app/utils.py b/pvnet_app/utils.py index 07ca432..1ebc7d5 100644 --- a/pvnet_app/utils.py +++ b/pvnet_app/utils.py @@ -14,7 +14,7 @@ get_latest_input_data_last_updated, get_location, ) -from nowcasting_datamodel.read.read_models import get_models +from nowcasting_datamodel.read.read_models import get_model from datetime import timezone, datetime diff --git a/requirements.txt b/requirements.txt index 11d27bd..5b3396e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ torch[cpu]==2.2.0 PVNet-summation==0.1.4 pvnet==3.0.25 ocf_datapipes==3.3.19 -nowcasting_datamodel>=1.5.43 +nowcasting_datamodel>=1.5.42 fsspec[s3] xarray zarr