Re-organize examples as test_TASK_TYPE.py

Author: blokhin

mpds_ml_labs/common.py

@@ -1,6 +1,10 @@
 
 import os
 from ConfigParser import ConfigParser
+from urllib import urlencode
+
+import ujson as json
+import pg8000
 
 
 DATA_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '../data'))
@@ -33,7 +37,6 @@
 
 
 def connect_database():
-    import pg8000
 
     assert KNN_TABLE
 
@@ -47,3 +50,17 @@ def connect_database():
     cursor = connection.cursor()
 
     return cursor, connection
+
+
+def make_request(req, address, data={}, httpverb='POST', headers={}):
+
+    address += '?' + urlencode(data)
+
+    if httpverb == 'GET':
+        response, content = req.request(address, httpverb, headers=headers)
+
+    else:
+        headers.update({'Content-type': 'application/x-www-form-urlencoded'})
+        response, content = req.request(address, httpverb, headers=headers, body=urlencode(data))
+
+    return json.loads(content)

mpds_ml_labs/test_design_client.py

@@ -0,0 +1,33 @@
+
+import time
+import httplib2
+import ujson as json
+
+from common import make_request
+
+
+remote = httplib2.Http()
+
+LABS_SERVER_ADDR = 'http://127.0.0.1:5000/design'
+
+# NB. mind prediction_ranges.prediction_ranges
+sample = {
+    'z': [200, 265],
+    'y': [-325, -250],
+    'x': [11, 28],
+    'k': [150, 225],
+    'w': [1, 3],
+    'm': [2000, 2700],
+    'd': [175, 1100],
+    't': [-0.5, 3]
+}
+
+if __name__ == '__main__':
+    starttime = time.time()
+
+    answer = make_request(remote, LABS_SERVER_ADDR, {'numerics': json.dumps(sample)})
+    if 'error' in answer:
+        raise RuntimeError(answer['error'])
+
+    print(answer['vis_cif'])
+    print("Done in %1.2f sc" % (time.time() - starttime))

mpds_ml_labs/test_design.py renamed to mpds_ml_labs/test_design_cmd.py

@@ -1,36 +1,24 @@
 
 import sys
 import time
-from urllib import urlencode
 
 import httplib2
-import ujson as json
 import numpy as np
-
 from mpds_client import MPDSDataRetrieval, APIError
 
 from prediction import prop_models
 from struct_utils import detect_format, poscar_to_ase, refine, get_formula, sgn_to_crsystem
 from cif_utils import cif_to_ase
-from common import API_KEY, API_ENDPOINT
+from common import API_KEY, API_ENDPOINT, make_request
 
 
-req = httplib2.Http()
+remote = httplib2.Http()
 client = MPDSDataRetrieval(api_key=API_KEY, endpoint=API_ENDPOINT)
-ARITY = {1: 'unary', 2: 'binary', 3: 'ternary', 4: 'quaternary', 5: 'quinary'}
-
-def make_request(address, data={}, httpverb='POST', headers={}):
 
-    address += '?' + urlencode(data)
+LABS_SERVER_ADDR = 'http://127.0.0.1:5000/predict'
 
-    if httpverb == 'GET':
-        response, content = req.request(address, httpverb, headers=headers)
-
-    else:
-        headers.update({'Content-type': 'application/x-www-form-urlencoded'})
-        response, content = req.request(address, httpverb, headers=headers, body=urlencode(data))
+ARITY = {1: 'unary', 2: 'binary', 3: 'ternary', 4: 'quaternary', 5: 'quinary'}
 
-    return json.loads(content)
 
 if __name__ == '__main__':
 
@@ -75,7 +63,7 @@ def make_request(address, data={}, httpverb='POST', headers={}):
             'lattices': sgn_to_crsystem(ase_obj.info['spacegroup'].no)
         }
 
-    answer = make_request('http://127.0.0.1:5000/predict', {'structure': structure})
+    answer = make_request(remote, LABS_SERVER_ADDR, {'structure': structure})
     if 'error' in answer:
         raise RuntimeError(answer['error'])
 
@@ -85,10 +73,9 @@ def make_request(address, data={}, httpverb='POST', headers={}):
             resp = client.get_dataframe(tpl_query)
         except APIError as e:
             prop_models[prop_id]['factual'] = None
-            if e.code == 1:
-                continue
-            else:
-                raise
+            if e.code != 1:
+                print("While checking against the MPDS an error %s occured" % e.code)
+            continue
 
         resp['Value'] = resp['Value'].astype('float64') # to treat values out of bounds given as str
         resp = resp[resp['Units'] == pdata['units']]