[pull] dev from home-assistant:dev

homeassistant/components/airgradient/const.py

@@ -71,6 +71,11 @@ class ModelCapabilities:
  }
 )
 
+OUTDOOR_CAPABILITIES = ModelCapabilities(
+ config=COMMON_LEGACY_CONFIG,
+ actions=frozenset({CO2_CALIBRATION}),
+)
+
 MODEL_CAPABILITIES: tuple[tuple[str, ModelCapabilities], ...] = (
  (
  "I-9PSL",
@@ -86,13 +91,8 @@ class ModelCapabilities:
  actions=frozenset({CO2_CALIBRATION, LED_BAR_TEST}),
  ),
  ),
- (
- "O-1",
- ModelCapabilities(
- config=COMMON_LEGACY_CONFIG,
- actions=frozenset({CO2_CALIBRATION}),
- ),
- ),
+ ("O-1", OUTDOOR_CAPABILITIES),
+ ("0-1PS", OUTDOOR_CAPABILITIES),
  (
  "DIY",
  ModelCapabilities(

homeassistant/components/alexa_devices/coordinator.py

@@ -1,5 +1,6 @@
 """Support for Alexa Devices."""
 
+fromasyncioimportLock
 fromcollections.abcimportAsyncGenerator
 fromcontextlibimportasynccontextmanager
 fromdatetimeimporttimedelta
@@ -167,6 +168,7 @@ def __init__(
  }
 
 self._todo_list_items: dict[str, dict[str, AmazonListItem]] = {}
+self._todo_refresh_lock=Lock()
 self.api.on_todo_event.append(self.todo_event_handler)
 self.api.on_todo_event.freeze()
 
@@ -308,23 +310,45 @@ async def sync_todo_list_items(self) -> None:
 todo_list.id
  ] =awaitself.api.get_todo_list_items(todo_list.id)
 
+asyncdefrefresh_todo_list_items(self, list_id: str) ->None:
+"""Refresh the cached items of a single to-do list.
+
+ Cached items are otherwise only filled by the initial sync and by
+ pushed events, so a write of our own needs a pull to become visible.
+
+ The pulls are serialized, as an older answer landing last would leave
+ the cache behind with nothing to repair it.
+ """
+asyncwithself._todo_refresh_lock, alexa_api_call(self):
+self._todo_list_items[list_id] =awaitself.api.get_todo_list_items(list_id)
+
+# Reading the list back proves the API answers again
+self.last_update_success=True
+
+self.async_update_listeners()
+
 asyncdeftodo_event_handler(self, list_event: AmazonListEvent) ->None:
-"""Handle changes on To-Do lists."""
-iflist_event.type==AmazonListEventType.DELETED:
-self._todo_list_items.get(list_event.list_id, {}).pop(
-list_event.item_id, None
- )
-elif (
-list_event.type
-in (AmazonListEventType.UPDATED, AmazonListEventType.CREATED)
- ) andlist_event.items:
-iflist_event.list_idnotinself._todo_list_items:
-# List was newly created after initial sync
-self._todo_list_items[list_event.list_id] = {}
-
-self._todo_list_items[list_event.list_id][list_event.item_id] = (
-list_event.items
- )
+"""Handle changes on To-Do lists.
+
+ Takes the refresh lock, so an event arriving while a list is being
+ read back is applied on top of that read instead of under it.
+ """
+asyncwithself._todo_refresh_lock:
+iflist_event.type==AmazonListEventType.DELETED:
+self._todo_list_items.get(list_event.list_id, {}).pop(
+list_event.item_id, None
+ )
+elif (
+list_event.type
+in (AmazonListEventType.UPDATED, AmazonListEventType.CREATED)
+ ) andlist_event.items:
+iflist_event.list_idnotinself._todo_list_items:
+# List was newly created after initial sync
+self._todo_list_items[list_event.list_id] = {}
+
+self._todo_list_items[list_event.list_id][list_event.item_id] = (
+list_event.items
+ )
 
 self.async_update_listeners()
 

homeassistant/components/alexa_devices/todo.py

@@ -126,32 +126,38 @@ async def async_create_todo_item(self, item: TodoItem) -> None:
  self._list.name,
  )
 
+ await self.coordinator.refresh_todo_list_items(self._list.id)
+
  @override
  async def async_delete_todo_items(self, uids: list[str]) -> None:
  """Delete items from the to-do list."""
  LOGGER.debug("Called async_delete_todo_items for %s item(s)", len(uids))
 
  list_items_lookup = self.coordinator.todo_list_items[self._list.id]
 
- for uid in uids:
- existing_item = list_items_lookup[uid]
+ try:
+ for uid in uids:
+ existing_item = list_items_lookup[uid]
 
