refactored WebServer class a bit

app.py

@@ -1,32 +1,19 @@
 #!/usr/bin/env python
+import os
+import json
 
-from json import load
-from os import mkdir, path
-
-from pycs.database.Database import Database
 from pycs.frontend.WebServer import WebServer
-from pycs.jobs.JobRunner import JobRunner
-
-if __name__ == '__main__':
-    # load settings
-    print('- load settings')
-    with open('settings.json', 'r') as file:
-        settings = load(file)
 
-    # create projects folder
-    if not path.exists('projects/'):
-        mkdir('projects/')
+print('- Loading settings')
+with open('settings.json') as file:
+    settings = json.load(file)
 
-    # initialize database
-    print('- load database')
-    database = Database('data.sqlite3')
+# create projects folder
+if not os.path.exists('projects/'):
+    os.mkdir('projects/')
 
-    # start job runner
-    print('- start job runner')
-    jobs = JobRunner()
+# start web server
+server = WebServer(settings)
 
-    # start web server
-    print('- start web server')
-    web_server = WebServer(settings, database, jobs)
-
-    web_server.run()
+if __name__ == '__main__':
+    server.run()

pycs/frontend/WebServer.py

@@ -1,5 +1,6 @@
-import eventlet
-import socketio
+# import eventlet
+# import socketio
+from flask_socketio import SocketIO
 
 from glob import glob
 from os import getcwd
@@ -9,6 +10,7 @@ from logging.config import dictConfig
 
 from flask import Flask
 from flask import send_from_directory
+from flask import send_from_directory
 
 from pycs.database.Database import Database
 from pycs.frontend.endpoints.ListJobs import ListJobs
