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

Author: pmmayne

dataikuapi/dss/recipe.py

@@ -1430,6 +1430,12 @@ class StandaloneEvaluationRecipeCreator(DSSRecipeCreator):
         builder.with_input("scored_dataset_to_evaluate")
         builder.with_output_evaluation_store(evaluation_store_id)
 
+        # Add a reference dataset (optional) to compute data drift
+
+        builder.with_reference_dataset("reference_dataset")
+
+        # Finish creation of the recipe
+
         new_recipe = builder.create()
 
         # Modify the model parameters in the SER settings
@@ -1484,6 +1490,10 @@ def with_output_evaluation_store(self, mes_id):
         """Sets the output model evaluation store"""
         return self._with_output(mes_id, role="main")
 
+    def with_reference_dataset(self, dataset_name):
+        """Sets the dataset to use as a reference in data drift computation (optional)."""
+        return self._with_input(dataset_name, self.project.project_key, role="reference")
+
 
 class ClusteringScoringRecipeCreator(SingleOutputRecipeCreator):
     """

dataikuapi/dssclient.py

@@ -1033,6 +1033,19 @@ def apply_kubernetes_namespaces_policies(self):
         resp = self._perform_json("POST", "/admin/container-exec/actions/apply-kubernetes-policies")
         return DSSFuture.from_resp(self, resp)
 
+
+    ########################################################
+    # Global Instance Info
+    ########################################################
+
+    def get_instance_info(self):
+        """
+        Get global information about the DSS instance
+        :return: a :classss:`DSSInstanceInfo` 
+        """
+        resp = self._perform_json("GET", "/instance-info")
+        return DSSInstanceInfo(resp)
+
     ########################################################
     # Licensing
     ########################################################
@@ -1171,3 +1184,33 @@ def execute(self, settings=None):
             settings["_"] = "_"
         return self.client._perform_json("POST", "/projects/import/%s/process" % (self.import_id),
             body = settings)
+
+class DSSInstanceInfo(object):
+    """Global information about the DSS instance"""
+
+    def __init__(self, data):
+        """Do not call this directly, use :meth:`DSSClient.get_instance_info`"""
+        self._data = data
+
+    @property
+    def raw(self):
+        """Returns all data as a Python dictionary"""
+        return self._data
+
+    @property
+    def node_id(self):
+        """Returns the node id (as defined in Cloud Stacks or in install.ini)"""
+        return self._data["nodeId"]
+
+    @property
+    def node_name(self):
+        """Returns the node name as it appears in the navigation bar"""
+        return self._data["nodeName"]
+
+    @property
+    def node_type(self):
+        """
+        Returns the node type
+        :return: One of DESIGN, AUTOMATION or DEPLOYER
+        """
+        return self._data["nodeType"]