diff --git a/src/dsmr_consumption/services.py b/src/dsmr_consumption/services.py index 5ac6cf33..b7e3e1a6 100644 --- a/src/dsmr_consumption/services.py +++ b/src/dsmr_consumption/services.py @@ -485,22 +485,22 @@ def day_consumption(day: datetime.date) -> Dict: consumption["total_cost"] = round_decimal(consumption["total_cost"]) # Current prices as well. - consumption[ - "energy_supplier_price_electricity_delivered_1" - ] = daily_energy_price.electricity_delivered_1_price - consumption[ - "energy_supplier_price_electricity_delivered_2" - ] = daily_energy_price.electricity_delivered_2_price - consumption[ - "energy_supplier_price_electricity_returned_1" - ] = daily_energy_price.electricity_returned_1_price - consumption[ - "energy_supplier_price_electricity_returned_2" - ] = daily_energy_price.electricity_returned_2_price + consumption["energy_supplier_price_electricity_delivered_1"] = ( + daily_energy_price.electricity_delivered_1_price + ) + consumption["energy_supplier_price_electricity_delivered_2"] = ( + daily_energy_price.electricity_delivered_2_price + ) + consumption["energy_supplier_price_electricity_returned_1"] = ( + daily_energy_price.electricity_returned_1_price + ) + consumption["energy_supplier_price_electricity_returned_2"] = ( + daily_energy_price.electricity_returned_2_price + ) consumption["energy_supplier_price_gas"] = daily_energy_price.gas_price - consumption[ - "energy_supplier_price_fixed_daily_cost" - ] = daily_energy_price.fixed_daily_cost + consumption["energy_supplier_price_fixed_daily_cost"] = ( + daily_energy_price.fixed_daily_cost + ) # Any notes of that day. consumption["notes"] = Note.objects.filter(day=day).values_list( diff --git a/src/dsmr_datalogger/services/datalogger.py b/src/dsmr_datalogger/services/datalogger.py index 4ddc00c5..1cafb6bb 100644 --- a/src/dsmr_datalogger/services/datalogger.py +++ b/src/dsmr_datalogger/services/datalogger.py @@ -149,9 +149,9 @@ def _map_telegram_to_model(parsed_telegram: Dict, data: str): "dsmr_version" ].startswith("5") - model_fields[ - "extra_device_timestamp" - ] = calculate_fake_gas_reading_timestamp(now=now, is_dsmr_v5=is_v5) + model_fields["extra_device_timestamp"] = ( + calculate_fake_gas_reading_timestamp(now=now, is_dsmr_v5=is_v5) + ) # Fix for rare smart meters with a timestamp in the far future. We should disallow that. discard_after = timezone.now() + timezone.timedelta(hours=24) diff --git a/src/dsmr_frontend/views/about.py b/src/dsmr_frontend/views/about.py index a0ff24be..9aa507cf 100644 --- a/src/dsmr_frontend/views/about.py +++ b/src/dsmr_frontend/views/about.py @@ -15,9 +15,9 @@ class About(ConfigurableLoginRequiredMixin, TemplateView): def get_context_data(self, **kwargs): context_data = super(About, self).get_context_data(**kwargs) - context_data[ - "monitoring_issues" - ] = dsmr_backend.services.backend.request_monitoring_status() + context_data["monitoring_issues"] = ( + dsmr_backend.services.backend.request_monitoring_status() + ) context_data["frontend_settings"] = FrontendSettings.get_solo() return context_data diff --git a/src/dsmr_frontend/views/energy_contracts.py b/src/dsmr_frontend/views/energy_contracts.py index 9e389a84..1efebad0 100644 --- a/src/dsmr_frontend/views/energy_contracts.py +++ b/src/dsmr_frontend/views/energy_contracts.py @@ -14,8 +14,8 @@ def get_context_data(self, **kwargs): context_data["capabilities"] = dsmr_backend.services.backend.get_capabilities() context_data["frontend_settings"] = FrontendSettings.get_solo() - context_data[ - "energy_contracts" - ] = dsmr_consumption.services.summarize_energy_contracts() + context_data["energy_contracts"] = ( + dsmr_consumption.services.summarize_energy_contracts() + ) return context_data diff --git a/src/dsmr_frontend/views/statistics.py b/src/dsmr_frontend/views/statistics.py index 50b9ccc0..8c6e5c27 100644 --- a/src/dsmr_frontend/views/statistics.py +++ b/src/dsmr_frontend/views/statistics.py @@ -17,9 +17,9 @@ class Statistics(ConfigurableLoginRequiredMixin, TemplateView): def get_context_data(self, **kwargs): context_data = super(Statistics, self).get_context_data(**kwargs) context_data["capabilities"] = dsmr_backend.services.backend.get_capabilities() - context_data[ - "electricity_statistics" - ] = ElectricityStatistics.get_solo().export() + context_data["electricity_statistics"] = ( + ElectricityStatistics.get_solo().export() + ) context_data["frontend_settings"] = FrontendSettings.get_solo() try: diff --git a/src/dsmr_frontend/views/support.py b/src/dsmr_frontend/views/support.py index c01ad3f3..1498b3c1 100644 --- a/src/dsmr_frontend/views/support.py +++ b/src/dsmr_frontend/views/support.py @@ -15,9 +15,9 @@ class Support(LoginRequiredMixin, TemplateView): def get_context_data(self, **kwargs): context_data = super(Support, self).get_context_data(**kwargs) - context_data[ - "monitoring_issues" - ] = dsmr_backend.services.backend.request_monitoring_status() + context_data["monitoring_issues"] = ( + dsmr_backend.services.backend.request_monitoring_status() + ) context_data["frontend_settings"] = FrontendSettings.get_solo() return context_data diff --git a/src/dsmr_plugins/modules/__init__.py b/src/dsmr_plugins/modules/__init__.py index 5de6f068..72872496 100644 --- a/src/dsmr_plugins/modules/__init__.py +++ b/src/dsmr_plugins/modules/__init__.py @@ -14,6 +14,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . """ + from django.utils.version import get_version diff --git a/src/dsmr_stats/services.py b/src/dsmr_stats/services.py index 95af4e6b..9e6ad5d5 100644 --- a/src/dsmr_stats/services.py +++ b/src/dsmr_stats/services.py @@ -260,7 +260,10 @@ def clear_statistics() -> None: def electricity_tariff_percentage(start: date, end: date) -> Optional[Dict]: """Returns the total electricity consumption percentage by tariff (high/low tariff).""" - totals = DayStatistics.objects.filter(day__gte=start, day__lte=end,).aggregate( + totals = DayStatistics.objects.filter( + day__gte=start, + day__lte=end, + ).aggregate( electricity1=Sum("electricity1"), electricity2=Sum("electricity2"), )