use environment variable

Author: tcnichol

pyclowder/datasets.py

@@ -17,7 +17,7 @@
 
 clowder_version = int(os.getenv('CLOWDER_VERSION', '1'))
 
-def create_empty(connector, host, key, datasetname, description, parentid=None, spaceid=None,  clowder_version=1):
+def create_empty(connector, host, key, datasetname, description, parentid=None, spaceid=None):
     """Create a new dataset in Clowder.
 
     Keyword arguments:
@@ -37,7 +37,7 @@ def create_empty(connector, host, key, datasetname, description, parentid=None,
     return datasetid
 
 
-def delete(connector, host, key, datasetid,  clowder_version=1):
+def delete(connector, host, key, datasetid):
     """Delete dataset from Clowder.
 
     Keyword arguments:
@@ -56,7 +56,7 @@ def delete(connector, host, key, datasetid,  clowder_version=1):
     return json.loads(result.text)
 
 
-def delete_by_collection(connector, host, key, collectionid, recursive=True, delete_colls=False, clowder_version=1):
+def delete_by_collection(connector, host, key, collectionid, recursive=True, delete_colls=False):
     """Delete datasets from Clowder by iterating through collection.
 
     Keyword arguments:
@@ -81,7 +81,7 @@ def delete_by_collection(connector, host, key, collectionid, recursive=True, del
         delete_collection(connector, client, collectionid)
 
 
-def download(connector, host, key, datasetid, clowder_version=1):
+def download(connector, host, key, datasetid):
     """Download dataset to be processed from Clowder as zip file.
 
     Keyword arguments:
@@ -98,7 +98,7 @@ def download(connector, host, key, datasetid, clowder_version=1):
     return zipfile
 
 
-def download_metadata(connector, host, key, datasetid, extractor=None, clowder_version=1):
+def download_metadata(connector, host, key, datasetid, extractor=None):
     """Download dataset JSON-LD metadata from Clowder.
 
     Keyword arguments:
@@ -117,7 +117,7 @@ def download_metadata(connector, host, key, datasetid, extractor=None, clowder_v
         return result_json
 
 
-def get_info(connector, host, key, datasetid, clowder_version=1):
+def get_info(connector, host, key, datasetid):
     """Get basic dataset information from UUID.
 
     Keyword arguments:
@@ -134,7 +134,7 @@ def get_info(connector, host, key, datasetid, clowder_version=1):
     return info
 
 
-def get_file_list(connector, client, datasetid, clowder_version=1):
+def get_file_list(connector, client, datasetid):
     """Get list of files in a dataset as JSON object.
 
     Keyword arguments:
@@ -150,7 +150,7 @@ def get_file_list(connector, client, datasetid, clowder_version=1):
     return file_list
 
 
-def remove_metadata(connector, host, key, datasetid, extractor=None, clowder_version=1):
+def remove_metadata(connector, host, key, datasetid, extractor=None):
     """Delete dataset JSON-LD metadata from Clowder.
 
     Keyword arguments:
