when uploading previews, metadata cannot be posted unless a section_id is included in the metadata. Since section_id is not required for preview metadata in clowder, this changes the requirement that section_id must be present to post metadata.

Also, if metadata is sent to upload_preview without a section_id, an error is thrown because the method checks for section_id key and it is not present.

changelog entry added

Updated changelog.

fixed per Sandeep's comment

check for section_id key in previewmetadata in collections.upload_preview

Updated changelog.

Author: toddn

CHANGELOG.md

@@ -4,7 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/) 
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## Unreleased
+## [Unreleased]
+### Changed
+- files.upload_preview and collections.upload_preview does not require section_id for metadata [CATS-935](https://opensource.ncsa.illinois.edu/jira/browse/CATS-935)
 
 ### Added
 - Docker compose file for starting up the Clowder stack [BD-2226](https://opensource.ncsa.illinois.edu/jira/browse/BD-2226)
@@ -38,4 +40,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Now has onbuild version of pyclowder
 - release.sh will now tag images (e.g. this will be tagged 2.0.3 2.0 and 2)
 - RABBITMQ_URI is now set to amqp://guest:guest@rabbitmq/%2F to allow easy deployment
-  using docker-compose of clowder
+  using docker-compose of clowder

pyclowder/collections.py

@@ -137,7 +137,7 @@ def upload_preview(connector, host, key, collectionid, previewfile, previewmetad
     logger.debug("preview id = [%s]", previewid)
 
     # associate uploaded preview with original collection
-    if collectionid and not (previewmetadata and previewmetadata['section_id']):
+    if collectionid and not (previewmetadata and 'section_id' in previewmetadata and previewmetadata['section_id']):
         url = '%sapi/collections/%s/previews/%s?key=%s' % (host, collectionid, previewid, key)
         result = requests.post(url, headers=headers, data=json.dumps({}),
                                verify=connector.ssl_verify if connector else True)

pyclowder/files.py

@@ -222,7 +222,7 @@ def upload_preview(connector, host, key, fileid, previewfile, previewmetadata, p
     logger.debug("preview id = [%s]", previewid)
 
     # associate uploaded preview with orginal file
-    if fileid and not (previewmetadata and previewmetadata['section_id']):
+    if fileid and not (previewmetadata and 'section_id' in previewmetadata and previewmetadata['section_id']):
         url = '%sapi/files/%s/previews/%s?key=%s' % (host, fileid, previewid, key)
         result = connector.post(url, headers=headers, data=json.dumps({}),
                                 verify=connector.ssl_verify if connector else True)