zhmiscellany 6.3.0__py3-none-any.whl → 6.3.2__py3-none-any.whl

zhmiscellany/fileio.py

@@ -159,19 +159,19 @@ def fast_dill_loads(data):
 
 
 def save_object_to_file(object, file_name, compressed=False):
-    import zlib
+    import lzma
     with open(file_name, 'wb') as f:
         if compressed:
-            f.write(zlib.compress(fast_dill_dumps(object)))
+            f.write(lzma.compress(fast_dill_dumps(object)))
         else:
             f.write(fast_dill_dumps(object))
 
 
 def load_object_from_file(file_name, compressed=False):
-    import zlib
+    import lzma
     with open(file_name, 'rb') as f:
         if compressed:
-            return fast_dill_loads(zlib.decompress(f.read()))
+            return fast_dill_loads(lzma.decompress(f.read()))
         else:
             return fast_dill_loads(f.read())
 
@@ -179,8 +179,8 @@ def load_object_from_file(file_name, compressed=False):
 def pickle_and_encode(obj):
     """Pickles an object and URL-safe encodes it."""
     import base64
-    import zlib
-    pickled_data = zlib.compress(fast_dill_dumps(obj), 9)  # Serialize the object
+    import lzma
+    pickled_data = lzma.compress(fast_dill_dumps(obj), 9)  # Serialize the object
     encoded_data = base64.urlsafe_b64encode(pickled_data).decode()  # Base64 encode
     return encoded_data
 
@@ -188,9 +188,9 @@ def pickle_and_encode(obj):
 def decode_and_unpickle(encoded_str):
     """Decodes a URL-safe encoded string and unpickles the object."""
     import base64
-    import zlib
+    import lzma
     pickled_data = base64.urlsafe_b64decode(encoded_str)  # Decode from Base64
-    obj = fast_dill_loads(zlib.decompress(pickled_data))  # Deserialize
+    obj = fast_dill_loads(lzma.decompress(pickled_data))  # Deserialize
     return obj
 
 
@@ -218,7 +218,7 @@ def chdir_to_script_dir():
     os.chdir(os.path.dirname(get_script_path()))
 
 
-def cache(function, *args, **kwargs):
+def cache(function, *args, compressed=False, **kwargs):
     """
     Caches the result of a function call to disk.
     """
@@ -299,7 +299,8 @@ def cache(function, *args, **kwargs):
     seed = {
         'function': function,
         'args': args,
-        'kwargs': kwargs
+        'kwargs': kwargs,
+        'compressed': compressed
     }
 
     seed_hash = get_hash_orjson(seed)
@@ -307,11 +308,11 @@ def cache(function, *args, **kwargs):
     cache_file = f'{cache_folder}/cache_{function.__name__}_{seed_hash}.pkl'
 
     if os.path.exists(cache_file):
-        return load_object_from_file(cache_file)
+        return load_object_from_file(cache_file, compressed=compressed)
     else:
         result = function(*args, **kwargs)
         zhmiscellany.fileio.create_folder(cache_folder)
-        save_object_to_file(result, cache_file)
+        save_object_to_file(result, cache_file, compressed=compressed)
         return result
 
 

zhmiscellany/macro.py

@@ -400,17 +400,20 @@ def toggle_function(func, key='f8', blocking=True, hold=False):
     import threading
     # better_wait_for is in the same module, no import needed
     
-    def atom():
+    def atom(hold):
         while True:
             better_wait_for(key)
             t = kthread.KThread(target=func)
             t.start()
-            better_wait_for(key)
+            if not hold:
+                better_wait_for(key)
+            else:
+                better_wait_for(key, wait_for_release=True)
             t.kill()
     if blocking:
-        atom()
+        atom(hold)
     else:
-        t = threading.Thread(target=atom)
+        t = threading.Thread(target=atom, args=(hold,))
         t.start()
         return t
 

zhmiscellany/processing.py

@@ -71,17 +71,17 @@ def raw_multiprocess(func, args=(), fileless=True):
     import subprocess
     import tempfile
     import os
-    import zlib
+    import lzma
     import pickle
     import dill
     cap_string = b'|'+bytes(zhmiscellany.string.get_universally_unique_string(), 'u8')+b'|'
     code = \
-'''import os, dill, zlib, sys, pickle, traceback, psutil, signal
+'''import os, dill, lzma, sys, pickle, traceback, psutil, signal
 cwd = '''+repr(os.getcwd())+'''
 host_pid = {os.getpid()}
 os.chdir(os.path.dirname(cwd))
