Bug fix (#224)

* Add missing `fes_scenario` wildcard to bid_offer_multiplier rule output

* Use script path provider

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Bryn Pickering <17178478+brynpickering@users.noreply.github.com>

Author: 3 people

rules/gb-model/redispatch.smk

@@ -39,7 +39,7 @@ rule fetch_bid_offer_data_elexon:
     log:
         logs("fetch_bid_offer_data_elexon_{bod_year}.log"),
     script:
-        "../../scripts/gb_model/redispatch/fetch_bid_offer_data_elexon.py"
+        scripts("gb_model/redispatch/fetch_bid_offer_data_elexon.py")
 
 
 rule calculate_bid_offer_multipliers:
@@ -58,18 +58,18 @@ rule calculate_bid_offer_multipliers:
             bod_year=config["redispatch"]["elexon"]["years"],
         ),
     output:
-        csv=resources("gb-model/bid_offer_multipliers.csv"),
+        csv=resources("gb-model/{fes_scenario}/bid_offer_multipliers.csv"),
     log:
-        logs("calculate_bid_offer_multipliers.log"),
+        logs("calculate_bid_offer_multipliers_{fes_scenario}.log"),
     script:
-        "../../scripts/gb_model/redispatch/calculate_bid_offer_multipliers.py"
+        scripts("gb_model/redispatch/calculate_bid_offer_multipliers.py")
 
 
 rule calc_interconnector_bid_offer_profile:
     message:
         "Calculate interconnector bid/offer profiles"
     input:
-        bids_and_offers=resources("gb-model/bid_offer_multipliers.csv"),
+        bids_and_offers=resources("gb-model/{fes_scenario}/bid_offer_multipliers.csv"),
         unconstrained_result=RESULTS
         + "networks/{fes_scenario}/unconstrained_clustered/{year}.nc",
     output:
@@ -93,7 +93,7 @@ rule prepare_constrained_network:
         interconnector_bid_offer=resources(
             "gb-model/{fes_scenario}/interconnector_bid_offer_profile/{year}.csv"
         ),
-        bids_and_offers=resources("gb-model/bid_offer_multipliers.csv"),
+        bids_and_offers=resources("gb-model/{fes_scenario}/bid_offer_multipliers.csv"),
     output:
         network=resources("networks/{fes_scenario}/constrained_clustered/{year}.nc"),
     log:

scripts/gb_model/redispatch/calculate_bid_offer_multipliers.py

@@ -12,7 +12,8 @@
 import numpy as np
 import pandas as pd
 
-from scripts._helpers import configure_logging, get_scenario_name, set_scenario_config
+from scripts._helpers import configure_logging, set_scenario_config
+from scripts.gb_model._helpers import get_scenario_name
 from scripts.gb_model.generators.assign_costs import (
     _load_costs,
     _load_fes_carbon_costs,