zou 1.0.5__py3-none-any.whl → 1.0.6__py3-none-any.whl

zou/__init__.py

@@ -1 +1 @@
-__version__ = "1.0.5"
+__version__ = "1.0.6"

zou/app/blueprints/persons/resources.py

@@ -672,7 +672,7 @@ class PersonMonthAllTimeSpentsResource(Resource):
             )
             return fields.serialize_list(timespents)
         except WrongDateFormatException:
-            abort(404)
+            raise WrongParameterException("Invalid month or year.")
 
 
 class PersonWeekTimeSpentsResource(PersonDurationTimeSpentsResource):
@@ -1160,10 +1160,12 @@ class TimeSpentMonthResource(TimeSpentDurationResource):
                 schema:
                   type: object
         """
-
-        return time_spents_service.get_day_table(
-            year, month, **self.get_person_project_department_arguments()
-        )
+        try:
+            return time_spents_service.get_day_table(
+                year, month, **self.get_person_project_department_arguments()
+            )
+        except WrongDateFormatException:
+            raise WrongParameterException("Invalid month or year.")
 
 
 class TimeSpentYearsResource(TimeSpentDurationResource):

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

@@ -68,7 +68,7 @@ class BaseCsvImportResource(Resource, ArgsMixin):
         result = []
         self.check_permissions(*args)
         self.prepare_import(*args)
-        with open(file_path) as csvfile:
+        with open(file_path, newline="", encoding="utf-8") as csvfile:
             reader = csv.DictReader(csvfile, dialect=self.get_dialect(csvfile))
             line_number = 1
             for row in reader:
@@ -94,9 +94,10 @@ class BaseCsvImportResource(Resource, ArgsMixin):
 
     def get_dialect(self, csvfile):
         sniffer = csv.Sniffer()
-        dialect = sniffer.sniff(csvfile.read())
-        dialect.doublequote = True
+        sample = csvfile.read(8192)
         csvfile.seek(0)
+        dialect = sniffer.sniff(sample)
+        dialect.doublequote = True
         return dialect
 
     def prepare_import(self, *args):

zou/app/services/deletion_service.py

@@ -42,6 +42,7 @@ from zou.app.services.exception import (
     CommentNotFoundException,
     ModelWithRelationsDeletionException,
     PersonInProtectedAccounts,
+    PreviewFileNotFoundException,
 )
 
 
@@ -157,6 +158,8 @@ def remove_task(task_id, force=False):
 
 def remove_preview_file_by_id(preview_file_id, force=False):
     preview_file = PreviewFile.get(preview_file_id)
+    if preview_file is None:
+        raise PreviewFileNotFoundException
     return remove_preview_file(preview_file, force=force)
 
 

zou/app/services/time_spents_service.py

@@ -184,7 +184,10 @@ def get_time_spents_for_month(
     """
     Return all time spents for given month.
     """
-    date = datetime.datetime(int(year), int(month), 1)
+    month_int = int(month)
+    if month_int < 1 or month_int > 12:
+        raise WrongDateFormatException
+    date = datetime.datetime(int(year), month_int, 1)
     next_month = date + relativedelta.relativedelta(months=1)
     query = TimeSpent.query.filter(TimeSpent.date >= date).filter(
         TimeSpent.date < next_month

zou/app/services/user_service.py

@@ -1336,6 +1336,8 @@ def update_notification(notification_id, read):
     notification = Notification.get_by(
         id=notification_id, person_id=current_user["id"]
     )
+    if notification is None:
+        raise NotificationNotFoundException
     notification.update({"read": read})
     if read:
         events.emit(

zou/app/stores/file_store.py

@@ -47,11 +47,38 @@ def make_key(prefix, id):
 
 
 def make_read_generator(bucket, key):
+    """
+    Create a generator that yields chunks from the storage bucket.
+    This function ensures proper cleanup of the underlying stream to avoid
+    reentrant call errors when the stream is accessed concurrently.
+    """
     read_stream = bucket.read_chunks(key)
 
     def read_generator(read_stream):
-        for chunk in read_stream:
-            yield chunk
+        try:
+            for chunk in read_stream:
+                yield chunk
+        except GeneratorExit:
+            try:
+                if hasattr(read_stream, 'close'):
+                    read_stream.close()
+            except Exception:
+                pass
+            raise
+        except StopIteration:
+            try:
+                if hasattr(read_stream, 'close'):
+                    read_stream.close()
+            except Exception:
+                pass
+            raise
+        except Exception:
+            try:
+                if hasattr(read_stream, 'close'):
+                    read_stream.close()
+            except Exception:
+                pass
+            raise
 
     return read_generator(read_stream)
 

zou/app/utils/fs.py

@@ -57,20 +57,42 @@ def get_file_path_and_file(
             exception = None
             try:
                 with open(file_path, "wb") as tmp_file:
-                    for chunk in open_file(prefix, instance_id):
-                        tmp_file.write(chunk)
-            except:
+                    file_generator = open_file(prefix, instance_id)
+                    try:
+                        for chunk in file_generator:
+                            tmp_file.write(chunk)
+                    finally:
+                        try:
+                            file_generator.close()
+                        except StopIteration:
+                            # Normal end of iteration, expected
+                            pass
+                        except Exception:
+                            pass
+            except Exception as e:
                 download_failed = True
+                exception = e
 
             if is_unvalid_file(
                 file_path, file_size, download_failed
             ):  # download failed
                 time.sleep(3)
                 download_failed = False
+                exception = None
                 try:
                     with open(file_path, "wb") as tmp_file:
-                        for chunk in open_file(prefix, instance_id):
-                            tmp_file.write(chunk)
+                        file_generator = open_file(prefix, instance_id)
+                        try:
+                            for chunk in file_generator:
+                                tmp_file.write(chunk)
+                        finally:
+                            try:
+                                file_generator.close()
+                            except StopIteration:
+                                # Normal end of iteration, expected
+                                pass
+                            except Exception:
+                                pass
                 except Exception as e:
                     download_failed = True
                     exception = e

zou/app/utils/plugins.py

@@ -371,7 +371,14 @@ def install_plugin_files(files_path, installation_path):
     installation_path.mkdir(parents=True, exist_ok=True)
 
     if files_path.is_dir():
-        shutil.copytree(files_path, installation_path, dirs_exist_ok=True)
+        def ignore_git(dir, names):
+            ignored = []
+            if ".git" in names:
+                ignored.append(".git")
+            return ignored
+        shutil.copytree(
+            files_path, installation_path, dirs_exist_ok=True, ignore=ignore_git
+        )
     elif zipfile.is_zipfile(files_path):
         shutil.unpack_archive(files_path, installation_path, format="zip")
     else:

{zou-1.0.5.dist-info → zou-1.0.6.dist-info}/METADATA

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

{zou-1.0.5.dist-info → zou-1.0.6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-zou/__init__.py,sha256=B9kKWJLln1i8LjtkcYecvNWGLTrez4gCUOHtnPlInFo,22
+zou/__init__.py,sha256=mqMuQB3aqJVPrHHqJMLjqiMKUiJjozc7EPLcX5DpKHg,22
 zou/cli.py,sha256=m2TcWtyPiPqBxTms3ndeLZ8L8tz3s74VKrB7NKga0ks,23141
 zou/debug.py,sha256=1fawPbkD4wn0Y9Gk0BiBFSa-CQe5agFi8R9uJYl2Uyk,520
 zou/event_stream.py,sha256=9O1PE_vDW8p3yfHJNSZ8w0ybD-660x8oGN0izgJdTjM,8575
@@ -95,7 +95,7 @@ zou/app/blueprints/index/resources.py,sha256=vCyW-LkLZacx3-E3kfbNfPTMHkgn7Tmhoha
 zou/app/blueprints/news/__init__.py,sha256=HxBXjC15dVbotNAZ0CLf02iwUjxJr20kgf8_kT_9nwM,505
 zou/app/blueprints/news/resources.py,sha256=FfYLp4PprTBZmpZ_vNV0K5RnBr2oAO49Llwr6InBaKA,12806
 zou/app/blueprints/persons/__init__.py,sha256=0cnHHw3K_8OEMm0qOi3wKVomSAg9IJSnVjAXabMeHks,3893
-zou/app/blueprints/persons/resources.py,sha256=-2FV1rDkMDtEvrUkbHdHFC7lTCoWRkxjIvSzAviwlwY,60634
+zou/app/blueprints/persons/resources.py,sha256=ERYNS-B6m_O0h85BRz014zK6kQOjlMD2dCkDgIdin6w,60812
 zou/app/blueprints/playlists/__init__.py,sha256=gI6dV102RwsztOnUDk53BErYd9zrjA43gfNgGeYwfFU,1700
 zou/app/blueprints/playlists/resources.py,sha256=Ol0bQKcX4dtlduBaBD5OQm0jXMu-kqvO-YTLjw13a4A,29303
 zou/app/blueprints/previews/__init__.py,sha256=ihC6OQ9AUjnZ2JeMnjRh_tKGO0UmAjOwhZnOivc3BnQ,4460
@@ -111,7 +111,7 @@ zou/app/blueprints/source/kitsu.py,sha256=agVjvFh7isPpZJZgHVKebLQrD07YYm2yJo_ubf
 zou/app/blueprints/source/otio.py,sha256=7lpBO-WUZyBpR9l583Odlfjrm8XJG4emmB43T37mE-4,21161
 zou/app/blueprints/source/csv/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zou/app/blueprints/source/csv/assets.py,sha256=HiX3S1Qk-AJh8PGKc_BOUuxJc0sXkyqNSgRlnPuMV4Q,12421
-zou/app/blueprints/source/csv/base.py,sha256=1WcvpQv5FrJvE5nyRbJ1Nqrye4OgoTEBItYbHga-Uj4,4373
+zou/app/blueprints/source/csv/base.py,sha256=o-DxUXgPmQpOU7fKdWnLrTsaFyWBJIDtKQ6iYAco004,4431
 zou/app/blueprints/source/csv/casting.py,sha256=jtNLJh_TMVjgZTW75oTzC_VfJVZerSSUxBiwGYzdFzU,7044
 zou/app/blueprints/source/csv/edits.py,sha256=aodUtzbPqmmf5GrB_06Ns-X4dEVybGDjUjeAGeEPHKE,9906
 zou/app/blueprints/source/csv/persons.py,sha256=uFyL2MR-M_eA7vpj2W4PChFJ-gnHED-3C-wyqz-hTjU,4043
@@ -203,7 +203,7 @@ zou/app/services/chats_service.py,sha256=pqnT-RCltdf9Dp4t-2NtOSawGk0jyNhVPTgERZ_
 zou/app/services/comments_service.py,sha256=cJ4K0GI8_VkCIBw4CLBW8bOrBOaG8Qj4EI4AcOZKAR8,22310
 zou/app/services/concepts_service.py,sha256=uH0leb23Op48wc1bHlUV2-I97QROsIemKr80F0UwnoM,11213
 zou/app/services/custom_actions_service.py,sha256=fWISEOOdthadrxeHuacEel5Xj6msn0yWXJQDG1gzvsY,297
-zou/app/services/deletion_service.py,sha256=Wr0pcwvaT2PPGYwtv9Sd7dvTucvRsl7EWBaoIchDW-I,17929
+zou/app/services/deletion_service.py,sha256=a2b7SFbkyAp1Ubl3HG5OAUt23dj0YnNqeeOGeAuX8IY,18035
 zou/app/services/departments_service.py,sha256=7jLKH7ziToc6uHZsZKdBUzN2Ubi2YloHCX7PecE51LU,4596
 zou/app/services/edits_service.py,sha256=hfg6Fk9J9W41Qyw96UF35cSgbXqCYci6H8OY5rL_cIk,12075
 zou/app/services/emails_service.py,sha256=6Ye4dUB_04XItdH6mynCERYP2Jj5wYTYrJQfir7slDA,14993
@@ -230,11 +230,11 @@ zou/app/services/sync_service.py,sha256=iWxx1kOGEXympHmSBBQWtDZWNtumdxp8kppee0Oe
 zou/app/services/tasks_service.py,sha256=34ozKuBjSKkirJJk3Wf6J-U3LrOWb3Oo1TqKvmAIJI8,70014
 zou/app/services/telemetry_services.py,sha256=xQm1h1t_JxSFW59zQGf4NuNdUi1UfMa_6pQ-ytRbmGA,1029
 zou/app/services/templates_service.py,sha256=vz4ACtLW-NZcLB-2uisQgGvU9vGFeIL9fUEaCULX8W0,38070
-zou/app/services/time_spents_service.py,sha256=CO3CXpGCNqOtBRxPo_H9tqEIrhCG7crFvgSkhAl1Vys,18634
-zou/app/services/user_service.py,sha256=h5SUU-Y6KJzAgEukWFCl8q8lpT1MKXtWp5yXXEl7eMk,54124
+zou/app/services/time_spents_service.py,sha256=E-seu2vqmJJCyrZ2c1q4Q_ADEyV263lJmVGBvPHOv9E,18739
+zou/app/services/user_service.py,sha256=Bv9o0L-WGu2nHFrMCh6vDZEHlkClw5Uk1xtJljHr1mM,54197
 zou/app/stores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zou/app/stores/auth_tokens_store.py,sha256=-qOJPybLHvnMOq3PWk073OW9HJwOHGhFLZeOIlX1UVw,1290
-zou/app/stores/file_store.py,sha256=yLQDM6mNbj9oe0vsWdBqun7D8Dw-eSjD1yHCCftX0OI,4045
+zou/app/stores/file_store.py,sha256=U_0YDIfvSvdA3fpsvEbavwQyT8cDCuORVhioBe33zQI,4906
 zou/app/stores/publisher_store.py,sha256=ggpb68i_wCfcuWicmxv8B1YPLXwHmcZo2reqcLnfV3E,1076
 zou/app/stores/queue_store.py,sha256=udbZSm3Rfwi-zwSRzVz-0qjdrVYbUWA8WwuIsdQikn8,669
 zou/app/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -253,12 +253,12 @@ zou/app/utils/events.py,sha256=czvaA4QeWIgroshpmonQCMmuq5O1XzIz08HfyLUq5T8,3213
 zou/app/utils/fido.py,sha256=Tlv5V4mDIbWiz93-gLh6i5p4PXBJWTLR3djR4ysT-PA,460
 zou/app/utils/fields.py,sha256=GTG6249Dz5pJUI1pcDPilzZqGkyPkAEyLpT3Gu2CfB0,3707
 zou/app/utils/flask.py,sha256=t0sC6yEDyzn-vCsijWzI9lpNWoxAYWfui25QtjQi_64,1822
-zou/app/utils/fs.py,sha256=EIRfKJXtHubVVi8FlDd9s9TcUok91LvRgU0l_B3Fq3w,3356
+zou/app/utils/fs.py,sha256=pKDmMh0Tbz8XeStTxF83Ob7RS9aW8CNrO-auLssu0mE,4298
 zou/app/utils/git.py,sha256=MhmAYvEY-bXsnLvcHUW_NY5V636lJL3H-cdNrTHgLGk,114
 zou/app/utils/logs.py,sha256=lB6kyFmeANxCILUULLqGN8fuq9IY5FcbrVWmLdqWs2U,1404
 zou/app/utils/monitoring.py,sha256=XCpl0QshKD_tSok1vrIu9lB97JsvKLhvxJo3UyeqEoQ,2153
 zou/app/utils/permissions.py,sha256=Oq91C_lN6aGVCtCVUqQhijMQEjXOiMezbngpjybzzQk,3426
-zou/app/utils/plugins.py,sha256=BnLKQdExVt_LHhJreIQEIN_ntreZOBXDKh0AIrEfm6A,12834
+zou/app/utils/plugins.py,sha256=Lie0Lm6Ax94m3o35vs_3xbYwDcFGPYwwuHXi1JxAuw0,13034
 zou/app/utils/query.py,sha256=q8ETGPAqnz0Pt9xWoQt5o7FFAVYUKVCJiWpwefIr-iU,4592
 zou/app/utils/redis.py,sha256=xXEh9pl-3qPbr89dKHvcXSUTC6hd77vv_N8PVcRRZTE,377
 zou/app/utils/remote_job.py,sha256=QPxcCWEv-NM1Q4IQawAyJAiSORwkMeOlByQb9OCShEw,2522
@@ -478,9 +478,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-1.0.5.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-zou-1.0.5.dist-info/METADATA,sha256=GZdobpPCjsFUmKZk8nq-Vzcl3qKh7RK8wvnndW3q48E,6695
-zou-1.0.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-zou-1.0.5.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
-zou-1.0.5.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
-zou-1.0.5.dist-info/RECORD,,
+zou-1.0.6.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+zou-1.0.6.dist-info/METADATA,sha256=LdI3qxAVDqImAgb-fZY_A3jfQLGR7WR71T2wacVYx3Y,6695
+zou-1.0.6.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+zou-1.0.6.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
+zou-1.0.6.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
+zou-1.0.6.dist-info/RECORD,,

{zou-1.0.5.dist-info → zou-1.0.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any