Skip to content

SoC Module bmwbc: cleanup exception handling #2597

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

Merged
benderl merged 1 commit into from
Jul 28, 2025
Merged

SoC Module bmwbc: cleanup exception handling #2597

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
22 changes: 7 additions & 15 deletions packages/modules/vehicles/bmwbc/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@
# send store content n debug level to soc log
def log_store(store: dict, txt: str):
st = deepcopy(store) # create a copy of the store
st['rt'] = st['refresh_token'] # copy key to avoid REDACTED
st['at'] = st['access_token'] # copy key to avoid REDACTED
log.info("store file action:" + txt)
# st['rt'] = st['refresh_token'] # copy key to avoid REDACTED
# st['at'] = st['access_token'] # copy key to avoid REDACTED
log.debug("store file action:" + txt)
log.debug(txt + ":\n" + dumps(st, indent=4))


Expand Down Expand Up @@ -287,11 +287,9 @@ async def _fetch_soc(self,

if nowdt > expires_at:
log.debug("# Proactive login to force refresh token before get_vehicles")
log.debug("# before proactive login:" + str(self._auth[user_id].expires_at) +
"/" + self._auth[user_id].refresh_token)
log.debug("# before proactive login:" + str(self._auth[user_id].expires_at))
await self._auth[user_id].login()
log.debug("# after proactive login:" + str(self._auth[user_id].expires_at) +
"/" + self._auth[user_id].refresh_token)
log.debug("# after proactive login:" + str(self._auth[user_id].expires_at))

# get vehicle list - needs to be called async
_loop = 5 # 5 retries
Expand All @@ -309,16 +307,10 @@ async def _fetch_soc(self,
log.info(self._mode + ": get_vehicles : Request Timeout (408)")
_err = 408
else:
log.info(self._mode + ": get_vehicles err=" + str(err))
log.info(self._mode + ": get_vehicles unknown err=" + str(err))
log.info(self._mode + ": get_vehicles : MyBMWAPIError, _loop/_err=" +
str(_loop) + "/" + str(_err))
time.sleep(10) # sleep for 10 secs before token refresh
log.info("# before except login:" + str(self._auth[user_id].expires_at))
# refresh token
await self._auth[user_id].login()
log.info("# after except login:" + str(self._auth[user_id].expires_at))
# await self._account[user_id].get_vehicles()
time.sleep(5) # sleep for 5 secs after token refresh
time.sleep(15) # sleep for 15 secs before retry
_loop = _loop - 1
except Exception as err:
log.error("bmwbc.fetch_soc: get_vehicles Error, vehicle_id: " +
Expand Down