Improving ConnectorClient and UserTokenClient error handling

libraries/microsoft-agents-hosting-core/microsoft_agents/hosting/core/connector/_utils.py

@@ -0,0 +1,27 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+from logging import Logger
+
+import aiohttp
+
+
+def _handle_request_error(
+    logger: Logger, response: aiohttp.ClientResponse, resource: str = "resource"
+) -> None:
+
+    if response.status == 400:
+        logger.error("Bad request for '%s': %s", resource, response.status)
+    else:
+        logger.error("Error accessing '%s': %s", resource, response.status)
+
+    if not response.ok:
+        response.raise_for_status()
+
+    raise aiohttp.ClientResponseError(
+        response.request_info,
+        response.history,
+        status=response.status,
+        message=f"Error accessing resource '{resource}'",
+        headers=response.headers,
+    )

libraries/microsoft-agents-hosting-core/microsoft_agents/hosting/core/connector/client/agent_sign_in.py

@@ -7,6 +7,7 @@
 from microsoft_agents.activity import SignInResource
 from ..telemetry import user_token_client_spans as spans
 from ..agent_sign_in_base import AgentSignInBase
+from .._utils import _handle_request_error
 from ._base_client import _BaseClient
 
 logger = logging.getLogger(__name__)
@@ -60,9 +61,10 @@ async def get_sign_in_url(
         async with self._wrapped_client().get(
             "api/agentsignin/getSignInUrl", params=params
         ) as response:
-            if response.status >= 300:
-                logger.error("Error getting sign-in URL: %s", response.status)
-                response.raise_for_status()
+            if response.status != 200:
+                _handle_request_error(
+                    logger, response, resource="api/agentsignin/getSignInUrl"
+                )
 
             return await response.text()
 
@@ -100,9 +102,10 @@ async def get_sign_in_resource(
                 "api/botsignin/getSignInResource", params=params
             ) as response:
                 span.share(http_method="GET", status_code=response.status)
-                if response.status >= 300:
-                    logger.error("Error getting sign-in resource: %s", response.status)
-                    response.raise_for_status()
+                if response.status != 200:
+                    _handle_request_error(
+                        logger, response, resource="api/botsignin/getSignInResource"
+                    )
 
                 data = await response.json()
                 return SignInResource.model_validate(data)