zou 0.19.68__py3-none-any.whl → 0.19.70__py3-none-any.whl

zou/app/blueprints/source/csv/edits.py

@@ -21,7 +21,7 @@ from zou.app.services.tasks_service import (
 )
 from zou.app.services.comments_service import create_comment
 from zou.app.services.exception import WrongParameterException
-from zou.app.utils import events
+from zou.app.utils import events, string
 
 
 class EditsCsvImportResource(BaseCsvProjectImportResource):
@@ -192,9 +192,16 @@ class EditsCsvImportResource(BaseCsvProjectImportResource):
         else:
             edit_new_values["data"] = entity.data.copy()
 
-        for name, field_name in self.descriptor_fields.items():
+        for name, descriptor in self.descriptor_fields.items():
             if name in row:
-                edit_new_values["data"][field_name] = row[name]
+                if descriptor["data_type"] == "boolean":
+                    edit_new_values["data"][descriptor["field_name"]] = (
+                        "true" if string.strtobool(row[name]) else "false"
+                    )
+                else:
+                    edit_new_values["data"][descriptor["field_name"]] = row[
+                        name
+                    ]
 
         tasks_update = self.get_tasks_update(row)
 

zou/app/blueprints/source/csv/shots.py

@@ -21,7 +21,7 @@ from zou.app.services.tasks_service import (
 )
 from zou.app.services.comments_service import create_comment
 from zou.app.services.exception import WrongParameterException
-from zou.app.utils import events
+from zou.app.utils import events, string
 
 
 class ShotsCsvImportResource(BaseCsvProjectImportResource):
@@ -229,9 +229,16 @@ class ShotsCsvImportResource(BaseCsvProjectImportResource):
         if fps is not None:
             shot_new_values["data"]["fps"] = fps
 
-        for name, field_name in self.descriptor_fields.items():
+        for name, descriptor in self.descriptor_fields.items():
             if name in row:
-                shot_new_values["data"][field_name] = row[name]
+                if descriptor["data_type"] == "boolean":
+                    shot_new_values["data"][descriptor["field_name"]] = (
+                        "true" if string.strtobool(row[name]) else "false"
+                    )
+                else:
+                    shot_new_values["data"][descriptor["field_name"]] = row[
+                        name
+                    ]
 
         tasks_update = self.get_tasks_update(row)
 

zou/app/blueprints/tasks/resources.py

@@ -1532,6 +1532,11 @@ class ProjectCommentsResource(Resource, ArgsMixin):
             type: string
             format: UUID
             x-example: a24a6ea4-ce75-4665-a070-57453082c25
+          - in: query
+            name: limit
+            type: integer
+            default: 100
+            x-example: 100
         responses:
             200:
                 description: All comments to tasks related to given project
@@ -1544,7 +1549,8 @@ class ProjectCommentsResource(Resource, ArgsMixin):
         ):
             raise permissions.PermissionDenied
         page = self.get_page()
-        return tasks_service.get_comments_for_project(project_id, page)
+        limit = self.get_limit()
+        return tasks_service.get_comments_for_project(project_id, page, limit)
 
 
 class ProjectPreviewFilesResource(Resource, ArgsMixin):

zou/app/config.py

@@ -158,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))

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):
@@ -22,22 +21,15 @@ class Organisation(db.Model, BaseMixin, SerializerMixin):
     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,
-                "dark_theme_by_default": self.dark_theme_by_default,
-                "format_duration_in_hours": self.format_duration_in_hours,
-                "updated_at": self.updated_at,
-                "created_at": self.created_at,
-            }
+    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)

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/services/assets_service.py

