Refactor attachment protocol tutorial

* TODO: release v0.4 of aries-agent-controller
  * is required because the setup pulls aries-agent-controller from pypi
  and the current version 0.3 lacks the new controller layout

Author: morrieinmaas

helpers/create_connection/create_connection.py

@@ -19,22 +19,22 @@
 BOB_WEBHOOK_BASE = os.getenv('BOB_WEBHOOK_BASE')
 
 
-
-
-
 async def start_agent():
 
     time.sleep(10)
 
     # Inviter
-    bob_agent_controller = AriesAgentController(webhook_host=BOB_WEBHOOK_HOST, webhook_port=BOB_WEBHOOK_PORT,
-                                               webhook_base=BOB_WEBHOOK_BASE, admin_url=BOB_ADMIN_URL)
-
+    bob_agent_controller = AriesAgentController(admin_url=BOB_ADMIN_URL)
 
     # Invitee
-    alice_agent_controller = AriesAgentController(webhook_host=ALICE_WEBHOOK_HOST, webhook_port=ALICE_WEBHOOK_PORT,
-                                               webhook_base=ALICE_WEBHOOK_BASE, admin_url=ALICE_ADMIN_URL, api_key=ALICE_API_KEY)
+    alice_agent_controller = AriesAgentController(
+                                                admin_url=ALICE_ADMIN_URL,
+                                                api_key=ALICE_API_KEY)
 
+    # alice_agent_controller.init_webhook_server(
+    #                                         webhook_host=ALICE_WEBHOOK_HOST,
+    #                                         webhook_port=ALICE_WEBHOOK_PORT,
+    #                                         webhook_base=ALICE_WEBHOOK_BASE)
 
     # await alice_agent_controller.listen_webhooks()
     #
@@ -113,4 +113,3 @@ async def start_agent():
         asyncio.get_event_loop().run_until_complete(start_agent())
     except KeyboardInterrupt:
         os._exit(1)
-

libs/attachment-controller/attachment_controller/attachment_controller.py

@@ -1,12 +1,14 @@
 from aries_basic_controller.aries_controller import AriesAgentController
 from .protocol_controller import ProtocolController
 
+from dataclasses import dataclass
 
+
+@dataclass
 class AttachmentController(AriesAgentController):
 
-    def __init__(self, webhook_host: str, webhook_port: int, admin_url: str, webhook_base: str = "",
-                 connections: bool = True, messaging: bool = True, issuer: bool = True, api_key = None):
-        super().__init__(webhook_host, webhook_port, admin_url, webhook_base,
-                         connections, messaging, issuer, api_key=api_key)
+    def __post_init__(self):
+        super().__post_init__()
 
-        self.protocol = ProtocolController(admin_url, self.client_session, self.connections)
+        self.protocol = ProtocolController(
+            self.admin_url, self.client_session, self.connections)

libs/attachment-controller/attachment_controller/protocol_controller.py

@@ -3,10 +3,15 @@
 
 from aiohttp import ClientSession
 
+
 # This is an example for how we might extend the basic controller
 class ProtocolController(BaseController):
 
-    def __init__(self, admin_url: str, client_session: ClientSession, connections_controller: ConnectionsController):
+    def __init__(
+            self, admin_url: str,
+            client_session: ClientSession,
+            connections_controller: ConnectionsController):
+
         super().__init__(admin_url, client_session)
         self.connections = connections_controller
 
@@ -17,6 +22,4 @@ async def send_attachment(self, connection_id, data):
         path = f"/connections/{connection_id}/send-attachment"
         return await self.admin_POST(path, data=data)
 
- # async def store_attachment(self,data):
-
- 
+# async def store_attachment(self,data):

libs/attachment-controller/requirements.txt

@@ -1 +1 @@
-aries-basic-controller>=0.1.1
+aries-basic-controller>=0.4

tutorials/3. Attachments/notebooks/alice/attachment.ipynb

@@ -45,8 +45,18 @@
     "API_KEY = \"alice_api_123456789\"\n",
     "\n",
     "# Based on the aca-py agent you wish to control\n",
-    "attach_controller = AttachmentController(webhook_host=WEBHOOK_HOST, webhook_port=WEBHOOK_PORT,\n",
-    "                                       webhook_base=WEBHOOK_BASE, admin_url=ADMIN_URL, api_key=API_KEY)"
+    "attach_controller = AttachmentController(admin_url=ADMIN_URL, api_key=API_KEY)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "attach_controller.init_webhook_server(webhook_host=WEBHOOK_HOST,\n",
+    "                                     webhook_port=WEBHOOK_PORT,\n",
+    "                                     webhook_base=WEBHOOK_BASE)"
    ]
   },
   {
@@ -193,7 +203,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.6"
+   "version": "3.8.5"
   },
   "pycharm": {
    "stem_cell": {

tutorials/3. Attachments/notebooks/bob/attachment.ipynb

@@ -37,8 +37,7 @@
     "ADMIN_URL = \"http://bob-agent:8051\"\n",
     "\n",
     "# Based on the aca-py agent you wish to control\n",
-    "attach_controller = AttachmentController(webhook_host=WEBHOOK_HOST, webhook_port=WEBHOOK_PORT,\n",
-    "                                       webhook_base=WEBHOOK_BASE, admin_url=ADMIN_URL)"
+    "attach_controller = AttachmentController(admin_url=ADMIN_URL)"
    ]
   },
   {
@@ -161,7 +160,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.6"
+   "version": "3.8.5"
   }
  },
  "nbformat": 4,