Update controller.py

zabuldon · Oct 11, 2023 · 7bcbf91 · 7bcbf91
1 parent 16644b3
commit 7bcbf91
Showing 1 changed file with 16 additions and 27 deletions.
diff --git a/teslajsonpy/controller.py b/teslajsonpy/controller.py
@@ -401,18 +401,19 @@ async def generate_energysite_objects(self) -> Dict[int, EnergySite]:
             # Default to True and check during updates
             self._grid_status_unknown = {energysite_id: True}
             # Solar only systems (no Powerwalls) are listed as "solar"
+            try:
+                self._site_data[energysite_id] = await self.get_site_data(
+                    energysite_id
+                )
+            except TeslaException as ex:
+                _LOGGER.warning(
+                    "Unable to get site data during setup, site will still be added. %s: %s",
+                    ex.code,
+                    ex.message,
+                )
+                self._site_data[energysite_id] = {}
+
             if energysite[RESOURCE_TYPE] == RESOURCE_TYPE_SOLAR:
-                try:
-                    self._site_data[energysite_id] = await self.get_site_data(
-                        energysite_id
-                    )
-                except TeslaException as ex:
-                    _LOGGER.warning(
-                        "Unable to get site data during setup, site will still be added. %s: %s",
-                        ex.code,
-                        ex.message,
-                    )
-                    self._site_data[energysite_id] = {}
 
                 self.energysites[energysite_id] = SolarSite(
                     self.api,
@@ -422,17 +423,6 @@ async def generate_energysite_objects(self) -> Dict[int, EnergySite]:
                 )
             # Powerwall systems listed as "battery"
             if energysite[RESOURCE_TYPE] == RESOURCE_TYPE_BATTERY:                
-                try:
-                    self._site_data[energysite_id] = await self.get_site_data(
-                        energysite_id
-                    )
-                except TeslaException as ex:
-                    _LOGGER.warning(
-                        "Unable to get site data during setup, site will still be added. %s: %s",
-                        ex.code,
-                        ex.message,
-                    )
-                    self._site_data[energysite_id] = {}
 
                 self._site_summary[energysite_id] = await self.get_site_summary(
                         energysite_id
@@ -817,12 +807,11 @@ async def _get_and_process_site_config(energysite_id: int) -> None:
                         and energysite_id not in energy_site_ids
                     ):
                         continue
-                        
-                    if energysite[RESOURCE_TYPE] == RESOURCE_TYPE_SOLAR:
-                        tasks.append(_get_and_process_site_data(energysite_id))
-
+
+                    tasks.append(_get_and_process_site_data(energysite_id))
+                    tasks.append(_get_and_process_site_config(energysite_id))
+                    
                     if energysite[RESOURCE_TYPE] == RESOURCE_TYPE_BATTERY:
-                        tasks.append(_get_and_process_site_config(energysite_id))
                         tasks.append(_get_and_process_site_summary(energysite_id))
 
             return any(await asyncio.gather(*tasks))