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

zou/__init__.py

@@ -1 +1 @@
-__version__ = "0.19.68"
+__version__ = "0.19.70"

zou/app/__init__.py

@@ -134,7 +134,7 @@ def indexer_key_error(error):
         raise error
 
 
-if not config.DEBUG:
+if config.DEBUG:
 
     @app.errorhandler(Exception)
     def server_error(error):

zou/app/blueprints/auth/resources.py

@@ -78,7 +78,9 @@ class AuthenticatedResource(Resource):
             description: Person not found
         """
         person = persons_service.get_current_user(relations=True)
-        organisation = persons_service.get_organisation()
+        organisation = persons_service.get_organisation(
+            sensitive=permissions.has_admin_permissions()
+        )
         return {
             "authenticated": True,
             "user": person,
@@ -227,15 +229,21 @@ class LoginResource(Resource, ArgsMixin):
                 "HTTP_X_REAL_IP", request.remote_addr
             )
 
+            organisation = persons_service.get_organisation(
+                sensitive=user["role"] != "admin"
+            )
+
+            response = jsonify(
+                {
+                    "user": user,
+                    "organisation": organisation,
+                    "login": True,
+                    "access_token": access_token,
+                    "refresh_token": refresh_token,
+                }
+            )
+
             if is_from_browser(request.user_agent):
-                organisation = persons_service.get_organisation()
-                response = jsonify(
-                    {
-                        "user": user,
-                        "organisation": organisation,
-                        "login": True,
-                    }
-                )
                 set_access_cookies(response, access_token)
                 set_refresh_cookies(response, refresh_token)
                 events_service.create_login_log(user["id"], ip_address, "web")
@@ -243,12 +251,6 @@ class LoginResource(Resource, ArgsMixin):
                 events_service.create_login_log(
                     user["id"], ip_address, "script"
                 )
-                response = {
-                    "login": True,
-                    "user": user,
-                    "access_token": access_token,
-                    "refresh_token": refresh_token,
-                }
             current_app.logger.info(f"User {email} is logged in.")
             return response
         except WrongUserException:

zou/app/blueprints/breakdown/resources.py

@@ -398,14 +398,14 @@ class ProjectEntityLinksResource(Resource, ArgsMixin):
             type: string
             format: Number
             x-example: 2
-          - in: limit
-            name: page
+          - in: query
+            name: limit
             required: False
             type: string
             format: Number
             x-example: 100
-          - in: cursor_created_at
-            name: page
+          - in: query
+            name: cursor_created_at
             required: False
             type: string
             format: Datetime

zou/app/blueprints/comments/resources.py

@@ -435,8 +435,8 @@ class CommentManyTasksResource(Resource):
         allowed_comments = []
         for comment in comments:
             try:
-                task = tasks_service.get_task_with_relations(
-                    comment["object_id"],
+                task = tasks_service.get_task(
+                    comment["object_id"], relations=True
                 )
                 if (
                     person["role"] == "supervisor"

zou/app/blueprints/crud/base.py

@@ -13,7 +13,6 @@ from zou.app.mixin import ArgsMixin
 from zou.app.utils import events, fields, permissions, query
 from zou.app.services.exception import (
     WrongParameterException,
-    WrongParameterException,
 )
 
 
@@ -27,7 +26,10 @@ class BaseModelsResource(Resource, ArgsMixin):
         if query is None:
             query = self.model.query
 
-        return self.model.serialize_list(query.all(), relations=relations)
+        return self.serialize_list(query.all(), relations=relations)
+
+    def serialize_list(self, entries, relations=False):
+        return self.model.serialize_list(entries, relations=relations)
 
     def paginated_entries(self, query, page, limit=None, relations=False):
         total = query.count()
@@ -259,14 +261,6 @@ class BaseModelsResource(Resource, ArgsMixin):
             current_app.logger.error(str(exception), exc_info=1)
             return {"message": str(exception)}, 400
 
-        except WrongParameterException as exception:
-            current_app.logger.error(str(exception), exc_info=1)
-            return (
-                exception.dict
-                if exception.dict is not None
-                else {"message": str(exception)}
-            ), 400
-
     def emit_create_event(self, instance_dict):
         return events.emit(
             "%s:new" % self.model.__tablename__.replace("_", "-"),
@@ -290,6 +284,10 @@ class BaseModelResource(Resource, ArgsMixin):
             abort(404)
         return instance
 
+    def get_serialized_instance(self, instance_id, relations=True):
+        instance = self.get_model_or_404(instance_id)
+        return self.serialize_instance(instance, relations=relations)
+
     def check_read_permissions(self, instance_dict):
         return permissions.check_admin_permissions()
 
@@ -338,8 +336,9 @@ class BaseModelResource(Resource, ArgsMixin):
         """
         relations = self.get_bool_parameter("relations", "true")
         try:
