Improve config None handling for edge case, add test (#1807)

custom_components/mass/config_flow.py

@@ -215,7 +215,7 @@ async def async_step_manual(self, user_input: dict[str, Any] | None = None) -> F
 
         try:
             self.server_info = await get_server_info(self.hass, user_input[CONF_URL])
-            self.openai_agent_id = user_input[CONF_OPENAI_AGENT_ID]
+            self.openai_agent_id = user_input[CONF_OPENAI_AGENT_ID] or ""
             self.expose_players_assist = user_input[CONF_ASSIST_AUTO_EXPOSE_PLAYERS]
             await self.async_set_unique_id(self.server_info.server_id)
         except CannotConnect:
@@ -258,7 +258,7 @@ async def async_step_discovery_confirm(
         if user_input is not None:
             # Check that we can connect to the address.
             try:
-                self.openai_agent_id = user_input[CONF_OPENAI_AGENT_ID]
+                self.openai_agent_id = user_input[CONF_OPENAI_AGENT_ID] or ""
                 self.expose_players_assist = user_input[CONF_ASSIST_AUTO_EXPOSE_PLAYERS]
                 await get_server_info(self.hass, self.server_info.base_url)
             except CannotConnect:
@@ -302,7 +302,7 @@ async def async_step_finish_addon_setup(
             except CannotConnect:
                 return self.async_abort(reason="cannot_connect")
         if user_input is not None:
-            self.openai_agent_id = user_input[CONF_OPENAI_AGENT_ID]
+            self.openai_agent_id = user_input[CONF_OPENAI_AGENT_ID] or ""
             self.expose_players_assist = user_input[CONF_ASSIST_AUTO_EXPOSE_PLAYERS]
         return await self._async_create_entry_or_abort()
 

requirements_test.txt

@@ -3,5 +3,6 @@ pylint==3.0.3
 pre-commit==3.6.0
 music-assistant==2.0.0b83
 async_timeout==4.0.3
-pytest-homeassistant-custom-component==0.13.88
-zeroconf==0.128.0
+pytest-homeassistant-custom-component==0.13.91
+voluptuous==0.13.1
+zeroconf==0.131.0

tests/test_config_flow.py

@@ -10,6 +10,7 @@
 from homeassistant.helpers.selector import ConversationAgentSelector
 from music_assistant.client.exceptions import CannotConnect, InvalidServerVersion
 from pytest_homeassistant_custom_component.common import MockConfigEntry
+from voluptuous.error import MultipleInvalid
 
 from custom_components.mass import config_flow
 from custom_components.mass.config_flow import (
@@ -221,6 +222,25 @@ async def test_flow_discovery_confirm_creates_config_entry(m_mass, hass):  # noq
     assert expected == result
 
 
+@patch("custom_components.mass.config_flow.MusicAssistantClient")
+async def test_flow_discovery_confirm_creates_config_entry_with_none_type_conversation_agent(
+    m_mass, hass  # noqa: ARG001
+):
+    """Test the config entry is successfully created."""
+    with pytest.raises(MultipleInvalid):
+        config_flow.ConfigFlow.data = VALID_CONFIG
+        _result = await hass.config_entries.flow.async_init(
+            config_flow.DOMAIN, context={"source": "zeroconf"}, data=ZEROCONF_DATA
+        )
+        await hass.config_entries.flow.async_configure(
+            _result["flow_id"],
+            user_input={
+                CONF_OPENAI_AGENT_ID: None,
+                CONF_ASSIST_AUTO_EXPOSE_PLAYERS: False,
+            },
+        )
+
+
 async def test_options_flow_init(hass):
     """Test config flow options."""
     config_entry = await setup_mass_integration(hass)