Add Solcast

api/tariff.go

@@ -9,4 +9,5 @@ const (
 	TariffTypePriceStatic
 	TariffTypePriceDynamic
 	TariffTypeCo2
+	TariffTypeGeneration
 )

assets/js/api.js

@@ -33,3 +33,7 @@ export const i18n = axios.create({
     Accept: "application/toml",
   },
 });
+
+export function allowErrors(status) {
+  return status >= 200 && status < 500;
+}

assets/js/components/TargetCharge.vue

@@ -41,7 +41,7 @@
 					/>
 				</div>
 			</div>
-			<p class="mb-0">
+			<p class="my-2">
 				<span v-if="timeInThePast" class="d-block text-danger mb-1">
 					{{ $t("main.targetCharge.targetIsInThePast") }}
 				</span>
@@ -61,9 +61,27 @@
 				<span v-if="['off', 'now'].includes(mode)" class="d-block text-secondary mb-1">
 					{{ $t("main.targetCharge.onlyInPvMode") }}
 				</span>
-				&nbsp;
 			</p>
+			<div
+				v-if="$hiddenFeatures && !generationAvailable"
+				class="d-flex justify-content-end my-2"
+			>
+				<div class="form-check form-switch my-1">
+					<input
+						:id="`generationAdjusted${id}`"
+						v-model="generationAdjusted"
+						class="form-check-input"
+						type="checkbox"
+						role="switch"
+					/>
+					<div class="form-check-label">
+						<label :for="`generationAdjusted${id}`"> use solar forecast 🧪</label>
+					</div>
+				</div>
+			</div>
+
 			<TargetChargePlan v-if="targetChargePlanProps" v-bind="targetChargePlanProps" />
+
 			<div class="d-flex justify-content-between mt-3">
 				<button
 					type="button"
