Merge pull request #70 from vpriyankaprabhu/master

Release 3.1.10

Author: taylorsteffanj

ibmpairs/query.py

@@ -6695,8 +6695,16 @@ async def async_submit(self,
             logger.error(msg)
             raise common.PAWException(msg)
         else:
+            csv = False
+            if compact_csv or (
+                self._output_type and self._output_type.lower() == 'csv'
+                and self._spatial and self._spatial.type
+                and self._spatial.type.lower() in ['point']
+            ):                
+                csv = True
+
             query_response = query_response_from_json(response.body,
-                                                      compact_csv = compact_csv)
+                                                      compact_csv = csv)
 
             query.submit_response = query_response
 

setup.py

@@ -2,7 +2,7 @@
 from setuptools import setup
 
 # define package version
-version = '3.1.9'
+version = '3.1.10'
 # ... and record it for ibmpairs package
 with open("ibmpairs/version.py", 'w') as f:
     f.write('# generated by setup.py\nversion = "{}"\n'.format(version))

tests/test_catalog.py

@@ -2110,7 +2110,7 @@ def test_data_set_get(self, mock_get):
             result = ds3.get(id = "3")
         except Exception as ex:
             got_exception3 = True
-            self.assertEqual(str(ex), "The GET request to https://api.ibm.com/geospatial/run/na/core/v3/datasets/3 encountered an unspecified error contacting the server; the request was unsuccessful, error message: mocked_data_set_requests_get.<locals>.MockResponse.__init__() got an unexpected keyword argument 'status'")
+            self.assertEqual(str(ex), "The GET request to https://api.ibm.com/geospatial/run/na/core/v3/datasets/3 encountered an unspecified error contacting the server; the request was unsuccessful, error message: __init__() got an unexpected keyword argument 'status'")
 
         self.assertTrue(got_exception3)
 
@@ -2190,7 +2190,7 @@ def test_data_set_create(self, mock_post):
             data_set_create3.create()
         except Exception as ex:
             self.logger.info(ex)
-            self.assertEqual(str(ex), "The POST request to https://api.ibm.com/geospatial/run/na/core/v3/datasets/ encountered an unspecified error contacting the server; the request was unsuccessful, error message: mocked_data_set_requests_post.<locals>.MockResponse.__init__() got an unexpected keyword argument 'status'")
+            self.assertEqual(str(ex), "The POST request to https://api.ibm.com/geospatial/run/na/core/v3/datasets/ encountered an unspecified error contacting the server; the request was unsuccessful, error message: __init__() got an unexpected keyword argument 'status'")
             got_exception3 = True
 
         self.assertTrue(got_exception3)
@@ -2273,7 +2273,7 @@ def test_data_set_update(self, mock_put):
             data_set_update3.update(id = 3)
         except Exception as ex:
             self.logger.info(ex)
-            self.assertEqual(str(ex), "The PUT request to https://api.ibm.com/geospatial/run/na/core/v3/datasets/3 encountered an unspecified error contacting the server; the request was unsuccessful, error message: mocked_data_set_requests_put.<locals>.MockResponse.__init__() got an unexpected keyword argument 'status'")
+            self.assertEqual(str(ex), "The PUT request to https://api.ibm.com/geospatial/run/na/core/v3/datasets/3 encountered an unspecified error contacting the server; the request was unsuccessful, error message: __init__() got an unexpected keyword argument 'status'")
             got_exception = True
 
         self.assertTrue(got_exception)
@@ -2369,7 +2369,7 @@ def test_data_set_delete(self, mock_delete):
             data_set_delete3.delete(id = 4)
         except Exception as ex:
             self.logger.info(ex)
-            self.assertEqual(str(ex), "The DELETE request to https://api.ibm.com/geospatial/run/na/core/v3/datasets/4 encountered an unspecified error contacting the server; the request was unsuccessful, error message: mocked_data_set_requests_delete.<locals>.MockResponse.__init__() got an unexpected keyword argument 'status'")
+            self.assertEqual(str(ex), "The DELETE request to https://api.ibm.com/geospatial/run/na/core/v3/datasets/4 encountered an unspecified error contacting the server; the request was unsuccessful, error message: __init__() got an unexpected keyword argument 'status'")
             got_exception = True
 
         self.assertTrue(got_exception)
