Make elevenlabs recoverable #134094

joostlek · 2024-12-27T15:54:04Z

Proposed change

Make elevenlabs recoverable

So last night the power went out in my building, and it got restored an hour later. The main internet switch did not restore right away. This of course causes HA to still try to connect to the internet, but it can't resolve DNS.

2024-12-26 19:12:00.682 ERROR (MainThread) [homeassistant.config_entries] Error setting up entry ElevenLabs for elevenlabs
Traceback (most recent call last):
  File "/usr/local/lib/python3.13/site-packages/httpx/_transports/default.py", line 72, in map_httpcore_exceptions
    yield
  File "/usr/local/lib/python3.13/site-packages/httpx/_transports/default.py", line 377, in handle_async_request
    resp = await self._pool.handle_async_request(req)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/local/lib/python3.13/site-packages/httpcore/_async/connection_pool.py", line 216, in handle_async_request
    raise exc from None
  File "/usr/local/lib/python3.13/site-packages/httpcore/_async/connection_pool.py", line 196, in handle_async_request
    response = await connection.handle_async_request(
               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
        pool_request.request
        ^^^^^^^^^^^^^^^^^^^^
    )
    ^
  File "/usr/local/lib/python3.13/site-packages/httpcore/_async/connection.py", line 99, in handle_async_request
    raise exc
  File "/usr/local/lib/python3.13/site-packages/httpcore/_async/connection.py", line 76, in handle_async_request
    stream = await self._connect(request)
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/local/lib/python3.13/site-packages/httpcore/_async/connection.py", line 122, in _connect
    stream = await self._network_backend.connect_tcp(**kwargs)
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/local/lib/python3.13/site-packages/httpcore/_backends/auto.py", line 30, in connect_tcp
    return await self._backend.connect_tcp(
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    ...<5 lines>...
    )
    ^
  File "/usr/local/lib/python3.13/site-packages/httpcore/_backends/anyio.py", line 114, in connect_tcp
    with map_exceptions(exc_map):
         ~~~~~~~~~~~~~~^^^^^^^^^
  File "/usr/local/lib/python3.13/contextlib.py", line 162, in __exit__
    self.gen.throw(value)
    ~~~~~~~~~~~~~~^^^^^^^
  File "/usr/local/lib/python3.13/site-packages/httpcore/_exceptions.py", line 14, in map_exceptions
    raise to_exc(exc) from exc
httpcore.ConnectError: [Errno -3] Try again

The above exception was the direct cause of the following exception:

Traceback (most recent call last):
  File "/usr/src/homeassistant/homeassistant/config_entries.py", line 640, in __async_setup_with_context
    result = await component.async_setup_entry(hass, self)
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/src/homeassistant/homeassistant/components/elevenlabs/__init__.py", line 50, in async_setup_entry
    model = await get_model_by_id(client, model_id)
            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/src/homeassistant/homeassistant/components/elevenlabs/__init__.py", line 23, in get_model_by_id
    models = await client.models.get_all()
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/local/lib/python3.13/site-packages/elevenlabs/models/client.py", line 107, in get_all
    _response = await self._client_wrapper.httpx_client.request(
                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    ...<3 lines>...
    )
    ^
  File "/usr/local/lib/python3.13/site-packages/elevenlabs/core/http_client.py", line 361, in request
    response = await self.httpx_client.request(
               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    ...<33 lines>...
    )
    ^
  File "/usr/local/lib/python3.13/site-packages/httpx/_client.py", line 1585, in request
    return await self.send(request, auth=auth, follow_redirects=follow_redirects)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/local/lib/python3.13/site-packages/httpx/_client.py", line 1674, in send
    response = await self._send_handling_auth(
               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    ...<4 lines>...
    )
    ^
  File "/usr/local/lib/python3.13/site-packages/httpx/_client.py", line 1702, in _send_handling_auth
    response = await self._send_handling_redirects(
               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    ...<3 lines>...
    )
    ^
  File "/usr/local/lib/python3.13/site-packages/httpx/_client.py", line 1739, in _send_handling_redirects
    response = await self._send_single_request(request)
               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/local/lib/python3.13/site-packages/httpx/_client.py", line 1776, in _send_single_request
    response = await transport.handle_async_request(request)
               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/local/lib/python3.13/site-packages/httpx/_transports/default.py", line 376, in handle_async_request
    with map_httpcore_exceptions():
         ~~~~~~~~~~~~~~~~~~~~~~~^^
  File "/usr/local/lib/python3.13/contextlib.py", line 162, in __exit__
    self.gen.throw(value)
    ~~~~~~~~~~~~~~^^^^^^^
  File "/usr/local/lib/python3.13/site-packages/httpx/_transports/default.py", line 89, in map_httpcore_exceptions
    raise mapped_exc(message) from exc
