adding d1_python.cnclient operations (#26)

mnonboard/cli.py

@@ -5,6 +5,7 @@
 from mnonboard import utils
 from mnonboard import info_chx
 from mnonboard import data_chx
+from mnonboard import cn
 from mnonboard.defs import CFG, HELP_TEXT, SO_SRVR, CN_SRVR, CN_SRVR_BASEURL, CN_CERT_LOC, APPROVE_SCRIPT_LOC
 from mnonboard import default_json, L
 
@@ -16,6 +17,13 @@ def run(cfg):
     Args:
         cfg (dict): Dict containing config variables.
     """
+    # auth
+    if not cfg['token']:
+        cfg['token'] = os.environ.get('D1_AUTH_TOKEN')
+    if not cfg['token']:
+        print('Your DataONE auth token is missing. Please enter it here and/or store it in the env variable "D1_AUTH_TOKEN".')
+        cfg['token'] = info_chx.req_input('Please enter your DataONE authentication token: ')
+    DC = cn.init_client(cn_url=cfg['cn_url'], auth_token=cfg['token'])
     if cfg['info'] == 'user':
         # do the full user-driven info gathering process
         ufields = info_chx.user_input()

mnonboard/cn.py

@@ -0,0 +1,46 @@
+from os import environ
+from d1_client.cnclient import CoordinatingNodeClient
+from d1_common.types.dataoneTypes import Subject, person
+
+from . import defs
+
+def init_client(cn_url: str, auth_token: str):
+    """
+    Initialize a d1_client.cnclient.CoordinatingNodeClient instance.
+
+    :param str cn_url: The URL 
+    """
+    options: dict = {"headers": {"Authorization": "Bearer " + auth_token}}
+    return CoordinatingNodeClient(cn_url, **options)
+
+def get_subjects(client: CoordinatingNodeClient, orcid: str):
+    """
+    """
+    return client.getSubjectInfo(orcid)
+
+def get_first_subject(client: CoordinatingNodeClient, orcid: str):
+    """
+    """
+    try:
+        return get_subjects(client=client, orcid=orcid)[0]
+    except IndexError:
+        return None
+
+def get_subject_name(subject: Subject):
+    """
+    """
+    first, last = subject.content()[0].content()[1], subject.content()[0].content()[2]
+    return "%s %s" % (first, last)
+
+def node_list(client: CoordinatingNodeClient):
+    """
+    """
+    nodes = client.listNodes()
+    for node in nodes.content():
+        print(node.name)
+    return nodes
+
+def register_user(client: CoordinatingNodeClient, orcid: str, name: str, email: str=None):
+    """
+    """
+

mnonboard/defs.py

@@ -9,6 +9,7 @@
     'json_file': 'node.json',
     'cn_url': 'https://cn-stage.test.dataone.org/cn',
     'mode': 'testing',
+    'token': None,
     'check_files': 5,
     'local': False,
 }