@@ -2384,7 +2384,7 @@ def test_data_set_delete(self, mock_delete):
         except Exception as ex:
             self.logger.info(ex)        
             got_exception4 = True
-            self.assertEqual(str(ex), "DataSet.delete() missing 1 required positional argument: 'id'")
+            self.assertEqual(str(ex), "delete() missing 1 required positional argument: 'id'")
 
         self.assertTrue(got_exception4)
 
@@ -3460,7 +3460,7 @@ def test_data_sets_get(self, mock_delete):
             result = ds3.get()
         except Exception as ex:
             got_exception3 = True
-            self.assertEqual(str(ex), "The GET request to https://api.ibm.com/geospatial/run/na/core/v3/datasets/full encountered an unspecified error contacting the server; the request was unsuccessful, error message: mocked_data_sets_requests_get.<locals>.MockResponse.__init__() got an unexpected keyword argument 'status'")
+            self.assertEqual(str(ex), "The GET request to https://api.ibm.com/geospatial/run/na/core/v3/datasets/full encountered an unspecified error contacting the server; the request was unsuccessful, error message: __init__() got an unexpected keyword argument 'status'")
 
         self.assertTrue(got_exception3)
 
@@ -4168,7 +4168,7 @@ def test_data_layer_dimension_get(self, mock_get):
             result = dld3.get(id = "3")
         except Exception as ex:
             got_exception3 = True
-            self.assertEqual(str(ex), "The GET request to https://api.ibm.com/geospatial/run/na/core/v3/datalayer_dimensions/3 encountered an unspecified error contacting the server; the request was unsuccessful, error message: mocked_data_layer_dimension_requests_get.<locals>.MockResponse.__init__() got an unexpected keyword argument 'status'")
+            self.assertEqual(str(ex), "The GET request to https://api.ibm.com/geospatial/run/na/core/v3/datalayer_dimensions/3 encountered an unspecified error contacting the server; the request was unsuccessful, error message: __init__() got an unexpected keyword argument 'status'")
 
         self.assertTrue(got_exception3)
 
@@ -4252,7 +4252,7 @@ def test_data_layer_dimension_create(self, mock_post):
            dld3 = data_layer_dimension_create3.create(data_layer_id = 3)
         except Exception as ex:
             self.logger.info(ex)
-            self.assertEqual(str(ex), "The POST request to https://api.ibm.com/geospatial/run/na/core/v3/datalayers/3/datalayer_dimensions encountered an unspecified error contacting the server; the request was unsuccessful, error message: mocked_data_layer_dimension_requests_post.<locals>.MockResponse.__init__() got an unexpected keyword argument 'status'")
+            self.assertEqual(str(ex), "The POST request to https://api.ibm.com/geospatial/run/na/core/v3/datalayers/3/datalayer_dimensions encountered an unspecified error contacting the server; the request was unsuccessful, error message: __init__() got an unexpected keyword argument 'status'")
             got_exception3 = True
 
         self.assertTrue(got_exception3)
@@ -4663,7 +4663,7 @@ def test_data_layer_dimensions_get(self, mock_delete):
             result = dld3.get(data_layer_id = 3)
         except Exception as ex:
             got_exception3 = True
-            self.assertEqual(str(ex), "The GET request to https://api.ibm.com/geospatial/run/na/core/v3/datalayers/3/datalayer_dimensions encountered an unspecified error contacting the server; the request was unsuccessful, error message: mocked_data_layer_dimensions_requests_get.<locals>.MockResponse.__init__() got an unexpected keyword argument 'status'")
+            self.assertEqual(str(ex), "The GET request to https://api.ibm.com/geospatial/run/na/core/v3/datalayers/3/datalayer_dimensions encountered an unspecified error contacting the server; the request was unsuccessful, error message: __init__() got an unexpected keyword argument 'status'")
 
         self.assertTrue(got_exception3)
 
