Basics to version-bump aca-py

* Bumped aca-py version to 0.6 in Dockerfile
* add auto-provision param to aries basic args
* add auto-provision param to aries advanced args

Adjust proof controller to reflect version 0.6 API of aca-py.

* Added sending problem report function
* Tidied up th ecode to reflect Python linting
* Tidied up function definitions in order to reflect swagger docs order

Bump version of aca-py for attachment protocol example

* Change aca-py version for Docker image
* add --auto-provision flag to aca-py start so it runs properly and a
new wallet is created on startup

Changes to plugin routes to work with v0.6.0

* Connection takes now a session instead of context
* session is now a context property (context.session())
* context now comes from AdminRequestContext (new import) and is the
request["context"]
* Outbound_handler now directly takes the router from request and not
app.request
* ConnectionRecord has changed to ConnRecord (this takes the session)

Add mediation controller

* Added all async functions to cover mediation via API
* minor fixes to proofs.py, fixed naming of parsed args

Removed superfluous variable parsing in mediation.py

Make changes to remove by topic method call without the dirty changes to
the notebook like cell runs

Add reference to mediation manual/README for usage

Pave the way for multitenant use

* supply apropriate params in configuration YAML files so the containers
start up with multitenent use enabled
* The required and supplied password is password as a dummy. DO NOT use
this in production.
* Add a new MultitenancyController that exposes the entire swagger API.

Remove auto-provision param from docker-compose file. This is passed
from the configuration YAML.

Addresses merge request feedback.

* remove multitenancy from args file and
** Move them to a new config YAML file for multitenancy
* auto-provision param remains in args file as it is required to produce
the previously known behaviour from before v0.6

Remove duplicate auto-provion flag from docker-compose.yml

Remove multitenant args file

