naeural-client 2.7.7__py3-none-any.whl → 2.7.8__py3-none-any.whl

naeural_client/_ver.py

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

naeural_client/base/generic_session.py

@@ -212,7 +212,8 @@ class GenericSession(BaseDecentrAIObject):
     self._dct_online_nodes_last_heartbeat: dict[str, dict] = {}
     self._dct_can_send_to_node: dict[str, bool] = {}
     self._dct_node_last_seen_time = {} # key is node address
-    self._dct_node_addr_name = {}
+    self.__dct_node_address_to_alias = {}
+    self.__dct_node_eth_addr_to_node_addr = {}
 
     self._dct_netconfig_pipelines_requests = {}
     
@@ -486,17 +487,24 @@ class GenericSession(BaseDecentrAIObject):
       """
       return self.filter_workers is not None and node_addr not in self.filter_workers
 
-    def __track_online_node(self, node_addr, node_id):
+    def __track_online_node(self, node_addr, node_id, node_eth_address=None):
       """
       Track the last time a node was seen online.
 
       Parameters
       ----------
+      node_id : str
+          The alias of the Ratio1 edge node that sent the message.
       node_addr : str
-          The address of the Naeural Edge Protocol edge node that sent the message.
+          The address of the Ratio1 edge node that sent the message.
+      node_eth_address : str, optional
+          The Ethereum address of the Ratio1 edge node that sent the message, by
       """
       self._dct_node_last_seen_time[node_addr] = tm()
-      self._dct_node_addr_name[node_addr] = node_id
+      self.__dct_node_address_to_alias[node_addr] = node_id
+      if node_eth_address is not None:
+        self.__dct_node_eth_addr_to_node_addr[node_eth_address] = node_addr
+      # endif node_eth address not provided - this is just for safety and it should not happen!
       return
 
     def __track_allowed_node_by_hb(self, node_addr, dict_msg):
@@ -586,9 +594,14 @@ class GenericSession(BaseDecentrAIObject):
       node_secured = dict_msg.get(PAYLOAD_DATA.NETMON_NODE_SECURED, False)
       node_online = dict_msg.get(PAYLOAD_DATA.NETMON_STATUS_KEY) == PAYLOAD_DATA.NETMON_STATUS_ONLINE
       node_alias = dict_msg.get(PAYLOAD_DATA.NETMON_EEID, None)
+      node_eth_address = dict_msg.get(PAYLOAD_DATA.NETMON_ETH_ADDRESS, None)
       
       if node_online:
-        self.__track_online_node(node_addr, node_alias)
+        self.__track_online_node(
+          node_addr=node_addr,
+          node_id=node_alias,
+          node_eth_address=node_eth_address
+        )
       
       client_is_allowed = self.bc_engine.contains_current_address(node_whitelist)
       can_send = not node_secured or client_is_allowed or self.bc_engine.address == node_addr      
@@ -654,9 +667,14 @@ class GenericSession(BaseDecentrAIObject):
       self._dct_online_nodes_last_heartbeat[msg_node_addr] = dict_msg
 
       msg_node_id = dict_msg[PAYLOAD_DATA.EE_ID]
+      msg_node_eth_addr = dict_msg.get(PAYLOAD_DATA.EE_ETH_ADDR, None)
       # track the node based on heartbeat - a normal heartbeat means the node is online
       # however this can lead to long wait times for the first heartbeat for all nodes
-      self.__track_online_node(msg_node_addr, msg_node_id)
+      self.__track_online_node(
+        node_addr=msg_node_addr,
+        node_id=msg_node_id,
+        node_eth_address=msg_node_eth_addr
+      )
 
       msg_active_configs = dict_msg.get(HB.CONFIG_STREAMS)
       if msg_active_configs is None:
@@ -1379,12 +1397,12 @@ class GenericSession(BaseDecentrAIObject):
         self._config[comm_ct.SECURED] = secured
         
       return
-    
+
     def __aliases_to_addresses(self):
       """
       Convert the aliases to addresses.
       """
-      dct_aliases = {v: k for k, v in self._dct_node_addr_name.items()}
+      dct_aliases = {v: k for k, v in self.__dct_node_address_to_alias.items()}
       return dct_aliases
 
     def __get_node_address(self, node):
@@ -1403,12 +1421,13 @@ class GenericSession(BaseDecentrAIObject):
       str
           The address of the node.
       """