-            instance = self.get_model_or_404(instance_id)
-            result = self.serialize_instance(instance, relations=relations)
+            result = self.get_serialized_instance(
+                instance_id, relations=relations
+            )
             self.check_read_permissions(result)
             result = self.clean_get_result(result)
 
@@ -430,14 +429,6 @@ class BaseModelResource(Resource, ArgsMixin):
             current_app.logger.error(str(exception), exc_info=1)
             return {"message": str(exception)}, 400
 
-        except WrongParameterException as exception:
-            current_app.logger.error(str(exception), exc_info=1)
-            return (
-                exception.dict
-                if exception.dict is not None
-                else {"message": str(exception)}
-            ), 400
-
     @jwt_required()
     def delete(self, instance_id):
         """

zou/app/blueprints/crud/comments.py

@@ -1,7 +1,5 @@
 from flask_jwt_extended import jwt_required
-from flask import current_app
 
-from sqlalchemy.exc import StatementError
 
 from zou.app.models.comment import Comment
 from zou.app.models.attachment_file import AttachmentFile
@@ -19,53 +17,19 @@ from zou.app.utils import events, permissions
 
 from zou.app.blueprints.crud.base import BaseModelResource, BaseModelsResource
 
-from zou.app.services.exception import (
-    CommentNotFoundException,
-)
-
 
 class CommentsResource(BaseModelsResource):
     def __init__(self):
         BaseModelsResource.__init__(self, Comment)
 
-    def check_read_permissions(self, options=None):
-        if options is not None:
-            if "project_id" in options:
-                user_service.check_project_access(options["project_id"])
-                if (
-                    permissions.has_vendor_permissions()
-                    or permissions.has_client_permissions()
-                ):
-                    raise permissions.PermissionDenied
-                else:
-                    return True
-        return permissions.check_admin_permissions()
-
 
 class CommentResource(BaseModelResource):
     def __init__(self):
         BaseModelResource.__init__(self, Comment)
         self.protected_fields += ["mentions", "department_mentions"]
 
-    @jwt_required()
-    def get(self, instance_id):
-        """
-        Retrieve a model corresponding at given ID and return it as a JSON
-        object.
-        """
-        try:
-            instance = tasks_service.get_comment_with_relations(instance_id)
-            self.check_read_permissions(instance)
-            result = self.clean_get_result(instance)
-
-        except StatementError as exception:
-            current_app.logger.error(str(exception), exc_info=1)
-            return {"message": str(exception)}, 400
-
-        except ValueError:
-            raise CommentNotFoundException
-
-        return result, 200
+    def get_serialized_instance(self, instance_id, relations=True):
+        return tasks_service.get_comment(instance_id, relations=relations)
 
     def clean_get_result(self, result):
         if permissions.has_client_permissions():
@@ -123,8 +87,8 @@ class CommentResource(BaseModelResource):
                 instance["object_id"], relations=True
             )
             task_type = tasks_service.get_task_type(task["task_type_id"])
-            project = projects_service.get_project_with_relations(
-                task["project_id"]
+            project = projects_service.get_project(
+                task["project_id"], relations=True
             )
             current_user = persons_service.get_current_user(relations=True)
             if current_user["id"] not in project["team"]:

zou/app/blueprints/crud/event.py

@@ -11,7 +11,7 @@ class EventsResource(BaseModelsResource):
         if query is None:
             query = self.model.query
 
-        return self.model.serialize_list(
+        return self.serialize_list(
             query.limit(1000).all(), relations=relations
         )
 

zou/app/blueprints/crud/metadata_descriptor.py

@@ -27,15 +27,6 @@ class MetadataDescriptorsResource(BaseModelsResource):
             )
         return query
 
-    def all_entries(self, query=None, relations=True):
-        if query is None:
-            query = self.model.query
-
-        return [
-            metadata_descriptor.serialize(relations=relations)
-            for metadata_descriptor in query.all()
-        ]
-
     def check_creation_integrity(self, data):
         """
         Check if the data descriptor has a valid data_type.
