naeural-client 2.7.40__py3-none-any.whl → 2.7.42__py3-none-any.whl

naeural_client/_ver.py

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

naeural_client/ipfs/r1fs.py

@@ -23,6 +23,10 @@ class IPFSCt:
   R1FS_UPLOADS = "ipfs_uploads"
   TEMP_DOWNLOAD = os.path.join("./_local_cache/_output", R1FS_DOWNLOADS)
   TEMP_UPLOAD = os.path.join("./_local_cache/_output", R1FS_UPLOADS)
+  
+  TIMEOUT = 90 # seconds
+  REPROVIDER = "1m"
+
 
 ERROR_TAG = "Unknown"
 
@@ -201,24 +205,38 @@ class R1FSEngine:
   def downloaded_files(self):
     return self.__downloaded_files
   
-  def get_unique_name(self, prefix="r1fs", suffix=""):
+  def _get_unique_name(self, prefix="r1fs", suffix=""):
     str_id = str(uuid.uuid4()).replace("-", "")[:8]
     return f"{prefix}_{str_id}{suffix}"
   
-  def get_unique_upload_name(self, prefix="r1fs", suffix=""):
-    return os.path.join(self.__uploads_dir, self.get_unique_name(prefix, suffix))
+  def _get_unique_upload_name(self, prefix="r1fs", suffix=""):
+    return os.path.join(self.__uploads_dir, self._get_unique_name(prefix, suffix))
   
-  def get_unique_or_complete_upload_name(self, fn=None, prefix="r1fs", suffix=""):
+  def _get_unique_or_complete_upload_name(self, fn=None, prefix="r1fs", suffix=""):
     if fn is not None and os.path.dirname(fn) == "":
       return os.path.join(self.__uploads_dir, fn)
-    return self.get_unique_upload_name(prefix, suffix)
+    return self._get_unique_upload_name(prefix, suffix)
+  
+  def __set_reprovider_interval(self):
+    # Command to set the Reprovider.Interval to 1 minute
+    cmd = ["ipfs", "config", "--json", "Reprovider.Interval", f'"{IPFSCt.REPROVIDER}"']
+    result = self.__run_command(cmd)
+    return
+
   
