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, } diff --git a/src/pvsite_forecast.py b/src/pvsite_forecast.py index 3551bc2..4b52dfc 100644 --- a/src/pvsite_forecast.py +++ b/src/pvsite_forecast.py @@ -22,7 +22,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) @@ -202,6 +202,7 @@ def convert_df(df: pd.DataFrame): file_name=f'site_forecast_{site_selection}_{now}.csv', mime='text/csv', ) + def get_site_capacity(session : Session , site_uuidss: str) -> float: site = get_site_by_uuid(session, site_uuidss) capacity_kw = site.capacity_kw 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 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