zou 0.19.15__py3-none-any.whl → 0.20.11__py3-none-any.whl

zou/app/config.py

@@ -7,6 +7,7 @@ from zou.app.utils.env import envtobool, env_with_semicolon_to_list
 
 PROPAGATE_EXCEPTIONS = True
 DEBUG = envtobool("DEBUG", False)
+DEBUG_HOST = os.getenv("DEBUG_HOST", "127.0.0.1")
 DEBUG_PORT = int(os.getenv("DEBUG_PORT", 5000))
 
 APP_NAME = "Zou"
@@ -18,6 +19,7 @@ AUTH_STRATEGY = os.getenv("AUTH_STRATEGY", "auth_local_classic")
 KEY_VALUE_STORE = {
     "host": os.getenv("KV_HOST", "localhost"),
     "port": os.getenv("KV_PORT", "6379"),
+    "password": os.getenv("KV_PASSWORD", None),
 }
 AUTH_TOKEN_BLACKLIST_KV_INDEX = 0
 MEMOIZE_DB_INDEX = 1
@@ -80,6 +82,7 @@ MAIL_PORT = os.getenv("MAIL_PORT", 25)
 MAIL_USERNAME = os.getenv("MAIL_USERNAME", "")
 MAIL_PASSWORD = os.getenv("MAIL_PASSWORD", "")
 MAIL_DEBUG = envtobool("MAIL_DEBUG", False)
+MAIL_DEBUG_BODY = envtobool("MAIL_DEBUG_BODY", False)
 MAIL_USE_TLS = envtobool("MAIL_USE_TLS", False)
 MAIL_USE_SSL = envtobool("MAIL_USE_SSL", False)
 MAIL_DEFAULT_SENDER = os.getenv(
@@ -131,6 +134,10 @@ LDAP_IS_AD = envtobool("LDAP_IS_AD", False)
 LDAP_IS_AD_SIMPLE = envtobool("LDAP_IS_AD_SIMPLE", False)
 LDAP_SSL = envtobool("LDAP_SSL", False)
 
+SAML_ENABLED = envtobool("SAML_ENABLED", False)
+SAML_IDP_NAME = os.getenv("SAML_IDP_NAME", "")
+SAML_METADATA_URL = os.getenv("SAML_METADATA_URL", "")
+
 LOGS_MODE = os.getenv("LOGS_MODE", "default")
 LOGS_HOST = os.getenv("LOGS_HOST", "localhost")
 LOGS_PORT = os.getenv("LOGS_PORT", 2202)
@@ -151,6 +158,7 @@ CRISP_TOKEN = os.getenv("CRISP_TOKEN", "")
 IS_SELF_HOSTED = envtobool("IS_SELF_HOSTED", True)
 
 DEFAULT_TIMEZONE = os.getenv("DEFAULT_TIMEZONE", "Europe/Paris")
+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))
@@ -161,6 +169,8 @@ TELEMETRY_URL = os.getenv(
     f"{'http://localhost:8000' if DEBUG else 'https://account.cg-wire.com'}/api/selfhosted/telemetry/new/",
 )
 
+REMOVE_FILES = envtobool("REMOVE_FILES", False)
+
 # Deprecated
 TO_REVIEW_TASK_STATUS = "To review"
 DEFAULT_FILE_STATUS = "To review"

zou/app/mixin.py

@@ -1,7 +1,7 @@
 from flask_restful import reqparse
 from flask import request
 
-from zou.app.utils import fields
+from zou.app.utils import date_helpers
 from zou.app.services.exception import WrongParameterException
 
 
@@ -14,6 +14,7 @@ class ArgsMixin(object):
         parser = reqparse.RequestParser()
         if location is None:
             location = ["values", "json"] if request.is_json else ["values"]
+
         for descriptor in descriptors:
             action = None
             data_type = str
@@ -121,12 +122,12 @@ class ArgsMixin(object):
         """
         return self.get_bool_parameter("no_job")
 
-    def get_text_parameter(self, field_name):
+    def get_text_parameter(self, field_name, default=None):
         """
         Returns text parameter value matching `field_name`.
         """
         options = request.args
-        return options.get(field_name, None)
+        return options.get(field_name, default)
 
     def get_bool_parameter(self, field_name, default="false"):
         """
@@ -146,10 +147,10 @@ class ArgsMixin(object):
         if param is None:
             return date
         try:
