lint

pvconsumer/app.py

@@ -129,7 +129,6 @@ def pull_data_and_save(
 
     all_pv_yields_df = []
     for pv_system_chunk in pv_system_chunks:
-
         if provider == "pvoutput.org":
             # set up pv output.org
             pv_output = PVOutput()
@@ -176,7 +175,6 @@ def pull_data_and_save(
             if len(pv_yield_df) == 0:
                 logger.warning(f"Did not find any data for {pv_system.client_site_id} for {date}")
             else:
-
                 # filter out which is in our database and a funny 0 bug
                 pv_yield_df = format_pv_data(
                     pv_system=pv_system, pv_yield_df=pv_yield_df, session=session

tests/conftest.py

@@ -3,10 +3,10 @@
 
 import pandas as pd
 import pytest
+from pvsite_datamodel.connection import DatabaseConnection
 
 # from nowcasting_datamodel.connection import DatabaseConnection
 from pvsite_datamodel.sqlmodels import Base, GenerationSQL, SiteSQL
-from pvsite_datamodel.connection import DatabaseConnection
 from testcontainers.postgres import PostgresContainer
 
 import pvconsumer

tests/intergration/test_app.py

@@ -1,18 +1,17 @@
 from click.testing import CliRunner
-from pvconsumer.app import app, pull_data_and_save
 from pvsite_datamodel.sqlmodels import GenerationSQL, SiteSQL
 
+from pvconsumer.app import app, pull_data_and_save
 
-def test_pull_data(db_session, sites):
 
+def test_pull_data(db_session, sites):
     pull_data_and_save(pv_systems=sites, session=db_session, provider="pvoutput.org")
 
     pv_yields = db_session.query(GenerationSQL).all()
     assert len(pv_yields) > 0
 
 
 def test_pull_data_solar_sheffield(db_session, sites):
-
     pull_data_and_save(pv_systems=sites, session=db_session, provider="solar_sheffield_passiv")
 
     pv_yields = db_session.query(GenerationSQL).all()

tests/unittest/test_pv_systems.py

@@ -2,13 +2,14 @@
 from datetime import datetime
 
 import pandas as pd
+from pvsite_datamodel.sqlmodels import GenerationSQL, SiteSQL
+
 from pvconsumer.pv_systems import (
     filter_pv_systems_which_have_new_data,
     find_missing_pv_systems,
     load_pv_systems,
 )
 from pvconsumer.utils import solar_sheffield_passiv
-from pvsite_datamodel.sqlmodels import SiteSQL, GenerationSQL
 
 
 def test_load_pv_systems():

tests/unittest/test_utils.py

@@ -1,20 +1,19 @@
 from datetime import datetime, timezone
 
 import pandas as pd
-from pvconsumer.utils import format_pv_data
 from pvsite_datamodel.sqlmodels import GenerationSQL
 
+from pvconsumer.utils import format_pv_data
 
-def test_pv_yield_df_no_data(db_session, sites):
 
+def test_pv_yield_df_no_data(db_session, sites):
     pv_yield_df = pd.DataFrame(columns=["instantaneous_power_gen_W", "datetime"])
 
     pv_yields = format_pv_data(pv_system=sites[0], pv_yield_df=pv_yield_df, session=db_session)
     assert len(pv_yields) == 0
 
 
 def test_pv_yield_df(sites, db_session):
-
     pv_yield_df = pd.DataFrame(
         columns=["instantaneous_power_gen_W", "datetime"], data=[[1, datetime(2022, 1, 1)]]
     )
@@ -66,7 +65,6 @@ def test_pv_yield_df_0_bug(sites, db_session):
 
 
 def test_pv_yield_df_zeros(sites, db_session):
-
     pv_yield_df = pd.DataFrame(
         columns=["instantaneous_power_gen_W", "datetime"],
         data=[