zou 0.19.15__py3-none-any.whl → 0.20.11__py3-none-any.whl

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/search/resources.py

@@ -78,12 +78,24 @@ class SearchResource(Resource, ArgsMixin):
                 query, limit=limit, offset=offset
             )
         if "assets" in index_names:
-            results["assets"] = index_service.search_assets(
-                query, project_ids, limit=limit, offset=offset
-            )
+            if (
+                len(project_ids) == 0
+                and not permissions.has_admin_permissions()
+            ):
+                results["assets"] = []
+            else:
+                results["assets"] = index_service.search_assets(
+                    query, project_ids, limit=limit, offset=offset
+                )
         if "shots" in index_names:
-            results["shots"] = index_service.search_shots(
-                query, project_ids, limit=limit, offset=offset
-            )
+            if (
+                len(project_ids) == 0
+                and not permissions.has_admin_permissions()
+            ):
+                results["shots"] = []
+            else:
+                results["shots"] = index_service.search_shots(
+                    query, project_ids, limit=limit, offset=offset
+                )
 
         return results

zou/app/blueprints/shots/__init__.py

@@ -42,6 +42,7 @@ from zou.app.blueprints.shots.resources import (
     EpisodeAssetTasksResource,
     SequenceShotTasksResource,
     ProjectQuotasResource,
+    SetShotsFramesResource,
 )
 
 routes = [
@@ -94,6 +95,10 @@ routes = [
         "/data/projects/<project_id>/quotas/<task_type_id>",
         ProjectQuotasResource,
     ),
+    (
+        "/actions/projects/<project_id>/task-types/<task_type_id>/set-shot-nb-frames",
+        SetShotsFramesResource,
+    ),
 ]
 
 

zou/app/blueprints/shots/resources.py

@@ -18,6 +18,9 @@ from zou.app.services import (
 
 from zou.app.mixin import ArgsMixin
 from zou.app.utils import fields, query, permissions
+from zou.app.services.exception import (
+    WrongParameterException,
+)
 
 
 class ShotResource(Resource, ArgsMixin):
@@ -47,6 +50,52 @@ class ShotResource(Resource, ArgsMixin):
         user_service.check_entity_access(shot["id"])
         return shot
 
+    @jwt_required()
+    def put(self, shot_id):
+        """
+        Update given shot.
+        ---
+        tags:
+        - Shots
+        parameters:
+          - in: path
+            name: shot_id
+            required: True
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+          - in: body
+            name: data
+            required: True
+            type: object
+        responses:
+            200:
+                description: Update given shot
+        """
+        shot = shots_service.get_shot(shot_id)
+        user_service.check_manager_project_access(shot["project_id"])
+        data = request.json
+        if data is None:
+            raise WrongParameterException(
+                "Data are empty. Please verify that you sent JSON data and"
+                " that you set the right headers."
+            )
+        for field in [
+            "id",
+            "created_at",
+            "updated_at",
+            "instance_casting",
+            "project_id",
+            "entities_in",
+            "entities_out",
+            "type",
+            "shotgun_id",
+            "created_by",
+        ]:
+            data.pop(field, None)
+
+        return shots_service.update_shot(shot_id, data)
+
     @jwt_required()
     def delete(self, shot_id):
         """
@@ -1506,19 +1555,100 @@ class ProjectQuotasResource(Resource, ArgsMixin):
             type: string
             format: UUID
             x-example: a24a6ea4-ce75-4665-a070-57453082c25
+          - in: query
+            name: count_mode
+            required: True
+            type: string
+            enum: [weighted, weigtheddone, feedback, done]
+            x-example: weighted
+          - in: query
+            name: studio_id
+            required: False
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
                 description: Quotas statistics for shots
         """
         projects_service.get_project(project_id)
         user_service.check_project_access(project_id)
-        detail_level = self.get_text_parameter("detail")
-        weighted = self.get_bool_parameter("weighted", default="true")
+        args = self.get_args(
+            [
+                ("count_mode", "weighted", False, str),
+                ("studio_id", None, False, str),
+            ]
+        )
+        count_mode = args["count_mode"]
+        studio_id = args["studio_id"]
+
+        if count_mode not in ["weighted", "weighteddone", "feedback", "done"]:
+            raise WrongParameterException(
+                "count_mode must be equal to weighted, weigtheddone, feedback"
+                ", or done"
+            )
+
+        feedback = "done" not in count_mode
+        weighted = "weighted" in count_mode
+
         if weighted:
             return shots_service.get_weighted_quotas(
-                project_id, task_type_id, detail_level
+                project_id,
+                task_type_id,
+                feedback=feedback,
+                studio_id=studio_id,
             )
         else:
             return shots_service.get_raw_quotas(
-                project_id, task_type_id, detail_level
+                project_id,
+                task_type_id,
+                feedback=feedback,
+                studio_id=studio_id,
             )
+
+
+class SetShotsFramesResource(Resource, ArgsMixin):
+    @jwt_required()
+    def post(self, project_id, task_type_id):
+        """
+        Set frames for given shots.
+        ---
+        tags:
+        - Shots
+        parameters:
+          - in: formData
+            name: shots
+            required: True
+            type: array
+            items:
+              type: object
+              properties:
+                shot_id:
+                  type: string
+                  format: UUID
+                  x-example: a24a6ea4-ce75-4665-a070-57453082c25
+                nb_frames:
+                  type: integer
+                  x-example: 24
+        responses:
+            200:
+                description: Frames set for given shots
+        """
+        user_service.check_manager_project_access(project_id)
+        if not fields.is_valid_id(task_type_id) or not fields.is_valid_id(
+            project_id
+        ):
+            raise WrongParameterException("Invalid project or task type id")
+
+        episode_id = self.get_episode_id()
+        if not episode_id in ["", None] and not fields.is_valid_id(episode_id):
+            raise WrongParameterException("Invalid episode id")
+
+        if episode_id == "":
+            episode_id = None
+
+        return shots_service.set_frames_from_task_type_preview_files(
+            project_id,
+            task_type_id,
+            episode_id=episode_id,
+        )

zou/app/blueprints/source/__init__.py

@@ -80,9 +80,9 @@ from zou.app.blueprints.source.kitsu import (
     ImportKitsuTasksResource,
 )
 
-from zou.app.blueprints.source.edl import (
-    EDLImportResource,
-    EDLImportEpisodeResource,
+from zou.app.blueprints.source.otio import (
+    OTIOImportResource,
+    OTIOImportEpisodeResource,
 )
 
 routes = [
@@ -133,10 +133,10 @@ routes = [
         "/import/csv/projects/<project_id>/episodes/<episode_id>/task-types/<task_type_id>/estimations",
         TaskTypeEstimationsEpisodeCsvImportResource,
     ),
-    ("/import/edl/projects/<project_id>", EDLImportResource),
+    ("/import/otio/projects/<project_id>", OTIOImportResource),
     (
-        "/import/edl/projects/<project_id>/episodes/<episode_id>",
-        EDLImportEpisodeResource,
+        "/import/otio/projects/<project_id>/episodes/<episode_id>",
+        OTIOImportEpisodeResource,
     ),
     ("/import/kitsu/comments", ImportKitsuCommentsResource),
     ("/import/kitsu/entities", ImportKitsuEntitiesResource),

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

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

@@ -21,7 +21,7 @@ from zou.app.services.tasks_service import (
 )
 from zou.app.services.comments_service import create_comment
 from zou.app.services.exception import WrongParameterException
-from zou.app.utils import events
+from zou.app.utils import events, string
 
 
 class EditsCsvImportResource(BaseCsvProjectImportResource):
@@ -192,9 +192,16 @@ class EditsCsvImportResource(BaseCsvProjectImportResource):
         else:
             edit_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:
-                edit_new_values["data"][field_name] = row[name]
+                if descriptor["data_type"] == "boolean":
+                    edit_new_values["data"][descriptor["field_name"]] = (
+                        "true" if string.strtobool(row[name]) else "false"
+                    )
+                else:
+                    edit_new_values["data"][descriptor["field_name"]] = row[
+                        name
+                    ]
 
         tasks_update = self.get_tasks_update(row)
 

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

@@ -21,7 +21,7 @@ from zou.app.services.tasks_service import (
 )
 from zou.app.services.comments_service import create_comment
 from zou.app.services.exception import WrongParameterException
-from zou.app.utils import events
+from zou.app.utils import events, string
 
 
 class ShotsCsvImportResource(BaseCsvProjectImportResource):
@@ -229,9 +229,16 @@ class ShotsCsvImportResource(BaseCsvProjectImportResource):
         if fps is not None:
             shot_new_values["data"]["fps"] = fps
 
-        for name, field_name in self.descriptor_fields.items():
+        for name, descriptor in self.descriptor_fields.items():
             if name in row:
-                shot_new_values["data"][field_name] = row[name]
+                if descriptor["data_type"] == "boolean":
+                    shot_new_values["data"][descriptor["field_name"]] = (
+                        "true" if string.strtobool(row[name]) else "false"
+                    )
+                else:
+                    shot_new_values["data"][descriptor["field_name"]] = row[
+                        name
+                    ]
 
         tasks_update = self.get_tasks_update(row)
 

zou/app/blueprints/source/{edl.py → otio.py}

@@ -1,12 +1,12 @@
 import os
-import uuid
+import pathlib
 import opentimelineio as otio
 import re
 
 from string import Template
 
 from flask import request, current_app
-from flask_restful import Resource
+from flask_restful import Resource, inputs
 from flask_jwt_extended import jwt_required
 
 from zou.app import config
@@ -40,26 +40,26 @@ mapping_substitutions_to_regex = {
 }
 
 
-class EDLBaseResource(Resource, ArgsMixin):
+class OTIOBaseResource(Resource, ArgsMixin):
     @jwt_required()
     def post(self, project_id, episode_id=None):
         args = self.post_args()
         user_service.check_manager_project_access(project_id)
         uploaded_file = request.files["file"]
-        file_name = "%s.edl" % uuid.uuid4()
+        file_name = uploaded_file.filename
         file_path = os.path.join(config.TMP_DIR, file_name)
         uploaded_file.save(file_path)
-        self.prepare_import(
-            project_id,
-            episode_id,
-            args["naming_convention"],
-            args["match_case"],
-        )
         try:
-            result = self.run_import(project_id, file_path)
+            result = self.run_import(
+                file_path,
+                project_id,
+                episode_id,
+                args["naming_convention"],
+                args["match_case"],
+            )
         except Exception as e:
             current_app.logger.error(
-                f"Import EDL failed: {type(e).__name__}: {str(e)}"
+                f"Import OTIO failed: {type(e).__name__}: {str(e)}"
             )
             return {
                 "error": True,
@@ -121,25 +121,50 @@ class EDLBaseResource(Resource, ArgsMixin):
                 key = key.lower()
             self.shot_map[key] = shot["id"]
 
-    def run_import(self, project_id, file_path):
+    def run_import(
+        self,
+        file_path,
+        project_id,
+        episode_id,
+        naming_convention,
+        match_case,
+    ):
         result = {"updated_shots": [], "created_shots": []}
         try:
-            with open(file_path, "r+", errors="replace") as edl_file:
-                contents = edl_file.read()
-                edl_file.seek(0)
-                edl_file.write(contents)
-
-            timeline = otio.adapters.read_from_file(
-                file_path,
-                rate=projects_service.get_project_fps(project_id),
-                ignore_timecode_mismatch=True,
-            )
+            kwargs = {}
+            extension = pathlib.Path(file_path).suffix
+            if extension == ".edl":
+                kwargs["rate"] = projects_service.get_project_fps(project_id)
+                kwargs["ignore_timecode_mismatch"] = True
+            timeline = otio.adapters.read_from_file(file_path, **kwargs)
         except Exception as e:
-            raise Exception("Failed to parse EDL file: %s" % str(e))
+            raise Exception(f"Failed to parse OTIO file: {str(e)}")
+
+        self.prepare_import(
+            project_id,
+            episode_id,
+            naming_convention,
+            match_case,
+        )
         for video_track in timeline.video_tracks():
             for track in video_track:
                 if isinstance(track, otio.schema.Clip):
-                    name, _ = os.path.splitext(track.name)
+                    name = os.path.splitext(track.name)[0]
+                    if not name:
+                        if getattr(track.media_reference, "name_prefix", None):
+                            name = track.media_reference.name_prefix
+                        elif getattr(track.media_reference, "name", None):
+                            name, _ = os.path.splitext(
+                                track.media_reference.name
+                            )[0]
+                        elif getattr(
+                            track.media_reference, "target_url", None
+                        ):
+                            name, _ = os.path.splitext(
+                                os.path.basename(
+                                    track.media_reference.target_url
+                                )
+                            )[0]
                     name_to_search = name if self.match_case else name.lower()
                     if name_to_search in self.shot_map:
                         shot_id = self.shot_map[name_to_search]
@@ -184,19 +209,31 @@ class EDLBaseResource(Resource, ArgsMixin):
 
                     data = future_shot_values["data"] or {}
                     try:
-                        data["frame_in"] = (
-                            track.trimmed_range_in_parent().start_time.to_frames()
-                        )
+                        try:
+                            data["frame_in"] = (
+                                track.trimmed_range_in_parent().start_time.to_frames()
+                            )
+                        except:
+                            data["frame_in"] = (
+                                track.trimmed_range().start_time.to_frames()
+                            )
                     except Exception as e:
                         current_app.logger.error(
                             f"Parsing frame_in failed: {type(e).__name__}: {str(e)}"
                         )
                     try:
-                        data["frame_out"] = (
-                            track.trimmed_range_in_parent()
-                            .end_time_inclusive()
-                            .to_frames()
-                        )
+                        try:
+                            data["frame_out"] = (
+                                track.trimmed_range_in_parent()
+                                .end_time_inclusive()
+                                .to_frames()
+                            )
+                        except:
+                            data["frame_out"] = (
+                                track.trimmed_range()
+                                .end_time_inclusive()
+                                .to_frames()
+                            )
                     except Exception as e:
                         current_app.logger.error(
                             f"Parsing frame_out failed: {type(e).__name__}: {str(e)}"
@@ -231,11 +268,13 @@ class EDLBaseResource(Resource, ArgsMixin):
         return result
 
 
-class EDLImportResource(EDLBaseResource):
+class OTIOImportResource(OTIOBaseResource):
     @jwt_required()
     def post(self, **kwargs):
         """
-        Import an EDL file to enter frame_in / frame_out / nb_frames.
+        Import an OTIO file to enter frame_in / frame_out / nb_frames (it can
+        be every adapter supported by OpenTimelineIO, for example: EDL, OTIO...
+        ).
         ---
         tags:
           - Import
@@ -256,7 +295,7 @@ class EDLImportResource(EDLBaseResource):
             201:
                 description: .
             400:
-                description: The .EDL file is not properly formatted.
+                description: The .otio file is not properly formatted.
         """
         return super().post(**kwargs)
 
@@ -269,16 +308,18 @@ class EDLImportResource(EDLBaseResource):
                     False,
                     str,
                 ),
-                ("match_case", True, False, bool),
+                ("match_case", True, False, inputs.boolean),
             ]
         )
 
 
-class EDLImportEpisodeResource(EDLBaseResource):
+class OTIOImportEpisodeResource(OTIOBaseResource):
     @jwt_required()
     def post(self, **kwargs):
         """
-        Import an EDL file to enter frame_in / frame_out / nb_frames.
+        Import an OTIO file to enter frame_in / frame_out / nb_frames (it can
+        be every adapter supported by OpenTimelineIO, for example: edl, otio...
+        ).
         ---
         tags:
           - Import
@@ -305,7 +346,7 @@ class EDLImportEpisodeResource(EDLBaseResource):
             201:
                 description: .
             400:
-                description: The .EDL file is not properly formatted.
+                description: The .otio file is not properly formatted.
         """
         return super().post(**kwargs)
 
@@ -318,6 +359,6 @@ class EDLImportEpisodeResource(EDLBaseResource):
                     False,
                     str,
                 ),
-                ("match_case", True, False, bool),
+                ("match_case", True, False, inputs.boolean),
             ]
         )

zou/app/blueprints/tasks/__init__.py

@@ -35,11 +35,13 @@ from zou.app.blueprints.tasks.resources import (
     SetTaskMainPreviewResource,
     PersonsTasksDatesResource,
     CreateConceptTasksResource,
+    OpenTasksStatsResource,
 )
 
 
 routes = [
     ("/data/tasks/open-tasks", OpenTasksResource),
+    ("/data/tasks/open-tasks/stats", OpenTasksStatsResource),
     ("/data/tasks/<task_id>/comments", TaskCommentsResource),
     ("/data/tasks/<task_id>/comments/<comment_id>", TaskCommentResource),
     ("/data/tasks/<task_id>/previews", TaskPreviewsResource),
@@ -92,8 +94,7 @@ routes = [
         AddPreviewResource,
     ),
     (
-        "/actions/tasks/<task_id>/comments/<comment_id>/preview-files/"
-        "<preview_file_id>",
+        "/actions/tasks/<task_id>/comments/<comment_id>/preview-files/<preview_file_id>",
         AddExtraPreviewResource,
     ),
     ("/actions/tasks/<task_id>/to-review", ToReviewResource),