-func = dill.loads(zlib.decompress('''+repr(zlib.compress(dill.dumps(func), 9))+'''))
-args_list = dill.loads(zlib.decompress('''+repr(zlib.compress(dill.dumps(args), 9))+f'''))
+func = dill.loads(lzma.decompress('''+repr(lzma.compress(dill.dumps(func), 9))+'''))
+args_list = dill.loads(lzma.decompress('''+repr(lzma.compress(dill.dumps(args), 9))+f'''))
 if __name__ == "__main__":
     data = [None, None]
     def sync_host_alive_state():
@@ -110,7 +110,7 @@ if __name__ == "__main__":
         except:
             pickled = pickle.dumps([1, None], protocol=5)
     del data
-    compressed = zlib.compress(pickled, 9);del pickled
+    compressed = lzma.compress(pickled, 9);del pickled
     sys.stdout.buffer.write({repr(cap_string)} + compressed + {repr(cap_string)})
     sys.stdout.buffer.flush()
 '''
@@ -146,7 +146,7 @@ if __name__ == "__main__":
         raise Exception(f'Critical error in process:\n{raw}')
     
     try:
-        decompressed = zlib.decompress(raw)
+        decompressed = lzma.decompress(raw)
     except Exception as e:
         print(raw)
         raise e
@@ -171,7 +171,7 @@ def raw_continuous_multiprocess(input_class, args=(), fileless=True, cleanup_fil
     import subprocess
     import tempfile
     import os
-    import zlib
+    import lzma
     import pickle
     import dill
     import base64
@@ -185,7 +185,7 @@ def raw_continuous_multiprocess(input_class, args=(), fileless=True, cleanup_fil
     marker_prefix = block_header_str + cap_str
     
     code = f'''
-import os, dill, zlib, sys, pickle, traceback, base64, threading, psutil, time, signal
+import os, dill, lzma, sys, pickle, traceback, base64, threading, psutil, time, signal
 cwd = {repr(os.getcwd())}
 host_pid = {os.getpid()}
 os.chdir(os.path.dirname(cwd))
@@ -210,13 +210,13 @@ if __name__=="__main__":
                 pickled = dill.dumps(data, protocol=5)
             except:
                 pickled = pickle.dumps([1, None], protocol=5)
-        compressed = zlib.compress(pickled, 9)
+        compressed = lzma.compress(pickled, 9)
         encoded = base64.b64encode(compressed).decode('utf-8')
         print({repr(block_header_str)} + {repr(cap_str)} + encoded + {repr(cap_str)} + '\\n', flush=True, end='')
     computed = False
     try:
-        cls = dill.loads(zlib.decompress({repr(zlib.compress(dill.dumps(input_class), 9))}))
-        args_list = dill.loads(zlib.decompress({repr(zlib.compress(dill.dumps(args), 9))}))
+        cls = dill.loads(lzma.decompress({repr(lzma.compress(dill.dumps(input_class), 9))}))
+        args_list = dill.loads(lzma.decompress({repr(lzma.compress(dill.dumps(args), 9))}))
         computed = True
     except:
         data[0] = traceback.format_exc()
@@ -278,7 +278,7 @@ if __name__=="__main__":
         encoded = line[len(marker_prefix):-len(cap_str)]
         try:
             compressed = base64.b64decode(encoded)
-            decompressed = zlib.decompress(compressed)
+            decompressed = lzma.decompress(compressed)
         except Exception as e:
             raise Exception("Error decoding output") from e
         try:

