zou 0.19.52__py3-none-any.whl → 0.19.54__py3-none-any.whl

zou/app/blueprints/crud/project.py

@@ -18,7 +18,7 @@ from zou.app.utils import events, permissions, fields
 
 from zou.app.blueprints.crud.base import BaseModelResource, BaseModelsResource
 
-from zou.app.services.exception import ArgumentsException
+from zou.app.services.exception import WrongParameterException
 
 
 class ProjectsResource(BaseModelsResource):
@@ -44,7 +44,7 @@ class ProjectsResource(BaseModelsResource):
             if data["production_style"] not in [
                 type_name for type_name, _ in PROJECT_STYLES
             ]:
-                raise ArgumentsException("Invalid production_style")
+                raise WrongParameterException("Invalid production_style")
         return True
 
     def update_data(self, data):
@@ -71,7 +71,7 @@ class ProjectsResource(BaseModelsResource):
                 or data["preview_background_file_id"]
                 not in data["preview_background_files_ids"]
             ):
-                raise ArgumentsException("Invalid preview_background_file_id")
+                raise WrongParameterException("Invalid preview_background_file_id")
         return data
 
     def post_creation(self, project):
@@ -131,7 +131,7 @@ class ProjectResource(BaseModelResource, ArgsMixin):
                 data["preview_background_file_id"]
                 not in preview_background_files_ids
             ):
-                raise ArgumentsException("Invalid preview_background_file_id")
+                raise WrongParameterException("Invalid preview_background_file_id")
 
         return data
 
@@ -167,7 +167,7 @@ class ProjectResource(BaseModelResource, ArgsMixin):
             if data["production_style"] not in [
                 type_name for type_name, _ in PROJECT_STYLES
             ]:
-                raise ArgumentsException("Invalid production_style")
+                raise WrongParameterException("Invalid production_style")
         return data
 
     @jwt_required()

zou/app/blueprints/crud/schedule_item.py

@@ -3,7 +3,7 @@ from zou.app.models.schedule_item import ScheduleItem
 from zou.app.blueprints.crud.base import BaseModelResource, BaseModelsResource
 
 from zou.app.services import user_service
-from zou.app.services.exception import ArgumentsException
+from zou.app.services.exception import WrongParameterException
 
 
 class ScheduleItemsResource(BaseModelsResource):
@@ -17,7 +17,7 @@ class ScheduleItemsResource(BaseModelsResource):
             object_id=data.get("object_id", None),
         )
         if schedule_item is not None:
-            raise ArgumentsException("A similar schedule item already exists")
+            raise WrongParameterException("A similar schedule item already exists")
         return schedule_item
 
 

zou/app/blueprints/crud/task.py

@@ -114,6 +114,7 @@ class TasksResource(BaseModelsResource, ArgsMixin):
             if assignees is not None:
                 instance.assignees = persons
             instance.save()
+            self.emit_create_event(instance.serialize())
 
             return tasks_service.get_task_with_relations(str(instance.id)), 201
 

zou/app/blueprints/crud/task_type.py

@@ -1,5 +1,5 @@
 from zou.app.models.task_type import TaskType
-from zou.app.services.exception import ArgumentsException
+from zou.app.services.exception import WrongParameterException
 from zou.app.services import tasks_service
 
 from zou.app.blueprints.crud.base import BaseModelResource, BaseModelsResource
@@ -17,7 +17,7 @@ class TaskTypesResource(BaseModelsResource):
         name = data.get("name", None)
         task_type = TaskType.get_by(name=name)
         if task_type is not None:
-            raise ArgumentsException(
+            raise WrongParameterException(
                 "A task type with similar name already exists"
             )
         return data
@@ -40,7 +40,7 @@ class TaskTypeResource(BaseModelResource):
         if name is not None:
             task_type = TaskType.get_by(name=name)
             if task_type is not None and instance_id != str(task_type.id):
-                raise ArgumentsException(
+                raise WrongParameterException(
                     "A task type with similar name already exists"
                 )
         return data

zou/app/blueprints/persons/resources.py

@@ -30,7 +30,7 @@ from zou.app.services.exception import (
     UnactiveUserException,
     TwoFactorAuthenticationNotEnabledException,
     PersonInProtectedAccounts,
-    ArgumentsException,
+    WrongParameterException,
 )
 from zou.app.services.auth_service import (
     disable_two_factor_authentication_for_person,
@@ -779,7 +779,7 @@ class TimeSpentDurationResource(Resource, ArgsMixin):
                     )["departments"]
                     if department_id is not None:
                         if department_id not in persons_departments:
-                            raise ArgumentsException(
+                            raise WrongParameterException(
                                 "Supervisor not allowed to access this department"
                             )
                     else:

zou/app/blueprints/previews/resources.py

@@ -35,7 +35,7 @@ from zou.app.utils import (
     date_helpers,
 )
 from zou.app.services.exception import (
-    ArgumentsException,
+    WrongParameterException,
     PreviewBackgroundFileNotFoundException,
     PreviewFileReuploadNotAllowedException,
 )
@@ -813,7 +813,29 @@ class BasePreviewPictureResource(BasePreviewFileResource):
             abort(404)
 
 
-class PreviewFileThumbnailResource(BasePreviewPictureResource):
+class BasePreviewFileThumbnailResource(BasePreviewPictureResource):
+    """
+    Base class to download a thumbnail for a preview file.
+    """
+
+    def is_allowed(self, preview_file_id):
+        self.preview_file = files_service.get_preview_file(preview_file_id)
+        task = tasks_service.get_task(self.preview_file["task_id"])
+        entity = entities_service.get_entity(task["entity_id"])
+        if (
+            entity["preview_file_id"] != preview_file_id
+            or not entity["is_shared"]
+            or permissions.has_vendor_permissions()
+        ):
+            user_service.check_project_access(task["project_id"])
+            user_service.check_entity_access(task["entity_id"])
+        self.last_modified = date_helpers.get_datetime_from_string(
+            self.preview_file["updated_at"]
+        )
+
+
+class PreviewFileThumbnailResource(BasePreviewFileThumbnailResource):
+
     def __init__(self):
         BasePreviewPictureResource.__init__(self, "thumbnails")
 
@@ -832,12 +854,12 @@ class PreviewFilePreviewResource(BasePreviewPictureResource):
         BasePreviewPictureResource.__init__(self, "previews")
 
 
-class PreviewFileThumbnailSquareResource(BasePreviewPictureResource):
+class PreviewFileThumbnailSquareResource(BasePreviewFileThumbnailResource):
     def __init__(self):
         BasePreviewPictureResource.__init__(self, "thumbnails-square")
 
 
-class PreviewFileOriginalResource(BasePreviewPictureResource):
+class PreviewFileOriginalResource(BasePreviewFileThumbnailResource):
     def __init__(self):
         BasePreviewPictureResource.__init__(self, "original")
 
@@ -1034,7 +1056,8 @@ class ProjectThumbnailResource(BaseThumbnailResource):
 
     def check_allowed_to_get(self, instance_id):
         super().check_allowed_to_get(instance_id)
-        user_service.check_project_access(instance_id)
+        if not permissions.has_manager_permissions():
+            user_service.check_project_access(instance_id)
 
 
 class CreateProjectThumbnailResource(ProjectThumbnailResource):
@@ -1074,7 +1097,7 @@ class SetMainPreviewResource(Resource, ArgsMixin):
         user_service.check_entity_access(task["entity_id"])
         if frame_number is not None:
             if preview_file["extension"] != "mp4":
-                raise ArgumentsException(
+                raise WrongParameterException(
                     "Can't use a given frame on non movie preview"
                 )
             preview_files_service.replace_extracted_frame_for_preview_file(

zou/app/blueprints/projects/resources.py

@@ -659,7 +659,7 @@ class ProductionMetadataDescriptorsResource(Resource, ArgsMixin):
             200:
               description: All metadata descriptors
         """
-        user_service.check_manager_project_access(project_id)
+        user_service.check_project_access(project_id)
         for_client = permissions.has_client_permissions()
         return projects_service.get_metadata_descriptors(
             project_id, for_client

zou/app/blueprints/shots/resources.py

@@ -20,7 +20,7 @@ from zou.app.mixin import ArgsMixin
 from zou.app.utils import fields, query, permissions
 from zou.app.services.exception import (
     WrongParameterException,
-    ArgumentsException,
+    WrongParameterException,
 )
 
 
@@ -77,7 +77,7 @@ class ShotResource(Resource, ArgsMixin):
         user_service.check_manager_project_access(shot["project_id"])
         data = request.json
         if data is None:
-            raise ArgumentsException(
+            raise WrongParameterException(
                 "Data are empty. Please verify that you sent JSON data and"
                 " that you set the right headers."
             )

zou/app/models/base.py

@@ -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):
         """

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,10 +89,7 @@ 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.Text())
@@ -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/services/assets_service.py

@@ -84,7 +84,7 @@ def build_entity_type_asset_type_filter():
     return ~EntityType.id.in_(ids_to_exclude)
 
 
-def get_assets(criterions={}):
+def get_assets(criterions={}, is_admin=False):
     """
     Get all assets for given criterions.
     """
@@ -102,6 +102,12 @@ def get_assets(criterions={}):
         query = query.outerjoin(Task)
         query = query.filter(user_service.build_assignee_filter())
 
+    if "is_shared" in criterions:
+        if not is_admin:
+            query = (
+                query.join(Project).filter(user_service.build_team_filter())
+            )
+
     if episode_id is not None:
         # Filter based on main episode.
         query = query.filter(Entity.source_id == episode_id)
@@ -306,6 +312,7 @@ def get_assets_and_tasks(criterions={}, page=1, with_episode_ids=False):
                 "episode_id": source_id,
                 "casting_episode_ids": cast_in_episode_ids.get(asset_id, []),
                 "is_casting_standby": asset.is_casting_standby,
+                "is_shared": asset.is_shared,
                 "data": data,
                 "tasks": [],
             }
@@ -571,6 +578,7 @@ def create_asset(
     name,
     description,
     data,
+    is_shared=False,
     source_id=None,
     created_by=None,
 ):
@@ -587,6 +595,7 @@ def create_asset(
         name=name,
         description=description,
         data=data,
+        is_shared=is_shared,
         source_id=source_id,
         created_by=created_by,
     )
@@ -706,3 +715,69 @@ def cancel_asset(asset_id, force=True):
         project_id=str(asset.project_id),
     )
     return asset_dict
+
+
+def set_shared_assets(
+    is_shared=True,
+    project_id=None,
+    asset_type_id=None,
+    asset_ids=None,
+    with_events=False
+):
+    """
+    Set all assets of a project to is_shared=True or False.
+    """
+
+    query = Entity.query.filter(build_asset_type_filter()).filter()
+
+    if project_id is not None:
+        query = query.filter(Entity.project_id == project_id)
+
+    if asset_type_id is not None:
+        query = query.filter(Entity.entity_type_id == asset_type_id)
+
+    if asset_ids is not None:
+        query = query.filter(Entity.id.in_(asset_ids))
+
+    assets = query.all()
+
+    for asset in assets:
+        asset.update_no_commit({"is_shared": is_shared})
+
+    Entity.commit()
+
+    for asset in assets:
+        asset_id = str(asset.id)
+        clear_asset_cache(asset_id)
+        if with_events:
+            events.emit(
+                "asset:update",
+                {"asset_id": asset_id},
+                project_id=project_id,
+            )
+
+    return Entity.serialize_list(assets, obj_type="Asset")
+
+
+def get_shared_assets_used_in_project(project_id, episode_id=None):
+    """
+    Get all shared assets used in a project.
+    """
+    Shot = aliased(Entity, name="shot")
+    Sequence = aliased(Entity, name="sequence")
+
+    assets = (
+        Entity.query.filter(build_asset_type_filter())
+        .filter(Entity.is_shared == True)
+        .join(EntityLink, EntityLink.entity_out_id == Entity.id)
+        .join(Shot, EntityLink.entity_in_id == Shot.id)
+        .join(Sequence, Shot.parent_id == Sequence.id)
+        .filter(Shot.project_id == project_id)
+        .filter(Entity.canceled != True)
+        .filter(Entity.project_id != project_id)
+    )
+
+    if episode_id is not None and episode_id not in ["main", "all"]:
+        assets = assets.filter(Sequence.parent_id == episode_id)
+
+    return Entity.serialize_list(assets.all(), obj_type="Asset")

zou/app/services/breakdown_service.py

@@ -50,6 +50,8 @@ def get_casting(shot_id):
             Entity.preview_file_id,
             Entity.source_id,
             Entity.ready_for,
+            Entity.is_shared,
+            Entity.project_id,
         )
         .order_by(EntityType.name, Entity.name)
     )
