Merge branch 'master' into removePayments

Author: tracyboehrer

libraries/botbuilder-azure/botbuilder/azure/blob_storage.py

@@ -73,7 +73,11 @@ async def write(self, changes: Dict[str, object]):
         )
 
         for (name, item) in changes.items():
-            e_tag = item.e_tag if hasattr(item, "e_tag") else item.get("e_tag", None)
+            e_tag = None
+            if isinstance(item, dict):
+                e_tag = item.get("e_tag", None)
+            elif hasattr(item, "e_tag"):
+                e_tag = item.e_tag
             e_tag = None if e_tag == "*" else e_tag
             if e_tag == "":
                 raise Exception("blob_storage.write(): etag missing")

libraries/botbuilder-azure/botbuilder/azure/cosmosdb_partitioned_storage.py

@@ -150,7 +150,11 @@ async def write(self, changes: Dict[str, object]):
         await self.initialize()
 
         for (key, change) in changes.items():
-            e_tag = change.get("e_tag", None)
+            e_tag = None
+            if isinstance(change, dict):
+                e_tag = change.get("e_tag", None)
+            elif hasattr(change, "e_tag"):
+                e_tag = change.e_tag
             doc = {
                 "id": CosmosDbKeyEscape.sanitize_key(
                     key, self.config.key_suffix, self.config.compatibility_mode

libraries/botbuilder-azure/botbuilder/azure/cosmosdb_storage.py

@@ -183,11 +183,11 @@ async def write(self, changes: Dict[str, object]):
                 # iterate over the changes
             for (key, change) in changes.items():
                 # store the e_tag
-                e_tag = (
-                    change.e_tag
-                    if hasattr(change, "e_tag")
-                    else change.get("e_tag", None)
-                )
+                e_tag = None
+                if isinstance(change, dict):
+                    e_tag = change.get("e_tag", None)
+                elif hasattr(change, "e_tag"):
+                    e_tag = change.e_tag
                 # create the new document
                 doc = {
                     "id": CosmosDbKeyEscape.sanitize_key(key),

libraries/botbuilder-core/botbuilder/core/bot_framework_adapter.py

@@ -172,7 +172,9 @@ async def create_conversation(
                 )
 
             # Create conversation
-            parameters = ConversationParameters(bot=reference.bot)
+            parameters = ConversationParameters(
+                bot=reference.bot, members=[reference.user], is_group=False
+            )
             client = await self.create_connector_client(reference.service_url)
 
             # Mix in the tenant ID if specified. This is required for MS Teams.

libraries/botbuilder-core/botbuilder/core/memory_storage.py

@@ -48,21 +48,21 @@ async def write(self, changes: Dict[str, StoreItem]):
                 # If it exists then we want to cache its original value from memory
                 if key in self.memory:
                     old_state = self.memory[key]
-                    if not isinstance(old_state, StoreItem):
+                    if isinstance(old_state, dict):
                         old_state_etag = old_state.get("e_tag", None)
-                    elif old_state.e_tag:
+                    elif hasattr(old_state, "e_tag"):
                         old_state_etag = old_state.e_tag
 
                 new_state = new_value
 
                 # Set ETag if applicable
-                new_value_etag = (
-                    new_value.e_tag
-                    if hasattr(new_value, "e_tag")
-                    else new_value.get("e_tag", None)
-                )
+                new_value_etag = None
+                if isinstance(new_value, dict):
+                    new_value_etag = new_value.get("e_tag", None)
+                elif hasattr(new_value, "e_tag"):
+                    new_value_etag = new_value.e_tag
                 if new_value_etag == "":
-                    raise Exception("blob_storage.write(): etag missing")
+                    raise Exception("memory_storage.write(): etag missing")
                 if (
                     old_state_etag is not None
                     and new_value_etag is not None

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

@@ -359,9 +359,11 @@ def remove_recipient_mention(activity: Activity) -> str:
     def remove_mention_text(activity: Activity, identifier: str) -> str:
         mentions = TurnContext.get_mentions(activity)
         for mention in mentions:
-            if mention.mentioned.id == identifier:
+            if mention.additional_properties["mentioned"]["id"] == identifier:
                 mention_name_match = re.match(
-                    r"<at(.*)>(.*?)<\/at>", mention.text, re.IGNORECASE
+                    r"<at(.*)>(.*?)<\/at>",
+                    mention.additional_properties["text"],
+                    re.IGNORECASE,
                 )
                 if mention_name_match:
                     activity.text = re.sub(

libraries/botbuilder-core/tests/test_inspection_middleware.py

@@ -14,7 +14,7 @@
 )
 from botbuilder.core.adapters import TestAdapter
 from botbuilder.core.inspection import InspectionMiddleware, InspectionState
-from botbuilder.schema import Activity, ActivityTypes, ChannelAccount, Mention
+from botbuilder.schema import Activity, ActivityTypes, ChannelAccount, Entity, Mention
 
 
 class TestConversationState(aiounittest.AsyncTestCase):
@@ -249,10 +249,12 @@ async def exec_test2(turn_context):
                 text=attach_command,
                 recipient=ChannelAccount(id=recipient_id),
                 entities=[
-                    Mention(
-                        type="mention",
-                        text=f"<at>{recipient_id}</at>",
-                        mentioned=ChannelAccount(name="Bot", id=recipient_id),
+                    Entity().deserialize(
+                        Mention(
+                            type="mention",
+                            text=f"<at>{recipient_id}</at>",
+                            mentioned=ChannelAccount(name="Bot", id=recipient_id),
+                        ).serialize()
                     )
                 ],
             )

libraries/botbuilder-core/tests/test_turn_context.py

@@ -9,6 +9,7 @@
     ActivityTypes,
     ChannelAccount,
     ConversationAccount,
+    Entity,
     Mention,
     ResourceResponse,
 )
@@ -309,10 +310,12 @@ def test_should_remove_at_mention_from_activity(self):
             text="<at>TestOAuth619</at> test activity",
             recipient=ChannelAccount(id="TestOAuth619"),
             entities=[
-                Mention(
-                    type="mention",
-                    text="<at>TestOAuth619</at>",
-                    mentioned=ChannelAccount(name="Bot", id="TestOAuth619"),
+                Entity().deserialize(
+                    Mention(
+                        type="mention",
+                        text="<at>TestOAuth619</at>",
+                        mentioned=ChannelAccount(name="Bot", id="TestOAuth619"),
+                    ).serialize()
                 )
             ],
         )