Skip to content

Refactor unit of measurement handling in importer.py #340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lanort wants to merge 1 commit into
base: main
Choose a base branch
from
+25 −2
Open

Refactor unit of measurement handling in importer.py #340

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions custom_components/wnsm/importer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,15 +160,38 @@ async def _import_statistics(self, start: datetime = None, end: datetime = None,

bewegungsdaten = await self.async_smartmeter.get_bewegungsdaten(self.zaehlpunkt, start, end, self.granularity)
_LOGGER.debug(f"Mapped historical data: {bewegungsdaten}")
<<<<<<< HEAD
if bewegungsdaten['unitOfMeasurement'] is None:
_LOGGER.warning("Unit of measurement is None! Aborting import...")
return None
elif bewegungsdaten['unitOfMeasurement'] == 'WH':
=======

# Get unit of measurement from API response, with fallback to configured unit
unit_of_measurement = bewegungsdaten.get('unitOfMeasurement')
if unit_of_measurement is None:
# Fallback to the unit configured in the sensor
# Normalize unit: "kWh" -> "KWH", "Wh" -> "WH"
normalized_unit = self.unit_of_measurement.upper()
if 'KW' in normalized_unit:
unit_of_measurement = 'KWH'
elif 'W' in normalized_unit:
unit_of_measurement = 'WH'
else:
# If we can't determine the unit, default to KWH (most common)
unit_of_measurement = 'KWH'
_LOGGER.warning(
f"API response missing 'unitOfMeasurement' for zaehlpunkt {self.zaehlpunkt}. "
f"Using fallback unit: {unit_of_measurement}"
)

if unit_of_measurement == 'WH':
>>>>>>> 9faf4c2 (Refactor unit of measurement handling in importer.py)
factor = 1e-3
elif bewegungsdaten['unitOfMeasurement'] == 'KWH':
elif unit_of_measurement == 'KWH':
factor = 1.0
else:
raise NotImplementedError(f'Unit {bewegungsdaten["unitOfMeasurement"]}" is not yet implemented. Please report!')
raise NotImplementedError(f'Unit {unit_of_measurement}" is not yet implemented. Please report!')

dates = defaultdict(Decimal)
if 'values' not in bewegungsdaten:
Expand Down