- LOGGER.debug(
- "Deleting item %s (ID: %s) with version %s",
- existing_item.name,
- uid,
- existing_item.version,
- )
- async with alexa_api_call(self.coordinator):
- await self.coordinator.api.delete_todo_list_item(
- self._list.id, uid, existing_item.version
+ LOGGER.debug(
+ "Deleting item %s (ID: %s) with version %s",
+ existing_item.name,
+ uid,
+ existing_item.version,
  )
- LOGGER.debug(
- "Successfully deleted item %s (ID: %s) with version %s",
- existing_item.name,
- uid,
- existing_item.version,
- )
+ async with alexa_api_call(self.coordinator):
+ await self.coordinator.api.delete_todo_list_item(
+ self._list.id, uid, existing_item.version
+ )
+ LOGGER.debug(
+ "Successfully deleted item %s (ID: %s) with version %s",
+ existing_item.name,
+ uid,
+ existing_item.version,
+ )
+ finally:
+ # A later delete can fail after an earlier one went through
+ await self.coordinator.refresh_todo_list_items(self._list.id)
 
  @override
  async def async_update_todo_item(self, item: TodoItem) -> None:
@@ -166,39 +172,53 @@ async def async_update_todo_item(self, item: TodoItem) -> None:
 
  existing_item = list_items_lookup[item.uid]
 
-if has_completed_changed := (
+ has_completed_changed = (
  existing_item.status == AmazonListItemStatus.COMPLETE
- ) != (item.status == TodoItemStatus.COMPLETED):
- # Update the checked status
- LOGGER.debug(
- "Updating item %s with checked status %s", item.uid, item.status
- )
+ ) != (item.status == TodoItemStatus.COMPLETED)
+ has_renamed = existing_item.name != item.summary
 
- async with alexa_api_call(self.coordinator):
- await self.coordinator.api.set_todo_list_item_checked_status(
- self._list.id,
- item.uid,
- item.status == TodoItemStatus.COMPLETED,
- existing_item.version,
+ if not has_completed_changed and not has_renamed:
+ return
+
+ try:
+ if has_completed_changed:
+ # Update the checked status
+ LOGGER.debug(
+ "Updating item %s with checked status %s", item.uid, item.status
  )
 
- LOGGER.debug(
- "Successfully updated item %s with checked status %s",
- item.uid,
- item.status,
- )
+ async with alexa_api_call(self.coordinator):
+ await self.coordinator.api.set_todo_list_item_checked_status(
+ self._list.id,
+ item.uid,
+ item.status == TodoItemStatus.COMPLETED,
+ existing_item.version,
+ )
+
+ LOGGER.debug(
+ "Successfully updated item %s with checked status %s",
+ item.uid,
+ item.status,
+ )
 
- if existing_item.name != item.summary:
- # Name has changed, update it
- LOGGER.debug("Updating item %s with new name %s", item.uid, item.summary)
+ if has_renamed:
+ # Name has changed, update it
+ LOGGER.debug(
+ "Updating item %s with new name %s", item.uid, item.summary
+ )
 
- # If both have changed -> Increase item version by 1
- version = existing_item.version + int(has_completed_changed)
+# If both have changed -> Increase item version by 1
+version = existing_item.version + int(has_completed_changed)
 
- async with alexa_api_call(self.coordinator):
- await self.coordinator.api.rename_todo_list_item(
- self._list.id, item.uid, item.summary, version
+ async with alexa_api_call(self.coordinator):
+ await self.coordinator.api.rename_todo_list_item(
+ self._list.id, item.uid, item.summary, version
+ )
+ LOGGER.debug(
+ "Successfully updated item %s with new name %s",
+ item.uid,
+ item.summary,
  )
- LOGGER.debug(
- "Successfully updated item %s with new name %s", item.uid, item.summary
- )
+finally:
+# A rename can fail after the status change went through
+await self.coordinator.refresh_todo_list_items(self._list.id)

homeassistant/components/aws_s3/__init__.py

@@ -3,6 +3,7 @@
 import logging
 from typing import cast
 
+from aiobotocore.config import AioConfig
 from aiobotocore.session import AioSession
 from botocore.exceptions import ClientError, ConnectionError, ParamValidationError
 
@@ -37,6 +38,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: S3ConfigEntry) -> bool:
  endpoint_url=data.get(CONF_ENDPOINT_URL),
  aws_secret_access_key=data[CONF_SECRET_ACCESS_KEY],
  aws_access_key_id=data[CONF_ACCESS_KEY_ID],
+ config=AioConfig(warm_up_loader_caches=True),
  ).__aenter__()
  await client.head_bucket(Bucket=data[CONF_BUCKET])
  except ClientError as err:

homeassistant/components/aws_s3/config_flow.py

@@ -3,6 +3,7 @@
 from typing import Any, override
 from urllib.parse import urlparse
 
+from aiobotocore.config import AioConfig
 from aiobotocore.session import AioSession
 from botocore.exceptions import ClientError, ConnectionError, ParamValidationError
 import voluptuous as vol
@@ -77,6 +78,7 @@ async def async_step_user(
  endpoint_url=user_input.get(CONF_ENDPOINT_URL),
  aws_secret_access_key=user_input[CONF_SECRET_ACCESS_KEY],
  aws_access_key_id=user_input[CONF_ACCESS_KEY_ID],
+ config=AioConfig(warm_up_loader_caches=True),
  ) as client:
  await client.head_bucket(Bucket=user_input[CONF_BUCKET])
  except ClientError:

homeassistant/components/besen/const.py

@@ -7,4 +7,4 @@
 DOMAIN: Final = "besen"
 NAME: Final = "Besen"
 
-PLATFORMS: Final = [Platform.SWITCH]
+PLATFORMS: Final = [Platform.SENSOR, Platform.SWITCH]

homeassistant/components/besen/manifest.json

@@ -14,5 +14,5 @@
  "integration_type": "device",
  "iot_class": "local_push",
  "quality_scale": "bronze",
- "requirements": ["besen==0.3.4"]
+ "requirements": ["besen==0.4.0"]
 }