Finish refactor controllers.

* change 4. tutorials acordingly
* TODO: refactor 1. 2. 3. tutorials

Author: morrieinmaas

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

@@ -61,6 +61,7 @@ def init_webhook_server(
     async def listen_webhooks(self):
         try:
             await self.webhook_server.listen_webhooks()
+            logger.info("Webhook server started.")
         except AttributeError:
             logger.warning("Missing webhook listener.")
         except Exception as exc:

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

@@ -36,11 +36,11 @@ class AriesAgentControllerBase(ABC):
     admin_url : str
         The URL for the Admin API
     api_key : str
-        The API key
+        The API key (default is None)
     """
 
     admin_url: str
-    api_key: str
+    api_key: str = None
 
     def __post_init__(self):
         """Constructs additional attributes and logic
@@ -54,7 +54,7 @@ def __post_init__(self):
         # Construct headers for Client Session and the session itself
         self.headers = {}
 
-        if self.api_key not in [None, ""]:
+        if self.api_key:
             self.headers.update({"X-API-Key": self.api_key})
 
         self.client_session: ClientSession = ClientSession(

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

@@ -7,6 +7,8 @@
 
 logger = logging.getLogger("aries_tenant_controller")
 
+_required = object()
+
 
 @dataclass
 class AriesTenantController(AriesAgentControllerBase):
@@ -22,14 +24,20 @@ class AriesTenantController(AriesAgentControllerBase):
         The tenant JW token
     """
 
-    wallet_id: str
-    tenant_jwt: str
+    wallet_id: str = _required
+    tenant_jwt: str = _required
 
     def __post_init__(self):
         """Constructs additional attributes,
         and logic defined by attributes set during instantiation
         """
 
+        if (self.wallet_id is _required):
+            raise TypeError("__init__ missing required wallet_id (str)")
+
+        if (self.tenant_jwt is _required):
+            raise TypeError("__init__ missing required tenant_jwt (str)")
+
         super().__post_init__()
 
         if self.tenant_jwt:

tutorials/4. Multitenancy/notebooks/external/Configure External Agent.ipynb

@@ -60,7 +60,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "agent_controller.webhook_listener(webhook_host=WEBHOOK_HOST, webhook_port=WEBHOOK_PORT, webhook_base=WEBHOOK_BASE)"
+    "agent_controller.init_webhook_server(webhook_host=WEBHOOK_HOST, webhook_port=WEBHOOK_PORT, webhook_base=WEBHOOK_BASE)"
    ]
   },
   {
@@ -453,8 +453,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "response = await agent_controller.terminate()\n",
-    "print(response)"
+    "await agent_controller.terminate()"
    ]
   },
   {

tutorials/4. Multitenancy/notebooks/mediator/Configure Mediator.ipynb

@@ -75,7 +75,7 @@
    "outputs": [],
    "source": [
     "# Based on the aca-py agent you wish to control\n",
-    "agent_controller = AriesAgentController(admin_url=ADMIN_URL, mediation=True)"
+    "agent_controller = AriesAgentController(admin_url=ADMIN_URL)"
    ]
   },
   {
@@ -84,7 +84,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "agent_controller.webhook_listener(webhook_host=WEBHOOK_HOST, webhook_port=WEBHOOK_PORT, webhook_base=WEBHOOK_BASE)"
+    "agent_controller.init_webhook_server(webhook_host=WEBHOOK_HOST, webhook_port=WEBHOOK_PORT, webhook_base=WEBHOOK_BASE)"
    ]
   },
   {
@@ -107,7 +107,7 @@
    "outputs": [],
    "source": [
     "loop = asyncio.get_event_loop()\n",
-    "loop.create_task(agent_controller.webhook_listener.listen_webhooks())\n",
+    "loop.create_task(agent_controller.listen_webhooks())\n",
     "\n",
     "def connection_handler(payload):\n",
     "    print(\"Connection Handler Called\")\n",
@@ -199,6 +199,15 @@
     "    print(\"State\", record[\"state\"])"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "await agent_controller.connections.accept_connection(record[\"connection_id\"])"
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {},