updated cache_bundle -> bundle, removed unused json_serialize function (superceded by Pydantic)

Author: lukvmil

src/rid_lib/ext/cache.py

@@ -13,19 +13,19 @@ def file_path_to(self, rid: RID) -> str:
         encoded_rid_str = b64_encode(str(rid))
         return f"{self.directory_path}/{encoded_rid_str}.json"
 
-    def write(self, cache_bundle: Bundle) -> Bundle:
+    def write(self, bundle: Bundle) -> Bundle:
         """Writes bundle to cache, returns a Bundle."""
         if not os.path.exists(self.directory_path):
             os.makedirs(self.directory_path)
 
         with open(
-            file=self.file_path_to(cache_bundle.manifest.rid), 
+            file=self.file_path_to(bundle.manifest.rid), 
             mode="w", 
             encoding="utf-8"
         ) as f:
-            f.write(cache_bundle.model_dump_json(indent=2))
+            f.write(bundle.model_dump_json(indent=2))
 
-        return cache_bundle
+        return bundle
 
     def exists(self, rid: RID) -> bool:
         return os.path.exists(

src/rid_lib/ext/utils.py

@@ -1,10 +1,7 @@
 import json
 import hashlib
 from base64 import urlsafe_b64encode, urlsafe_b64decode
-from dataclasses import asdict, is_dataclass
-from datetime import datetime
 from pydantic import BaseModel
-from rid_lib import RID
 
 
 def sha256_hash_json(data: dict | BaseModel):
@@ -22,18 +19,4 @@ def b64_encode(string: str):
 
 def b64_decode(string: str):
     return urlsafe_b64decode(
-        (string + "=" * (-len(string) % 4)).encode()).decode()
-
-def json_serialize(obj):
-    if isinstance(obj, RID):
-        return str(obj)
-    elif is_dataclass(obj) and not isinstance(obj, type):
-        return json_serialize(asdict(obj))
-    elif isinstance(obj, datetime):
-        return obj.isoformat()
-    elif isinstance(obj, (list, tuple)):
-        return [json_serialize(item) for item in obj]
-    elif isinstance(obj, dict):
-        return {key: json_serialize(value) for key, value in obj.items()}
-    else:
-        return obj
+        (string + "=" * (-len(string) % 4)).encode()).decode()