Updating elasticsearch and date centroid.

Author: rhysrevans3

extraction_methods/plugins/datetime_bound_to_centroid.py

@@ -66,10 +66,20 @@ def __init__(self, **kwargs):
         if "format" not in self.output_term:
             self.output_term["format"] = "%Y-%m-%dT%H:%M:%SZ"
 
+    def strip_time(self, datetime_str:str, datetime_format:str) -> "datetime":
+        try: 
+            return datetime.strptime(datetime_str, datetime_format)
+        except ValueError as v:
+            if len(v.args) > 0 and v.args[0].startswith('unconverted data remains: '):
+                datetime_str = datetime_str[:-(len(v.args[0]) - 26)]
+                return datetime.strptime(datetime_str, datetime_format)
+        else:
+            raise
+
     def run(self, body: dict, **kwargs):
 
-        start_datetime = datetime.strptime(body[self.start_term["name"]], self.start_term["format"])
-        end_datetime = datetime.strptime(body[self.end_term["name"]], self.end_term["format"])
+        start_datetime = self.strip_time(body[self.start_term["name"]], self.start_term["format"])
+        end_datetime = self.strip_time(body[self.end_term["name"]], self.end_term["format"])
 
         centroid_datetime = start_datetime + (end_datetime - start_datetime) / 2
 

extraction_methods/plugins/elasticsearch_aggregation.py

@@ -69,23 +69,23 @@ def __init__(self, **kwargs):
         if not hasattr(self, "request_tiemout"):
             self.request_tiemout = 15
 
-        for position, geo_bound_term in enumerate(self.geo_bounds):
+        for position, geo_bound_term in enumerate(getattr(self, "geo_bounds", [])):
             if "name" not in geo_bound_term:
                 self.geo_bounds[position]["name"] = geo_bound_term["key"]
 
-        for position, min_term in enumerate(self.min):
+        for position, min_term in enumerate(getattr(self, "min", [])):
             if "name" not in min_term:
                 self.min[position]["name"] = min_term["key"]
 
-        for position, max_term in enumerate(self.max):
+        for position, max_term in enumerate(getattr(self, "max", [])):
             if "name" not in max_term:
                 self.max[position]["name"] = max_term["key"]
 
-        for position, sum_term in enumerate(self.sum):
+        for position, sum_term in enumerate(getattr(self, "sum", [])):
             if "name" not in sum_term:
                 self.sum[position]["name"] = sum_term["key"]
 
-        for position, list_term in enumerate(self.list):
+        for position, list_term in enumerate(getattr(self, "list", [])):
             if "name" not in list_term:
                 self.list[position]["name"] = list_term["key"]
 
@@ -147,7 +147,7 @@ def extract_facet(self, facets: list):
                 elif "bounds" in self.aggregations[facet["name"]].keys():
                     value = self.aggregations[facet["name"]]["bounds"]
 
-                else:
+                elif "value" in self.aggregations[facet["name"]].keys():
                     value = self.aggregations[facet["name"]]["value"]
 
                 self.metadata[facet["name"]] = value

extraction_methods/plugins/lambda.py

@@ -42,7 +42,7 @@ class LambdaExtract(ExtractionMethod):
 
     .. code-block:: yaml
 
-        - method: general_function
+        - method: lambda
           function: 'lambda x: x * x'
           input_args:
             - hello