include _type and _version in AgentMessage

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

Author: shaangill025

aries_cloudagent/messaging/agent_message.py

@@ -4,7 +4,7 @@
 
 from collections import OrderedDict
 from re import sub
-from typing import Mapping, Union
+from typing import Mapping, Optional, Union, Text
 
 from marshmallow import (
     EXCLUDE,
@@ -55,7 +55,13 @@ class Meta:
         schema_class = None
         message_type = None
 
-    def __init__(self, _id: str = None, _decorators: BaseDecoratorSet = None):
+    def __init__(
+        self,
+        _id: str = None,
+        _type: Optional[Text] = None,
+        _version: Optional[Text] = None,
+        _decorators: BaseDecoratorSet = None,
+    ):
         """
         Initialize base agent message object.
 
@@ -83,7 +89,12 @@ def __init__(self, _id: str = None, _decorators: BaseDecoratorSet = None):
                     self.__class__.__name__
                 )
             )
-        self._message_type = self.Meta.message_type
+        if _type:
+            self._message_type = _type
+        elif _version:
+            self._message_type = self.get_updated_msg_type(_version)
+        else:
+            self._message_type = self.Meta.message_type
         # Not required for now
         # if not self.Meta.handler_class:
         #    raise TypeError(

aries_cloudagent/protocols/out_of_band/v1_0/manager.py

@@ -108,8 +108,8 @@ async def create_invitation(
             multi_use: set to True to create an invitation for multiple-use connection
             alias: optional alias to apply to connection for later use
             attachments: list of dicts in form of {"id": ..., "type": ...}
-            service_accept: Optional list of mime types in the order of preference of the sender
-            that the receiver can use in responding to the message
+            service_accept: Optional list of mime types in the order of preference of
+            the sender that the receiver can use in responding to the message
             protocol_version: OOB protocol version [1.0, 1.1]
 
         Returns:
@@ -233,7 +233,7 @@ async def create_invitation(
                 handshake_protocols=handshake_protocols,
                 requests_attach=message_attachments,
                 services=[f"did:sov:{public_did.did}"],
-                service_accept=service_accept if protocol_version != "1.0" else None,
+                accept=service_accept if protocol_version != "1.0" else None,
                 version=protocol_version or DEFAULT_VERSION,
             )
 
@@ -332,9 +332,7 @@ async def create_invitation(
             invi_msg.label = my_label or self.profile.settings.get("default_label")
             invi_msg.handshake_protocols = handshake_protocols
             invi_msg.requests_attach = message_attachments
-            invi_msg.service_accept = (
-                service_accept if protocol_version != "1.0" else None
-            )
+            invi_msg.accept = service_accept if protocol_version != "1.0" else None
             invi_msg.services = [
                 ServiceMessage(
                     _id="#inline",
@@ -429,7 +427,7 @@ async def receive_invitation(
         oob_service_item = invitation.services[0]
 
         # service_accept
-        service_accept = invitation.service_accept
+        service_accept = invitation.accept
 
         # Get the DID public did, if any
         public_did = None

aries_cloudagent/protocols/out_of_band/v1_0/messages/invitation.py

@@ -123,7 +123,7 @@ def __init__(
         handshake_protocols: Sequence[Text] = None,
         requests_attach: Sequence[AttachDecorator] = None,
         services: Sequence[Union[Service, Text]] = None,
-        service_accept: Optional[Sequence[Text]] = None,
+        accept: Optional[Sequence[Text]] = None,
         version: str = DEFAULT_VERSION,
         msg_type: Optional[Text] = None,
         **kwargs,
@@ -136,18 +136,14 @@ def __init__(
 
         """
         # super().__init__(_id=_id, **kwargs)
-        super().__init__(**kwargs)
+        super().__init__(_type=msg_type, _version=version, **kwargs)
         self.label = label
         self.handshake_protocols = (
             list(handshake_protocols) if handshake_protocols else []
         )
         self.requests_attach = list(requests_attach) if requests_attach else []
         self.services = services
-        if msg_type:
-            self._type = msg_type
-        else:
-            self._type = self.get_updated_msg_type(version)
-        self.service_accept = service_accept
+        self.accept = accept
 
     @classmethod
     def wrap_message(cls, message: dict) -> AttachDecorator:
@@ -222,7 +218,7 @@ class Meta:
         ),
         required=False,
     )
-    service_accept = fields.List(
+    accept = fields.List(
         fields.Str(),
         example=["didcomm/aip1", "didcomm/aip2;env=rfc19"],
         description=("List of mime type in order of preference"),

aries_cloudagent/protocols/out_of_band/v1_0/messages/problem_report.py

@@ -50,11 +50,7 @@ def __init__(
         **kwargs,
     ):
         """Initialize a ProblemReport message instance."""
-        super().__init__(*args, **kwargs)
-        if msg_type:
-            self._type = msg_type
-        else:
-            self._type = self.get_updated_msg_type(version)
+        super().__init__(_type=msg_type, _version=version, *args, **kwargs)
 
 
 class OOBProblemReportSchema(ProblemReportSchema):

aries_cloudagent/protocols/out_of_band/v1_0/messages/reuse.py

@@ -29,11 +29,7 @@ def __init__(
         **kwargs,
     ):
         """Initialize Handshake Reuse message object."""
-        super().__init__(**kwargs)
-        if msg_type:
-            self._type = msg_type
-        else:
-            self._type = self.get_updated_msg_type(version)
+        super().__init__(_type=msg_type, _version=version, **kwargs)
 
 
 class HandshakeReuseSchema(AgentMessageSchema):

aries_cloudagent/protocols/out_of_band/v1_0/messages/reuse_accept.py

@@ -30,11 +30,7 @@ def __init__(
         **kwargs,
     ):
         """Initialize Handshake Reuse Accept object."""
-        super().__init__(**kwargs)
-        if msg_type:
-            self._type = msg_type
-        else:
-            self._type = self.get_updated_msg_type(version)
+        super().__init__(_type=msg_type, _version=version, **kwargs)
 
 
 class HandshakeReuseAcceptSchema(AgentMessageSchema):

aries_cloudagent/resolver/default/indy.py

@@ -115,7 +115,8 @@ def add_services(
                     service_endpoint=endpoint,
                     recipient_keys=[recipient_key.id],
                     routing_keys=routing_keys,
-                    # CHECKME accept=(service_accept if service_accept else ["didcomm/v2"]),
+                    # CHECKME
+                    # accept=(service_accept if service_accept else ["didcomm/v2"]),
                     accept=["didcomm/v2"],
                 )
                 builder.context.append(self.CONTEXT_DIDCOMM_V2)