zou 0.20.78__tar.gz → 0.20.80__tar.gz

{zou-0.20.78/zou.egg-info → zou-0.20.80}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zou
-Version: 0.20.78
+Version: 0.20.80
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire

zou-0.20.80/zou/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.20.80"

{zou-0.20.78 → zou-0.20.80}/zou/app/blueprints/auth/resources.py

@@ -572,19 +572,16 @@ class ChangePasswordResource(Resource, ArgsMixin):
             html = f"""<p>Hello {user["first_name"]},</p>
 
 <p>
-You have successfully changed your password at this date : {time_string}.
-
-Your IP when you have changed your password is : {person_IP}.
-</p>
-
-Thank you and see you soon on Kitsu,
+You have successfully changed your password at this date: {time_string}.
 </p>
 <p>
-{organisation["name"]} Team
+Your IP when you have changed your password is: {person_IP}.
 </p>
 """
             subject = f"{organisation['name']} - Kitsu: password changed"
-            emails.send_email(subject, html, user["email"])
+            title = "Password Changed"
+            email_html_body = templates_service.generate_html_body(title, html)
+            emails.send_email(subject, email_html_body, user["email"])
             return {"success": True}
 
         except auth.PasswordsNoMatchException:
@@ -778,15 +775,11 @@ This link will expire after 2 hours. After, you have to do a new request to rese
 This email was sent at this date: {time_string}.
 The IP of the person who requested this is: {person_IP}.
 </p>
-
-Thank you and see you soon on Kitsu,
-</p>
-<p>
-{organisation["name"]} Team
-</p>
 """
         subject = f"{organisation['name']} - Kitsu: password recovery"
-        emails.send_email(subject, html, args["email"])
+        title = "Password Recovery"
+        email_html_body = templates_service.generate_html_body(title, html)
+        emails.send_email(subject, email_html_body, args["email"])
         return {"success": "Reset token sent"}
 
 

{zou-0.20.78 → zou-0.20.80}/zou/app/blueprints/comments/resources.py

@@ -498,8 +498,10 @@ class ReplyCommentResource(Resource, ArgsMixin):
         if comment["person_id"] != current_user["id"]:
             if permissions.has_client_permissions():
                 author = persons_service.get_person(comment["person_id"])
-                if current_user["studio_id"] != author["studio_id"] and \
-                    author["role"] == "client":
+                if (
+                    current_user["studio_id"] != author["studio_id"]
+                    and author["role"] == "client"
+                ):
                     raise permissions.PermissionDenied()
             user_service.check_task_action_access(task_id)
 
@@ -510,9 +512,7 @@ class ReplyCommentResource(Resource, ArgsMixin):
         )
         files = request.files
         return comments_service.reply_comment(
-            comment_id,
-            args["text"],
-            files=files
+            comment_id, args["text"], files=files
         )
 
 

{zou-0.20.78 → zou-0.20.80}/zou/app/blueprints/files/resources.py

@@ -2575,4 +2575,4 @@ class GuessFromPathResource(Resource, ArgsMixin):
                 },
                 ["sep", "/"],
             ]
-        )
+        )

{zou-0.20.78 → zou-0.20.80}/zou/app/blueprints/persons/resources.py

@@ -14,6 +14,7 @@ from zou.app.services import (
     time_spents_service,
     shots_service,
     user_service,
+    templates_service,
 )
 from zou.app.utils import (
     permissions,
@@ -1398,17 +1399,18 @@ class ChangePasswordForPersonResource(Resource, ArgsMixin):
             html = f"""<p>Hello {person["first_name"]},</p>
 <p>
 Your password was changed at this date: {time_string}.
-The IP of the user who changed your password is: {person_IP}.
-If you don't know the person who changed the password, please contact our support team.
 </p>
-Thank you and see you soon on Kitsu,
+<p>
+The IP of the user who changed your password is: {person_IP}.
 </p>
 <p>
