Revert Attchment tutorial to old state.

* works/tested in notebook

Author: morrieinmaas

libs/aries-basic-controller/requirements.txt

@@ -7,5 +7,4 @@ python-dotenv
 termcolor
 pillow
 qrcode
-beautifulsoup4
-pytest~=6.2.3
+beautifulsoup4

libs/attachment-controller/attachment_controller/attachment_controller.py

@@ -1,14 +1,12 @@
 from aries_basic_controller.aries_controller import AriesAgentController
 from .protocol_controller import ProtocolController
 
-from dataclasses import dataclass
 
-
-@dataclass
 class AttachmentController(AriesAgentController):
 
-    def __post_init__(self):
-        super().__post_init__()
+    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)
 
-        self.protocol = ProtocolController(
-            self.admin_url, self.client_session, self.connections)
+        self.protocol = ProtocolController(admin_url, self.client_session, self.connections)

libs/attachment-controller/requirements.txt

@@ -1 +1 @@
-aries-basic-controller>=0.4
+aries-basic-controller<0.3

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

@@ -45,18 +45,7 @@
     "API_KEY = \"alice_api_123456789\"\n",
     "\n",
     "# Based on the aca-py agent you wish to control\n",
-    "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)"
+    "attach_controller = AttachmentController(admin_url=ADMIN_URL, api_key=API_KEY, webhook_host=WEBHOOK_HOST, webhook_port=WEBHOOK_PORT, webhook_base=WEBHOOK_BASE)"
    ]
   },
   {

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

@@ -37,7 +37,7 @@
     "ADMIN_URL = \"http://bob-agent:8051\"\n",
     "\n",
     "# Based on the aca-py agent you wish to control\n",
-    "attach_controller = AttachmentController(admin_url=ADMIN_URL)"
+    "attach_controller = AttachmentController(admin_url=ADMIN_URL, webhook_host=WEBHOOK_HOST, webhook_base=WEBHOOK_BASE, webhook_port=WEBHOOK_PORT)"
    ]
   },
   {
@@ -103,7 +103,7 @@
     "#     fh = open(\"image_received.png\", \"wb\")\n",
     "#     fh.write(text)\n",
     "#     fh.close()\n",
-    "    filepath = f\"received_files/{filename}\"\n",
+    "    filepath = f\"{filename}\"\n",
     "    f = open(filepath,'wb')\n",
     "    f.write(file_content)\n",
     "    f.close()\n",
@@ -133,7 +133,7 @@
    "outputs": [],
    "source": [
     "response = await attach_controller.terminate()\n",
-    "print(response)\n"
+    "print(response)"
    ]
   },
   {