clean up environment variable

Author: max-zilla

pyclowder/connectors.py

@@ -240,7 +240,7 @@ def _build_resource(self, body, host, secret_key, clowder_version):
 
         elif resource_type == "file":
             ext = os.path.splitext(filename)[1]
-            if clowder_version == 2.0:
+            if clowder_version == 2:
                 return {
                     "type": "file",
                     "id": fileid,
@@ -405,14 +405,14 @@ def _process_message(self, body):
         if not host.endswith('/'): host += '/'
         secret_key = body.get('secretKey', '')
         retry_count = 0 if 'retry_count' not in body else body['retry_count']
-        clowder_version = float(body.get('clowderVersion', os.getenv('clowder_version', '1.0')))
+        clowder_version = int(body.get('clowderVersion', os.getenv('CLOWDER_VERSION', '1')))
         resource = self._build_resource(body, host, secret_key, clowder_version)
         if not resource:
             logging.error("No resource found, this is bad.")
             return
 
         # register extractor
-        if clowder_version != 2.0:
+        if clowder_version != 2:
             url = "%sapi/extractors" % source_host
             if url not in Connector.registered_clowder:
                 Connector.registered_clowder.append(url)

pyclowder/datasets.py

@@ -15,7 +15,7 @@
 from pyclowder.collections import get_datasets, get_child_collections, delete as delete_collection
 from pyclowder.utils import StatusMessage
 
-clowder_version = float(os.getenv('clowder_version', '1.0'))
+clowder_version = int(os.getenv('CLOWDER_VERSION', '1'))
 
 def create_empty(connector, host, key, datasetname, description, parentid=None, spaceid=None):
     """Create a new dataset in Clowder.
@@ -29,7 +29,7 @@ def create_empty(connector, host, key, datasetname, description, parentid=None,
     parentid -- id of parent collection
     spaceid -- id of the space to add dataset to
     """
-    if clowder_version >= 2.0:
+    if clowder_version == 2:
         datasetid = v2datasets.create_empty(connector, host, key, datasetname, description, parentid, spaceid)
     else:
         datasetid = v1datasets.create_empty(connector, host, key, datasetname, description, parentid, spaceid)
@@ -45,7 +45,7 @@ def delete(connector, host, key, datasetid):
     key -- the secret key to login to clowder
     datasetid -- the dataset to delete
     """
-    if clowder_version >= 2.0:
+    if clowder_version == 2:
         result = v2datasets.delete(connector, host, key, datasetid)
     else:
         result = v2datasets.delete(connector, host, key, datasetid)
@@ -87,7 +87,7 @@ def download(connector, host, key, datasetid):
     key -- the secret key to login to clowder
     datasetid -- the file that is currently being processed
     """
-    if clowder_version >= 2.0:
+    if clowder_version == 2:
         zipfile = v2datasets.download(connector, host, key, datasetid)
     else:
         zipfile = v1datasets.download(connector, host, key, datasetid)
@@ -104,7 +104,7 @@ def download_metadata(connector, host, key, datasetid, extractor=None):
     datasetid -- the dataset to fetch metadata of
     extractor -- extractor name to filter results (if only one extractor's metadata is desired)
     """
-    if clowder_version >= 2.0:
+    if clowder_version == 2:
         result_json = v2datasets.download_metadata(connector, host, key, datasetid, extractor)
         return result_json
     else:
@@ -121,7 +121,7 @@ def get_info(connector, host, key, datasetid):
     key -- the secret key to login to clowder
     datasetid -- the dataset to get info of
     """
-    if clowder_version >= 2.0:
+    if clowder_version == 2:
         info = v2datasets.get_info(connector, host, key, datasetid)
     else:
         info = v1datasets.get_info(connector, host, key, datasetid)
@@ -137,7 +137,7 @@ def get_file_list(connector, host, key, datasetid):
     key -- the secret key to login to clowder
     datasetid -- the dataset to get filelist of
     """
-    if clowder_version >= 2.0:
+    if clowder_version == 2:
         file_list = v2datasets.get_file_list(connector, host, key, datasetid)
     else:
         file_list = v1datasets.get_file_list(connector, host, key, datasetid)
@@ -155,7 +155,7 @@ def remove_metadata(connector, host, key, datasetid, extractor=None):
     extractor -- extractor name to filter deletion
                     !!! ALL JSON-LD METADATA WILL BE REMOVED IF NO extractor PROVIDED !!!
     """
-    if clowder_version >= 2.0:
+    if clowder_version == 2:
         v2datasets.remove_metadata(connector, host, key, datasetid, extractor)
     else:
         v1datasets.remove_metadata(connector, host, key, datasetid, extractor)
@@ -171,7 +171,7 @@ def submit_extraction(connector, host, key, datasetid, extractorname):
     datasetid -- the dataset UUID to submit
     extractorname -- registered name of extractor to trigger
     """
-    if clowder_version >= 2.0:
+    if clowder_version == 2:
         result_status_code = v2datasets.submit_extraction(connector, host, key, datasetid, extractorname)
     else:
         result_status_code = v1datasets.submit_extraction(connector, host, key, datasetid, extractorname)
@@ -232,7 +232,7 @@ def upload_metadata(connector, host, key, datasetid, metadata):
     datasetid -- the dataset that is currently being processed
     metadata -- the metadata to be uploaded
     """
-    if clowder_version >= 2.0:
+    if clowder_version == 2:
         v2datasets.upload_metadata(connector, host, key, datasetid, metadata)
     else:
         v1datasets.upload_metadata(connector, host, key, datasetid, metadata)

pyclowder/extractors.py

@@ -26,7 +26,7 @@
 
 from dotenv import load_dotenv
 load_dotenv()
-clowder_version = float(os.getenv('clowder_version', '1.0'))
+clowder_version = float(os.getenv('CLOWDER_VERSION', '1'))
 
 
 class Extractor(object):
@@ -266,7 +266,7 @@ def get_metadata(self, content, resource_type, resource_id, server=None):
                 if not self._check_key(k, self.extractor_info['contexts']):
                     logger.debug("Simple check could not find %s in contexts" % k)
         # TODO generate clowder2.0 extractor info
-        if clowder_version >= 2.0:
+        if clowder_version == 2:
             new_extractor_info = self._get_extractor_info_v2()
             md = dict()
             md["file_version"] = 1

pyclowder/files.py

@@ -41,7 +41,7 @@ def download(connector, host, key, fileid, intermediatefileid=None, ext=""):
     intermediatefileid -- either same as fileid, or the intermediate file to be used
     ext -- the file extension, the downloaded file will end with this extension
     """
-    if clowder_version >= 2.0:
+    if clowder_version == 2:
         inputfilename = v2files.download(connector, host, key, fileid, intermediatefileid, ext)
     else:
         inputfilename = v1files.download(connector, host, key, fileid, intermediatefileid, ext)
@@ -58,7 +58,7 @@ def download_info(connector, host, key, fileid):
     fileid -- the file to fetch metadata of
     """
 
-    if clowder_version >= 2.0:
+    if clowder_version == 2:
         result = v2files.download_info(connector, host, key, fileid)
     else:
         result = v1files.download_info(connector, host, key, fileid)
@@ -75,7 +75,7 @@ def download_metadata(connector, host, key, fileid, extractor=None):
     fileid -- the file to fetch metadata of
     extractor -- extractor name to filter results (if only one extractor's metadata is desired)
     """
-    if clowder_version >= 2.0:
+    if clowder_version == 2:
         result = v2files.download_metadata(connector, host, key, fileid, extractor)
     else:
         result = v1files.download_metadata(connector, host, key, fileid, extractor)
@@ -92,7 +92,7 @@ def submit_extraction(connector, host, key, fileid, extractorname):
     fileid -- the file UUID to submit
     extractorname -- registered name of extractor to trigger
     """
-    if clowder_version >= 2.0:
+    if clowder_version == 2:
         result = v2files.submit_extraction(connector, host, key, fileid, extractorname)
     else:
         result = v1files.submit_extraction(connector, host, key, fileid, extractorname)
@@ -162,7 +162,7 @@ def upload_metadata(connector, host, key, fileid, metadata):
     metadata -- the metadata to be uploaded
     """
 
-    if clowder_version >= 2.0:
+    if clowder_version == 2:
         v2files.upload_metadata(connector, host, key, fileid, metadata)
     else:
         v1files.upload_metadata(connector, host, key, fileid, metadata)
@@ -277,7 +277,7 @@ def upload_to_dataset(connector, host, key, datasetid, filepath, check_duplicate
     check_duplicate -- check if filename already exists in dataset and skip upload if so
     """
 
-    if clowder_version >= 2.0:
+    if clowder_version == 2:
         v2files.upload_to_dataset(connector, host, key, datasetid, filepath, check_duplicate)
     else:
         logger = logging.getLogger(__name__)
@@ -322,7 +322,7 @@ def _upload_to_dataset_local(connector, host, key, datasetid, filepath):
     filepath -- path to file
     """
 
-    if clowder_version >= 2.0:
+    if clowder_version == 2:
         uploadedfileid = v2files._upload_to_dataset_local(connector, host, key, datasetid, filepath)
     else:
         uploadedfileid = v1files._upload_to_dataset_local(connector, host, key, datasetid, filepath)