@@ -5049,7 +5049,7 @@ def test_data_layer_property_get(self, mock_get):
             result = dlp3.get(id = "3")
         except Exception as ex:
             got_exception3 = True
-            self.assertEqual(str(ex), "The GET request to https://api.ibm.com/geospatial/run/na/core/v3/datalayer_properties/3 encountered an unspecified error contacting the server; the request was unsuccessful, error message: mocked_data_layer_property_requests_get.<locals>.MockResponse.__init__() got an unexpected keyword argument 'status'")
+            self.assertEqual(str(ex), "The GET request to https://api.ibm.com/geospatial/run/na/core/v3/datalayer_properties/3 encountered an unspecified error contacting the server; the request was unsuccessful, error message: __init__() got an unexpected keyword argument 'status'")
 
         self.assertTrue(got_exception3)
 
@@ -5132,7 +5132,7 @@ def test_data_layer_property_create(self, mock_post):
             dlp3 = data_layer_property_create3.create(data_layer_id = 3)
         except Exception as ex:
             self.logger.info(ex)
-            self.assertEqual(str(ex), "The POST request to https://api.ibm.com/geospatial/run/na/core/v3/datalayers/3/datalayer_properties encountered an unspecified error contacting the server; the request was unsuccessful, error message: mocked_data_layer_property_requests_post.<locals>.MockResponse.__init__() got an unexpected keyword argument 'status'")
+            self.assertEqual(str(ex), "The POST request to https://api.ibm.com/geospatial/run/na/core/v3/datalayers/3/datalayer_properties encountered an unspecified error contacting the server; the request was unsuccessful, error message: __init__() got an unexpected keyword argument 'status'")
             got_exception3 = True
 
         self.assertTrue(got_exception3)
@@ -6409,7 +6409,7 @@ def test_data_layer_get(self, mock_get):
             result = dl3.get(id = "3")
         except Exception as ex:
             got_exception3 = True
-            self.assertEqual(str(ex), "The GET request to https://api.ibm.com/geospatial/run/na/core/v3/datalayers/3 encountered an unspecified error contacting the server; the request was unsuccessful, error message: mocked_data_layer_requests_get.<locals>.MockResponse.__init__() got an unexpected keyword argument 'status'")
+            self.assertEqual(str(ex), "The GET request to https://api.ibm.com/geospatial/run/na/core/v3/datalayers/3 encountered an unspecified error contacting the server; the request was unsuccessful, error message: __init__() got an unexpected keyword argument 'status'")
 
         self.assertTrue(got_exception3)
 
@@ -6505,7 +6505,7 @@ def test_data_layer_create(self, mock_post, mock_get):
                                             data_layer_group = None)
         except Exception as ex:
             self.logger.info(ex)
-            self.assertEqual(str(ex), "The POST request to https://api.ibm.com/geospatial/run/na/core/v3/datasets/3/datalayers encountered an unspecified error contacting the server; the request was unsuccessful, error message: mocked_data_layer_requests_post.<locals>.MockResponse.__init__() got an unexpected keyword argument 'status'")
+            self.assertEqual(str(ex), "The POST request to https://api.ibm.com/geospatial/run/na/core/v3/datasets/3/datalayers encountered an unspecified error contacting the server; the request was unsuccessful, error message: __init__() got an unexpected keyword argument 'status'")
             got_exception3 = True
 
         self.assertTrue(got_exception3)
@@ -6595,7 +6595,7 @@ def test_data_layer_update(self, mock_put):
             data_layer_update3.update(id = 3)
         except Exception as ex:
             self.logger.info(ex)
-            self.assertEqual(str(ex), "The PUT request to https://api.ibm.com/geospatial/run/na/core/v3/datalayers/3 encountered an unspecified error contacting the server; the request was unsuccessful, error message: mocked_data_layer_requests_put.<locals>.MockResponse.__init__() got an unexpected keyword argument 'status'")
+            self.assertEqual(str(ex), "The PUT request to https://api.ibm.com/geospatial/run/na/core/v3/datalayers/3 encountered an unspecified error contacting the server; the request was unsuccessful, error message: __init__() got an unexpected keyword argument 'status'")
             got_exception = True
 
         self.assertTrue(got_exception)
