Merge branch upstream main into per_tenant_logging

Signed-off-by: Shaanjot Gill <gill.shaanjots@gmail.com>

aries_cloudagent/connections/models/conn_record.py

@@ -294,9 +294,9 @@ def record_value(self) -> dict:
     async def retrieve_by_did(
         cls,
         session: ProfileSession,
-        their_did: str = None,
-        my_did: str = None,
-        their_role: str = None,
+        their_did: Optional[str] = None,
+        my_did: Optional[str] = None,
+        their_role: Optional[str] = None,
     ) -> "ConnRecord":
         """Retrieve a connection record by target DID.
 

aries_cloudagent/connections/models/connection_target.py

@@ -1,6 +1,6 @@
 """Record used to handle routing of messages to another agent."""
 
-from typing import Sequence
+from typing import Optional, Sequence
 
 from marshmallow import EXCLUDE, fields
 
@@ -24,12 +24,12 @@ class Meta:
     def __init__(
         self,
         *,
-        did: str = None,
-        endpoint: str = None,
-        label: str = None,
-        recipient_keys: Sequence[str] = None,
-        routing_keys: Sequence[str] = None,
-        sender_key: str = None,
+        did: Optional[str] = None,
+        endpoint: Optional[str] = None,
+        label: Optional[str] = None,
+        recipient_keys: Optional[Sequence[str]] = None,
+        routing_keys: Optional[Sequence[str]] = None,
+        sender_key: Optional[str] = None,
     ):
         """
         Initialize a ConnectionTarget instance.