@@ -58,48 +60,56 @@ class WebServer:
     """
 
     # pylint: disable=line-too-long
-    def __init__(self, settings: dict, database: Database, jobs: JobRunner):
+    def __init__(self, settings: dict):
 
         dictConfig(settings["logging"])
+        # initialize flask app instance
+        self.app = Flask(__name__)
+
 
-        # initialize web server
-        self.__flask = Flask(__name__)
+        # initialize database
+        db_file = settings["database"]
+        self.logger.info(f'Loading database from \"{db_file}\"')
+        self.db = Database(db_file)
+
+        # start job runner
+        self.logger.info('Starting job runner... ')
+        self.jobs = JobRunner()
 
         init_func = self.production_init if exists('webui/index.html') else self.development_init
         kwargs, static_files = init_func()
 
-        self.__sio = socketio.Server(**kwargs)
-        self.__app = socketio.WSGIApp(self.__sio, self.__flask, static_files=static_files)
-        self.__host, self.__port = settings['host'], settings['port']
+        self.sio = SocketIO(self.app, **kwargs)#socketio.Server(**kwargs)
+        # self.__app = socketio.WSGIApp(self.sio, self.app, static_files=static_files)
+        self.host, self.port = settings['host'], settings['port']
 
         # set json encoder so database objects are serialized correctly
-        self.__flask.json_encoder = JSONEncoder
+        self.app.json_encoder = JSONEncoder
 
-        notifications = self.init_notifications(jobs)
-        self.define_routes(database, jobs, notifications)
+        self.init_notifications()
+        self.define_routes()
+        self.logger.info("Server initialized")
 
     @property
     def logger(self):
-        return self.__flask.logger
+        return self.app.logger
 
-    def init_notifications(self, jobs):
+    def init_notifications(self):
         # create notification manager
-        notifications = NotificationManager(self.__sio)
-
-        jobs.on_create(notifications.create_job)
-        jobs.on_start(notifications.edit_job)
-        jobs.on_progress(notifications.edit_job)
-        jobs.on_finish(notifications.edit_job)
-        jobs.on_remove(notifications.remove_job)
+        self.notifications = n = NotificationManager(self.sio)
 
-        return notifications
+        self.jobs.on_create(n.create_job)
+        self.jobs.on_start(n.edit_job)
+        self.jobs.on_progress(n.edit_job)
+        self.jobs.on_finish(n.edit_job)
+        self.jobs.on_remove(n.remove_job)
 
     def development_init(self):
 
-        self.logger.info('development build')
+        self.logger.info('Initializing development build')
 
         # set access control header to allow requests from Vue.js development server
-        @self.__flask.after_request
+        @self.app.after_request
         def after_request(response):
             # pylint: disable=unused-variable
             response.headers['Access-Control-Allow-Origin'] = '*'
@@ -109,7 +119,7 @@ class WebServer:
 
     def production_init(self):
 
-        self.logger.info('production build')
+        self.logger.info('Initializing production build')
 
         kwargs = dict(async_mode='eventlet')
         if len(settings['allowedOrigins']) > 0:
@@ -117,7 +127,7 @@ class WebServer:
             kwargs["cors_allowed_origins"] = origins
 
         # overwrite root path to serve index.html
-        @self.__flask.route('/', methods=['GET'])
+        @self.app.route('/', methods=['GET'])
         def index():
             # pylint: disable=unused-variable
             return send_from_directory(path.join(getcwd(), 'webui'), 'index.html')
@@ -140,172 +150,174 @@ class WebServer:
 
         return static_files
 
-    def define_routes(self, database, jobs, notifications):
+    def define_routes(self):
         # additional
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/folder',
             view_func=FolderInformation.as_view('folder_information')
         )
 
         # jobs
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/jobs',
-            view_func=ListJobs.as_view('list_jobs', jobs)
+            view_func=ListJobs.as_view('list_jobs', self.jobs)
         )
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/jobs/<identifier>/remove',
-            view_func=RemoveJob.as_view('remove_job', jobs)
+            view_func=RemoveJob.as_view('remove_job', self.jobs)
         )
 
         # models
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/models',
-            view_func=ListModels.as_view('list_models', database)
+            view_func=ListModels.as_view('list_models', self.db)
         )
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/projects/<int:identifier>/model',
-            view_func=GetProjectModel.as_view('get_project_model', database)
+            view_func=GetProjectModel.as_view('get_project_model', self.db)
         )
 
         # labels
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/label_providers',
-            view_func=ListLabelProviders.as_view('label_providers', database)
+            view_func=ListLabelProviders.as_view('label_providers', self.db)
         )
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/projects/<int:identifier>/labels',
-            view_func=ListLabels.as_view('list_labels', database)
+            view_func=ListLabels.as_view('list_labels', self.db)
         )
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/projects/<int:identifier>/labels',
-            view_func=CreateLabel.as_view('create_label', database, notifications)
+            view_func=CreateLabel.as_view('create_label', self.db, self.notifications)
         )
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/projects/<int:project_id>/labels/<int:label_id>/remove',
-            view_func=RemoveLabel.as_view('remove_label', database, notifications)
+            view_func=RemoveLabel.as_view('remove_label', self.db, self.notifications)
         )
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/projects/<int:project_id>/labels/<int:label_id>/name',
-            view_func=EditLabelName.as_view('edit_label_name', database, notifications)
+            view_func=EditLabelName.as_view('edit_label_name', self.db, self.notifications)
         )
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/projects/<int:project_id>/labels/<int:label_id>/parent',
-            view_func=EditLabelParent.as_view('edit_label_parent', database, notifications)
+            view_func=EditLabelParent.as_view('edit_label_parent', self.db, self.notifications)
         )
 
         # collections
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/projects/<int:project_id>/collections',
-            view_func=ListCollections.as_view('list_collections', database)
+            view_func=ListCollections.as_view('list_collections', self.db)
         )
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/projects/<int:project_id>/data/<int:collection_id>/<int:start>/<int:length>',
-            view_func=ListFiles.as_view('list_collection_files', database)
+            view_func=ListFiles.as_view('list_collection_files', self.db)
         )
 
         # data
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/projects/<int:identifier>/data',
-            view_func=UploadFile.as_view('upload_file', database, notifications)
+            view_func=UploadFile.as_view('upload_file', self.db, self.notifications)
         )
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/projects/<int:project_id>/data/<int:start>/<int:length>',
-            view_func=ListFiles.as_view('list_files', database)
+            view_func=ListFiles.as_view('list_files', self.db)
         )
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/data/<int:identifier>/remove',
-            view_func=RemoveFile.as_view('remove_file', database, notifications)
+            view_func=RemoveFile.as_view('remove_file', self.db, self.notifications)
         )
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/data/<int:file_id>',
-            view_func=GetFile.as_view('get_file', database)
+            view_func=GetFile.as_view('get_file', self.db)
         )
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/data/<int:file_id>/<resolution>',
-            view_func=GetResizedFile.as_view('get_resized_file', database)
+            view_func=GetResizedFile.as_view('get_resized_file', self.db)
         )
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/data/<int:file_id>/previous_next',
-            view_func=GetPreviousAndNextFile.as_view('get_previous_and_next_file', database)
+            view_func=GetPreviousAndNextFile.as_view('get_previous_and_next_file', self.db)
         )
 
         # results
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/projects/<int:project_id>/results',
-            view_func=GetProjectResults.as_view('get_project_results', database)
+            view_func=GetProjectResults.as_view('get_project_results', self.db)
         )
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/data/<int:file_id>/results',
-            view_func=GetResults.as_view('get_results', database)
+            view_func=GetResults.as_view('get_results', self.db)
         )
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/data/<int:file_id>/results',
-            view_func=CreateResult.as_view('create_result', database, notifications)
+            view_func=CreateResult.as_view('create_result', self.db, self.notifications)
         )
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/data/<int:file_id>/reset',
-            view_func=ResetResults.as_view('reset_results', database, notifications)
+            view_func=ResetResults.as_view('reset_results', self.db, self.notifications)
         )
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/results/<int:result_id>/remove',
-            view_func=RemoveResult.as_view('remove_result', database, notifications)
+            view_func=RemoveResult.as_view('remove_result', self.db, self.notifications)
         )
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/results/<int:result_id>/confirm',
-            view_func=ConfirmResult.as_view('confirm_result', database, notifications)
+            view_func=ConfirmResult.as_view('confirm_result', self.db, self.notifications)
         )
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/results/<int:result_id>/label',
-            view_func=EditResultLabel.as_view('edit_result_label', database, notifications)
+            view_func=EditResultLabel.as_view('edit_result_label', self.db, self.notifications)
         )
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/results/<int:result_id>/data',
-            view_func=EditResultData.as_view('edit_result_data', database, notifications)
+            view_func=EditResultData.as_view('edit_result_data', self.db, self.notifications)
         )
 
         # projects
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/projects',
-            view_func=ListProjects.as_view('list_projects', database)
+            view_func=ListProjects.as_view('list_projects', self.db)
         )
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/projects',
-            view_func=CreateProject.as_view('create_project', database, notifications, jobs)
+            view_func=CreateProject.as_view('create_project', self.db, self.notifications, self.jobs)
         )
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/projects/<int:identifier>/label_provider',
-            view_func=ExecuteLabelProvider.as_view('execute_label_provider', database, notifications, jobs)
+            view_func=ExecuteLabelProvider.as_view('execute_label_provider', self.db, self.notifications, self.jobs)
         )
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/projects/<int:identifier>/external_storage',
-            view_func=ExecuteExternalStorage.as_view('execute_external_storage', database, notifications, jobs)
+            view_func=ExecuteExternalStorage.as_view('execute_external_storage', self.db, self.notifications, self.jobs)
         )
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/projects/<int:identifier>/remove',
-            view_func=RemoveProject.as_view('remove_project', database, notifications)
+            view_func=RemoveProject.as_view('remove_project', self.db, self.notifications)
         )
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/projects/<int:identifier>/name',
-            view_func=EditProjectName.as_view('edit_project_name', database, notifications)
+            view_func=EditProjectName.as_view('edit_project_name', self.db, self.notifications)
         )
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/projects/<int:identifier>/description',
-            view_func=EditProjectDescription.as_view('edit_project_description', database, notifications)
+            view_func=EditProjectDescription.as_view('edit_project_description', self.db, self.notifications)
         )
 
         # pipelines
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/projects/<int:project_id>/pipelines/fit',
-            view_func=FitModel.as_view('fit_model', database, jobs)
+            view_func=FitModel.as_view('fit_model', self.db, self.jobs)
         )
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/projects/<int:project_id>/pipelines/predict',
-            view_func=PredictModel.as_view('predict_model', database, notifications, jobs)
+            view_func=PredictModel.as_view('predict_model', self.db, self.notifications, self.jobs)
         )
-        self.__flask.add_url_rule(
+        self.app.add_url_rule(
             '/data/<int:file_id>/predict',
-            view_func=PredictFile.as_view('predict_file', database, notifications, jobs)
+            view_func=PredictFile.as_view('predict_file', self.db, self.notifications, self.jobs)
         )
 
     def run(self):
-        eventlet.wsgi.server(eventlet.listen((self.__host, self.__port)), self.__app)
+        self.logger.info("Starting server...")
+        return self.sio.run(self.app, host=self.host, port=self.port)
+        # eventlet.wsgi.server(eventlet.listen((self.__host, self.__port)), self.__app)

requirements.txt

@@ -4,7 +4,8 @@ Pillow
 scipy
 eventlet
 flask
-python-socketio
+flask-socketio
+# python-socketio
 munch
 scikit-image
 

settings.json

@@ -1,5 +1,5 @@
 {
-  "host": "",
+  "host": "0.0.0.0",
   "port": 5000,
   "allowedOrigins": [],
 
@@ -21,5 +21,7 @@
         "level": "INFO",
         "handlers": ["wsgi"]
     }
-  }
+  },
+
+  "database": "data.sqlite3"
 }