+  def __set_relay(self):
+    # Command to enable the IPFS relay
+    result = self.__run_command(
+      ["ipfs", "config", "--json", "Swarm.DisableRelay", "false"]
+    )
+    return
+
 
   def __run_command(
     self, 
     cmd_list: list, 
     raise_on_error=True,
-    timeout=60,
+    timeout=IPFSCt.TIMEOUT,
     verbose=False,
   ):
     """
@@ -297,7 +315,7 @@ class R1FSEngine:
           f.write(json_data)
         fn = f.name
       else:
-        fn = self.get_unique_or_complete_upload_name(fn=fn, suffix=".json")
+        fn = self._get_unique_or_complete_upload_name(fn=fn, suffix=".json")
         self.Pd(f"Using unique name for JSON: {fn}")
         with open(fn, "w") as f:
           f.write(json_data)
@@ -322,7 +340,7 @@ class R1FSEngine:
           f.write(yaml_data)
         fn = f.name
       else:
-        fn = self.get_unique_or_complete_upload_name(fn=fn, suffix=".yaml")
+        fn = self._get_unique_or_complete_upload_name(fn=fn, suffix=".yaml")
         self.Pd(f"Using unique name for YAML: {fn}")
         with open(fn, "w") as f:
           f.write(yaml_data)
@@ -345,7 +363,7 @@ class R1FSEngine:
           pickle.dump(data, f)
         fn = f.name
       else:
-        fn = self.get_unique_or_complete_upload_name(fn=fn, suffix=".pkl")
+        fn = self._get_unique_or_complete_upload_name(fn=fn, suffix=".pkl")
         self.Pd(f"Using unique name for pkl: {fn}")
         with open(fn, "wb") as f:
           pickle.dump(data, f)
@@ -415,14 +433,16 @@ class R1FSEngine:
       local_folder = os.path.join(local_folder, cid) # add the CID as a subfolder
       
     self.Pd(f"Downloading file {cid} to {local_folder}")
+    start_time = time.time()
     self.__run_command(["ipfs", "get", cid, "-o", local_folder])
+    elapsed_time = time.time() - start_time
     # now we need to get the file from the folder
     folder_contents = os.listdir(local_folder)
     if len(folder_contents) != 1:
       raise Exception(f"Expected one file in {local_folder}, found {folder_contents}")
     # get the full path of the file
     out_local_filename = os.path.join(local_folder, folder_contents[0])
-    self.P(f"Downloaded <{cid}> to {out_local_filename}")
+    self.P(f"Downloaded in {elapsed_time:.1f}s <{cid}> to {out_local_filename}")
     self.__downloaded_files[cid] = out_local_filename
     return out_local_filename
 
@@ -528,8 +548,11 @@ class R1FSEngine:
       self.P("IPFS daemon running", color='g')
             
     except Exception:
+      self.Pd("ipfs id failed, starting daemon...")
       try:
-        self.P("Starting IPFS daemon in background...")
+        self.__set_reprovider_interval()
+        self.__set_relay()
+        self.P("Starting IPFS daemon in background...")        
         subprocess.Popen(["ipfs", "daemon"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
         time.sleep(5)
       except Exception as e:

{naeural_client-2.7.40.dist-info → naeural_client-2.7.42.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naeural_client
-Version: 2.7.40
+Version: 2.7.42
 Summary: `naeural_client` is the Python SDK required for client app development for the Naeural Edge Protocol Edge Protocol framework
 Project-URL: Homepage, https://github.com/NaeuralEdgeProtocol/naeural_client
 Project-URL: Bug Tracker, https://github.com/NaeuralEdgeProtocol/naeural_client/issues

{naeural_client-2.7.40.dist-info → naeural_client-2.7.42.dist-info}/RECORD

@@ -1,5 +1,5 @@
 naeural_client/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-naeural_client/_ver.py,sha256=w-s-yz0eHjAKD9mUqSByv0yLn__Zw5dFOhJPHU7DI3w,331
+naeural_client/_ver.py,sha256=Q93aXw2mji9yRTgEWkuF0JwuicbvBiHlVU3oFdsJmUs,331
 naeural_client/base_decentra_object.py,sha256=C4iwZTkhKNBS4VHlJs5DfElRYLo4Q9l1V1DNVSk1fyQ,4412
 naeural_client/plugins_manager_mixin.py,sha256=X1JdGLDz0gN1rPnTN_5mJXR8JmqoBFQISJXmPR9yvCo,11106
 naeural_client/base/__init__.py,sha256=hACh83_cIv7-PwYMM3bQm2IBmNqiHw-3PAfDfAEKz9A,259
@@ -61,7 +61,7 @@ naeural_client/io_formatter/default/a_dummy.py,sha256=qr9eUizQ-NN5jdXVzkaZKMaf9K
 naeural_client/io_formatter/default/aixp1.py,sha256=MX0TeUR4APA-qN3vUC6uzcz8Pssz5lgrQWo7td5Ri1A,3052
 naeural_client/io_formatter/default/default.py,sha256=gEy78cP2D5s0y8vQh4aHuxqz7D10gGfuiKF311QhrpE,494
 naeural_client/ipfs/__init__.py,sha256=vXEDLUNUO6lOTMGa8iQ9Zf7ajIQq9GZuvYraAHt3meE,38
-naeural_client/ipfs/r1fs.py,sha256=u_Dy05wH_Xt4GTvxjLwSoz5hzRz0Tc2Tr-0c2BxwXtg,16503
+naeural_client/ipfs/r1fs.py,sha256=vqqSDulF1AlqrepCS8byGAv3JwNppMwbdS1KmuTvKw8,17213
 naeural_client/logging/__init__.py,sha256=b79X45VC6c37u32flKB2GAK9f-RR0ocwP0JDCy0t7QQ,33
 naeural_client/logging/base_logger.py,sha256=qqqMX30Vmh5Dz8YYaeL_ainQPTP5FsX1Y4QMbsIG5Rg,69599
 naeural_client/logging/small_logger.py,sha256=m12hCb_H4XifJYYfgCAOUDkcXm-h4pSODnFf277OFVI,2937
@@ -88,8 +88,8 @@ naeural_client/utils/comm_utils.py,sha256=4cS9llRr_pK_3rNgDcRMCQwYPO0kcNU7AdWy_L
 naeural_client/utils/config.py,sha256=lAbWe3UMi40BOdsAIZIb-fYtb4LwG3MIYg0EOA1ITr8,10340
 naeural_client/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
 naeural_client/utils/oracle_sync/oracle_tester.py,sha256=X-923ccjkr6_kzbbiuAAcWSIhMtBDOH2VURjTh55apQ,27235
-naeural_client-2.7.40.dist-info/METADATA,sha256=cRiEi7AbNAdspHTFOmzlUxQwk6MzIoKtTYwudP65_fo,12354
-naeural_client-2.7.40.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-naeural_client-2.7.40.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
-naeural_client-2.7.40.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-naeural_client-2.7.40.dist-info/RECORD,,
+naeural_client-2.7.42.dist-info/METADATA,sha256=_MgS-DeFCJsXJlhrvjUxxo2bzlFgs494DCfztb8JrOM,12354
+naeural_client-2.7.42.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+naeural_client-2.7.42.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
+naeural_client-2.7.42.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+naeural_client-2.7.42.dist-info/RECORD,,