naeural-client 3.0.1__py3-none-any.whl → 3.0.3__py3-none-any.whl

naeural_client/_ver.py

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

naeural_client/ipfs/r1fs.py

@@ -528,15 +528,23 @@ class R1FSEngine:
     if self.ipfs_started:
       return
     
+    self.P("Starting R1FS...", color='m')
+    
     if base64_swarm_key is None:
       base64_swarm_key = os.getenv(IPFSCt.EE_SWARM_KEY_CONTENT_BASE64_ENV_KEY)
       if base64_swarm_key is not None:
-        self.P("Found IPFS swarm key in environment variable.", color='d')
+        self.P(f"Found env IPFS swarm key: {str(base64_swarm_key)[:4]}...", color='d')
+        if len(base64_swarm_key) < 10:
+          self.P(f"Invalid IPFS swarm key: `{base64_swarm_key}`", color='r')
+          return False
       
     if ipfs_relay is None:
       ipfs_relay = os.getenv(IPFSCt.EE_IPFS_RELAY_ENV_KEY)
       if ipfs_relay is not None:
-        self.P("Found IPFS relay in environment variable.", color='d')
+        self.P(f"Found env IPFS relay: {ipfs_relay}", color='d')
+        if len(ipfs_relay) < 10:
+          self.P(f"Invalid IPFS relay: `{ipfs_relay}`", color='r')
+          return False
       
     
     if not base64_swarm_key or not ipfs_relay:
@@ -551,12 +559,14 @@ class R1FSEngine:
     msg += f"\n  Download: {self.__downloads_dir}"
     msg += f"\n  Upload:   {self.__uploads_dir}"
     msg += f"\n  SwarmKey: {hidden_base64_swarm_key}"
-    self.P(msg, color='m')
+    self.P(msg, color='d')
     
     ipfs_repo = os.path.expanduser("~/.ipfs")
     os.makedirs(ipfs_repo, exist_ok=True)
     config_path = os.path.join(ipfs_repo, "config")
     swarm_key_path = os.path.join(ipfs_repo, "swarm.key")
+    
+    # TODO: maybe here we need to update swarm.key if the ~/.ipfs is volume mounted
 
     if not os.path.isfile(config_path):
       # Repository is not initialized; write the swarm key and init.
@@ -609,12 +619,16 @@ class R1FSEngine:
     try:
       my_id = self.__get_id()
       assert my_id != ERROR_TAG, "Failed to get IPFS ID."
-      self.P("IPFS ID: " + my_id, color='g')
-      self.P(f"Connecting to relay: {ipfs_relay}")
+      msg =  f"Connecting to R1FS relay"
+      msg += f"\n  IPFS ID:    {my_id}"
+      msg += f"\n  IPFS Addr:  {self.__ipfs_address}"
+      msg += f"\n  IPFS Agent: {self.__ipfs_agent}"
+      msg += f"\n  Relay:      {ipfs_relay}"
+      self.P(msg, color='m')
       result = self.__run_command(["ipfs", "swarm", "connect", ipfs_relay])
       relay_ip = ipfs_relay.split("/")[2]
       if "connect" in result.lower() and "success" in result.lower():
-        self.P(f"R1FS connected to: {relay_ip}", color='g', boxed=True)
+        self.P(f"{my_id} connected to: {relay_ip}", color='g', boxed=True)
         self.__ipfs_started = True
       else:
         self.P("Relay connection result did not indicate success.", color='r')

{naeural_client-3.0.1.dist-info → naeural_client-3.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naeural_client
-Version: 3.0.1
+Version: 3.0.3
 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-3.0.1.dist-info → naeural_client-3.0.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 naeural_client/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-naeural_client/_ver.py,sha256=GM3HOpu1UjzlMJ16igSUpevkN9uk8-FtzD3cdJgX8qM,330
+naeural_client/_ver.py,sha256=zsIkCPDIjjFJe67LB09iUq1RO3eenvp4bjNse_1gIps,330
 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
@@ -62,7 +62,7 @@ naeural_client/io_formatter/default/aixp1.py,sha256=MX0TeUR4APA-qN3vUC6uzcz8Pssz
 naeural_client/io_formatter/default/default.py,sha256=gEy78cP2D5s0y8vQh4aHuxqz7D10gGfuiKF311QhrpE,494
 naeural_client/ipfs/__init__.py,sha256=vXEDLUNUO6lOTMGa8iQ9Zf7ajIQq9GZuvYraAHt3meE,38
 naeural_client/ipfs/ifps_keygen,sha256=PcoYuo4c89_C9FWrKq9K_28ruhKqnxNn1s3nLHiF1tc,879
-naeural_client/ipfs/r1fs.py,sha256=IKJZG3jiodvXT6tfRWKQtg4oALQ9H9OhW85q1JGnd58,18653
+naeural_client/ipfs/r1fs.py,sha256=osLLpNgKi43fj-uqldMc62MoN2ryRnbPWtI5uedRM0Y,19225
 naeural_client/ipfs/ipfs_setup/ipfs.service,sha256=isTJQsktPy4i1yaDA9AC1OKdlTYvsCCRRAVX-EmGqAs,248
 naeural_client/ipfs/ipfs_setup/launch_service.sh,sha256=GWhZyNqtohLxJg8Q_c8YnNZduu1ddXDU-IFRRMaEyiY,141
 naeural_client/ipfs/ipfs_setup/restart.sh,sha256=9xHMgkUoAMI25jeaoDVFbCa_LjojYm3ubljW58RatKE,22
@@ -96,8 +96,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-3.0.1.dist-info/METADATA,sha256=c9VxeNWlJqSwtxY8U-4SdgaLMT3kd221ySdPmLN0YVo,12353
-naeural_client-3.0.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-naeural_client-3.0.1.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
-naeural_client-3.0.1.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-naeural_client-3.0.1.dist-info/RECORD,,
+naeural_client-3.0.3.dist-info/METADATA,sha256=HwVdrMiths1CWxOo0iE3zR6qww8bknBZ5wNkNF4riRY,12353
+naeural_client-3.0.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+naeural_client-3.0.3.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
+naeural_client-3.0.3.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+naeural_client-3.0.3.dist-info/RECORD,,