calling appropriate methods for v1 and v2

Author: ddey2

pyclowder/datasets.py

@@ -16,6 +16,11 @@
 from pyclowder.utils import StatusMessage
 
 clowder_version = int(os.getenv('CLOWDER_VERSION', '1'))
+# Import dataset API methods based on Clowder version
+if clowder_version == 2:
+    import pyclowder.api.v2.datasets as datasets
+else:
+    import pyclowder.api.v1.datasets as datasets
 
 def create_empty(connector, host, key, datasetname, description, parentid=None, spaceid=None):
     """Create a new dataset in Clowder.
@@ -30,10 +35,7 @@ def create_empty(connector, host, key, datasetname, description, parentid=None,
     spaceid -- id of the space to add dataset to
     """
     client = ClowderClient(host=host, key=key)
-    if clowder_version == 2:
-        datasetid = v2datasets.create_empty(connector, client, datasetname, description, parentid, spaceid)
-    else:
-        datasetid = v1datasets.create_empty(connector, client, datasetname, description, parentid, spaceid)
+    datasetid = datasets.create_empty(connector, client, datasetname, description, parentid, spaceid)
     return datasetid
 
 
@@ -47,10 +49,7 @@ def delete(connector, host, key, datasetid):
     datasetid -- the dataset to delete
     """
     client = ClowderClient(host=host, key=key)
-    if clowder_version == 2:
-        result = v2datasets.delete(connector, client, datasetid)
-    else:
-        result = v1datasets.delete(connector, client, datasetid)
+    result = datasets.delete(connector, client, datasetid)
     result.raise_for_status()
 
     return json.loads(result.text)
@@ -91,10 +90,7 @@ def download(connector, host, key, datasetid):
     datasetid -- the file that is currently being processed
     """
     client = ClowderClient(host=host, key=key)
-    if clowder_version == 2:
-        zipfile = v2datasets.download(connector, client, datasetid)
-    else:
-        zipfile = v1datasets.download(connector, client, datasetid)
+    zipfile = datasets.download(connector, client, datasetid)
     return zipfile
 
 
@@ -109,12 +105,8 @@ def download_metadata(connector, host, key, datasetid, extractor=None):
     extractor -- extractor name to filter results (if only one extractor's metadata is desired)
     """
     client = ClowderClient(host=host, key=key)
-    if clowder_version == 2:
-        result_json = v2datasets.download_metadata(connector, client, datasetid, extractor)
-        return result_json
-    else:
-        result_json = v1datasets.download_metadata(connector, client, datasetid, extractor)
-        return result_json
+    result_json = datasets.download_metadata(connector, client, datasetid, extractor)
+    return result_json
 
 
 def get_info(connector, host, key, datasetid):
@@ -127,10 +119,7 @@ def get_info(connector, host, key, datasetid):
     datasetid -- the dataset to get info of
     """
     client = ClowderClient(host=host, key=key)
-    if clowder_version == 2:
-        info = v2datasets.get_info(connector, client, datasetid)
-    else:
-        info = v1datasets.get_info(connector, client, datasetid)
+    info = datasets.get_info(connector, client, datasetid)
     return info
 
 
@@ -144,10 +133,7 @@ def get_file_list(connector, host, key, datasetid):
     datasetid -- the dataset to get filelist of
     """
     client = ClowderClient(host=host, key=key)
-    if clowder_version == 2:
-        file_list = v2datasets.get_file_list(connector, client, datasetid)
-    else:
-        file_list = v1datasets.get_file_list(connector, client, datasetid)
+    file_list = datasets.get_file_list(connector, client, datasetid)
     return file_list
 
 
@@ -163,10 +149,7 @@ def remove_metadata(connector, host, key, datasetid, extractor=None):
                     !!! ALL JSON-LD METADATA WILL BE REMOVED IF NO extractor PROVIDED !!!
     """
     client = ClowderClient(host=host, key=key)
-    if clowder_version == 2:
-        v2datasets.remove_metadata(connector, client, datasetid, extractor)
-    else:
-        v1datasets.remove_metadata(connector, client, datasetid, extractor)
+    datasets.remove_metadata(connector, client, datasetid, extractor)
 
 
 def submit_extraction(connector, host, key, datasetid, extractorname):
@@ -180,10 +163,7 @@ def submit_extraction(connector, host, key, datasetid, extractorname):
     extractorname -- registered name of extractor to trigger
     """
     client = ClowderClient(host=host, key=key)
-    if clowder_version == 2:
-        result_status_code = v2datasets.submit_extraction(connector, client, datasetid, extractorname)
-    else:
-        result_status_code = v1datasets.submit_extraction(connector, client, datasetid, extractorname)
+    return datasets.submit_extraction(connector, client, datasetid, extractorname)
 
 
 def submit_extractions_by_collection(connector, host, key, collectionid, extractorname, recursive=True):
@@ -242,7 +222,4 @@ def upload_metadata(connector, host, key, datasetid, metadata):
     metadata -- the metadata to be uploaded
     """
     client = ClowderClient(host=host, key=key)
-    if clowder_version == 2:
-        v2datasets.upload_metadata(connector, client, datasetid, metadata)
-    else:
-        v1datasets.upload_metadata(connector, client, datasetid, metadata)
+    datasets.upload_metadata(connector, client, datasetid, metadata)