Fix ai_task camera snapshot mime type (#172682)

homeassistant/components/ai_task/task.py

@@ -72,8 +72,7 @@ async def _resolve_attachments(
             resolved_attachments.append(
                 conversation.Attachment(
                     media_content_id=media_content_id,
-                    mime_type=attachment.get("media_content_type")
-                    or image_data.content_type,
+                    mime_type=image_data.content_type,
                     path=temp_filename,
                 )
             )

tests/components/ai_task/test_task.py

@@ -286,37 +286,20 @@ async def test_generate_data_content_type(
     mock_ai_task_entity: MockAITaskEntity,
 ) -> None:
     """Test that user-provided content type of an attachment is respected."""
-    with (
-        patch(  # Intentionally broken content type
-            "homeassistant.components.camera.async_get_image",
-            return_value=Image(content_type="image/png", content=b"fake_camera_jpeg"),
-        ) as mock_get_camera_image,
-        patch(  # Same
-            "homeassistant.components.image.async_get_image",
-            return_value=Image(content_type="image/png", content=b"fake_image_jpeg"),
-        ) as mock_get_image_image,
-        patch(
-            "homeassistant.components.media_source.async_resolve_media",
-            return_value=media_source.PlayMedia(
-                url="http://example.com/test.png",  # jpeg image saved as png
-                mime_type="image/png",
-                path=Path("/media/test.png"),
-            ),
-        ) as mock_resolve_media,
-    ):
+    with patch(
+        "homeassistant.components.media_source.async_resolve_media",
+        return_value=media_source.PlayMedia(
+            url="http://example.com/test.png",  # jpeg image saved as png
+            mime_type="image/png",
+            path=Path("/media/test.png"),
+        ),
+    ) as mock_resolve_media:
         await async_generate_data(
             hass,
             task_name="Test Task",
             entity_id=TEST_ENTITY_ID,
-            instructions="Describe these images",
+            instructions="Describe this image",
             attachments=[
-                {  # supply corrected content type from the user input
-                    "media_content_id": "media-source://camera/camera.front_door",
-                    "media_content_type": "image/jpeg",
-                },
-                {  # User did not provide content type, fallback to the integration
-                    "media_content_id": "media-source://image/image.floorplan",
-                },
                 {
                     "media_content_id": "media-source://media_player/test.png",
                     "media_content_type": "image/jpeg",
@@ -324,9 +307,7 @@ async def test_generate_data_content_type(
             ],
         )
 
-    # Verify both methods were called
-    mock_get_camera_image.assert_called_once_with(hass, "camera.front_door")
-    mock_get_image_image.assert_called_once_with(hass, "image.floorplan")
+    # Verify the method was called
     mock_resolve_media.assert_called_once_with(
         hass, "media-source://media_player/test.png", None
     )
@@ -335,47 +316,9 @@ async def test_generate_data_content_type(
     assert len(mock_ai_task_entity.mock_generate_data_tasks) == 1
     task = mock_ai_task_entity.mock_generate_data_tasks[0]
     assert task.attachments is not None
-    assert len(task.attachments) == 3
+    assert len(task.attachments) == 1
 
-    # Check camera attachment
-    camera_attachment = task.attachments[0]
-    assert (
-        camera_attachment.media_content_id == "media-source://camera/camera.front_door"
-    )
-    assert camera_attachment.mime_type == "image/jpeg"
-    assert isinstance(camera_attachment.path, Path)
-    assert camera_attachment.path.suffix == ".png"  # This is fine
-
-    # Verify camera snapshot content
-    assert camera_attachment.path.exists()
-    content = await hass.async_add_executor_job(camera_attachment.path.read_bytes)
-    assert content == b"fake_camera_jpeg"
-
-    # Check image attachment
-    image_attachment = task.attachments[1]
-    assert image_attachment.media_content_id == "media-source://image/image.floorplan"
-    assert image_attachment.mime_type == "image/png"
-    assert isinstance(image_attachment.path, Path)
-    assert image_attachment.path.suffix == ".png"
-
-    # Verify image snapshot content
-    assert image_attachment.path.exists()
-    content = await hass.async_add_executor_job(image_attachment.path.read_bytes)
-    assert content == b"fake_image_jpeg"
-
-    # Trigger clean up
-    async_fire_time_changed(
-        hass,
-        dt_util.utcnow() + chat_session.CONVERSATION_TIMEOUT + timedelta(seconds=1),
-    )
-    await hass.async_block_till_done(wait_background_tasks=True)
-
-    # Verify the temporary file cleaned up
-    assert not camera_attachment.path.exists()
-    assert not image_attachment.path.exists()
-
-    # Check regular media attachment
-    media_attachment = task.attachments[2]
+    media_attachment = task.attachments[0]
     assert media_attachment.media_content_id == "media-source://media_player/test.png"
     assert media_attachment.mime_type == "image/jpeg"
     assert media_attachment.path == Path("/media/test.png")