fixed database related stuff

pycs/database/Database.py

@@ -33,11 +33,11 @@ class Database:
             LabelProvider.discover("labels/")
 
     def __enter__(self):
-        app.logger.warning("REMOVE ME!")
+        app.logger.warning("Database.__enter__(): REMOVE ME!")
         return self
 
     def __exit__(self, exc_type, exc_val, exc_tb):
-        app.logger.warning("REMOVE ME!")
+        app.logger.warning("Database.__exit__(): REMOVE ME!")
 
         if exc_type is None:
             db.session.commit()
@@ -45,6 +45,12 @@ class Database:
             app.logger.info("Rolling back a transaction!")
             db.session.rollback()
 
+    def close(self):
+        app.logger.warning("Database.close(): REMOVE ME!")
+
+    def commit(self):
+        db.session.commit()
+
     def copy(self):
         return Database(self.path, initialization=False, discovery=False)
 

pycs/database/File.py

@@ -8,6 +8,7 @@ from datetime import datetime
 
 from pycs import db
 from pycs.database.Result import Result
+from pycs.database.Label import Label
 from pycs.database.Collection import Collection
 from pycs.database.base import NamedBaseModel
 
@@ -49,13 +50,14 @@ class File(NamedBaseModel):
 
     # relationships to other models
     results = db.relationship("Result", backref="file", lazy="dynamic")
-    serialize_rules = ('-results',)
 
-    def serialize(self):
-        result = super().serialize()
-        if result["data"] is not None:
-            result["data"] = json.loads(result["data"])
-        return result
+    serialize_only = (
+        "id", "name", "uuid",
+        "extension", "type", "size",
+        "created", "path", "frames",
+        "fps", "project_id",
+        "collection_id",
+    )
 
     def set_collection(self, id: T.Optional[int]):
         """
@@ -88,7 +90,9 @@ class File(NamedBaseModel):
 
         :return: another file or None
         """
-        return self.project.files.filter(*query)\
+        # return self.project.files.filter(*query)\
+        return File.query.filter_by(project_id=self.project_id)\
+            .filter(*query)\
             .order_by(File.id.desc())\
             .first()
 
@@ -98,8 +102,7 @@ class File(NamedBaseModel):
 
         :return: another file or None
         """
-        query = File.id > self.id
-        return self._get_another_file(*query)
+        return self._get_another_file(File.id > self.id)
 
 
     def previous(self) -> T.Optional[File]:
@@ -108,8 +111,7 @@ class File(NamedBaseModel):
 
         :return: another file or None
         """
-        query = File.id < self.id
-        return self._get_another_file(*query)
+        return self._get_another_file(File.id < self.id)
 
 
     def next_in_collection(self) -> T.Optional[File]:
@@ -118,8 +120,7 @@ class File(NamedBaseModel):
 
         :return: another file or None
         """
-        query = File.id > self.id, Collection.id == self.collection_id
-        return self._get_another_file(*query)
+        return self._get_another_file(File.id > self.id, Collection.id == self.collection_id)
 
 
     def previous_in_collection(self) -> T.Optional[File]:
@@ -128,8 +129,7 @@ class File(NamedBaseModel):
 
         :return: another file or None
         """
-        query = File.id < self.id, Collection.id == self.collection_id
-        return self._get_another_file(*query)
+        return self._get_another_file(File.id < self.id, Collection.id == self.collection_id)
 
 
     def result(self, id: int) -> T.Optional[Result]:
@@ -139,19 +139,27 @@ class File(NamedBaseModel):
     def create_result(self, origin, result_type, label, data: T.Optional[dict] = None):
         data = data if data is None else json.dumps(data)
 
-        result = Result.new(commit=True,
-                            file=self,
+        result = Result.new(file=self,
                             origin=origin,
                             type=result_type,
-                            label=label,
                             data=data)
-        return result
 
+        if label is not None:
+            if isinstance(label, int):
+                label = Label.query.get(label)
+
+            elif not isinstance(label, Label):
+                raise ValueError(f"wrong label type: {type(label)}")
+
+            result.label = label
+
+        self.commit()
+        return result
 
     def remove_results(self, origin='pipeline'):
 
         results = Result.query.filter(Result.file == self, Result.origin == origin)
 
-        results.remove()
+        results.delete()
 
         return results

pycs/database/Project.py

@@ -54,7 +54,7 @@ class Project(NamedBaseModel):
         :param identifier: unique identifier
         :return: label
         """
-        return self.labels.get(id)
+        return self.labels.filter_by(id=id).one_or_none()
 
     def file(self, id: int) -> T.Optional[Label]:
         """
@@ -63,7 +63,7 @@ class Project(NamedBaseModel):
         :param identifier: unique identifier
         :return: file
         """
-        return self.files.get(id)
+        return self.files.filter_by(id=id).one_or_none()
 
     def collection(self, id: int) -> T.Optional[Collection]:
         """
@@ -72,7 +72,7 @@ class Project(NamedBaseModel):
         :param identifier: unique identifier
         :return: collection
         """
-        return self.collections.get(id)
+        return self.collections.filter_by(id=id).one_or_none()
 
     def collection_by_reference(self, reference: str) -> T.Optional[Collection]:
         """
@@ -81,7 +81,7 @@ class Project(NamedBaseModel):
         :param identifier: unique identifier
         :return: collection
         """
-        return self.collections.filter_by(reference=reference).one()
+        return self.collections.filter_by(reference=reference).one_or_none()
 
     def create_label(self, name: str, reference: str = None,
                      parent_id: int = None) -> Tuple[Optional[Label], bool]:
@@ -159,6 +159,7 @@ class Project(NamedBaseModel):
         :return:
         """
         self.description = description
+        self.commit()
 
     def count_files(self) -> int:
         """

pycs/database/Result.py

@@ -23,6 +23,16 @@ class Result(BaseModel):
 
     data = db.Column(db.String)
 
+    serialize_only = (
+        "id",
+        "file_id",
+        "origin",
+        "type",
+        "label_id",
+        "data",
+    )
+
+
     def serialize(self):
         result = super().serialize()
         if result["data"] is not None:

pycs/database/base.py

@@ -20,7 +20,7 @@ class BaseModel(db.Model, ModelSerializer):
 
     @property
     def identifier(self) -> int:
-        app.logger.warning("REMOVE ME!")
+        app.logger.warning("BaseModel.identifier: REMOVE ME!")
         return self.id
 
 
@@ -30,6 +30,10 @@ class BaseModel(db.Model, ModelSerializer):
         result["identifier"] = result["id"]
         return result
 
+    def __repr__(self):
+        attrs = self.serialize()
+        content = ", ".join([f"{attr}={value}" for attr, value in attrs.items()])
+        return f"<{self.__class__.__name__}: {content}>"
 
     def remove(self, commit=True) -> None:
         """

pycs/frontend/WebServer.py

@@ -242,7 +242,7 @@ class WebServer:
         # results
         self.app.add_url_rule(
             '/projects/<int:project_id>/results',
-            view_func=GetProjectResults.as_view('get_project_results', self.db)
+            view_func=GetProjectResults.as_view('get_project_results')
         )
         self.app.add_url_rule(
             '/data/<int:file_id>/results',

pycs/frontend/endpoints/data/GetResizedFile.py

@@ -27,7 +27,7 @@ class GetResizedFile(View):
         if file is None:
             return abort(404)
 
-        project = file.project()
+        project = file.project
 
         # extract desired resolution
         resolution = re.split(r'[^0-9]', resolution)

pycs/frontend/endpoints/data/RemoveFile.py

@@ -34,8 +34,7 @@ class RemoveFile(View):
                 return abort(400)
 
             # check if project uses an external data directory
-            project = file.project()
-            if project.external_data:
+            if file.project.external_data:
                 return abort(400)
 
             # remove file from database
@@ -47,5 +46,5 @@ class RemoveFile(View):
             # TODO remove temp files
 
         # send notification
-        self.nm.remove_file(file)
+        self.nm.remove_file(file.id)
         return make_response()

pycs/frontend/endpoints/data/UploadFile.py

@@ -65,7 +65,7 @@ class UploadFile(View):
                                        self.file_size, self.file_id, frames, fps)
 
         # send update
-        self.nm.create_file(file)
+        self.nm.create_file(file.id)
 
         # return default success response
         return make_response()

pycs/frontend/endpoints/labels/CreateLabel.py

@@ -38,7 +38,7 @@ class CreateLabel(View):
             label, _ = project.create_label(name, parent_id=parent)
 
         # send notification
-        self.nm.create_label(label)
+        self.nm.create_label(label.id)
 
         # return success response
         return make_response()

pycs/frontend/endpoints/labels/EditLabelName.py

@@ -40,7 +40,7 @@ class EditLabelName(View):
             label.set_name(data['name'])
 
         # send notification
-        self.nm.edit_label(label)
+        self.nm.edit_label(label.id)
 
         # return success response
         return make_response()

pycs/frontend/endpoints/labels/EditLabelParent.py

@@ -40,7 +40,7 @@ class EditLabelParent(View):
             label.set_parent(data['parent'])
 
         # send notification
-        self.nm.edit_label(label)
+        self.nm.edit_label(label.id)
 
         # return success response
         return make_response()

pycs/frontend/endpoints/labels/RemoveLabel.py

@@ -42,11 +42,11 @@ class RemoveLabel(View):
             # remove children's parent entry
             for child in children:
                 child.set_parent(None)
-                self.nm.edit_label(child)
+                self.nm.edit_label(child.id)
 
             # remove label
             label.remove()
-            self.nm.remove_label(label)
+            self.nm.remove_label(label.id)
 
         # return success response
         return make_response()

pycs/frontend/endpoints/pipelines/FitModel.py

@@ -2,6 +2,7 @@ from flask import make_response, request, abort
 from flask.views import View
 
 from pycs.database.Database import Database
+from pycs.database.Project import Project
 from pycs.interfaces.MediaStorage import MediaStorage
 from pycs.jobs.JobGroupBusyException import JobGroupBusyException
 from pycs.jobs.JobRunner import JobRunner
@@ -29,7 +30,7 @@ class FitModel(View):
             return abort(400)
 
         # find project
-        project = self.db.project(project_id)
+        project = Project.query.get(project_id)
         if project is None:
             return abort(404)
 
@@ -47,25 +48,18 @@ class FitModel(View):
 
     @staticmethod
     def load_and_fit(database: Database, pipelines: PipelineCache, project_id: int):
-        db = None
         pipeline = None
 
-        # create new database instance
-        try:
-            db = database.copy()
-            project = db.project(project_id)
-            model = project.model()
-            storage = MediaStorage(db, project_id)
+        project = Project.query.get(project_id)
+        model = project.model()
+        storage = MediaStorage(project_id)
 
-            # load pipeline
-            try:
-                pipeline = pipelines.load_from_root_folder(project, model.root_folder)
-                yield from pipeline.fit(storage)
-            except TypeError:
-                pass
-            finally:
-                if pipeline is not None:
-                    pipelines.free_instance(model.root_folder)
+        # load pipeline
+        try:
+            pipeline = pipelines.load_from_root_folder(project, model.root_folder)
+            yield from pipeline.fit(storage)
+        except TypeError:
+            pass
         finally:
-            if db is not None:
-                db.close()
+            if pipeline is not None:
+                pipelines.free_instance(model.root_folder)

pycs/frontend/endpoints/pipelines/PredictFile.py

@@ -38,7 +38,7 @@ class PredictFile(View):
             return abort(404)
 
         # get project and model
-        project = file.project()
+        project = file.project
 
         # create job
         try:

pycs/frontend/endpoints/pipelines/PredictModel.py

@@ -3,7 +3,9 @@ from typing import Any
 from flask import make_response, request, abort
 from flask.views import View
 
+from pycs import app
 from pycs.database.Database import Database
+from pycs.database.Project import Project
 from pycs.frontend.notifications.NotificationList import NotificationList
 from pycs.frontend.notifications.NotificationManager import NotificationManager
 from pycs.interfaces.MediaFile import MediaFile
@@ -32,11 +34,11 @@ class PredictModel(View):
         # extract request data
         data = request.get_json(force=True)
 
-        if 'predict' not in data or data['predict'] not in ['all', 'new']:
+        if data.get('predict') not in ['all', 'new']:
             return abort(400)
 
         # find project
-        project = self.db.project(project_id)
+        project = Project.query.get(project_id)
         if project is None:
             return abort(404)
 
@@ -66,9 +68,9 @@ class PredictModel(View):
         # create new database instance
         try:
             db = database.copy()
-            project = db.project(project_id)
-            model = project.model()
-            storage = MediaStorage(db, project_id, notifications)
+            project = Project.query.get(project_id)
+            model = project.model
+            storage = MediaStorage(project_id, notifications)
 
             # create a list of MediaFile
             if isinstance(file_filter, str):
@@ -79,7 +81,7 @@ class PredictModel(View):
                 else:
                     length = project.count_files()
                     files = map(lambda f: MediaFile(f, notifications),
-                                project.files())
+                                project.files.all())
             else:
                 files = map(lambda f: MediaFile(project.file(f.identifier), notifications),
                             file_filter)
@@ -103,9 +105,20 @@ class PredictModel(View):
                     yield index / length, notifications
 
                     index += 1
+            except Exception as e:
+                import traceback
+                traceback.print_exc()
+                app.logger.warning(f"Pipeline Error #2: {e}")
+
             finally:
                 if pipeline is not None:
                     pipelines.free_instance(model.root_folder)
+
+        except Exception as e:
+            import traceback
+            traceback.print_exc()
+            app.logger.warning(f"Pipeline Error #1: {e}")
+
         finally:
             if db is not None:
                 db.close()

pycs/frontend/endpoints/projects/CreateProject.py

@@ -96,7 +96,7 @@ class CreateProject(View):
         # load model and add collections to the project
         def load_model_and_get_collections():
             with closing(load_pipeline(model.root_folder)) as pipeline:
-                return pipeline.collections()
+                return pipeline.collections.all()
 
         def add_collections_to_project(provided_collections):
             with self.db:
@@ -119,8 +119,8 @@ class CreateProject(View):
             ExecuteExternalStorage.find_media_files(self.db, self.nm, self.jobs, created)
 
         # fire event
-        self.nm.create_model(model)
-        self.nm.create_project(created)
+        self.nm.create_model(model.id)
+        self.nm.create_project(created.id)
 
         # return success response
         return make_response()

