Adapt for Sungrow CSV files

Author: ledermann

.env.test

@@ -5,6 +5,7 @@ INFLUX_PORT=8086
 INFLUX_TOKEN_WRITE=my-token
 INFLUX_ORG=my-org
 INFLUX_BUCKET=my-bucket
+INFLUX_MEASUREMENT=my-measurement
 
 # Folder with CSV test data
 IMPORT_FOLDER=./spec/data

.github/workflows/push.yml

@@ -50,7 +50,7 @@ jobs:
         with:
           # list of Docker images to use as base name for tags
           images: |
-            ghcr.io/solectrus/senec-importer
+            ghcr.io/solectrus/sungrow-importer
           # generate Docker tags based on the following events/attributes
           tags: |
             type=ref,event=branch

.rubocop.yml

@@ -35,4 +35,4 @@ Metrics/MethodLength:
   Max: 20
 
 Metrics/AbcSize:
-  Max: 20
+  Max: 22

Dockerfile

@@ -1,9 +1,9 @@
 FROM ruby:3.2.2-alpine AS Builder
 RUN apk add --no-cache build-base
 
-WORKDIR /senec-importer
+WORKDIR /sungrow-importer
 
-COPY Gemfile* /senec-importer/
+COPY Gemfile* /sungrow-importer/
 RUN bundle config --local frozen 1 && \
     bundle config --local without 'development test' && \
     bundle install -j4 --retry 3 && \
@@ -25,9 +25,9 @@ ENV VERSION ${VERSION}
 ARG REVISION
 ENV REVISION ${REVISION}
 
-WORKDIR /senec-importer
+WORKDIR /sungrow-importer
 
 COPY --from=Builder /usr/local/bundle/ /usr/local/bundle/
-COPY . /senec-importer/
+COPY . /sungrow-importer/
 
 ENTRYPOINT bundle exec app/main.rb

README.md