httpx.ConnectError: [Errno -3] Try again

After this, the integration did not reload anymore. This PR is making sure we catch this exception so we can retry again later

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 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:

Documentation added/updated for www.home-assistant.io

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:

I have reviewed two other open pull requests in this repository.

home-assistant · 2024-12-27T15:54:11Z

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

Code owner commands

Code owners of elevenlabs 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 elevenlabs 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.

sorgfresser

Thanks a bunch! Tested locally and works as intended.

The coverage is not happy though. I'm happy to add a test

sorgfresser · 2024-12-27T17:23:27Z

I PR'ed them in your repo joostlek#4

gjohansson-ST

Looks like init isn't tested anyhow.

gjohansson-ST · 2024-12-28T14:57:33Z

tests/components/elevenlabs/test_setup.py

+    """Test entry setup without any exceptions."""
+    mock_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(mock_entry.entry_id)
+    assert mock_entry.state == ConfigEntryState.LOADED


Include the unloading here as well to extend the coverage

sorgfresser · 2024-12-28T15:13:12Z

tests/components/elevenlabs/test_setup.py

+    """Test entry setup without any exceptions."""
+    mock_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(mock_entry.entry_id)
+    assert mock_entry.state == ConfigEntryState.LOADED


Suggested change

assert mock_entry.state == ConfigEntryState.LOADED

assert mock_entry.state == ConfigEntryState.LOADED

# Unload

await hass.config_entries.async_unload(mock_entry.entry_id)

assert mock_entry.state == ConfigEntryState.NOT_LOADED

Make elevenlabs recoverable

a969cd3

joostlek added this to the 2025.1.0 milestone Dec 27, 2024

home-assistant bot added bugfix cla-signed integration: elevenlabs small-pr PRs with less than 30 lines. Quality Scale: No score labels Dec 27, 2024

sorgfresser reviewed Dec 27, 2024

View reviewed changes

Add tests for entry setup

2566810

gjohansson-ST approved these changes Dec 28, 2024

View reviewed changes

sorgfresser and others added 2 commits December 28, 2024 13:56

Use the same fixtures for setup and config flow

1d66a99

Merge pull request #4 from sorgfresser/elevenlabsrecoverable

2a54299

gjohansson-ST reviewed Dec 28, 2024

View reviewed changes

sorgfresser reviewed Dec 28, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make elevenlabs recoverable #134094

Make elevenlabs recoverable #134094

joostlek commented Dec 27, 2024

home-assistant bot commented Dec 27, 2024

sorgfresser left a comment

sorgfresser commented Dec 27, 2024

gjohansson-ST left a comment

gjohansson-ST Dec 28, 2024

sorgfresser Dec 28, 2024

-    assert mock_entry.state == ConfigEntryState.LOADED
+    assert mock_entry.state == ConfigEntryState.LOADED
+    # Unload
+    await hass.config_entries.async_unload(mock_entry.entry_id)
+    assert mock_entry.state == ConfigEntryState.NOT_LOADED

Make elevenlabs recoverable #134094

Are you sure you want to change the base?

Make elevenlabs recoverable #134094

Conversation

joostlek commented Dec 27, 2024

Proposed change

Type of change

Additional information

Checklist

home-assistant bot commented Dec 27, 2024

sorgfresser left a comment

Choose a reason for hiding this comment

sorgfresser commented Dec 27, 2024

gjohansson-ST left a comment

Choose a reason for hiding this comment

gjohansson-ST Dec 28, 2024

Choose a reason for hiding this comment

sorgfresser Dec 28, 2024

Choose a reason for hiding this comment