Merge branch 'master' into feature/management-public-api-keys

Author: nicolasservel

dataikuapi/apinode_client.py

@@ -67,6 +67,17 @@ def predict_records(self, endpoint_id, records, forced_generation=None, dispatch
 
         return self._perform_json("POST", "%s/predict-multi" % endpoint_id, body = obj)
 
+    def evaluate_function(self, endpoint_id, **kwargs):
+        """
+        Applies a DSS API node function endpoint (Python or R) to the given parameters
+
+        :param str endpoint_id: Identifier of the endpoint to query
+        :param **kwargs: parameters to the functon
+
+        :return: a Python dict of the API answer. The answer is the result
+        """
+        return self.apply_on_record(endpoint_id, kwargs)
+
     def apply_on_record(self, endpoint_id, features):
         """
         Applies a function on a single record on a DSS API node endpoint (Python or R function)
@@ -78,6 +89,17 @@ def apply_on_record(self, endpoint_id, features):
         """
         return self._perform_json("POST", "%s/run" % endpoint_id, body = features)
 
+    def run_query(self, endpoint_id, **kwargs):
+        """
+        Run a DSS API node SQL endpoint with the given parameters
+
+        :param str endpoint_id: Identifier of the endpoint to query
+        :param **kwargs: parameters to the functon
+
+        :return: a Python dict of the API answer. The answer is the a dict with a columns field and a rows field (list of rows as list of strings)
+        """
+        return self.query_on_record(endpoint_id, kwargs)
+
     def query_on_record(self, endpoint_id, features):
         """
         Run a record on a DSS API node SQL endpoint 

dataikuapi/dss/project.py

@@ -384,10 +384,20 @@ def import_bundle_from_archive(self, archive_path):
                 "/projects/%s/bundles/imported/actions/importFromArchive" % (self.project_key),
                  params = { "archivePath" : osp.abspath(archive_path) })
 
+    def import_bundle_from_stream(self, fp):
+        files = {'file': fp }
+        return self.client._perform_empty("POST",
+                "/projects/%s/bundles/imported/actions/importFromStream" % (self.project_key),
+                files=files)
+
     def activate_bundle(self, bundle_id):
          return self.client._perform_json("POST",
                 "/projects/%s/bundles/imported/%s/actions/activate" % (self.project_key, bundle_id))
 
+    def preload_bundle(self, bundle_id):
+         return self.client._perform_json("POST",
+                "/projects/%s/bundles/imported/%s/actions/preload" % (self.project_key, bundle_id))
+
 
     ########################################################
     # Scenarios