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

zou/__init__.py

@@ -1 +1 @@
-__version__ = "0.19.52"
+__version__ = "0.19.54"

zou/app/__init__.py

@@ -96,7 +96,7 @@ def id_parameter_format_error(error):
 
 @app.errorhandler(WrongParameterException)
 def wrong_parameter(error):
-    return jsonify(error=True, message=str(error)), 400
+    return jsonify(error=True, message=str(error), data=error.dict), 400
 
 
 @app.errorhandler(ExpiredSignatureError)

zou/app/blueprints/assets/__init__.py

@@ -21,6 +21,11 @@ from zou.app.blueprints.assets.resources import (
     ProjectAssetTypeAssetsResource,
     ProjectAssetTypesResource,
     ShotAssetTypesResource,
+    SetSharedProjectAssetsResource,
+    SetSharedProjectAssetTypeAssetsResource,
+    SetSharedAssetsResource,
+    ProjectAssetsSharedUsedResource,
+    ProjectEpisodeAssetsSharedUsedResource,
 )
 
 
@@ -59,6 +64,23 @@ routes = [
     ("/data/projects/<project_id>/asset-types", ProjectAssetTypesResource),
     ("/data/shots/<shot_id>/asset-types", ShotAssetTypesResource),
     ("/data/projects/<project_id>/assets", ProjectAssetsResource),
+    ("/actions/assets/share", SetSharedAssetsResource),
+    (
+        "/actions/projects/<project_id>/assets/share",
+        SetSharedProjectAssetsResource,
+    ),
+    (
+        "/actions/projects/<project_id>/asset-types/<asset_type_id>/assets/share",
+        SetSharedProjectAssetTypeAssetsResource,
+    ),
+    (
+        "/data/projects/<project_id>/assets/shared-used",
+        ProjectAssetsSharedUsedResource,
+    ),
+    (
+        "/data/projects/<project_id>/episodes/<episode_id>/assets/shared-used",
+        ProjectEpisodeAssetsSharedUsedResource,
+    ),
 ]
 
 blueprint = Blueprint("assets", "assets")

zou/app/blueprints/assets/resources.py

@@ -21,7 +21,11 @@ def check_criterion_access(criterions):
     elif "episode_id" in criterions:
         episode_id = criterions.get("episode_id", None)
         project_id = shots_service.get_episode(episode_id)["project_id"]
-    return user_service.check_project_access(project_id)
+
+    if "project_id" in criterions:
+        user_service.check_project_access(project_id)
+
+    return True
 
 
 class AssetResource(Resource, ArgsMixin):
@@ -106,7 +110,10 @@ class AllAssetsResource(Resource):
             criterions["assigned_to"] = persons_service.get_current_user()[
                 "id"
             ]
-        return assets_service.get_assets(criterions)
+        return assets_service.get_assets(
+            criterions,
+            is_admin=permissions.has_admin_permissions(),
+        )
 
 
 class AllAssetsAliasResource(AllAssetsResource):
@@ -431,6 +438,7 @@ class NewAssetResource(Resource, ArgsMixin):
                 - name
                 - description
                 - data
+                - is_shared
                 - source_id
                 properties:
                     name:
@@ -439,6 +447,8 @@ class NewAssetResource(Resource, ArgsMixin):
                         type: string
                     data:
                         type: string
+                    is_shared:
+                        type: boolean
                     source_id:
                         type: string
                         format: UUID