-            date = fields.get_date_object(param, "%Y-%m-%dT%H:%M:%S")
+            date = date_helpers.get_datetime_from_string(param)
         except Exception:
             try:
-                date = fields.get_date_object(param, "%Y-%m-%d")
+                date = date_helpers.get_date_from_string(param)
             except Exception:
                 raise WrongParameterException(
                     "Wrong date format for before argument."

zou/app/models/attachment_file.py

@@ -15,11 +15,16 @@ class AttachmentFile(db.Model, BaseMixin, SerializerMixin):
     extension = db.Column(db.String(6))
     mimetype = db.Column(db.String(255))
     comment_id = db.Column(
-        UUIDType(binary=False), db.ForeignKey("comment.id"), index=True
+        UUIDType(binary=False),
+        db.ForeignKey("comment.id"),
+        index=True,
+        nullable=True,
     )
-
-    __table_args__ = (
-        db.UniqueConstraint("name", "comment_id", name="attachment_uc"),
+    chat_message_id = db.Column(
+        UUIDType(binary=False),
+        db.ForeignKey("chat_message.id"),
+        index=True,
+        nullable=True,
     )
 
     def __repr__(self):
@@ -37,6 +42,7 @@ class AttachmentFile(db.Model, BaseMixin, SerializerMixin):
     def create_from_import(cls, data):
         data.pop("type", None)
         data.pop("comment", None)
+        data.pop("chat_message", None)
         previous_data = cls.get(data["id"])
         if previous_data is None:
             return cls.create(**data)

zou/app/models/base.py

@@ -1,10 +1,8 @@
-import datetime
-
 from sqlalchemy_utils import UUIDType
 from sqlalchemy import func
 from sqlalchemy import orm
 from zou.app import db
-from zou.app.utils import fields
+from zou.app.utils import fields, date_helpers
 
 
 class BaseMixin(object):
@@ -13,11 +11,13 @@ class BaseMixin(object):
     )
 
     # Audit fields
-    created_at = db.Column(db.DateTime, default=datetime.datetime.utcnow)
+    created_at = db.Column(
+        db.DateTime, default=date_helpers.get_utc_now_datetime
+    )
     updated_at = db.Column(
         db.DateTime,
-        default=datetime.datetime.utcnow,
-        onupdate=datetime.datetime.utcnow,
+        default=date_helpers.get_utc_now_datetime,
+        onupdate=date_helpers.get_utc_now_datetime,
     )
 
     def __repr__(self):
@@ -41,12 +41,12 @@ class BaseMixin(object):
         return db.session.get(cls, id)
 
     @classmethod
-    def get_by(cls, **kw):
+    def get_by(cls, *criterions, **kw):
         """
         Shorthand to retrieve data by using filters. It returns the first
         element of the returned data.
         """
-        return cls.query.filter_by(**kw).first()
+        return cls.query.filter(*criterions).filter_by(**kw).first()
 
     @classmethod
     def get_by_case_insensitive(cls, **kw):
@@ -126,11 +126,11 @@ class BaseMixin(object):
         return instance
 
     @classmethod
-    def delete_all_by(cls, **kw):
+    def delete_all_by(cls, *criterions, **kw):
         """
         Shorthand to delete data by using filters.
         """
-        result = cls.query.filter_by(**kw).delete()
+        result = cls.query.filter(*criterions).filter_by(**kw).delete()
         db.session.commit()
         return result
 
@@ -184,7 +184,12 @@ class BaseMixin(object):
 
     @classmethod
     def commit(cls):
-        db.session.commit()
+        try:
+            db.session.commit()
+        except BaseException:
+            db.session.rollback()
+            db.session.remove()
+            raise
 
     def save(self):
         """
@@ -192,7 +197,7 @@ class BaseMixin(object):
         instance fields.
         """
         try:
-            self.updated_at = datetime.datetime.utcnow()
+            self.updated_at = date_helpers.get_utc_now_datetime()
             db.session.add(self)
             db.session.commit()
         except BaseException:
@@ -239,7 +244,7 @@ class BaseMixin(object):
         Shorthand to update an entry via the database session based on current
         instance fields. It doesn't generate a commit.
         """
-        self.updated_at = datetime.datetime.utcnow()
+        self.updated_at = date_helpers.get_utc_now_datetime()
         for key, value in data.items():
             if hasattr(self.__class__, key):
                 field_key = getattr(self.__class__, key)

zou/app/models/build_job.py

@@ -1,11 +1,9 @@
-import datetime
-
 from sqlalchemy_utils import UUIDType, ChoiceType
 
 from zou.app import db
 from zou.app.models.serializer import SerializerMixin
 from zou.app.models.base import BaseMixin
-from zou.app.utils import fields
+from zou.app.utils import fields, date_helpers
 
 STATUSES = [
     ("running", "Running"),
@@ -34,7 +32,12 @@ class BuildJob(db.Model, BaseMixin, SerializerMixin):
     )
 
     def end(self, status):
-        self.update({"status": status, "ended_at": datetime.datetime.utcnow()})
+        self.update(
+            {
+                "status": status,
+                "ended_at": date_helpers.get_utc_now_datetime(),
+            }
+        )
 
     def present(self):
         return fields.serialize_dict(

zou/app/models/chat.py

@@ -0,0 +1,44 @@
+from sqlalchemy_utils import UUIDType
+
+from zou.app import db
+from zou.app.models.serializer import SerializerMixin
+from zou.app.models.base import BaseMixin
+
+
+class ChatParticipant(db.Model):
+    __tablename__ = "chat_participant"
+    chat_id = db.Column(
+        UUIDType(binary=False),
+        db.ForeignKey("chat.id"),
+        primary_key=True,
+    )
+    person_id = db.Column(
+        UUIDType(binary=False),
+        db.ForeignKey("person.id"),
+        primary_key=True,
+    )
+
+
+class Chat(db.Model, BaseMixin, SerializerMixin):
+    """
+    Message shared in the entity chat feeds.
+    """
+
+    object_id = db.Column(UUIDType(binary=False), nullable=False, index=True)
+    object_type = db.Column(
+        db.String(80), nullable=False, index=True, default="entity"
+    )
+    last_message = db.Column(db.DateTime, nullable=True)
+    participants = db.relationship(
+        "Person", secondary="chat_participant", lazy="joined"
+    )
+
+    def __repr__(self):
+        return "<Message of %s>" % self.object_id
+
+    def present(self):
+        return {
+            "id": str(self.id),
+            "object_id": str(self.object_id),
+            "last_message": self.last_message,
+        }

zou/app/models/chat_message.py

@@ -0,0 +1,37 @@
+from sqlalchemy_utils import UUIDType
+
+from zou.app import db
+from zou.app.models.serializer import SerializerMixin
+from zou.app.models.base import BaseMixin
+
+
+class ChatMessage(db.Model, BaseMixin, SerializerMixin):
+    """
+    Message shared in the entity chat feeds.
+    """
+
+    chat_id = db.Column(
+        UUIDType(binary=False),
+        db.ForeignKey("chat.id"),
+        nullable=False,
+        index=True,
+    )
+    person_id = db.Column(
+        UUIDType(binary=False),
+        db.ForeignKey("person.id"),
+        nullable=False,
+        index=True,
+    )
+    text = db.Column(db.Text())
+    attachment_files = db.relationship(
+        "AttachmentFile", backref="chat_message", lazy="joined"
+    )
+
+    # TODO
+    # * mentions
+    # * reactions
+    # * concept links ?
+    # * task links ?
+
+    def __repr__(self):
+        return "<Message of %s>" % self.object_id

zou/app/models/comment.py

@@ -92,6 +92,7 @@ class Comment(db.Model, BaseMixin, SerializerMixin):
     replies = db.Column(JSONB, default=[])
     checklist = db.Column(JSONB)
     pinned = db.Column(db.Boolean)
+    links = db.Column(db.ARRAY(db.String()))
 
     task_status_id = db.Column(
         UUIDType(binary=False), db.ForeignKey("task_status.id"), index=True

zou/app/models/day_off.py

@@ -10,9 +10,12 @@ class DayOff(db.Model, BaseMixin, SerializerMixin):
     """
 
     date = db.Column(db.Date, nullable=False)
+    end_date = db.Column(db.Date, nullable=False)
+    description = db.Column(db.Text)
     person_id = db.Column(
         UUIDType(binary=False), db.ForeignKey("person.id"), index=True
     )
     __table_args__ = (
         db.UniqueConstraint("person_id", "date", name="day_off_uc"),
+        db.CheckConstraint("date <= end_date", name="day_off_date_check"),
     )

zou/app/models/entity.py

@@ -3,7 +3,6 @@ from sqlalchemy_utils import UUIDType, ChoiceType
 from zou.app import db
 from zou.app.models.serializer import SerializerMixin
 from zou.app.models.base import BaseMixin
-from zou.app.utils import fields
 
 from sqlalchemy.dialects.postgresql import JSONB
 
@@ -90,13 +89,10 @@ class Entity(db.Model, BaseMixin, SerializerMixin):
     tasks and files.
     """
 
-    id = db.Column(
-        UUIDType(binary=False), primary_key=True, default=fields.gen_uuid
-    )
-
+    id = BaseMixin.id
     name = db.Column(db.String(160), nullable=False)
     code = db.Column(db.String(160))  # To store sanitized version of name
-    description = db.Column(db.String(1200))
+    description = db.Column(db.Text())
     shotgun_id = db.Column(db.Integer)
     canceled = db.Column(db.Boolean, default=False)
 
@@ -104,6 +100,8 @@ class Entity(db.Model, BaseMixin, SerializerMixin):
     nb_entities_out = db.Column(db.Integer, default=0)
     is_casting_standby = db.Column(db.Boolean, default=False)
 
+    is_shared = db.Column(db.Boolean, default=False, nullable=False)
+
     status = db.Column(
         ChoiceType(ENTITY_STATUSES), default="running", nullable=False
     )

zou/app/models/entity_type.py

@@ -27,6 +27,8 @@ class EntityType(db.Model, BaseMixin, SerializerMixin):
     """
 
     name = db.Column(db.String(30), unique=True, nullable=False, index=True)
+    short_name = db.Column(db.String(20))
+    description = db.Column(db.Text())
     task_types = db.relationship(
         "TaskType", secondary=task_type_link, lazy="joined"
     )

zou/app/models/organisation.py

@@ -1,7 +1,6 @@
 from zou.app import db
 from zou.app.models.serializer import SerializerMixin
 from zou.app.models.base import BaseMixin
-from zou.app.utils import fields
 
 
 class Organisation(db.Model, BaseMixin, SerializerMixin):
@@ -14,23 +13,23 @@ class Organisation(db.Model, BaseMixin, SerializerMixin):
     has_avatar = db.Column(db.Boolean(), default=False)
     use_original_file_name = db.Column(db.Boolean(), default=False)
     timesheets_locked = db.Column(db.Boolean(), default=False)
+    format_duration_in_hours = db.Column(db.Boolean(), default=False)
     hd_by_default = db.Column(db.Boolean(), default=False)
     chat_token_slack = db.Column(db.String(80), default="")
     chat_webhook_mattermost = db.Column(db.String(80), default="")
     chat_token_discord = db.Column(db.String(80), default="")
+    dark_theme_by_default = db.Column(db.Boolean(), default=False)
+    format_duration_in_hours = db.Column(db.Boolean(), default=False)
 
-    def present(self):
-        return fields.serialize_dict(
-            {
-                "id": self.id,
-                "chat_token_slack": self.chat_token_slack,
-                "chat_webhook_mattermost": self.chat_webhook_mattermost,
-                "chat_token_discord": self.chat_token_discord,
-                "name": self.name,
-                "has_avatar": self.has_avatar,
-                "hours_by_day": self.hours_by_day,
-                "hd_by_default": self.hd_by_default,
-                "use_original_file_name": self.use_original_file_name,
-                "timesheets_locked": self.timesheets_locked,
-            }
+    def present(self, sensitive=False):
+        return self.serialize(
+            ignored_attrs=(
+                []
+                if sensitive
+                else [
+                    "chat_token_slack",
+                    "chat_webhook_mattermost",
+                    "chat_token_discord",
+                ]
+            )
         )

zou/app/models/person.py

@@ -94,7 +94,7 @@ class Person(db.Model, BaseMixin, SerializerMixin):
         TimezoneType(backend="pytz"),
         default=pytz_timezone(config.DEFAULT_TIMEZONE),
     )
-    locale = db.Column(LocaleType, default=Locale("en", "US"))
+    locale = db.Column(LocaleType, default=Locale(config.DEFAULT_LOCALE))
     data = db.Column(JSONB)
     role = db.Column(ChoiceType(ROLE_TYPES), default="user", nullable=False)
     has_avatar = db.Column(db.Boolean(), default=False)
@@ -114,6 +114,9 @@ class Person(db.Model, BaseMixin, SerializerMixin):
     departments = db.relationship(
         "Department", secondary="department_link", lazy="joined"
     )
+    studio_id = db.Column(
+        UUIDType(binary=False), db.ForeignKey("studio.id"), index=True
+    )
 
     is_generated_from_ldap = db.Column(db.Boolean(), default=False)
     ldap_uid = db.Column(db.String(60), unique=True, default=None)
@@ -179,12 +182,14 @@ class Person(db.Model, BaseMixin, SerializerMixin):
         )
         return {
             "id": data["id"],
+            "type": data["type"],
             "first_name": data["first_name"],
             "last_name": data["last_name"],
             "full_name": self.full_name,
             "has_avatar": data["has_avatar"],
             "active": data["active"],
             "departments": data.get("departments", []),
+            "studio_id": data["studio_id"],
             "role": data["role"],
             "desktop_login": data["desktop_login"],
             "is_bot": data["is_bot"],

zou/app/models/project.py

@@ -142,6 +142,9 @@ class Project(db.Model, BaseMixin, SerializerMixin):
     is_preview_download_allowed = db.Column(db.Boolean(), default=False)
     is_set_preview_automated = db.Column(db.Boolean(), default=False)
     homepage = db.Column(db.String(80), default="assets")
+    is_publish_default_for_artists = db.Column(db.Boolean(), default=False)
+    hd_bitrate_compression = db.Column(db.Integer, default=28)
+    ld_bitrate_compression = db.Column(db.Integer, default=6)
 
     project_status_id = db.Column(
         UUIDType(binary=False), db.ForeignKey("project_status.id"), index=True

zou/app/models/search_filter.py

@@ -3,6 +3,7 @@ from sqlalchemy_utils import UUIDType
 from zou.app import db
 from zou.app.models.serializer import SerializerMixin
 from zou.app.models.base import BaseMixin
+from sqlalchemy.sql import expression
 
 
 class SearchFilter(db.Model, BaseMixin, SerializerMixin):
@@ -15,7 +16,17 @@ class SearchFilter(db.Model, BaseMixin, SerializerMixin):
     entity_type = db.Column(db.String(80))
     name = db.Column(db.String(200), nullable=False, default="")
     search_query = db.Column(db.String(500), nullable=False, default="")
+    is_shared = db.Column(
+        db.Boolean,
+        server_default=expression.false(),
+        default=False,
+        nullable=False,
+    )
 
+    department_id = db.Column(
+        UUIDType(binary=False),
+        db.ForeignKey("department.id"),
+    )
     search_filter_group_id = db.Column(
         UUIDType(binary=False),
         db.ForeignKey("search_filter_group.id"),

zou/app/models/search_filter_group.py

@@ -3,6 +3,7 @@ from sqlalchemy_utils import UUIDType
 from zou.app import db
 from zou.app.models.serializer import SerializerMixin
 from zou.app.models.base import BaseMixin
+from sqlalchemy.sql import expression
 
 
 class SearchFilterGroup(db.Model, BaseMixin, SerializerMixin):
@@ -14,6 +15,15 @@ class SearchFilterGroup(db.Model, BaseMixin, SerializerMixin):
     entity_type = db.Column(db.String(80))
     name = db.Column(db.String(200), nullable=False, default="")
     color = db.Column(db.String(8), nullable=False, default="")
+    is_shared = db.Column(
+        db.Boolean,
+        server_default=expression.false(),
+        default=False,
+        nullable=False,
+    )
 
     person_id = db.Column(UUIDType(binary=False), db.ForeignKey("person.id"))
     project_id = db.Column(UUIDType(binary=False), db.ForeignKey("project.id"))
+    department_id = db.Column(
+        UUIDType(binary=False), db.ForeignKey("department.id")
+    )

zou/app/models/serializer.py

@@ -14,35 +14,35 @@ class SerializerMixin(object):
             orm.attributes.CollectionAttributeImpl,
         )
 
-    def serialize(self, obj_type=None, relations=False, milliseconds=False):
+    def serialize(
+        self,
+        obj_type=None,
+        relations=False,
+        milliseconds=False,
+        ignored_attrs=[],
+    ):
         attrs = inspect(self.__class__).all_orm_descriptors.keys()
-        if relations:
-            obj_dict = {
-                attr: serialize_value(
-                    getattr(self, attr), milliseconds=milliseconds
-                )
-                for attr in attrs
-            }
-        else:
-            obj_dict = {
-                attr: serialize_value(
-                    getattr(self, attr), milliseconds=milliseconds
-                )
-                for attr in attrs
-                if not self.is_join(attr)
-            }
+        obj_dict = {
+            attr: serialize_value(
+                getattr(self, attr), milliseconds=milliseconds
+            )
+            for attr in attrs
+            if attr not in ignored_attrs
+            and (relations or not self.is_join(attr))
+        }
         obj_dict["type"] = obj_type or type(self).__name__
         return obj_dict
 
     @staticmethod
     def serialize_list(
-        models, obj_type=None, relations=False, milliseconds=False
+        models, obj_type=None, relations=False, milliseconds=False, **kwargs
     ):
         return [
             model.serialize(
                 obj_type=obj_type,
                 relations=relations,
                 milliseconds=milliseconds,
+                **kwargs
             )
             for model in models
         ]

zou/app/models/status_automation.py

@@ -37,4 +37,6 @@ class StatusAutomation(db.Model, BaseMixin, SerializerMixin):
         index=True,
         nullable=True,
     )
+    import_last_revision = db.Column(db.Boolean(), default=False)
+
     archived = db.Column(db.Boolean(), default=False)

zou/app/models/studio.py

@@ -0,0 +1,13 @@
+from zou.app import db
+from zou.app.models.serializer import SerializerMixin
+from zou.app.models.base import BaseMixin
+
+
+class Studio(db.Model, BaseMixin, SerializerMixin):
+    """
+    Describe a studio.
+    """
+
+    name = db.Column(db.String(80), unique=True, nullable=False)
+    color = db.Column(db.String(7), nullable=False)
+    archived = db.Column(db.Boolean(), default=False)

zou/app/models/subscription.py

@@ -22,10 +22,10 @@ class Subscription(db.Model, BaseMixin, SerializerMixin):
 
     entity_id = db.Column(
         UUIDType(binary=False), db.ForeignKey("entity.id"), index=True
-    )
+    )  # Deprecated
     task_type_id = db.Column(
         UUIDType(binary=False), db.ForeignKey("task_type.id"), index=True
-    )
+    )  # Deprecated
 
     __table_args__ = (
         db.UniqueConstraint(

zou/app/models/task.py

@@ -30,9 +30,10 @@ class Task(db.Model, BaseMixin, SerializerMixin):
     """
 
     name = db.Column(db.String(80), nullable=False)
-    description = db.Column(db.String(200))
+    description = db.Column(db.Text())
 
     priority = db.Column(db.Integer, default=0)
+    difficulty = db.Column(db.Integer, default=3, nullable=False)
     duration = db.Column(db.Float, default=0)
     estimation = db.Column(db.Float, default=0)
     completion_rate = db.Column(db.Integer, default=0)
@@ -42,6 +43,7 @@ class Task(db.Model, BaseMixin, SerializerMixin):
     due_date = db.Column(db.DateTime)
     real_start_date = db.Column(db.DateTime)
     end_date = db.Column(db.DateTime)
+    done_date = db.Column(db.DateTime)
     last_comment_date = db.Column(db.DateTime)
     nb_assets_ready = db.Column(db.Integer, default=0)
     data = db.Column(JSONB)
@@ -69,6 +71,9 @@ class Task(db.Model, BaseMixin, SerializerMixin):
         db.UniqueConstraint(
             "name", "project_id", "task_type_id", "entity_id", name="task_uc"
         ),
+        db.CheckConstraint(
+            "difficulty > 0 AND difficulty < 6", name="check_difficulty"
+        ),
     )
 
     def assignees_as_string(self):

zou/app/models/task_status.py

@@ -15,6 +15,7 @@ class TaskStatus(db.Model, BaseMixin, SerializerMixin):
     short_name = db.Column(
         db.String(10), unique=True, nullable=False, index=True
     )
+    description = db.Column(db.Text())
     color = db.Column(db.String(7), nullable=False)
     priority = db.Column(db.Integer, default=1)
 

zou/app/models/task_type.py

@@ -12,6 +12,7 @@ class TaskType(db.Model, BaseMixin, SerializerMixin):
 
     name = db.Column(db.String(40), nullable=False)
     short_name = db.Column(db.String(20))
+    description = db.Column(db.Text())
     color = db.Column(db.String(7), default="#FFFFFF")
     priority = db.Column(db.Integer, default=1)
     for_entity = db.Column(db.String(30), default="Asset")