naeural-client 2.7.40__tar.gz → 2.7.41__tar.gz

{naeural_client-2.7.40 → naeural_client-2.7.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naeural_client
-Version: 2.7.40
+Version: 2.7.41
 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 → naeural_client-2.7.41}/naeural_client/_ver.py

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

{naeural_client-2.7.40 → naeural_client-2.7.41}/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,37 @@ 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):
+    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 +314,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 +339,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 +362,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 +432,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
 
@@ -529,7 +548,9 @@ class R1FSEngine:
             
     except Exception:
       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 → naeural_client-2.7.41}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "naeural_client"
-version = "2.7.40"
+version = "2.7.41"
 authors = [
   { name="Andrei Ionut Damian", email="andrei.damian@me.com" },
   { name="Cristan Bleotiu", email="cristibleotiu@gmail.com" },