Merge branch 'release/9.0'

Author: instanceofme

dataikuapi/dss/admin.py

@@ -710,7 +710,19 @@ def set_definition(self, env):
         """
         return self.client._perform_json(
             "PUT", "/admin/code-envs/%s/%s" % (self.env_lang, self.env_name), body=env)
-    
+
+    def get_version_for_project(self, project_key):
+        """
+        Resolve the code env version for a given project
+
+        Note: version will only be non-empty for versioned code envs actually used by the project
+
+        :returns: the code env reference, with a version field
+        """
+        return self.client._perform_json(
+            "GET", "/admin/code-envs/%s/%s/%s/version" % (self.env_lang, self.env_name, project_key))
+
+   
     ########################################################
     # Code env actions
     ########################################################
@@ -747,6 +759,52 @@ def update_packages(self, force_rebuild_env=False):
             raise Exception('Env update failed : %s' % (json.dumps(resp.get('messages', {}).get('messages', {}))))
         return resp
 
+    def update_images(self, env_version=None):
+        """
+        Rebuild the docker image of the code env
+        
+        Note: this call requires an API key with admin rights
+        """
+        resp = self.client._perform_json(
+            "POST", "/admin/code-envs/%s/%s/images" % (self.env_lang, self.env_name),
+            params={"envVersion": env_version})
+        if resp is None:
+            raise Exception('Env image build returned no data')
+        if resp.get('messages', {}).get('error', False):
+            raise Exception('Env image build failed : %s' % (json.dumps(resp.get('messages', {}).get('messages', {}))))
+        return resp
+
+    def list_usages(self, env_version=None):
+        """
+        List usages of the code env in the instance
+
+        :return: a list of objects where the code env is used
+        """
+        return self.client._perform_json(
+            "GET", "/admin/code-envs/%s/%s/usages" % (self.env_lang, self.env_name), params={"envVersion": env_version})
+
+    def list_logs(self, env_version=None):
+        """
+        List logs of the code env in the instance
+
+        :return: a list of log descriptions
+        """
+        return self.client._perform_json(
+            "GET", "/admin/code-envs/%s/%s/logs" % (self.env_lang, self.env_name), params={"envVersion": env_version})
+
+    def get_log(self, log_name):
+        """
+        Get the logs of the code env
+        
+        Args:
+            log_name: name of the log to fetch
+            
+           Returns:
+               the log, as a string
+        """
+        return self.client._perform_text(
+            "GET", "/admin/code-envs/%s/%s/logs/%s" % (self.env_lang, self.env_name, log_name))
+
 
 class DSSGlobalApiKey(object):
     """

dataikuapi/dss/apideployer.py

@@ -347,15 +347,29 @@ def start_update(self):
 
         return DSSFuture(self.client, future_response.get('jobId', None), future_response)
 
-    def delete(self):
+    def delete(self, disable_first=False):
         """
-        Deletes this deployment
+        Deletes this deployment. The disable_first flag automatically disables the deployment
+        before its deletion.
+
+        :param boolean disable_first: If True, automatically disables this deployment before deleting it.
+        If False, will raise an Exception if this deployment is enabled.
 
-        You may only delete a deployment if it is disabled and has been updated after disabling it.
         """
-        return self.client._perform_empty(
-            "DELETE", "/api-deployer/deployments/%s" % (self.deployment_id))
 
+        # Check if the deployment is disabled
+        is_enabled = self.get_status().light_status["deploymentBasicInfo"].get("enabled")
+        if is_enabled and not disable_first:
+            raise Exception("Deployment {} deletion failed: deployment must be disabled first.".format(self.deployment_id))
+        if is_enabled:
+            settings = self.get_settings()
+            settings.set_enabled(enabled=False)
+            settings.save()
+        self.client._perform_empty(
+                "DELETE", "/api-deployer/deployments/%s" % (self.deployment_id))
+
+                
+            
 
 class DSSAPIDeployerDeploymentSettings(object):
     """
@@ -534,7 +548,7 @@ def delete(self):
 
         You may only delete a service if it has no deployments on it anymore.
         """
-        return self.client._perform_empty(
+        self.client._perform_empty(
             "DELETE", "/api-deployer/services/%s" % (self.service_id))
 
 

dataikuapi/dss/recipe.py

@@ -1406,44 +1406,3 @@ def __init__(self, name, project):
     def with_input_model(self, model_id):
         """Sets the input model"""
         return self._with_input(model_id, self.project.project_key, "model")
-
-
-class DownloadRecipeCreator(SingleOutputRecipeCreator):
-    """
-    Create a Download recipe
-    """
-    def __init__(self, name, project):
-        SingleOutputRecipeCreator.__init__(self, 'download', name, project)
-
-
-class RequiredSchemaUpdates(object):
-    """
-    Representation of the updates required to the schema of the outputs of a recipe.
-    Do not create this class directly, use :meth:`DSSRecipe.compute_schema_updates`
-    """
-
-    def __init__(self, recipe, data):
-        self.recipe = recipe
-        self.data = data
-        self.drop_and_recreate = True
-        self.synchronize_metastore = True
-
-    def any_action_required(self):
-        return self.data["totalIncompatibilities"] > 0
-
-    def apply(self):
-        results  = []
-        for computable in self.data["computables"]:
-            osu = {
-                "computableType": computable["type"],
-                # dirty
-                "computableId": computable["type"] == "DATASET" and computable["datasetName"] or computable["id"],
-                "newSchema": computable["newSchema"],
-                "dropAndRecreate": self.drop_and_recreate,
-                "synchronizeMetastore" : self.synchronize_metastore
-            }
-
-            results.append(self.recipe.client._perform_json("POST",
-                    "/projects/%s/recipes/%s/actions/updateOutputSchema" % (self.recipe.project_key, self.recipe.recipe_name),
-                    body=osu))
-        return results

dataikuapi/dssclient.py

@@ -114,7 +114,7 @@ def get_root_project_folder(self):
         """
         Get a handle to interact with the root project folder.
 
-        :returns: A :class:`dataikuapi.dss.projectfolder.DSSProjectFolder`to interact with this project folder
+        :returns: A :class:`dataikuapi.dss.projectfolder.DSSProjectFolder` to interact with this project folder
         """
         return self.get_project_folder("ROOT")
 
@@ -123,7 +123,7 @@ def get_project_folder(self, project_folder_id):
         Get a handle to interact with a project folder.
 
         :param str project_folder_id: the project folder ID of the desired project folder
-        :returns: A :class:`dataikuapi.dss.projectfolder.DSSProjectFolder`to interact with this project folder
+        :returns: A :class:`dataikuapi.dss.projectfolder.DSSProjectFolder` to interact with this project folder
         """
         data = self._perform_json("GET", "/project-folders/%s" % project_folder_id)
         return DSSProjectFolder(self, data)
@@ -179,7 +179,7 @@ def create_project(self, project_key, name, owner, description=None, settings=No
         :param dict settings: Initial settings for the project (can be modified later). The exact possible settings are not documented.
         :param str project_folder_id: the project folder ID in which the project will be created (root project folder if not specified)
         
-        :returns: A class:`dataikuapi.dss.project.DSSProject` project handle to interact with this project
+        :returns: A :class:`dataikuapi.dss.project.DSSProject` project handle to interact with this project
         """
         params = {}
         if project_folder_id is not None:
@@ -528,6 +528,15 @@ def create_code_env(self, env_lang, env_name, deployment_mode, params=None):
             raise Exception('Env creation failed : %s' % (json.dumps(resp.get('messages', {}).get('messages', {}))))
         return DSSCodeEnv(self, env_lang, env_name)
 
+    def list_code_env_usages(self):
+        """
+        List all usages of a code env in the instance
+
+        :return: a list of objects where the code env is used
+        """
+        return self._perform_json("GET", "/admin/code-envs/usages")
+
+
     ########################################################
     # Clusters
     ########################################################