stylistic changes

pycs/frontend/endpoints/data/RemoveFile.py

@@ -14,6 +14,7 @@ class RemoveFile(View):
     # pylint: disable=arguments-differ
     methods = ['POST']
 
+
     def dispatch_request(self, identifier):
         # extract request data
         data = request.get_json(force=True)

pycs/frontend/endpoints/pipelines/FitModel.py

@@ -33,7 +33,7 @@ class FitModel(View):
 
         # create job
         try:
-            JobRunner.Run(project,
+            JobRunner.run(project,
                           'Model Interaction',
                           f'{project.name} (fit model with new data)',
                           f'{project.name}/model-interaction',

pycs/frontend/endpoints/pipelines/PredictFile.py

@@ -39,7 +39,7 @@ class PredictFile(View):
         try:
             notifications = NotificationList()
 
-            JobRunner.Run(project,
+            JobRunner.run(project,
                           'Model Interaction',
                           f'{project.name} (create predictions)',
                           f'{project.name}/model-interaction',

pycs/frontend/endpoints/pipelines/PredictModel.py

@@ -45,7 +45,7 @@ class PredictModel(View):
         try:
             notifications = NotificationList()
 
-            JobRunner.Run(project,
+            JobRunner.run(project,
                           'Model Interaction',
                           f'{project.name} (create predictions)',
                           f'{project.name}/model-interaction',
@@ -96,8 +96,7 @@ class PredictModel(View):
                 pipeline = pipelines.load_from_root_folder(project)
 
                 # iterate over files
-                index = 0
-                for file in files:
+                for index, file in enumerate(files, 1):
                     # remove old predictions
                     file.remove_predictions()
 
@@ -108,8 +107,6 @@ class PredictModel(View):
                     db.session.commit()
                     yield index / length, notifications
 
-                    index += 1
-
             except Exception as e:
                 import traceback
                 traceback.print_exc()

pycs/frontend/endpoints/projects/CreateProject.py

@@ -122,7 +122,7 @@ class CreateProject(View):
                         commit=False,
                     )
 
-        JobRunner.Run(project,
+        JobRunner.run(project,
                       'Media Collections',
                       f'{project.name}',
                       f'{project.id}/media-collections',

pycs/frontend/endpoints/projects/ExecuteExternalStorage.py

@@ -108,9 +108,9 @@ class ExecuteExternalStorage(View):
             return current / length
 
         # run job with given functions
-        JobRunner.Run(project,
-            'Find Media Files',
-            project.name,
-            f'{project.id}/find-files',
-            find,
-            progress=progress)
+        JobRunner.run(project,
+                      'Find Media Files',
+                      project.name,
+                      f'{project.id}/find-files',
+                      find,
+                      progress=progress)

pycs/frontend/endpoints/projects/ExecuteLabelProvider.py

@@ -42,7 +42,7 @@ class ExecuteLabelProvider(View):
 
         # execute label provider and add labels to project
         try:
-            self.execute_label_provider(project, label_provider)
+            ExecuteLabelProvider.execute_label_provider(project, label_provider)
         except JobGroupBusyException:
             return abort(400)
 
@@ -82,9 +82,9 @@ class ExecuteLabelProvider(View):
                 notify("label", label.id, Label)
 
         # run job with given functions
-        JobRunner.Run(project,
-                 'Label Provider',
-                 f'{project.name} ({label_provider.name})',
-                 f'{project.id}/label-provider',
-                 receive,
-                 result=result)
+        JobRunner.run(project,
+                      'Label Provider',
+                      f'{project.name} ({label_provider.name})',
+                      f'{project.id}/label-provider',
+                      receive,
+                      result=result)

pycs/frontend/notifications/NotificationManager.py

@@ -80,156 +80,3 @@ class NotificationManager(Singleton):
     def created(kls, suffix, *args, **kwargs):
         return kls().create(suffix)(*args, **kwargs)
 
-
-    # def create_job(self, created_job: Job):
-    #     """
-    #     fire create-job event
-
-    #     :param created_job:
-    #     :return:
-    #     """
-    #     self.__emit('create-job', created_job)
-
-    # def edit_job(self, edited_job: Job):
-    #     """
-    #     fire edit-job event
-
-    #     :param edited_job:
-    #     :return:
-    #     """
-    #     self.__emit('edit-job', edited_job)
-
-    # def remove_job(self, removed_job: Job):
-    #     """
-    #     fire remove-job event
-
-    #     :param removed_job:
-    #     :return:
-    #     """
-    #     self.__emit('remove-job', removed_job)
-
-    # def create_model(self, created_model_id: int):
-    #     """
-    #     fire create-model event
-
-    #     :param created_model:
-    #     :return:
-    #     """
-    #     self.__emit('create-model', created_model_id, Model)
-
-    # def remove_model(self, model_serialized: dict):
-    #     """
-    #     fire remove-model event
-
-    #     :param removed_model:
-    #     :return:
-    #     """
-    #     self.__emit('remove-model', model_serialized)
-
-    # def create_project(self, created_project_id: int):
-    #     """
-    #     fire create-project event
-
-    #     :param created_project:
-    #     :return:
-    #     """
-    #     self.__emit('create-project', created_project_id, Project)
-
-    # def remove_project(self, project_serialized: dict):
-    #     """
-    #     fire remove-project event
-
-    #     :param removed_project:
-    #     :return:
-    #     """
-    #     self.__emit('remove-project', project_serialized)
-
-    # def edit_project(self, edited_project_id: int):
-    #     """
-    #     fire edit-project event
-
-    #     :param edited_project:
-    #     :return:
-    #     """
-    #     self.__emit('edit-project', edited_project_id, Project)
-
-    # def create_label(self, created_label_id: int):
-    #     """
-    #     fire create-label event
-
-    #     :param created_label:
-    #     :return:
-    #     """
-    #     self.__emit('create-label', created_label_id, Label)
-
-    # def edit_label(self, edited_label_id: int):
-    #     """
-    #     fire edit-label event
-
-    #     :param edited_label:
-    #     :return:
-    #     """
-    #     self.__emit('edit-label', edited_label_id, Label)
-
-    # def remove_label(self, label_serialized: dict):
-    #     """
-    #     fire remove-label event
-
-    #     :param removed_label:
-    #     :return:
-    #     """
-    #     self.__emit('remove-label', label_serialized)
-
-    # def create_file(self, created_file_id: int):
-    #     """
-    #     fire create-file event
-
-    #     :param created_file:
-    #     :return:
-    #     """
-    #     self.__emit('create-file', created_file_id, File)
-
-    # def edit_file(self, edited_file_id: int):
-    #     """
-    #     fire edit-file event
-
-    #     :param edited_file:
-    #     :return:
-    #     """
-    #     self.__emit('edit-file', edited_file_id, File)
-
-    # def remove_file(self, file_serialized: dict):
-    #     """
-    #     fire remove-file event
-
-    #     :param removed_file:
-    #     :return:
-    #     """
-    #     self.__emit('remove-file', file_serialized)
-
-    # def create_result(self, created_result_id: int):
-    #     """
-    #     fire create-result event
-
-    #     :param created_result:
-    #     :return:
-    #     """
-    #     self.__emit('create-result', created_result_id, Result)
-
-    # def edit_result(self, edited_result_id: int):
-    #     """
-    #     fire edit-result event
-
-    #     :param edited_result:
-    #     :return:
-    #     """
-    #     self.__emit('edit-result', edited_result_id, Result)
-
-    # def remove_result(self, result_serialized: dict):
-    #     """
-    #     fire remove-result event
-
-    #     :param removed_result:
-    #     :return:
-    #     """
-    #     self.__emit('remove-result', result_serialized)

pycs/jobs/JobRunner.py

@@ -14,8 +14,8 @@ from eventlet.event import Event
 
 
 from pycs.database.Project import Project
-from pycs.jobs.Job import Job
 from pycs.frontend.notifications.NotificationManager import NotificationManager
+from pycs.jobs.Job import Job
 from pycs.jobs.JobGroupBusyException import JobGroupBusyException
 from pycs.util import Callbacks
 from pycs.util import GreenWorker
@@ -27,7 +27,6 @@ class JobRunner(GreenWorker, Singleton):
     run jobs in a thread pool, but track progress and process results in eventlet queue
     """
 
-    # pylint: disable=too-many-arguments
     """ Because it is a singleton (as described here:
         https://www.python.org/download/releases/2.2/descrintro/#__new__),
         __init__ is called every time the singleton object
@@ -59,14 +58,14 @@ class JobRunner(GreenWorker, Singleton):
         self.on("remove",      nm.remove("job"))
 
     @classmethod
-    def Run(cls, *args, **kwargs):
-        cls().run(*args, **kwargs)
+    def run(cls, *args, **kwargs):
+        cls()._run(*args, **kwargs)
 
     @classmethod
-    def Remove(cls, *args, **kwargs):
-        cls().remove(*args, **kwargs)
+    def remove(cls, *args, **kwargs):
+        cls()._remove(*args, **kwargs)
 
-    def remove(self, id):
+    def _remove(self, id):
         """
         remove a job using its unique id
 
@@ -78,13 +77,11 @@ class JobRunner(GreenWorker, Singleton):
                 if self.__jobs[i].finished is not None:
                     job = self.__jobs[i]
                     del self.__jobs[i]
-
-                    for callback in self.__remove_listeners:
-                        callback(job)
+                    self.__listeners["remove"](job)
 
                 return
 
-    def run(self,
+    def _run(self,
             project: Project,
             job_type: str,
             name: str,

pycs/util/PipelineCache.py

@@ -55,8 +55,7 @@ class PipelineCache(GreenWorker):
         """
         load configuration.json and create an instance from the included code object
 
-        :param projeventletect: associated project
-        :param root_folder: path to model root folder
+        :param project: associated project
         :return: Pipeline instance
         """
         root_folder = project.model.root_folder
@@ -93,7 +92,7 @@ class PipelineCache(GreenWorker):
         after `CLOSE_TIMER` seconds. The next call to `load_from_root_folder` in this interval
         will disable this timer.
 
-        :param root_folder: path to model root folder
+        :param project: associated project
         """
         root_folder = project.model.root_folder
 
@@ -128,7 +127,7 @@ class PipelineCache(GreenWorker):
                 continue
 
             # create job to close pipeline
-            JobRunner.Run(project,
+            JobRunner.run(project,
                             'Model Interaction',
                             f'{project.name} (close pipeline)',
                             f'{project.name}/model-interaction',

testing.py

@@ -1,23 +0,0 @@
-
-class Test(object):
-    _instance = None
-
-    def __new__(cls, *args, **kwargs):
-        if cls._instance is None:
-            cls._instance = super(Test, cls).__new__(*args, **kwargs)
-        return cls._instance
-
-
-    def __init__(self):
-        super(Test, self).__init__()
-
-    @classmethod
-    def foo(cls):
-        print("classmethod")
-
-    def foo(self):
-        print("method", self)
-
-
-Test.foo()
-Test().foo()