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

zou/app/services/deletion_service.py

@@ -31,7 +31,7 @@ from zou.app.models.task import Task
 from zou.app.models.time_spent import TimeSpent
 from zou.app.models.working_file import WorkingFile
 
-from zou.app.utils import events, fields
+from zou.app.utils import events, fields, date_helpers
 from zou.app.stores import file_store
 from zou.app import config
 
@@ -149,12 +149,12 @@ def remove_task(task_id, force=False):
     return task_serialized
 
 
-def remove_preview_file_by_id(preview_file_id):
+def remove_preview_file_by_id(preview_file_id, force=False):
     preview_file = PreviewFile.get(preview_file_id)
-    return remove_preview_file(preview_file)
+    return remove_preview_file(preview_file, force=force)
 
 
-def remove_preview_file(preview_file):
+def remove_preview_file(preview_file, force=False):
     """
     Remove all files related to given preview file, then remove the preview file
     entry from the database.
@@ -169,13 +169,13 @@ def remove_preview_file(preview_file):
     if news is not None:
         news.update({"preview_file_id": None})
 
-    # stop removing files for now
-    # if preview_file.extension == "png":
-    #     clear_picture_files(preview_file.id)
-    # elif preview_file.extension == "mp4":
-    #     clear_movie_files(preview_file.id)
-    # else:
-    #     clear_generic_files(preview_file.id)
+    if config.REMOVE_FILES or force:
+        if preview_file.extension == "png":
+            clear_picture_files(preview_file.id)
+        elif preview_file.extension == "mp4":
+            clear_movie_files(preview_file.id)
+        else:
+            clear_generic_files(preview_file.id)
 
     preview_file.comments = []
     preview_file.save()
@@ -202,7 +202,9 @@ def remove_preview_file(preview_file):
     return preview_file.serialize()
 
 
-def remove_preview_background_file_by_id(preview_background_file_id):
+def remove_preview_background_file_by_id(
+    preview_background_file_id, force=False
+):
     """
     Remove all files related to given preview background file, then remove the
     preview background file entry from the database.
@@ -210,16 +212,15 @@ def remove_preview_background_file_by_id(preview_background_file_id):
     preview_background_file = PreviewBackgroundFile.get(
         preview_background_file_id
     )
-    return remove_preview_background_file(preview_background_file)
+    return remove_preview_background_file(preview_background_file, force=force)
 
 
-def remove_preview_background_file(preview_background_file):
+def remove_preview_background_file(preview_background_file, force=False):
     """
     Remove all files related to given preview background file, then remove the
     preview background file entry from the database.
     """
-    # stop removing files for now
-    # clear_preview_background_files(preview_background_file.id)
+    clear_preview_background_files(preview_background_file.id, force=force)
     preview_background_file.delete()
     return preview_background_file.serialize()
 