@@ -61,6 +63,8 @@ def get_casting(shot_id):
         entity_preview_file_id,
         episode_id,
         entity_ready_for,
+        entity_is_shared,
+        entity_project_id,
     ) in links:
         casting.append(
             {
@@ -74,6 +78,8 @@ def get_casting(shot_id):
                 ),
                 "nb_occurences": link.nb_occurences,
                 "label": link.label,
+                "is_shared": entity_is_shared,
+                "project_id": entity_project_id,
             }
         )
     return casting
@@ -93,11 +99,27 @@ def get_production_episodes_casting(project_id):
         .join(EntityType, Entity.entity_type_id == EntityType.id)
         .filter(Episode.project_id == project_id)
         .filter(Entity.canceled != True)
-        .add_columns(Entity.name, EntityType.name, Entity.preview_file_id)
-        .order_by(EntityType.name, Entity.name)
+        .add_columns(
+            Entity.name,
+            EntityType.name,
+            Entity.preview_file_id,
+            Entity.is_shared,
+            Entity.project_id,
+        )
+        .order_by(
+            EntityType.name,
+            Entity.name,
+        )
     )
 
-    for link, entity_name, entity_type_name, entity_preview_file_id in links:
+    for (
+        link,
+        entity_name,
+        entity_type_name,
+        entity_preview_file_id,
+        entity_is_shared,
+        entity_project_id,
+    ) in links:
         episode_id = str(link.entity_in_id)
         if episode_id not in castings:
             castings[episode_id] = []
