From 4c8c2862949c3a0b3820097cc2f1dc22e5572048 Mon Sep 17 00:00:00 2001 From: peterdudfield Date: Tue, 12 Dec 2023 21:19:19 +0000 Subject: [PATCH] update eval and hf logging in --- quartz_solar_forecast/eval/pv.py | 1 - quartz_solar_forecast/evaluation.py | 25 +++++++++++++++++++++---- tests/eval/test_evaluation.py | 6 +++--- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/quartz_solar_forecast/eval/pv.py b/quartz_solar_forecast/eval/pv.py index 38dd9c97..4b5f1528 100644 --- a/quartz_solar_forecast/eval/pv.py +++ b/quartz_solar_forecast/eval/pv.py @@ -7,7 +7,6 @@ fs = HfFileSystem() - def get_pv_metadata(testset: pd.DataFrame): # download from hugginface or load from cache diff --git a/quartz_solar_forecast/evaluation.py b/quartz_solar_forecast/evaluation.py index cf9b682b..0e55b5a7 100644 --- a/quartz_solar_forecast/evaluation.py +++ b/quartz_solar_forecast/evaluation.py @@ -5,16 +5,32 @@ This contains 50 sites each with 50 timestamps to make 2500 samples in total. """ + +import os + +import pandas as pd +from huggingface_hub.hf_api import HfFolder + +from quartz_solar_forecast.eval.forecast import run_forecast from quartz_solar_forecast.eval.metrics import metrics from quartz_solar_forecast.eval.nwp import get_nwp -from quartz_solar_forecast.eval.forecast import run_forecast -from quartz_solar_forecast.eval.utils import combine_forecast_ground_truth from quartz_solar_forecast.eval.pv import get_pv_metadata, get_pv_truth +from quartz_solar_forecast.eval.utils import combine_forecast_ground_truth + +try: + + hf_token = os.environ["HF_TOKEN"] + HfFolder.save_token(hf_token) +except: + + print( + "Warning, you wont be able to run evaluation if you dont set your " + "Hugging Face Access Token to HF_TOKEN, or be logged in with Hugging Face" + ) -import pandas as pd -def run_eval(testset_path: str = 'quartz_solar_forecast/dataset/testset.csv'): +def run_eval(testset_path: str = "quartz_solar_forecast/dataset/testset2.csv"): # load testset from csv testset = pd.read_csv(testset_path) @@ -42,3 +58,4 @@ def run_eval(testset_path: str = 'quartz_solar_forecast/dataset/testset.csv'): # Visulisations +# run_eval() diff --git a/tests/eval/test_evaluation.py b/tests/eval/test_evaluation.py index 630b7068..e6548b2b 100644 --- a/tests/eval/test_evaluation.py +++ b/tests/eval/test_evaluation.py @@ -18,8 +18,8 @@ def test_run_eval(): data=[[8215, "2021-01-26 01:15:00"], [8215, "2021-01-30 16:30:00"]], ) - testset_path = tmpdirname + "/test_dataset.csv" - test_dataset.to_csv(testset_path, index=False) + testset_filename = tmpdirname + "/test_dataset.csv" + test_dataset.to_csv(testset_filename, index=False) # call the metrics function - run_eval(testset_path) + run_eval(testset_filename)