zou 0.20.74__py3-none-any.whl → 0.20.76__py3-none-any.whl

zou/__init__.py

@@ -1 +1 @@
-__version__ = "0.20.74"
+__version__ = "0.20.76"

zou/app/blueprints/files/resources.py

@@ -202,11 +202,6 @@ class WorkingFileFileResource(Resource):
 
 
 class WorkingFilePathResource(Resource, ArgsMixin):
-    """
-    Generate from file tree template a working file path based on several
-    parameters: task, software, mode, revision and separator. Revision can be
-    computed automatically as next revision if not given.
-    """
 
     @jwt_required()
     def post(self, task_id):
@@ -215,7 +210,7 @@ class WorkingFilePathResource(Resource, ArgsMixin):
         ---
         tags:
           - Files
-        description: Generate file path based on several parameters: task, software, mode, revision and separator.
+        description: Generate file path based on several parameters
                      Revision can be computed automatically as next revision if not given.
         parameters:
           - in: path
@@ -338,12 +333,6 @@ class WorkingFilePathResource(Resource, ArgsMixin):
 
 
 class EntityOutputFilePathResource(Resource, ArgsMixin):
-    """
-    Generate from file tree template an output file path based on several
-    parameters: entity, output type, task type, revision, mode, name
-    and separator. Revision can be computed automatically as next revision if
-    not given.
-    """
 
     @jwt_required()
     def post(self, entity_id):
@@ -352,7 +341,7 @@ class EntityOutputFilePathResource(Resource, ArgsMixin):
         ---
         tags:
           - Files
-        description: Generate file path based on several parameters: entity, output type, task type, revision, mode, name and separator.
+        description: Generate file path based on several parameters entity, output type, task type, revision, mode, name and separator.
                      Revision can be computed automatically as next revision if not given.
         parameters:
           - in: path
@@ -474,11 +463,6 @@ class EntityOutputFilePathResource(Resource, ArgsMixin):
 
 
 class InstanceOutputFilePathResource(Resource, ArgsMixin):
-    """
-    Generate from file tree template an output file path based on several
-    parameters: asset instance, output type, task type, revision, mode, name and separator.
-    Revision can be computed automatically as next revision in case no revision is given in parameter.
-    """
 
     @jwt_required()
     def post(self, asset_instance_id, temporal_entity_id):
@@ -487,7 +471,7 @@ class InstanceOutputFilePathResource(Resource, ArgsMixin):
         ---
         tags:
         - Files
-        description: "Generate file path based on several parameters: asset instance, output type, task type, revision, mode, name and separator.
+        description: "Generate file path based on several parameters asset instance, output type, task type, revision, mode, name and separator.
                      Revision can be computed automatically as next revision in case no revision is given in parameter."
         parameters:
           - in: path
@@ -991,17 +975,6 @@ class CommentWorkingFileResource(Resource, ArgsMixin):
 
 
 class NewEntityOutputFileResource(Resource, ArgsMixin):
-    """
-    Output files are linked to entities. Each time a CG artist is satisfied
-    by what he did on a working file, he can create an output file that
-    will be linked to a target entity (an asset, a shot, a sequence, ...).
-    It keeps track of the working file at the origin of the output file.
-    An output type is required for better categorization (textures, caches,
-    ...). A task type can be set too to give the department related to the
-    output file.
-
-    Revision is automatically set.
-    """
 
     @jwt_required()
     def post(self, entity_id):
@@ -2602,4 +2575,4 @@ class GuessFromPathResource(Resource, ArgsMixin):
                 },
                 ["sep", "/"],
             ]
-        )
+        )

zou/app/blueprints/projects/resources.py

