Merge branch 'main' into dependabot/pip/libraries/botbuilder-core/pip-2b31a88a5d

Author: tracyboehrer

libraries/botbuilder-ai/botbuilder/ai/luis/activity_util.py

@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-from datetime import datetime
+from datetime import datetime, timezone
 
 from botbuilder.schema import (
     Activity,
@@ -51,7 +51,7 @@ def create_trace(
 
         reply = Activity(
             type=ActivityTypes.trace,
-            timestamp=datetime.utcnow(),
+            timestamp=datetime.now(timezone.utc),
             from_property=from_property,
             recipient=ChannelAccount(
                 id=turn_activity.from_property.id, name=turn_activity.from_property.name

libraries/botbuilder-ai/tests/qna/test_qna.py

@@ -347,8 +347,6 @@ async def test_trace_test(self):
                 self._knowledge_base_id, trace_activity.value.knowledge_base_id
             )
 
-            return result
-
     async def test_returns_answer_with_timeout(self):
         question: str = "how do I clean the stove?"
         options = QnAMakerOptions(timeout=999999)
@@ -823,7 +821,7 @@ async def test_call_train(self):
             QnAMaker, "call_train", return_value=None
         ) as mocked_call_train:
             qna = QnAMaker(QnaApplicationTest.tests_endpoint)
-            qna.call_train(feedback_records)
+            await qna.call_train(feedback_records)
 
             mocked_call_train.assert_called_once_with(feedback_records)
 

libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/processor/telemetry_processor.py

@@ -3,7 +3,7 @@
 import base64
 import json
 from abc import ABC, abstractmethod
-from _sha256 import sha256
+from hashlib import sha256
 
 
 class TelemetryProcessor(ABC):

libraries/botbuilder-applicationinsights/setup.py

@@ -12,7 +12,7 @@
 ]
 TESTS_REQUIRES = [
     "aiounittest==1.3.0",
-    "django==3.2.24",  # For samples
+    "django==4.2.15",  # For samples
     "djangorestframework==3.14.0",  # For samples
     "flask==2.2.5",  # For samples
 ]

libraries/botbuilder-core/botbuilder/core/adapters/test_adapter.py

@@ -8,7 +8,7 @@
 import asyncio
 import inspect
 import uuid
-from datetime import datetime
+from datetime import datetime, timezone
 from uuid import uuid4
 from typing import Awaitable, Coroutine, Dict, List, Callable, Union
 from copy import copy
@@ -155,7 +155,7 @@ async def process_activity(
         finally:
             self._conversation_lock.release()
 
-        activity.timestamp = activity.timestamp or datetime.utcnow()
+        activity.timestamp = activity.timestamp or datetime.now(timezone.utc)
         await self.run_pipeline(self.create_turn_context(activity), logic)
 
     async def send_activities(

libraries/botbuilder-core/botbuilder/core/inspection/trace_activity.py

@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Dict, Union
 
 from botbuilder.core import BotState
@@ -11,7 +11,7 @@
 def make_command_activity(command: str) -> Activity:
     return Activity(
         type=ActivityTypes.trace,
-        timestamp=datetime.utcnow(),
+        timestamp=datetime.now(timezone.utc),
         name="Command",
         label="Command",
         value=command,
@@ -22,7 +22,7 @@ def make_command_activity(command: str) -> Activity:
 def from_activity(activity: Activity, name: str, label: str) -> Activity:
     return Activity(
         type=ActivityTypes.trace,
-        timestamp=datetime.utcnow(),
+        timestamp=datetime.now(timezone.utc),
         name=name,
         label=label,
         value=activity,
@@ -33,7 +33,7 @@ def from_activity(activity: Activity, name: str, label: str) -> Activity:
 def from_state(bot_state: Union[BotState, Dict]) -> Activity:
     return Activity(
         type=ActivityTypes.trace,
-        timestamp=datetime.utcnow(),
+        timestamp=datetime.now(timezone.utc),
         name="Bot State",
         label="BotState",
         value=bot_state,

libraries/botbuilder-core/botbuilder/core/transcript_logger.py

@@ -2,7 +2,7 @@
 # Licensed under the MIT License.
 """Logs incoming and outgoing activities to a TranscriptStore.."""
 
-import datetime
+from datetime import datetime, timezone
 import copy
 import random
 import string
@@ -86,11 +86,11 @@ async def send_activities_handler(
                     prefix = "g_" + "".join(
                         random.choice(alphanumeric) for i in range(5)
                     )
-                    epoch = datetime.datetime.utcfromtimestamp(0)
+                    epoch = datetime.fromtimestamp(0, timezone.utc)
                     if cloned_activity.timestamp:
                         reference = cloned_activity.timestamp
                     else:
-                        reference = datetime.datetime.today()
+                        reference = datetime.now(timezone.utc)
                     delta = (reference - epoch).total_seconds() * 1000
                     cloned_activity.id = f"{prefix}{delta}"
                 await self.log_activity(transcript, cloned_activity)

libraries/botbuilder-core/botbuilder/core/turn_context.py

@@ -3,7 +3,7 @@
 
 import re
 from copy import copy, deepcopy
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import List, Callable, Union, Dict
 from botframework.connector import Channels
 from botbuilder.schema import (
@@ -308,7 +308,7 @@ async def send_trace_activity(
     ) -> ResourceResponse:
         trace_activity = Activity(
             type=ActivityTypes.trace,
-            timestamp=datetime.utcnow(),
+            timestamp=datetime.now(timezone.utc),
             name=name,
             value=value,
             value_type=value_type,

libraries/botbuilder-dialogs/botbuilder/dialogs/prompts/oauth_prompt.py

@@ -420,7 +420,11 @@ async def _recognize_token(
                 )
 
         elif OAuthPrompt._is_teams_verification_invoke(context):
-            code = context.activity.value["state"]
+            code = (
+                context.activity.value.get("state", None)
+                if context.activity.value
+                else None
+            )
             try:
                 token = await _UserTokenAccess.get_user_token(
                     context, self._settings, code

libraries/botbuilder-schema/botbuilder/schema/_models_py3.py

@@ -4,7 +4,7 @@
 from typing import List
 
 from botbuilder.schema._connector_client_enums import ActivityTypes
-from datetime import datetime
+from datetime import datetime, timezone
 from enum import Enum
 from msrest.serialization import Model
 from msrest.exceptions import HttpOperationError
@@ -630,7 +630,7 @@ def create_reply(self, text: str = None, locale: str = None):
         """
         return Activity(
             type=ActivityTypes.message,
-            timestamp=datetime.utcnow(),
+            timestamp=datetime.now(timezone.utc),
             from_property=ChannelAccount(
                 id=self.recipient.id if self.recipient else None,
                 name=self.recipient.name if self.recipient else None,
@@ -677,7 +677,7 @@ def create_trace(
 
         return Activity(
             type=ActivityTypes.trace,
-            timestamp=datetime.utcnow(),
+            timestamp=datetime.now(timezone.utc),
             from_property=ChannelAccount(
                 id=self.recipient.id if self.recipient else None,
                 name=self.recipient.name if self.recipient else None,