@@ -6690,7 +6690,7 @@ def test_data_layer_delete(self, mock_delete):
             data_layer_delete3.delete(id = 4)
         except Exception as ex:
             self.logger.info(ex)
-            self.assertEqual(str(ex), "The DELETE request to https://api.ibm.com/geospatial/run/na/core/v3/datalayers/4 encountered an unspecified error contacting the server; the request was unsuccessful, error message: mocked_data_layer_requests_delete.<locals>.MockResponse.__init__() got an unexpected keyword argument 'status'")
+            self.assertEqual(str(ex), "The DELETE request to https://api.ibm.com/geospatial/run/na/core/v3/datalayers/4 encountered an unspecified error contacting the server; the request was unsuccessful, error message: __init__() got an unexpected keyword argument 'status'")
             got_exception = True
 
         self.assertTrue(got_exception)
@@ -8063,7 +8063,7 @@ def test_data_layers_get(self, mock_delete):
             result = dl3.get()
         except Exception as ex:
             got_exception3 = True
-            self.assertEqual(str(ex), "The GET request to https://api.ibm.com/geospatial/run/na/core/v3/datalayers/full encountered an unspecified error contacting the server; the request was unsuccessful, error message: mocked_data_layers_requests_get.<locals>.MockResponse.__init__() got an unexpected keyword argument 'status'")
+            self.assertEqual(str(ex), "The GET request to https://api.ibm.com/geospatial/run/na/core/v3/datalayers/full encountered an unspecified error contacting the server; the request was unsuccessful, error message: __init__() got an unexpected keyword argument 'status'")
 
         self.assertTrue(got_exception3)
 
@@ -8077,7 +8077,7 @@ def test_data_layers_get(self, mock_delete):
             result4 = dl4.get(data_set_id = 997)
         except Exception as ex:
             got_exception4 = True
-            self.assertEqual(str(ex), "The GET request to https://api.ibm.com/geospatial/run/na/core/v3/datasets/997/datalayers encountered an unspecified error contacting the server; the request was unsuccessful, error message: mocked_data_layers_requests_get.<locals>.MockResponse.__init__() got an unexpected keyword argument 'status'")
+            self.assertEqual(str(ex), "The GET request to https://api.ibm.com/geospatial/run/na/core/v3/datasets/997/datalayers encountered an unspecified error contacting the server; the request was unsuccessful, error message: __init__() got an unexpected keyword argument 'status'")
 
         self.assertTrue(got_exception4)
 

tests/test_query.py

@@ -6120,11 +6120,11 @@ def test_point_data_as_dataframe_csv(self):
             got_exception = True
 
         self.assertFalse(got_exception)
-        self.assertEqual(int(query_as_df_csv.head(1)["layer_id"]), 16100)
-        self.assertEqual(int(query_as_df_csv.head(1)["timestamp"]), 1421528400000)
-        self.assertEqual(float(query_as_df_csv.head(1)["longitude"]), 139.7)
-        self.assertEqual(float(query_as_df_csv.head(1)["latitude"]), 35.7)
-        self.assertEqual(float(query_as_df_csv.head(1)["value"]), 273.918212890625)
+        self.assertEqual(int(query_as_df_csv["layer_id"].iloc[0]), 16100)
+        self.assertEqual(int(query_as_df_csv["timestamp"].iloc[0]), 1421528400000)
+        self.assertEqual(float(query_as_df_csv["longitude"].iloc[0]), 139.7)
+        self.assertEqual(float(query_as_df_csv["latitude"].iloc[0]), 35.7)
+        self.assertEqual(float(query_as_df_csv["value"].iloc[0]), 273.918212890625)
 
     @mock.patch('ibmpairs.client.Client.async_get', 
                 side_effect=mocked_download_async_get