@@ -112,6 +134,8 @@ def get_production_episodes_casting(project_id):
                 ),
                 "nb_occurences": link.nb_occurences,
                 "label": link.label,
+                "is_shared": entity_is_shared,
+                "project_id": entity_project_id,
             }
         )
     return castings
@@ -139,6 +163,8 @@ def get_sequence_casting(sequence_id, project_id=None, episode_id=None):
             Entity.name,
             EntityType.name,
             Entity.preview_file_id,
+            Entity.is_shared,
+            Entity.project_id,
             Sequence.name,
         )
     )
@@ -163,6 +189,8 @@ def get_sequence_casting(sequence_id, project_id=None, episode_id=None):
         entity_name,
         entity_type_name,
         entity_preview_file_id,
+        entity_is_shared,
+        entity_project_id,
         sequence_name,
     ) in links:
         shot_id = str(link.entity_in_id)
@@ -180,6 +208,8 @@ def get_sequence_casting(sequence_id, project_id=None, episode_id=None):
                 ),
                 "nb_occurences": link.nb_occurences,
                 "label": link.label,
+                "is_shared": entity_is_shared,
+                "project_id": entity_project_id,
             }
         )
     return castings

zou/app/services/deletion_service.py

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

zou/app/services/exception.py

@@ -251,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
@@ -261,10 +261,6 @@ class WrongIdFormatException(Exception):
     pass
 
 
-class WrongParameterException(Exception):
-    pass
-
-
 class ModelWithRelationsDeletionException(Exception):
     pass
 

zou/app/services/preview_files_service.py

@@ -34,7 +34,7 @@ from zou.app.utils import (
     thumbnail as thumbnail_utils,
 )
 from zou.app.services.exception import (
-    ArgumentsException,
+    WrongParameterException,
     PreviewFileNotFoundException,
     ProjectNotFoundException,
     EpisodeNotFoundException,
@@ -650,7 +650,7 @@ def extract_tile_from_preview_file(preview_file):
         extracted_tile_path = movie.generate_tile(preview_file_path)
         return extracted_tile_path
     else:
-        return ArgumentsException("Preview file is not a movie")
+        return WrongParameterException("Preview file is not a movie")
 
 
 def reset_movie_files_metadata():

zou/app/services/tasks_service.py

@@ -1082,7 +1082,7 @@ def get_person_tasks_to_check(project_ids=None, department_ids=None):
     else:
         query = query.filter(user_service.build_open_project_filter())
 
-    if department_ids is not None:
+    if department_ids:
         query = query.filter(TaskType.department_id.in_(department_ids))
     tasks = []
     for (

zou/app/services/time_spents_service.py

@@ -158,7 +158,7 @@ def get_time_spents_for_year(
         else:
             query = query.filter(Task.project_id == project_id)
 
-    if department_ids is not None:
+    if department_ids:
         query = query.join(TaskType).filter(
             TaskType.department_id.in_(department_ids)
         )
@@ -200,7 +200,7 @@ def get_time_spents_for_month(
         else:
             query = query.filter(Task.project_id == project_id)
 
-    if department_ids is not None:
+    if department_ids:
         query = query.join(TaskType).filter(
             TaskType.department_id.in_(department_ids)
         )
@@ -255,7 +255,7 @@ def get_time_spents(
         if project_ids is not None:
             query = query.filter(Task.project_id.in_(project_ids))
 
-        if department_ids is not None:
+        if department_ids:
             query = query.join(TaskType)
             query = query.filter(TaskType.department_id.in_(department_ids))
     except DataError:
@@ -430,7 +430,7 @@ def get_person_time_spent_entries(
         else:
             query = query.filter(Task.project_id == project_id)
 
-    if department_ids is not None:
+    if department_ids:
         query = query.join(TaskType, TaskType.id == Task.task_type_id).filter(
             TaskType.department_id.in_(department_ids)
         )

zou/app/swagger.py

@@ -14,6 +14,7 @@ swagger_config = {
     "static_url_path": "/docs",
     "swagger_ui": True,
     "specs_route": "/apidocs/",
+    "openapi": "3.0.2",
 }
 
 
@@ -30,26 +31,18 @@ An easy to use Python client to access this API is available:
 
 <p>Before you can use any of the endpoints outline below,
 you will have to get a JWT token to authorize your requests.
+</p>
 
-You can get a authorization token using a (form-encoded) POST request to ```/auth/login```.
-With curl this would look something like ```curl -X POST <server_address>/auth/login -d "email=<youremail>&password=<yourpassword>```.
+<p>
+You will find the information to retrieve it in the 
+<a href="#tag/Authentication">Zou documentation</a>.
+</p>
 
-The response is a JSON object, specifically you'll need to provide the ```access_token``` for your future requests.
-
-Here is a complete authentication process as an example (again using curl):
-```
-$ curl -X POST <server_address>/api/auth/login -d "email=<youremail>&password=<yourpassword>"'
-{{"login": true", "access_token": "eyJ0e...", ...}}
-$ jwt=eyJ0e...  # Store the access token for easier use
-$ curl -H "Authorization: Bearer $jwt" <server_address>/api/data/projects
-[{{...}},
-{{...}}]
-```
 [OpenAPI definition](/openapi.json)
 """
 
 swagger_template = {
-    "openapi": "3.1",
+    "openapi": "3.0.2",
     "info": {
         "title": "Kitsu API",
         "description": description,
@@ -70,12 +63,14 @@ swagger_template = {
     "host": "localhost:8080",
     "basePath": "/api",
     "schemes": ["http", "https"],
-    "securityDefinitions": {
-        "JWT Authorization": {
-            "name": "Authorization",
-            "in": "header",
-            "type": "apiKey",
-            "description": "Format in header: **Authorization: Bearer {token}**. \n\n Value example: Bearer xxxxx.yyyyy.zzzzz",
+    "components": {
+        "securitySchemes": {
+            "JWT Authorization": {
+                "name": "Authorization",
+                "in": "header",
+                "type": "apiKey",
+                "description": "Format in header: **Authorization: Bearer {token}**. \n\n Value example: Bearer xxxxx.yyyyy.zzzzz",
+            }
         }
     },
     "security": [{"JWT Authorization": []}],