zhmiscellany 6.3.6__py3-none-any.whl → 6.3.7__py3-none-any.whl

zhmiscellany/fileio.py

@@ -231,77 +231,78 @@ def cache(function, *args, _cache_compressed=False, **kwargs):
 
     cache_folder = 'zhmiscellany_cache'
 
-    def get_hash_orjson(data):
-        def default_converter(obj):
-            if callable(obj):
-                try:
-                    return inspect.getsource(obj)
-                except (OSError, TypeError):
-                    return str(obj)  # Fallback for lambdas/partials
-
-            # DICT-LIKE OBJECTS WITH NON-STRING KEYS (e.g., bidict, defaultdict, etc.)
-            # Convert keys to strings to make them JSON-serializable
-            if isinstance(obj, dict):
-                try:
-                    # Check if any key is not a string
-                    if any(not isinstance(k, str) for k in obj.keys()):
-                        return {str(k): v for k, v in obj.items()}
-                except (TypeError, AttributeError):
-                    pass
-
-            # PANDAS DATAFRAMES: Convert to stable dictionary format
-            if hasattr(obj, '__class__') and obj.__class__.__name__ == 'DataFrame':
-                try:
-                    import pandas as pd
-                    if isinstance(obj, pd.DataFrame):
-                        # Convert to dict with records orientation for stability
-                        # Include dtypes to ensure type information is preserved
-                        return {
-                            'data': obj.to_dict(orient='split'),
-                            'dtypes': {col: str(dtype) for col, dtype in obj.dtypes.items()},
-                            'index_name': obj.index.name,
-                            'columns': list(obj.columns)
-                        }
-                except ImportError:
-                    pass
+    def normalize_for_json(obj):
+        """Recursively normalize objects to be JSON-serializable."""
+        if callable(obj):
+            try:
+                return ('__callable__', inspect.getsource(obj))
+            except (OSError, TypeError):
+                return ('__callable__', str(obj))
+
+        # Handle dict-like objects (including bidict, defaultdict, etc.)
+        if isinstance(obj, dict):
+            # Convert non-string keys to strings
+            return {str(k): normalize_for_json(v) for k, v in obj.items()}
+
+        # Handle lists and tuples
+        if isinstance(obj, (list, tuple)):
+            return type(obj)(normalize_for_json(item) for item in obj)
+
+        # Handle sets
+        if isinstance(obj, set):
+            return sorted([normalize_for_json(item) for item in obj])
+
+        # Handle pandas DataFrames
+        if hasattr(obj, '__class__') and obj.__class__.__name__ == 'DataFrame':
+            try:
+                import pandas as pd
+                if isinstance(obj, pd.DataFrame):
+                    return {
+                        '__type__': 'DataFrame',
+                        'data': obj.to_dict(orient='split'),
+                        'dtypes': {col: str(dtype) for col, dtype in obj.dtypes.items()},
+                        'index_name': obj.index.name,
+                        'columns': list(obj.columns)
+                    }
+            except ImportError:
+                pass
+
+        # Handle pandas Series
+        if hasattr(obj, '__class__') and obj.__class__.__name__ == 'Series':
+            try:
+                import pandas as pd
+                if isinstance(obj, pd.Series):
+                    return {
+                        '__type__': 'Series',
+                        'data': obj.to_dict(),
+                        'dtype': str(obj.dtype),
+                        'name': obj.name,
+                        'index': list(obj.index)
+                    }
+            except ImportError:
+                pass
+
+        # Handle bytes
+        if isinstance(obj, bytes):
+            return ('__bytes__', obj.hex())
+
+        # Handle datetime
+        if isinstance(obj, datetime):
+            return ('__datetime__', obj.isoformat())
+
+        # Handle custom objects with __dict__
+        if hasattr(obj, '__dict__') and not isinstance(obj, type):
+            return {f'__{obj.__class__.__name__}__': normalize_for_json(obj.__dict__)}
+
+        # Return primitives as-is
+        return obj
 
-            # PANDAS SERIES: Similar handling
-            if hasattr(obj, '__class__') and obj.__class__.__name__ == 'Series':
-                try:
-                    import pandas as pd
-                    if isinstance(obj, pd.Series):
-                        return {
-                            'data': obj.to_dict(),
-                            'dtype': str(obj.dtype),
-                            'name': obj.name,
-                            'index': list(obj.index)
-                        }
-                except ImportError:
-                    pass
-
-            # 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))
-
-            # BYTES: Decode to string (if utf-8) or hex
-            if isinstance(obj, bytes):
-                return obj.hex()
-
-            # 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)
+    def get_hash_orjson(data):
+        # Pre-process the data to handle non-string keys and other issues
+        normalized_data = normalize_for_json(data)
 
         json_bytes = orjson.dumps(
-            data,
-            default=default_converter,
+            normalized_data,
             option=orjson.OPT_SORT_KEYS
         )
         return hashlib.md5(json_bytes).hexdigest()

{zhmiscellany-6.3.6.dist-info → zhmiscellany-6.3.7.dist-info}/METADATA

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

{zhmiscellany-6.3.6.dist-info → zhmiscellany-6.3.7.dist-info}/RECORD

@@ -8,7 +8,7 @@ zhmiscellany/_resource_files_lookup.py,sha256=hsgPW0dngokgqWrAVAv5rUo-eobzJPjvWH
 zhmiscellany/cpp.py,sha256=XEUEoIKCDCdY5VgwNWE5oXrGjtsmGdz_MnaVwQmi2dk,179
 zhmiscellany/dict.py,sha256=dNu3G9qiJeLgE7JY3QD31GJU7EfLsYPqxf8AOhBsYag,81
 zhmiscellany/discord.py,sha256=yKoigWI3tONfYSoMEynGGEWW1VsXSRdkg8vPbIKwBNI,20312
-zhmiscellany/fileio.py,sha256=7eMIrLBX69KLdxNbFur8hG16iZkg570LzOGizU2h2s4,22676
+zhmiscellany/fileio.py,sha256=Muiktj_fzCBNBzVMktJzKBkT1_Ssx3EbKkaBGkm6NPA,22372
 zhmiscellany/gui.py,sha256=OVwuZ_kWHJlgKPeYR7fAAyomNmU-OnxOgXZelVNPm1w,10409
 zhmiscellany/image.py,sha256=6Hz5sfym_o7FHokGUKeXRsjl89VY_ZMSLnvuSam1icI,8265
 zhmiscellany/list.py,sha256=BnbYG-lpHmi0C4v8jLfaeXqQdc3opmNgkvY6yz4pasg,1475
@@ -21,7 +21,7 @@ zhmiscellany/pipes.py,sha256=RlHxsW_M_R6UJUIDgYVS_zfqUwO8kXG8j-0YG5qByjo,4637
 zhmiscellany/processing.py,sha256=ZhNAJ5OfCUHuaXj0z6XZ94ZGSK86-EdCyqW-9ILayLg,11524
 zhmiscellany/rust.py,sha256=cHkSpdtq7QQW3yzBEAYL9lZxLW0h4wal2tsxIOnyTrA,494
 zhmiscellany/string.py,sha256=A4ilBWSYlrJ0AJ0axvepSSjYCYwYk5X-vRrHNphi_ow,4809
-zhmiscellany-6.3.6.dist-info/METADATA,sha256=HjIrPNfZ5x7q3srMfDGlcC8_Jkl5WWLPLdO-wkRS798,43872
-zhmiscellany-6.3.6.dist-info/WHEEL,sha256=hPN0AlP2dZM_3ZJZWP4WooepkmU9wzjGgCLCeFjkHLA,92
-zhmiscellany-6.3.6.dist-info/top_level.txt,sha256=ioDtsrevCI52rTxZntMPljRIBsZs73tD0hI00HektiE,13
-zhmiscellany-6.3.6.dist-info/RECORD,,
+zhmiscellany-6.3.7.dist-info/METADATA,sha256=wtzaVO-OHJfk0qnhUfzRKlZj9ZihD0BEL4zoP0ILFGY,43872
+zhmiscellany-6.3.7.dist-info/WHEEL,sha256=hPN0AlP2dZM_3ZJZWP4WooepkmU9wzjGgCLCeFjkHLA,92
+zhmiscellany-6.3.7.dist-info/top_level.txt,sha256=ioDtsrevCI52rTxZntMPljRIBsZs73tD0hI00HektiE,13
+zhmiscellany-6.3.7.dist-info/RECORD,,