* This will be handled by parsing startup args like described [here](https://github.com/hyperledger/aries-cloudagent-python/blob/b8f28dfe1b8b84f1fd5143bd5219c93b0913c3cc/aries_cloudagent/config/argparse.py)

Author: morrieinmaas

configuration/aries-args-advanced.yaml

@@ -45,6 +45,7 @@ seed: !ENV ${WALLET_SEED}
 
 
 auto-accept-requests: true
+auto-provision: true
 auto-respond-credential-proposal: true
 auto-respond-credential-offer: true
 auto-respond-credential-request: true

configuration/aries-args-basic.yaml

@@ -33,6 +33,8 @@ wallet-type: !ENV ${WALLET_TYPE}
 wallet-name: !ENV ${WALLET_NAME}
 wallet-key: !ENV ${WALLET_KEY}
 seed: !ENV ${WALLET_SEED}
+auto-provision: true
+
 
 ## run a local postgres (docker) like:
 ##    docker run --name some-postgres -e POSTGRES_PASSWORD=mysecretpassword -d -p 5432:5432 postgres:10

dockerfiles/agents/Dockerfile

@@ -1,4 +1,4 @@
-FROM bcgovimages/aries-cloudagent:py36-1.15-0_0.5.6
+FROM bcgovimages/aries-cloudagent:py36-1.15-1_0.6.0
 
 ADD configuration ./configuration
 ADD scripts ./scripts

dockerfiles/agents/Dockerfile.attachmentprotocol

@@ -1,4 +1,4 @@
-FROM bcgovimages/aries-cloudagent:py36-1.15-0_0.5.6
+FROM bcgovimages/aries-cloudagent:py36-1.15-1_0.6.0
 
 ADD configuration ./configuration
 ADD scripts ./scripts

libs/acapy-protocol-example/acapy_protocol_example/protocolexample/v1_0/routes.py

@@ -5,9 +5,10 @@
 
 from marshmallow import fields, Schema
 
-from aries_cloudagent.connections.models.connection_record import ConnectionRecord
+from aries_cloudagent.connections.models.conn_record import ConnRecord
 from aries_cloudagent.messaging.valid import UUIDFour
 from aries_cloudagent.storage.error import StorageNotFoundError
+from aries_cloudagent.admin.request_context import AdminRequestContext
 
 from .messages.protocolexample import ProtocolExample
 
@@ -42,15 +43,17 @@ async def connections_send_ping(request: web.BaseRequest):
         request: aiohttp request object
 
     """
-    context = request.app["request_context"]
+    context: AdminRequestContext = request["context"]
     connection_id = request.match_info["conn_id"]
-    outbound_handler = request.app["outbound_message_router"]
+    outbound_handler = request["outbound_message_router"]
+    session = await context.session()
+
     body = await request.json()
     example = body.get("example")
     response_requested = body.get("response_requested")
 
     try:
-        connection = await ConnectionRecord.retrieve_by_id(context, connection_id)
+        connection = await ConnRecord.retrieve_by_id(session, connection_id)
     except StorageNotFoundError:
         raise web.HTTPNotFound()
 

libs/aries-basic-controller/aries_basic_controller/controllers/mediation.py

@@ -0,0 +1,101 @@
+# For usage please consult https://github.com/hyperledger/aries-cloudagent-python/blob/main/Mediation.md
+
+from .base import BaseController
+from aiohttp import ClientSession
+import logging
+from typing import List
+
+logger = logging.getLogger("aries_controller.mediation")
+
+
+class MediationController(BaseController):
+
+    def __init__(self, admin_url: str, client_session: ClientSession):
+        super().__init__(admin_url, client_session)
+        self.base_url = "/mediation"
+
+    def default_handler(self, payload):
+        logger.debug("Mediation Message received", payload)
+
+
+    # Get default mediator
+    async def get_default_mediator(self):
+        return await self.admin_POST(f"{self.base_url}/default-mediator")
+
+
+    # Clear default mediator
+    async def delete_default_mediator(self):
+        return await self.admin_DELETE(f"{self.base_url}/default-mediator")
+
+
+    # Retrieve keylists by connection or role
+    async def get_keylists(self, conn_id: str = None, role: str = None):
+        params = {}
+        if conn_id:
+            params["conn_id"] = conn_id
+        if role:
+            params["role"] = role
+
+        return await self.admin_GET(f"{self.base_url}/keylists", params=params)
+
+
+    # Send keylist query to mediator
+    async def send_keylist_query(self, request, mediation_id: str, paginate_limit: int = -1, paginate_offset: int = 0):
+        params = {}
+        params["mediation_id"] = mediation_id
+        if paginate_limit:
+            params["paginate_limit"] = paginate_limit
+        if paginate_offset:
+            params["paginate_offset"] = paginate_offset
+
+        return await self.admin_POST(f"{self.base_url}/keylists/{mediation_id}/send-keylist-query", params=params, json_data=request)
+
+
+    # Send keylist update to mediator
+    async def send_keylist_update(self, request, mediation_id: str):
+        return await self.admin_POST(f"{self.base_url}/keylists/{mediation_id}/send-keylist-update", json_data=request)
+
+
+    # Request mediation from connection
+    async def request_mediation(self, request, conn_id: str):
+        return await self.admin_POST(f"{self.base_url}/request/{conn_id}", json_data=request)
+
+
+    # Query mediation requests, returns list of all mediation records
+    async def get_mediation_records(self, mediator_terms: [str], recipient_terms: [str], state: str = None, conn_id: str = None):
+        params = {}
+        if conn_id:
+            params["conn_id"] = conn_id
+        if mediator_terms:
+            params["mediator_terms"] = mediator_terms
+        if recipient_terms:
+            params["recipient_terms"] = recipient_terms
+        if state:
+            params["state"] = state
+
+        return await self.admin_GET(f"{self.base_url}/requests", params=params)
+
+
+    # Retrieve mediation request record
+    async def get_mediation_record_by_id(self, mediation_id: str):
+        return await self.admin_GET(f"{self.base_url}/requests/{mediation_id}")
+
+
+    # Delete mediation request record
+    async def delete_mediation_record_by_id(self, mediation_id: str):
+        return await self.admin_DELETE(f"{self.base_url}/requests/{mediation_id}")
+
+
+    # Deny a stored mediation request
+    async def deny_mediation_request_by_id(self, request, mediation_id: str):
+        return await self.admin_POST(f"{self.base_url}/requests/{mediation_id}/deny", json_data=request)
+
+
+    # Grant received mediation request
+    async def grant_mediation_request_by_id(self, mediation_id: str):
+        return await self.admin_POST(f"{self.base_url}/requests/{mediation_id}/grant")
+
+
+    # Grant received mediation request
+    async def set_default_mediator(self, mediation_id: str):
+        return await self.admin_PUT(f"{self.base_url}/requests/{mediation_id}/default-mediator")

libs/aries-basic-controller/aries_basic_controller/controllers/multitenant.py

@@ -0,0 +1,55 @@
+# For usage please consult https://github.com/hyperledger/aries-cloudagent-python/blob/main/Mediation.md
+
+from .base import BaseController
+from aiohttp import ClientSession
+import logging
+from typing import List
+
+logger = logging.getLogger("aries_controller.multitenancy")
+
+
+class MultitenancyController(BaseController):
+
+    def __init__(self, admin_url: str, client_session: ClientSession):
+        super().__init__(admin_url, client_session)
+        self.base_url = "/multitenancy"
+
+    def default_handler(self, payload):
+        logger.debug("Multitenancy Message received", payload)
+
+
+    # Create a subwallet
+    async def create_subwallet(self, request):
+        return await self.admin_POST(f"{self.base_url}/wallet", json_data=request)
+
+
+    # Get a single subwallet
+    async def get_single_subwallet_by_id(self, wallet_id: str):
+        return await self.admin_GET(f"{self.base_url}/wallet/{wallet_id}")
+
+
+    # Update a subwallet
+    async def update_subwallet_by_id(self, request, wallet_id: str):
+        return await self.admin_PUT(f"{self.base_url}/wallet/{wallet_id}", json_data=request)
+
+
+    # Remove a subwallet
+    async def remove_subwallet_by_id(self, request, wallet_id: str):
+        return await self.admin_POST(f"{self.base_url}/wallet/{wallet_id}/remove", json_data=request)
+
+
+    # Get auth token for a subwallet
+    async def get_subwallet_authtoken_by_id(self, request, wallet_id: str):
+        return await self.admin_POST(f"{self.base_url}/wallet/{wallet_id}/token", json_data=request)
+
+
+    # Query subwallets
+    async def query_subwallets(self, wallet_name: str = None):
+        params = {}
+        if wallet_name:
+            params["wallet_name"] = wallet_name
+            
+        return await self.admin_GET(f"{self.base_url}/wallets")
+
+
+   

libs/aries-basic-controller/aries_basic_controller/controllers/proof.py

@@ -16,6 +16,15 @@ def __init__(self, admin_url: str, client_session: ClientSession):
     def default_handler(self, payload):
         logger.debug("Present Proof Message received", payload)
 
+
+     # Creates a presentation request not bound to any proposal or existing connection
+    async def create_request(self, request):
+        # TODO How should proof request object be broken up? Complex.
+        #  Do we want user to have to know how to build this object?
+        return await self.admin_POST(f"{self.base_url}/create-request", json_data=request)
+
+
+    # Fetch all present-proof exchange records
     async def get_records(self, connection_id: str = None, thread_id: str = None, state: str = None, role: str = None):
         params = {}
         if connection_id:
@@ -29,10 +38,18 @@ async def get_records(self, connection_id: str = None, thread_id: str = None, st
 
         return await self.admin_GET(f"{self.base_url}/records", params=params)
 
+
+    # Fetch a single presentation exchange record
     async def get_record_by_id(self, pres_ex_id):
         return await self.admin_GET(f"{self.base_url}/records/{pres_ex_id}")
+    
 
-    # Fetch a single presentation exchange record
+    # Remove an existing presentation exchange record
+    async def remove_presentation_record(self, pres_ex_id):
+        return await self.admin_DELETE(f"{self.base_url}/records/{pres_ex_id}")
+
+
+    # Fetch credentials for a presentation request from wallet
     async def get_presentation_credentials(self, pres_ex_id, count: int = None, wql_query: str = None, start: int = None, referent: str = None):
         params = {}
         if count:
@@ -47,39 +64,37 @@ async def get_presentation_credentials(self, pres_ex_id, count: int = None, wql_
             params["referent"] = referent
 
         return await self.admin_GET(f"{self.base_url}/records/{pres_ex_id}/credentials", params=params)
+    
 
-    # Sends a presentation proposal
-    async def send_proposal(self, proposal):
-
-        return await self.admin_POST(f"{self.base_url}/send-proposal", json_data=proposal)
-
-    # Creates a presentation request not bound to any proposal or existing connection
-    async def create_request(self, request):
-        # TODO How should proof request object be broken up? Complex.
-        #  Do we want user to have to know how to build this object?
-
-        return await self.admin_POST(f"{self.base_url}/create-request", json_data=request)
-
-
-    # Sends a free presentation request not bound to any proposal
-    async def send_request(self, request):
-        return await self.admin_POST(f"{self.base_url}/send-request", json_data=request)
+    # Send a problem report for presentation exchange
+    async def send_problem_report(self, request, pres_ex_id):
+        return await self.admin_POST(f"{self.base_url}/records/{pres_ex_id}/problem-report", json_data=request)
 
-    async def send_request_for_proposal(self, pres_ex_id, proposal_request):
 
-        return await self.admin_POST(f"{self.base_url}/records/{pres_ex_id}/send-request", json_data=proposal_request)
+    # Sends a proof presentation
+    async def send_presentation(self, request, pres_ex_id):
+        return await self.admin_POST(f"{self.base_url}/records/{pres_ex_id}/send-presentation", json_data=request)
 
-    # Send a proof presentation
-    async def send_presentation(self, pres_ex_id, presentation):
 
-        return await self.admin_POST(f"{self.base_url}/records/{pres_ex_id}/send-presentation", json_data=presentation)
+    # Sends a presentation request in reference to a proposal
+    async def send_request_for_proposal(self, request, pres_ex_id):
+        return await self.admin_POST(f"{self.base_url}/records/{pres_ex_id}/send-request", json_data=request)
 
+    
     # Verify a received presentation
     async def verify_presentation(self, pres_ex_id):
         return await self.admin_POST(f"{self.base_url}/records/{pres_ex_id}/verify-presentation")
 
-    async def remove_presentation_record(self, pres_ex_id):
-        return await self.admin_DELETE(f"{self.base_url}/records/{pres_ex_id}")
 
+    # Sends a presentation proposal
+    async def send_proposal(self, request):
+        return await self.admin_POST(f"{self.base_url}/send-proposal", json_data=request)
+
+
+   # Sends a free presentation request not bound to any proposal
+    async def send_request(self, request):
+        return await self.admin_POST(f"{self.base_url}/send-request", json_data=request)
+
+ 
     # def build_proof_request(self, name, version, requested_attributes, requested_predicates):
 

libs/attachment-protocol/attach_protocol/attachment_protocol/v1_0/routes.py

@@ -3,9 +3,11 @@
 from marshmallow import fields, Schema
 from aiohttp import web, FormData
 from aiohttp_apispec import docs, match_info_schema, form_schema, request_schema, response_schema
-from aries_cloudagent.connections.models.connection_record import ConnectionRecord
+from aries_cloudagent.connections.models.conn_record import ConnRecord
 from aries_cloudagent.messaging.valid import UUIDFour
 from aries_cloudagent.storage.error import StorageNotFoundError
+from aries_cloudagent.storage.base import BaseStorage
+from aries_cloudagent.admin.request_context import AdminRequestContext
 
 from .messages.attachment import Attachment, AttachmentSchema
 
@@ -32,9 +34,11 @@ async def send_attachment(request: web.BaseRequest):
     """
     Request Handler to send attachment protocol
     """
-    context = request.app["request_context"]
+    context: AdminRequestContext = request["context"]
     connection_id = request.match_info["conn_id"]
-    outbound_handler = request.app["outbound_message_router"]
+    outbound_handler = request["outbound_message_router"]
+
+    session = await context.session()
 
     # WARNING: don't do that if you plan to receive large files!
     # TODO change to handle large files??
@@ -58,7 +62,7 @@ async def send_attachment(request: web.BaseRequest):
     content = file.read()
 
     try:
-        connection = await ConnectionRecord.retrieve_by_id(context, connection_id)
+        connection = await ConnRecord.retrieve_by_id(session, connection_id)
     except StorageNotFoundError:
         raise web.HTTPNotFound()
 

tutorials/aries-basic-controller/notebooks/alice/Part 2 - Aries Basic Controller.ipynb

@@ -302,7 +302,7 @@
    "outputs": [],
    "source": [
     "topic = \"basicmessages\"\n",
-    "agent_controller.remove_all(topic)\n",
+    "agent_controller.remove_all_listeners(topic)\n",
     "\n"
    ]
   },