Merge remote-tracking branch 'origin/release/6.0'

Author: cstenac

dataikuapi/dss/dataset.py

@@ -280,14 +280,15 @@ def with_store_into(self, connection, type_option_id = None, format_option_id =
             self.creation_settings["specificSettings"]["formatOptionId"] = format_option_id 
         return self
 
-    def with_copy_partitioning_from(self, dataset_ref):
+    def with_copy_partitioning_from(self, dataset_ref, object_type='DATASET'):
         """
         Sets the new managed dataset to use the same partitioning as an existing dataset_name
 
         :param str dataset_ref: Name of the dataset to copy partitioning from
         :return: self
         """
-        self.creation_settings["partitioningOptionId"] = "copy:%s" % dataset_ref
+        code = 'dataset' if object_type == 'DATASET' else 'folder'
+        self.creation_settings["partitioningOptionId"] = "copy:%s:%s" % (code, dataset_ref)
         return self
 
     def create(self):

dataikuapi/dss/recipe.py

@@ -329,7 +329,7 @@ def with_new_output(self, name, connection_id, typeOptionId=None, format_option_
                                      AVRO, ORC 
         :param override_sql_schema: schema to force dataset, for SQL dataset. If left empty, will be autodetected
         :param str partitioning_option_id: to copy the partitioning schema of an existing dataset 'foo', pass a
-                                           value of 'copy:foo'
+                                           value of 'copy:dataset:foo'
         :param append: whether the recipe should append or overwrite the output when running
                        (note: not available for all dataset types)
         :param str object_type: DATASET or MANAGED_FOLDER

dataikuapi/dss/wiki.py

@@ -237,6 +237,16 @@ def upload_attachement(self, fp, filename):
 
         self.client._perform_json("POST", "/projects/%s/wiki/%s/upload" % (self.project_key, dku_quote_fn(self.article_id)), files={"file":(clean_filename, fp)})
 
+    def get_uploaded_file(self, upload_id):
+        """"
+        Download the attachement of an article
+
+        :param str upload_id: The attachement upload id
+        :returns: The requests.Response object
+        :rtype: :class:`requests.Response`
+        """
+        return self.client._perform_raw("GET", "/projects/%s/wiki/%s/uploads/%s" % (self.project_key, self.article_id, upload_id))
+
     def delete(self):
         """
         Delete the article