aiohttp 3.10.2 (#2158)

* aiohttp 3.10.2 * Fixing pylint errors --------- Co-authored-by: tracyboehrer <[email protected]>
microsoft · Sep 3, 2024 · b802535 · b802535
1 parent 86673e2
commit b802535
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 11 deletions.
diff --git a/libraries/botbuilder-ai/botbuilder/ai/qna/qnamaker.py b/libraries/botbuilder-ai/botbuilder/ai/qna/qnamaker.py
@@ -1,6 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
+import asyncio
 import json
 from typing import Dict, List, NamedTuple, Union
 from aiohttp import ClientSession, ClientTimeout
@@ -52,8 +53,16 @@ def __init__(
         opt = options or QnAMakerOptions()
         self._validate_options(opt)
 
+        try:
+            loop = asyncio.get_running_loop()
+        except RuntimeError:
+            loop = asyncio.new_event_loop()
+            asyncio.set_event_loop(loop)
+
         instance_timeout = ClientTimeout(total=opt.timeout / 1000)
-        self._http_client = http_client or ClientSession(timeout=instance_timeout)
+        self._http_client = http_client or ClientSession(
+            timeout=instance_timeout, loop=loop
+        )
 
         self.telemetry_client: Union[BotTelemetryClient, NullTelemetryClient] = (
             telemetry_client or NullTelemetryClient()

diff --git a/libraries/botbuilder-ai/setup.py b/libraries/botbuilder-ai/setup.py
@@ -8,7 +8,7 @@
     "azure-cognitiveservices-language-luis==0.2.0",
     "botbuilder-schema==4.17.0",
     "botbuilder-core==4.17.0",
-    "aiohttp==3.9.5",
+    "aiohttp==3.10.2",
 ]
 
 TESTS_REQUIRES = ["aiounittest>=1.1.0"]

diff --git a/...er-applicationinsights/botbuilder/applicationinsights/flask/flask_telemetry_middleware.py b/...er-applicationinsights/botbuilder/applicationinsights/flask/flask_telemetry_middleware.py
@@ -38,6 +38,8 @@ def __call__(self, environ, start_response):
 
     def process_request(self, environ) -> bool:
         """Process the incoming Flask request."""
+        body_unicode = None
+
         # Bot Service doesn't handle anything over 256k
         length = int(environ.get("CONTENT_LENGTH", "0"))
         if length > 256 * 1024:

diff --git a/libraries/botbuilder-dialogs/botbuilder/dialogs/choices/choice_factory.py b/libraries/botbuilder-dialogs/botbuilder/dialogs/choices/choice_factory.py
@@ -46,8 +46,7 @@ def for_channel(
             else:
                 size = len(choice.value)
 
-            if size > max_title_length:
-                max_title_length = size
+            max_title_length = max(max_title_length, size)
 
         # Determine list style
         supports_suggested_actions = Channel.supports_suggested_actions(

diff --git a/libraries/botbuilder-dialogs/botbuilder/dialogs/dialog.py b/libraries/botbuilder-dialogs/botbuilder/dialogs/dialog.py
@@ -176,7 +176,6 @@ def _register_source_location(
         Registers a SourceRange in the provided location.
         :param path: The path to the source file.
         :param line_number: The line number where the source will be located on the file.
-        :return:
         """
         if path:
             # This will be added when debbuging support is ported.
@@ -185,4 +184,4 @@ def _register_source_location(
             #     start_point = SourcePoint(line_index = line_number, char_index = 0 ),
             #     end_point = SourcePoint(line_index = line_number + 1, char_index = 0 ),
             # )
-            return
+            pass
diff --git a/...uilder-integration-aiohttp/botbuilder/integration/aiohttp/streaming/aiohttp_web_socket.py b/...uilder-integration-aiohttp/botbuilder/integration/aiohttp/streaming/aiohttp_web_socket.py
@@ -40,6 +40,8 @@ async def receive(self) -> WebSocketMessage:
         try:
             message = await self._aiohttp_ws.receive()
 
+            message_data = None
+
             if message.type == WSMsgType.TEXT:
                 message_data = list(str(message.data).encode("ascii"))
             elif message.type == WSMsgType.BINARY:

diff --git a/libraries/botbuilder-integration-aiohttp/setup.py b/libraries/botbuilder-integration-aiohttp/setup.py
@@ -10,7 +10,7 @@
     "botframework-connector==4.17.0",
     "botbuilder-core==4.17.0",
     "yarl>=1.8.1",
-    "aiohttp==3.9.5",
+    "aiohttp==3.10.2",
 ]
 
 root = os.path.abspath(os.path.dirname(__file__))

diff --git a/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py b/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py
@@ -6,7 +6,7 @@
 
 REQUIRES = [
     "applicationinsights>=0.11.9",
-    "aiohttp==3.9.5",
+    "aiohttp==3.10.2",
     "botbuilder-schema==4.17.0",
     "botframework-connector==4.17.0",
     "botbuilder-core==4.17.0",

diff --git a/libraries/botbuilder-schema/botbuilder/schema/_models_py3.py b/libraries/botbuilder-schema/botbuilder/schema/_models_py3.py
@@ -641,7 +641,7 @@ def create_reply(self, text: str = None, locale: str = None):
             ),
             reply_to_id=(
                 self.id
-                if not type == ActivityTypes.conversation_update
+                if type != ActivityTypes.conversation_update
                 or self.channel_id not in ["directline", "webchat"]
                 else None
             ),
@@ -688,7 +688,7 @@ def create_trace(
             ),
             reply_to_id=(
                 self.id
-                if not type == ActivityTypes.conversation_update
+                if type != ActivityTypes.conversation_update
                 or self.channel_id not in ["directline", "webchat"]
                 else None
             ),
@@ -749,7 +749,7 @@ def get_conversation_reference(self):
         return ConversationReference(
             activity_id=(
                 self.id
-                if not type == ActivityTypes.conversation_update
+                if type != ActivityTypes.conversation_update
                 or self.channel_id not in ["directline", "webchat"]
                 else None
             ),