Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion homeassistant/components/ai_task/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,6 @@ class ImageView(HomeAssistantView):

url = f"/api/{DOMAIN}/images/{{filename}}"
name = f"api:{DOMAIN}/images"
requires_auth = False

async def get(
self,
Expand Down
13 changes: 11 additions & 2 deletions homeassistant/components/ai_task/media_source.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

from __future__ import annotations

from datetime import timedelta
import logging

from homeassistant.components.http.auth import async_sign_path
from homeassistant.components.media_player import BrowseError, MediaClass
from homeassistant.components.media_source import (
BrowseMediaSource,
Expand All @@ -14,7 +16,7 @@
)
from homeassistant.core import HomeAssistant

from .const import DATA_IMAGES, DOMAIN
from .const import DATA_IMAGES, DOMAIN, IMAGE_EXPIRY_TIME

_LOGGER = logging.getLogger(__name__)

Expand Down Expand Up @@ -43,7 +45,14 @@ async def async_resolve_media(self, item: MediaSourceItem) -> PlayMedia:
if image is None:
raise Unresolvable(f"Could not resolve media item: {item.identifier}")

return PlayMedia(f"/api/{DOMAIN}/images/{item.identifier}", image.mime_type)
return PlayMedia(
async_sign_path(
self.hass,
f"/api/{DOMAIN}/images/{item.identifier}",
timedelta(seconds=IMAGE_EXPIRY_TIME or 1800),
),
image.mime_type,
)

async def async_browse_media(
self,
Expand Down
9 changes: 7 additions & 2 deletions homeassistant/components/ai_task/task.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from __future__ import annotations

from dataclasses import dataclass
from datetime import datetime
from datetime import datetime, timedelta
from functools import partial
import mimetypes
from pathlib import Path
Expand All @@ -13,6 +13,7 @@
import voluptuous as vol

from homeassistant.components import camera, conversation, media_source
from homeassistant.components.http.auth import async_sign_path
from homeassistant.core import HomeAssistant, ServiceResponse, callback
from homeassistant.exceptions import HomeAssistantError
from homeassistant.helpers.chat_session import ChatSession, async_get_chat_session
Expand Down Expand Up @@ -239,7 +240,11 @@ def _purge_image(filename: str, now: datetime) -> None:
if IMAGE_EXPIRY_TIME > 0:
async_call_later(hass, IMAGE_EXPIRY_TIME, partial(_purge_image, filename))

service_result["url"] = get_url(hass) + f"/api/{DOMAIN}/images/{filename}"
service_result["url"] = get_url(hass) + async_sign_path(
hass,
f"/api/{DOMAIN}/images/{filename}",
timedelta(seconds=IMAGE_EXPIRY_TIME or 1800),
)
service_result["media_source_id"] = f"media-source://{DOMAIN}/images/{filename}"

return service_result
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/ecowitt/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"dependencies": ["webhook"],
"documentation": "https://www.home-assistant.io/integrations/ecowitt",
"iot_class": "local_push",
"requirements": ["aioecowitt==2025.9.0"]
"requirements": ["aioecowitt==2025.9.1"]
}
4 changes: 2 additions & 2 deletions homeassistant/components/volvooncall/strings.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"username": "[%key:common::config_flow::data::username%]",
"password": "[%key:common::config_flow::data::password%]",
"region": "Region",
"unit_system": "Unit System",
"mutable": "Allow Remote Start / Lock / etc."
"unit_system": "Unit system",
"mutable": "Allow remote start/lock etc."
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion requirements_all.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion requirements_test_all.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tests/components/ai_task/test_media_source.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ async def test_resolving(
hass, f"media-source://ai_task/{image_id}", None
)
assert item is not None
assert item.url == f"/api/ai_task/images/{image_id}"
assert item.url.startswith(f"/api/ai_task/images/{image_id}?authSig=")
assert item.mime_type == "image/png"

invalid_id = "aabbccddeeff"
Expand Down
8 changes: 3 additions & 5 deletions tests/components/ai_task/test_task.py
Original file line number Diff line number Diff line change
Expand Up @@ -237,9 +237,7 @@ async def test_generate_data_mixed_attachments(
hass,
dt_util.utcnow() + chat_session.CONVERSATION_TIMEOUT + timedelta(seconds=1),
)
await hass.async_block_till_done() # Need several iterations
await hass.async_block_till_done() # because one iteration of the loop
await hass.async_block_till_done() # simply schedules the cleanup
await hass.async_block_till_done(wait_background_tasks=True)

# Verify the temporary file cleaned up
assert not camera_attachment.path.exists()
Expand Down Expand Up @@ -281,7 +279,7 @@ async def test_generate_image(
assert result["media_source_id"].startswith("media-source://ai_task/images/")
assert result["media_source_id"].endswith("_test_task.png")
assert result["url"].startswith("http://10.10.10.10:8123/api/ai_task/images/")
assert result["url"].endswith("_test_task.png")
assert result["url"].count("_test_task.png?authSig=") == 1
assert result["mime_type"] == "image/png"
assert result["model"] == "mock_model"
assert result["revised_prompt"] == "mock_revised_prompt"
Expand Down Expand Up @@ -333,7 +331,7 @@ async def test_image_cleanup(
instructions="Test prompt",
)

assert result["url"].split("/")[-1] in image_storage
assert result["url"].split("?authSig=")[0].split("/")[-1] in image_storage
assert len(image_storage) == 20

async_fire_time_changed(hass, dt_util.utcnow() + timedelta(hours=1, seconds=1))
Expand Down
Loading