From 63ef411372ded3a5393ea59ea20a4e95d1b847f8 Mon Sep 17 00:00:00 2001 From: peterdudfield Date: Fri, 3 May 2024 17:25:14 +0100 Subject: [PATCH 1/4] add api user page to india --- src/main_india.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main_india.py b/src/main_india.py index 0688aaf..637c92e 100644 --- a/src/main_india.py +++ b/src/main_india.py @@ -12,6 +12,7 @@ from sites_toolbox import sites_toolbox_page from satellite_page import satellite_page from status import status_page +from users import user_page st.get_option("theme.primaryColor") st.set_page_config(layout="wide", page_title="OCF Dashboard") @@ -22,6 +23,7 @@ "Status": status_page, "Location Forecast": pvsite_forecast_page, "Sites Toolbox": sites_toolbox_page, + "API Users": user_page, "NWP": nwp_page, "Satellite": satellite_page, } From 3e59f986f379304ec9dfeb2f4bf70ed10c3e6484 Mon Sep 17 00:00:00 2001 From: peterdudfield Date: Fri, 3 May 2024 18:04:11 +0100 Subject: [PATCH 2/4] fix --- src/users.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/users.py b/src/users.py index d7b00d9..8b53476 100644 --- a/src/users.py +++ b/src/users.py @@ -37,8 +37,8 @@ def user_page(): ) # get last call from the database - db_url = os.environ["DB_URL"] - db_url_sites = os.environ["SITES_DB_URL"] + db_url = os.getenv("DB_URL", None) + db_url_sites = os.getenv("SITES_DB_URL", None) # if both databases are available, let the user choose which one to use # if none, show error From f2adaa2da73f712e9df35a17c53ea96546c01337 Mon Sep 17 00:00:00 2001 From: Peter Dudfield <34686298+peterdudfield@users.noreply.github.com> Date: Thu, 9 May 2024 18:38:05 +0100 Subject: [PATCH 3/4] Update pvsite_forecast.py fix --- src/pvsite_forecast.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pvsite_forecast.py b/src/pvsite_forecast.py index 0d05b66..19d24ee 100644 --- a/src/pvsite_forecast.py +++ b/src/pvsite_forecast.py @@ -20,7 +20,7 @@ def pvsite_forecast_page(): unsafe_allow_html=True, ) # get site_uuids from database - url = 'os.environ["SITES_DB_URL"]' + url = os.environ["SITES_DB_URL"] connection = DatabaseConnection(url=url, echo=True) with connection.get_session() as session: site_uuids = get_all_sites(session=session) @@ -185,4 +185,4 @@ def convert_df(df: pd.DataFrame): data=csv, file_name=f'site_forecast_{site_selection}_{now}.csv', mime='text/csv', - ) \ No newline at end of file + ) From 4bf2148e635ec4484c3b7dfb07a874b01ea43cf1 Mon Sep 17 00:00:00 2001 From: peterdudfield Date: Wed, 15 May 2024 16:06:00 +0100 Subject: [PATCH 4/4] reduce satellite cache to 5 minutes --- src/satellite_page.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/satellite_page.py b/src/satellite_page.py index 936c63c..6dee7da 100644 --- a/src/satellite_page.py +++ b/src/satellite_page.py @@ -24,7 +24,7 @@ def get_data(zarr_file): downloaded_datetime = datetime.fromtimestamp(downloaded_datetime) print(downloaded_datetime) - if downloaded_datetime < datetime.now() - timedelta(hours=1): + if downloaded_datetime < datetime.now() - timedelta(minutes=5): print("Satellite file is more than 1 hour old") download = True