Merge pull request #217 from kilowatts-io/209-add-regional-solar

Add Regional Solar+Wind Data for National Grid DNO Areas

backend/lambda/gb_snapshot/gb_snapshot.py

@@ -5,10 +5,10 @@
 from .ptypes import (
     BalancingTotals,
     EmbeddedSnapshot,
+    ForeignMarketSnapshot,
     NationalGridGspSnapshot,
     SummaryOutput,
     TotalsSnapshot,
-    UnitGroupSnapshot,
 )
 from .generation import GenerationTotals
 from .foreign_markets import ForeignMarketTotals
@@ -17,7 +17,7 @@
 from .bm import Bm
 
 
-def combine_totals(gen_totals: List[UnitGroupSnapshot], fm_totals: TotalsSnapshot):
+def combine_totals(gen_totals: List[TotalsSnapshot], fm_totals: ForeignMarketSnapshot):
     totals = gen_totals + [fm_totals]
     totals.sort(key=lambda x: x.ac, reverse=True)
     return totals