@@ -46,6 +37,15 @@ class MetadataDescriptorsResource(BaseModelsResource):
                 raise WrongParameterException("Invalid data_type")
         return True
 
+    def all_entries(self, query=None, relations=True):
+        if query is None:
+            query = self.model.query
+
+        return [
+            metadata_descriptor.serialize(relations=relations)
+            for metadata_descriptor in query.all()
+        ]
+
 
 class MetadataDescriptorResource(BaseModelResource):
 

zou/app/blueprints/crud/organisation.py

@@ -2,6 +2,7 @@ from zou.app.models.organisation import Organisation
 from zou.app.blueprints.crud.base import BaseModelResource, BaseModelsResource
 
 from zou.app.services import persons_service
+from zou.app.utils.permissions import has_admin_permissions
 
 
 class OrganisationsResource(BaseModelsResource):
@@ -24,6 +25,20 @@ class OrganisationResource(BaseModelResource):
             data["hours_by_day"] = float(data["hours_by_day"])
         return data
 
+    def serialize_instance(self, data, relations=True):
+        return data.serialize(
+            relations=relations,
+            ignored_attrs=(
+                []
+                if has_admin_permissions()
+                else [
+                    "chat_token_slack",
+                    "chat_webhook_mattermost",
+                    "chat_token_discord",
+                ]
+            ),
+        )
+
     def post_update(self, instance_dict, data):
-        persons_service.clear_oranisation_cache()
+        persons_service.clear_organisation_cache()
         return instance_dict

zou/app/blueprints/crud/person.py

@@ -97,6 +97,8 @@ class PersonsResource(BaseModelsResource):
                     raise WrongParameterException(
                         "Expiration date can't be in the past."
                     )
+            except WrongParameterException:
+                raise
             except:
                 raise WrongParameterException("Expiration date is not valid.")
         return data
@@ -178,6 +180,8 @@ class PersonResource(BaseModelResource, ArgsMixin):
                     raise WrongParameterException(
                         "Expiration date can't be in the past."
                     )
+            except WrongParameterException:
+                raise
             except:
                 raise WrongParameterException("Expiration date is not valid.")
         return data

zou/app/blueprints/crud/task.py

@@ -116,7 +116,10 @@ class TasksResource(BaseModelsResource, ArgsMixin):
             instance.save()
             self.emit_create_event(instance.serialize())
 
-            return tasks_service.get_task_with_relations(str(instance.id)), 201
+            return (
+                tasks_service.get_task(str(instance.id), relations=True),
+                201,
+            )
 
         except TypeError as exception:
             current_app.logger.error(str(exception), exc_info=1)

zou/app/blueprints/events/resources.py

@@ -32,7 +32,7 @@ class EventsResource(Resource, ArgsMixin):
             type: boolean
             default: False
           - in: query
-            name: page_size
+            name: limit
             type: integer
             default: 100
             x-example: 100
@@ -50,7 +50,7 @@ class EventsResource(Resource, ArgsMixin):
                 ("after", None, False),
                 ("before", None, False),
                 ("only_files", False, False),
-                ("page_size", 100, False),
+                ("limit", 100, False),
                 ("project_id", None, False),
                 ("name", None, False),
             ],
@@ -59,7 +59,7 @@ class EventsResource(Resource, ArgsMixin):
         permissions.check_manager_permissions()
         before = self.parse_date_parameter(args["before"])
         after = self.parse_date_parameter(args["after"])
-        page_size = args["page_size"]
+        limit = args["limit"]
         only_files = args["only_files"] == "true"
         project_id = args.get("project_id", None)
         name = args["name"]
