zhmiscellany 6.1.6__py3-none-any.whl → 6.1.8__py3-none-any.whl

zhmiscellany/_processing_supportfuncs.py

@@ -217,7 +217,7 @@ from zhmiscellany._processing_supportfuncs import _ray_init_thread; _ray_init_th
     _ray_init_thread.join()
     
     if not expect_crashes:
-        @ray.remote(max_retries=max_retries)
+        @ray.remote(max_retries=max_retries, num_cpus=0)
         def worker(func, *args):
             return func(*args)
         

zhmiscellany/fileio.py

@@ -8,6 +8,8 @@ from itertools import chain
 import tempfile
 import random
 import string
+import orjson
+from datetime import datetime
 
 
 def read_json_file(file_path):
@@ -207,22 +209,51 @@ def chdir_to_script_dir():
     os.chdir(os.path.dirname(get_script_path()))
 
 
-def cache(seed, function):
+def cache(function, *args, **kwargs):
     cache_folder = 'zhmiscellany_cache'
-    zhmiscellany.fileio.create_folder(cache_folder)
 
-    def generate_hash(obj):
-        obj_str = str(obj)
-        return hashlib.md5(obj_str.encode()).hexdigest()
+    def get_hash_orjson(data):
+        def default_converter(obj):
+            # SETS: Must be sorted to ensure determinism!
+            # JSON doesn't support sets, so we turn them into sorted lists.
+            if isinstance(obj, set):
+                return sorted(list(obj))
 
-    seed_hash = generate_hash(seed)
+            # BYTES: Decode to string (if utf-8) or hex
+            if isinstance(obj, bytes):
+                return obj.hex()
 
-    cache_file = f'{cache_folder}/fn_cache_{seed_hash}.pkl'
+            # DATETIMES: Convert to ISO format string
+            if isinstance(obj, datetime):
+                return obj.isoformat()
+
+            # CUSTOM OBJECTS: Try to return their __dict__ or string rep
+            if hasattr(obj, '__dict__'):
+                return obj.__dict__
+
+            # Fallback: String representation (risky if str() format changes)
+            return str(obj)
+        json_bytes = orjson.dumps(
+            data,
+            default=default_converter,
+            option=orjson.OPT_SORT_KEYS
+        )
+        return hashlib.md5(json_bytes).hexdigest()
+
+    seed = {
+        'args': fast_dill_dumps(args),
+        'kwargs': fast_dill_dumps(kwargs)
+    }
+
+    seed_hash = get_hash_orjson(seed)
+
+    cache_file = f'{cache_folder}/cache_{function.__name__}_{seed_hash}.pkl'
 
     if os.path.exists(cache_file):
         return load_object_from_file(cache_file)
     else:
-        result = function(seed)
+        result = function(*args, **kwargs)
+        zhmiscellany.fileio.create_folder(cache_folder)
         save_object_to_file(result, cache_file)
         return result
 

