update all notebooks to use ACAPY_WEBHOOK_URL

Author: wip-abramson

configuration/aries-args-advanced.yaml

@@ -15,7 +15,7 @@ genesis-url: !ENV ${GENESIS_URL}
 admin: [0.0.0.0, !ENV '${ADMIN_PORT}']
 label: !ENV ${AGENT_NAME}
 # the following is the callback url for your controller
-webhook-url: !ENV ${WEBHOOK_URL}
+#webhook-url: !ENV ${WEBHOOK_URL}
 # assumes you are running a local von-network, like:
 #    cd von-network
 #    ./manage start <my local ip>

configuration/aries-args-basic.yaml

@@ -15,7 +15,7 @@ genesis-url: !ENV ${GENESIS_URL}
 admin: [0.0.0.0, !ENV '${ADMIN_PORT}']
 label: !ENV ${AGENT_NAME}
 # the following is the callback url for your controller
-webhook-url: !ENV ${WEBHOOK_URL}
+#webhook-url: !ENV ${WEBHOOK_URL}
 # assumes you are running a local von-network, like:
 #    cd von-network
 #    ./manage start <my local ip>

configuration/aries-args-multitenant.yaml

@@ -15,7 +15,7 @@ genesis-url: !ENV ${GENESIS_URL}
 admin: [0.0.0.0, !ENV '${ADMIN_PORT}']
 label: !ENV ${AGENT_NAME}
 # the following is the callback url for your controller
-webhook-url: !ENV ${WEBHOOK_URL}
+#webhook-url: !ENV ${WEBHOOK_URL}
 # assumes you are running a local von-network, like:
 #    cd von-network
 #    ./manage start <my local ip>

libs/aries-basic-controller/aries_basic_controller/aries_controller.py

@@ -219,6 +219,7 @@ def add_listener(self, listener):
         """
         try:
             pub.subscribe(listener["handler"], listener["topic"])
+            logger.debug("Lister added for topic : ", listener["topic"])
         except Exception as exc:
             print(f"Adding webhooks listener failed! {exc!r} occurred.")
             logger.warn(f"Adding webhooks listener failed! {exc!r} occurred.")
@@ -291,6 +292,8 @@ async def _receive_webhook(self, request: ClientRequest):
             A response with status 200
         """
         topic = request.match_info["topic"]
+        print("WEBHOOK RECIEVED - ", topic)
+
         try:
             payload = await request.json()
             await self._handle_webhook(topic, payload)
