zou 0.20.70__tar.gz → 0.20.72__tar.gz

{zou-0.20.70/zou.egg-info → zou-0.20.72}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zou
-Version: 0.20.70
+Version: 0.20.72
 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.72/zou/__init__.py

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

{zou-0.20.70 → zou-0.20.72}/zou/app/blueprints/comments/resources.py

@@ -326,9 +326,6 @@ class AddAttachmentToCommentResource(Resource):
             name: reply_id
             type: uuid
             example: a24a6ea4-ce75-4665-a070-57453082c25
-            required: True
-            format: uuid
-            example: a24a6ea4-ce75-4665-a070-57453082c25
           - in: formData
             name: files
             type: file

{zou-0.20.70 → zou-0.20.72}/zou/app/services/assets_service.py

@@ -567,7 +567,12 @@ def is_asset_type(entity_type):
     """
     Returns true if given entity type is an asset, not a shot.
     """
-    return str(entity_type.id) not in get_temporal_type_ids()
+    entity_type_id = ""
+    if isinstance(entity_type, dict):
+        entity_type_id = entity_type.get("id", "")
+    else:
+        entity_type_id = str(entity_type.id)
+    return entity_type_id not in get_temporal_type_ids()
 
 
 def create_asset_types(asset_type_names):

{zou-0.20.70 → zou-0.20.72}/zou/app/services/comments_service.py

@@ -79,14 +79,18 @@ def create_comment(
     files={},
     created_at="",
     links=[],
+    with_hashtags=True
 ):
     """
     Create a new comment and related: news, notifications and events.
     """
+    related_tasks = []
+    author = _get_comment_author(person_id)
     task = tasks_service.get_task(task_id, relations=True)
     task_status = tasks_service.get_task_status(task_status_id)
-    author = _get_comment_author(person_id)
+    task_type = tasks_service.get_task_type(task["task_type_id"])
     _check_retake_capping(task_status, task)
+
     comment = new_comment(
         task_id=task_id,
         object_type="Task",
@@ -98,6 +102,10 @@ def create_comment(
         created_at=created_at,
         links=links,
     )
+
+    if with_hashtags:
+        _handle_hashtags(author, task_type, task, text)
+
     task, status_changed = _manage_status_change(task_status, task, comment)
     _manage_subscriptions(task, comment, status_changed)
     comment["task_status"] = task_status
@@ -108,9 +116,32 @@ def create_comment(
     )
     for automation in status_automations:
         _run_status_automation(automation, task, person_id)
+
     return comment
 
 
+def _handle_hashtags(person, task_type, task, text):
+    hashtags = get_comment_hashtags(text)
+    if len(hashtags) > 0:
+        entity = entities_service.get_entity(entity_id=task["entity_id"])
+        tasks = entities_service.get_entity_tasks(entity)
+        tasks = filter_tasks_by_hashtags(tasks, hashtags, task_type)
+        if len(tasks) > 0:
+            for _task in tasks:
+                task_status = tasks_service.get_task_status(
+                    _task["task_status_id"]
+                )
+                create_comment(
+                    person_id=person["id"],
+                    task_id=_task["id"],
+                    text=text + f"\n\n____\nFrom {task_type['name']} task",
+                    task_status_id=task_status["id"],
+                    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"])
@@ -493,27 +524,26 @@ def reply_comment(comment_id, text, person_id=None, files={}):
     replies = list(comment.replies)
     replies.append(reply)
     comment.update({"replies": replies})
+    comment_dict = comment.serialize(relations=True)
     if len(files.keys()) > 0:
-        comment = comment.serialize(relations=True)
         new_attachment_files = add_attachments_to_comment(
-            comment, files, reply_id=reply["id"]
+            comment_dict, files, reply_id=reply["id"]
         )
         for new_attachment_file in new_attachment_files:
             new_attachment_file["reply_id"] = reply["id"]
         reply["attachment_files"] = new_attachment_files
     tasks_service.clear_comment_cache(comment_id)
-    comment = comment.serialize(relations=True)
     events.emit(
         "comment:reply",
         {
             "task_id": task["id"],
-            "comment_id": comment,
+            "comment_id": comment_id,
             "reply_id": reply["id"],
         },
         project_id=task["project_id"],
     )
     notifications_service.create_notifications_for_task_and_reply(
-        task, comment, reply
+        task, comment_dict, reply
     )
     return reply
 
@@ -594,12 +624,51 @@ 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 
+    tags. If all is present, return only all because it includes everything
+    else.
+    """
+    hashtags = [
+        hashtag[1:].lower()
+        for hashtag in re.findall("#[a-zA-Z]*", text, re.IGNORECASE)
+    ]
+    if "all" in hashtags:
+        return ["all"]
+    return list(set(hashtags))
+
+
+def filter_tasks_by_hashtags(tasks, hashtags, original_task_type):
+    """
+    Filter tasks based on hashtags, excluding specified task types.
+    """
+    if "all" in hashtags:
+        return [
+            task
+            for task in tasks
+            if task["task_type_name"].lower() != \
+                original_task_type["name"].lower()
+        ]
+    else:
+        hashtag_map = {
+            hashtag: True
+            for hashtag in hashtags 
+            if hashtag != original_task_type["name"].lower()
+        }
+        return [
+            task
+            for task in tasks
+            if hashtag_map.get(task["task_type_name"].lower(), False)
+        ]
+
+
 def add_attachments_to_comment(comment, files, reply_id=None):
     """
     Create an attachment entry and for each given uploaded files and tie it
     to given comment.
     """
-    if comment["attachment_files"] is None:
+    if comment.get("attachment_files", None) is None:
         comment["attachment_files"] = []
     new_attachment_files = []
     for uploaded_file in files.values():

{zou-0.20.70 → zou-0.20.72}/zou/app/services/deletion_service.py

@@ -118,6 +118,10 @@ def remove_task(task_id, force=False):
         for subscription in subscriptions:
             subscription.delete()
 
+        working_files = WorkingFile.query.filter_by(task_id=task_id)
+        for working_file in working_files:
+            working_file.delete()
+
         preview_files = PreviewFile.query.filter_by(task_id=task_id)
         for preview_file in preview_files:
             remove_preview_file(preview_file)

{zou-0.20.70 → zou-0.20.72}/zou/app/services/entities_service.py

@@ -1,10 +1,12 @@
 from zou.app.services import (
+    assets_service,
     base_service,
     projects_service,
     notifications_service,
     assets_service,
     shots_service,
     edits_service,
+    tasks_service,
 )
 from zou.app.utils import (
     date_helpers,
@@ -363,6 +365,20 @@ def get_entities_and_tasks(criterions={}):
     return list(entity_map.values())
 
 
+def get_entity_tasks(entity):
+    """
+    Get all tasks for a given entity.
+    """
+    entity_type = get_entity_type(entity_type_id=entity["entity_type_id"])
+    entity_type_name = entity_type["name"]
+    if assets_service.is_asset_type(entity_type):
+        entity_type_name = "Asset"
+    get_tasks = getattr(
+        tasks_service, "get_tasks_for_" + entity_type_name.lower()
+    )
+    return get_tasks(entity["id"])    
+
+
 def remove_entity_link(link_id):
     try:
         link = EntityLink.get_by(id=link_id)

{zou-0.20.70 → zou-0.20.72/zou.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zou
-Version: 0.20.70
+Version: 0.20.72
 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.70/zou/__init__.py

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