@@ -168,7 +168,7 @@ def remove_metadata(connector, host, key, datasetid, extractor=None, clowder_ver
         v1datasets.remove_metadata(connector, client, datasetid, extractor)
 
 
-def submit_extraction(connector, host, key, datasetid, extractorname, clowder_version=1):
+def submit_extraction(connector, host, key, datasetid, extractorname):
     """Submit dataset for extraction by given extractor.
 
     Keyword arguments:
@@ -185,7 +185,7 @@ def submit_extraction(connector, host, key, datasetid, extractorname, clowder_ve
         result_status_code = v1datasets.submit_extraction(connector, client, datasetid, extractorname)
 
 
-def submit_extractions_by_collection(connector, host, key, collectionid, extractorname, recursive=True, clowder_version=1):
+def submit_extractions_by_collection(connector, host, key, collectionid, extractorname, recursive=True):
     """Manually trigger an extraction on all datasets in a collection.
 
         This will iterate through all datasets in the given collection and submit them to
@@ -211,7 +211,7 @@ def submit_extractions_by_collection(connector, host, key, collectionid, extract
             submit_extractions_by_collection(connector, client, coll['id'], extractorname, recursive)
 
 
-def upload_tags(connector, host, key, datasetid, tags, clowder_version=1):
+def upload_tags(connector, host, key, datasetid, tags):
     """Upload dataset tag to Clowder.
 
     Keyword arguments:
@@ -230,7 +230,7 @@ def upload_tags(connector, host, key, datasetid, tags, clowder_version=1):
                             verify=connector.ssl_verify if connector else True)
 
 
-def upload_metadata(connector, host, key, datasetid, metadata, clowder_version=1):
+def upload_metadata(connector, host, key, datasetid, metadata):
     """Upload dataset JSON-LD metadata to Clowder.
 
     Keyword arguments:

pyclowder/extractors.py

@@ -24,6 +24,7 @@
 import pyclowder.files
 import pyclowder.datasets
 
+clowder_version = int(os.getenv('CLOWDER_VERSION', '1'))
 
 class Extractor(object):
     """Basic extractor.
@@ -228,7 +229,7 @@ def _get_extractor_info_v2(self):
         return current_extractor_info
 
 
-    def get_metadata(self, content, resource_type, resource_id, server=None, clowder_version=1):
+    def get_metadata(self, content, resource_type, resource_id, server=None):
         """Generate a metadata field.
 
         This will return a metadata dict that is valid JSON-LD. This will use the results as well as the information

pyclowder/files.py

@@ -29,7 +29,7 @@
 
 
 # pylint: disable=too-many-arguments
-def download(connector, host, key, fileid, intermediatefileid=None, ext="", clowder_version=1):
+def download(connector, host, key, fileid, intermediatefileid=None, ext=""):
     """Download file to be processed from Clowder.
 
     Keyword arguments:
@@ -48,7 +48,7 @@ def download(connector, host, key, fileid, intermediatefileid=None, ext="", clow
     return inputfilename
 
 
-def download_info(connector, host, key, fileid, clowder_version=1):
+def download_info(connector, host, key, fileid):
     """Download file summary metadata from Clowder.
 
     Keyword arguments:
@@ -65,7 +65,7 @@ def download_info(connector, host, key, fileid, clowder_version=1):
     return result.json()
 
 
-def download_metadata(connector, host, key, fileid, extractor=None, clowder_version=1):
+def download_metadata(connector, host, key, fileid, extractor=None):
     """Download file JSON-LD metadata from Clowder.
 
     Keyword arguments:
@@ -83,7 +83,7 @@ def download_metadata(connector, host, key, fileid, extractor=None, clowder_vers
     return result.json()
 
 
-def submit_extraction(connector, host, key, fileid, extractorname, clowder_version=1):
+def submit_extraction(connector, host, key, fileid, extractorname):
     """Submit file for extraction by given extractor.
 
     Keyword arguments:
@@ -101,7 +101,7 @@ def submit_extraction(connector, host, key, fileid, extractorname, clowder_versi
     return result.json()
 
 
-def submit_extractions_by_dataset(connector, host, key, datasetid, extractorname, ext=False, clowder_version=1):
+def submit_extractions_by_dataset(connector, host, key, datasetid, extractorname, ext=False):
     """Manually trigger an extraction on all files in a dataset.
 
         This will iterate through all files in the given dataset and submit them to
@@ -126,7 +126,7 @@ def submit_extractions_by_dataset(connector, host, key, datasetid, extractorname
         submit_extraction(connector, host, key, f['id'], extractorname)
 
 
-def submit_extractions_by_collection(connector, host, key, collectionid, extractorname, ext=False, recursive=True, clowder_version=1):
+def submit_extractions_by_collection(connector, host, key, collectionid, extractorname, ext=False, recursive=True):
     """Manually trigger an extraction on all files in a collection.
 
         This will iterate through all datasets in the given collection and submit them to
@@ -153,7 +153,7 @@ def submit_extractions_by_collection(connector, host, key, collectionid, extract
             submit_extractions_by_collection(connector, host, key, coll['id'], extractorname, ext, recursive)
 
 
-def upload_metadata(connector, host, key, fileid, metadata, clowder_version=1):
+def upload_metadata(connector, host, key, fileid, metadata):
     """Upload file JSON-LD metadata to Clowder.
 
     Keyword arguments:
@@ -171,7 +171,7 @@ def upload_metadata(connector, host, key, fileid, metadata, clowder_version=1):
 
 
 # pylint: disable=too-many-arguments
-def upload_preview(connector, host, key, fileid, previewfile, previewmetadata=None, preview_mimetype=None, clowder_version=1):
+def upload_preview(connector, host, key, fileid, previewfile, previewmetadata=None, preview_mimetype=None):
     """Upload preview to Clowder.
 
     Keyword arguments:
@@ -219,7 +219,7 @@ def upload_preview(connector, host, key, fileid, previewfile, previewmetadata=No
     return previewid
 
 
-def upload_tags(connector, host, key, fileid, tags, clowder_version=1):
+def upload_tags(connector, host, key, fileid, tags):
     """Upload file tag to Clowder.
 
     Keyword arguments:
@@ -238,7 +238,7 @@ def upload_tags(connector, host, key, fileid, tags, clowder_version=1):
                             verify=connector.ssl_verify if connector else True)
 
 
-def upload_thumbnail(connector, host, key, fileid, thumbnail, clowder_version=1):
+def upload_thumbnail(connector, host, key, fileid, thumbnail):
     """Upload thumbnail to Clowder.
 
     Keyword arguments:
@@ -267,7 +267,7 @@ def upload_thumbnail(connector, host, key, fileid, thumbnail, clowder_version=1)
     return thumbnailid
 
 
-def upload_to_dataset(connector, host, key, datasetid, filepath, check_duplicate=False, clowder_version=1):
+def upload_to_dataset(connector, host, key, datasetid, filepath, check_duplicate=False):
     """Upload file to existing Clowder dataset.
 
     Keyword arguments:
@@ -313,7 +313,7 @@ def upload_to_dataset(connector, host, key, datasetid, filepath, check_duplicate
             logger.error("unable to upload file %s (not found)", filepath)
 
 
-def _upload_to_dataset_local(connector, host, key, datasetid, filepath, clowder_version=1):
+def _upload_to_dataset_local(connector, host, key, datasetid, filepath):
     """Upload file POINTER to existing Clowder dataset. Does not copy actual file bytes.
 
     Keyword arguments: