Skip to content

Complete strict typing for recorder #71274

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
bdraco merged 7 commits into from
May 4, 2022
Merged

Complete strict typing for recorder #71274

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1bb8451
Complete strict typing for recorder
bdraco May 4, 2022
5388d47
update tests
bdraco May 4, 2022
52962f8
Update tests/components/recorder/test_migrate.py
bdraco May 4, 2022
a6afdb1
Update tests/components/recorder/test_migrate.py
bdraco May 4, 2022
a46a4a2
Remove the asserts
bdraco May 4, 2022
ceface7
Merge branch 'recorder_migration_typing' of github.com:bdraco/home-as…
bdraco May 4, 2022
cca21d6
remove ignore comments
bdraco May 4, 2022
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
18 changes: 1 addition & 17 deletions .strict-typing
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,23 +177,7 @@ homeassistant.components.pure_energie.*
homeassistant.components.rainmachine.*
homeassistant.components.rdw.*
homeassistant.components.recollect_waste.*
homeassistant.components.recorder
homeassistant.components.recorder.const
homeassistant.components.recorder.core
homeassistant.components.recorder.backup
homeassistant.components.recorder.executor
homeassistant.components.recorder.history
homeassistant.components.recorder.models
homeassistant.components.recorder.pool
homeassistant.components.recorder.purge
homeassistant.components.recorder.repack
homeassistant.components.recorder.run_history
homeassistant.components.recorder.services
homeassistant.components.recorder.statistics
homeassistant.components.recorder.system_health
homeassistant.components.recorder.tasks
homeassistant.components.recorder.util
homeassistant.components.recorder.websocket_api
homeassistant.components.recorder.*
homeassistant.components.remote.*
homeassistant.components.renault.*
homeassistant.components.ridwell.*
Expand Down
8 changes: 6 additions & 2 deletions homeassistant/components/recorder/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,8 @@ def _setup_recorder(self) -> None | int:
while tries <= self.db_max_retries:
try:
self._setup_connection()
return migration.get_schema_version(self)
assert self.get_session is not None
Comment thread
bdraco marked this conversation as resolved.
Outdated
return migration.get_schema_version(self.get_session)
except Exception as err: # pylint: disable=broad-except
_LOGGER.exception(
"Error during connection setup: %s (retrying in %s seconds)",
Expand All @@ -612,9 +613,12 @@ def _migrate_schema_and_setup_run(self, current_version: int) -> bool:
"recorder_database_migration",
)
self.hass.add_job(self._async_migration_started)
assert self.get_session is not None

try:
migration.migrate_schema(self, current_version)
migration.migrate_schema(
self.hass, self.engine, self.get_session, current_version
)
except exc.DatabaseError as err:
if self._handle_database_error(err):
return True
Expand Down
Loading