-{organisation["name"]} Team
+If you don't know the person who changed the password, please contact our support team.
 </p>
 """
             subject = f"{organisation['name']} - Kitsu: password changed"
-            emails.send_email(subject, html, person["email"])
+            title = "Password Changed"
+            email_html_body = templates_service.generate_html_body(title, html)
+            emails.send_email(subject, email_html_body, person["email"])
             return {"success": True}
 
         except auth.PasswordsNoMatchException:
@@ -1497,17 +1499,18 @@ class DisableTwoFactorAuthenticationPersonResource(Resource, ArgsMixin):
             html = f"""<p>Hello {person["first_name"]},</p>
 <p>
 Your two factor authentication was disabled at this date: {time_string}.
-The IP of the user who disabled your two factor authentication is: {person_IP}.
-If you don't know the person who disabled the two factor authentication, please contact our support team.
 </p>
-Thank you and see you soon on Kitsu,
+<p>
+The IP of the user who disabled your two factor authentication is: {person_IP}.
 </p>
 <p>
-{organisation["name"]} Team
+If you don't know the person who disabled the two factor authentication, please contact our support team.
 </p>
 """
             subject = f"{organisation['name']} - Kitsu: two factor authentication disabled"
-            emails.send_email(subject, html, person["email"])
+            title = "Two Factor Authentication Disabled"
+            email_html_body = templates_service.generate_html_body(title, html)
+            emails.send_email(subject, email_html_body, person["email"])
             return {"success": True}
 
         except UnactiveUserException:

{zou-0.20.78 → zou-0.20.80}/zou/app/blueprints/playlists/resources.py

@@ -727,48 +727,50 @@ class TempPlaylistResource(Resource, ArgsMixin):
 
 class NotifyClientsResource(Resource, ArgsMixin):
 
-  @jwt_required()
-  def post(self, playlist_id):
-    """
-    Notify clients that given playlist is ready.
-
-    ---
-    tags:
-      - Playlists
-    parameters:
-      - in: path
-        name: playlist_id
-        required: true
-        schema:
-          type: string
-          format: uuid
-        example: a24a6ea4-ce75-4665-a070-57453082c25
-    requestBody:
-      required: true
-      content:
-        application/json:
-          schema:
-            type: object
-            properties:
-              studio_id:
-                type: string
-                format: uuid
-                example: a24a6ea4-ce75-4665-a070-57453082c25
-    responses:
-      '200':
-        description: Clients notified
-        content:
-          application/json:
+    @jwt_required()
+    def post(self, playlist_id):
+        """
+        Notify clients that given playlist is ready.
+
+        ---
+        tags:
+          - Playlists
+        parameters:
+          - in: path
+            name: playlist_id
+            required: true
             schema:
-              type: object
-              properties:
-                status:
-                  type: string
-                  example: success
-    """
-    studio_id = request.json.get("studio_id", None)
-    playlist = playlists_service.get_playlist(playlist_id)
-    project_id = playlist["project_id"]
-    user_service.check_manager_project_access(project_id)
-    notifications_service.notify_clients_playlist_ready(playlist, studio_id)
-    return {"status": "success"}
+              type: string
+              format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
+        requestBody:
+          required: true
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  studio_id:
+                    type: string
+                    format: uuid
+                    example: a24a6ea4-ce75-4665-a070-57453082c25
+        responses:
+          '200':
+            description: Clients notified
+            content:
+              application/json:
+                schema:
+                  type: object
+                  properties:
+                    status:
+                      type: string
+                      example: success
+        """
+        studio_id = request.json.get("studio_id", None)
+        playlist = playlists_service.get_playlist(playlist_id)
+        project_id = playlist["project_id"]
+        user_service.check_manager_project_access(project_id)
+        notifications_service.notify_clients_playlist_ready(
+            playlist, studio_id
+        )
+        return {"status": "success"}

{zou-0.20.78 → zou-0.20.80}/zou/app/blueprints/user/resources.py

@@ -594,7 +594,6 @@ class DoneResource(Resource):
 
 class FiltersResource(Resource, ArgsMixin):
 
-
     def get(self):
         """
         Get filters
@@ -701,7 +700,6 @@ class FiltersResource(Resource, ArgsMixin):
 
 class FilterResource(Resource, ArgsMixin):
 
-
     def put(self, filter_id):
         """
         Update filter

{zou-0.20.78 → zou-0.20.80}/zou/app/services/auth_service.py

@@ -14,7 +14,7 @@ from ldap3.core.exceptions import (
     LDAPInvalidCredentialsResult,
 )
 
-from zou.app.services import persons_service
+from zou.app.services import persons_service, templates_service
 from zou.app.models.person import Person
 from zou.app.services.exception import (
     EmailOTPAlreadyEnabledException,
@@ -493,17 +493,13 @@ This one time password will expire after 5 minutes. After, you will have to requ
 This email was sent at this date : {time_string}.
 The IP of the person who requested this is: {person_IP}.
 </p>
-
-Thank you and see you soon on Kitsu,
-</p>
-<p>
-{organisation["name"]} Team
-</p>
 """
     subject = (
         f"{organisation['name']} - Kitsu : your verification code is {otp}"
     )
-    emails.send_email(subject, html, person["email"])
+    title = "Your verification code"
+    email_html_body = templates_service.generate_html_body(title, html)
+    emails.send_email(subject, email_html_body, person["email"])
     return True
 
 

{zou-0.20.78 → zou-0.20.80}/zou/app/services/comments_service.py

@@ -79,7 +79,7 @@ def create_comment(
     files={},
     created_at="",
     links=[],
-    with_hashtags=True
+    with_hashtags=True,
 ):
     """
     Create a new comment and related: news, notifications and events.
@@ -136,12 +136,11 @@ def _handle_hashtags(person, task_type, task, text):
                     task_id=_task["id"],
                     text=text + f"\n\n____\nFrom {task_type['name']} task",
                     task_status_id=task_status["id"],
-                    with_hashtags=False
+                    with_hashtags=False,
                 )
     return hashtags
 
 
-
 def _check_retake_capping(task_status, task):
     if task_status["is_retake"]:
         project = projects_service.get_project(task["project_id"])
@@ -629,7 +628,7 @@ def get_comment_department_mention_ids(project_id, text):
 
 def get_comment_hashtags(text):
     """
-    Check for task type mentions (#full name) in text and returns matching 
+    Check for task type mentions (#full name) in text and returns matching
     tags. If all is present, return only all because it includes everything
     else.
     """
@@ -650,13 +649,13 @@ def filter_tasks_by_hashtags(tasks, hashtags, original_task_type):
         return [
             task
             for task in tasks
-            if task["task_type_name"].lower() != \
-                original_task_type["name"].lower()
+            if task["task_type_name"].lower()
+            != original_task_type["name"].lower()
         ]
     else:
         hashtag_map = {
             hashtag: True
-            for hashtag in hashtags 
+            for hashtag in hashtags
             if hashtag != original_task_type["name"].lower()
         }
         return [

{zou-0.20.78 → zou-0.20.80}/zou/app/services/deletion_service.py

@@ -3,6 +3,8 @@ from sqlalchemy.exc import IntegrityError
 
 
 from zou.app.models.attachment_file import AttachmentFile
+from zou.app.models.budget import Budget
+from zou.app.models.budget_entry import BudgetEntry
 from zou.app.models.comment import Comment
 from zou.app.models.desktop_login_log import DesktopLoginLog
 from zou.app.models.entity import (
@@ -346,6 +348,11 @@ def remove_project(project_id):
     for task in tasks:
         remove_task(task.id, force=True)
 
+    budgets = Budget.get_all_by(project_id=project_id)
+    for budget in budgets:
+        BudgetEntry.delete_all_by(budget_id=budget.id)
+        budget.delete()
+
     EntityLink.query.filter(
         EntityLink.entity_in_id == Entity.id,
         Entity.project_id == project_id,

{zou-0.20.78 → zou-0.20.80}/zou/app/services/emails_service.py

@@ -10,10 +10,12 @@ from zou.app.services import (
     tasks_service,
 )
 from zou.app.stores import queue_store
-from zou.app.services.template_services import generate_html_body
+from zou.app.services.templates_service import generate_html_body
 
 
-def send_notification(person_id, subject, messages, title=""):
+def send_notification(
+    person_id, subject, messages, title="", force_email=False
+):
     """
     Send email notification to given person. Use the job queue if it is
     activated.
@@ -25,7 +27,7 @@ def send_notification(person_id, subject, messages, title=""):
     discord_message = messages["discord_message"]
     email_html_body = generate_html_body(title, email_message)
 
-    if person["notifications_enabled"]:
+    if person["notifications_enabled"] or force_email:
         if config.ENABLE_JOB_QUEUE:
             queue_store.job_queue.enqueue(
                 emails.send_email,
@@ -79,7 +81,7 @@ def send_notification(person_id, subject, messages, title=""):
 
 def send_comment_notification(person_id, author_id, comment, task):
     """
-    Send a notification emali telling that a new comment was posted to person
+    Send a notification email telling that a new comment was posted to person
     matching given person id.
     """
     person = persons_service.get_person(person_id)
@@ -155,6 +157,7 @@ _%s_
                 task_status_name,
             )
 
+        title = "New Comment"
         messages = {
             "email_message": email_message,
             "slack_message": slack_message,
@@ -164,7 +167,7 @@ _%s_
             },
             "discord_message": discord_message,
         }
-        send_notification(person_id, subject, messages)
+        send_notification(person_id, subject, messages, title)
 
     return True
 
@@ -215,7 +218,7 @@ _%s_
             task_url,
             comment["text"],
         )
-
+        title = "New Mention"
         messages = {
             "email_message": email_message,
             "slack_message": slack_message,
@@ -225,7 +228,7 @@ _%s_
             },
             "discord_message": discord_message,
         }
-        return send_notification(person_id, subject, messages)
+        return send_notification(person_id, subject, messages, title)
     else:
         return True
 
@@ -273,7 +276,7 @@ def send_assignation_notification(person_id, author_id, task):
             },
             "discord_message": discord_message,
         }
-        return send_notification(person_id, subject, messages)
+        return send_notification(person_id, subject, messages, title)
     return True
 
 
@@ -372,7 +375,7 @@ _%s_
             },
             "discord_message": discord_message,
         }
-        send_notification(person_id, subject, messages)
+        send_notification(person_id, subject, messages, title)
     return True
 
 
@@ -397,25 +400,41 @@ def send_playlist_ready_notification(person_id, author_id, playlist):
         or person["notifications_mattermost_enabled"]
         or person["notifications_discord_enabled"]
     ):
+
+        playlist_url = f"{config.DOMAIN_PROTOCOL}://{config.DOMAIN_NAME}/productions/{playlist['project_id']}/"
+
         if episode is not None:
-            playlist_url = f"{config.DOMAIN_PROTOCOL}://{config.DOMAIN_NAME}/productions/{playlist['project_id']}/episodes/{episode['id']}/playlists/{playlist['id']}"
+            playlist_url += (
+                f"episodes/{episode['id']}/playlists/{playlist['id']}"
+            )
+        elif (
+            project["production_type"] == "tvshow"
+            and playlist["for_entity"] == "asset"
+        ):
+            if playlist["is_for_all"] == True:
+                playlist_url += f"episodes/all/playlists/{playlist['id']}"
+            else:
+                playlist_url += f"episodes/main/playlists/{playlist['id']}"
         else:
-            playlist_url = f"{config.DOMAIN_PROTOCOL}://{config.DOMAIN_NAME}/productions/{playlist['project_id']}/playlists/{playlist['id']}"
+            playlist_url += f"playlists/{playlist['id']}"
 
-        title = "Playlist Ready"
+        title = "New Playlist Ready"
         episode_segment = ""
         if episode is not None:
-            episode_segment = f"the episode {episode['name']} of"
-        subject = "[Kitsu] A new playlist is ready"
+            episode_segment = f"the episode {episode['name']} of "
+        subject = f'[Kitsu] The playlist {playlist["name"]} in project {project["name"]} is ready for review'
 
-        email_message = f"""<p><strong>{author["full_name"]}</strong> notifies you that playlist <a href="{playlist_url}">{playlist["name"]}</a> is ready for a review under {episode_segment} the project {project["name"]}.</p>
+        email_message = f"""<p><strong>{author["full_name"]}</strong> notifies you that playlist <a href="{playlist_url}">{playlist["name"]}</a> is ready for a review under {episode_segment}the project {project["name"]}.</p>
+        """
 
-        {len(playlist["shots"])} elements are listed in the playlist.
+        if len(playlist["shots"]) > 1:
+            email_message += f"""
+<p>{len(playlist["shots"])} elements are listed in the playlist.</p>
         """
 
-        slack_message = f"*{author['full_name']}* notifies you that a playlist <{playlist_url}|{playlist['name']}> is ready for a review under {episode_segment} the project {project['name']}."
+        slack_message = f"*{author['full_name']}* notifies you that a playlist <{playlist_url}|{playlist['name']}> is ready for a review under {episode_segment}the project {project['name']}."
 
-        discord_message = f"*{author['full_name']}* notifies you that a playlist [{playlist['name']}]({playlist_url}) is ready for a review under {episode_segment} the project {project['name']}."
+        discord_message = f"*{author['full_name']}* notifies you that a playlist [{playlist['name']}]({playlist_url}) is ready for a review under {episode_segment}the project {project['name']}."
         messages = {
             "email_message": email_message,
             "slack_message": slack_message,
@@ -425,4 +444,6 @@ def send_playlist_ready_notification(person_id, author_id, playlist):
             },
             "discord_message": discord_message,
         }
-        send_notification(person_id, subject, messages, title)
+        send_notification(
+            person_id, subject, messages, title, force_email=True
+        )

{zou-0.20.78 → zou-0.20.80}/zou/app/services/entities_service.py

@@ -376,7 +376,7 @@ def get_entity_tasks(entity):
     get_tasks = getattr(
         tasks_service, "get_tasks_for_" + entity_type_name.lower()
     )
-    return get_tasks(entity["id"])    
+    return get_tasks(entity["id"])
 
 
 def remove_entity_link(link_id):

{zou-0.20.78 → zou-0.20.80}/zou/app/services/notifications_service.py

@@ -505,8 +505,7 @@ def notify_clients_playlist_ready(playlist, studio_id=None):
     author = persons_service.get_current_user()
     project_id = playlist["project_id"]
     query = (
-        Person.query
-        .join(ProjectPersonLink)
+        Person.query.join(ProjectPersonLink)
         .filter(Person.is_bot == False)
         .filter(Person.role == "client")
         .filter(ProjectPersonLink.project_id == project_id)
@@ -529,3 +528,12 @@ def notify_clients_playlist_ready(playlist, studio_id=None):
         emails_service.send_playlist_ready_notification(
             recipient_id, author_id, playlist
         )
+        events.emit(
+            "notification:new",
+            {
+                "notification_id": notification["id"],
+                "person_id": recipient_id,
+            },
+            project_id=playlist["project_id"],
+            persist=False,
+        )

{zou-0.20.78 → zou-0.20.80}/zou/app/services/persons_service.py

@@ -18,7 +18,7 @@ from zou.app.models.time_spent import TimeSpent
 
 from zou.app import config, file_store
 from zou.app.utils import fields, events, cache, emails, date_helpers
-from zou.app.services import index_service, auth_service
+from zou.app.services import index_service, auth_service, templates_service
 from zou.app.stores import auth_tokens_store
 from zou.app.services.exception import (
     PersonNotFoundException,
@@ -441,9 +441,8 @@ def invite_person(person_id):
     auth_tokens_store.add(
         "reset-token-%s" % person["email"], token, ttl=3600 * 24 * 7
     )
-    subject = (
-        "You are invited by %s to join their Kitsu production tracker"
-        % (organisation["name"])
+    subject = "You are invited by %s to join their Kitsu platform" % (
+        organisation["name"]
     )
     params = {"email": person["email"], "token": token}
     query = urllib.parse.urlencode(params)
@@ -461,27 +460,21 @@ def invite_person(person_id):
 
     html = f"""<p>Hello {person["first_name"]},</p>
 <p>
-You are invited by {organisation["name"]} to collaborate on their Kitsu production tracker.
+You are invited by {organisation["name"]} to join their team on Kitsu.
 </p>
 <p>
 Your login is: <strong>{person["email"]}</strong>
 </p>
 <p>
-You are invited to set your password by following this link: <a href="{reset_url}">{reset_url}</a>
+Set your password to continue:
 </p>
-<p>
-This link will expire after one week. After, you have to request to reset your password.
-The invitation was sent at this date: {time_string}.
-</p>
-<p>
-Thank you and see you soon on Kitsu,
-</p>
-<p>
-{organisation["name"]} Team
+<p class="cta">
+<a class="button" href="{reset_url}">Set your password</a>
 </p>
 """
-
-    emails.send_email(subject, html, person["email"])
+    title = "Welcome to Kitsu"
+    email_html_body = templates_service.generate_html_body(title, html)
+    emails.send_email(subject, email_html_body, person["email"])
 
 
 @cache.memoize_function(120)

{zou-0.20.78 → zou-0.20.80}/zou/app/services/playlists_service.py

@@ -38,6 +38,7 @@ from zou.app.services import (
     tasks_service,
     names_service,
     persons_service,
+    templates_service,
 )
 
 from zou.app.services.exception import (
@@ -694,19 +695,17 @@ def build_playlist_job(playlist, job, shots, params, email, full, remote):
             job["id"],
         )
         html = f"""<p>Hello {person.first_name},</p>
-<p>Your playlist {playlist["name"]} is available at:
-<a href="{playlist_url}">{playlist_url}</a>
+<p>Your playlist {playlist["name"]} build is available:
 </p>
-<p>
-Thank you and see you soon on Kitsu,
-</p>
-<p>
-{organisation["name"]} Team
+<p class="cta">
+<a href="{playlist_url}">Download Playlist Build (.mp4)</a>
 </p>
 """
 
         subject = f"{organisation['name']} - Kitsu: playlist download"
-        emails.send_email(subject, html, email)
+        title = "Playlist Download"
+        email_html_body = templates_service.generate_html_body(title, html)
+        emails.send_email(subject, email_html_body, email)
 
 
 def get_playlist_file_name(playlist):

zou-0.20.78/zou/app/services/template_services.py → zou-0.20.80/zou/app/services/templates_service.py

@@ -107,7 +107,6 @@ notification_template_end_title = """
 """
 
 
-
 def get_signature():
     """
     Build signature for Zou emails.
@@ -115,7 +114,7 @@ def get_signature():
     organisation = persons_service.get_organisation()
     return (
         """
-<p>Best,</p>
+<p>Best regards,</p>
 
 <p>%s Team</p>"""
         % organisation["name"]
@@ -123,7 +122,11 @@ def get_signature():
 
 
 def generate_html_body(title, message):
-    return notification_template_begin + \
-            title + notification_template_end_title + \
-            message + get_signature () + \
-            notification_template_end
+    return (
+        notification_template_begin
+        + title
+        + notification_template_end_title
+        + message
+        + get_signature()
+        + notification_template_end
+    )