@@ -40,7 +40,7 @@ from zou.app.services.exception import (
 
 def clear_asset_cache(asset_id):
     cache.cache.delete_memoized(get_asset, asset_id)
-    cache.cache.delete_memoized(get_asset_with_relations, asset_id)
+    cache.cache.delete_memoized(get_asset, asset_id, True)
     cache.cache.delete_memoized(get_full_asset, asset_id)
 
 
@@ -416,19 +416,13 @@ def get_asset_raw(entity_id):
 
 
 @cache.memoize_function(120)
-def get_asset(entity_id):
+def get_asset(entity_id, relations=False):
     """
     Return a given asset as a dict.
     """
-    return get_asset_raw(entity_id).serialize(obj_type="Asset")
-
-
-@cache.memoize_function(120)
-def get_asset_with_relations(entity_id):
-    """
-    Return a given asset as a dict.
-    """
-    return get_asset_raw(entity_id).serialize(obj_type="Asset", relations=True)
+    return get_asset_raw(entity_id).serialize(
+        obj_type="Asset", relations=relations
+    )
 
 
 def get_asset_by_shotgun_id(shotgun_id):
@@ -458,7 +452,7 @@ def get_full_asset(asset_id):
     """
     assets = get_assets_and_tasks({"id": asset_id}, with_episode_ids=True)
     if len(assets) > 0:
-        asset = get_asset_with_relations(asset_id)
+        asset = get_asset(asset_id, relations=True)
         asset_type_id = asset["entity_type_id"]
         asset_type = get_asset_type(asset_type_id)
         project = Project.get(asset["project_id"])

zou/app/services/breakdown_service.py

@@ -414,7 +414,7 @@ def _create_episode_casting_link(entity, asset_id, nb_occurences=1, label=""):
                 link = EntityLink.create(
                     entity_in_id=sequence["parent_id"],
                     entity_out_id=asset_id,
-                    nb_occurences=1,
+                    nb_occurences=nb_occurences,
                     label=label,
                 )
                 events.emit(

zou/app/services/comments_service.py

@@ -82,7 +82,7 @@ def create_comment(
     """
     Create a new comment and related: news, notifications and events.
     """
-    task = tasks_service.get_task_with_relations(task_id)
+    task = tasks_service.get_task(task_id, relations=True)
     task_status = tasks_service.get_task_status(task_status_id)
     author = _get_comment_author(person_id)
     _check_retake_capping(task_status, task)

zou/app/services/concepts_service.py

@@ -33,7 +33,7 @@ from zou.app.services.exception import (
 
 def clear_concept_cache(concept_id):
     cache.cache.delete_memoized(get_concept, concept_id)
-    cache.cache.delete_memoized(get_concept_with_relations, concept_id)
+    cache.cache.delete_memoized(get_concept, concept_id, True)
     cache.cache.delete_memoized(get_full_concept, concept_id)
 
 
@@ -61,23 +61,15 @@ def get_concept_raw(concept_id):
 
 
 @cache.memoize_function(120)
-def get_concept_with_relations(concept_id):
+def get_concept(concept_id, relations=False):
     """
     Return given concept as a dictionary.
     """
     return get_concept_raw(concept_id).serialize(
-        obj_type="Concept", relations=True
+        obj_type="Concept", relations=relations
     )
 
 
-@cache.memoize_function(120)
-def get_concept(concept_id):
-    """
-    Return given concept as a dictionary.
-    """
-    return get_concept_raw(concept_id).serialize(obj_type="Concept")
-
-
 @cache.memoize_function(120)
 def get_full_concept(concept_id):
     """
@@ -86,7 +78,7 @@ def get_full_concept(concept_id):
     concepts = get_concepts_and_tasks({"id": concept_id})
     if len(concepts) > 0:
         concept = concepts[0]
-        concept.update(get_concept_with_relations(concept_id))
+        concept.update(get_concept(concept_id, relations=True))
         return concept
     else:
         raise ConceptNotFoundException

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/events_service.py

@@ -7,7 +7,7 @@ from sqlalchemy import func
 def get_last_events(
     after=None,
     before=None,
-    page_size=100,
+    limit=100,
     only_files=False,
     project_id=None,
     name=None,
@@ -46,7 +46,7 @@ def get_last_events(
     if name is not None:
         query = query.filter(ApiEvent.name == name)
 
-    events = query.limit(page_size).all()
+    events = query.limit(limit).all()
     return [
         fields.serialize_dict(
             {
@@ -71,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.
@@ -85,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/news_service.py

@@ -92,7 +92,7 @@ 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,
@@ -102,7 +102,7 @@ def get_last_news_for_project(
     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())
@@ -158,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,
@@ -172,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 = []
@@ -221,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
 
 
@@ -314,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

@@ -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)
@@ -230,6 +231,8 @@ def create_person(
                 raise WrongParameterException(
                     "Expiration date can't be in the past."
                 )
+        except WrongParameterException:
+            raise
         except:
             raise WrongParameterException("Expiration date is not valid.")
 
@@ -310,6 +313,8 @@ def update_person(person_id, data, bypass_protected_accounts=False):
                 raise WrongParameterException(
                     "Expiration date can't be in the past."
                 )
+        except WrongParameterException:
+            raise
         except:
             raise WrongParameterException("Expiration date is not valid.")
 
@@ -480,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):
@@ -497,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()
 
 

zou/app/services/preview_files_service.py

@@ -89,7 +89,7 @@ def _is_valid_partial_resolution(resolution):
     return resolution is not None and bool(re.match(r"x\d{3,4}", resolution))
 
 
-def get_preview_file_fps(project):
+def get_preview_file_fps(project, entity=None):
     """
     Return fps set at project level or default fps if the dimensions are not
     set.
@@ -97,6 +97,12 @@ def get_preview_file_fps(project):
     fps = "25.00"
     if project.get("fps", None) is not None:
         fps = project["fps"].replace(",", ".")
+
+    if entity is not None:
+        entity_data = entity.get("data", {}) or {}
+        if entity_data.get("fps", None) is not None:
+            fps = entity_data["fps"].replace(",", ".")
+
     return "%.3f" % float(fps)
 
 
@@ -193,7 +199,7 @@ def prepare_and_store_movie(
                 preview_file = set_preview_file_as_broken(preview_file_id)
                 return preview_file
 
-        fps = get_preview_file_fps(project)
+        fps = get_preview_file_fps(project, entity)
         (width, height) = get_preview_file_dimensions(project, entity)
 
         if normalize:
@@ -619,7 +625,9 @@ def extract_frame_from_preview_file(preview_file, frame_number):
     else:
         raise PreviewFileNotFoundException
 
-    fps = get_preview_file_fps(project)
+    fps = get_preview_file_fps(
+        project, get_entity_from_preview_file(preview_file["id"])
+    )
     extracted_frame_path = movie.extract_frame_from_movie(
         preview_file_path, frame_number, fps
     )
@@ -650,7 +658,7 @@ def extract_tile_from_preview_file(preview_file):
         extracted_tile_path = movie.generate_tile(preview_file_path)
         return extracted_tile_path
     else:
-        return WrongParameterException("Preview file is not a movie")
+        raise WrongParameterException("Preview file is not a movie")
 
 
 def reset_movie_files_metadata():

zou/app/services/projects_service.py

@@ -38,7 +38,7 @@ from sqlalchemy import or_
 
 def clear_project_cache(project_id):
     cache.cache.delete_memoized(get_project, project_id)
-    cache.cache.delete_memoized(get_project_with_relations, project_id)
+    cache.cache.delete_memoized(get_project, project_id, True)
     cache.cache.delete_memoized(get_project_by_name)
     cache.cache.delete_memoized(open_projects)
 
@@ -259,21 +259,12 @@ def get_project_raw(project_id):
 
 
 @cache.memoize_function(240)
-def get_project(project_id):
+def get_project(project_id, relations=False):
     """
     Get project matching given id, as a dict. Raises an exception if project is
     not found.
     """
-    return get_project_raw(project_id).serialize()
-
-
-@cache.memoize_function(240)
-def get_project_with_relations(project_id):
-    """
-    Get project matching given id, as a dict. Raises an exception if project is
-    not found.
-    """
-    return get_project_raw(project_id).serialize(relations=True)
+    return get_project_raw(project_id).serialize(relations=relations)
 
 
 @cache.memoize_function(120)
@@ -487,7 +478,7 @@ def add_metadata_descriptor(
             field_name=slugify.slugify(name, separator="_"),
         )
     except Exception:
-        raise WrongParameterException
+        raise WrongParameterException("Metadata descriptor already exists.")
     events.emit(
         "metadata-descriptor:new",
         {"metadata_descriptor_id": str(descriptor.id)},

zou/app/services/shots_service.py

@@ -50,7 +50,7 @@ from zou.app.services.exception import (
 
 def clear_shot_cache(shot_id):
     cache.cache.delete_memoized(get_shot, shot_id)
-    cache.cache.delete_memoized(get_shot_with_relations, shot_id)
+    cache.cache.delete_memoized(get_shot, shot_id, True)
     cache.cache.delete_memoized(get_full_shot, shot_id)
 
 
@@ -402,19 +402,13 @@ def get_shot_raw(shot_id):
 
 
 @cache.memoize_function(120)
-def get_shot(shot_id):
+def get_shot(shot_id, relations=False):
     """
     Return given shot as a dictionary.
     """
-    return get_shot_raw(shot_id).serialize(obj_type="Shot")
-
-
-@cache.memoize_function(120)
-def get_shot_with_relations(shot_id):
-    """
-    Return given shot as a dictionary.
-    """
-    return get_shot_raw(shot_id).serialize(obj_type="Shot", relations=True)
+    return get_shot_raw(shot_id).serialize(
+        obj_type="Shot", relations=relations
+    )
 
 
 @cache.memoize_function(120)
@@ -426,7 +420,7 @@ def get_full_shot(shot_id):
     shots = get_shots_and_tasks({"id": shot_id})
     if len(shots) > 0:
         shot = shots[0]
-        shot.update(get_shot_with_relations(shot_id))
+        shot.update(get_shot(shot_id, relations=True))
         return shot
     else:
         raise ShotNotFoundException

zou/app/services/sync_service.py

@@ -323,12 +323,12 @@ def run_other_sync(project=None, with_events=False):
         sync_entries("events", ApiEvent, project=project)
 
 
-def run_last_events_sync(minutes=0, page_size=300):
+def run_last_events_sync(minutes=0, limit=300):
     """
     Retrieve last events from source instance and import related data and
     action.
     """
-    path = "events/last?page_size=%s" % page_size
+    path = "events/last?limit=%s" % limit
     if minutes > 0:
         now = date_helpers.get_utc_now_datetime()
         min_before = now - datetime.timedelta(minutes=minutes)
@@ -346,12 +346,12 @@ def run_last_events_sync(minutes=0, page_size=300):
                 pass
 
 
-def run_last_events_files(minutes=0, page_size=50):
+def run_last_events_files(minutes=0, limit=50):
     """
     Retrieve last events from source instance and import related data and
     action.
     """
-    path = "events/last?only_files=true&page_size=%s" % page_size
+    path = "events/last?only_files=true&limit=%s" % limit
     if minutes > 0:
         now = date_helpers.get_utc_now_datetime()
         min_before = now - datetime.timedelta(minutes=minutes)