ratio1 3.4.82__py3-none-any.whl → 3.4.84__py3-none-any.whl

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/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/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
 
 

{ratio1-3.4.82.dist-info → ratio1-3.4.84.dist-info}/METADATA

@@ -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.dist-info → ratio1-3.4.84.dist-info}/RECORD

@@ -1,5 +1,5 @@
 ratio1/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-ratio1/_ver.py,sha256=PohojJjl3IBbYbTACoP-pqohIaJFzWjWhiQUXacX6fo,331
+ratio1/_ver.py,sha256=_MLEuDeZiCUunApTcwOfbV0uV-7L8FXhhe9_9nS_nWk,331
 ratio1/base_decentra_object.py,sha256=iXvAAf6wPnGWzeeiRfwLojVoan-m1e_VsyPzjUQuENo,4492
 ratio1/plugins_manager_mixin.py,sha256=X1JdGLDz0gN1rPnTN_5mJXR8JmqoBFQISJXmPR9yvCo,11106
 ratio1/base/__init__.py,sha256=hACh83_cIv7-PwYMM3bQm2IBmNqiHw-3PAfDfAEKz9A,259
@@ -68,7 +68,7 @@ ratio1/io_formatter/default/aixp1.py,sha256=MX0TeUR4APA-qN3vUC6uzcz8Pssz5lgrQWo7
 ratio1/io_formatter/default/default.py,sha256=gEy78cP2D5s0y8vQh4aHuxqz7D10gGfuiKF311QhrpE,494
 ratio1/ipfs/__init__.py,sha256=vXEDLUNUO6lOTMGa8iQ9Zf7ajIQq9GZuvYraAHt3meE,38
 ratio1/ipfs/ifps_keygen,sha256=PcoYuo4c89_C9FWrKq9K_28ruhKqnxNn1s3nLHiF1tc,879
-ratio1/ipfs/r1fs.py,sha256=vpX2b_FdgWgC_ArY8JgW-D_9TbhIPIsNN2YFLB39mJs,49327
+ratio1/ipfs/r1fs.py,sha256=bslLpr0FTiqBsXPCoAqmH62MDki1lkvgW-oT7TvgFcQ,49458
 ratio1/ipfs/ipfs_setup/ipfs.service,sha256=isTJQsktPy4i1yaDA9AC1OKdlTYvsCCRRAVX-EmGqAs,248
 ratio1/ipfs/ipfs_setup/launch_service.sh,sha256=GWhZyNqtohLxJg8Q_c8YnNZduu1ddXDU-IFRRMaEyiY,141
 ratio1/ipfs/ipfs_setup/restart.sh,sha256=9xHMgkUoAMI25jeaoDVFbCa_LjojYm3ubljW58RatKE,22
@@ -87,7 +87,7 @@ ratio1/logging/logger_mixins/download_mixin.py,sha256=ZZ1QuQ7kDcUkxhu65odD2pvBRl
 ratio1/logging/logger_mixins/general_serialization_mixin.py,sha256=bNM-6AsYhKD56v79hvJDgO8un5rHH4IKv1XJ3yksseQ,7424
 ratio1/logging/logger_mixins/json_serialization_mixin.py,sha256=JnfVOdQQTlx10sTLjQv8d7DO-1lNKuK4E8vMSE_t--Q,15198
 ratio1/logging/logger_mixins/machine_mixin.py,sha256=VoGijSjj0CwfbSo_jjp3uvs_aovWwQHNDEqu5jzmWJE,3640
-ratio1/logging/logger_mixins/pickle_serialization_mixin.py,sha256=wQK8nqRmABo_JU_iX1TsIHcfpgAzcP6IJUhPPvHdt-8,9346
+ratio1/logging/logger_mixins/pickle_serialization_mixin.py,sha256=T2NubHBoXPkIjSEM-9NgIiYfVbOk3qHI2VQ2BkHp_MY,9553
 ratio1/logging/logger_mixins/process_mixin.py,sha256=eI0izBAhStPOant2SZv2ZuTDH10s2ON_CkuGQEEFew4,1888
 ratio1/logging/logger_mixins/resource_size_mixin.py,sha256=nH0R9RmhJxatX_qSQu_CtkLD6sH2stMOylpp_Ym6mHI,2281
 ratio1/logging/logger_mixins/timers_mixin.py,sha256=jXQvGxpemTrKZRI5ydrTUYrqAnXzZnvwzpqN4agJlGo,17299
@@ -103,8 +103,8 @@ ratio1/utils/comm_utils.py,sha256=4cS9llRr_pK_3rNgDcRMCQwYPO0kcNU7AdWy_LtMyCY,10
 ratio1/utils/config.py,sha256=Elfkl7W4aDMvB5WZLiYlPXrecBncgTxb4hcKhQedMzI,10111
 ratio1/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
 ratio1/utils/oracle_sync/oracle_tester.py,sha256=aJOPcZhtbw1XPqsFG4qYpfv2Taj5-qRXbwJzrPyeXDE,27465
-ratio1-3.4.82.dist-info/METADATA,sha256=Yez_0wqWcW8oBNZMwfAYOdJHQvCR4EBE1K8VBmdB2K8,12255
-ratio1-3.4.82.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ratio1-3.4.82.dist-info/entry_points.txt,sha256=DR_olREzU1egwmgek3s4GfQslBi-KR7lXsd4ap0TFxE,46
-ratio1-3.4.82.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-ratio1-3.4.82.dist-info/RECORD,,
+ratio1-3.4.84.dist-info/METADATA,sha256=rtoAy7UB59eVghuv0hNVKyhb-oGwBR29u2c8WajHzck,12255
+ratio1-3.4.84.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ratio1-3.4.84.dist-info/entry_points.txt,sha256=DR_olREzU1egwmgek3s4GfQslBi-KR7lXsd4ap0TFxE,46
+ratio1-3.4.84.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+ratio1-3.4.84.dist-info/RECORD,,