@@ -2159,12 +2159,21 @@ class ProductionDayOffsResource(Resource, ArgsMixin):
           '400':
             description: Invalid date range parameters
         """
-        user_service.check_manager_project_access(project_id)
+        user_service.check_project_access(project_id)
+        if (
+            permissions.has_client_permissions()
+            or permissions.has_vendor_permissions()
+        ):
+            raise permissions.PermissionDenied
         arguments = self.get_args(["start_date", "end_date"])
         start_date, end_date = arguments["start_date"], arguments["end_date"]
         try:
             return time_spents_service.get_day_offs_between_for_project(
-                project_id, start_date, end_date
+                project_id,
+                start_date,
+                end_date,
+                safe=permissions.has_manager_permissions(),
+                current_user_id=persons_service.get_current_user()["id"],
             )
         except WrongDateFormatException:
             abort(

zou/app/blueprints/user/resources.py

@@ -1232,9 +1232,9 @@ class TaskSubscribeResource(Resource):
         tags:
         - User
         description: It applies to given task and current user. When a user
-        subscribed, he gets notified everytime a comment is posted on the task.
-        When a user subscribes, he gets notified everytime a
-            comment is posted on the task.
+            subscribed, he gets notified everytime a comment is posted on the
+            task. When a user subscribes, he gets notified everytime a comment 
+            is posted on the task.
         parameters:
           - in: path
             name: task_id

zou/app/models/day_off.py

@@ -19,3 +19,6 @@ class DayOff(db.Model, BaseMixin, SerializerMixin):
         db.UniqueConstraint("person_id", "date", name="day_off_uc"),
         db.CheckConstraint("date <= end_date", name="day_off_date_check"),
     )
+
+    def serialize_safe(self, **kwargs):
+        return self.serialize(ignored_attrs=["description"], **kwargs)

zou/app/models/person.py

@@ -183,24 +183,25 @@ class Person(db.Model, BaseMixin, SerializerMixin):
                 for credential in self.fido_credentials
             ]
 
-    def serialize(
-        self, obj_type="Person", relations=False, milliseconds=False
-    ):
-        data = SerializerMixin.serialize(
-            self, obj_type, relations=relations, milliseconds=milliseconds
-        )
-        data["fido_devices"] = self.fido_devices()
+    def serialize(self, **kwargs):
+        data = super().serialize(**kwargs)
+        if "fido_devices" not in kwargs.get("ignored_attrs", []):
+            data["fido_devices"] = self.fido_devices()
         return data
 
-    def serialize_safe(self, relations=False, milliseconds=False):
-        data = self.serialize(relations=relations, milliseconds=milliseconds)
-        del data["password"]
-        del data["totp_secret"]
-        del data["email_otp_secret"]
-        del data["otp_recovery_codes"]
-        del data["fido_credentials"]
-        del data["jti"]
-        return data
+    def serialize_safe(self, **kwargs):
+        return self.serialize(
+            ignored_attrs=[
+                "password",
+                "totp_secret",
+                "email_otp_secret",
+                "otp_recovery_codes",
+                "fido_credentials",
+                "fido_devices",
+                "jti",
+            ],
+            **kwargs,
+        )
 
     def present_minimal(self, relations=False, milliseconds=False):
         data = SerializerMixin.serialize(

zou/app/services/time_spents_service.py

@@ -606,7 +606,11 @@ def get_project_task_type_time_spents(
 
 
 def get_day_offs_between_for_project(
-    project_id, start_date=None, end_date=None
+    project_id,
+    start_date=None,
+    end_date=None,
+    safe=False,
+    current_user_id=None,
 ):
     """
     Get all day off entries for project, start and end date.
