Merge branch '50-clowder20-submit-file-to-extractor' of https://github.com/clowder-framework/pyclowder into 50-clowder20-submit-file-to-extractor

Author: max-zilla

pyclowder/api/v2/datasets.py

@@ -224,53 +224,6 @@ def submit_extraction(connector, host, key, datasetid, extractorname):
     return result.status_code
 
 
-# TODO not implemented in v2 yet
-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
-        the provided extractor.
-
-        Keyword arguments:
-        connector -- connector information, used to get missing parameters and send status updates
-        host -- the clowder host, including http and port, should end with a /
-        key -- the secret key to login to clowder
-        datasetid -- the dataset UUID to submit
-        extractorname -- registered name of extractor to trigger
-        recursive -- whether to also submit child collection datasets recursively (defaults to True)
-    """
-
-    dslist = get_datasets(connector, host, key, collectionid)
-
-    for ds in dslist:
-        submit_extraction(connector, host, key, ds['id'], extractorname)
-
-    if recursive:
-        childcolls = get_child_collections(connector, host, key, collectionid)
-        for coll in childcolls:
-            submit_extractions_by_collection(connector, host, key, coll['id'], extractorname, recursive)
-
-
-# TODO tags not implemented in v2
-def upload_tags(connector, host, key, datasetid, tags):
-    """Upload dataset tag to Clowder.
-
-    Keyword arguments:
-    connector -- connector information, used to get missing parameters and send status updates
-    host -- the clowder host, including http and port, should end with a /
-    key -- the secret key to login to clowder
-    datasetid -- the dataset that is currently being processed
-    tags -- the tags to be uploaded
-    """
-
-    connector.status_update(StatusMessage.processing, {"type": "dataset", "id": datasetid}, "Uploading dataset tags.")
-
-    headers = {'Content-Type': 'application/json'}
-    url = '%sapi/datasets/%s/tags?key=%s' % (host, datasetid, key)
-    result = connector.post(url, headers=headers, data=json.dumps(tags),
-                            verify=connector.ssl_verify if connector else True)
-
-
 def upload_metadata(connector, host, key, datasetid, metadata):
     """Upload dataset JSON-LD metadata to Clowder.
 
@@ -291,96 +244,3 @@ def upload_metadata(connector, host, key, datasetid, metadata):
                            verify=connector.ssl_verify if connector else True)
     result.raise_for_status()
 
-# TODO not done yet, need more testing
-class DatasetsApi(object):
-    """
-        API to manage the REST CRUD endpoints for datasets.
-    """
-
-    def __init__(self, client=None, host=None, key=None,
-                 username=None, password=None):
-        """Set client if provided otherwise create new one"""
-        if client:
-            self.client = client
-        else:
-            self.client = ClowderClient(host=host, key=key,
-                                        username=username, password=password)
-
-    def datasets_get(self):
-        """
-        Get the list of all available datasets.
-
-        :return: Full list of datasets.
-        :rtype: `requests.Response`
-        """
-        logging.debug("Getting all datasets")
-        try:
-            return self.client.get("/datasets")
-        except Exception as e:
-            logging.error("Error retrieving dataset list: %s", str(e))
-
-    def dataset_get(self, dataset_id):
-        """
-        Get a specific dataset by id.
-
-        :return: Sensor object as JSON.
-        :rtype: `requests.Response`
-        """
-        logging.debug("Getting dataset %s" % dataset_id)
-        try:
-            return self.client.get("/datasets/%s" % dataset_id)
-        except Exception as e:
-            logging.error("Error retrieving dataset %s: %s" % (dataset_id, str(e)))
-
-    def create_empty(self, dataset_id):
-        """
-        Create dataset.
-
-        :return: If successful or not.
-        :rtype: `requests.Response`
-        """
-        logging.debug("Adding dataset")
-        try:
-            return self.client.post("/datasets/createempty", dataset_id)
-        except Exception as e:
-            logging.error("Error adding datapoint %s: %s" % (dataset_id, str(e)))
-
-    def dataset_delete(self, dataset_id):
-        """
-        Delete a specific dataset by id.
-
-        :return: If successfull or not.
-        :rtype: `requests.Response`
-        """
-        logging.debug("Deleting dataset %s" % dataset_id)
-        try:
-            return self.client.delete("/datasets/%s" % dataset_id)
-        except Exception as e:
-            logging.error("Error retrieving dataset %s: %s" % (dataset_id, str(e)))
-
-    def upload_file(self, dataset_id, file):
-        """
-        Add a file to a dataset.
-
-        :return: If successfull or not.
-        :rtype: `requests.Response`
-        """
-        logging.debug("Uploading a file to dataset %s" % dataset_id)
-        try:
-            return self.client.post_file("/uploadToDataset/%s" % dataset_id, file)
-        except Exception as e:
-            logging.error("Error upload to dataset %s: %s" % (dataset_id, str(e)))
-
-    def add_metadata(self, dataset_id, metadata):
-        """
-        Add a file to a dataset
-
-        :return: If successfull or not.
-        :rtype: `requests.Response`
-        """
-
-        logging.debug("Update metadata of dataset %s" % dataset_id)
-        try:
-            return self.client.post("/datasets/%s/metadata" % dataset_id, metadata)
-        except Exception as e:
-            logging.error("Error upload to dataset %s: %s" % (dataset_id, str(e)))

pyclowder/api/v2/files.py

@@ -125,60 +125,6 @@ def submit_extraction(connector, host, key, fileid, extractorname):
     return result
 
 
-# TODO not implemented in v2
-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
-        the provided extractor.
-
-        Keyword arguments:
-        connector -- connector information, used to get missing parameters and send status updates
-        host -- the clowder host, including http and port, should end with a /
-        key -- the secret key to login to clowder
-        datasetid -- the dataset UUID to submit
-        extractorname -- registered name of extractor to trigger
-        ext -- extension to filter. e.g. 'tif' will only submit TIFF files for extraction.
-    """
-
-    filelist = get_file_list(connector, host, key, datasetid)
-
-    for f in filelist:
-        # Only submit files that end with given extension, if specified
-        if ext and not f['filename'].endswith(ext):
-            continue
-
-        submit_extraction(connector, host, key, f['id'], extractorname)
-
-
-# TODO not implemented in v2
-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
-        the submit_extractions_by_dataset(). Does not operate recursively if there are nested collections.
-
-        Keyword arguments:
-        connector -- connector information, used to get missing parameters and send status updates
-        host -- the clowder host, including http and port, should end with a /
-        key -- the secret key to login to clowder
-        collectionid -- the collection UUID to submit
-        extractorname -- registered name of extractor to trigger
-        ext -- extension to filter. e.g. 'tif' will only submit TIFF files for extraction
-        recursive -- whether to also submit child collection files recursively (defaults to True)
-    """
-
-    dslist = get_datasets(connector, host, key, collectionid)
-
-    for ds in dslist:
-        submit_extractions_by_dataset(connector, host, key, ds['id'], extractorname, ext)
-
-    if recursive:
-        childcolls = get_child_collections(connector, host, key, collectionid)
-        for coll in childcolls:
-            submit_extractions_by_collection(connector, host, key, coll['id'], extractorname, ext, recursive)
-
-
 def upload_metadata(connector, host, key, fileid, metadata):
     """Upload file JSON-LD metadata to Clowder.