add formular to tariff-base, add math

evcc-io · Nov 5, 2024 · 1de1548 · 1de1548
1 parent 03ad8e8
commit 1de1548
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 0 deletions.
diff --git a/evcc.dist.yaml b/evcc.dist.yaml
@@ -197,6 +197,13 @@ tariffs:
     #   uri: https://example.org/price.json
     #   jq: .price.current
 
+    # type: template
+    # template: energy-charts-api # epex spot market prices
+    # bzn: DE-LU
+    # charges: 0.15
+    # tax: 0.1
+    # formula: math.Min((price + charges) * (1 + tax), 0.5)
+
   feedin:
     # rate for feeding excess (pv) energy to the grid
     type: fixed

diff --git a/tariff/embed.go b/tariff/embed.go
@@ -26,6 +26,10 @@ func (t *embed) init() error {
 		return err
 	}
 
+	if _, err := vm.Eval(`import "math"`); err != nil {
+		return err
+	}
+
 	if _, err := vm.Eval("var price, charges, tax float64"); err != nil {
 		return err
 	}

diff --git a/util/templates/defaults.yaml b/util/templates/defaults.yaml
@@ -333,6 +333,12 @@ presets:
         help:
           de: Zusätzlicher prozentualer Aufschlag (z.B. 0.2 für 20%)
           en: Additional percentage charge (e.g. 0.2 for 20%)
+      - name: formula
+        type: string
+        help:
+          de: Individuelle Formel zur Berechnung des Preises
+          en: Individual formula for calculating the price
+        example: "math.Max((price + charges) * (1 + tax), 0.0)"
   eebus:
     params:
       - name: ski

diff --git a/util/templates/includes/tariff-base.tpl b/util/templates/includes/tariff-base.tpl
@@ -5,4 +5,7 @@ charges: {{ .charges }}
 {{- if .tax }}
 tax: {{ .tax }}
 {{- end }}
+{{- if .formula }}
+formula: {{ .formula }}
+{{- end }}
 {{- end }}