Simplify API validation by removing confusing origin parameter (#6203)

Co-authored-by: Claude <[email protected]>

Author: agners

supervisor/addons/options.py

@@ -187,7 +187,7 @@ def _single_validate(self, typ: str, value: Any, key: str) -> Any:
 
             # Device valid
             self.devices.add(device)
-            return str(device.path)
+            return str(value)
 
         raise vol.Invalid(
             f"Fatal error for option '{key}' with type '{typ}' in {self._name} ({self._slug})"

supervisor/api/addons.py

@@ -306,7 +306,7 @@ async def options(self, request: web.Request) -> None:
         )
 
         # Validate/Process Body
-        body = await api_validate(addon_schema, request, origin=[ATTR_OPTIONS])
+        body = await api_validate(addon_schema, request)
         if ATTR_OPTIONS in body:
             addon.options = body[ATTR_OPTIONS]
         if ATTR_BOOT in body:

supervisor/api/utils.py

@@ -190,7 +190,6 @@ def api_return_ok(data: dict[str, Any] | list[Any] | None = None) -> web.Respons
 async def api_validate(
     schema: vol.Schema | vol.All,
     request: web.Request,
-    origin: list[str] | None = None,
 ) -> dict[str, Any]:
     """Validate request data with schema."""
     data: dict[str, Any] = await request.json(loads=json_loads)
@@ -199,14 +198,6 @@ async def api_validate(
     except vol.Invalid as ex:
         raise APIError(humanize_error(data, ex)) from None
 
-    if not origin:
-        return data_validated
-
-    for origin_value in origin:
-        if origin_value not in data_validated:
-            continue
-        data_validated[origin_value] = data[origin_value]
-
     return data_validated
 
 

tests/addons/test_options.py

@@ -233,20 +233,21 @@ def test_simple_device_schema(coresys):
     ):
         coresys.hardware.update_device(device)
 
-    assert AddonOptions(
+    data_device_path = AddonOptions(
         coresys,
         {"name": "str", "password": "password", "input": "device"},
         MOCK_ADDON_NAME,
         MOCK_ADDON_SLUG,
     )({"name": "Pascal", "password": "1234", "input": "/dev/ttyUSB0"})
+    assert data_device_path["input"] == "/dev/ttyUSB0"
 
     data = AddonOptions(
         coresys,
         {"name": "str", "password": "password", "input": "device"},
         MOCK_ADDON_NAME,
         MOCK_ADDON_SLUG,
     )({"name": "Pascal", "password": "1234", "input": "/dev/serial/by-id/xyx"})
-    assert data["input"] == "/dev/ttyUSB0"
+    assert data["input"] == "/dev/serial/by-id/xyx"
 
     assert AddonOptions(
         coresys,