Refactor database handling to support multiple fields.

Updated `write_to_database` to accept and process multiple fields, simplifying usage for batch operations. Removed unused `InfluxDBTag` class, consolidating data handling.

Author: felixschndr

README.md

@@ -213,10 +213,13 @@ It saves the following data:
 
 ## InfluxDB commands
 
-- See all `energy_price`s: `influx query -org default -token <token> '
-import "experimental"
-from(bucket: "default")
-  |> range(start: 0, stop: experimental.addDuration(d: 2d, to: now()))
-  |> filter(fn: (r) => r._measurement == "energy_price")'`
 - Create bucket: `influx bucket create -org default -token <token> --name default`
 - Delete bucket: `influx bucket delete -org default -token <token> --name default`
+- Retrieve all solar forecast values: `influx query -org default -token <token> 'from(bucket: "default")
+|> range(start: -1d)
+|> filter(fn: (r) => r._measurement == "sun_forecast")
+|> pivot(rowKey:["_time"], columnKey:["_field"], valueColumn:"_value")'`
+- Retrieve all energy prices: `influx query -org default -token <token> 'import "experimental"
+from(bucket: "default")
+|> range(start: 0, stop: experimental.addDuration(d: 2d, to: now()))
+|> filter(fn: (r) => r._measurement == "energy_price")'`

source/database_handler.py

@@ -9,21 +9,11 @@
 
 
 @dataclasses.dataclass
-class InfluxDBComponent:  # TODO: Find better name
+class InfluxDBField:
     name: str
     value: float | str
 
 
-@dataclasses.dataclass
-class InfluxDBField(InfluxDBComponent):
-    pass
-
-
-@dataclasses.dataclass
-class InfluxDBTag(InfluxDBComponent):
-    pass
-
-
 class DatabaseHandler(LoggerMixin):
     def __init__(self, measurement: str):
         super().__init__()
@@ -39,19 +29,21 @@ def __init__(self, measurement: str):
         self.write_api = client.write_api(write_options=SYNCHRONOUS)
 
     def write_to_database(
-        self, field_to_insert: InfluxDBField, tags: list[InfluxDBTag] = None, timestamp: datetime = None
+        self, fields_to_insert: InfluxDBField | list[InfluxDBField], timestamp: datetime = None
     ) -> None:
         if timestamp is not None and timestamp.tzinfo is None:
             self.log.warning(f"Timestamp {timestamp} has no timezone information, adding it")
             timestamp = timestamp.replace(tzinfo=TimeHandler.get_timezone())
         if timestamp is None:
             timestamp = datetime.now(tz=TimeHandler.get_timezone())
 
-        point = Point(self.measurement).field(field_to_insert.name, field_to_insert.value)
-        if tags is not None:
-            for tag in tags:
-                point = point.tag(tag.name, tag.value)
+        point = Point(self.measurement)
+        if type(fields_to_insert) is not list:
+            fields_to_insert = [fields_to_insert]
+        for field_to_insert in fields_to_insert:
+            point = point.field(field_to_insert.name, field_to_insert.value)
         point = point.time(timestamp)
+        # point = Point("sun_forecast").field("pv_estimate", 20.52).time(TimeHandler.get_time())
 
         self.log.trace(f"Writing to database: {point}")
         self.write_api.write(bucket=self.bucket, record=point)

source/sun_forecast_handler.py

@@ -1,7 +1,7 @@
 from datetime import datetime, timedelta
 
 import requests
-from database_handler import DatabaseHandler, InfluxDBField, InfluxDBTag
+from database_handler import DatabaseHandler, InfluxDBField
 from energy_amount import EnergyAmount, Power
 from environment_variable_getter import EnvironmentVariableGetter
 from isodate import parse_duration
@@ -94,8 +94,10 @@ def get_solar_output_in_timeframe_for_rooftop(
             timeslot_start = timeslot_end - timeslot_duration
 
             self.database_handler.write_to_database(
-                InfluxDBField("pv_estimate", float(timeslot["pv_estimate"])),
-                tags=[InfluxDBTag("retrieval_timestamp", now.isoformat())],
+                [
+                    InfluxDBField("pv_estimate", float(timeslot["pv_estimate"] * 1000)),
+                    InfluxDBField("retrieval_timestamp", now.isoformat()),
+                ],
                 timestamp=timeslot_start,
             )
 
@@ -152,11 +154,3 @@ def get_solar_output_in_timeframe(self, timestamp_start: datetime, timestamp_end
             expected_solar_output += solar_forecast_for_rooftop
 
         return expected_solar_output
-
-
-if __name__ == "__main__":
-    s = SunForecastHandler()
-    f = InfluxDBField("pv_estimate", 23.52)
-    t = [InfluxDBTag("retrieval_timestamp", TimeHandler.get_time().isoformat())]
-    start = TimeHandler.get_time() + timedelta(hours=5)
-    s.database_handler.write_to_database(f, t, timestamp=start)