zou 1.0.5__tar.gz → 1.0.6__tar.gz

{zou-1.0.5/zou.egg-info → zou-1.0.6}/PKG-INFO

@@ -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.6/zou/__init__.py

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

{zou-1.0.5 → zou-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-1.0.5 → zou-1.0.6}/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-1.0.5 → zou-1.0.6}/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-1.0.5 → zou-1.0.6}/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-1.0.5 → zou-1.0.6}/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-1.0.5 → zou-1.0.6}/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-1.0.5 → zou-1.0.6}/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-1.0.5 → zou-1.0.6}/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 → zou-1.0.6/zou.egg-info}/PKG-INFO

@@ -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/zou/__init__.py

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