{zhmiscellany-6.3.0.dist-info → zhmiscellany-6.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zhmiscellany
-Version: 6.3.0
+Version: 6.3.2
 Summary: A collection of useful/interesting python libraries made by zh.
 Home-page: https://discord.gg/ThBBAuueVJ
 Author: zh

{zhmiscellany-6.3.0.dist-info → zhmiscellany-6.3.2.dist-info}/RECORD

@@ -3,25 +3,25 @@ zhmiscellany/_discord_supportfuncs.py,sha256=cCvru9zGEeFxn-hqnBeI6fFYoKTWeTQIHvZ
 zhmiscellany/_fileio_supportfuncs.py,sha256=RZxakXD4tb05AXJXgHS4ZI-Lr9A8fY_LcWe2-8EeF9Y,436
 zhmiscellany/_misc_supportfuncs.py,sha256=gprZ1b7PgfSlAppMlHxRQImV-ks4IXFe7LZhbVecLUQ,13839
 zhmiscellany/_processing_supportfuncs.py,sha256=kKP_dChzkci9zleP3nEvEEIz0Jd8DJ3X0Hi3Qah9eK8,11449
-zhmiscellany/_py_resources.py,sha256=eEEvqa-C7jYFrUnKLvemO77_h1-TdzEe_QsLal86P8U,229013
+zhmiscellany/_py_resources.py,sha256=jEt4250w3Fornx_zxhJchfkFZ31K44b3qm-HXYGGt8g,229013
 zhmiscellany/_resource_files_lookup.py,sha256=hsgPW0dngokgqWrAVAv5rUo-eobzJPjvWHt4xrOG5l0,856
 zhmiscellany/cpp.py,sha256=XEUEoIKCDCdY5VgwNWE5oXrGjtsmGdz_MnaVwQmi2dk,179
 zhmiscellany/dict.py,sha256=dNu3G9qiJeLgE7JY3QD31GJU7EfLsYPqxf8AOhBsYag,81
 zhmiscellany/discord.py,sha256=yKoigWI3tONfYSoMEynGGEWW1VsXSRdkg8vPbIKwBNI,20312
-zhmiscellany/fileio.py,sha256=-W1A_sEymfaqxhiEY-y6h_owBlAyVWNm4PSFn7LVoBI,21991
+zhmiscellany/fileio.py,sha256=vC1ukkvmh9gv2dXO3XEhMYLzKodQqRKahP83TH0JAHc,22090
 zhmiscellany/gui.py,sha256=OVwuZ_kWHJlgKPeYR7fAAyomNmU-OnxOgXZelVNPm1w,10409
 zhmiscellany/image.py,sha256=6Hz5sfym_o7FHokGUKeXRsjl89VY_ZMSLnvuSam1icI,8265
 zhmiscellany/list.py,sha256=BnbYG-lpHmi0C4v8jLfaeXqQdc3opmNgkvY6yz4pasg,1475
-zhmiscellany/macro.py,sha256=7qUZ7LFzWl8gD2K-uAxf3l3Qc2Wskezo7XAKKoqdowA,28263
+zhmiscellany/macro.py,sha256=K-pcV8PwOienpLZJlS-AlSj5uc2rCp1JKoXPrCdQVho,28395
 zhmiscellany/math.py,sha256=nNsrg4le3XIt1y36lQv5xNCjUoIu7Q1lV5BdpmyD_wk,2530
 zhmiscellany/misc.py,sha256=0vJFa0MRdKXjLLVeFfMx1Q-b-qrKqpdaq6FzWKz6SMY,32489
 zhmiscellany/netio.py,sha256=rN17uIbsWqDG9ssmouD7VZqOtlgWObaCsvn2Hrq-k6w,2413
 zhmiscellany/pastebin.py,sha256=jstR_HRP9fUVcQXp4D8zkqvA0GLHNrDrfhqb9Sc-dL0,6479
 zhmiscellany/pipes.py,sha256=RlHxsW_M_R6UJUIDgYVS_zfqUwO8kXG8j-0YG5qByjo,4637
-zhmiscellany/processing.py,sha256=S0Rb6ndTC6N23-kz4hLEeRNgAaWjcMAtt8QNDE8x4v4,11350
+zhmiscellany/processing.py,sha256=NYH5j4B_neuijFYXhbhS_PidvJUKqvwnzHulBGJKZ2o,11350
 zhmiscellany/rust.py,sha256=cHkSpdtq7QQW3yzBEAYL9lZxLW0h4wal2tsxIOnyTrA,494
 zhmiscellany/string.py,sha256=A4ilBWSYlrJ0AJ0axvepSSjYCYwYk5X-vRrHNphi_ow,4809
-zhmiscellany-6.3.0.dist-info/METADATA,sha256=wfTYRCFcsryY7Lsh7KyLlieRexUdE5d_aAobSlCLmLM,43872
-zhmiscellany-6.3.0.dist-info/WHEEL,sha256=hPN0AlP2dZM_3ZJZWP4WooepkmU9wzjGgCLCeFjkHLA,92
-zhmiscellany-6.3.0.dist-info/top_level.txt,sha256=ioDtsrevCI52rTxZntMPljRIBsZs73tD0hI00HektiE,13
-zhmiscellany-6.3.0.dist-info/RECORD,,
+zhmiscellany-6.3.2.dist-info/METADATA,sha256=uErV3G6hiDVI9CCNLh3TK6y-Fgt2DLb-jZdNo0b5IZY,43872
+zhmiscellany-6.3.2.dist-info/WHEEL,sha256=hPN0AlP2dZM_3ZJZWP4WooepkmU9wzjGgCLCeFjkHLA,92
+zhmiscellany-6.3.2.dist-info/top_level.txt,sha256=ioDtsrevCI52rTxZntMPljRIBsZs73tD0hI00HektiE,13
+zhmiscellany-6.3.2.dist-info/RECORD,,