@@ -1,14 +1,14 @@
-[![Continuous integration](https://github.com/solectrus/senec-importer/actions/workflows/push.yml/badge.svg)](https://github.com/solectrus/senec-importer/actions/workflows/push.yml)
-[![wakatime](https://wakatime.com/badge/user/697af4f5-617a-446d-ba58-407e7f3e0243/project/0fd4e23c-13b0-43a6-bfe0-2f235cbe9785.svg)](https://wakatime.com/badge/user/697af4f5-617a-446d-ba58-407e7f3e0243/project/0fd4e23c-13b0-43a6-bfe0-2f235cbe9785)
+[![Continuous integration](https://github.com/solectrus/sungrow-importer/actions/workflows/push.yml/badge.svg)](https://github.com/solectrus/sungrow-importer/actions/workflows/push.yml)
+[![wakatime](https://wakatime.com/badge/user/697af4f5-617a-446d-ba58-407e7f3e0243/project/f8429171-106d-4ef2-877c-b5fd73495e6e.svg)](https://wakatime.com/badge/user/697af4f5-617a-446d-ba58-407e7f3e0243/project/f8429171-106d-4ef2-877c-b5fd73495e6e)
 
-# SENEC importer
+# Sungrow importer
 
-Import CSV data downloaded from mein-senec.de and push it to InfluxDB.
+Import CSV data downloaded from portaleu.isolarcloud.com and push it to InfluxDB.
 
 ## Requirements
 
 - SOLECTRUS installed and running
-- CSV files downloaded from mein-senec.de
+- CSV files downloaded from portaleu.isolarcloud.com
 
 ## Usage
 
@@ -22,7 +22,7 @@ docker run -it --rm \
            --env-file .env \
            --mount type=bind,source="$PWD/csv",target=/data,readonly \
            --network=solectrus_default \
-           ghcr.io/solectrus/senec-importer
+           ghcr.io/solectrus/sungrow-importer
 ```
 
 (Name of the network may vary, see `docker network ls`)
@@ -50,29 +50,15 @@ Second note: Check the `.env` variable `INSTALLATION_DATE`. This must be set to
 | `INFLUX_TOKEN_WRITE` or `INFLUX_TOKEN` | Token for InfluxDB (requires write permissions) |         |
 | `INFLUX_ORG`                           | Organization for InfluxDB                       |         |
 | `INFLUX_BUCKET`                        | Bucket for InfluxDB                             |         |
+| `INFLUX_MEASUREMENT`                   | Measurement for InfluxDB                        |         |
 | `INFLUX_OPEN_TIMEOUT`                  | Timeout for InfluxDB connection (in seconds)    | `30`    |
 | `INFLUX_READ_TIMEOUT`                  | Timeout for InfluxDB read (in seconds)          | `30`    |
 | `INFLUX_WRITE_TIMEOUT`                 | Timeout for InfluxDB write (in seconds)         | `30`    |
 | `IMPORT_FOLDER`                        | Folder where CSV files are located              | `/data` |
 | `IMPORT_PAUSE`                         | Pause after each imported file (in seconds)     | `0`     |
 
-## Dealing with missing wallbox measurements
-
-The CSV data from mein-senec.de is not complete, there are no measurements for the wallbox. To get around this, wallbox charges are **estimated** using the following formula:
-
-```
-wallbox_charge_power =   inverter_power (Stromerzeugung)
-                       + grid_power_plus (Netzbezug)
-                       + bat_power_minus (Akkuentnahme)
-                       - grid_power_minus (Netzeinspeisung)
-                       - house_power (Stromverbrauch)
-                       - bat_power_plus (Akkubeladung)
-```
-
-Please note that this method appears to be ineffective for processing CSV files that were created from July 2022 onwards. This is because wallbox charges are now being included in the overall house consumption since that time. Therefore, it seems that there is currently no way to import wallbox measurements.
-
-The [senec-collector](https://github.com/solectrus/senec-collector) does not have this problem, as it obtains the wallbox measurements directly.
-
 ## License
 
-Copyright (c) 2020-2023 Georg Ledermann, released under the MIT License
+Copyright (c) 2023 Georg Ledermann, released under the MIT License
+
+Based on some work by [Rainer Drexler](https://github.com/holiday-sunrise/)

app/config.rb

@@ -8,6 +8,7 @@
     :influx_token,
     :influx_org,
     :influx_bucket,
+    :influx_measurement,
     :influx_open_timeout,
     :influx_read_timeout,
     :influx_write_timeout,
@@ -35,6 +36,7 @@ def self.from_env(options = {})
             ENV.fetch('INFLUX_TOKEN_WRITE', nil) || ENV.fetch('INFLUX_TOKEN'),
           influx_org: ENV.fetch('INFLUX_ORG'),
           influx_bucket: ENV.fetch('INFLUX_BUCKET'),
+          influx_measurement: ENV.fetch('INFLUX_MEASUREMENT'),
           influx_open_timeout: ENV.fetch('INFLUX_OPEN_TIMEOUT', 30).to_i,
           influx_read_timeout: ENV.fetch('INFLUX_READ_TIMEOUT', 30).to_i,
           influx_write_timeout: ENV.fetch('INFLUX_WRITE_TIMEOUT', 30).to_i,

app/flux_writer.rb

@@ -32,7 +32,7 @@ def point(record)
   end
 
   def influx_measurement
-    'SENEC'
+    config.influx_measurement
   end
 
   def influx_client

app/import.rb

@@ -32,11 +32,11 @@ def process(filename)
     count = 0
     records =
       CSV
-        .parse(File.read(filename), headers: true, col_sep: ';')
+        .parse(File.read(filename), headers: true, col_sep: ',')
         .map do |row|
           count += 1
 
-          SolectrusRecord.new(row).to_h
+          SolectrusRecord.new(row, measurement: config.influx_measurement).to_h
         end
 
     return unless count.positive?

app/main.rb

@@ -7,10 +7,10 @@
 # Flush output immediately
 $stdout.sync = true
 
-puts 'SENEC CSV importer for SOLECTRUS, ' \
+puts 'Sungrow CSV importer for SOLECTRUS, ' \
        "Version #{ENV.fetch('VERSION', '<unknown>')}, " \
        "built at #{ENV.fetch('BUILDTIME', '<unknown>')}"
-puts 'https://github.com/solectrus/senec-importer'
+puts 'https://github.com/solectrus/sungrow-importer'
 puts 'Copyright (c) 2020-2023 Georg Ledermann, released under the MIT License'
 puts "\n"
 

app/solectrus_record.rb

@@ -1,20 +1,21 @@
 ENV['TZ'] = 'CET'
 
 class SolectrusRecord
-  def initialize(row)
+  def initialize(row, measurement:)
     @row = row
+    @measurement = measurement
   end
 
-  attr_reader :row
+  attr_reader :row, :measurement
 
   def to_h
-    { name: 'SENEC', time:, fields: }
+    { name: measurement, time:, fields: }
   end
 
   private
 
   def time
-    parse_time(row, 'Uhrzeit')
+    parse_time(row, 'Zeit')
   end
 
   def fields
@@ -24,84 +25,46 @@ def fields
       bat_power_plus:,
       bat_power_minus:,
       bat_fuel_charge: nil,
-      bat_charge_current:,
-      bat_voltage:,
       grid_power_plus:,
       grid_power_minus:,
-      # There is no data for the wallbox, but we can estimate it
-      wallbox_charge_power: estimated_wallbox_charge_power,
     }
   end
 
   def inverter_power
-    @inverter_power ||=
-      parse_kw(row, 'Stromerzeugung [kW]', 'Stromerzeugung [kWh]')
+    @inverter_power ||= parse_kw(row, 'PV-Ertrag(W)')
   end
 
   def house_power
-    @house_power ||=
-      parse_kw(row, 'Stromverbrauch [kW]', 'Stromverbrauch [kWh]')
+    @house_power ||= parse_kw(row, 'Gesamtverbrauch(W)')
   end
 
   def bat_power_plus
-    @bat_power_plus ||=
-      parse_kw(
-        row,
-        'Akkubeladung [kW]',
-        'Akku-Beladung [kW]',
-        'Akku-Beladung [kWh]',
-      )
+    @bat_power_plus ||= bat_power.negative? ? -bat_power : 0.0
   end
 
   def bat_power_minus
-    # The CSV file format has changed over time, so two different column names are possible
-    @bat_power_minus ||=
-      parse_kw(
-        row,
-        'Akkuentnahme [kW]',
-        'Akku-Entnahme [kW]',
-        'Akku-Entnahme [kWh]',
-      )
+    @bat_power_minus ||= bat_power.positive? ? bat_power : 0.0
   end
 
-  def bat_charge_current
-    @bat_charge_current ||= parse_a(row, 'Akku Stromstärke [A]')
-  end
-
-  def bat_voltage
-    @bat_voltage ||= parse_v(row, 'Akku Spannung [V]')
+  def bat_power
+    @bat_power ||= parse_kw(row, 'Batterie(W)')
   end
 
   def grid_power_plus
-    @grid_power_plus ||= parse_kw(row, 'Netzbezug [kW]', 'Netzbezug [kWh]')
+    @grid_power_plus ||= grid_power.positive? ? grid_power : 0.0
   end
 
   def grid_power_minus
-    @grid_power_minus ||=
-      parse_kw(row, 'Netzeinspeisung [kW]', 'Netzeinspeisung [kWh]')
+    @grid_power_minus ||= grid_power.negative? ? -grid_power : 0.0
   end
 
-  def estimated_wallbox_charge_power
-    incoming = inverter_power + grid_power_plus + bat_power_minus
-    outgoing = grid_power_minus + house_power + bat_power_plus
-    diff = incoming - outgoing
-
-    diff < 50 ? 0 : diff
+  def grid_power
+    @grid_power ||= parse_kw(row, 'Netz(W)')
   end
 
   # KiloWatt
   def parse_kw(row, *columns)
-    (cell(row, *columns).sub(',', '.').to_f * 1_000).round
-  end
-
-  # Ampere
-  def parse_a(row, *columns)
-    cell(row, *columns).sub(',', '.').to_f
-  end
-
-  # Volt
-  def parse_v(row, *columns)
-    cell(row, *columns).sub(',', '.').to_f
+    cell(row, *columns).to_f
   end
 
   # Time