Fix command output

Author: MDUYN

investing_algorithm_framework/core/workers/worker.py

@@ -1,9 +1,14 @@
+import logging
 from abc import abstractmethod, ABC
 from typing import Dict, Any
+from wrapt import synchronized
+from datetime import datetime
 
 from investing_algorithm_framework.core.events.observable import Observable
 from investing_algorithm_framework.core.events.observer import Observer
 
+logger = logging.getLogger('investing_algorithm_framework')
+
 
 class Worker(Observable, ABC):
     """
@@ -12,15 +17,19 @@ class Worker(Observable, ABC):
     """
 
     id = None
+    last_run: datetime = None
 
     def start(self, **kwargs: Dict[str, Any]) -> None:
         """
         Function that will start the worker, and notify its observers when
         it is finished
         """
 
+        logger.info("Starting worker {}".format(self.get_id()))
         self.work(**kwargs)
         self.notify_observers()
+        self.update_last_run()
+        logger.info("Worker {} finished".format(self.get_id()))
 
     @abstractmethod
     def work(self, **kwargs: Dict[str, Any]) -> None:
@@ -42,3 +51,17 @@ def get_id(self) -> str:
         )
 
         return getattr(self, 'id')
+
+    @classmethod
+    @synchronized
+    def update_last_run(cls) -> None:
+        """
+        Update last run, this function is synchronized, which means that
+        different instances can update the last_run attribute from different
+        threads.
+        """
+        cls.last_run = datetime.now()
+
+    @classmethod
+    def get_last_run(cls):
+        return cls.last_run

investing_algorithm_framework/management/command.py

@@ -89,6 +89,8 @@ def execute(self, *args, **options) -> Any:
         if response is None and self.success_message is not None:
             return self.success_message
 
+        return response
+
     @abstractmethod
     def handle(self, *args, **options) -> Any:
         """

investing_algorithm_framework/management/command_manager.py

@@ -42,6 +42,7 @@ def execute(self) -> None:
             ]:
                 response = self.fetch_command(sub_command).\
                     run_from_argv(self.argv)
+                response = format_success_message(response)
             else:
                 # Help for sub command
                 if len(self.argv) > 2:
@@ -55,10 +56,12 @@ def execute(self) -> None:
                     self.argv[2] = option
                     response = self.fetch_command(sub_command)\
                         .run_from_argv(self.argv)
+                    response = format_success_message(response)
                 else:
                     # Show general help command
                     command = HelpCommand()
                     response = command.run_from_argv(self.argv)
+                    response = format_success_message(response)
         except Exception as e:
             response = format_error_message(str(e))
 

investing_algorithm_framework/management/commands/create_standard_algo.py

@@ -10,11 +10,9 @@
 
 
 class CreateStandardAlgorithmCommand(BaseCommand):
-    help = (
-        "Creates a project directory structure for the given "
-        "investing_algorithm_framework instance in the current "
-        "directory or optionally in the given directory."
-    )
+    help = "Creates a project directory structure for the given " \
+           "investing_algorithm_framework instance in the current " \
+           "directory or optionally in the given directory."
 
     missing_args_message = "You must provide a project name."
     success_message = "Algorithm created and initialized."
@@ -42,7 +40,7 @@ def handle(self, **options) -> None:
                 raise ImproperlyConfigured(
                     "Directory {} already exists. Please make sure that "
                     "the project name does not correspond to an existing "
-                    "directory".format(str(directory))
+                    "directory.".format(str(directory))
                 )
 
             os.mkdir(directory)
@@ -71,13 +69,13 @@ def validate_name(name: str) -> None:
         """
 
         if name is None:
-            raise CommandError("you must provide a project name")
+            raise CommandError("you must provide a project name.")
 
         if not re.match("^[a-zA-Z_.-]+$", name):
             raise CommandError(
                 "{} is not allowed, value must begin with a letter and "
                 "only contains the characters of A-Z, "
-                "a-z and _".format(name)
+                "a-z and _ .".format(name)
             )
 
         # Make sure it can't be imported

investing_algorithm_framework/management/commands/run_algorithm.py

@@ -8,16 +8,10 @@
 
 
 class RunAlgorithmCommand(BaseCommand):
-    help_message = (
-        "Runs a instance of an algorithm created with the "
-        "investing_algorithm_framework, by default it will run "
-        "until stopped, if cycles is specified it will run the according "
-        "to the amount of cycles"
-    )
-
-    success_message = (
-        "Algorithm is finished running"
-    )
+    help_message = "Runs an instance of an algorithm created with the " \
+                   "investing_algorithm_framework."
+
+    success_message = "Algorithm is finished running."
 
     def add_arguments(self, parser) -> None:
         pass