Bump azure-servicebus to support py3.10 (#76092)

Bump azure-servicebus
This commit is contained in:
Heine Furubotten 2022-08-03 10:31:09 +02:00 committed by GitHub
parent 1ee4445a7b
commit 651928ee0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 13 deletions

View File

@ -2,7 +2,7 @@
"domain": "azure_service_bus", "domain": "azure_service_bus",
"name": "Azure Service Bus", "name": "Azure Service Bus",
"documentation": "https://www.home-assistant.io/integrations/azure_service_bus", "documentation": "https://www.home-assistant.io/integrations/azure_service_bus",
"requirements": ["azure-servicebus==0.50.3"], "requirements": ["azure-servicebus==7.8.0"],
"codeowners": ["@hfurubotten"], "codeowners": ["@hfurubotten"],
"iot_class": "cloud_push", "iot_class": "cloud_push",
"loggers": ["azure"] "loggers": ["azure"]

View File

@ -2,11 +2,12 @@
import json import json
import logging import logging
from azure.servicebus.aio import Message, ServiceBusClient from azure.servicebus import ServiceBusMessage
from azure.servicebus.common.errors import ( from azure.servicebus.aio import ServiceBusClient
MessageSendFailed, from azure.servicebus.exceptions import (
MessagingEntityNotFoundError,
ServiceBusConnectionError, ServiceBusConnectionError,
ServiceBusResourceNotFound, ServiceBusError,
) )
import voluptuous as vol import voluptuous as vol
@ -60,10 +61,10 @@ def get_service(hass, config, discovery_info=None):
try: try:
if queue_name: if queue_name:
client = servicebus.get_queue(queue_name) client = servicebus.get_queue_sender(queue_name)
else: else:
client = servicebus.get_topic(topic_name) client = servicebus.get_topic_sender(topic_name)
except (ServiceBusConnectionError, ServiceBusResourceNotFound) as err: except (ServiceBusConnectionError, MessagingEntityNotFoundError) as err:
_LOGGER.error( _LOGGER.error(
"Connection error while creating client for queue/topic '%s'. %s", "Connection error while creating client for queue/topic '%s'. %s",
queue_name or topic_name, queue_name or topic_name,
@ -93,11 +94,12 @@ class ServiceBusNotificationService(BaseNotificationService):
if data := kwargs.get(ATTR_DATA): if data := kwargs.get(ATTR_DATA):
dto.update(data) dto.update(data)
queue_message = Message(json.dumps(dto)) queue_message = ServiceBusMessage(
queue_message.properties.content_type = CONTENT_TYPE_JSON json.dumps(dto), content_type=CONTENT_TYPE_JSON
)
try: try:
await self._client.send(queue_message) await self._client.send_messages(queue_message)
except MessageSendFailed as err: except ServiceBusError as err:
_LOGGER.error( _LOGGER.error(
"Could not send service bus notification to %s. %s", "Could not send service bus notification to %s. %s",
self._client.name, self._client.name,

View File

@ -378,7 +378,7 @@ axis==44
azure-eventhub==5.7.0 azure-eventhub==5.7.0
# homeassistant.components.azure_service_bus # homeassistant.components.azure_service_bus
azure-servicebus==0.50.3 azure-servicebus==7.8.0
# homeassistant.components.baidu # homeassistant.components.baidu
baidu-aip==1.6.6 baidu-aip==1.6.6