-      # if node not in self.get_active_nodes():
-      #   node = next((key for key, value in self._dct_node_addr_name.items() if value == node), node)
       result = None
-      if node in self.get_active_nodes():
+      if node in self._dct_node_last_seen_time.keys():
         # node seems to be already an address
         result = node
+      elif node in self.__dct_node_eth_addr_to_node_addr.keys():
+        # node is an eth address
+        result = self.__dct_node_eth_addr_to_node_addr.get(node, None)
       else:
         # maybe node is a name
         aliases = self.__aliases_to_addresses()
@@ -1791,9 +1810,9 @@ class GenericSession(BaseDecentrAIObject):
       return self.__get_node_address(name)      
       
 
-    def get_node_name(self, node_addr):
+    def get_node_alias(self, node_addr):
       """
-      Get the name of a node.
+      Get the alias of a node.
 
       Parameters
       ----------
@@ -1805,7 +1824,39 @@ class GenericSession(BaseDecentrAIObject):
       str
           The name of the node.
       """
-      return self._dct_node_addr_name.get(node_addr, None)
+      return self.__dct_node_address_to_alias.get(node_addr, None)
+
+    def get_addr_by_eth_address(self, eth_address):
+      """
+      Get the address of a node by its eth address.
+
+      Parameters
+      ----------
+      eth_address : str
+          The eth address of the node.
+
+      Returns
+      -------
+      str
+          The address of the node.
+      """
+      return self.__dct_node_eth_addr_to_node_addr.get(eth_address, None)
+
+    def get_eth_address_by_addr(self, node_addr):
+      """
+      Get the eth address of a node by its address.
+
+      Parameters
+      ----------
+      node_addr : str
+          The address of the node.
+
+      Returns
+      -------
+      str
+          The eth address of the node.
+      """
+      return self.bc_engine.node_address_to_eth_address(node_addr)
 
     def get_active_nodes(self):
       """
@@ -2173,14 +2224,15 @@ class GenericSession(BaseDecentrAIObject):
       Parameters
       ----------
       node : str
-          The address or name of the Naeural Edge Protocol edge node.
+          The address or name of the Ratio1 edge node.
 
       Returns
       -------
       bool
           True if the node is online, False otherwise.
       """
