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

Subclass aiohttp requests to use json helper #90214

Merged
merged 7 commits into from
Mar 24, 2023
Merged

Subclass aiohttp requests to use json helper #90214

merged 7 commits into from
Mar 24, 2023

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Mar 24, 2023

Proposed change

#90194 (comment)

Subclass aiohttp requests to use json helper

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

  • This PR fixes or closes issue: fixes #
  • This PR is related to issue:
  • Link to documentation pull request:

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 Black (black --fast 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.
  • Untested files have been added to .coveragerc.

To help with the load of incoming pull requests:

@home-assistant
Copy link

Hey there @home-assistant/core, mind taking a look at this pull request as it has been labeled with an integration (http) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of http 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 http Removes the current integration label and assignees on the pull request, add the integration domain after the command.

@bdraco bdraco marked this pull request as ready for review March 24, 2023 07:10
@bdraco bdraco requested a review from a team as a code owner March 24, 2023 07:10
return json_loads(await self.read())


class HomeAssistantApplication(web.Application):
Copy link
Member

Choose a reason for hiding this comment

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

I'm not 100% following what is going on here. web.Application is marked as @final and the _make_request function is part of AppRunner.

Copy link
Member Author

Choose a reason for hiding this comment

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

Doesn't make any sense to me either after sleep. I'll rework and re-run the traces.

What I can't explain is I can see the new code being executed in the py-spy
Screenshot 2023-03-24 at 6 15 43 AM

Copy link
Member Author

@bdraco bdraco Mar 24, 2023

Choose a reason for hiding this comment

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

It definitely works as-is but I can't explain why .. yet

Copy link
Member Author

@bdraco bdraco Mar 24, 2023

Choose a reason for hiding this comment

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

Oh.

I was looking at aiohttp 4.x which is a major refactor

This is the 3.8.4 code

https://github.com/aio-libs/aiohttp/blob/33953f110e97eecc707e1402daa8d543f38a189b/aiohttp/web_app.py#L437

For 4.x its moved a bit so the below should work for that (maybe still needs some minor tweaks):

369cd3d

Copy link
Member Author

Choose a reason for hiding this comment

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

After the aiohttp change for the logging no op merges (been through one review pass there already), I'll do another upstream PR to make this a bit easier for when 4.x is released

Copy link
Member

Choose a reason for hiding this comment

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

Doh. My bad for not looking at the right branch.

@balloob balloob merged commit 72b09bf into dev Mar 24, 2023
@balloob balloob deleted the custom_request branch March 24, 2023 19:37
@github-actions github-actions bot locked and limited conversation to collaborators Mar 25, 2023
@@ -240,6 +246,40 @@ def log(
super().log(request, response, time)


class HomeAssistantRequest(web.Request):
Copy link
Contributor

Choose a reason for hiding this comment

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

this results in a deprecation warning in tests

../../usr/local/lib/python3.10/abc.py:106
  /usr/local/lib/python3.10/abc.py:106: DeprecationWarning: Inheritance class HomeAssistantApplication from web.Application is discouraged

inheritance has been deprecated in aiohttp with aio-libs/aiohttp#2692 and will be removed in aiohttp 4.0.0 with aio-libs/aiohttp#3933

Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

ah sorry, did somehow oversee this comment 🙈

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.

3 participants