@@ -124,6 +142,8 @@ export default {
 			tariff: {},
 			activeTab: "time",
 			loading: false,
+			generationAvailable: false,
+			generationAdjusted: false,
 		};
 	},
 	computed: {
@@ -204,10 +224,14 @@ export default {
 		targetEnergy() {
 			this.updatePlan();
 		},
+		generationAdjusted() {
+			this.updatePlan();
+		},
 	},
-	mounted() {
+	async mounted() {
 		this.initInputFields();
-		this.updatePlan();
+		await this.checkGenerationAvailable();
+		await this.updatePlan();
 	},
 	methods: {
 		updatePlan: async function () {
@@ -221,15 +245,18 @@ export default {
 					this.loading = true;
 					this.plan = (
 						await api.get(`loadpoints/${this.id}/target/plan`, {
-							params: { targetTime: this.selectedTargetTime },
+							params: {
+								targetTime: this.selectedTargetTime,
+								adjusted: this.generationAdjusted,
+							},
 						})
 					).data.result;
 
-					const tariffRes = await api.get(`tariff/planner`, {
-						validateStatus: function (status) {
-							return status >= 200 && status < 500;
-						},
-					});
+					const tariffRes = await api.get(
+						`tariff/planner`,
+						{ params: { adjusted: this.generationAdjusted } },
+						{ validateStatus: api.allowErrors }
+					);
 					this.tariff = tariffRes.status === 404 ? { rates: [] } : tariffRes.data.result;
 				} catch (e) {
 					console.error(e);
@@ -238,6 +265,17 @@ export default {
 				}
 			}
 		},
+		checkGenerationAvailable() {
+			if (!this.$hiddenFeatures) {
+				return;
+			}
+			try {
+				const res = api.get(`tariff/generation`, { validateStatus: api.allowErrors });
+				this.generationAvailable = res.status === 200;
+			} catch (e) {
+				console.error(e);
+			}
+		},
 		defaultDate: function () {
 			const [hours, minutes] = (
 				window.localStorage[LAST_TARGET_TIME_KEY] || DEFAULT_TARGET_TIME

cmd/setup.go

@@ -48,7 +48,6 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"golang.org/x/sync/errgroup"
-	"golang.org/x/text/currency"
 )
 
 var conf = globalConfig{
@@ -91,7 +90,7 @@ type globalConfig struct {
 	Meters       []config.Named
 	Chargers     []config.Named
 	Vehicles     []config.Named
-	Tariffs      tariffConfig
+	Tariffs      tariff.Config
 	Site         map[string]interface{}
 	Loadpoints   []map[string]interface{}
 }
@@ -127,14 +126,6 @@ type messagingConfig struct {
 	Services []config.Typed
 }
 
-type tariffConfig struct {
-	Currency string
-	Grid     config.Typed
-	FeedIn   config.Typed
-	Co2      config.Typed
-	Planner  config.Typed
-}
-
 type networkConfig struct {
 	Schema string
 	Host   string
@@ -560,54 +551,6 @@ func configureMessengers(conf messagingConfig, valueChan chan util.Param, cache
 	return messageChan, nil
 }
 
-func configureTariffs(conf tariffConfig) (tariff.Tariffs, error) {
-	var grid, feedin, co2, planner api.Tariff
-	var currencyCode currency.Unit = currency.EUR
-	var err error
-
-	if conf.Currency != "" {
-		currencyCode = currency.MustParseISO(conf.Currency)
-	}
-
-	if conf.Grid.Type != "" {
-		grid, err = tariff.NewFromConfig(conf.Grid.Type, conf.Grid.Other)
-		if err != nil {
-			grid = nil
-			log.ERROR.Printf("failed configuring grid tariff: %v", err)
-		}
-	}
-
-	if conf.FeedIn.Type != "" {
-		feedin, err = tariff.NewFromConfig(conf.FeedIn.Type, conf.FeedIn.Other)
-		if err != nil {
-			feedin = nil
-			log.ERROR.Printf("failed configuring feed-in tariff: %v", err)
-		}
-	}
-
-	if conf.Co2.Type != "" {
-		co2, err = tariff.NewFromConfig(conf.Co2.Type, conf.Co2.Other)
-		if err != nil {
-			co2 = nil
-			log.ERROR.Printf("failed configuring co2 tariff: %v", err)
-		}
-	}
-
-	if conf.Planner.Type != "" {
-		planner, err = tariff.NewFromConfig(conf.Planner.Type, conf.Planner.Other)
-		if err != nil {
-			planner = nil
-			log.ERROR.Printf("failed configuring planner tariff: %v", err)
-		} else if planner.Type() == api.TariffTypeCo2 {
-			log.WARN.Printf("tariff configuration changed, use co2 instead of planner for co2 tariff")
-		}
-	}
-
-	tariffs := tariff.NewTariffs(currencyCode, grid, feedin, co2, planner)
-
-	return *tariffs, nil
-}
-
 func configureDevices(conf globalConfig) error {
 	if err := configureMeters(conf.Meters); err != nil {
 		return err
@@ -628,15 +571,15 @@ func configureSiteAndLoadpoints(conf globalConfig) (*core.Site, error) {
 		return nil, fmt.Errorf("failed configuring loadpoints: %w", err)
 	}
 
-	tariffs, err := configureTariffs(conf.Tariffs)
+	tariffs, err := tariff.New(conf.Tariffs)
 	if err != nil {
 		return nil, err
 	}
 
 	return configureSite(conf.Site, loadpoints, config.Instances(config.Vehicles().Devices()), tariffs)
 }
 
-func configureSite(conf map[string]interface{}, loadpoints []*core.Loadpoint, vehicles []api.Vehicle, tariffs tariff.Tariffs) (*core.Site, error) {
+func configureSite(conf map[string]interface{}, loadpoints []*core.Loadpoint, vehicles []api.Vehicle, tariffs *tariff.Tariffs) (*core.Site, error) {
 	site, err := core.NewSiteFromConfig(log, conf, loadpoints, vehicles, tariffs)
 	if err != nil {
 		return nil, fmt.Errorf("failed configuring site: %w", err)

cmd/tariff.go

@@ -39,10 +39,11 @@ func runTariff(cmd *cobra.Command, args []string) {
 	}
 
 	for key, cc := range map[string]config.Typed{
-		"grid":    conf.Tariffs.Grid,
-		"feedin":  conf.Tariffs.FeedIn,
-		"co2":     conf.Tariffs.Co2,
-		"planner": conf.Tariffs.Planner,
+		"grid":       conf.Tariffs.Grid,
+		"feedin":     conf.Tariffs.FeedIn,
+		"co2":        conf.Tariffs.Co2,
+		"generation": conf.Tariffs.Generation,
+		"planner":    conf.Tariffs.Planner,
 	} {
 		if cc.Type == "" || (name != "" && key != name) {
 			continue

core/loadpoint/api.go

@@ -60,7 +60,7 @@ type API interface {
 	// SetTargetSoc sets the charge target soc
 	SetTargetSoc(int)
 	// GetPlan creates a charging plan
-	GetPlan(targetTime time.Time, maxPower float64) (time.Duration, api.Rates, error)
+	GetPlan(targetTime time.Time, maxPower float64, adjusted bool) (time.Duration, api.Rates, error)
 	// GetEnableThreshold gets the loadpoint enable threshold
 	GetEnableThreshold() float64
 	// SetEnableThreshold sets loadpoint enable threshold

core/loadpoint_plan.go

@@ -47,7 +47,7 @@ func (lp *Loadpoint) planRequiredDuration(maxPower float64) time.Duration {
 // Results:
 // - required total charging duration
 // - actual charging plan as rate table
-func (lp *Loadpoint) GetPlan(targetTime time.Time, maxPower float64) (time.Duration, api.Rates, error) {
+func (lp *Loadpoint) GetPlan(targetTime time.Time, maxPower float64, adjusted bool) (time.Duration, api.Rates, error) {
 	if lp.planner == nil || targetTime.IsZero() {
 		return 0, nil, nil
 	}
@@ -58,7 +58,7 @@ func (lp *Loadpoint) GetPlan(targetTime time.Time, maxPower float64) (time.Durat
 	}
 
 	requiredDuration := lp.planRequiredDuration(maxPower)
-	plan, err := lp.planner.Plan(requiredDuration, targetTime)
+	plan, err := lp.planner.Plan(requiredDuration, targetTime, adjusted)
 
 	// sort plan by time
 	slices.SortStableFunc(plan, planner.SortByTime)
@@ -74,7 +74,7 @@ func (lp *Loadpoint) plannerActive() (active bool) {
 
 	maxPower := lp.GetMaxPower()
 
-	requiredDuration, plan, err := lp.GetPlan(lp.GetTargetTime(), maxPower)
+	requiredDuration, plan, err := lp.GetPlan(lp.GetTargetTime(), maxPower, false)
 	if err != nil {
 		lp.log.ERROR.Println("planner:", err)
 		return false

core/planner/planner.go

@@ -82,7 +82,7 @@ func (t *Planner) plan(rates api.Rates, requiredDuration time.Duration, targetTi
 }
 
 // Plan creates a lowest-cost charging plan, considering edge conditions
-func (t *Planner) Plan(requiredDuration time.Duration, targetTime time.Time) (api.Rates, error) {
+func (t *Planner) Plan(requiredDuration time.Duration, targetTime time.Time, adjusted bool) (api.Rates, error) {
 	if t == nil || requiredDuration <= 0 {
 		return nil, nil
 	}