Updated in sync with PR 678 in clowder backend

Author: ddey2

pyclowder/api/v1/datasets.py

@@ -260,15 +260,15 @@ def upload_metadata(connector, client, datasetid, metadata):
                            verify=connector.ssl_verify if connector else True)
     result.raise_for_status()
 
-def upload_thumbnail(connector, host, key, datasetid, thumbnailid):
+def upload_thumbnail(connector, host, key, datasetid, thumbnail):
     """Upload thumbnail 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 the thumbnail should be associated with
-        thumbnailid -- the file containing the thumbnail
+        thumbnail -- the file containing the thumbnail
         """
     logger = logging.getLogger(__name__)
     logger.info("Upload thumbnails to datasets is not available in V1")

pyclowder/api/v2/datasets.py

@@ -316,22 +316,38 @@ def upload_preview(connector, client, datasetid, previewfile, previewmetadata=No
 
     return preview_id
 
-def upload_thumbnail(connector, client, datasetid, thumbnailid):
+def upload_thumbnail(connector, client, datasetid, thumbnail):
     """Upload thumbnail 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 the thumbnail should be associated with
-            thumbnailid -- the file containing the thumbnail
+            thumbnail -- the file containing the thumbnail
             """
 
+    logger = logging.getLogger(__name__)
+
     connector.message_process({"type": "dataset", "id": datasetid}, "Uploading thumbnail to dataset.")
-    headers = {'Content-Type': 'application/json',
-               'X-API-KEY': client.key}
-    url = '%s/api/v2/datasets/%s/thumbnail/%s' % (client.host, datasetid, thumbnailid)
-    result = connector.patch(url, headers=headers,
-                             verify=connector.ssl_verify if connector else True)
-    return result.json()["thumbnail_id"]
 
+    url = '%s/api/v2/thumbnails' % (client.host)
+
+    if os.path.exists(thumbnail):
+        file_data = {"file": open(thumbnail, 'rb')}
+        headers = {"X-API-KEY": client.key}
+        result = connector.post(url, files=file_data, headers=headers,
+                                verify=connector.ssl_verify if connector else True)
+
+        thumbnailid = result.json()['id']
+        logger.debug("uploaded thumbnail id = [%s]", thumbnailid)
+
+        connector.message_process({"type": "dataset", "id": datasetid}, "Uploading thumbnail to dataset.")
+        headers = {'Content-Type': 'application/json',
+                   'X-API-KEY': client.key}
+        url = '%s/api/v2/datasets/%s/thumbnail/%s' % (client.host, datasetid, thumbnailid)
+        result = connector.patch(url, headers=headers,
+                                 verify=connector.ssl_verify if connector else True)
+        return result.json()["thumbnail_id"]
+    else:
+        logger.error("unable to upload thumbnail %s to dataset %s", thumbnail, datasetid)

pyclowder/api/v2/files.py

@@ -273,24 +273,39 @@ def upload_tags(connector, client, fileid, tags):
                             verify=connector.ssl_verify if connector else True)
 
 
-def upload_thumbnail(connector, client, fileid, thumbnailid):
+def upload_thumbnail(connector, client, fileid, thumbnail):
     """Upload thumbnail 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
     fileid -- the file that the thumbnail should be associated with
-    thumbnailid -- the file containing the thumbnail
+    thumbnail -- the file containing the thumbnail
     """
 
+    logger = logging.getLogger(__name__)
+
     connector.message_process({"type": "file", "id": fileid}, "Uploading thumbnail to file.")
-    headers = {'Content-Type': 'application/json',
-               'X-API-KEY': client.key}
-    url = '%s/api/v2/files/%s/thumbnail/%s' % (client.host, fileid, thumbnailid)
-    result = connector.patch(url, headers=headers,
-                             verify=connector.ssl_verify if connector else True)
-    return result.json()["thumbnail_id"]
+
+    url = '%s/api/v2/thumbnails' % (client.host)
+
+    if os.path.exists(thumbnail):
+        file_data = {"file": open(thumbnail, 'rb')}
+        headers = {"X-API-KEY": client.key}
+        result = connector.post(url, files=file_data, headers=headers,
+                                verify=connector.ssl_verify if connector else True)
+
+        thumbnailid = result.json()['id']
+        logger.debug("uploaded thumbnail id = [%s]", thumbnailid)
+        headers = {'Content-Type': 'application/json',
+                   'X-API-KEY': client.key}
+        url = '%s/api/v2/files/%s/thumbnail/%s' % (client.host, fileid, thumbnailid)
+        result = connector.patch(url, headers=headers,
+                                 verify=connector.ssl_verify if connector else True)
+        return result.json()["thumbnail_id"]
+    else:
+        logger.error("unable to upload thumbnail %s to file %s", thumbnail, fileid)
 
 
 def upload_to_dataset(connector, client, datasetid, filepath, check_duplicate=False):

pyclowder/datasets.py

@@ -252,17 +252,17 @@ def upload_preview(connector, host, key, datasetid, previewfile, previewmetadata
     return preview_id
 
 
-def upload_thumbnail(connector, host, key, datasetid, thumbnailid):
+def upload_thumbnail(connector, host, key, datasetid, thumbnail):
     """Upload thumbnail 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 the thumbnail should be associated with
-            thumbnailid -- the file containing the thumbnail
+            thumbnail -- the file containing the thumbnail
             """
     logger = logging.getLogger(__name__)
 
     client = ClowderClient(host=host, key=key)
-    return datasets.upload_thumbnail(connector, client, datasetid, thumbnailid)
+    return datasets.upload_thumbnail(connector, client, datasetid, thumbnail)

sample-extractors/test-dataset-extractor/test-dataset-extractor.py

@@ -77,12 +77,12 @@ def process_message(self, connector, host, secret_key, resource, parameters):
             logger.info("Preview %s uploaded to dataset successfully ", preview_id)
 
         # Uploaing thumbnail
-        thumbnailid = "64e4bed765b3b301d4965820"
-        thumbnail_id = pyclowder.datasets.upload_thumbnail(connector, host, secret_key, dataset_id, thumbnailid)
-        if thumbnail_id == thumbnailid:
-            logger.info("Success in uploading thumbnail to file")
+        thumbnail = "thumbnail.jpeg"
+        thumbnail_id = pyclowder.datasets.upload_thumbnail(connector, host, secret_key, dataset_id, thumbnail)
+        if thumbnail_id is None:
+            logger.info("Error in uploading thumbnail to dataset")
         else:
-            logger.error("Error in uploading thumbnail to file")
+            logger.error("Success in uploading thumbnail to dataset")
 
 
 

sample-extractors/test-dataset-extractor/thumbnail.jpeg

@@ -63,12 +63,12 @@ def process_message(self, connector, host, secret_key, resource, parameters):
             logger.error("Error in downloading file summary")
 
         # Uploaing thumbnail
-        thumbnailid = "64ac275727c83a6786dd9fd4"
-        thumbnail_id = pyclowder.files.upload_thumbnail(connector, host, secret_key, file_id, thumbnailid)
-        if thumbnail_id == thumbnailid:
-            logger.info("Success in uploading thumbnail to file")
+        thumbnail = "thumbnail.jpeg"
+        thumbnail_id = pyclowder.files.upload_thumbnail(connector, host, secret_key, file_id, thumbnail)
+        if thumbnail_id is None:
+            logger.info("Error in uploading thumbnail to file")
         else:
-            logger.error("Error in uploading thumbnail to file")
+            logger.error("Success in uploading thumbnail to file")