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.

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

Jump to bottom

Enumerate openai.Models to validate config #99438

Merged
merged 2 commits into from
Nov 24, 2023
Merged

Enumerate openai.Models to validate config #99438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64f60f3
Enumerate openai.Models to validate config
joseph39 Sep 1, 2023
bfba9e6
Merge branch 'dev' into openai-validate-impl
joseph39 Sep 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion homeassistant/components/openai_conversation/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
try:
await hass.async_add_executor_job(
partial(
openai.Engine.list,
openai.Model.list,
api_key=entry.data[CONF_API_KEY],
request_timeout=10,
)
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/openai_conversation/config_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> None:
Data has the keys from STEP_USER_DATA_SCHEMA with values provided by the user.
"""
openai.api_key = data[CONF_API_KEY]
await hass.async_add_executor_job(partial(openai.Engine.list, request_timeout=10))
await hass.async_add_executor_job(partial(openai.Model.list, request_timeout=10))


class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
Expand Down
2 changes: 1 addition & 1 deletion tests/components/openai_conversation/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def mock_config_entry(hass):
async def mock_init_component(hass, mock_config_entry):
"""Initialize integration."""
with patch(
"openai.Engine.list",
"openai.Model.list",
):
assert await async_setup_component(hass, "openai_conversation", {})
await hass.async_block_till_done()
4 changes: 2 additions & 2 deletions tests/components/openai_conversation/test_config_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ async def test_form(hass: HomeAssistant) -> None:
assert result["errors"] is None

with patch(
"homeassistant.components.openai_conversation.config_flow.openai.Engine.list",
"homeassistant.components.openai_conversation.config_flow.openai.Model.list",
), patch(
"homeassistant.components.openai_conversation.async_setup_entry",
return_value=True,
Expand Down Expand Up @@ -88,7 +88,7 @@ async def test_form_invalid_auth(hass: HomeAssistant, side_effect, error) -> Non
)

with patch(
"homeassistant.components.openai_conversation.config_flow.openai.Engine.list",
"homeassistant.components.openai_conversation.config_flow.openai.Model.list",
side_effect=side_effect,
):
result2 = await hass.config_entries.flow.async_configure(
Expand Down
2 changes: 1 addition & 1 deletion tests/components/openai_conversation/test_init.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ async def test_template_error(
},
)
with patch(
"openai.Engine.list",
"openai.Model.list",
), patch("openai.ChatCompletion.acreate"):
await hass.config_entries.async_setup(mock_config_entry.entry_id)
await hass.async_block_till_done()
Expand Down