ratio1 3.4.82__tar.gz → 3.4.84__tar.gz

{ratio1-3.4.82 → ratio1-3.4.84}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ratio1
-Version: 3.4.82
+Version: 3.4.84
 Summary: `ratio1` or Ration1 SDK is the Python SDK required for client app development for the Ratio1 ecosystem
 Project-URL: Homepage, https://github.com/Ratio1/ratio1_sdk
 Project-URL: Bug Tracker, https://github.com/Ratio1/ratio1_sdk/issues

{ratio1-3.4.82 → ratio1-3.4.84}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ratio1"
-version = "3.4.82"
+version = "3.4.84"
 authors = [
   { name="Andrei Ionut Damian", email="andrei.damian@ratio1.ai" },
   { name="Cristan Bleotiu", email="cristian.bleotiu@ratio1.ai" },

{ratio1-3.4.82 → ratio1-3.4.84}/ratio1/_ver.py

@@ -1,4 +1,4 @@
-__VER__ = "3.4.82"
+__VER__ = "3.4.84"
 
 if __name__ == "__main__":
   with open("pyproject.toml", "rt") as fd:

{ratio1-3.4.82 → ratio1-3.4.84}/ratio1/ipfs/r1fs.py

@@ -67,6 +67,7 @@ from io import BytesIO
 import ssl
 from requests.auth import HTTPBasicAuth
 import tempfile
+import random
 
 from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
 
@@ -739,9 +740,10 @@ class R1FSEngine:
     def add_file(
       self,
       file_path: str,
+      nonce: int = None,
       secret: str = None,
       raise_on_error: bool = False,
-      show_logs: bool = True
+      show_logs: bool = True,
     ) -> str:
       """
       Add a file to R1FS with default encryption. The secret parameter is mandatory,
@@ -797,7 +799,12 @@ class R1FSEngine:
         raise ValueError(f"File {file_path} is too large ({file_size} bytes). Maximum allowed size is 2 GB.")
 
       key = self._hash_secret(secret)  # mandatory passphrase
-      nonce = os.urandom(12)           # recommended for GCM
+
+      if nonce is None:
+        nonce = os.urandom(12)           # recommended for GCM
+      else:
+        nonce = random.Random(nonce).randbytes(12)
+
       original_basename = os.path.basename(file_path)
 
       # JSON metadata storing the original filename

{ratio1-3.4.82 → ratio1-3.4.84}/ratio1/logging/logger_mixins/pickle_serialization_mixin.py

@@ -89,6 +89,8 @@ class _PickleSerializationMixin(object):
     os.makedirs(os.path.split(datafile)[0], exist_ok=True)
 
     tm_start = time()
+    tm_elapsed = None
+    err_msg = None
     if compressed or '.pklz' in fn:
       if not compressed:
         P("Saving pickle with compression=True forced due to extension")
@@ -106,11 +108,15 @@ class _PickleSerializationMixin(object):
           with open(datafile, 'wb') as fhandle:
             pickle.dump(data, fhandle, protocol=pickle.HIGHEST_PROTOCOL)
           tm_elapsed = time() - tm_start
-        except:
-          pass
-    # endwith conditional lock
-      if verbose:
-        P("  Saved pickle '{}' in '{}' folder in {:.1f}s".format(fn, folder, tm_elapsed))
+        except Exception as e:
+          err_msg = e
+      if tm_elapsed is not None:
+        if verbose:
+          P("  Saved pickle '{}' in '{}' folder in {:.1f}s".format(fn, folder, tm_elapsed))
+      else:
+        # maybe show this only if verbose?
+        P(f"  FAILED pickle save! Error: {err_msg}")
+    # endif compressed or not
     return datafile