Merge pull request #20 from datmo/task-client

adding client task with test

datmo/__init__.py

@@ -5,4 +5,5 @@
 from __future__ import division
 from __future__ import print_function
 
-import datmo.snapshot
+import datmo.snapshot
+import datmo.task

datmo/cli/command/snapshot.py

@@ -103,8 +103,8 @@ def mutually_exclusive(dictionary, mutually_exclusive_args):
 
     def delete(self, **kwargs):
         self.cli_helper.echo(__("info", "cli.snapshot.delete"))
-        id = kwargs.get("id", None)
-        return self.snapshot_controller.delete(id)
+        snapshot_id = kwargs.get("id", None)
+        return self.snapshot_controller.delete(snapshot_id)
 
     def ls(self, **kwargs):
         session_id = kwargs.get('session_id',
@@ -135,8 +135,8 @@ def ls(self, **kwargs):
         return True
 
     def checkout(self, **kwargs):
-        id = kwargs.get("id", None)
-        return self.snapshot_controller.checkout(id)
+        snapshot_id = kwargs.get("id", None)
+        return self.snapshot_controller.checkout(snapshot_id)
 
 
 

datmo/cli/command/task.py

@@ -51,7 +51,7 @@ def run(self, **kwargs):
                 kwargs['environment_definition_filepath']
         }
 
-        if type(kwargs['cmd']) is not list:
+        if not isinstance(kwargs['cmd'], list):
             kwargs['cmd'] = shlex.split(kwargs['cmd'])
 
         task_dict = {
@@ -89,22 +89,21 @@ def ls(self, **kwargs):
         return True
 
     def stop(self, **kwargs):
-        id = kwargs.get('id', None)
-        task_stop_dict = {"id": id}
+        task_id = kwargs.get('id', None)
         self.cli_helper.echo(__("info",
                                 "cli.task.stop",
-                                id))
+                                task_id))
         try:
-            result = self.task_controller.stop(**task_stop_dict)
+            result = self.task_controller.stop(task_id)
             if not result:
                 self.cli_helper.echo(__("error",
                                         "cli.task.stop",
-                                        id))
+                                        task_id))
             return result
         except:
             self.cli_helper.echo(__("error",
                                     "cli.task.stop",
-                                    id))
+                                    task_id))
             return False
 
 

datmo/cli/command/test/test_project.py

@@ -1,5 +1,5 @@
 """
-Tests for Init
+Tests for Project Commands
 """
 from __future__ import division
 from __future__ import print_function
@@ -19,7 +19,8 @@
 from datmo.cli.driver.helper import Helper
 from datmo.cli.command.project import ProjectCommand
 
-class TestInit():
+
+class TestProject():
     def setup_class(self):
         # provide mountable tmp directory for docker
         tempfile.tempdir = '/tmp'

datmo/cli/command/test/test_snapshot.py

@@ -14,6 +14,11 @@
 import os
 import shutil
 import tempfile
+from io import open
+try:
+    to_unicode = unicode
+except NameError:
+    to_unicode = str
 
 from datmo.cli.driver.helper import Helper
 from datmo.cli.command.project import ProjectCommand
@@ -46,25 +51,25 @@ def __set_variables(self):
         self.env_def_path = os.path.join(self.temp_dir,
                                          "Dockerfile")
         with open(self.env_def_path, "w") as f:
-            f.write(str("FROM datmo/xgboost:cpu"))
+            f.write(to_unicode(str("FROM datmo/xgboost:cpu")))
 
         # Create config
         self.config_filepath = os.path.join(self.snapshot.home,
                                        "config.json")
         with open(self.config_filepath, "w") as f:
-            f.write(str("{}"))
+            f.write(to_unicode(str("{}")))
 
         # Create stats
         self.stats_filepath = os.path.join(self.snapshot.home,
                                       "stats.json")
         with open(self.stats_filepath, "w") as f:
-            f.write(str("{}"))
+            f.write(to_unicode(str("{}")))
 
         # Create test file
         self.filepath = os.path.join(self.snapshot.home,
                                            "file.txt")
         with open(self.filepath, "w") as f:
-            f.write(str("test"))
+            f.write(to_unicode(str("test")))
 
     def test_snapshot_project_not_init(self):
         failed = False

datmo/cli/command/test/test_task.py

@@ -15,6 +15,11 @@
 import os
 import shutil
 import tempfile
+from io import open
+try:
+    to_unicode = unicode
+except NameError:
+    to_unicode = str
 
 from datmo.cli.driver.helper import Helper
 from datmo.cli.command.project import ProjectCommand
@@ -47,7 +52,7 @@ def __set_variables(self):
         env_def_path = os.path.join(self.temp_dir,
                                     "Dockerfile")
         with open(env_def_path, "w") as f:
-            f.write(str("FROM datmo/xgboost:cpu"))
+            f.write(to_unicode(str("FROM datmo/xgboost:cpu")))
 
     def test_task_project_not_init(self):
         failed = False

datmo/cli/driver/test/test_helper.py

@@ -8,6 +8,11 @@
 import os
 import sys
 import tempfile
+from io import open
+try:
+    to_unicode = unicode
+except NameError:
+    to_unicode = str
 
 # TODO: include builtin libraries for the appropriate Python
 # try:
@@ -16,9 +21,9 @@
 #     # Python 3
 #     import builtins as __builtin__
 
-
 from datmo.cli.driver.helper import Helper
 
+
 class TestHelper():
     # https://stackoverflow.com/questions/35851323/pytest-how-to-test-a-function-with-input-call/36377194
 
@@ -42,7 +47,7 @@ def test_prompt(self):
         test_message = 'foobar'
         with open(os.path.join(self.temp_dir,
                                "test.txt"), "w") as f:
-            f.write(test_message)
+            f.write(to_unicode(test_message))
 
         with open(os.path.join(self.temp_dir,
                                "test.txt"), "r") as f:

datmo/core/controller/code/code.py

@@ -75,12 +75,12 @@ def list(self):
         # TODO: Add time filters
         return self.dal.code.query({})
 
-    def delete(self, id):
+    def delete(self, code_id):
         """Delete all traces of Code object
 
         Parameters
         ----------
-        id : str
+        code_id : str
             code object id to remove
 
         Returns
@@ -93,11 +93,11 @@ def delete(self, id):
         DoesNotExistException
             if the specified Code does not exist.
         """
-        code_obj = self.dal.code.get_by_id(id)
+        code_obj = self.dal.code.get_by_id(code_id)
         if not code_obj:
             raise DoesNotExistException(__("error",
-                                          "controller.code.delete",
-                                          id))
+                                           "controller.code.delete",
+                                           code_id))
         # Remove code reference
         delete_code_success = self.code_driver.delete_ref(code_obj.commit_id)
         # Delete code object

datmo/core/controller/code/driver/git.py

@@ -2,6 +2,11 @@
 import shutil
 import subprocess
 import semver
+from io import open
+try:
+    to_unicode = unicode
+except NameError:
+    to_unicode = str
 from giturlparse import parse
 
 from datmo.core.util.i18n import get as __
@@ -141,7 +146,7 @@ def create_ref(self, commit_id=None):
                                      ".git/refs/datmo/",
                                      commit_id)
         with open(code_ref_path, "w") as f:
-            f.write(commit_id)
+            f.write(to_unicode(commit_id))
         return commit_id
 
     def exists_ref(self, commit_id):
@@ -226,7 +231,7 @@ def ensure_datmo_files_ignored(self):
         try:
             if not self.exists_datmo_files_ignored():
                 with open(exclude_file, "a") as f:
-                    f.write("\n.datmo/*\n")
+                    f.write(to_unicode("\n.datmo/*\n"))
         except Exception as e:
             raise FileIOException(__("error",
                                      "controller.code.driver.git.ensure_code_refs_dir",
@@ -693,12 +698,12 @@ def create_git_netrc(self, username, password):
         netrc_filepath = os.path.join(self.home, ".netrc")
         netrc_file = open(netrc_filepath, "w")
         netrc_file.truncate()
-        netrc_file.write("machine %s" % (self.host))
-        netrc_file.write("\n")
-        netrc_file.write("login " + str(username))
-        netrc_file.write("\n")
-        netrc_file.write("password " + str(password))
-        netrc_file.write("\n")
+        netrc_file.write(to_unicode("machine %s" % (self.host)))
+        netrc_file.write(to_unicode("\n"))
+        netrc_file.write(to_unicode("login " + str(username)))
+        netrc_file.write(to_unicode("\n"))
+        netrc_file.write(to_unicode("password " + str(password)))
+        netrc_file.write(to_unicode("\n"))
         netrc_file.close()
         return True