split out json-ifying datetimes and numpy to a separate function so that we dont do it for internal calls

Author: phirstgemini

recipe_system/cal_service/calrequestlib.py

@@ -83,13 +83,6 @@ def get_descriptors_dict(ad):
                 dv = dv[0] if all(v == dv[0] for v in dv) else "+".join(
                     [str(v) for v in dv])
 
-            # Convert datetime types to iso representation
-            if isinstance(dv, (datetime.datetime, datetime.date, datetime.time)):
-                dv = dv.isoformat()
-            # Deal with numpy float types
-            if isinstance(dv, numpy.float32):
-                dv = float(dv)
-
             desc_dict[desc_name] = dv
 
 

recipe_system/cal_service/remotedb.py

@@ -1,6 +1,6 @@
 # Defines the RemoteDB class for calibration returns. This is a high-level
 # interface to FITSstore. It may be subclassed in future
-
+import datetime
 from os import path, makedirs
 from io import BytesIO
 import json
@@ -9,6 +9,8 @@
 import urllib.parse
 import urllib.error
 
+import numpy
+
 from .caldb import CalDB, CalReturn
 from .calrequestlib import get_cal_requests, generate_md5_digest
 from .file_getter import GetterError, get_request
@@ -148,8 +150,19 @@ def _store_calibration(self, cal, caltype=None):
             raise
 
 
+def make_dict_json_encodable(desc_dict):
+    for d in desc_dict:
+        if isinstance(desc_dict[d],
+                      (datetime.datetime, datetime.date, datetime.time)):
+            desc_dict[d] = desc_dict[d].isoformat()
+        if isinstance(desc_dict[d], numpy.float32):
+            desc_dict[d] = float(desc_dict[d])
+    return desc_dict
+
+
 def retrieve_calibration(rqurl, rq, howmany=1):
-    postdata = json.dumps({'tags': list(rq.tags), 'descriptors': rq.descriptors})
+    postdata = json.dumps({'tags': list(rq.tags),
+                           'descriptors': make_dict_json_encodable(rq.descriptors)})
     try:
         calrq = urllib.request.Request(rqurl)
         u = urllib.request.urlopen(calrq, postdata.encode('utf-8'))