Address code review feedback

* minor tweaks
* bump python version to min. 3.7.3 so dataclasses is in the standard
library
* TODO check in notebooks/rewirte notebooks

Author: morrieinmaas

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 (default is None)
+        The API key
     """
 
     admin_url: str
-    api_key: str = None
+    api_key: str
 
     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:
+        if self.api_key not in [None, ""]:
             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

@@ -12,7 +12,7 @@
 class AriesTenantController(AriesAgentControllerBase):
     """The Aries Agent Controller class
 
-    This class allows you to interact with Aries by exposing the aca-py API. 
+    This class allows you to interact with Aries by exposing the aca-py API.
 
     Attributes:
     ----------
@@ -55,6 +55,7 @@ def add_listener(self, listener):
         Overrides parent method and uses the tenant's wallet ID to
         listen for that wallet's webhooks under the url defined
         by the wallet ID.
+
         Args:
         ----
         listener : dict
@@ -64,10 +65,9 @@ def add_listener(self, listener):
         try:
             pub_topic_path_base = listener['topic']
             pub_topic_path = f"{self.wallet_id}.{pub_topic_path_base}"
-            print("Subscribing too: " + pub_topic_path)
             pub.subscribe(listener["handler"], pub_topic_path)
             logger.debug("Lister added for topic : ", pub_topic_path)
-        except self.wallet_id is "":
+        except self.wallet_id == "":
             logger.error(
                 "Cannot add listener for empty wallet_id.")
         except Exception as exc:
@@ -83,7 +83,10 @@ def update_wallet_id(self, wallet_id: str):
         wallet_id : str
             The tenant wallet identifier
         """
-        self.wallet_id = wallet_id
+        try:
+            self.wallet_id = wallet_id
+        except wallet_id == "":
+            raise Exception("wallet_id must not be empty")
 
     def update_tenant_jwt(self, tenant_jwt: str, wallet_id: str):
         """Update the tenant JW token attribute and the header
@@ -102,6 +105,8 @@ def update_tenant_jwt(self, tenant_jwt: str, wallet_id: str):
                 {'Authorization': 'Bearer ' + tenant_jwt,
                     'content-type': "application/json"})
             self.client_session.headers.update(self.headers)
+        except tenant_jwt == "":
+            raise Exception("tenant_jwt must not be empty")
         except Exception as exc:
             logger.warning(
                 (f"Updating tenant JW token"

libs/aries-basic-controller/requirements.txt

@@ -8,3 +8,4 @@ termcolor
 pillow
 qrcode
 beautifulsoup4
+pytest~=6.2.3

libs/aries-basic-controller/setup.py

@@ -22,7 +22,7 @@ def parse_requirements(filename):
 if __name__ == "__main__":
     setup(
         name=PACKAGE_NAME,
-        version="0.2",
+        version="0.4",
         author="Will Abramson",
         description="A simple python package for controlling an aries agent through the admin-api interface",
         long_description=long_description,
@@ -32,7 +32,7 @@ def parse_requirements(filename):
         include_package_data=True,
         package_data={"aries_basic_controller": ["requirements.txt"]},
         install_requires=parse_requirements("requirements.txt"),
-        python_requires=">=3.6.3",
+        python_requires=">=3.7.3",
         classifiers=[
             "Programming Language :: Python :: 3",
             "License :: OSI Approved :: Apache Software License",