@@ -240,25 +241,26 @@ def remove_attachment_file(attachment_file):
     Remove all files related to given attachment file, then remove the
     attachment file entry from the database.
     """
-    # stop removing files for now
-    # file_store.remove_file("attachments", str(attachment_file.id))
+    if config.REMOVE_FILES:
+        file_store.remove_file("attachments", str(attachment_file.id))
     attachment_dict = attachment_file.serialize()
     attachment_file.delete()
     return attachment_dict
 
 
-def clear_preview_background_files(preview_background_id):
+def clear_preview_background_files(preview_background_id, force=False):
     """
     Remove all files related to given preview background file.
     """
-    for image_type in [
-        "thumbnails",
-        "preview-backgrounds",
-    ]:
-        try:
-            file_store.remove_picture(image_type, preview_background_id)
-        except BaseException:
-            pass
+    if config.REMOVE_FILES or force:
+        for image_type in [
+            "thumbnails",
+            "preview-backgrounds",
+        ]:
+            try:
+                file_store.remove_picture(image_type, preview_background_id)
+            except BaseException:
+                pass
 
 
 def clear_picture_files(preview_file_id):
@@ -360,6 +362,11 @@ def remove_project(project_id):
 
     ApiEvent.delete_all_by(project_id=project_id)
     Entity.delete_all_by(project_id=project_id)
+
+    descriptors = MetadataDescriptor.query.filter_by(project_id=project_id)
+    for descriptor in descriptors:
+        descriptor.departments = []
+        descriptor.save()
     MetadataDescriptor.delete_all_by(project_id=project_id)
     Milestone.delete_all_by(project_id=project_id)
     ScheduleItem.delete_all_by(project_id=project_id)
@@ -440,7 +447,9 @@ def remove_old_events(days_old=90):
     """
     Remove events older than *days_old*.
     """
-    limit_date = datetime.datetime.utcnow() - datetime.timedelta(days=days_old)
+    limit_date = date_helpers.get_utc_now_datetime() - datetime.timedelta(
+        days=days_old
+    )
     ApiEvent.query.filter(ApiEvent.created_at < limit_date).delete()
     ApiEvent.commit()
 
@@ -449,7 +458,9 @@ def remove_old_login_logs(days_old=90):
     """
     Remove login logs older than *days_old*.
     """
-    limit_date = datetime.datetime.utcnow() - datetime.timedelta(days=days_old)
+    limit_date = date_helpers.get_utc_now_datetime() - datetime.timedelta(
+        days=days_old
+    )
     LoginLog.query.filter(LoginLog.created_at < limit_date).delete()
     LoginLog.commit()
 
@@ -458,7 +469,9 @@ def remove_old_notifications(days_old=90):
     """
     Remove notifications older than *days_old*.
     """
-    limit_date = datetime.datetime.utcnow() - datetime.timedelta(days=days_old)
+    limit_date = date_helpers.get_utc_now_datetime() - datetime.timedelta(
+        days=days_old
+    )
     Notification.query.filter(Notification.created_at < limit_date).delete()
     Notification.commit()
 

zou/app/services/edits_service.py

@@ -33,7 +33,7 @@ from zou.app.services.exception import (
 
 def clear_edit_cache(edit_id):
     cache.cache.delete_memoized(get_edit, edit_id)
-    cache.cache.delete_memoized(get_edit_with_relations, edit_id)
+    cache.cache.delete_memoized(get_edit, edit_id, True)
     cache.cache.delete_memoized(get_full_edit, edit_id)
 
 
@@ -241,19 +241,13 @@ def get_edit_raw(edit_id):
 
 
 @cache.memoize_function(120)
-def get_edit(edit_id):
+def get_edit(edit_id, relations=False):
     """
     Return given edit as a dictionary.
     """
-    return get_edit_raw(edit_id).serialize(obj_type="Edit")
-
-
-@cache.memoize_function(120)
-def get_edit_with_relations(edit_id):
-    """
-    Return given edit as a dictionary.
-    """
-    return get_edit_raw(edit_id).serialize(obj_type="Edit", relations=True)
+    return get_edit_raw(edit_id).serialize(
+        obj_type="Edit", relations=relations
+    )
 
 
 @cache.memoize_function(120)

zou/app/services/emails_service.py

@@ -37,7 +37,7 @@ def send_notification(person_id, subject, messages):
             )
 
     if person["notifications_slack_enabled"]:
-        organisation = persons_service.get_organisation()
+        organisation = persons_service.get_organisation(sensitive=True)
         userid = person["notifications_slack_userid"]
         token = organisation.get("chat_token_slack", "")
         if config.ENABLE_JOB_QUEUE:
@@ -49,7 +49,7 @@ def send_notification(person_id, subject, messages):
             chats.send_to_slack(token, userid, slack_message)
 
     if person["notifications_mattermost_enabled"]:
-        organisation = persons_service.get_organisation()
+        organisation = persons_service.get_organisation(sensitive=True)
         userid = person["notifications_mattermost_userid"]
         webhook = organisation.get("chat_webhook_mattermost", "")
         if config.ENABLE_JOB_QUEUE:
@@ -61,7 +61,7 @@ def send_notification(person_id, subject, messages):
             chats.send_to_mattermost(webhook, userid, mattermost_message)
 
     if person["notifications_discord_enabled"]:
-        organisation = persons_service.get_organisation()
+        organisation = persons_service.get_organisation(sensitive=True)
         userid = person["notifications_discord_userid"]
         token = organisation.get("chat_token_discord", "")
         if config.ENABLE_JOB_QUEUE:
@@ -296,7 +296,7 @@ def get_task_descriptors(person_id, task):
     project = projects_service.get_project(task["project_id"])
     task_type = tasks_service.get_task_type(task["task_type_id"])
     entity = entities_service.get_entity(task["entity_id"])
-    (entity_name, episode_id) = names_service.get_full_entity_name(
+    entity_name, episode_id, _ = names_service.get_full_entity_name(
         entity["id"]
     )
 

zou/app/services/entities_service.py

@@ -2,6 +2,9 @@ from zou.app.services import (
     base_service,
     projects_service,
     notifications_service,
+    assets_service,
+    shots_service,
+    edits_service,
 )
 from zou.app.utils import (
     date_helpers,
@@ -108,12 +111,13 @@ def update_entity_preview(entity_id, preview_file_id):
     if entity is None:
         raise EntityNotFoundException
 
+    entity_id = str(entity.id)
     preview_file = PreviewFile.get(preview_file_id)
     if preview_file is None:
         raise PreviewFileNotFoundException
 
     entity.update({"preview_file_id": preview_file.id})
-    clear_entity_cache(str(entity.id))
+    clear_entity_cache(entity_id)
     events.emit(
         "preview-file:set-main",
         {"entity_id": entity_id, "preview_file_id": preview_file_id},
@@ -125,9 +129,14 @@ def update_entity_preview(entity_id, preview_file_id):
         entity_type_name = entity_type.name.lower()
     events.emit(
         "%s:update" % entity_type_name,
-        {"%s_id" % entity_type_name: str(entity.id)},
+        {"%s_id" % entity_type_name: entity_id},
         project_id=str(entity.project_id),
     )
+    assets_service.clear_asset_cache(entity_id)
+    edits_service.clear_edit_cache(entity_id)
+    shots_service.clear_shot_cache(entity_id)
+    shots_service.clear_episode_cache(entity_id)
+    shots_service.clear_sequence_cache(entity_id)
     return entity.serialize()
 
 
@@ -240,7 +249,9 @@ def get_entities_and_tasks(criterions={}):
             Task.end_date,
             Task.start_date,
             Task.due_date,
+            Task.done_date,
             Task.last_comment_date,
+            Task.difficulty,
             assignees_table.columns.person,
         )
     )
@@ -269,7 +280,9 @@ def get_entities_and_tasks(criterions={}):
         task_end_date,
         task_start_date,
         task_due_date,
+        task_done_date,
         task_last_comment_date,
+        task_difficulty,
         person_id,
     ) in query.all():
         entity_id = str(entity.id)
@@ -305,6 +318,7 @@ def get_entities_and_tasks(criterions={}):
                         "entity_id": entity_id,
                         "end_date": task_end_date,
                         "due_date": task_due_date,
+                        "done_date": task_done_date,
                         "duration": task_duration,
                         "is_subscribed": subscription_map.get(task_id, False),
                         "last_comment_date": task_last_comment_date,
@@ -312,6 +326,7 @@ def get_entities_and_tasks(criterions={}):
                         "real_start_date": task_real_start_date,
                         "retake_count": task_retake_count,
                         "start_date": task_start_date,
+                        "difficulty": task_difficulty,
                         "task_status_id": str(task_status_id),
                         "task_type_id": str(task_type_id),
                         "assignees": [],

zou/app/services/events_service.py

@@ -5,7 +5,12 @@ from sqlalchemy import func
 
 
 def get_last_events(
-    after=None, before=None, page_size=100, only_files=False, project_id=None
+    after=None,
+    before=None,
+    limit=100,
+    only_files=False,
+    project_id=None,
+    name=None,
 ):
     """
     Return last 100 events published. If before parameter is set, it returns
