Merge domoinc/upsert-fixes to fix upsert dataset creation

Fixing upsert upload for ds_create

Author: samrands

pydomo/__init__.py

@@ -203,12 +203,21 @@ def ds_get(self, dataset_id):
 
         return df
 
-    def ds_create(self, df_up, name, description='', update_method='REPLACE', key_column_names=''):
-        new_stream = self.utilities.stream_create(df_up, name, description, update_method, key_column_names)
-        ds_id = json.loads(new_stream.content.decode('utf-8'))['dataSet']['id']
-        self.utilities.stream_upload(ds_id,df_up,warn_schema_change=False)
-        return ds_id
-
+    def ds_create(self, df_up, name, description='',
+                  update_method='REPLACE', key_column_names=[]):
+        new_stream = self.utilities.stream_create(df_up,
+                                                  name,
+                                                  description,
+                                                  update_method,
+                                                  key_column_names)
+        if "dataSet" in new_stream:
+            ds_id = new_stream['dataSet']['id']
+            self.utilities.stream_upload(ds_id, df_up,
+                                         warn_schema_change=False)
+            return ds_id
+        else:
+            raise Exception(("Stream creation didn't work as expected. "
+                             "Response: {}").format(new_stream))
 
     def ds_update(self, ds_id, df_up):
         return self.utilities.stream_upload(ds_id, df_up)

pydomo/utilities/UtilitiesClient.py

@@ -92,12 +92,11 @@ def stream_upload(self, ds_id, df_up, warn_schema_change=True):
 
         return result
 
-    def stream_create(self, up_ds, name, description, updateMethod='REPLACE', keyColumnNames=''):
+    def stream_create(self, up_ds, name, description, updateMethod='REPLACE', keyColumnNames=[]):
         df_schema = self.data_schema(up_ds)
         req_body = {'dataSet': {'name': name, 'description': description, 'schema': {'columns': df_schema}}, 'updateMethod': updateMethod}
         if( updateMethod == 'UPSERT' ):
             req_body['keyColumnNames'] = keyColumnNames
         # return req_body
         st_created = self.transport.post('/v1/streams/', req_body, {})
-        return(st_created)
-        return json.loads(st_created.content.decode('utf-8'))['dataSet']['id']
+        return json.loads(st_created.content.decode('utf-8'))