Skip to content
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.

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

Use KNX UI entity platform controller class #123128

Merged
merged 10 commits into from
Aug 5, 2024
Merged

Conversation

farmio
Copy link
Contributor

@farmio farmio commented Aug 3, 2024

Proposed change

Use KNX UI entity platform controller class to add and reload UI entities instead of KNXConfigStore.
First commit is where the logic is built, second where it is used and third is only some renaming.

Type of change

  • Dependency upgrade
  • Bugfix (non-breaking change which fixes an issue)
  • New integration (thank you!)
  • New feature (which adds functionality to an existing integration)
  • Deprecation (breaking change to happen in the future)
  • Breaking change (fix/feature causing existing functionality to break)
  • Code quality improvements to existing code or addition of tests

Additional information

Checklist

  • The code change is tested and works locally.
  • Local tests pass. Your PR cannot be merged unless tests pass
  • There is no commented out code in this PR.
  • I have followed the development checklist
  • I have followed the perfect PR recommendations
  • The code has been formatted using Ruff (ruff format homeassistant tests)
  • Tests have been added to verify that the new code works.

If user exposed functionality or configuration variables are added/changed:

If the code communicates with devices, web services, or third-party tools:

  • The manifest file has all fields filled out correctly.
    Updated and included derived files by running: python3 -m script.hassfest.
  • New or updated dependencies have been added to requirements_all.txt.
    Updated by running python3 -m script.gen_requirements_all.
  • For the updated dependencies - a link to the changelog, or at minimum a diff between library versions is added to the PR description.

To help with the load of incoming pull requests:

@home-assistant
Copy link

home-assistant bot commented Aug 3, 2024

Hey there @Julius2342, @marvin-w, mind taking a look at this pull request as it has been labeled with an integration (knx) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of knx can trigger bot actions by commenting:

  • @home-assistant close Closes the pull request.
  • @home-assistant rename Awesome new title Renames the pull request.
  • @home-assistant reopen Reopen the pull request.
  • @home-assistant unassign knx Removes the current integration label and assignees on the pull request, add the integration domain after the command.
  • @home-assistant add-label needs-more-information Add a label (needs-more-information, problem in dependency, problem in custom component) to the pull request.
  • @home-assistant remove-label needs-more-information Remove a label (needs-more-information, problem in dependency, problem in custom component) on the pull request.

homeassistant/components/knx/knx_entity.py Outdated Show resolved Hide resolved
homeassistant/components/knx/knx_entity.py Outdated Show resolved Hide resolved
@home-assistant home-assistant bot marked this pull request as draft August 4, 2024 00:42
@home-assistant
Copy link

home-assistant bot commented Aug 4, 2024

Please take a look at the requested changes, and use the Ready for review button when you are done, thanks 👍

Learn more about our pull request process.

@farmio farmio marked this pull request as ready for review August 4, 2024 09:24
Copy link
Member

@MartinHjelmare MartinHjelmare left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! There were some annotations about missing coverage that I recommend addressing before merging, if correct.

homeassistant/components/knx/storage/config_store.py Outdated Show resolved Hide resolved
homeassistant/components/knx/light.py Outdated Show resolved Hide resolved
homeassistant/components/knx/switch.py Outdated Show resolved Hide resolved
Comment on lines 78 to 87
async def create_entity(
self, platform: Platform, data: dict[str, Any]
) -> str | None:
"""Create a new entity."""
if platform not in self.async_add_entity:
raise ConfigStoreException(f"Entity platform not ready: {platform}")
try:
platform_controller = self._platform_controllers[platform]
except KeyError as err:
raise ConfigStoreException(
f"Entity platform not ready: {platform}"
) from err
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't really know how to write a test against this.
All UI supported platforms should create and add their platform_controllers on integration load.
The websocket call triggering create_entity will be voluptuous validated to not create an unsupported platform. So in theory this can never raise. If it did, it would just forward the error message in the UI.

Would you prefer to remove the try-except block in this case, or should it stay?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How is the supported platform validated in the websocket? Does it check that the platform is setup? Cause that's what is required here. If the config entry is loaded we can assume that platforms are setup. If the websocket API checks that the config entry is loaded would be enough.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd test this by setting up the config entry and then unloading it, and then calling the websocket API.

Copy link
Member

@MartinHjelmare MartinHjelmare Aug 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To be clear, I don't think we need to catch the error here but we need to handle an unloaded config entry in the websocket API.

@MartinHjelmare
Copy link
Member

Are you going to handle an unloaded config entry in a separate PR?

@farmio
Copy link
Contributor Author

farmio commented Aug 4, 2024

Yes, that would probably be a good idea.

@farmio
Copy link
Contributor Author

farmio commented Aug 5, 2024

-> #123178

Should this PR be marked with 2024.8 milestone or can it wait for next release?

@MartinHjelmare
Copy link
Member

Since the other PRs have been added to the release branch I suggest we add this too.

@MartinHjelmare MartinHjelmare added this to the 2024.8.0 milestone Aug 5, 2024
@farmio farmio merged commit f2d99cb into dev Aug 5, 2024
26 checks passed
@farmio farmio deleted the knx-ui-entity-platform-controller branch August 5, 2024 10:34
beastie29a pushed a commit to beastie29a/core that referenced this pull request Aug 6, 2024
@github-actions github-actions bot locked and limited conversation to collaborators Aug 6, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants