Merge pull request #231 from ASFHyP3/develop

Release v0.5.1

Author: asjohnston-asf

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.5.1]
+### Fixed
+- Resolved HTTP 500 error when submitting jobs with a resolution with decimal precision (e.g. `30.0`)
+
 ## [0.5.0]
 ### Changed
 - The `dem_matching`, `speckle_filter`, `include_dem`, and `include_inc_map` api parameters are now booleans instead of strings.

api/src/hyp3_api/handlers.py

@@ -11,7 +11,8 @@
 from flask_cors import CORS
 
 from hyp3_api import DYNAMODB_RESOURCE, connexion_app
-from hyp3_api.util import format_time, get_remaining_jobs_for_user, get_request_time_expression
+from hyp3_api.util import convert_floats_to_decimals, format_time, get_remaining_jobs_for_user, \
+    get_request_time_expression
 from hyp3_api.validation import GranuleValidationError, validate_granules
 
 
@@ -62,6 +63,7 @@ def post_jobs(body, user):
         job['status_code'] = 'PENDING'
         job['request_time'] = request_time
         if not body.get('validate_only'):
+            job = convert_floats_to_decimals(job)
             table.put_item(Item=job)
 
     return body

api/src/hyp3_api/util.py

@@ -1,4 +1,5 @@
 from datetime import datetime, timezone
+from decimal import Decimal
 from os import environ
 
 from boto3.dynamodb.conditions import Key
@@ -39,3 +40,13 @@ def get_request_time_expression(start, end):
         return key.gte(formatted_start)
     if formatted_end:
         return key.lte(formatted_end)
+
+
+def convert_floats_to_decimals(element):
+    if type(element) is float:
+        return Decimal(element)
+    if type(element) is list:
+        return [convert_floats_to_decimals(item) for item in element]
+    if type(element) is dict:
+        return {key: convert_floats_to_decimals(value) for key, value in element.items()}
+    return element

api/tests/conftest.py

@@ -51,7 +51,8 @@ def make_job(granule='S1B_IW_SLC__1SDV_20200604T082207_20200604T082234_021881_02
     job = {
         'job_type': job_type,
         'job_parameters': {
-            'granule': granule
+            'granule': granule,
+            'resolution': 30.0,
         }
     }
     if name is not None: