zou 1.0.3__tar.gz → 1.0.5__tar.gz

{zou-1.0.3/zou.egg-info → zou-1.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zou
-Version: 1.0.3
+Version: 1.0.5
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire

zou-1.0.5/zou/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.0.5"

{zou-1.0.3 → zou-1.0.5}/zou/app/blueprints/crud/person.py

@@ -604,6 +604,7 @@ class PersonResource(BaseModelResource, ArgsMixin):
         if (
             instance_dict["email"] in config.PROTECTED_ACCOUNTS
             and instance_dict["id"] != persons_service.get_current_user()["id"]
+            and instance_dict.get("is_bot", False) == False
         ):
             message = None
             if data.get("active") is False:

{zou-1.0.3 → zou-1.0.5}/zou/app/blueprints/crud/task_type.py

@@ -1,6 +1,7 @@
 from flask_jwt_extended import jwt_required
 
 from zou.app.models.task_type import TaskType
+from zou.app.models.schedule_item import ScheduleItem
 from zou.app.services.exception import WrongParameterException
 from zou.app.services import tasks_service
 
@@ -317,6 +318,15 @@ class TaskTypeResource(BaseModelResource):
         """
         return super().delete(instance_id)
 
+    def pre_delete(self, instance_dict):
+        """
+        Delete related ScheduleItems before deleting the TaskType.
+        This runs AFTER check_delete_permissions, preventing foreign key
+        constraint violations while maintaining security.
+        """
+        ScheduleItem.query.filter_by(task_type_id=instance_dict["id"]).delete()
+        return instance_dict
+
     def update_data(self, data, instance_id):
         data = super().update_data(data, instance_id)
         name = data.get("name", None)

{zou-1.0.3 → zou-1.0.5}/zou/app/blueprints/events/resources.py

@@ -38,6 +38,13 @@ class EventsResource(Resource, ArgsMixin):
             default: false
             description: Return only file-related events
             example: false
+          - in: query
+            name: cursor_event_id
+            required: False
+            type: string
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
+            description: ID of the last event from previous page for cursor-based pagination
           - in: query
             name: limit
             type: integer
@@ -99,7 +106,8 @@ class EventsResource(Resource, ArgsMixin):
                 ("after", None, False),
                 ("before", None, False),
                 ("only_files", False, False),
-                ("limit", 100, False),
+                ("cursor_event_id", None, False),
+                ("limit", 100, False, int),
                 ("project_id", None, False),
                 ("name", None, False),
             ],
@@ -108,6 +116,7 @@ class EventsResource(Resource, ArgsMixin):
         permissions.check_manager_permissions()
         before = self.parse_date_parameter(args["before"])
         after = self.parse_date_parameter(args["after"])
+        cursor_event_id = args["cursor_event_id"]
         limit = args["limit"]
         only_files = args["only_files"] == "true"
         project_id = args.get("project_id", None)
@@ -116,15 +125,21 @@ class EventsResource(Resource, ArgsMixin):
             raise WrongParameterException(
                 "The project_id parameter is not a valid id"
             )
-        else:
-            return events_service.get_last_events(
-                after=after,
-                before=before,
-                limit=limit,
-                only_files=only_files,
-                project_id=project_id,
-                name=name,
+        if cursor_event_id is not None and not fields.is_valid_id(
+            cursor_event_id
+        ):
+            raise WrongParameterException(
+                "The cursor_event_id parameter is not a valid id"
             )
+        return events_service.get_last_events(
+            after=after,
+            before=before,
+            cursor_event_id=cursor_event_id,
+            limit=limit,
+            only_files=only_files,
+            project_id=project_id,
+            name=name,
+        )
 
 
 class LoginLogsResource(Resource, ArgsMixin):

{zou-1.0.3 → zou-1.0.5}/zou/app/blueprints/files/resources.py

@@ -1303,6 +1303,8 @@ class NewEntityOutputFileResource(Resource, ArgsMixin):
             return {"error": "Cannot find given person."}, 400
         except EntryAlreadyExistsException:
             return {"error": "The given output file already exists."}, 400
+        except MalformedFileTreeException as exception:
+            return {"error": str(exception)}, 400
 
         return output_file_dict, 201
 

{zou-1.0.3 → zou-1.0.5}/zou/app/blueprints/index/resources.py

@@ -1,16 +1,21 @@
+import datetime
+
 import psutil
 import redis
 import requests
-import datetime
-
 from flask import Response, abort
+from flask_jwt_extended import jwt_required
 from flask_restful import Resource
-from zou import __version__
 
+from zou import __version__
 from zou.app import app, config
-from zou.app.utils import permissions, shell, date_helpers
-from zou.app.services import projects_service, stats_service, persons_service
-from flask_jwt_extended import jwt_required
+from zou.app.indexer import indexing
+from zou.app.services import (
+    persons_service,
+    projects_service,
+    stats_service,
+)
+from zou.app.utils import date_helpers, permissions, shell
 from zou.app.utils.redis import get_redis_url
 
 
@@ -40,14 +45,32 @@ class IndexResource(Resource):
 
 
 class BaseStatusResource(Resource):
+
     def get_status(self):
-        is_db_up = True
+        is_db_up = self._check_database()
+        is_kv_up = self._check_key_value_store()
+        is_es_up = self._check_event_stream()
+        is_jq_up = self._check_job_queue()
+        is_indexer_up = self._check_indexer()
+
+        return (
+            config.APP_NAME,
+            __version__,
+            is_db_up,
+            is_kv_up,
+            is_es_up,
+            is_jq_up,
+            is_indexer_up,
+        )
+
+    def _check_database(self):
         try:
             projects_service.get_or_create_status("Open")
+            return True
         except Exception:
-            is_db_up = False
+            return False
 
-        is_kv_up = True
+    def _check_key_value_store(self):
         try:
             store = redis.StrictRedis(
                 host=config.KEY_VALUE_STORE["host"],
@@ -57,18 +80,21 @@ class BaseStatusResource(Resource):
                 decode_responses=True,
             )
             store.get("test")
+            return True
         except redis.ConnectionError:
-            is_kv_up = False
+            return False
 
-        is_es_up = True
+    def _check_event_stream(self):
         try:
             requests.get(
-                f"http://{config.EVENT_STREAM_HOST}:{config.EVENT_STREAM_PORT}"
+                f"http://{config.EVENT_STREAM_HOST}:{config.EVENT_STREAM_PORT}",
+                timeout=5,
             )
+            return True
         except Exception:
-            is_es_up = False
+            return False
 
-        is_jq_up = True
+    def _check_job_queue(self):
         try:
             args = [
                 "rq",
@@ -77,30 +103,20 @@ class BaseStatusResource(Resource):
                 get_redis_url(config.KV_JOB_DB_INDEX),
             ]
             out = shell.run_command(args)
-            is_jq_up = b"0 workers" not in out
+            return b"0 workers" not in out
         except Exception:
             app.logger.error("Job queue is not accessible", exc_info=1)
-            is_jq_up = False
+            return False
 
-        is_indexer_up = True
+    def _check_indexer(self):
         try:
-            requests.get(
-                f"{config.INDEXER['protocol']}://{config.INDEXER['host']}:{config.INDEXER['port']}"
-            )
+            client = indexing.get_client()
+            client.get_indexes()
+            return True
+        except indexing.IndexerNotInitializedError:
+            return False
         except Exception:
-            is_indexer_up = False
-
-        version = __version__
-
-        return (
-            config.APP_NAME,
-            version,
-            is_db_up,
-            is_kv_up,
-            is_es_up,
-            is_jq_up,
-            is_indexer_up,
-        )
+            return False
 
 
 class StatusResource(BaseStatusResource):
@@ -224,9 +240,16 @@ class StatusResourcesResource(BaseStatusResource):
                           type: integer
                           example: 3
         """
-        loadavg = list(psutil.getloadavg())
+        return {
+            "date": datetime.datetime.now().isoformat(),
+            "cpu": self._get_cpu_stats(),
+            "memory": self._get_memory_stats(),
+            "jobs": self._get_job_stats(),
+        }
 
-        cpu_stats = {
+    def _get_cpu_stats(self):
+        loadavg = list(psutil.getloadavg())
+        return {
             "percent": psutil.cpu_percent(interval=1, percpu=True),
             "loadavg": {
                 "last 1 min": loadavg[0],
@@ -235,29 +258,23 @@ class StatusResourcesResource(BaseStatusResource):
             },
         }
 
-        memory_stats = {
-            "total": psutil.virtual_memory().total,
-            "used": psutil.virtual_memory().used,
-            "available": psutil.virtual_memory().available,
-            "percent": psutil.virtual_memory().percent,
+    def _get_memory_stats(self):
+        memory = psutil.virtual_memory()
+        return {
+            "total": memory.total,
+            "used": memory.used,
+            "available": memory.available,
+            "percent": memory.percent,
         }
 
+    def _get_job_stats(self):
         nb_jobs = 0
         if config.ENABLE_JOB_QUEUE:
             from zou.app.stores.queue_store import job_queue
 
             registry = job_queue.started_job_registry
             nb_jobs = registry.count
-        job_stats = {
-            "running_jobs": nb_jobs,
-        }
-
-        return {
-            "date": datetime.datetime.now().isoformat(),
-            "cpu": cpu_stats,
-            "memory": memory_stats,
-            "jobs": job_stats,
-        }
+        return {"running_jobs": nb_jobs}
 
 
 class TxtStatusResource(BaseStatusResource):
@@ -294,22 +311,14 @@ class TxtStatusResource(BaseStatusResource):
             is_indexer_up,
         ) = self.get_status()
 
-        text = """name: %s
-version: %s
-database-up: %s
-event-stream-up: %s
-key-value-store-up: %s
-job-queue-up: %s
-indexer-up: %s
-""" % (
-            api_name,
-            version,
-            "up" if is_db_up else "down",
-            "up" if is_kv_up else "down",
-            "up" if is_es_up else "down",
-            "up" if is_jq_up else "down",
-            "up" if is_indexer_up else "down",
-        )
+        text = f"""name: {api_name}
+version: {version}
+database-up: {"up" if is_db_up else "down"}
+event-stream-up: {"up" if is_es_up else "down"}
+key-value-store-up: {"up" if is_kv_up else "down"}
+job-queue-up: {"up" if is_jq_up else "down"}
+indexer-up: {"up" if is_indexer_up else "down"}
+"""
         return Response(text, mimetype="text")
 
 
@@ -469,6 +478,7 @@ class ConfigResource(Resource):
             "saml_idp_name": config.SAML_IDP_NAME,
             "default_locale": config.DEFAULT_LOCALE,
             "default_timezone": config.DEFAULT_TIMEZONE,
+            "enforce_2fa": config.ENFORCE_2FA,
         }
         if config.SENTRY_KITSU_ENABLED:
             conf["sentry"] = {

{zou-1.0.3 → zou-1.0.5}/zou/app/blueprints/news/resources.py

@@ -228,7 +228,7 @@ class NewsResource(Resource, NewsMixin, ArgsMixin):
         """
         Get open projects news
         ---
-        description: Returns the latest news and activity feed from all 
+        description: Returns the latest news and activity feed from all
           projects the user has access to.
         tags:
           - News
@@ -348,7 +348,7 @@ class ProjectSingleNewsResource(Resource):
         """
         Get news item
         ---
-        description: Retrieves detailed information about a specific news item 
+        description: Retrieves detailed information about a specific news item
           from a givenproject.
         tags:
           - News

{zou-1.0.3 → zou-1.0.5}/zou/app/blueprints/playlists/resources.py

@@ -835,6 +835,11 @@ class NotifyClientsResource(Resource, ArgsMixin):
                     format: uuid
                     description: Studio unique identifier to notify
                     example: b35b7fb5-df86-5776-b181-68564193d36
+                  department_id:
+                    type: string
+                    format: uuid
+                    description: Department unique identifier to notify
+                    example: c46c8gc6-eg97-6887-c292-79675204e47
         responses:
           200:
             description: Clients notified successfully
@@ -848,11 +853,12 @@ class NotifyClientsResource(Resource, ArgsMixin):
                       description: Notification status
                       example: "success"
         """
-        studio_id = request.json.get("studio_id", None)
+        studio_id = self.get_id_parameter("studio_id", None)
+        department_id = self.get_id_parameter("department_id", None)
         playlist = playlists_service.get_playlist(playlist_id)
         project_id = playlist["project_id"]
         user_service.check_manager_project_access(project_id)
         notifications_service.notify_clients_playlist_ready(
-            playlist, studio_id
+            playlist, studio_id, department_id
         )
         return {"status": "success"}

{zou-1.0.3 → zou-1.0.5}/zou/app/blueprints/previews/resources.py

@@ -27,6 +27,7 @@ from zou.app.services import (
 from zou.app.stores import queue_store
 from zou.utils import movie
 from zou.app.utils import (
+    fields,
     fs,
     events,
     permissions,
@@ -247,15 +248,24 @@ class BaseNewPreviewFilePicture:
         uploaded_movie_path = movie.save_file(
             tmp_folder, preview_file_id, uploaded_file
         )
+        save_source_file = config.PREVIEW_SAVE_SOURCE_FILE
         if normalize and config.ENABLE_JOB_QUEUE and not no_job:
             queue_store.job_queue.enqueue(
                 preview_files_service.prepare_and_store_movie,
-                args=(preview_file_id, uploaded_movie_path),
+                args=(
+                    preview_file_id,
+                    uploaded_movie_path,
+                    True,
+                    save_source_file,
+                ),
                 job_timeout=int(config.JOB_QUEUE_TIMEOUT),
             )
         else:
             preview_files_service.prepare_and_store_movie(
-                preview_file_id, uploaded_movie_path, normalize=normalize
+                preview_file_id,
+                uploaded_movie_path,
+                normalize=normalize,
+                add_source_to_file_store=save_source_file,
             )
         return preview_file_id
 
@@ -1567,6 +1577,20 @@ class RunningPreviewFiles(Resource, ArgsMixin):
           states equal to processing or broken.
         tags:
           - Previews
+        parameters:
+          - in: query
+            name: cursor_preview_file_id
+            required: false
+            type: string
+            format: uuid
+            description: ID of the last preview file from previous page for cursor-based pagination
+            example: a24a6ea4-ce75-4665-a070-57453082c25
+          - in: query
+            name: limit
+            required: false
+            type: integer
+            description: Maximum number of preview files to return
+            example: 100
         responses:
           200:
             description: All preview files from open productions with processing or broken states
@@ -1588,7 +1612,26 @@ class RunningPreviewFiles(Resource, ArgsMixin):
                         example: "processing"
         """
         permissions.check_admin_permissions()
-        return preview_files_service.get_running_preview_files()
+        args = self.get_args(
+            [
+                ("cursor_preview_file_id", None, False),
+                ("limit", None, False, int),
+            ],
+        )
+        cursor_preview_file_id = args["cursor_preview_file_id"]
+        limit = args["limit"]
+
+        if cursor_preview_file_id is not None and not fields.is_valid_id(
+            cursor_preview_file_id
+        ):
+            raise WrongParameterException(
+                "The cursor_preview_file_id parameter is not a valid id"
+            )
+
+        return preview_files_service.get_running_preview_files(
+            cursor_preview_file_id=cursor_preview_file_id,
+            limit=limit,
+        )
 
 
 class ExtractFrameFromPreview(Resource, ArgsMixin):

{zou-1.0.3 → zou-1.0.5}/zou/app/config.py

@@ -68,6 +68,7 @@ PREVIEW_FOLDER = os.getenv(
     "PREVIEW_FOLDER",
     os.getenv("THUMBNAIL_FOLDER", os.path.join(os.getcwd(), "previews")),
 )
+PREVIEW_SAVE_SOURCE_FILE = envtobool("PREVIEW_SAVE_SOURCE_FILE", False)
 TMP_DIR = os.getenv("TMP_DIR", os.path.join(tempfile.gettempdir(), "zou"))
 
 EVENT_STREAM_HOST = os.getenv("EVENT_STREAM_HOST", "localhost")
@@ -165,6 +166,7 @@ DEFAULT_LOCALE = os.getenv("DEFAULT_LOCALE", "en_US")
 USER_LIMIT = int(os.getenv("USER_LIMIT", "100"))
 MIN_PASSWORD_LENGTH = int(os.getenv("MIN_PASSWORD_LENGTH", 8))
 PROTECTED_ACCOUNTS = env_with_semicolon_to_list("PROTECTED_ACCOUNTS")
+ENFORCE_2FA = envtobool("ENFORCE_2FA", False)
 
 TELEMETRY_URL = os.getenv(
     "TELEMETRY_URL",

{zou-1.0.3 → zou-1.0.5}/zou/app/file_trees/default.json

@@ -7,6 +7,7 @@
             "asset": "<Project>/assets/<AssetType>/<Asset>/<TaskType>",
             "sequence": "<Project>/sequences/<Sequence>/<TaskType>",
             "scene": "<Project>/scenes/<Sequence>/<Scene>/<TaskType>",
+            "episode": "<Project>/episodes/<Episode>/<TaskType>",
             "style": "lowercase"
         },
         "file_name": {
@@ -14,6 +15,7 @@
             "asset": "<Project>_<AssetType>_<Asset>_<TaskType>",
             "sequence": "<Project>_<Sequence>_<TaskType>",
             "scene": "<Project>_<Sequence>_<Scene>_<TaskType>",
+            "episode": "<Project>_<Episode>_<TaskType>",
             "style": "lowercase"
         }
     },
@@ -25,6 +27,7 @@
             "asset": "<Project>/assets/<AssetType>/<Asset>/<OutputType>",
             "sequence": "<Project>/sequences/<Sequence>/<OutputType>",
             "scene": "<Project>/scenes/<Sequence>/<Scene>/<OutputType>",
+            "episode": "<Project>/episodes/<Episode>/<OutputType>",
             "style": "lowercase"
         },
         "file_name": {
@@ -32,6 +35,7 @@
             "asset": "<Project>_<AssetType>_<Asset>_<OutputType>_<OutputFile>",
             "sequence": "<Project>_<Sequence>_<OuputType>_<OutputFile>",
             "scene": "<Project>_<Sequence>_<Scene>_<OutputType>_<OutputFile>",
+            "episode": "<Project>_<Episode>_<OutputType>_<OutputFile>",
             "style": "lowercase"
         }
     },
@@ -43,6 +47,7 @@
             "asset": "<Project>/assets/<AssetType>/<Asset>/<TaskType>",
             "sequence": "<Project>/sequences/<Sequence>/<TaskType>",
             "scene": "<Project>/scene/<Scene>/<TaskType>",
+            "episode": "<Project>/episodes/<Episode>/<TaskType>",
             "style": "lowercase"
         },
         "file_name": {
@@ -50,6 +55,7 @@
             "asset": "<Project>_<AssetType>_<Asset>_<TaskType>",
             "sequence": "<Project>_<Sequence>_<TaskType>",
             "scene": "<Project>_<Scene>_<TaskType>",
+            "episode": "<Project>_<Episode>_<TaskType>",
             "style": "lowercase"
         }
     }

{zou-1.0.3 → zou-1.0.5}/zou/app/file_trees/simple.json

@@ -7,6 +7,7 @@
             "asset": "<Project>/assets/<AssetType>/<Asset>/<TaskType>/<Software>",
             "sequence": "<Project>/sequences/<Sequence>/<TaskType>/<Software>",
             "scene": "<Project>/scenes/<Sequence>/<Scene>/<TaskType>/<Software>",
+            "episode": "<Project>/episodes/<Episode>/<TaskType>/<Software>",
             "style": "lowercase"
         },
         "file_name": {
@@ -14,6 +15,7 @@
             "asset": "<Project>_<AssetType>_<Asset>_<TaskType>_<Name>_v<Version>",
             "sequence": "<Project>_<Sequence>_<TaskType>_<Name>_v<Version>",
             "scene": "<Project>_<Scene>_<TaskType>_<Name>_v<Version>",
+            "episode": "<Project>_<Episode>_<TaskType>_<Name>_v<Version>",
             "style": "lowercase"
         }
     },
@@ -25,6 +27,7 @@
             "asset": "<Project>/assets/<AssetType>/<Asset>/<TaskType>/<OutputType>",
             "sequence": "<Project>/sequences/<Sequence>/<TaskType>/<OutputType>",
             "scene": "<Project>/scenes/<Sequence>/<Scene>/<TaskType>/<OutputType>",
+            "episode": "<Project>/episodes/<Episode>/<TaskType>/<OutputType>",
             "instance_asset": "<Project>/assets/<TemporalEntityType>/<TemporalEntity>/<TaskType>/<OutputType>/<AssetType>/<Asset>/instance_<Instance.number>/<Representation>",
             "instance": "<Project>/<TemporalEntityType>/<Sequence>/<TemporalEntity>/<TaskType>/<OutputType>/<AssetType>/<Asset>/instance_<Instance.number>/<Representation>",
             "style": "lowercase"
@@ -34,6 +37,7 @@
             "asset": "<Project>_<AssetType>_<Asset>_<TaskType>_<OutputType>_<Name>_v<Version>",
             "sequence": "<Project>_<Sequence>_<TaskType>_<OutputType>_<Name>_v<Version>",
             "scene": "<Project>_<Scene>_<TaskType>_<OutputType>_<Name>_v<Version>",
+            "episode": "<Project>_<Episode>_<TaskType>_<OutputType>_<Name>_v<Version>",
             "instance_asset": "<Project>_<TemporalEntityType>_<TemporalEntity>_<TaskType>_<OutputType>_<Name>_<Instance.name>_v<Version>",
             "instance": "<Project>_<Sequence>_<TemporalEntity>_<TaskType>_<OutputType>_<Name>_<Instance.name>_v<Version>",
             "style": "lowercase"
@@ -47,6 +51,7 @@
             "asset": "<Project>/assets/<AssetType>/<Asset>/<TaskType>",
             "sequence": "<Project>/sequences/<Sequence>/<TaskType>",
             "scene": "<Project>/scenes/<Sequence>/<Scene>/<TaskType>",
+            "episode": "<Project>/episodes/<Episode>/<TaskType>",
             "style": "lowercase"
         },
         "file_name": {
@@ -54,6 +59,7 @@
             "asset": "<Project>_<AssetType>_<Asset>_<TaskType>",
             "sequence": "<Project>_<Sequence>_<TaskType>",
             "scene": "<Project>_<Scene>_<TaskType>",
+            "episode": "<Project>_<Episode>_<TaskType>",
             "style": "lowercase"
         }
     }

{zou-1.0.3 → zou-1.0.5}/zou/app/mixin.py

@@ -168,3 +168,12 @@ class ArgsMixin(object):
         if not fields.is_valid_id(uuid):
             raise WrongParameterException("Wrong UUID format.")
         return True
+
+    def get_id_parameter(self, field_name, default=None):
+        """
+        Returns ID parameter value matching `field_name`.
+        """
+        entity_id = self.get_text_parameter(field_name + "_id", default)
+        if entity_id is not None and entity_id != "":
+            self.check_id_parameter(entity_id)
+        return entity_id

zou-1.0.5/zou/app/models/plugin.py

@@ -0,0 +1,41 @@
+from sqlalchemy_utils import EmailType, URLType
+
+from zou.app import db
+from zou.app.models.serializer import SerializerMixin
+from zou.app.models.base import BaseMixin
+
+
+class Plugin(db.Model, BaseMixin, SerializerMixin):
+    """
+    A plugin is a module used to extend the functionality of Zou.
+    You can extend the REST API routes and the database models.
+    """
+
+    plugin_id = db.Column(
+        db.String(80), unique=True, nullable=False, index=True
+    )
+    name = db.Column(db.String(80), nullable=False, index=True)
+    description = db.Column(db.Text())
+    version = db.Column(db.String(50), nullable=False)
+    maintainer_name = db.Column(db.String(200), nullable=False)
+    maintainer_email = db.Column(EmailType)
+    website = db.Column(URLType)
+    license = db.Column(db.String(80), nullable=False)
+    revision = db.Column(db.String(12), nullable=True)
+    frontend_project_enabled = db.Column(db.Boolean(), default=False)
+    frontend_studio_enabled = db.Column(db.Boolean(), default=False)
+    icon = db.Column(db.String(255), nullable=True)  # lucide-vue icon name
+
+    def present(self):
+        return {
+            "id": self.id,
+            "plugin_id": self.plugin_id,
+            "name": self.name,
+            "description": self.description,
+            "version": self.version,
+            "maintainer_name": self.maintainer_name,
+            "maintainer_email": self.maintainer_email,
+            "frontend_project_enabled": self.frontend_project_enabled,
+            "frontend_studio_enabled": self.frontend_studio_enabled,
+            "icon": self.icon,
+        }

{zou-1.0.3 → zou-1.0.5}/zou/app/models/preview_file.py

@@ -1,4 +1,5 @@
 from sqlalchemy_utils import UUIDType, ChoiceType
+from sqlalchemy.dialects.postgresql import JSONB
 
 from zou.app import db
 from zou.app.models.serializer import SerializerMixin
@@ -45,6 +46,7 @@ class PreviewFile(db.Model, BaseMixin, SerializerMixin):
     width = db.Column(db.Integer(), default=0)
     height = db.Column(db.Integer(), default=0)
     duration = db.Column(db.Float, default=0)
+    data = db.Column(JSONB)
 
     task_id = db.Column(
         UUIDType(binary=False), db.ForeignKey("task.id"), index=True

{zou-1.0.3 → zou-1.0.5}/zou/app/services/comments_service.py

@@ -188,7 +188,8 @@ def _manage_status_change(task_status, task, comment):
                 new_data["retake_count"] = retake_count + 1
 
             if task_status["is_feedback_request"]:
-                new_data["end_date"] = date_helpers.get_utc_now_datetime()
+                if task.get("end_date") is None:
+                    new_data["end_date"] = date_helpers.get_utc_now_datetime()
 
             if task_status["is_wip"] and task["real_start_date"] is None:
                 new_data["real_start_date"] = datetime.datetime.now(