Merge branch 'main' into releases/4.14

Author: Tracy Boehrer

.pylintrc

@@ -195,7 +195,9 @@ def test_logger(self):
         )
 
     def test_thrower(self):
-        """Tests that unhandled exceptions generate an exception telemetry item parented to the request telemetry item"""
+        """
+        Tests that unhandled exceptions generate an exception telemetry item parented to the request telemetry item
+        """
         response = self.invoke_post("thrower")
         self.assertEqual(response.status_code, 500)
 

libraries/botbuilder-applicationinsights/django_tests/tests.py

@@ -100,7 +100,7 @@ async def send_activities(
                         )
                     )
 
-            response = response or ResourceResponse(activity.id or "")
+            response = response or ResourceResponse(id=activity.id or "")
 
             responses.append(response)
 

libraries/botbuilder-core/botbuilder/core/cloud_adapter_base.py

@@ -5,6 +5,7 @@
 
 from aiohttp.web import (
     middleware,
+    HTTPException,
     HTTPNotImplemented,
     HTTPUnauthorized,
     HTTPNotFound,
@@ -27,6 +28,8 @@ async def aiohttp_error_middleware(request, handler):
         raise HTTPUnauthorized()
     except KeyError:
         raise HTTPNotFound()
+    except HTTPException:
+        raise
     except Exception:
         traceback.print_exc()
         raise HTTPInternalServerError()

libraries/botbuilder-core/botbuilder/core/integration/aiohttp_channel_service_exception_middleware.py

@@ -10,7 +10,7 @@
     teams_get_meeting_info,
     teams_get_channel_data,
 )
-from botbuilder.core import CloudAdapterBase, BotFrameworkAdapter, TurnContext
+from botbuilder.core import CloudAdapterBase, BotFrameworkAdapter, TurnContext, BotAdapter
 from botbuilder.schema import Activity, ConversationParameters, ConversationReference
 from botbuilder.schema.teams import (
     ChannelInfo,
@@ -318,10 +318,15 @@ def get_team_id(turn_context: TurnContext):
 
     @staticmethod
     async def _get_connector_client(turn_context: TurnContext) -> ConnectorClient:
-        return await turn_context.adapter.create_connector_client(
-            turn_context.activity.service_url
+        connector_client = turn_context.turn_state.get(
+            BotAdapter.BOT_CONNECTOR_CLIENT_KEY
         )
 
+        if connector_client is None:
+            raise ValueError('This method requires a connector client.')
+
+        return connector_client
+
     @staticmethod
     async def _get_members(
         connector_client: ConnectorClient, conversation_id: str

libraries/botbuilder-core/botbuilder/core/teams/teams_info.py

@@ -75,7 +75,7 @@ async def update_activity(self, context: TurnContext, activity: Activity):
         if self._call_on_update is not None:
             self._call_on_update(activity)
 
-        return ResourceResponse(activity.id)
+        return ResourceResponse(id=activity.id)
 
     async def process_request(self, activity, handler):
         context = TurnContext(self, activity)

libraries/botbuilder-core/tests/simple_adapter.py

@@ -76,7 +76,7 @@ async def update_activity(self, context: TurnContext, activity: Activity):
         if self._call_on_update is not None:
             self._call_on_update(activity)
 
-        return ResourceResponse(activity.id)
+        return ResourceResponse(id=activity.id)
 
     async def process_request(self, activity, handler):
         context = TurnContext(self, activity)

libraries/botbuilder-core/tests/teams/simple_adapter_with_create_conversation.py

@@ -592,6 +592,9 @@ async def test_on_teams_members_added_activity(self):
 
         turn_context = TurnContext(SimpleAdapter(), activity)
 
+        mock_connector_client = await SimpleAdapter.create_connector_client(self, turn_context.activity.service_url)
+        turn_context.turn_state[BotAdapter.BOT_CONNECTOR_CLIENT_KEY] = mock_connector_client
+
         # Act
         bot = TestingTeamsActivityHandler()
         await bot.on_turn(turn_context)

libraries/botbuilder-core/tests/teams/test_teams_activity_handler.py

@@ -29,7 +29,7 @@ def __init__(
 
     def dispose(self):
         if self._session:
-            asyncio.create_task(self._session.close())
+            task = asyncio.create_task(self._session.close())
 
     async def close(self, close_status: WebSocketCloseStatus, status_description: str):
         await self._aiohttp_ws.close(

libraries/botbuilder-integration-aiohttp/botbuilder/integration/aiohttp/streaming/aiohttp_web_socket.py

@@ -19,7 +19,7 @@ def retrieve_aiohttp_body():
 @middleware
 async def bot_telemetry_middleware(request, handler):
     """Process the incoming Flask request."""
-    if "application/json" in request.headers["Content-Type"]:
+    if "Content-Type" in request.headers and request.headers["Content-Type"] == "application/json":
         body = await request.json()
         _REQUEST_BODIES[current_thread().ident] = body