{zhmiscellany-6.1.6.dist-info → zhmiscellany-6.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zhmiscellany
-Version: 6.1.6
+Version: 6.1.8
 Summary: A collection of useful/interesting python libraries made by zh.
 Home-page: https://discord.gg/ThBBAuueVJ
 Author: zh
@@ -20,6 +20,7 @@ Requires-Dist: psutil>=0
 Requires-Dist: kthread>=0
 Requires-Dist: pillow>=0
 Requires-Dist: fuzzywuzzy>=0
+Requires-Dist: orjson>=0
 Requires-Dist: pyautogui>=0; sys_platform == "linux"
 Requires-Dist: ray>=0; sys_platform == "win32"
 Requires-Dist: pywin32>=0; sys_platform == "win32"
@@ -43,6 +44,8 @@ Introduction
 
 Can be installed with `pip install zhmiscellany`
 
+Supports Linux! (Some functionality reduced)
+
 Currently, the package stands at 149 functions/classes/bindings across 15 modules.
 
 The git repository for this package can be found [here](https://github.com/zen-ham/zhmiscellany). The docs also look nicer on github.

{zhmiscellany-6.1.6.dist-info → zhmiscellany-6.1.8.dist-info}/RECORD

@@ -2,13 +2,13 @@ zhmiscellany/__init__.py,sha256=Oh3gAJRWq2aUEgkolmQyiZOQ3iey5OC4NA2XaTHuVv4,1139
 zhmiscellany/_discord_supportfuncs.py,sha256=RotSpurqFtL5q6v_ST1e2Y_1qJMaHp1CDsF5i-gR4ec,6524
 zhmiscellany/_fileio_supportfuncs.py,sha256=soibLv9nOR79sHQ2MGQH2O6MhnqdXqI7ybxHSN2Tfac,434
 zhmiscellany/_misc_supportfuncs.py,sha256=RH1keGtoVjJOFh7MWOTJ2BJijLLeEvsMy9tNumdd6Uk,9944
-zhmiscellany/_processing_supportfuncs.py,sha256=u5dzW-2OtyViC74r5fhqd5_2uQ92ZhieRJRTJMevqbg,11071
+zhmiscellany/_processing_supportfuncs.py,sha256=XWyH6VNQLhHqnYLL9LJwU0hJ6PGzZNJXT8Gfmb-GRw8,11083
 zhmiscellany/_py_resources.py,sha256=HqJs5aRLymLZ2J5Io8g6bY58pGWhN9b8vCktC2DW4KQ,229009
 zhmiscellany/_resource_files_lookup.py,sha256=hsgPW0dngokgqWrAVAv5rUo-eobzJPjvWHt4xrOG5l0,856
 zhmiscellany/cpp.py,sha256=XEUEoIKCDCdY5VgwNWE5oXrGjtsmGdz_MnaVwQmi2dk,179
 zhmiscellany/dict.py,sha256=0BZJ5eK-MurAHYV1OPa0jdGTr-QEWos7ZM0npb-tN9I,81
 zhmiscellany/discord.py,sha256=nzXjRnJbuYbuH4hScqqdsF61VeXx8xiYrwp_AKTWt9o,19774
-zhmiscellany/fileio.py,sha256=KmRnWWZJWBc5Or3_mKcRY2ehE_Fuk870iS-imtyERyg,18169
+zhmiscellany/fileio.py,sha256=VZY6kFEaHUHVFVYPDFiXqFVhogP_8dZJI9lITRVlVO4,19273
 zhmiscellany/gui.py,sha256=BDmM7e5ITKQuzxSzaYvPapQuPbQjCMTOq-GyMcLCIgg,10198
 zhmiscellany/image.py,sha256=qUjxiYpc2VVZp2vwr1vN36O2PVQ7YlMKzhegQ1u4c0M,8198
 zhmiscellany/list.py,sha256=S8Z85bLJEP9lk2JkGpzUcG6kpRB7a-NWDIHMPiF5bKo,1473
@@ -21,7 +21,7 @@ zhmiscellany/pipes.py,sha256=zETvWP4PF-PuSzYwR1UCodY4ftNAgmCChb9DUMofXok,4657
 zhmiscellany/processing.py,sha256=sDKIbzG9TNFyT6yJ4TJL59taG-59_v3CBLekVSLrwgE,10899
 zhmiscellany/rust.py,sha256=znN6DYNoa_p-braTuDZKvUnXX8reWLFu_dG4fv2vLR0,442
 zhmiscellany/string.py,sha256=xyqE6V5YF2nieZDcg5ZrXTIrH2D9oDRbZ5vQGz8rPys,4787
-zhmiscellany-6.1.6.dist-info/METADATA,sha256=74DbT6MYJYmfIGsC-NHS8E3DorFcbB-bJgwwxwbTStI,43823
-zhmiscellany-6.1.6.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-zhmiscellany-6.1.6.dist-info/top_level.txt,sha256=ioDtsrevCI52rTxZntMPljRIBsZs73tD0hI00HektiE,13
-zhmiscellany-6.1.6.dist-info/RECORD,,
+zhmiscellany-6.1.8.dist-info/METADATA,sha256=gBTbEel5SULO595eMgWhvWfm3LvTfxOYFFfg-w6qR44,43897
+zhmiscellany-6.1.8.dist-info/WHEEL,sha256=hPN0AlP2dZM_3ZJZWP4WooepkmU9wzjGgCLCeFjkHLA,92
+zhmiscellany-6.1.8.dist-info/top_level.txt,sha256=ioDtsrevCI52rTxZntMPljRIBsZs73tD0hI00HektiE,13
+zhmiscellany-6.1.8.dist-info/RECORD,,

{zhmiscellany-6.1.6.dist-info → zhmiscellany-6.1.8.dist-info}/WHEEL

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