@@ -38,7 +43,10 @@ def get_last_events(
     if project_id is not None:
         query = query.filter(ApiEvent.project_id == project_id)
 
-    events = query.limit(page_size).all()
+    if name is not None:
+        query = query.filter(ApiEvent.name == name)
+
+    events = query.limit(limit).all()
     return [
         fields.serialize_dict(
             {
@@ -63,7 +71,7 @@ def create_login_log(person_id, ip_address, origin):
     return login_log.serialize()
 
 
-def get_last_login_logs(before=None, page_size=100):
+def get_last_login_logs(before=None, limit=100):
     """
     Return last 100 login logs published. If before parameter is set, it returns
     last 100 login logs before this date.
@@ -77,7 +85,7 @@ def get_last_login_logs(before=None, page_size=100):
             LoginLog.created_at < func.cast(before, LoginLog.created_at.type)
         )
 
-    login_logs = query.limit(page_size).all()
+    login_logs = query.limit(limit).all()
     return [
         {
             "created_at": fields.serialize_value(created_at),

zou/app/services/exception.py

@@ -49,6 +49,10 @@ class DepartmentNotFoundException(NotFound):
     pass
 
 
+class StudioNotFoundException(NotFound):
+    pass
+
+
 class TaskStatusNotFoundException(NotFound):
     pass
 
@@ -247,7 +251,7 @@ class EntryAlreadyExistsException(Exception):
     pass
 
 
-class ArgumentsException(Exception):
+class WrongParameterException(Exception):
     def __init__(self, message, dict=None):
         super().__init__(message)
         self.dict = dict
@@ -257,10 +261,6 @@ class WrongIdFormatException(Exception):
     pass
 
 
-class WrongParameterException(Exception):
-    pass
-
-
 class ModelWithRelationsDeletionException(Exception):
     pass
 

zou/app/services/names_service.py

@@ -1,5 +1,7 @@
 import slugify
 
+from zou.app.utils import cache
+
 from zou.app.services import (
     entities_service,
     files_service,
@@ -10,6 +12,9 @@ from zou.app.services import (
 )
 
 
+cache.memoize_function(1200)
+
+
 def get_full_entity_name(entity_id):
     """
     Get full entity name whether it's an asset or a shot. If it's a shot
@@ -47,7 +52,7 @@ def get_full_entity_name(entity_id):
         asset_type = entities_service.get_entity_type(entity["entity_type_id"])
         episode_id = entity["source_id"]
         name = "%s / %s" % (asset_type["name"], entity["name"])
-    return (name, episode_id)
+    return (name, episode_id, entity["preview_file_id"])
 
 
 def get_preview_file_name(preview_file_id):
@@ -61,7 +66,7 @@ def get_preview_file_name(preview_file_id):
     task = tasks_service.get_task(preview_file["task_id"])
     task_type = tasks_service.get_task_type(task["task_type_id"])
     project = projects_service.get_project(task["project_id"])
-    (entity_name, _) = get_full_entity_name(task["entity_id"])
+    (entity_name, _, _) = get_full_entity_name(task["entity_id"])
 
     if (
         organisation["use_original_file_name"]

zou/app/services/news_service.py

@@ -92,16 +92,17 @@ def get_last_news_for_project(
     task_status_id=None,
     author_id=None,
     page=1,
-    page_size=50,
+    limit=50,
     before=None,
     after=None,
     episode_id=None,
+    current_user=None,
 ):
     """
     Return last 50 news for given project. Add related information to make it
     displayable.
     """
-    offset = (page - 1) * page_size
+    offset = (page - 1) * limit
 
     query = (
         News.query.order_by(News.created_at.desc())
@@ -120,6 +121,9 @@ def get_last_news_for_project(
 
     if len(project_ids) > 0:
         query = query.filter(Project.id.in_(project_ids))
+    elif current_user is not None:
+        if current_user.role.code != "admin":
+            query = query.filter(Project.team.contains(current_user))
 
     if entity_id is not None:
         query = query.filter(Entity.id == entity_id)
@@ -154,7 +158,7 @@ def get_last_news_for_project(
             News.created_at < func.cast(before, News.created_at.type)
         )
 
-    (total, nb_pages) = _get_news_total(query, page_size)
+    (total, nb_pages) = _get_news_total(query, limit)
 
     query = query.add_columns(
         Project.id,
@@ -168,7 +172,7 @@ def get_last_news_for_project(
         Entity.preview_file_id,
     )
 
-    query = query.limit(page_size)
+    query = query.limit(limit)
     query = query.offset(offset)
     news_list = query.all()
     result = []
@@ -185,7 +189,7 @@ def get_last_news_for_project(
         preview_file_annotations,
         entity_preview_file_id,
     ) in news_list:
-        (full_entity_name, episode_id) = names_service.get_full_entity_name(
+        full_entity_name, episode_id, _ = names_service.get_full_entity_name(
             task_entity_id
         )
 
@@ -217,15 +221,15 @@ def get_last_news_for_project(
         "data": result,
         "total": total,
         "nb_pages": nb_pages,
-        "limit": page_size,
+        "limit": limit,
         "offset": offset,
         "page": page,
     }
 
 
-def _get_news_total(query, page_size):
+def _get_news_total(query, limit):
     total = query.count()
-    nb_pages = int(math.ceil(total / float(page_size)))
+    nb_pages = int(math.ceil(total / float(limit)))
     return total, nb_pages
 
 
@@ -239,6 +243,7 @@ def get_news_stats_for_project(
     author_id=None,
     before=None,
     after=None,
+    current_user=None,
 ):
     """
     Return the number of news by task status for given project and filters.
@@ -262,6 +267,9 @@ def get_news_stats_for_project(
 
     if len(project_ids) > 0:
         query = query.filter(Project.id.in_(project_ids))
+    elif current_user is not None:
+        if current_user.role.code != "admin":
+            query = query.filter(Project.team.contains(current_user))
 
     if task_status_id is not None:
         query = query.filter(Comment.task_status_id == task_status_id)
@@ -306,4 +314,4 @@ def get_news_for_entity(entity_id):
     """
     Get all news related to a given entity.
     """
-    return get_last_news_for_project(entity_id=entity_id, page_size=2000)
+    return get_last_news_for_project(entity_id=entity_id, limit=2000)

zou/app/services/persons_service.py

@@ -16,8 +16,8 @@ from zou.app.models.organisation import Organisation
 from zou.app.models.person import Person
 from zou.app.models.time_spent import TimeSpent
 
-from zou.app import config
-from zou.app.utils import fields, events, cache, emails
+from zou.app import config, file_store
+from zou.app.utils import fields, events, cache, emails, date_helpers
 from zou.app.services import index_service, auth_service
 from zou.app.stores import auth_tokens_store
 from zou.app.services.exception import (
@@ -36,8 +36,9 @@ def clear_person_cache():
     cache.cache.delete_memoized(get_persons)
 
 
-def clear_oranisation_cache():
+def clear_organisation_cache():
     cache.cache.delete_memoized(get_organisation)
+    cache.cache.delete_memoized(get_organisation, True)
 
 
 @cache.memoize_function(120)
@@ -210,6 +211,7 @@ def create_person(
     ldap_uid=None,
     is_bot=False,
     expiration_date=None,
+    studio_id=None,
     active=True,
     serialize=True,
 ):
@@ -223,12 +225,14 @@ def create_person(
     if expiration_date is not None:
         try:
             if (
-                datetime.datetime.strptime(expiration_date, "%Y-%m-%d").date()
+                date_helpers.get_date_from_string(expiration_date).date()
                 < datetime.date.today()
             ):
                 raise WrongParameterException(
                     "Expiration date can't be in the past."
                 )
+        except WrongParameterException:
+            raise
         except:
             raise WrongParameterException("Expiration date is not valid.")
 
@@ -245,6 +249,7 @@ def create_person(
         ldap_uid=ldap_uid,
         is_bot=is_bot,
         expiration_date=expiration_date,
+        studio_id=studio_id,
         active=active,
     )
     if is_bot:
@@ -274,18 +279,25 @@ def update_password(email, password):
     return person.serialize()
 
 
-def update_person(person_id, data):
+def update_person(person_id, data, bypass_protected_accounts=False):
     """
     Update person entry with data given in parameter.
     """
     person = Person.get(person_id)
     if (
-        data.get("active") is False
+        not bypass_protected_accounts
         and person.email in config.PROTECTED_ACCOUNTS
     ):
-        raise PersonInProtectedAccounts(
-            "Can't set this person as inactive it's a protected account."
-        )
+        message = None
+        if data.get("active") is False:
+            message = (
+                "Can't set this person as inactive it's a protected account."
+            )
+        elif data.get("role") is not None:
+            message = "Can't change the role of this person it's a protected account."
+
+        if message is not None:
+            raise PersonInProtectedAccounts(message)
 
     if "email" in data and data["email"] is not None:
         data["email"] = data["email"].strip()
@@ -301,6 +313,8 @@ def update_person(person_id, data):
                 raise WrongParameterException(
                     "Expiration date can't be in the past."
                 )
+        except WrongParameterException:
+            raise
         except:
             raise WrongParameterException("Expiration date is not valid.")
 
@@ -372,7 +386,9 @@ def update_person_last_presence(person_id):
         date = log.date
     elif time_spent is not None:
         date = time_spent.date
-    return update_person(person_id, {"last_presence": date})
+    return update_person(
+        person_id, {"last_presence": date}, bypass_protected_accounts=True
+    )
 
 
 def get_presence_logs(year, month):
@@ -438,7 +454,7 @@ def invite_person(person_id):
     )
 
     time_string = format_datetime(
-        datetime.datetime.utcnow(),
+        date_helpers.get_utc_now_datetime(),
         tzinfo=person["timezone"],
         locale=person["locale"],
     )
@@ -469,14 +485,14 @@ Thank you and see you soon on Kitsu,
 
 
 @cache.memoize_function(120)
-def get_organisation():
+def get_organisation(sensitive=False):
     """
     Return organisation set up on this instance. It creates it if none exists.
     """
     organisation = Organisation.query.first()
     if organisation is None:
         organisation = Organisation.create(name="Kitsu")
-    return organisation.present()
+    return organisation.present(sensitive=sensitive)
 
 
 def update_organisation(organisation_id, data):
@@ -486,7 +502,7 @@ def update_organisation(organisation_id, data):
     organisation = Organisation.get(organisation_id)
     organisation.update(data)
     events.emit("organisation:update", {"organisation_id": organisation_id})
-    clear_oranisation_cache()
+    clear_organisation_cache()
     return organisation.present()
 
 
@@ -535,11 +551,11 @@ def clear_avatar(person_id):
     person = get_person_raw(person_id)
     person.update({"has_avatar": False})
     clear_person_cache()
-    # stop removing files for now
-    # try:
-    #     file_store.remove_picture("thumbnails", person_id)
-    # except BaseException:
-    #     pass
+    if config.REMOVE_FILES:
+        try:
+            file_store.remove_picture("thumbnails", person_id)
+        except BaseException:
+            pass
     return person.serialize()
 
 
@@ -558,9 +574,10 @@ def create_access_token_for_raw_person(person):
     if person.expiration_date is not None:
         expires_delta = (
             datetime.datetime.combine(
-                person.expiration_date, datetime.datetime.max.time()
+                person.expiration_date,
+                datetime.datetime.max.time(),
             )
-            - datetime.datetime.utcnow()
+            - date_helpers.get_utc_now_datetime()
         )
     access_token = create_access_token(
         identity=person.id,