ParUtils 1.2.0__py3-none-any.whl → 1.2.2__py3-none-any.whl

{ParUtils-1.2.0.dist-info → ParUtils-1.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: ParUtils
-Version: 1.2.0
+Version: 1.2.2
 Summary: This package contains a bunch of Python utils developed for Support, Test and Automation IT Engineers
 Home-page: https://github.com/paularnaud2/ParUtils
 Author: Paul ARNAUD

{ParUtils-1.2.0.dist-info → ParUtils-1.2.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 parutils/__init__.py,sha256=EaFtUmU0kYgnjvAFwPmoKt7I5zn9bxY02R7TUtcE6M4,1434
-parutils/changelog.py,sha256=TzbgcMIo79cZeYx_i8uOMLhPsZaagge78lZt6KmeQ3Q,1406
+parutils/changelog.py,sha256=FRy4UkSbAPMgv4bnES4tYjs8_j-u8pl9Kq26keg0ygs,1591
 parutils/csvl.py,sha256=UBqw0lyhTNqFLSNIE-JM7TAQYCRgHftYQmHi21ru8-A,2874
 parutils/dq.py,sha256=kdvzOo5FLCumXagY05kGSseYlbR-zvjjmsMtGVliVc8,2302
 parutils/file.py,sha256=-OPfMhTjHDqubZLWJquY-FOv3W_k9GWoMq_rNgtdU9Y,2881
@@ -9,15 +9,15 @@ parutils/strg.py,sha256=_8NQJ1iY58Z_xACTDVcyonvRHDRuy9Ai3Kv3CvVXRh4,5563
 parutils/testing.py,sha256=kXrMz8Kze4mZejaePmV_OIca4iuNcG_dhGVHCgVuF-k,610
 parutils/wrap.py,sha256=PqMyKodgEjWDXoIVZZXRaBSdkGFL5OWmVJttl2Crrg8,421
 parutils/logging/__init__.py,sha256=rSNpgjuYer-Hhn6zKzKwKSn_KfcajEXlk6cJnPC9eJU,461
-parutils/logging/cl.py,sha256=L40SkNdrdAT-7hfXAcFPHdB73PVqAhKVlMGC7Awtx1w,2079
+parutils/logging/cl.py,sha256=NCLuxLHvqRTypZlAgwnegkByLTnTirKntnwguJHBelA,2086
 parutils/logging/const.py,sha256=L2OppBDAZYKUTIjsLPt6hTUh8UWH_1mX9YaGWlwzpj4,135
 parutils/logging/core.py,sha256=vBwZnpM2GRNSSABPdzEM9SRpqr_YNqdPlG3T3lNPSiY,843
 parutils/logging/g.py,sha256=ZSrgZw63kwxIW66A7-9_iYeDt4AstNZ_XXQgK8MglyQ,47
-parutils/logging/logger.py,sha256=TOEj65xZjKZm9toAG2NDSbby_gUVtCV33VH0jFNMWTY,3764
-parutils/logging/main.py,sha256=Z-ooY43PUk36nwVB_D9c9ZF7HUGngrFyVS8yBUVsTXA,1908
+parutils/logging/logger.py,sha256=Blt-loNbEyVo83E4viX1kDeY__6_bbwzWlIyDNPFLHU,4689
+parutils/logging/main.py,sha256=arUvgB0YTZpidt4wl2GZsR4bRUj_rrSYMrTnCMKt4gA,2127
 parutils/logging/sl.py,sha256=3-sj_o33cZmOqeFxlTl5HyHOvSAhn9glYcc-BmTUpZc,1164
-ParUtils-1.2.0.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-ParUtils-1.2.0.dist-info/METADATA,sha256=8xvOeEu0qBMQtzMAm-KzAF54FJzNuYoMbL7w40r1dIg,5285
-ParUtils-1.2.0.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-ParUtils-1.2.0.dist-info/top_level.txt,sha256=1MDobUcroeYEvdupZCAFvA5hJjm7LSDUV5A4jHySNis,9
-ParUtils-1.2.0.dist-info/RECORD,,
+ParUtils-1.2.2.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+ParUtils-1.2.2.dist-info/METADATA,sha256=s80O3PPMMmB_xSHMq4hhmYnPqqwYylAqrzbcCZLpnUs,5285
+ParUtils-1.2.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+ParUtils-1.2.2.dist-info/top_level.txt,sha256=1MDobUcroeYEvdupZCAFvA5hJjm7LSDUV5A4jHySNis,9
+ParUtils-1.2.2.dist-info/RECORD,,

{ParUtils-1.2.0.dist-info → ParUtils-1.2.2.dist-info}/WHEEL

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

parutils/changelog.py

@@ -1,5 +1,12 @@
-__VERSION__ = '1.2.0'
-# logging - error handling
+__VERSION__ = '1.2.2'
+# log_every
+
+# __VERSION__ = '1.2.1'
+# # log_dict + log_array - only one log_print -> better perfs
+# # Improved check_log logs - name appears when nok
+
+# __VERSION__ = '1.2.0'
+# # logging - error handling
 
 # __VERSION__ = '1.1.9'
 # # check_log - name appears when check_log ok

parutils/logging/cl.py

@@ -65,8 +65,8 @@ def check_warn(n_w, max_warn, name):
     if n_w == 0:
         log(f'check_log{s} ok')
     elif n_w <= max_warn:
-        log(f'check_log ended with {n_w} warnings')
+        log(f'check_log{s} ended with {n_w} warnings')
     else:
-        s = f'check_log ko, too many warnings ({n_w} warnings)'
+        s = f'check_log{s} nok, too many warnings ({n_w} warnings)'
         log(s)
         raise Exception(s)

parutils/logging/logger.py

@@ -21,6 +21,7 @@ class Logger:
         file_write=True,
         dir=None,
         file_format=None,
+        log_every=1,
     ) -> None:
         from . import g
 
@@ -35,9 +36,13 @@ class Logger:
         self.log_format = log_format if log_format else const.DEFAULT_LOG_FORMAT
         self.file_write = file_write
         self.start_time = time()
+
+        self.log_every = log_every
+        self.log_every_counter = 0
+        self.log_every_buffer = ''
+
         if not file_write:
             return
-
         self.file_label = file_label
         self.dir = dir if dir else const.DEFAULT_DIR
         self.file_format = file_format if file_format else const.DEFAULT_FILE_FORMAT
@@ -52,14 +57,18 @@ class Logger:
         s = (f"Log file initialised ({self.log_path})\n"
              f"CWD: {os.getcwd()}\n"
              f"Python interpreter path: {sys.executable}\n"
-             f"Python version: {sys.version }\n"
+             f"Python version: {sys.version}\n"
              f"ParUtils version: {u.__VERSION__}\n")
         self.log_print(s)
         g.logger = self
 
-    @staticmethod
-    def close():
+    def close(self):
         from . import g
+        if self.log_every_buffer:
+            self.log_every = 1
+            self.log_every_counter = 0
+            self._write_log(self.log_every_buffer, c_out=False)
+            self.log_every_buffer = ''
         g.logger = None
 
     def log(self, *args, level=0, c_out=True):
@@ -72,7 +81,7 @@ class Logger:
         s = f"{fdate}{msg}"
         self.log_print(s, c_out=c_out)
 
-    def log_print(self, *args, level=0, c_out=True, nb_tab=0, dashes=0, tab_char='    '):
+    def log_print(self, *args, level=0, c_out=True, nb_tab=0, dashes=0, tab_char='    ', str_out=False):
         if self.level < level:
             return
 
@@ -85,6 +94,24 @@ class Logger:
         if dashes > 0:
             s = u.extend_str(s, '-', dashes)
 
+        if str_out:
+            return s + '\n'
+
+        if self.log_every > 1:
+            self.log_every_counter += 1
+            if self.log_every_counter % self.log_every == 0:
+                self._write_log(self.log_every_buffer + s, c_out=False)
+                if c_out:
+                    print(s)
+                self.log_every_buffer = ''
+                self.log_every_counter = 0
+                return
+            else:
+                self.log_every_buffer += s + '\n'
+                if c_out:
+                    print(s)
+                return
+
         with lock:
             self._write_log(s, c_out)
 

parutils/logging/main.py

@@ -12,7 +12,7 @@ def log(*args, level=0, c_out=True):
 
 
 @logger_methode
-def log_print(*args, level=0, c_out=True, nb_tab=0, dashes=0, tab_char='    '):
+def log_print(*args, level=0, c_out=True, nb_tab=0, dashes=0, tab_char='    ', str_out=False):
     """Prints something in the current log file (log_path)
 
     - level: log level. Current log level is the attribute level of the current logger.
@@ -33,17 +33,23 @@ def log_input(str_in):
 
 
 def log_array(array, nb_tab=0, tab_char='    '):
+    out = ''
     for elt in array:
-        log_print(elt, nb_tab=nb_tab, tab_char=tab_char)
+        out += log_print(elt, nb_tab=nb_tab, tab_char=tab_char, str_out=True)
+    log_print(out)
 
 
-def log_dict(d, nb_tab=0, depth=0, tab_char='    '):
+def log_dict(d, nb_tab=0, depth=0, tab_char='    ', str_out=False):
+    out = ''
     for key in d:
         if isinstance(d[key], dict) and depth > 0:
-            log_print(f'{key}:', nb_tab=nb_tab, tab_char=tab_char)
-            log_dict(d[key], nb_tab + 1, depth - 1, tab_char=tab_char)
+            out += log_print(f'{key}:', nb_tab=nb_tab, tab_char=tab_char, str_out=True)
+            out += log_dict(d[key], nb_tab + 1, depth - 1, tab_char=tab_char, str_out=True)
         else:
-            log_print(f'{key}: {d[key]}', nb_tab=nb_tab, tab_char=tab_char)
+            out += log_print(f'{key}: {d[key]}', nb_tab=nb_tab, tab_char=tab_char, str_out=True)
+    if str_out:
+        return out
+    log_print(out)
 
 
 def log_example(list_in, what="duplicates", n_print=5):