@@ -312,7 +315,9 @@ async def _handle_webhook(self, topic, payload):
         """
         try:
             logging.debug(f"Handle Webhook - {topic}", payload)
+            print(f"HANDLE WEBHOOK - {topic}")
             pub.sendMessage(topic, payload=payload)
+            print(f"PUBSUB SENT - {topic}")
             # return web.Response(status=200)
         except Exception as exc:
             logger.warn(f"Handling webhooks failed! {exc!r} occurred when trying to handle this topic: {topic}")

projects/aries-fl/docker-compose.yml

@@ -9,7 +9,7 @@ services:
       - AGENT_NAME=${NHSTRUST_AGENT_NAME}
       - ADMIN_PORT=${NHSTRUST_ADMIN_PORT}
       - HTTP_PORT=${NHSTRUST_HTTP_PORT}
-      - WEBHOOK_URL=${NHSTRUST_WEBHOOK_URL}
+      - ACAPY_WEBHOOK_URL=${NHSTRUST_WEBHOOK_URL}
       - AGENT_ENDPOINT=${NHSTRUST_AGENT_ENDPOINT}
       - WALLET_SEED=${NHSTRUST_WALLET_SEED}
       - WALLET_NAME=${NHSTRUST_WALLET_NAME}
@@ -54,7 +54,7 @@ services:
       - AGENT_NAME=${REGULATOR_AGENT_NAME}
       - ADMIN_PORT=${REGULATOR_ADMIN_PORT}
       - HTTP_PORT=${REGULATOR_HTTP_PORT}
-      - WEBHOOK_URL=${REGULATOR_WEBHOOK_URL}
+      - ACAPY_WEBHOOK_URL=${REGULATOR_WEBHOOK_URL}
       - AGENT_ENDPOINT=${REGULATOR_AGENT_ENDPOINT}
       - WALLET_SEED=${REGULATOR_WALLET_SEED}
       - WALLET_NAME=${REGULATOR_WALLET_NAME}
@@ -99,7 +99,7 @@ services:
       - AGENT_NAME=${RESEARCHER_AGENT_NAME}
       - ADMIN_PORT=${RESEARCHER_ADMIN_PORT}
       - HTTP_PORT=${RESEARCHER_HTTP_PORT}
-      - WEBHOOK_URL=${RESEARCHER_WEBHOOK_URL}
+      - ACAPY_WEBHOOK_URL=${RESEARCHER_WEBHOOK_URL}
       - AGENT_ENDPOINT=${RESEARCHER_AGENT_ENDPOINT}
       - WALLET_SEED=${RESEARCHER_WALLET_SEED}
       - WALLET_NAME=${RESEARCHER_WALLET_NAME}
@@ -144,7 +144,7 @@ services:
       - AGENT_NAME=${HOSPITAL1_AGENT_NAME}
       - ADMIN_PORT=${HOSPITAL1_ADMIN_PORT}
       - HTTP_PORT=${HOSPITAL1_HTTP_PORT}
-      - WEBHOOK_URL=${HOSPITAL1_WEBHOOK_URL}
+      - ACAPY_WEBHOOK_URL=${HOSPITAL1_WEBHOOK_URL}
       - AGENT_ENDPOINT=${HOSPITAL1_AGENT_ENDPOINT}
       - WALLET_SEED=${HOSPITAL1_WALLET_SEED}
       - WALLET_NAME=${HOSPITAL1_WALLET_NAME}
@@ -190,7 +190,7 @@ services:
       - AGENT_NAME=${HOSPITAL2_AGENT_NAME}
       - ADMIN_PORT=${HOSPITAL2_ADMIN_PORT}
       - HTTP_PORT=${HOSPITAL2_HTTP_PORT}
-      - WEBHOOK_URL=${HOSPITAL2_WEBHOOK_URL}
+      - ACAPY_WEBHOOK_URL=${HOSPITAL2_WEBHOOK_URL}
       - AGENT_ENDPOINT=${HOSPITAL2_AGENT_ENDPOINT}
       - WALLET_SEED=${HOSPITAL2_WALLET_SEED}
       - WALLET_NAME=${HOSPITAL2_WALLET_NAME}
@@ -236,7 +236,7 @@ services:
       - AGENT_NAME=${HOSPITAL3_AGENT_NAME}
       - ADMIN_PORT=${HOSPITAL3_ADMIN_PORT}
       - HTTP_PORT=${HOSPITAL3_HTTP_PORT}
-      - WEBHOOK_URL=${HOSPITAL3_WEBHOOK_URL}
+      - ACAPY_WEBHOOK_URL=${HOSPITAL3_WEBHOOK_URL}
       - AGENT_ENDPOINT=${HOSPITAL3_AGENT_ENDPOINT}
       - WALLET_SEED=${HOSPITAL3_WALLET_SEED}
       - WALLET_NAME=${HOSPITAL3_WALLET_NAME}

projects/doctors-in-training/docker-compose.yml

@@ -15,7 +15,7 @@ services:
       - AGENT_NAME=${IDVERIFIER_AGENT_NAME}
       - ADMIN_PORT=${IDVERIFIER_ADMIN_PORT}
       - HTTP_PORT=${IDVERIFIER_HTTP_PORT}
-      - WEBHOOK_URL=${IDVERIFIER_WEBHOOK_URL}
+      - ACAPY_WEBHOOK_URL=${IDVERIFIER_WEBHOOK_URL}
       - AGENT_ENDPOINT=${IDVERIFIER_AGENT_ENDPOINT}
       - WALLET_SEED=${IDVERIFIER_WALLET_SEED}
       - WALLET_NAME=${IDVERIFIER_WALLET_NAME}
@@ -58,7 +58,7 @@ services:
       - AGENT_NAME=${MEDICAL_SCHOOL_AGENT_NAME}
       - ADMIN_PORT=${MEDICAL_SCHOOL_ADMIN_PORT}
       - HTTP_PORT=${MEDICAL_SCHOOL_HTTP_PORT}
-      - WEBHOOK_URL=${MEDICAL_SCHOOL_WEBHOOK_URL}
+      - ACAPY_WEBHOOK_URL=${MEDICAL_SCHOOL_WEBHOOK_URL}
       - AGENT_ENDPOINT=${MEDICAL_SCHOOL_AGENT_ENDPOINT}
       - WALLET_SEED=${MEDICAL_SCHOOL_WALLET_SEED}
       - WALLET_NAME=${MEDICAL_SCHOOL_WALLET_NAME}
@@ -102,7 +102,7 @@ services:
       - AGENT_NAME=${GMC_AGENT_NAME}
       - ADMIN_PORT=${GMC_ADMIN_PORT}
       - HTTP_PORT=${GMC_HTTP_PORT}
-      - WEBHOOK_URL=${GMC_WEBHOOK_URL}
+      - ACAPY_WEBHOOK_URL=${GMC_WEBHOOK_URL}
       - AGENT_ENDPOINT=${GMC_AGENT_ENDPOINT}
       - WALLET_SEED=${GMC_WALLET_SEED}
       - WALLET_NAME=${GMC_WALLET_NAME}
@@ -145,7 +145,7 @@ services:
       - AGENT_NAME=${HEE_AGENT_NAME}
       - ADMIN_PORT=${HEE_ADMIN_PORT}
       - HTTP_PORT=${HEE_HTTP_PORT}
-      - WEBHOOK_URL=${HEE_WEBHOOK_URL}
+      - ACAPY_WEBHOOK_URL=${HEE_WEBHOOK_URL}
       - AGENT_ENDPOINT=${HEE_AGENT_ENDPOINT}
       - WALLET_SEED=${HEE_WALLET_SEED}
       - WALLET_NAME=${HEE_WALLET_NAME}
@@ -188,7 +188,7 @@ services:
       - AGENT_NAME=${LEAD_AGENT_NAME}
       - ADMIN_PORT=${LEAD_ADMIN_PORT}
       - HTTP_PORT=${LEAD_HTTP_PORT}
-      - WEBHOOK_URL=${LEAD_WEBHOOK_URL}
+      - ACAPY_WEBHOOK_URL=${LEAD_WEBHOOK_URL}
       - AGENT_ENDPOINT=${LEAD_AGENT_ENDPOINT}
       - WALLET_SEED=${LEAD_WALLET_SEED}
       - WALLET_NAME=${LEAD_WALLET_NAME}

projects/single-agent/docker-compose.yml

@@ -17,7 +17,7 @@ services:
       - HTTP_PORT=${AGENT_HTTP_PORT}
       - WEBHOOK_URL=${AGENT_WEBHOOK_URL}
       - AGENT_ENDPOINT=${AGENT_AGENT_ENDPOINT}
-      - WALLET_SEED=${AGENT_WALLET_SEED}
+      - ACAPY_WEBHOOK_URL==${AGENT_ACAPY_WEBHOOK_URL=}
       - WALLET_NAME=${AGENT_WALLET_NAME}
       - WALLET_TYPE=${WALLET_TYPE}
       - WALLET_KEY=${AGENT_WALLET_KEY}

scripts/startup.sh

@@ -1,6 +1,7 @@
-if [[ -z "${MULTITENANT_TUTORIAL}" ]]; then
+if [[ -n "${MULTITENANT_TUTORIAL}" ]]; then
     echo $MULTITENANT_TUTORIAL
     python3 ./scripts/parse_yml_env_variables.py -c ./configuration/aries-args-multitenant.yaml;aca-py start --arg-file /tmp/agent_conf.yml
 else
+    echo "Advanced Args used"
     python3 ./scripts/parse_yml_env_variables.py -c ./configuration/aries-args-advanced.yaml;aca-py start --arg-file /tmp/agent_conf.yml
 fi

tutorials/1. Learning Aries, ACA-Py and the Basic Controller/docker-compose.yml

@@ -9,7 +9,7 @@ services:
       - AGENT_NAME=${BOB_AGENT_NAME}
       - ADMIN_PORT=${BOB_ADMIN_PORT}
       - HTTP_PORT=${BOB_HTTP_PORT}
-      - WEBHOOK_URL=${BOB_WEBHOOK_URL}
+      - ACAPY_WEBHOOK_URL=${BOB_WEBHOOK_URL}
       - AGENT_ENDPOINT=${BOB_AGENT_ENDPOINT}
       - WALLET_SEED=${BOB_WALLET_SEED}
       - WALLET_NAME=${BOB_WALLET_NAME}
@@ -45,7 +45,7 @@ services:
       - AGENT_NAME=${ALICE_AGENT_NAME}
       - ADMIN_PORT=${ALICE_ADMIN_PORT}
       - HTTP_PORT=${ALICE_HTTP_PORT}
-      - WEBHOOK_URL=${ALICE_WEBHOOK_URL}
+      - ACAPY_WEBHOOK_URL=${ALICE_WEBHOOK_URL}
       - AGENT_ENDPOINT=${ALICE_AGENT_ENDPOINT}
       - WALLET_SEED=${ALICE_WALLET_SEED}
       - WALLET_NAME=${ALICE_WALLET_NAME}

tutorials/1. Learning Aries, ACA-Py and the Basic Controller/notebooks/alice/3 Messages/Part 1 - Basic Message.ipynb

@@ -11,9 +11,17 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 1,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "IPython autoawait is `on`, and set to use `asyncio`\n"
+     ]
+    }
+   ],
    "source": [
     "%autoawait\n",
     "import time\n",
@@ -22,7 +30,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 2,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -54,7 +62,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 3,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -74,6 +82,25 @@
     "agent_controller.register_listeners([message_listener], defaults=True)"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": 4,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "def messages_handler2(payload):\n",
+    "    connection_id = payload[\"connection_id\"]\n",
+    "    print(\"Second Handler\", payload, connection_id)\n",
+    "\n",
+    "\n",
+    "message_listener2 = {\n",
+    "    \"handler\": messages_handler2,\n",
+    "    \"topic\": \"basicmessages\"\n",
+    "}\n",
+    "\n",
+    "agent_controller.add_listener(message_listener2)"
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -85,9 +112,19 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 5,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "Results :  [{'rfc23_state': 'completed', 'their_role': 'inviter', 'request_id': '5d457ff6-28c5-429d-b7cd-e3ab3b0dc829', 'invitation_key': 'D6x1TzfFP76ihR9zRZFdUgL4mvcE2F8JKCroQJyno1SE', 'created_at': '2021-03-29 15:20:13.311490Z', 'their_did': 'Rn6qN2oFfgPyRKoYP2JuTe', 'their_label': 'Bob', 'invitation_mode': 'once', 'my_did': 'MrasHcPmBT3H8VVYiaR7eA', 'connection_id': 'd61e6495-1b0a-41de-b9e6-db799e6e8bdf', 'routing_state': 'none', 'updated_at': '2021-03-29 15:20:33.593695Z', 'state': 'active', 'accept': 'manual'}]\n",
+      "Connection : {'rfc23_state': 'completed', 'their_role': 'inviter', 'request_id': '5d457ff6-28c5-429d-b7cd-e3ab3b0dc829', 'invitation_key': 'D6x1TzfFP76ihR9zRZFdUgL4mvcE2F8JKCroQJyno1SE', 'created_at': '2021-03-29 15:20:13.311490Z', 'their_did': 'Rn6qN2oFfgPyRKoYP2JuTe', 'their_label': 'Bob', 'invitation_mode': 'once', 'my_did': 'MrasHcPmBT3H8VVYiaR7eA', 'connection_id': 'd61e6495-1b0a-41de-b9e6-db799e6e8bdf', 'routing_state': 'none', 'updated_at': '2021-03-29 15:20:33.593695Z', 'state': 'active', 'accept': 'manual'}\n",
+      "Active Connection ID :  d61e6495-1b0a-41de-b9e6-db799e6e8bdf\n"
+     ]
+    }
+   ],
    "source": [
     "response = await agent_controller.connections.get_connections()\n",
     "results = response['results']\n",
@@ -107,19 +144,48 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 6,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "d61e6495-1b0a-41de-b9e6-db799e6e8bdf\n",
+      "WEBHOOK RECIEVED -  basicmessages\n",
+      "WEBHOOK RECIEVED -  basicmessages\n",
+      "HANDLE WEBHOOK - basicmessages\n",
+      "Handle message {'connection_id': 'd61e6495-1b0a-41de-b9e6-db799e6e8bdf', 'message_id': 'ee83bb20-c7ff-4961-9be2-a123eeff927c', 'content': 'Hello from Bob', 'state': 'received'} d61e6495-1b0a-41de-b9e6-db799e6e8bdf\n",
+      "Second Handler {'connection_id': 'd61e6495-1b0a-41de-b9e6-db799e6e8bdf', 'message_id': 'ee83bb20-c7ff-4961-9be2-a123eeff927c', 'content': 'Hello from Bob', 'state': 'received'} d61e6495-1b0a-41de-b9e6-db799e6e8bdf\n",
+      "PUBSUB SENT - basicmessages\n",
+      "HANDLE WEBHOOK - basicmessages\n",
+      "Handle message {'connection_id': 'd61e6495-1b0a-41de-b9e6-db799e6e8bdf', 'message_id': 'ee83bb20-c7ff-4961-9be2-a123eeff927c', 'content': 'Hello from Bob', 'state': 'received'} d61e6495-1b0a-41de-b9e6-db799e6e8bdf\n",
+      "Second Handler {'connection_id': 'd61e6495-1b0a-41de-b9e6-db799e6e8bdf', 'message_id': 'ee83bb20-c7ff-4961-9be2-a123eeff927c', 'content': 'Hello from Bob', 'state': 'received'} d61e6495-1b0a-41de-b9e6-db799e6e8bdf\n",
+      "PUBSUB SENT - basicmessages\n"
+     ]
+    }
+   ],
    "source": [
     "print(connection[\"connection_id\"])\n",
     "id = connection[\"connection_id\"]"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 7,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "{'thread_id': '5568ca7b-4922-4360-8794-dcb3910403dc'}"
+      ]
+     },
+     "execution_count": 7,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
    "source": [
     "await agent_controller.messaging.trust_ping(id, \"hello, world!\")"
    ]
@@ -137,9 +203,22 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 12,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "BASIC MESSAGE - Alice -> Bob\n",
+      "{}\n",
+      "Handle message {'connection_id': '4f66d7ac-2771-49c7-bf5c-0b84a228cb54', 'message_id': '5e8795cf-5311-4166-ad5f-259f22c40d93', 'content': 'This is a response from Bob', 'state': 'received'} 4f66d7ac-2771-49c7-bf5c-0b84a228cb54\n",
+      "Handle message {'connection_id': '4f66d7ac-2771-49c7-bf5c-0b84a228cb54', 'message_id': '5e8795cf-5311-4166-ad5f-259f22c40d93', 'content': 'This is a response from Bob', 'state': 'received'} 4f66d7ac-2771-49c7-bf5c-0b84a228cb54\n",
+      "Handle message {'connection_id': '4f66d7ac-2771-49c7-bf5c-0b84a228cb54', 'message_id': '93ddc727-6b92-4acd-8e1b-eaea87ec1091', 'content': 'This is a response from Bob', 'state': 'received'} 4f66d7ac-2771-49c7-bf5c-0b84a228cb54\n",
+      "Handle message {'connection_id': '4f66d7ac-2771-49c7-bf5c-0b84a228cb54', 'message_id': '93ddc727-6b92-4acd-8e1b-eaea87ec1091', 'content': 'This is a response from Bob', 'state': 'received'} 4f66d7ac-2771-49c7-bf5c-0b84a228cb54\n"
+     ]
+    }
+   ],
    "source": [
     "basic_message = \"hello from Alice\"\n",
     "response = await agent_controller.messaging.send_message(connection_id, basic_message)\n",
@@ -190,7 +269,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.5"
+   "version": "3.7.6"
   }
  },
  "nbformat": 4,