Server: removed some project settings

The Project model was featuring some unused parameters, such as
path_linux or render_path_linux. On the server we have only one storage
entry point (per project automations can be set up later), and that
storage hold I/O files for each job. Shared paths can be set up at the
manager level.

flamenco/manager/application/task_compilers/simple_blender_render.py

 import os
 import json
-#import logging
-
-#from application import app
 
 class task_compiler():
     @staticmethod
     def compile(worker, task, add_file):
 
         settings=task['settings']
-
-        """if 'Darwin' in worker.system:
-            setting_blender_path = app.config['BLENDER_PATH_OSX']
-            setting_render_settings = app.config['SETTINGS_PATH_OSX']
-            file_path = settings['file_path_osx']
-            output_path = settings['output_path_osx']
-        elif 'Windows' in worker.system:
-            setting_blender_path = app.config['BLENDER_PATH_WIN']
-            setting_render_settings = app.config['SETTINGS_PATH_WIN']
-            file_path = settings['file_path_win']
-            output_path = settings['output_path_win']
-        elif 'Linux' in worker.system:
-            setting_blender_path = app.config['BLENDER_PATH_LINUX']
-            setting_render_settings = app.config['SETTINGS_PATH_LINUX']
-            file_path = settings['file_path_linux']
-            output_path = settings['output_path_linux']
-
-        if setting_blender_path is None:
-            logging.info('[Debug] blender path is not set')
-            return None
-
-        if setting_render_settings is None:
-            logging.warning("Render settings path not set!")
-            return None
-
-        setting_render_settings = app.config['SETTINGS_PATH_LINUX']
-        render_settings = os.path.join(
-            setting_render_settings,
-            settings['render_settings'])"""
-
-        # TODO
-        #file_path = os.path.split(settings['file_path_linux'])[1]
         file_path = os.path.join('==jobpath==', settings['filepath'])
         output_path = "==outputpath=="
 
@@ -52,14 +17,12 @@ class task_compiler():
             script = f.read()
         f.close()
 
-
         add_file(
             script,
             'pre_render.py',
             task['job_id']
         )
 
-
         script_path = os.path.join(
             "==jobpath==", "pre_render.py")
 

flamenco/server/application/job_compilers/simple_blender_render.py

@@ -14,20 +14,9 @@ class job_compiler():
         task_settings['render_settings'] = job_settings['render_settings']
         task_settings['format'] = job_settings['format']
         task_settings['command_name'] = job_settings['command_name']
-
-        #project = Project.query.filter_by(id = job.project_id).first()
-        #filepath = task_settings['filepath']
-
-        """task_settings['file_path_linux'] = os.path.join(project.path_linux, filepath)
-        task_settings['file_path_win'] = os.path.join(project.path_win, filepath)
-        task_settings['file_path_osx'] = os.path.join(project.path_osx, filepath)"""
         task_settings['file_path_linux'] = ""
         task_settings['file_path_win'] = ""
         task_settings['file_path_osx'] = ""
-        #task_settings['settings'] = task.settings
-        """task_settings['output_path_linux'] = os.path.join(project.render_path_linux, str(job.id), '#####')
-        task_settings['output_path_win'] = os.path.join(project.render_path_win, str(job.id), '#####')
-        task_settings['output_path_osx'] = os.path.join(project.render_path_osx, str(job.id), '#####')"""
         task_settings['output_path_linux'] = '#####'
         task_settings['output_path_win'] = '#####'
         task_settings['output_path_osx'] = '#####'

flamenco/server/application/job_compilers/tiled_blender_render.py

@@ -6,27 +6,16 @@ class job_compiler():
     @staticmethod
     def compile(job, project, create_task):
         parser = 'blender_render'
-
         job_settings = json.loads(job.settings)
-        task_settings={}
-        task_settings['filepath'] = job_settings['filepath']
-        task_settings['render_settings'] = job_settings['render_settings']
-        task_settings['format'] = job_settings['format']
-        task_settings['command_name'] = job_settings['command_name']
-
-        #project = Project.query.filter_by(id = job.project_id).first()
-        filepath = task_settings['filepath']
-        task_settings['file_path_linux'] = os.path.join(project.path_linux, filepath)
-        task_settings['file_path_win'] = os.path.join(project.path_win, filepath)
-        task_settings['file_path_osx'] = os.path.join(project.path_osx, filepath)
-        #task_settings['settings'] = task.settings
-        task_settings['output_path_linux'] = os.path.join(project.render_path_linux, str(job.id))
-        task_settings['output_path_win'] = os.path.join(project.render_path_win, str(job.id))
-        task_settings['output_path_osx'] = os.path.join(project.render_path_osx, str(job.id))
-        task_settings['priority'] = job.priority
-
-        task_settings['frame_start']=job_settings['frames'].split('-')[0]
-        task_settings['frame_end']=job_settings['frames'].split('-')[0]
+        task_settings = dict(
+            filepath=job_settings['filepath'],
+            render_settings=job_settings['render_settings'],
+            format=job_settings['format'],
+            command_name=job_settings['command_name'],
+            priority=job.priority,
+            frame_start=job_settings['frames'].split('-')[0],
+            frame_end=job_settings['frames'].split('-')[0]
+        )
 
         tiles = 4
         task_settings['tiles'] = tiles

flamenco/server/application/modules/projects/__init__.py

@@ -12,28 +12,12 @@ from application.modules.jobs.model import Job
 
 parser = reqparse.RequestParser()
 parser.add_argument('name', type=str)
-parser.add_argument('path_server', type=str)
-parser.add_argument('path_linux', type=str)
-parser.add_argument('path_win', type=str)
-parser.add_argument('path_osx', type=str)
-parser.add_argument('render_path_server', type=str)
-parser.add_argument('render_path_linux', type=str)
-parser.add_argument('render_path_win', type=str)
-parser.add_argument('render_path_osx', type=str)
 parser.add_argument('is_active', type=bool)
 
 
 project_fields = {
     'id' : fields.Integer,
     'name' : fields.String,
-    'path_server' : fields.String,
-    'path_linux' : fields.String,
-    'path_win' : fields.String,
-    'path_osx' : fields.String,
-    'render_path_server' : fields.String,
-    'render_path_linux' : fields.String,
-    'render_path_win' : fields.String,
-    'render_path_osx' : fields.String,
     'is_active' :fields.Boolean
 }
 
@@ -50,14 +34,6 @@ class ProjectListApi(Resource):
         for project in Project.query.all():
             projects[project.id] = dict(
                 name=project.name)
-        """path_server=project.path_server,
-        path_linux=project.path_linux,
-        path_win=project.path_win,
-        path_osx=project.path_osx,
-        render_path_server=project.render_path_server,
-        render_path_linux=project.render_path_linux,
-        render_path_win=project.render_path_win,
-        render_path_osx=project.render_path_osx)"""
         return jsonify(projects)
 
     @marshal_with(project_fields)
@@ -65,14 +41,6 @@ class ProjectListApi(Resource):
         args = parser.parse_args()
         project = Project(
             name=args['name'])
-        """path_server=args['path_server'],
-        path_linux=args['path_linux'],
-        path_win=args['path_win'],
-        path_osx=args['path_osx'],
-        render_path_server=args['render_path_server'],
-        render_path_linux=args['render_path_linux'],
-        render_path_win=args['render_path_win'],
-        render_path_osx=args['render_path_osx'])"""
         db.session.add(project)
         db.session.commit()
 
@@ -116,14 +84,6 @@ class ProjectApi(Resource):
     def put(self, project_id):
         args = parser.parse_args()
         project = Project.query.get_or_404(project_id)
-        project.path_server = args['path_server']
-        project.path_linux = args['path_linux']
-        project.path_win = args['path_win']
-        project.path_osx = args['path_osx']
-        project.render_path_server = args['render_path_server']
-        project.render_path_linux = args['render_path_linux']
-        project.render_path_win = args['render_path_win']
-        project.render_path_osx = args['render_path_osx']
         if args['name']:
             project.name = args['name']
         if args['is_active']:

flamenco/server/application/modules/projects/model.py

-from datetime import date
+import datetime
 from application import db
 from application.modules.settings.model import Setting
 
 
 class Project(db.Model):
-    """Production project folders
-
-    This is a temporary table to get quickly up and running with project
-    support in flamenco. In the future, project definitions could come from
-    attract or it could be defined in another way.
+    """The project model is used mostly for overview queries on jobs. Most of
+    the configuration values that were originally associated with a project
+    have been moved to the managers.
     """
+
     id = db.Column(db.Integer, primary_key=True)
     name = db.Column(db.String(120))
-    path_server = db.Column(db.Text())
-    path_linux = db.Column(db.Text())
-    path_win = db.Column(db.Text())
-    path_osx = db.Column(db.Text())
-    render_path_server = db.Column(db.Text())
-    render_path_linux = db.Column(db.Text())
-    render_path_win = db.Column(db.Text())
-    render_path_osx = db.Column(db.Text())
+    status = db.Column(db.String(80))
+    creation_date = db.Column(db.DateTime(), default=datetime.datetime.now)
+
 
     @property
     def is_active(self):

flamenco/server/migrations/versions/86dad093873_project_table_cleanup.py

+"""Project table cleanup
+
+Revision ID: 86dad093873
+Revises: 2d4e61f9aa2a
+Create Date: 2015-10-18 21:04:19.180507
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '86dad093873'
+down_revision = '2d4e61f9aa2a'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    op.add_column('project', sa.Column('creation_date', sa.DateTime(), nullable=True))
+    op.add_column('project', sa.Column('status', sa.String(length=80), nullable=True))
+    with op.batch_alter_table('project', schema=None) as batch_op:
+        batch_op.drop_column('path_linux')
+        batch_op.drop_column('render_path_linux')
+        batch_op.drop_column('render_path_osx')
+        batch_op.drop_column('path_win')
+        batch_op.drop_column('render_path_server')
+        batch_op.drop_column('render_path_win')
+        batch_op.drop_column('path_osx')
+        batch_op.drop_column('path_server')
+
+
+def downgrade():
+    op.add_column('project', sa.Column('path_server', sa.TEXT(), nullable=True))
+    op.add_column('project', sa.Column('path_osx', sa.TEXT(), nullable=True))
+    op.add_column('project', sa.Column('render_path_win', sa.TEXT(), nullable=True))
+    op.add_column('project', sa.Column('render_path_server', sa.TEXT(), nullable=True))
+    op.add_column('project', sa.Column('path_win', sa.TEXT(), nullable=True))
+    op.add_column('project', sa.Column('render_path_osx', sa.TEXT(), nullable=True))
+    op.add_column('project', sa.Column('render_path_linux', sa.TEXT(), nullable=True))
+    op.add_column('project', sa.Column('path_linux', sa.TEXT(), nullable=True))
+    with op.batch_alter_table('project', schema=None) as batch_op:
+        batch_op.drop_column('status')
+        batch_op.drop_column('creation_date')