@@ -71,7 +71,7 @@ class EventsResource(Resource, ArgsMixin):
             return events_service.get_last_events(
                 after=after,
                 before=before,
-                page_size=page_size,
+                limit=limit,
                 only_files=only_files,
                 project_id=project_id,
                 name=name,
@@ -93,18 +93,18 @@ class LoginLogsResource(Resource, ArgsMixin):
             format: date
             x-example: "2022-07-12T00:00:00"
           - in: query
-            name: page_size
+            name: limit
             type: integer
             x-example: 100
         responses:
             200:
                 description: All login logs
         """
-        args = self.get_args(["before", ("page_size", 100)])
+        args = self.get_args(["before", ("limit", 100)])
 
         permissions.check_manager_permissions()
         before = None
         if args["before"] is not None:
             before = date_helpers.get_datetime_from_string(args["before"])
-        page_size = args["page_size"]
-        return events_service.get_last_login_logs(before, page_size)
+        limit = args["limit"]
+        return events_service.get_last_login_logs(before, limit)

zou/app/blueprints/export/csv/assets.py

@@ -65,7 +65,7 @@ class AssetsCsvExport(Resource):
     def build_headers(self, metadata_infos, validation_columns):
         headers = ["Project", "Type", "Name", "Description", "Time Spent"]
 
-        metadata_headers = [name for (name, _) in metadata_infos]
+        metadata_headers = [name for (name, _, _) in metadata_infos]
 
         validation_assignations_columns = []
         for validation_column in validation_columns:
@@ -97,10 +97,15 @@ class AssetsCsvExport(Resource):
                     for person_id in task["assignees"]
                 ]
             )
-
-        for _, field_name in metadata_infos:
-            result_metadata = result.get("data", {}) or {}
-            row.append(result_metadata.get(field_name, ""))
+        result_data = result.get("data", {}) or {}
+        for _, field_name, data_type in metadata_infos:
+            result_metadata = result_data.get(field_name, "")
+            if data_type == "boolean":
+                row.append(
+                    "true" if result_metadata.lower() == "true" else "false"
+                )
+            else:
+                row.append(result_metadata)
 
         for column in validation_columns:
             if column in task_map:
@@ -153,7 +158,11 @@ class AssetsCsvExport(Resource):
         ]
 
         columns = [
-            (descriptor["name"], descriptor["field_name"])
+            (
+                descriptor["name"],
+                descriptor["field_name"],
+                descriptor["data_type"],
+            )
             for descriptor in descriptors
         ]
 

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

@@ -61,7 +61,7 @@ class EditsCsvExport(Resource):
     def build_headers(self, metadata_infos, validation_columns):
         headers = ["Project", "Episode", "Name", "Description", "Time Spent"]
 
-        metadata_headers = [name for (name, _) in metadata_infos]
+        metadata_headers = [name for (name, _, _) in metadata_infos]
 
         validation_assignations_columns = []
         for validation_column in validation_columns:
@@ -94,9 +94,15 @@ class EditsCsvExport(Resource):
                 ]
             )
 
-        for _, field_name in metadata_infos:
-            result_metadata = result.get("data", {}) or {}
-            row.append(result_metadata.get(field_name, ""))
+        result_data = result.get("data", {}) or {}
+        for _, field_name, data_type in metadata_infos:
+            result_metadata = result_data.get(field_name, "")
+            if data_type == "boolean":
+                row.append(
+                    "true" if result_metadata.lower() == "true" else "false"
+                )
+            else:
+                row.append(result_metadata)
 
         for column in validation_columns:
             if column in task_map:
@@ -149,7 +155,11 @@ class EditsCsvExport(Resource):
         ]
 
         columns = [
-            (descriptor["name"], descriptor["field_name"])
+            (
+                descriptor["name"],
+                descriptor["field_name"],
+                descriptor["data_type"],
+            )
             for descriptor in descriptors
         ]
 

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

@@ -76,7 +76,7 @@ class ShotsCsvExport(Resource):
             "FPS",
         ]
 
-        metadata_headers = [name for (name, _) in metadata_infos]
+        metadata_headers = [name for (name, _, _) in metadata_infos]
 
         validation_assignations_columns = []
         for validation_column in validation_columns:
@@ -123,9 +123,15 @@ class ShotsCsvExport(Resource):
                     for person_id in task["assignees"]
                 ]
             )
-
-        for _, field_name in metadata_infos:
-            row.append(result.get("data", {}).get(field_name, ""))
+        result_data = result.get("data", {}) or {}
+        for _, field_name, data_type in metadata_infos:
+            result_metadata = result_data.get(field_name, "")
+            if data_type == "boolean":
+                row.append(
+                    "true" if result_metadata.lower() == "true" else "false"
+                )
+            else:
+                row.append(result_metadata)
 
         for column in validation_columns:
             if column in task_map:
@@ -171,7 +177,11 @@ class ShotsCsvExport(Resource):
         ]
 
         columns = [
-            (descriptor["name"], descriptor["field_name"])
+            (
+                descriptor["name"],
+                descriptor["field_name"],
+                descriptor["data_type"],
+            )
             for descriptor in descriptors
         ]
 

zou/app/blueprints/index/resources.py

@@ -297,6 +297,8 @@ class ConfigResource(Resource):
             ),
             "saml_enabled": config.SAML_ENABLED,
             "saml_idp_name": config.SAML_IDP_NAME,
+            "default_locale": config.DEFAULT_LOCALE,
+            "default_timezone": config.DEFAULT_TIMEZONE,
         }
         if config.SENTRY_KITSU_ENABLED:
             conf["sentry"] = {

zou/app/blueprints/news/resources.py

@@ -21,7 +21,7 @@ class NewsMixin(ArgsMixin):
             episode_id,
             person_id,
             page,
-            page_size,
+            limit,
             after,
             before,
         ) = self.get_arguments()
@@ -38,7 +38,7 @@ class NewsMixin(ArgsMixin):
             episode_id=episode_id,
             author_id=person_id,
             page=page,
-            page_size=page_size,
+            limit=limit,
             after=after,
             before=before,
             current_user=current_user,
@@ -72,7 +72,7 @@ class NewsMixin(ArgsMixin):
                 "project_id",
                 "episode_id",
                 {"name": "page", "default": 1, "type": int},
-                {"name": "page_size", "default": 50, "type": int},
+                {"name": "limit", "default": 50, "type": int},
                 "after",
                 "before",
             ],
@@ -84,7 +84,7 @@ class NewsMixin(ArgsMixin):
             args["episode_id"],
             args["person_id"],
             args["page"],
-            args["page_size"],
+            args["limit"],
             args["after"],
             args["before"],
         )
@@ -120,7 +120,7 @@ class ProjectNewsResource(Resource, NewsMixin, ArgsMixin):
             type: integer
             x-example: 1
           - in: query
-            name: page_size
+            name: limit
             type: integer
             x-example: 50
           - in: query
@@ -183,7 +183,7 @@ class NewsResource(Resource, NewsMixin, ArgsMixin):
             type: integer
             x-example: 1
           - in: query
-            name: page_size
+            name: limit
             type: integer
             x-example: 50
           - in: query

zou/app/blueprints/persons/resources.py

@@ -30,7 +30,6 @@ from zou.app.services.exception import (
     UnactiveUserException,
     TwoFactorAuthenticationNotEnabledException,
     PersonInProtectedAccounts,
-    WrongParameterException,
 )
 from zou.app.services.auth_service import (
     disable_two_factor_authentication_for_person,

zou/app/blueprints/shots/resources.py

@@ -20,7 +20,6 @@ from zou.app.mixin import ArgsMixin
 from zou.app.utils import fields, query, permissions
 from zou.app.services.exception import (
     WrongParameterException,
-    WrongParameterException,
 )
 
 

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

@@ -16,7 +16,7 @@ from zou.app.services import (
 )
 from zou.app.models.entity import Entity
 from zou.app.services.exception import WrongParameterException
-from zou.app.utils import events, cache
+from zou.app.utils import events, cache, string
 
 
 class AssetsCsvImportResource(BaseCsvProjectImportResource):
@@ -209,9 +209,16 @@ class AssetsCsvImportResource(BaseCsvProjectImportResource):
         else:
             asset_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:
-                asset_new_values["data"][field_name] = row[name]
+                if descriptor["data_type"] == "boolean":
+                    asset_new_values["data"][descriptor["field_name"]] = (
+                        "true" if string.strtobool(row[name]) else "false"
+                    )
+                else:
+                    asset_new_values["data"][descriptor["field_name"]] = row[
+                        name
+                    ]
 
         ready_for = row.get("Ready for", None)
         if ready_for is not None:

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

@@ -131,5 +131,5 @@ class BaseCsvProjectImportResource(BaseCsvImportResource, ArgsMixin):
         descriptors = projects_service.get_metadata_descriptors(project_id)
         for descriptor in descriptors:
             if descriptor["entity_type"] == entity_type:
-                descriptor_map[descriptor["name"]] = descriptor["field_name"]
+                descriptor_map[descriptor["name"]] = descriptor
         return descriptor_map