@@ -447,7 +457,7 @@ class NewAssetResource(Resource, ArgsMixin):
             201:
                 description: New asset resource created
         """
-        (name, description, data, source_id) = self.get_arguments()
+        (name, description, data, is_shared, source_id) = self.get_arguments()
 
         user_service.check_manager_project_access(project_id)
         asset = assets_service.create_asset(
@@ -456,6 +466,7 @@ class NewAssetResource(Resource, ArgsMixin):
             name,
             description,
             data,
+            is_shared,
             source_id,
             created_by=persons_service.get_current_user()["id"],
         )
@@ -471,6 +482,12 @@ class NewAssetResource(Resource, ArgsMixin):
                 },
                 "description",
                 ("data", {}, False, dict),
+                (
+                    "is_shared",
+                    True,
+                    False,
+                    bool,
+                ),
                 "episode_id",
             ]
         )
@@ -479,6 +496,7 @@ class NewAssetResource(Resource, ArgsMixin):
             args["name"],
             args.get("description", ""),
             args["data"],
+            args["is_shared"],
             args["episode_id"],
         )
 
@@ -658,3 +676,222 @@ class AssetAssetInstancesResource(Resource, ArgsMixin):
             asset_id, args["asset_to_instantiate_id"], args["description"]
         )
         return asset_instance, 201
+
+
+class BaseSetSharedAssetsResource(Resource, ArgsMixin):
+
+    @jwt_required()
+    def post(self, project_id=None, asset_type_id=None, asset_ids=None):
+        args = self.get_args(
+            [
+                (
+                    "is_shared",
+                    True,
+                    False,
+                    bool,
+                ),
+            ]
+        )
+        return assets_service.set_shared_assets(
+            is_shared=args["is_shared"],
+            project_id=project_id,
+            asset_type_id=asset_type_id,
+            asset_ids=asset_ids,
+        )
+
+
+class SetSharedProjectAssetsResource(BaseSetSharedAssetsResource):
+    """
+    Share or unshare all assets (or a list of assets) for given project.
+    """
+
+    @jwt_required()
+    def post(self, project_id):
+        """
+        Share or unshare all assets (or a list of assets) for given project.
+        ---
+        tags:
+        - Assets
+        consumes:
+            - multipart/form-data
+        parameters:
+          - in: path
+            name: project_id
+            required: True
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+          - in: formData
+            name: asset_ids
+            default: None,
+            type: array
+            items:
+                type: UUID
+            x-example: ["a24a6ea4-ce75-4665-a070-57453082c25"]
+          - in: formData
+            name: is_shared
+            default: true
+            type: boolean
+            x-example: true
+        responses:
+            201:
+                description: All assets modified.
+        """
+        args = self.get_args(
+            [
+                (
+                    "asset_ids",
+                    None,
+                    False,
+                    str,
+                    "append",
+                ),
+            ]
+        )
+        user_service.check_manager_project_access(project_id)
+        return super().post(project_id=project_id, asset_ids=args["asset_ids"])
+
+
+class SetSharedProjectAssetTypeAssetsResource(BaseSetSharedAssetsResource):
+    """
+    Share or unshare all assets for given project and asset type.
+    """
+
+    @jwt_required()
+    def post(self, project_id, asset_type_id):
+        """
+        Share or unshare all assets for given project and asset type.
+        ---
+        tags:
+        - Assets
+        consumes:
+            - multipart/form-data
+        parameters:
+          - in: path
+            name: project_id
+            required: True
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+          - in: path
+            name: asset_type_id
+            required: True
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+          - in: formData
+            name: is_shared
+            default: true
+            type: boolean
+            x-example: true
+        responses:
+            201:
+                description: All assets modified.
+        """
+        user_service.check_manager_project_access(project_id)
+        return super().post(project_id=project_id, asset_type_id=asset_type_id)
+
+
+class SetSharedAssetsResource(BaseSetSharedAssetsResource):
+    """
+    Share or unshare all assets (or a list of assets) for given project.
+    """
+
+    @jwt_required()
+    def post(self):
+        """
+        Share or unshare a list of assets.
+        ---
+        tags:
+        - Assets
+        consumes:
+            - multipart/form-data
+        parameters:
+          - in: formData
+            name: asset_ids
+            default: None,
+            type: array
+            items:
+                type: UUID
+            x-example: ["a24a6ea4-ce75-4665-a070-57453082c25"]
+          - in: formData
+            name: is_shared
+            default: true
+            type: boolean
+            x-example: true
+        responses:
+            201:
+                description: All assets modified.
+        """
+        args = self.get_args(
+            [
+                (
+                    "asset_ids",
+                    [],
+                    True,
+                    str,
+                    "append",
+                ),
+            ]
+        )
+        asset_ids = args["asset_ids"]
+        project_ids = set()
+        for asset_id in asset_ids:
+            project_ids.add(assets_service.get_asset(asset_id)["project_id"])
+        for project_id in project_ids:
+            user_service.check_manager_project_access(project_id)
+        return super().post(asset_ids=asset_ids)
+
+
+class ProjectAssetsSharedUsedResource(Resource):
+    @jwt_required()
+    def get(self, project_id):
+        """
+        Retrieve all shared assets used in project.
+        ---
+        tags:
+            - Assets
+        parameters:
+          - in: path
+            name: project_id
+            required: True
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+        responses:
+            200:
+                description: All shared assets used in project
+        """
+        user_service.check_project_access(project_id)
+        return assets_service.get_shared_assets_used_in_project(project_id)
+
+
+class ProjectEpisodeAssetsSharedUsedResource(Resource):
+    @jwt_required()
+    def get(self, project_id, episode_id):
+        """
+        Retrieve all shared assets used in project episode.
+        ---
+        tags:
+            - Assets
+        parameters:
+          - in: path
+            name: project_id
+            required: True
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+          - in: path
+            name: episode_id
+            required: True
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+        responses:
+            200:
+                description: All shared assets used in project episode
+        """
+        user_service.check_project_access(project_id)
+        return assets_service.get_shared_assets_used_in_project(
+            project_id, episode_id
+        )

zou/app/blueprints/chats/resources.py

@@ -10,7 +10,7 @@ from zou.app.services import (
     persons_service,
     user_service,
 )
-from zou.app.services.exception import ArgumentsException
+from zou.app.services.exception import WrongParameterException
 
 
 class ChatResource(Resource):
@@ -116,7 +116,7 @@ class ChatMessagesResource(Resource):
 
         chat = chats_service.get_chat(entity_id)
         if person["id"] not in chat["participants"]:
-            raise ArgumentsException("You are not a participant of this chat")
+            raise WrongParameterException("You are not a participant of this chat")
 
         return (
             chats_service.create_chat_message(

zou/app/blueprints/crud/base.py

@@ -12,7 +12,7 @@ from sqlalchemy.inspection import inspect
 from zou.app.mixin import ArgsMixin
 from zou.app.utils import events, fields, permissions, query
 from zou.app.services.exception import (
-    ArgumentsException,
+    WrongParameterException,
     WrongParameterException,
 )
 
@@ -79,7 +79,11 @@ class BaseModelsResource(Resource, ArgsMixin):
                 ) and isinstance(
                     field_key.property, orm.properties.RelationshipProperty
                 )
-                value_is_list = len(value) > 0 and value[0] == "["
+                value_is_list = (
+                    hasattr(value, "__len__")
+                    and len(value) > 0
+                    and value[0] == "["
+                )
 
                 if key == "name" and field_key is not None:
                     name_filter.append(value)
@@ -233,7 +237,7 @@ class BaseModelsResource(Resource, ArgsMixin):
         try:
             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."
                 )
@@ -254,7 +258,7 @@ class BaseModelsResource(Resource, ArgsMixin):
             current_app.logger.error(str(exception), exc_info=1)
             return {"message": str(exception)}, 400
 
-        except ArgumentsException as exception:
+        except WrongParameterException as exception:
             current_app.logger.error(str(exception), exc_info=1)
             return (
                 exception.dict
@@ -402,7 +406,7 @@ class BaseModelResource(Resource, ArgsMixin):
         try:
             data = self.get_arguments()
             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."
                 )
@@ -425,7 +429,7 @@ class BaseModelResource(Resource, ArgsMixin):
             current_app.logger.error(str(exception), exc_info=1)
             return {"message": str(exception)}, 400
 
-        except ArgumentsException as exception:
+        except WrongParameterException as exception:
             current_app.logger.error(str(exception), exc_info=1)
             return (
                 exception.dict

zou/app/blueprints/crud/day_off.py

@@ -5,7 +5,7 @@ from zou.app.blueprints.crud.base import BaseModelsResource, BaseModelResource
 
 from zou.app.services import user_service, time_spents_service
 
-from zou.app.services.exception import ArgumentsException
+from zou.app.services.exception import WrongParameterException
 
 from zou.app.utils import permissions
 
@@ -21,7 +21,7 @@ class DayOffsResource(BaseModelsResource):
         if time_spents_service.get_day_offs_between(
             data["date"], data["end_date"], data["person_id"]
         ):
-            raise ArgumentsException("Day off already exists for this period")
+            raise WrongParameterException("Day off already exists for this period")
         return data
 
     def post_creation(self, instance):
@@ -67,5 +67,5 @@ class DayOffResource(BaseModelResource):
             data.get("person_id", instance_dict["person_id"]),
             exclude_id=instance_dict["id"],
         ):
-            raise ArgumentsException("Day off already exists for this period")
+            raise WrongParameterException("Day off already exists for this period")
         return data

zou/app/blueprints/crud/entity.py

@@ -28,7 +28,7 @@ from zou.app.services import (
 )
 from zou.app.utils import date_helpers, events, permissions
 
-from zou.app.services.exception import ArgumentsException
+from zou.app.services.exception import WrongParameterException
 
 from werkzeug.exceptions import NotFound
 
@@ -88,7 +88,7 @@ class EntitiesResource(BaseModelsResource, EntityEventMixin):
         if "status" in data:
             types = [entity_status for entity_status, _ in ENTITY_STATUSES]
             if data["status"] not in types:
-                raise ArgumentsException("Invalid status")
+                raise WrongParameterException("Invalid status")
         return True
 
     def all_entries(self, query=None, relations=False):
@@ -255,5 +255,5 @@ class EntityResource(BaseModelResource, EntityEventMixin):
         if "status" in data:
             types = [entity_status for entity_status, _ in ENTITY_STATUSES]
             if data["status"] not in types:
-                raise ArgumentsException("Invalid status")
+                raise WrongParameterException("Invalid status")
         return data

zou/app/blueprints/crud/entity_type.py

@@ -4,6 +4,9 @@ from zou.app.models.entity_type import EntityType
 from zou.app.utils import events
 from zou.app.services import entities_service, assets_service
 
+from zou.app.services.exception import WrongParameterException
+
+
 
 class EntityTypesResource(BaseModelsResource):
     def __init__(self):
@@ -28,6 +31,18 @@ class EntityTypesResource(BaseModelsResource):
         assets_service.clear_asset_type_cache()
         return instance.serialize(relations=True)
 
+    def check_creation_integrity(self, data):
+        entity_type = (
+            EntityType.query
+            .filter(EntityType.name.ilike(data.get("name", "")))
+            .first()
+        )
+        if entity_type is not None:
+            raise WrongParameterException(
+                "Entity type with this name already exists"
+            )
+        return data
+
 
 class EntityTypeResource(BaseModelResource):
     def __init__(self):

zou/app/blueprints/crud/metadata_descriptor.py

@@ -4,9 +4,11 @@ from zou.app.models.metadata_descriptor import (
 )
 
 from zou.app.blueprints.crud.base import BaseModelResource, BaseModelsResource
+from zou.app.utils import permissions
+from zou.app.models.project import Project
 
 from zou.app.services.exception import (
-    ArgumentsException,
+    WrongParameterException,
 )
 
 
@@ -14,6 +16,16 @@ class MetadataDescriptorsResource(BaseModelsResource):
     def __init__(self):
         BaseModelsResource.__init__(self, MetadataDescriptor)
 
+    def check_read_permissions(self):
+        return not permissions.has_vendor_permissions()
+
+    def add_project_permission_filter(self, query):
+        if not permissions.has_admin_permissions():
+            query = query.join(Project).filter(
+                user_service.build_related_projects_filter()
+            )
+        return query
+
     def all_entries(self, query=None, relations=True):
         if query is None:
             query = self.model.query
@@ -30,11 +42,12 @@ class MetadataDescriptorsResource(BaseModelsResource):
         if "data_type" in data:
             types = [type_name for type_name, _ in METADATA_DESCRIPTOR_TYPES]
             if data["data_type"] not in types:
-                raise ArgumentsException("Invalid data_type")
+                raise WrongParameterException("Invalid data_type")
         return True
 
 
 class MetadataDescriptorResource(BaseModelResource):
+
     def __init__(self):
         BaseModelResource.__init__(self, MetadataDescriptor)
 
@@ -47,5 +60,5 @@ class MetadataDescriptorResource(BaseModelResource):
         if "data_type" in data:
             types = [type_name for type_name, _ in METADATA_DESCRIPTOR_TYPES]
             if data["data_type"] not in types:
-                raise ArgumentsException("Invalid data_type")
+                raise WrongParameterException("Invalid data_type")
         return data

zou/app/blueprints/crud/person.py

@@ -20,7 +20,7 @@ from zou.app.blueprints.crud.base import BaseModelsResource, BaseModelResource
 from zou.app.mixin import ArgsMixin
 
 from zou.app.services.exception import (
-    ArgumentsException,
+    WrongParameterException,
     PersonInProtectedAccounts,
 )
 
@@ -61,11 +61,9 @@ class PersonsResource(BaseModelsResource):
             and data.get("active", True)
             and persons_service.is_user_limit_reached()
         ):
-            raise ArgumentsException(
+            raise WrongParameterException(
                 "User limit reached.",
                 {
-                    "error": True,
-                    "message": "User limit reached.",
                     "limit": config.USER_LIMIT,
                 },
             )
@@ -75,18 +73,18 @@ class PersonsResource(BaseModelsResource):
         if "role" in data and data["role"] not in [
             role for role, _ in ROLE_TYPES
         ]:
-            raise ArgumentsException("Invalid role")
+            raise WrongParameterException("Invalid role")
         if "contract_type" in data and data["contract_type"] not in [
             contract_type for contract_type, _ in CONTRACT_TYPES
         ]:
-            raise ArgumentsException("Invalid contract_type")
+            raise WrongParameterException("Invalid contract_type")
         if "two_factor_authentication" in data and data[
             "two_factor_authentication"
         ] not in [
             two_factor_authentication
             for two_factor_authentication, _ in TWO_FACTOR_AUTHENTICATION_TYPES
         ]:
-            raise ArgumentsException("Invalid two_factor_authentication")
+            raise WrongParameterException("Invalid two_factor_authentication")
 
         if "expiration_date" in data and data["expiration_date"] is not None:
             try:
@@ -96,11 +94,11 @@ class PersonsResource(BaseModelsResource):
                     ).date()
                     < datetime.date.today()
                 ):
-                    raise ArgumentsException(
+                    raise WrongParameterException(
                         "Expiration date can't be in the past."
                     )
             except:
-                raise ArgumentsException("Expiration date is not valid.")
+                raise WrongParameterException("Expiration date is not valid.")
         return data
 
     def update_data(self, data):
@@ -156,18 +154,18 @@ class PersonResource(BaseModelResource, ArgsMixin):
         if "role" in data and data["role"] not in [
             role for role, _ in ROLE_TYPES
         ]:
-            raise ArgumentsException("Invalid role")
+            raise WrongParameterException("Invalid role")
         if "contract_type" in data and data["contract_type"] not in [
             contract_type for contract_type, _ in CONTRACT_TYPES
         ]:
-            raise ArgumentsException("Invalid contract_type")
+            raise WrongParameterException("Invalid contract_type")
         if "two_factor_authentication" in data and data[
             "two_factor_authentication"
         ] not in [
             two_factor_authentication
             for two_factor_authentication, _ in TWO_FACTOR_AUTHENTICATION_TYPES
         ]:
-            raise ArgumentsException("Invalid two_factor_authentication")
+            raise WrongParameterException("Invalid two_factor_authentication")
 
         if "expiration_date" in data and data["expiration_date"] is not None:
             try:
@@ -177,11 +175,11 @@ class PersonResource(BaseModelResource, ArgsMixin):
                     ).date()
                     < datetime.date.today()
                 ):
-                    raise ArgumentsException(
+                    raise WrongParameterException(
                         "Expiration date can't be in the past."
                     )
             except:
-                raise ArgumentsException("Expiration date is not valid.")
+                raise WrongParameterException("Expiration date is not valid.")
         return data
 
     def check_delete_permissions(self, instance_dict):
@@ -204,7 +202,7 @@ class PersonResource(BaseModelResource, ArgsMixin):
             and not data.get("is_bot", False)
             and persons_service.is_user_limit_reached()
         ):
-            raise ArgumentsException("User limit reached.")
+            raise WrongParameterException("User limit reached.")
         if instance_dict["email"] in config.PROTECTED_ACCOUNTS:
             message = None
             if data.get("active") is False:

zou/app/blueprints/crud/preview_background_file.py

@@ -1,5 +1,5 @@
 from zou.app.models.preview_background_file import PreviewBackgroundFile
-from zou.app.services.exception import ArgumentsException
+from zou.app.services.exception import WrongParameterException
 from zou.app.services import files_service, deletion_service
 
 from zou.app.blueprints.crud.base import BaseModelResource, BaseModelsResource
@@ -17,7 +17,7 @@ class PreviewBackgroundFilesResource(BaseModelsResource):
         name = data.get("name", None)
         preview_background_file = PreviewBackgroundFile.get_by(name=name)
         if preview_background_file is not None:
-            raise ArgumentsException(
+            raise WrongParameterException(
                 "A preview background file with similar name already exists"
             )
         return data
@@ -44,7 +44,7 @@ class PreviewBackgroundFileResource(BaseModelResource):
             if preview_background_file is not None and instance_id != str(
                 preview_background_file.id
             ):
-                raise ArgumentsException(
+                raise WrongParameterException(
                     "A preview background file with similar name already exists"
                 )
         return data