DIF Presentation Exchange and present-proof-v2 Updates

aries_cloudagent/holder/routes.py

@@ -14,7 +14,7 @@
 
 from ..admin.request_context import AdminRequestContext
 from ..indy.holder import IndyHolder, IndyHolderError
-from ..indy.sdk.models.cred_precis import IndyCredInfoSchema
+from ..indy.models.cred_precis import IndyCredInfoSchema
 from ..ledger.base import BaseLedger
 from ..ledger.error import LedgerError
 from ..messaging.models.openapi import OpenAPISchema

aries_cloudagent/holder/tests/test_routes.py

@@ -17,11 +17,11 @@
 VC_RECORD = VCRecord(
     contexts=[
         "https://www.w3.org/2018/credentials/v1",
-        "https://www.w3.org/2018/credentials/v1/examples",
+        "https://www.w3.org/2018/credentials/examples/v1",
     ],
-    types=[
-        "VerifiableCredential",
-        "AlumniCredential",
+    expanded_types=[
+        "https://www.w3.org/2018/credentials#VerifiableCredential",
+        "https://example.org/examples#UniversityDegreeCredential",
     ],
     issuer_id="https://example.edu/issuers/565049",
     subject_ids=["did:example:ebfeb1f712ebc6f1c276e12ec21"],

aries_cloudagent/indy/sdk/models/cred.py → aries_cloudagent/indy/models/cred.py

@@ -4,8 +4,8 @@
 
 from marshmallow import EXCLUDE, fields
 
-from ....messaging.models.base import BaseModel, BaseModelSchema
-from ....messaging.valid import (
+from ...messaging.models.base import BaseModel, BaseModelSchema
+from ...messaging.valid import (
     INDY_CRED_DEF_ID,
     INDY_REV_REG_ID,
     INDY_SCHEMA_ID,

aries_cloudagent/indy/sdk/models/cred_abstract.py → aries_cloudagent/indy/models/cred_abstract.py

@@ -4,8 +4,8 @@
 
 from marshmallow import EXCLUDE, fields
 
-from ....messaging.models.base import BaseModel, BaseModelSchema
-from ....messaging.valid import INDY_CRED_DEF_ID, INDY_SCHEMA_ID, NUM_STR_WHOLE
+from ...messaging.models.base import BaseModel, BaseModelSchema
+from ...messaging.valid import INDY_CRED_DEF_ID, INDY_SCHEMA_ID, NUM_STR_WHOLE
 
 
 class IndyKeyCorrectnessProof(BaseModel):

aries_cloudagent/indy/sdk/models/cred_def.py → aries_cloudagent/indy/models/cred_def.py

@@ -2,8 +2,8 @@
 
 from marshmallow import fields, Schema
 
-from ....messaging.models.openapi import OpenAPISchema
-from ....messaging.valid import INDY_CRED_DEF_ID, INDY_VERSION, NUM_STR_WHOLE
+from ...messaging.models.openapi import OpenAPISchema
+from ...messaging.valid import INDY_CRED_DEF_ID, INDY_VERSION, NUM_STR_WHOLE
 
 
 class CredDefValuePrimarySchema(OpenAPISchema):

aries_cloudagent/indy/sdk/models/cred_precis.py → aries_cloudagent/indy/models/cred_precis.py

@@ -4,9 +4,9 @@
 
 from marshmallow import EXCLUDE, fields
 
-from ....messaging.models.base import BaseModel, BaseModelSchema
-from ....messaging.models.openapi import OpenAPISchema
-from ....messaging.valid import (
+from ...messaging.models.base import BaseModel, BaseModelSchema
+from ...messaging.models.openapi import OpenAPISchema
+from ...messaging.valid import (
     INDY_CRED_DEF_ID,
     INDY_CRED_REV_ID,
     INDY_REV_REG_ID,

aries_cloudagent/indy/sdk/models/cred_request.py → aries_cloudagent/indy/models/cred_request.py

@@ -4,8 +4,8 @@
 
 from marshmallow import EXCLUDE, fields
 
-from ....messaging.models.base import BaseModel, BaseModelSchema
-from ....messaging.valid import INDY_CRED_DEF_ID, INDY_DID, NUM_STR_WHOLE
+from ...messaging.models.base import BaseModel, BaseModelSchema
+from ...messaging.valid import INDY_CRED_DEF_ID, INDY_DID, NUM_STR_WHOLE
 
 
 class IndyCredRequest(BaseModel):

aries_cloudagent/indy/sdk/models/non_rev_interval.py → aries_cloudagent/indy/models/non_rev_interval.py

@@ -4,8 +4,8 @@
 
 from marshmallow import EXCLUDE, fields
 
-from ....messaging.models.base import BaseModel, BaseModelSchema
-from ....messaging.valid import INT_EPOCH
+from ...messaging.models.base import BaseModel, BaseModelSchema
+from ...messaging.valid import INT_EPOCH
 
 
 class IndyNonRevocationInterval(BaseModel):

aries_cloudagent/indy/sdk/models/pres_preview.py → aries_cloudagent/indy/models/pres_preview.py

@@ -6,14 +6,14 @@
 
 from marshmallow import EXCLUDE, fields
 
-from ....ledger.indy import IndySdkLedger
-from ....messaging.models.base import BaseModel, BaseModelSchema
-from ....messaging.util import canon
-from ....messaging.valid import INDY_CRED_DEF_ID, INDY_PREDICATE
-from ....protocols.didcomm_prefix import DIDCommPrefix
-from ....wallet.util import b64_to_str
-
-from ...util import generate_pr_nonce
+from ...ledger.indy import IndySdkLedger
+from ...messaging.models.base import BaseModel, BaseModelSchema
+from ...messaging.util import canon
+from ...messaging.valid import INDY_CRED_DEF_ID, INDY_PREDICATE
+from ...protocols.didcomm_prefix import DIDCommPrefix
+from ...wallet.util import b64_to_str
+
+from ..util import generate_pr_nonce
 
 from .non_rev_interval import IndyNonRevocationInterval
 from .predicate import Predicate

aries_cloudagent/indy/sdk/models/proof.py → aries_cloudagent/indy/models/proof.py

@@ -4,15 +4,15 @@
 
 from marshmallow import EXCLUDE, fields, validate
 
-from ....messaging.models.base import BaseModel, BaseModelSchema
-from ....messaging.valid import (
+from ...messaging.models.base import BaseModel, BaseModelSchema
+from ...messaging.valid import (
     INDY_CRED_DEF_ID,
     INDY_REV_REG_ID,
     INDY_SCHEMA_ID,
     INT_EPOCH,
     NUM_STR_WHOLE,
 )
-from ....utils.tracing import AdminAPIMessageTracingSchema
+from ...utils.tracing import AdminAPIMessageTracingSchema
 
 from .predicate import Predicate
 from .requested_creds import (

aries_cloudagent/indy/sdk/models/proof_request.py → aries_cloudagent/indy/models/proof_request.py

@@ -11,9 +11,9 @@
     ValidationError,
 )
 
-from ....messaging.models.base import BaseModel, BaseModelSchema
-from ....messaging.models.openapi import OpenAPISchema
-from ....messaging.valid import (
+from ...messaging.models.base import BaseModel, BaseModelSchema
+from ...messaging.models.openapi import OpenAPISchema
+from ...messaging.valid import (
     INDY_CRED_DEF_ID,
     INDY_PREDICATE,
     INDY_VERSION,

aries_cloudagent/indy/sdk/models/requested_creds.py → aries_cloudagent/indy/models/requested_creds.py

@@ -2,8 +2,8 @@
 
 from marshmallow import fields
 
-from ....messaging.models.openapi import OpenAPISchema
-from ....messaging.valid import INT_EPOCH
+from ...messaging.models.openapi import OpenAPISchema
+from ...messaging.valid import INT_EPOCH
 
 
 class IndyRequestedCredsRequestedAttrSchema(OpenAPISchema):

aries_cloudagent/indy/sdk/models/revocation.py → aries_cloudagent/indy/models/revocation.py

@@ -4,8 +4,8 @@
 
 from marshmallow import EXCLUDE, fields, validate
 
-from ....messaging.models.base import BaseModel, BaseModelSchema
-from ....messaging.valid import (
+from ...messaging.models.base import BaseModel, BaseModelSchema
+from ...messaging.valid import (
     BASE58_SHA256_HASH,
     INDY_CRED_DEF_ID,
     INDY_REV_REG_ID,

aries_cloudagent/indy/sdk/models/schema.py → aries_cloudagent/indy/models/schema.py

@@ -2,8 +2,8 @@
 
 from marshmallow import fields
 
-from ....messaging.models.openapi import OpenAPISchema
-from ....messaging.valid import INDY_SCHEMA_ID, INDY_VERSION, NATURAL_NUM
+from ...messaging.models.openapi import OpenAPISchema
+from ...messaging.valid import INDY_SCHEMA_ID, INDY_VERSION, NATURAL_NUM
 
 
 class SchemaSchema(OpenAPISchema):

aries_cloudagent/indy/sdk/models/tests/test_pres_preview.py → aries_cloudagent/indy/models/tests/test_pres_preview.py

@@ -8,8 +8,8 @@
 from asynctest import TestCase as AsyncTestCase
 from asynctest import mock as async_mock
 
-from .....messaging.util import canon
-from .....protocols.didcomm_prefix import DIDCommPrefix
+from ....messaging.util import canon
+from ....protocols.didcomm_prefix import DIDCommPrefix
 
 
 from ..non_rev_interval import IndyNonRevocationInterval

aries_cloudagent/indy/sdk/models/xform.py → aries_cloudagent/indy/models/xform.py

@@ -1,6 +1,6 @@
 """Utilities to deal with indy."""
 
-from ....indy.holder import IndyHolder
+from ...indy.holder import IndyHolder
 
 from .pres_preview import IndyPresPreview
 

aries_cloudagent/indy/sdk/verifier.py

@@ -9,7 +9,7 @@
 import indy.anoncreds
 from indy.error import IndyError
 
-from ...indy.sdk.models.xform import indy_proof_req2non_revoc_intervals
+from ...indy.models.xform import indy_proof_req2non_revoc_intervals
 from ...ledger.indy import IndySdkLedger
 from ...messaging.util import canon, encode
 

aries_cloudagent/messaging/credential_definitions/routes.py

@@ -17,7 +17,7 @@
 
 from ...admin.request_context import AdminRequestContext
 from ...indy.issuer import IndyIssuer
-from ...indy.sdk.models.cred_def import CredentialDefinitionSchema
+from ...indy.models.cred_def import CredentialDefinitionSchema
 from ...ledger.base import BaseLedger
 from ...ledger.error import LedgerError
 from ...protocols.endorse_transaction.v1_0.manager import TransactionManager

aries_cloudagent/messaging/schemas/routes.py

@@ -18,7 +18,7 @@
 
 from ...admin.request_context import AdminRequestContext
 from ...indy.issuer import IndyIssuer, IndyIssuerError
-from ...indy.sdk.models.schema import SchemaSchema
+from ...indy.models.schema import SchemaSchema
 from ...ledger.base import BaseLedger
 from ...ledger.error import LedgerError
 from ...protocols.endorse_transaction.v1_0.manager import TransactionManager

aries_cloudagent/messaging/valid.py

@@ -32,6 +32,19 @@ def _deserialize(self, value, attr, data, **kwargs):
             raise ValidationError("Field should be str or dict")
 
 
+class StrOrNumberField(Field):
+    """String or Number field for Marshmallow."""
+
+    def _serialize(self, value, attr, obj, **kwargs):
+        return value
+
+    def _deserialize(self, value, attr, data, **kwargs):
+        if isinstance(value, (str, float, int)):
+            return value
+        else:
+            raise ValidationError("Field should be str or int or float")
+
+
 class DictOrDictListField(Field):
     """Dict or Dict List field for Marshmallow."""
 

aries_cloudagent/protocols/issue_credential/v1_0/models/credential_exchange.py

@@ -7,10 +7,10 @@
 from marshmallow import fields, validate
 
 from .....core.profile import ProfileSession
-from .....indy.sdk.models.cred import IndyCredential, IndyCredentialSchema
-from .....indy.sdk.models.cred_abstract import IndyCredAbstract, IndyCredAbstractSchema
-from .....indy.sdk.models.cred_precis import IndyCredInfo, IndyCredInfoSchema
-from .....indy.sdk.models.cred_request import IndyCredRequest, IndyCredRequestSchema
+from .....indy.models.cred import IndyCredential, IndyCredentialSchema
+from .....indy.models.cred_abstract import IndyCredAbstract, IndyCredAbstractSchema
+from .....indy.models.cred_precis import IndyCredInfo, IndyCredInfoSchema
+from .....indy.models.cred_request import IndyCredRequest, IndyCredRequestSchema
 from .....messaging.models.base_record import BaseExchangeRecord, BaseExchangeSchema
 from .....messaging.valid import INDY_CRED_DEF_ID, INDY_SCHEMA_ID, UUIDFour
 from .....storage.base import StorageError

aries_cloudagent/protocols/issue_credential/v2_0/formats/handler.py

@@ -3,20 +3,17 @@
 from abc import ABC, abstractclassmethod, abstractmethod
 import logging
 
-from typing import Mapping, Tuple, Union
+from typing import Mapping, Tuple
 
 from .....core.error import BaseError
 from .....core.profile import Profile
 from .....messaging.decorators.attach_decorator import AttachDecorator
 
-from ..message_types import ATTACHMENT_FORMAT
 from ..messages.cred_format import V20CredFormat
 from ..messages.cred_proposal import V20CredProposal
 from ..messages.cred_offer import V20CredOffer
 from ..messages.cred_request import V20CredRequest
 from ..messages.cred_issue import V20CredIssue
-from ..models.detail.indy import V20CredExRecordIndy
-from ..models.detail.ld_proof import V20CredExRecordLDProof
 from ..models.cred_ex_record import V20CredExRecord
 
 LOGGER = logging.getLogger(__name__)
@@ -50,32 +47,7 @@ def profile(self) -> Profile:
         """
         return self._profile
 
-    async def get_detail_record(
-        self, cred_ex_id: str
-    ) -> Union[V20CredExRecordIndy, V20CredExRecordLDProof]:
-        """Retrieve credential exchange detail record by cred_ex_id."""
-
-        async with self.profile.session() as session:
-            records = await self.format.detail.query_by_cred_ex_id(session, cred_ex_id)
-
-            if len(records) > 1:
-                LOGGER.warning(
-                    "Cred ex id %s has %d %s detail records: should be 1",
-                    cred_ex_id,
-                    len(records),
-                    self.format.api,
-                )
-            return records[0] if records else None
-
-    async def _check_uniqueness(self, cred_ex_id: str):
-        """Raise exception on evidence that cred ex already has cred issued to it."""
-        async with self.profile.session() as session:
-            if await self.format.detail.query_by_cred_ex_id(session, cred_ex_id):
-                raise V20CredFormatError(
-                    f"{self.format.api} detail record already "
-                    f"exists for cred ex id {cred_ex_id}"
-                )
-
+    @abstractmethod
     def get_format_identifier(self, message_type: str) -> str:
         """Get attachment format identifier for format and message combination.
 
@@ -86,31 +58,10 @@ def get_format_identifier(self, message_type: str) -> str:
             str: Issue credential attachment format identifier
 
         """
-        return ATTACHMENT_FORMAT[message_type][self.format.api]
 
+    @abstractmethod
     def get_format_data(self, message_type: str, data: dict) -> CredFormatAttachment:
-        """Get credential format and attachment objects for use in cred ex messages.
-
-        Returns a tuple of both credential format and attachment decorator for use
-        in credential exchange messages. It looks up the correct format identifier and
-        encodes the data as a base64 attachment.
-
-        Args:
-            message_type (str): The message type for which to return the cred format.
-                Should be one of the message types defined in the message types file
-            data (dict): The data to include in the attach decorator
-
-        Returns:
-            CredFormatAttachment: Credential format and attachment data objects
-
-        """
-        return (
-            V20CredFormat(
-                attach_id=self.format.api,
-                format_=self.get_format_identifier(message_type),
-            ),
-            AttachDecorator.data_base64(data, ident=self.format.api),
-        )
+        """Get credential format and attachment objects for use in cred ex messages."""
 
     @abstractclassmethod
     def validate_fields(cls, message_type: str, attachment_data: dict) -> None: