Refactored out home variable to Config().home

datmo/cli/command/base.py

@@ -1,5 +1,6 @@
 #!/usr/bin/python
 
+from datmo.config import Config
 from datmo.core.util.i18n import get as __
 from datmo.core.util.exceptions import ClassMethodNotFound
 from datmo.cli.parser import get_datmo_parser
@@ -8,8 +9,8 @@
 
 
 class BaseCommand(object):
-    def __init__(self, home, cli_helper):
-        self.home = home
+    def __init__(self, cli_helper):
+        self.home = Config().home
         self.cli_helper = cli_helper
         self.logger = DatmoLogger.get_logger(__name__)
         self.parser = get_datmo_parser()

datmo/cli/command/datmo_command.py

@@ -3,8 +3,8 @@
 
 
 class DatmoCommand(BaseCommand):
-    def __init__(self, home, cli_helper):
-        super(DatmoCommand, self).__init__(home, cli_helper)
+    def __init__(self, cli_helper):
+        super(DatmoCommand, self).__init__(cli_helper)
 
     def usage(self):
         self.cli_helper.echo(__("argparser", "cli.datmo.usage"))

datmo/cli/command/project.py

@@ -7,9 +7,9 @@
 class ProjectCommand(BaseCommand):
     # NOTE: dal_driver is not passed into the project because it is created
     # first by ProjectController and then passed down to all other Controllers
