Skip to content

Commit

Permalink
style: fix whitespace and formatting (#447)
Browse files Browse the repository at this point in the history
  • Loading branch information
lotharbach committed Jan 3, 2024
1 parent d35a489 commit 509cf4f
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 39 deletions.
44 changes: 22 additions & 22 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 14 additions & 14 deletions teslajsonpy/controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -339,12 +339,12 @@ async def get_site_data(self, energysite_id: int) -> dict:
return (await self.api("SITE_DATA", path_vars={"site_id": energysite_id}))[
"response"
]

async def get_site_summary(self, energysite_id: int) -> dict:
"""Get site data json from TeslaAPI for a given energysite_id."""
return (await self.api("SITE_SUMMARY", path_vars={"site_id": energysite_id}))[
"response"
]
]

async def generate_car_objects(
self,
Expand Down Expand Up @@ -412,7 +412,7 @@ async def generate_energysite_objects(self) -> Dict[int, EnergySite]:
ex.message,
)
self._site_data[energysite_id] = {}

if energysite[RESOURCE_TYPE] == RESOURCE_TYPE_SOLAR:

self.energysites[energysite_id] = SolarSite(
Expand All @@ -422,11 +422,11 @@ async def generate_energysite_objects(self) -> Dict[int, EnergySite]:
self._site_data[energysite_id],
)
# Powerwall systems listed as "battery"
if energysite[RESOURCE_TYPE] == RESOURCE_TYPE_BATTERY:
if energysite[RESOURCE_TYPE] == RESOURCE_TYPE_BATTERY:

self._site_summary[energysite_id] = await self.get_site_summary(
energysite_id
)
energysite_id
)

if energysite["components"]["solar"]:
self.energysites[energysite_id] = SolarPowerwallSite(
Expand All @@ -443,7 +443,7 @@ async def generate_energysite_objects(self) -> Dict[int, EnergySite]:
self._site_config[energysite_id],
self._site_data[energysite_id],
self._site_summary[energysite_id],
)
)

return self.energysites

Expand Down Expand Up @@ -694,17 +694,17 @@ async def _get_and_process_site_data(energysite_id: int) -> None:
del response["solar_power"]

self._site_data[energysite_id].update(response)

async def _get_and_process_site_summary(energysite_id: int) -> None:
_LOGGER.debug("Updating SITE_SUMMARY for energysite: %s", energysite_id)
try:
response = await self.get_site_summary(energysite_id)
except TeslaException:
response = None

if response:
self._site_summary[energysite_id].update(response)

async def _get_and_process_site_config(energysite_id: int) -> None:
_LOGGER.debug("Updating SITE_CONFIG for energysite: %s", energysite_id)
try:
Expand All @@ -713,7 +713,7 @@ async def _get_and_process_site_config(energysite_id: int) -> None:
response = None

if response:
self._site_config[energysite_id].update(response)
self._site_config[energysite_id].update(response)

async with self.__update_lock:
if self._vehicle_list:
Expand Down Expand Up @@ -807,10 +807,10 @@ async def _get_and_process_site_config(energysite_id: int) -> None:
and energysite_id not in energy_site_ids
):
continue

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_summary(energysite_id))

Expand Down
5 changes: 2 additions & 3 deletions teslajsonpy/energy.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def __init__(
self,
api: Callable,
energysite: dict,
site_config: dict,
site_config: dict,
site_data: dict,
site_summary: dict,
) -> None:
Expand Down Expand Up @@ -153,9 +153,8 @@ def energy_left(self) -> float:

@property
def grid_power(self) -> float:
"""Return grid power in Watts."""
"""Return grid power in Watts."""
return self._site_data.get("grid_power")


@property
def grid_status(self) -> str:
Expand Down

0 comments on commit 509cf4f

Please sign in to comment.