-      return node in self.get_active_nodes() or node in self._dct_node_addr_name.values()
+      node = self.__get_node_address(node)
+      return node in self.get_active_nodes()
 
     def create_chain_dist_custom_job(
       self,
@@ -2846,7 +2898,7 @@ class GenericSession(BaseDecentrAIObject):
               val = seconds_to_short_format(val)
             elif key == PAYLOAD_DATA.NETMON_ADDRESS:
               if self.bc_engine._remove_prefix(val) == self.bc_engine._remove_prefix(best_super):
-                # again self.get_node_name(best_super) might not work if using the hb data
+                # again self.get_node_alias(best_super) might not work if using the hb data
                 best_super_alias = node_info.get(PAYLOAD_DATA.NETMON_EEID, None)
               val = self.bc_engine._add_prefix(val)
               if all_info:

naeural_client/base/pipeline.py

@@ -1541,11 +1541,24 @@ class Pipeline(BaseCodeChecker):
       # end for instance
       return
 
+    @property
+    def node_alias(self):
+      """
+      Return the node alias of the pipeline.
+      """
+      return self.session.get_node_alias(self.node_addr)
+
     @property
     def node_id(self):
       """
-      Return the node id of the pipeline.
+      Method alias for `node_alias`
       """
-      return self.session.get_node_name(self.node_addr)
+      return self.node_alias
 
+    @property
+    def node_name(self):
+      """
+      Method alias for `node_alias`
+      """
+      return self.node_alias
 

naeural_client/const/payload.py

@@ -199,6 +199,7 @@ class PAYLOAD_DATA:
   NETMON_STATUS_KEY = "working"
   NETMON_STATUS_ONLINE = "ONLINE"
   NETMON_ADDRESS = "address"
+  NETMON_ETH_ADDRESS = "eth_address"
   NETMON_EEID = "eeid"
   NETMON_LAST_REMOTE_TIME = 'last_remote_time'
   NETMON_NODE_UTC = 'node_utc'

{naeural_client-2.7.7.dist-info → naeural_client-2.7.8.dist-info}/METADATA

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

@@ -1,12 +1,12 @@
 naeural_client/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-naeural_client/_ver.py,sha256=OLKx8hnD71ZUP5b74nYB4l0k_HtixADmnEBuBvOqDu0,330
+naeural_client/_ver.py,sha256=xyIpvn7b735D9Wb7uaQLhUG4S1REdX5ilj50twPH4lk,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
 naeural_client/base/distributed_custom_code_presets.py,sha256=cvz5R88P6Z5V61Ce1vHVVh8bOkgXd6gve_vdESDNAsg,2544
-naeural_client/base/generic_session.py,sha256=ZcfiPGYvp4hh_SU9W3Bp6N2ClwWvsB6jNB4amvwF8QI,108236
+naeural_client/base/generic_session.py,sha256=BdM28wRfDIqzAMOD3Msrtm8b-foDBo6X825MjyXGI5g,109812
 naeural_client/base/instance.py,sha256=kcZJmjLBtx8Bjj_ysIOx1JmLA-qSpG7E28j5rq6IYus,20444
-naeural_client/base/pipeline.py,sha256=EvESG5UH5GwyAZbJWJk1irTzGYBuOUjl-8KjkCdgLVI,58574
+naeural_client/base/pipeline.py,sha256=SNl0QLJTbaP_mlwVm1p9Vwxo72Q1Bp2ls3rt1WGPg7c,58828
 naeural_client/base/plugin_template.py,sha256=7YAFaND2iXoZLgtunjYkFf_TBGieFr3VdNLO3vCqzmM,138795
 naeural_client/base/responses.py,sha256=ZKBZmRhYDv8M8mQ5C_ahGsQvtWH4b9ImRcuerQdZmNw,6937
 naeural_client/base/transaction.py,sha256=bfs6td5M0fINgPQNxhrl_AUjb1YiilLDQ-Cd_o3OR_E,5146
@@ -40,7 +40,7 @@ naeural_client/const/environment.py,sha256=RpdDhDgB8NgRoFTk28eODigf9y0WcT9lul6mB
 naeural_client/const/formatter.py,sha256=AW3bWlqf39uaqV4BBUuW95qKYfF2OkkU4f9hy3kSVhM,200
 naeural_client/const/heartbeat.py,sha256=xHZBX_NzHTklwA2_AEKR0SGdlbavMT4nirqjQg8WlTU,2550
 naeural_client/const/misc.py,sha256=VDCwwpf5bl9ltx9rzT2WPVP8B3mZFRufU1tSS5MO240,413
-naeural_client/const/payload.py,sha256=cKfl2RO1VowrLM0KlYoZQIcwFs_mOCC9xzEZtj0pS9E,6563
+naeural_client/const/payload.py,sha256=u_FLn19EJCDo4UqVfUX9ExikFWE-YFEhkj-Ij8an0VQ,6600
 naeural_client/default/__init__.py,sha256=ozU6CMMuWl0LhG8Ae3LrZ65a6tLrptfscVYGf83zjxM,46
 naeural_client/default/instance/__init__.py,sha256=_cr6a9gProAZKL9_uz855q2pWt2jHwqE16ed8sm6V8I,653
 naeural_client/default/instance/chain_dist_custom_job_01_plugin.py,sha256=QtHi3uXKsVs9eyMgbnvBVbMylErhV1Du4X2-7zDL7Y0,1915
@@ -84,8 +84,8 @@ naeural_client/utils/comm_utils.py,sha256=4cS9llRr_pK_3rNgDcRMCQwYPO0kcNU7AdWy_L
 naeural_client/utils/config.py,sha256=QDrVywnhmf1k-sAb5jIBHZ_80TjNZk02uRG-t8mYLKQ,7413
 naeural_client/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
 naeural_client/utils/oracle_sync/oracle_tester.py,sha256=GmZwu2JM9_UB2K-4rKB3o0RgWLqM-7Im6HwBnQLXmHI,25312
-naeural_client-2.7.7.dist-info/METADATA,sha256=sROG0Xv0ef9ZdLou3W3d4FBhy8sYOiNyknRjy6gL8oU,12353
-naeural_client-2.7.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-naeural_client-2.7.7.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
-naeural_client-2.7.7.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-naeural_client-2.7.7.dist-info/RECORD,,
+naeural_client-2.7.8.dist-info/METADATA,sha256=14nrgXbF5gavIW1PCqmurhH5_7HD5lbrVIlo9BObw_E,12353
+naeural_client-2.7.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+naeural_client-2.7.8.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
+naeural_client-2.7.8.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+naeural_client-2.7.8.dist-info/RECORD,,