Merge commit '7ebfb3273ea8f58e297e88c5e2117bfe679cb4f9' into issue/rm…

…-old-db

# Conflicts:
#	pvconsumer/save.py

pvconsumer/app.py

@@ -13,15 +13,16 @@
 
 import click
 import pandas as pd
+from pvoutput import PVOutput
+from pvsite_datamodel.connection import DatabaseConnection
+from pvsite_datamodel.sqlmodels import SiteSQL
+from sqlalchemy.orm import Session
+
 import pvconsumer
 from pvconsumer.pv_systems import filter_pv_systems_which_have_new_data, get_pv_systems
 from pvconsumer.save import save_to_pv_site_database
 from pvconsumer.solar_sheffield_passiv import get_all_latest_pv_yield_from_solar_sheffield
 from pvconsumer.utils import format_pv_data
-from pvoutput import PVOutput
-from pvsite_datamodel.connection import DatabaseConnection
-from pvsite_datamodel.sqlmodels import SiteSQL
-from sqlalchemy.orm import Session
 
 logging.basicConfig(
     level=getattr(logging, os.getenv("LOGLEVEL", "INFO")),

pvconsumer/pv_systems.py

@@ -5,16 +5,15 @@
 from typing import List, Optional
 
 import pandas as pd
-from pvconsumer.utils import pv_output, solar_sheffield_passiv
 from pvoutput import PVOutput
-from sqlalchemy.orm import Session
-from sqlalchemy import func
-
-from pvsite_datamodel.sqlmodels import SiteSQL, GenerationSQL
 from pvsite_datamodel.read import get_all_sites
+from pvsite_datamodel.sqlmodels import GenerationSQL, SiteSQL
+from sqlalchemy import func
+from sqlalchemy.orm import Session
 
 import pvconsumer
 from pvconsumer.solar_sheffield_passiv import get_all_systems_from_solar_sheffield
+from pvconsumer.utils import pv_output, solar_sheffield_passiv
 
 # from pvconsumer.utils import df_to_list_pv_system, list_pv_system_to_df
 

pvconsumer/utils.py

@@ -3,10 +3,9 @@
 from datetime import timezone
 
 import pandas as pd
+from pvsite_datamodel.sqlmodels import GenerationSQL, SiteSQL
 from sqlalchemy.orm import Session
 
-from pvsite_datamodel.sqlmodels import SiteSQL, GenerationSQL
-
 #
 logger = logging.getLogger(__name__)