-    def __init__(self, home, cli_helper):
-        super(ProjectCommand, self).__init__(home, cli_helper)
-        self.project_controller = ProjectController(home=home)
+    def __init__(self, cli_helper):
+        super(ProjectCommand, self).__init__(cli_helper)
+        self.project_controller = ProjectController()
 
     def init(self, name, description):
         """Initialize command

datmo/cli/command/session.py

@@ -8,11 +8,11 @@
 
 
 class SessionCommand(ProjectCommand):
-    def __init__(self, home, cli_helper):
-        super(SessionCommand, self).__init__(home, cli_helper)
+    def __init__(self, cli_helper):
+        super(SessionCommand, self).__init__(cli_helper)
         # dest="subcommand" argument will populate a "subcommand" property with the subparsers name
         # example  "subcommand"="create"  or "subcommand"="ls"
-        self.session_controller = SessionController(home=home)
+        self.session_controller = SessionController()
 
     def session(self):
         self.parse(["--help"])

datmo/cli/command/snapshot.py

@@ -10,11 +10,11 @@
 
 
 class SnapshotCommand(ProjectCommand):
-    def __init__(self, home, cli_helper):
-        super(SnapshotCommand, self).__init__(home, cli_helper)
+    def __init__(self, cli_helper):
+        super(SnapshotCommand, self).__init__(cli_helper)
         # dest="subcommand" argument will populate a "subcommand" property with the subparsers name
         # example  "subcommand"="create"  or "subcommand"="ls"
-        self.snapshot_controller = SnapshotController(home=home)
+        self.snapshot_controller = SnapshotController()
 
     def usage(self):
         self.cli_helper.echo(__("argparser", "cli.snapshot.usage"))

datmo/cli/command/task.py

@@ -17,9 +17,9 @@
 
 
 class TaskCommand(ProjectCommand):
-    def __init__(self, home, cli_helper):
-        super(TaskCommand, self).__init__(home, cli_helper)
-        self.task_controller = TaskController(home=home)
+    def __init__(self, cli_helper):
+        super(TaskCommand, self).__init__(cli_helper)
+        self.task_controller = TaskController()
 
     def task(self):
         self.parse(["--help"])

datmo/cli/command/tests/test_datmo.py

@@ -17,6 +17,7 @@
 import tempfile
 import platform
 
+from datmo.config import Config
 from datmo.cli.driver.helper import Helper
 from datmo.cli.command.datmo_command import DatmoCommand
 
@@ -29,17 +30,18 @@ def setup_class(self):
         test_datmo_dir = os.environ.get('TEST_DATMO_DIR',
                                         tempfile.gettempdir())
         self.temp_dir = tempfile.mkdtemp(dir=test_datmo_dir)
+        Config().set_home(self.temp_dir)
         self.cli = Helper()
 
     def teardown_class(self):
         pass
 
     def test_datmo_base(self):
-        base = DatmoCommand(self.temp_dir, self.cli)
+        base = DatmoCommand(self.cli)
         base.parse([])
         assert base.execute()
 
     def test_datmo_help(self):
-        base = DatmoCommand(self.temp_dir, self.cli)
+        base = DatmoCommand(self.cli)
         base.parse(["--help"])
         assert base.execute()

datmo/cli/command/tests/test_project.py

@@ -16,6 +16,7 @@
 import tempfile
 import platform
 
+from datmo.config import Config
 from datmo import __version__
 from datmo.cli.driver.helper import Helper
 from datmo.cli.command.project import ProjectCommand
@@ -30,8 +31,9 @@ def setup_method(self):
         test_datmo_dir = os.environ.get('TEST_DATMO_DIR',
                                         tempfile.gettempdir())
         self.temp_dir = tempfile.mkdtemp(dir=test_datmo_dir)
+        Config().set_home(self.temp_dir)
         self.cli_helper = Helper()
-        self.project = ProjectCommand(self.temp_dir, self.cli_helper)
+        self.project = ProjectCommand(self.cli_helper)
 
     def teardown_method(self):
         pass

datmo/cli/command/tests/test_session.py

@@ -13,6 +13,7 @@
     to_unicode = str
 
 import os
+from datmo.config import Config
 from datmo.cli.driver.helper import Helper
 from datmo.cli.command.session import SessionCommand
 from datmo.cli.command.project import ProjectCommand
@@ -27,22 +28,23 @@ def setup_class(self):
         test_datmo_dir = os.environ.get('TEST_DATMO_DIR',
                                         tempfile.gettempdir())
         self.temp_dir = tempfile.mkdtemp(dir=test_datmo_dir)
+        Config().set_home(self.temp_dir)
         self.cli_helper = Helper()
 
     def teardown_class(self):
         pass
 
     def __set_variables(self):
-        self.project = ProjectCommand(self.temp_dir, self.cli_helper)
+        self.project = ProjectCommand(self.cli_helper)
         self.project.parse(
             ["init", "--name", "foobar", "--description", "test model"])
         self.project.execute()
-        self.session_command = SessionCommand(self.temp_dir, self.cli_helper)
+        self.session_command = SessionCommand(self.cli_helper)
 
     def test_session_project_not_init(self):
         failed = False
         try:
-            self.snapshot = SessionCommand(self.temp_dir, self.cli_helper)
+            self.snapshot = SessionCommand(self.cli_helper)
         except ProjectNotInitializedException:
             failed = True
         assert failed

datmo/cli/command/tests/test_snapshot.py

@@ -21,6 +21,7 @@
 except NameError:
     to_unicode = str
 
+from datmo.config import Config
 from datmo.cli.driver.helper import Helper
 from datmo.cli.command.project import ProjectCommand
 from datmo.cli.command.snapshot import SnapshotCommand
@@ -38,17 +39,18 @@
 class TestSnapshot():
     def setup_class(self):
         self.temp_dir = tempfile.mkdtemp(dir=test_datmo_dir)
+        Config().set_home(self.temp_dir)
         self.cli_helper = Helper()
 
     def teardown_class(self):
         pass
 
     def __set_variables(self):
-        self.project = ProjectCommand(self.temp_dir, self.cli_helper)
+        self.project = ProjectCommand(self.cli_helper)
         self.project.parse(
             ["init", "--name", "foobar", "--description", "test model"])
         self.project.execute()
-        self.snapshot = SnapshotCommand(self.temp_dir, self.cli_helper)
+        self.snapshot = SnapshotCommand(self.cli_helper)
 
         # Create environment_driver definition
         self.env_def_path = os.path.join(self.temp_dir, "Dockerfile")
@@ -78,7 +80,7 @@ def __set_variables(self):
     def test_snapshot_project_not_init(self):
         failed = False
         try:
-            self.snapshot = SnapshotCommand(self.temp_dir, self.cli_helper)
+            self.snapshot = SnapshotCommand(self.cli_helper)
         except ProjectNotInitializedException:
             failed = True
         assert failed
@@ -191,7 +193,7 @@ def test_snapshot_create_from_task(self):
         # create task
         test_command = "sh -c 'echo accuracy:0.45'"
         test_dockerfile = os.path.join(self.temp_dir, "Dockerfile")
-        self.task = TaskCommand(self.temp_dir, self.cli_helper)
+        self.task = TaskCommand(self.cli_helper)
         self.task.parse([
             "task", "run", "--environment-def", test_dockerfile, test_command
         ])
@@ -221,7 +223,7 @@ def test_snapshot_create_from_task_fail_user_inputs(self):
         # create task
         test_command = "sh -c 'echo accuracy:0.45'"
         test_dockerfile = os.path.join(self.temp_dir, "Dockerfile")
-        self.task = TaskCommand(self.temp_dir, self.cli_helper)
+        self.task = TaskCommand(self.cli_helper)
         self.task.parse([
             "task", "run", "--environment-def", test_dockerfile, test_command
         ])

datmo/cli/command/tests/test_task.py

@@ -24,6 +24,7 @@
 except NameError:
     to_unicode = str
 
+from datmo.config import Config
 from datmo.cli.driver.helper import Helper
 from datmo.cli.command.project import ProjectCommand
 from datmo.cli.command.task import TaskCommand
@@ -39,18 +40,19 @@
 class TestTaskCommand():
     def setup_class(self):
         self.temp_dir = tempfile.mkdtemp(dir=test_datmo_dir)
+        Config().set_home(self.temp_dir)
         self.cli_helper = Helper()
 
     def teardown_class(self):
         pass
 
     def __set_variables(self):
-        self.project = ProjectCommand(self.temp_dir, self.cli_helper)
+        self.project = ProjectCommand(self.cli_helper)
         self.project.parse(
             ["init", "--name", "foobar", "--description", "test model"])
         self.project.execute()
 
-        self.task = TaskCommand(self.temp_dir, self.cli_helper)
+        self.task = TaskCommand(self.cli_helper)
 
         # Create environment_driver definition
         env_def_path = os.path.join(self.temp_dir, "Dockerfile")
@@ -60,7 +62,7 @@ def __set_variables(self):
     def test_task_project_not_init(self):
         failed = False
         try:
-            self.task = TaskCommand(self.temp_dir, self.cli_helper)
+            self.task = TaskCommand(self.cli_helper)
         except ProjectNotInitializedException:
             failed = True
         assert failed
@@ -159,7 +161,7 @@ def test_task_run_string_command(self):
     #
     #     def task_exec_func(procnum, return_dict):
     #         print("Creating Task object")
-    #         task = TaskCommand(self.temp_dir, self.cli_helper)
+    #         task = TaskCommand(self.cli_helper)
     #         print("Parsing command")
     #         task.parse(
     #             ["task", "run", "--environment-def", test_dockerfile, test_command])

datmo/cli/main.py

@@ -20,6 +20,7 @@ def main():
     # This is required for logging to place the logs in a
     # place for the user.
     config = Config()
+    config.home = os.getcwd()
 
     log = DatmoLogger.get_logger(__name__)
     log.info("handling command %s", config.home)

datmo/config.py

@@ -38,8 +38,7 @@ def __init__(self):
         def home(self):
             return self._home
 
-        @home.setter
-        def home(self, home_path):
+        def set_home(self, home_path):
             self._home = home_path
 
         def get_cache_item(self, key):

datmo/core/controller/base.py

@@ -42,8 +42,8 @@ class BaseController(object):
         Return the configuration defaults
     """
 