pycs/frontend/endpoints/projects/EditProjectDescription.py

@@ -33,6 +33,6 @@ class EditProjectDescription(View):
 
             # set description
             project.set_description(data['description'])
-            self.nm.edit_project(project)
+            self.nm.edit_project(project.id)
 
         return make_response()

pycs/frontend/endpoints/projects/EditProjectName.py

@@ -33,6 +33,6 @@ class EditProjectName(View):
 
             # set name
             project.set_name(data['name'])
-            self.nm.edit_project(project)
+            self.nm.edit_project(project.id)
 
             return make_response()

pycs/frontend/endpoints/projects/ExecuteExternalStorage.py

@@ -104,7 +104,7 @@ class ExecuteExternalStorage(View):
                                                     file_size, file_name, frames, fps)
 
                     if insert:
-                        nm.create_file(file)
+                        nm.create_file(file.id)
 
             return current / length
 

pycs/frontend/endpoints/projects/ExecuteLabelProvider.py

@@ -80,9 +80,9 @@ class ExecuteLabelProvider(View):
                                                                  label['parent'])
 
                     if insert:
-                        nm.create_label(created_label)
+                        nm.create_label(created_label.id)
                     else:
-                        nm.edit_label(created_label)
+                        nm.edit_label(created_label.id)
 
         # run job with given functions
         jobs.run(project,

pycs/frontend/endpoints/projects/RemoveProject.py

@@ -45,7 +45,7 @@ class RemoveProject(View):
             shutil.rmtree(project.root_folder)
 
             # send update
-            self.nm.remove_model(model)
-            self.nm.remove_project(project)
+            self.nm.remove_model(model.id)
+            self.nm.remove_project(project.id)
 
             return make_response()

pycs/frontend/endpoints/results/ConfirmResult.py

@@ -33,5 +33,5 @@ class ConfirmResult(View):
         with self.db:
             result.set_origin('user')
 
-        self.nm.edit_result(result)
+        self.nm.edit_result(result.id)
         return make_response()

pycs/frontend/endpoints/results/CreateResult.py

@@ -50,13 +50,13 @@ class CreateResult(View):
         # start transaction
         with self.db:
             # find full-image labels and remove them
-            for result in file.results():
+            for result in file.results.all():
                 if result.type == 'labeled-image':
                     result.remove()
-                    self.nm.remove_result(result)
+                    self.nm.remove_result(result.id)
 
             # insert into database
             result = file.create_result('user', rtype, label, data)
-            self.nm.create_result(result)
+            self.nm.create_result(result.id)
 
         return jsonify(result)

pycs/frontend/endpoints/results/EditResultData.py

@@ -34,5 +34,5 @@ class EditResultData(View):
             result.set_data(data['data'])
             result.set_origin('user')
 
-        self.nm.edit_result(result)
+        self.nm.edit_result(result.id)
         return make_response()

pycs/frontend/endpoints/results/EditResultLabel.py

@@ -38,5 +38,5 @@ class EditResultLabel(View):
             result.set_label(data['label'])
             result.set_origin('user')
 
-        self.nm.edit_result(result)
+        self.nm.edit_result(result.id)
         return make_response()

pycs/frontend/endpoints/results/GetProjectResults.py

@@ -1,7 +1,7 @@
 from flask import abort, jsonify
 from flask.views import View
 
-from pycs.database.Database import Database
+from pycs.database.Project import Project
 from pycs.interfaces.MediaStorage import MediaStorage
 
 
@@ -12,18 +12,14 @@ class GetProjectResults(View):
     # pylint: disable=arguments-differ
     methods = ['GET']
 
-    def __init__(self, db: Database):
-        # pylint: disable=invalid-name
-        self.db = db
-
     def dispatch_request(self, project_id: int):
         # get project from database
-        project = self.db.project(project_id)
+        project = Project.object.get(project_id)
         if project is None:
             return abort(404)
 
         # map media files to a dict
-        ms = MediaStorage(self.db, project.identifier, None)
+        ms = MediaStorage(project.id)
         files = list(map(lambda f: f.serialize(), ms.files().iter()))
 
         # return result

pycs/frontend/endpoints/results/GetResults.py

@@ -21,8 +21,5 @@ class GetResults(View):
         if file is None:
             return abort(404)
 
-        # get results
-        results = file.results()
-
         # return result
-        return jsonify(results)
+        return jsonify(file.results.all())

pycs/frontend/endpoints/results/RemoveResult.py

@@ -33,5 +33,5 @@ class RemoveResult(View):
         with self.db:
             result.remove()
 
-        self.nm.remove_result(result)
+        self.nm.remove_result(result.id)
         return make_response()

pycs/frontend/endpoints/results/ResetResults.py

@@ -30,7 +30,7 @@ class ResetResults(View):
             return abort(404)
 
         # get results
-        results = file.results()
+        results = file.results.all()
 
         # start transaction
         with self.db:
@@ -38,6 +38,6 @@ class ResetResults(View):
                 result.remove()
 
         for result in results:
-            self.nm.remove_result(result)
+            self.nm.remove_result(result.id)
 
         return make_response()

pycs/frontend/notifications/NotificationManager.py

@@ -1,5 +1,6 @@
 from socketio import Server
 
+from pycs import app
 from pycs.database.File import File
 from pycs.database.Label import Label
 from pycs.database.Model import Model
@@ -18,7 +19,16 @@ class NotificationManager:
         self.sio = sio
         self.json = JSONEncoder()
 
-    def __emit(self, name, obj):
+    def __emit(self, name, obj_id, cls=None):
+        if cls is not None:
+            assert isinstance(obj_id, int), "Object ID must be an integer!"
+            obj = cls.query.get(obj_id)
+
+        else:
+            obj = obj_id
+
+        app.logger.debug(name, obj)
+
         enc = self.json.default(obj)
         self.sio.emit(name, enc)
 
@@ -29,7 +39,6 @@ class NotificationManager:
         :param created_job:
         :return:
         """
-        print('create_job', created_job)
         self.__emit('create-job', created_job)
 
     def edit_job(self, edited_job: Job):
@@ -39,7 +48,6 @@ class NotificationManager:
         :param edited_job:
         :return:
         """
-        print('edit_job', edited_job)
         self.__emit('edit-job', edited_job)
 
     def remove_job(self, removed_job: Job):
@@ -49,145 +57,130 @@ class NotificationManager:
         :param removed_job:
         :return:
         """
-        print('remove_job', removed_job)
         self.__emit('remove-job', removed_job)
 
-    def create_model(self, created_model: Model):
+    def create_model(self, created_model_id: int):
         """
         fire create-model event
 
         :param created_model:
         :return:
         """
-        print('create_model', created_model)
-        self.__emit('create-model', created_model)
+        self.__emit('create-model', created_model_id, Model)
 
-    def remove_model(self, removed_model: Model):
+    def remove_model(self, removed_model_id: int):
         """
         fire remove-model event
 
         :param removed_model:
         :return:
         """
-        print('remove_model', removed_model)
-        self.__emit('remove-model', removed_model)
+        self.__emit('remove-model', removed_model_id, Model)
 
-    def create_project(self, created_project: Project):
+    def create_project(self, created_project_id: int):
         """
         fire create-project event
 
         :param created_project:
         :return:
         """
-        print('create_project', created_project)
-        self.__emit('create-project', created_project)
+        self.__emit('create-project', created_project_id, Project)
 
-    def remove_project(self, removed_project: Project):
+    def remove_project(self, removed_project_id: int):
         """
         fire remove-project event
 
         :param removed_project:
         :return:
         """
-        print('remove_project', removed_project)
-        self.__emit('remove-project', removed_project)
+        self.__emit('remove-project', removed_project_id, Project)
 
-    def edit_project(self, edited_project: Project):
+    def edit_project(self, edited_project_id: int):
         """
         fire edit-project event
 
         :param edited_project:
         :return:
         """
-        print('edit_project', edited_project)
-        self.__emit('edit-project', edited_project)
+        self.__emit('edit-project', edited_project_id, Project)
 
-    def create_label(self, created_label: Label):
+    def create_label(self, created_label_id: int):
         """
         fire create-label event
 
         :param created_label:
         :return:
         """
-        print('create_label', created_label)
-        self.__emit('create-label', created_label)
+        self.__emit('create-label', created_label_id, Label)
 
-    def edit_label(self, edited_label: Label):
+    def edit_label(self, edited_label_id: int):
         """
         fire edit-label event
 
         :param edited_label:
         :return:
         """
-        print('edit_label', edited_label)
-        self.__emit('edit-label', edited_label)
+        self.__emit('edit-label', edited_label_id, Label)
 
-    def remove_label(self, removed_label: Label):
+    def remove_label(self, removed_label_id: int):
         """
         fire remove-label event
 
         :param removed_label:
         :return:
         """
-        print('remove_label', removed_label)
-        self.__emit('remove-label', removed_label)
+        self.__emit('remove-label', removed_label_id, Label)
 
-    def create_file(self, created_file: File):
+    def create_file(self, created_file_id: int):
         """
         fire create-file event
 
         :param created_file:
         :return:
         """
-        print('create_file', created_file)
-        self.__emit('create-file', created_file)
+        self.__emit('create-file', created_file_id, File)
 
-    def edit_file(self, edited_file: File):
+    def edit_file(self, edited_file_id: int):
         """
         fire edit-file event
 
         :param edited_file:
         :return:
         """
-        print('edit_file', edited_file)
-        self.__emit('edit-file', edited_file)
+        self.__emit('edit-file', edited_file_id, File)
 
-    def remove_file(self, removed_file: File):
+    def remove_file(self, removed_file_id: int):
         """
         fire remove-file event
 
         :param removed_file:
         :return:
         """
-        print('remove_file', removed_file)
-        self.__emit('remove-file', removed_file)
+        self.__emit('remove-file', removed_file_id, File)
 
-    def create_result(self, created_result: Result):
+    def create_result(self, created_result_id: int):
         """
         fire create-result event
 
         :param created_result:
         :return:
         """
-        print('create_result', created_result)
-        self.__emit('create-result', created_result)
+        self.__emit('create-result', created_result_id, Result)
 
-    def edit_result(self, edited_result: Result):
+    def edit_result(self, edited_result_id: int):
         """
         fire edit-result event
 
         :param edited_result:
         :return:
         """
-        print('edit_result', edited_result)
-        self.__emit('edit-result', edited_result)
+        self.__emit('edit-result', edited_result_id, Result)
 
-    def remove_result(self, removed_result: Result):
+    def remove_result(self, removed_result_id: int):
         """
         fire remove-result event
 
         :param removed_result:
         :return:
         """
-        print('remove_result', removed_result)
-        self.__emit('remove-result', removed_result)
+        self.__emit('remove-result', removed_result_id, Result)

pycs/interfaces/MediaFile.py

@@ -35,7 +35,7 @@ class MediaFile:
         :param reference: use None to remove this file's collection
         """
         self.__file.set_collection_by_reference(reference)
-        self.__notifications.add(self.__notifications.nm.edit_file, self.__file)
+        self.__notifications.add(self.__notifications.nm.edit_file, self.__file.id)
 
     def set_image_label(self, label: Union[int, MediaLabel], frame: int = None):
         """
@@ -53,7 +53,7 @@ class MediaFile:
             data = None
 
         created = self.__file.create_result('pipeline', 'labeled-image', label, data)
-        self.__notifications.add(self.__notifications.nm.create_result, created)
+        self.__notifications.add(self.__notifications.nm.create_result, created.id)
 
     def add_bounding_box(self, x: float, y: float, w: float, h: float,
                          label: Union[int, MediaLabel] = None, frame: int = None):
@@ -80,7 +80,7 @@ class MediaFile:
             label = label.identifier
 
         created = self.__file.create_result('pipeline', 'bounding-box', label, result)
-        self.__notifications.add(self.__notifications.nm.create_result, created)
+        self.__notifications.add(self.__notifications.nm.create_result, created.id)
 
     def remove_predictions(self):
         """
@@ -88,7 +88,7 @@ class MediaFile:
         """
         removed = self.__file.remove_results(origin='pipeline')
         for r in removed:
-            self.__notifications.add(self.__notifications.nm.remove_result, r)
+            self.__notifications.add(self.__notifications.nm.remove_result, r.id)
 
     def __get_results(self, origin: str) -> List[Union[MediaImageLabel, MediaBoundingBox]]:
         def map_r(result: Result) -> Union[MediaImageLabel, MediaBoundingBox]:
@@ -97,9 +97,7 @@ class MediaFile:
             else:
                 return MediaBoundingBox(result)
 
-        return list(map(map_r,
-                        filter(lambda r: r.origin == origin,
-                               self.__file.results())))
+        return list(map(map_r, self.__file.results.filter_by(origin=origin)))
 
     def results(self) -> List[Union[MediaImageLabel, MediaBoundingBox]]:
         """
@@ -125,6 +123,6 @@ class MediaFile:
             'fps': self.fps,
             'path': self.path,
             'filename': self.__file.name + self.__file.extension,
-            'results': list(map(lambda r: r.serialize(), self.results())),
+            'results': list(map(lambda r: r.serialize(), self.results)),
             'predictions': list(map(lambda r: r.serialize(), self.predictions())),
         }

pycs/interfaces/MediaFileList.py

@@ -39,11 +39,11 @@ class MediaFileList:
             source = self.__project
 
         if self.__label is None:
-            for file in source.files():
+            for file in source.files.all():
                 yield MediaFile(file, self.__notifications)
         else:
-            for file in source.files():
-                for result in file.results():
+            for file in source.files.all():
+                for result in file.results.all():
                     if result.label == self.__label:
                         yield MediaFile(file, self.__notifications)
                         break

pycs/interfaces/MediaStorage.py

@@ -1,6 +1,6 @@
 from typing import List
 
-from pycs.database.Database import Database
+from pycs.database.Project import Project
 from pycs.frontend.notifications.NotificationList import NotificationList
 from pycs.interfaces.MediaFileList import MediaFileList
 from pycs.interfaces.MediaLabel import MediaLabel
@@ -11,13 +11,12 @@ class MediaStorage:
     helper class for pipelines to interact with database entities
     """
 
-    def __init__(self, db: Database, project_id: int, notifications: NotificationList = None):
-        self.__db = db
+    def __init__(self, project_id: int, notifications: NotificationList = None):
         self.__project_id = project_id
         self.__notifications = notifications
 
-        self.__project = self.__db.project(self.__project_id)
-        self.__collections = self.__project.collections()
+        self.__project = Project.query.get(self.__project_id)
+        self.__collections = self.__project.collections.all()
 
     def labels(self) -> List[MediaLabel]:
         """
@@ -25,7 +24,7 @@ class MediaStorage:
 
         :return: list of labels
         """
-        label_list = self.__project.labels()
+        label_list = self.__project.labels.all()
         label_dict = {la.identifier: MediaLabel(la) for la in label_list}
         result = []
 
@@ -48,7 +47,7 @@ class MediaStorage:
         """
         return list(filter(
             lambda ml: ml.parent is None,
-            self.labels()
+            self.labels.all()
         ))
 
     def files(self) -> MediaFileList:

pycs/util/PipelineCache.py

@@ -46,7 +46,7 @@ class PipelineCache:
 
         # save instance to cache
         with self.__lock:
-            self.__pipelines[root_folder] = [1, pipeline, project]
+            self.__pipelines[root_folder] = [1, pipeline, project.id]
 
         # return
         return pipeline
@@ -97,7 +97,8 @@ class PipelineCache:
     def __run(self):
         while True:
             # get pipeline
-            pipeline, project = tpool.execute(self.__get)
+            pipeline, project_id = tpool.execute(self.__get)
+            project = Project.query.get(project_id)
 
             # create job to close pipeline
             self.__jobs.run(project,

settings.json

@@ -18,7 +18,7 @@
       }
     },
     "root": {
-        "level": "DEBUG",
+        "level": "INFO",
         "handlers": ["wsgi"]
     }
   },