@@ -627,8 +631,12 @@ def get_day_offs_between_for_project(
 
         result = defaultdict(list)
         for day_off in days_offs:
-            result[str(day_off.person_id)].append(day_off.serialize())
-
+            day_off_person_id = str(day_off.person_id)
+            result[day_off_person_id].append(
+                day_off.serialize_safe()
+                if safe and current_user_id != day_off_person_id
+                else day_off.serialize()
+            )
     except DataError:
         raise WrongDateFormatException
     return dict(result)

{zou-0.20.74.dist-info → zou-0.20.76.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zou
-Version: 0.20.74
+Version: 0.20.76
 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.74.dist-info → zou-0.20.76.dist-info}/RECORD

@@ -1,4 +1,4 @@
-zou/__init__.py,sha256=XfPpnxKnarguaQf3OrkgE_t9bFlmoaJ40CFc2Edn8bo,24
+zou/__init__.py,sha256=oQkI2-XLYe_07NDsHHivOsyhCx9KoY1Lb6Q3c4NO25Q,24
 zou/cli.py,sha256=N9FyrL4TDgIiCUa-I3xIzOgiVLM14kz8_QLQ48y51oE,22767
 zou/debug.py,sha256=1fawPbkD4wn0Y9Gk0BiBFSa-CQe5agFi8R9uJYl2Uyk,520
 zou/event_stream.py,sha256=9O1PE_vDW8p3yfHJNSZ8w0ybD-660x8oGN0izgJdTjM,8575
@@ -89,7 +89,7 @@ zou/app/blueprints/export/csv/task_types.py,sha256=PCEEhOQcdOJv_38i-KNxbkGeNzmQ8
 zou/app/blueprints/export/csv/tasks.py,sha256=CHFcs9S3eLIz6psE6Q6mZ-OSur_GrpBeLn98Nh9NNcA,4121
 zou/app/blueprints/export/csv/time_spents.py,sha256=yYPtilOxfQD5mBwyh9h-PbTQBpab-vMrec35tYUw4fQ,2984
 zou/app/blueprints/files/__init__.py,sha256=7Wty30JW2OXIn-tBFXOWWmPuHnsnxPpH3jNtHvvr9tY,3987
-zou/app/blueprints/files/resources.py,sha256=G2Xal8di3LFTETT54VqOGEzXYObsln4oc3L-Lf8FpRY,84021
+zou/app/blueprints/files/resources.py,sha256=c8QF_D9sC9xmz14hX4EquGB7119tz7r8N8LJS28-GuM,82692
 zou/app/blueprints/index/__init__.py,sha256=Dh3oQiirpg8RCkfVOuk3irIjSvUvuRf0jPxE6oGubz0,828
 zou/app/blueprints/index/resources.py,sha256=nLLrFK-gJv0S_eDVPOS36xFes_3MjT3vGqDQHbI5kPk,14728
 zou/app/blueprints/news/__init__.py,sha256=HxBXjC15dVbotNAZ0CLf02iwUjxJr20kgf8_kT_9nwM,505
@@ -101,7 +101,7 @@ zou/app/blueprints/playlists/resources.py,sha256=dD50WpKkIyaDar4nfYS2GfC_5e8mncV
 zou/app/blueprints/previews/__init__.py,sha256=ihC6OQ9AUjnZ2JeMnjRh_tKGO0UmAjOwhZnOivc3BnQ,4460
 zou/app/blueprints/previews/resources.py,sha256=mRFVMl4fi4mptE1qMG68GAIg868HMiE7AFnQYnszSAU,53345
 zou/app/blueprints/projects/__init__.py,sha256=ZX59ZmMIAI11zNy_RjLacOQnEcSJdwRIr68KwOYiB2k,5918
-zou/app/blueprints/projects/resources.py,sha256=BrPwUtiMAsk8Lozph5gNHV42mj3_RIN-1iG20bp2P88,64602
+zou/app/blueprints/projects/resources.py,sha256=a3Il_DHOEx9zauUf-ifvnJADC1-KRllHvFIP5RILurM,64933
 zou/app/blueprints/search/__init__.py,sha256=QCjQIY_85l_orhdEiqav_GifjReuwsjZggN3V0GeUVY,356
 zou/app/blueprints/search/resources.py,sha256=XhNewgF4y0Tj9TIZt-2b0c5Whu43YsoeLuNZG2EHFg4,4797
 zou/app/blueprints/shots/__init__.py,sha256=EcG9qmAchlucqg1M6-RqWGfuKpa5Kq6RgyLZNSsjUr4,4225
@@ -137,7 +137,7 @@ zou/app/blueprints/source/shotgun/versions.py,sha256=8Mb35e5p3FLbbiu6AZb9tJErDKz
 zou/app/blueprints/tasks/__init__.py,sha256=udtTZJVViawRAPu8dO_OoyVzQTheLYWTHeTnrC-2RDA,4331
 zou/app/blueprints/tasks/resources.py,sha256=WVNu30pj5snz1TXjla5ZzED2CkToTNAsmJF0RcYnYBk,62938
 zou/app/blueprints/user/__init__.py,sha256=H9zCHcVobC6jq6dTToXKAjnZmDA0a9gChHiIP3BcZsc,4586
-zou/app/blueprints/user/resources.py,sha256=kyNfqkMhAQ286fQmhHV2bM5Vl9kk7Wv_52cRwxo2gpM,49508
+zou/app/blueprints/user/resources.py,sha256=JE6i2znUUXYdl2yeI0hrkF1p6RqgYjrCb9-RmSK809Q,49517
 zou/app/file_trees/default.json,sha256=ryUrEmQYE8B_WkzCoQLgmem3N9yNwMIWx9G8p3HfG9o,2310
 zou/app/file_trees/simple.json,sha256=VBI43Z3rjQxtTpVCq3ktUgS0UB8x-aTowKL9LXuXCFI,3149
 zou/app/indexer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -154,7 +154,7 @@ zou/app/models/chat_message.py,sha256=8w7xtoqCW_CRoGKrF4ba5w-oyAHIRh-2ms3p5sQQor
 zou/app/models/comment.py,sha256=aDi64Yny5RvlSDace5ydUqxI7_hhugBVnO6EvR19tAE,6040
 zou/app/models/custom_action.py,sha256=wx5ASKJ2oG-ivASZbVf1nLiL7zELgQBJ8U1jDdvGkuU,578
 zou/app/models/data_import_error.py,sha256=dCyzaX0KATa0F8h5V3sTPlXz-XNl1VNkflRfJuaCmsg,425
-zou/app/models/day_off.py,sha256=WMZs7oMhUBpMnNyvhgpl1j6egZ5J0drnrF1dH3N5cII,691
+zou/app/models/day_off.py,sha256=pG5EKnohhdTkYgSQl4h1CrGQ6Woa8b-DGmS-DL5q7pw,803
 zou/app/models/department.py,sha256=j8nxMJRE6wvqlDY68uPRephQTSny4sr06qs0wbzlkzc,2095
 zou/app/models/desktop_login_log.py,sha256=fdgqEXAQkHw6CtRU_Y-CuboaZA9QWJc9OzklvbdPBJY,546
 zou/app/models/entity.py,sha256=-pW30_KWeKll5fTrLBAQ_O24KxUL6G5E8cj6xUAY8M8,8569
@@ -170,7 +170,7 @@ zou/app/models/notification.py,sha256=1ODOymGPeB4oxgX_3WhOgIL_Lsz-JR7miDkBS6W8t_
 zou/app/models/organisation.py,sha256=R69AR1JDZSs6YeXDalmz3ewmrSMDv9Mr8AZAHn09Iu0,1365
 zou/app/models/output_file.py,sha256=hyLGrpsgrk0aisDXppRQrB7ItCwyuyw-X0ZwVAHabsA,2569
 zou/app/models/output_type.py,sha256=us_lCUCEvuP4vi_XmmOcEl1J2MtZhMX5ZheBqEFCgWA,381
-zou/app/models/person.py,sha256=EiyzAQAZ3jypRXBIAIYCexv7AacqA9JUe5rODsLUxPo,8114
+zou/app/models/person.py,sha256=GhjiXxOXMPdeDHArTbbZDQt-9LLtJpq_HFF-7WVRlaM,8047
 zou/app/models/playlist.py,sha256=YGgAk84u0_fdIEY02Dal4kfk8APVZvWFwWYV74qvrio,1503
 zou/app/models/plugin.py,sha256=zNs9Qi1h_v_6edZs5GHRSKItaAG4Gnlk1FQKumiiv68,766
 zou/app/models/preview_background_file.py,sha256=j8LgRmY7INnlB07hFwwB-8ssQrRC8vsb8VcpsTbt6tA,559
@@ -229,7 +229,7 @@ zou/app/services/status_automations_service.py,sha256=tVio7Sj7inhvKS4UOyRhcdpwr_
 zou/app/services/sync_service.py,sha256=iWxx1kOGEXympHmSBBQWtDZWNtumdxp8kppee0OefMo,41811
 zou/app/services/tasks_service.py,sha256=ZLUi6_XhLU_SLwERFHx4QwcXdS-ncrVH_rIl-Lt-9yE,69993
 zou/app/services/telemetry_services.py,sha256=xQm1h1t_JxSFW59zQGf4NuNdUi1UfMa_6pQ-ytRbmGA,1029
-zou/app/services/time_spents_service.py,sha256=h3YlhAAhfAxijmQe-32p2qZNu4h5J3lIh8fOjV0uy4Y,18394
+zou/app/services/time_spents_service.py,sha256=E0RU5dcoME1MZrxohKWmRMDTD_irwT8HUUhXHeR7kng,18635
 zou/app/services/user_service.py,sha256=inFNPsAb11odskiidXAOzNGlY5S2DvFYuYCeGGN_1lc,52990
 zou/app/stores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zou/app/stores/auth_tokens_store.py,sha256=-qOJPybLHvnMOq3PWk073OW9HJwOHGhFLZeOIlX1UVw,1290
@@ -469,9 +469,9 @@ zou/remote/normalize_movie.py,sha256=zNfEY3N1UbAHZfddGONTg2Sff3ieLVWd4dfZa1dpnes
 zou/remote/playlist.py,sha256=AsDo0bgYhDcd6DfNRV6r6Jj3URWwavE2ZN3VkKRPbLU,3293
 zou/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zou/utils/movie.py,sha256=d67fIL9dVBKt-E_qCGXRbNNdbJaJR5sHvZeX3hf8ldE,16559
-zou-0.20.74.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-zou-0.20.74.dist-info/METADATA,sha256=JHbyHNZzhvDcMKA0cso9abXsl70PRr8G5WD9mdd-IPc,6698
-zou-0.20.74.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-zou-0.20.74.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
-zou-0.20.74.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
-zou-0.20.74.dist-info/RECORD,,
+zou-0.20.76.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+zou-0.20.76.dist-info/METADATA,sha256=MiayTBOvOTGmdM4CrpPqkuCD1wfcH6J9LoUqcRaxCjs,6698
+zou-0.20.76.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+zou-0.20.76.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
+zou-0.20.76.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
+zou-0.20.76.dist-info/RECORD,,