-    def __init__(self, home):
-        self.home = home
+    def __init__(self):
+        self.home = Config().home
         if not os.path.isdir(self.home):
             raise InvalidProjectPathException(
                 __("error", "controller.base.__init__", home))

datmo/core/controller/code/code.py

@@ -23,9 +23,9 @@ class CodeController(BaseController):
         delete the specified code object from the project
     """
 
-    def __init__(self, home):
+    def __init__(self):
         try:
-            super(CodeController, self).__init__(home)
+            super(CodeController, self).__init__()
         except EnvironmentInitFailed:
             self.logger.warning(
                 __("warn", "controller.general.environment.failed"))

datmo/core/controller/code/tests/test_code.py

@@ -10,6 +10,7 @@
 except NameError:
     to_unicode = str
 
+from datmo.config import Config
 from datmo.core.controller.project import ProjectController
 from datmo.core.controller.code.code import CodeController
 from datmo.core.util.exceptions import (EntityNotFound, GitCommitDoesNotExist)
@@ -23,8 +24,9 @@ def setup_method(self):
         test_datmo_dir = os.environ.get('TEST_DATMO_DIR',
                                         tempfile.gettempdir())
         self.temp_dir = tempfile.mkdtemp(dir=test_datmo_dir)
-        self.project = ProjectController(self.temp_dir)
-        self.code = CodeController(self.temp_dir)
+        Config().set_home(self.temp_dir)
+        self.project = ProjectController()
+        self.code = CodeController()
 
     def teardown_method(self):
         pass

datmo/core/controller/environment/environment.py

@@ -30,9 +30,9 @@ class EnvironmentController(BaseController):
         Delete the specified environment from the project
     """
 
-    def __init__(self, home):
-        super(EnvironmentController, self).__init__(home)
-        self.file_collection = FileCollectionController(home)
+    def __init__(self):
+        super(EnvironmentController, self).__init__()
+        self.file_collection = FileCollectionController()
 
     def create(self, dictionary):
         """Create an environment

datmo/core/controller/environment/tests/test_environment.py

@@ -14,6 +14,7 @@
 except NameError:
     to_unicode = str
 
+from datmo.config import Config
 from datmo.core.controller.project import ProjectController
 from datmo.core.controller.environment.environment import \
     EnvironmentController
@@ -30,8 +31,9 @@
 class TestEnvironmentController():
     def setup_method(self):
         self.temp_dir = tempfile.mkdtemp(dir=test_datmo_dir)
-        self.project = ProjectController(self.temp_dir)
-        self.environment = EnvironmentController(self.temp_dir)
+        Config().set_home(self.temp_dir)
+        self.project = ProjectController()
+        self.environment = EnvironmentController()
 
     def teardown_method(self):
         pass

datmo/core/controller/file/driver/local.py

@@ -15,6 +15,7 @@
 from datmo.core.util.exceptions import (PathDoesNotExist, FileIOException,
                                         FileStructureException)
 from datmo.core.controller.file.driver import FileDriver
+from datmo.config import Config
 
 
 class LocalFileDriver(FileDriver):

datmo/core/controller/file/driver/tests/test_local.py

@@ -12,6 +12,8 @@
 
 from datmo.core.controller.file.driver.local import LocalFileDriver
 from datmo.core.util.exceptions import PathDoesNotExist
+from datmo.core.controller.project import ProjectController
+from datmo.config import Config
 
 
 class TestLocalFileDriver():
@@ -27,6 +29,9 @@ def setup_method(self):
         test_datmo_dir = os.environ.get('TEST_DATMO_DIR',
                                         tempfile.gettempdir())
         self.temp_dir = tempfile.mkdtemp(dir=test_datmo_dir)
+        Config().set_home(self.temp_dir)
+        project = ProjectController()
+        project.init("testing", "test-project")
         self.local_file_driver = LocalFileDriver(filepath=self.temp_dir)
 
     def teardown_method(self):