naeural-client 2.7.3__py3-none-any.whl → 2.7.5__py3-none-any.whl

naeural_client/_ver.py

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

naeural_client/bc/base.py

@@ -1406,10 +1406,27 @@ class BaseBlockEngine:
         True if `address` meets the basic criteria for an EVM address, False otherwise.
     """
     return BaseBlockEngine.is_valid_evm_address(address)
-
+  
   
   @staticmethod
-  def web3_is_node_licensed(address : str, network=None) -> bool:
+  def get_evm_network() -> str:
+    """
+    Get the current network
+
+    Returns
+    -------
+    str
+      the network name.
+
+    """
+    return os.environ.get(dAuth.DAUTH_NET_ENV_KEY, dAuth.DAUTH_SDK_NET_DEFAULT)
+  
+  @property
+  def evm_network(self):
+    return self.get_evm_network()
+
+    
+  def web3_is_node_licensed(self, address : str, network=None, debug=False) -> bool:
     """
     Check if the address is allowed to send commands to the node
 
@@ -1419,11 +1436,12 @@ class BaseBlockEngine:
       the address to check.
     """
     if network is None:
-      network = os.environ.get(dAuth.DAUTH_NET_ENV_KEY, dAuth.DAUTH_SDK_NET_DEFAULT)
+      network = self.evm_network
 
     assert network.lower() in ['mainnet', 'testnet'], f"Invalid network {network}"
     
     assert BaseBlockEngine.is_valid_eth_address(address), "Invalid Ethereum address"
+      
     
     if network.lower() == 'mainnet':
       contract_address = dAuth.DAUTH_MAINNET_ND_ADDR
@@ -1431,6 +1449,9 @@ class BaseBlockEngine:
     else:
       contract_address = dAuth.DAUTH_TESTNET_ND_ADDR
       rpc_url = dAuth.DAUTH_TESTNET_RPC
+      
+    if debug:
+      self.P(f"Checking if {address} ({network}) is allowed via {rpc_url}...")
     
     w3 = Web3(Web3.HTTPProvider(rpc_url)) 
 
@@ -1442,7 +1463,7 @@ class BaseBlockEngine:
     return result
 
 
-  def web3_get_oracles(self, network=None) -> list:
+  def web3_get_oracles(self, network=None, debug=False) -> list:
     """
     Get the list of oracles from the contract
 
@@ -1458,7 +1479,7 @@ class BaseBlockEngine:
 
     """
     if network is None:
-      network = os.environ.get(dAuth.DAUTH_NET_ENV_KEY, dAuth.DAUTH_SDK_NET_DEFAULT)
+      network = BaseBlockEngine.get_evm_network()
 
     assert network.lower() in ['mainnet', 'testnet'], f"Invalid network {network}"
     
@@ -1468,6 +1489,9 @@ class BaseBlockEngine:
     else:
       contract_address = dAuth.DAUTH_TESTNET_ND_ADDR
       rpc_url = dAuth.DAUTH_TESTNET_RPC
+
+    if debug:
+      self.P(f"Getting oracles for {network} via {rpc_url}...")
     
     w3 = Web3(Web3.HTTPProvider(rpc_url)) 
 
@@ -1532,7 +1556,7 @@ class BaseBlockEngine:
 
     # Network handling
     if network is None:
-      network = os.environ.get(dAuth.DAUTH_NET_ENV_KEY, dAuth.DAUTH_SDK_NET_DEFAULT)
+      network = self.evm_network
 
     # URL handling
     if not isinstance(url, str) or len(url) < MIN_LEN:
@@ -1553,9 +1577,9 @@ class BaseBlockEngine:
           self.P("Found dAuth URL in environment: '{}'".format(url), color='g')
         else:
           self.P("Using default dAuth URL: '{}'".format(url), color='g')
-      
+      eth_short = self.eth_address[:6] + '...' + self.eth_address[-4:]
       while not done:
-        self.P(f"Trying dAuth `{url}` information... (try {tries})")
+        self.P(f"<{eth_short}> ({network}) dAuth with `{url}`... (try {tries + 1} / {max_tries})")
         try:
           to_send = {
             **kwargs,

naeural_client/cli/cli_commands.py

@@ -62,7 +62,8 @@ CLI_COMMANDS = {
             "func": get_set_network, # DONE
             "description": "Get/Set network",
             "params": {
-              "--new": "The network to set either 'mainnet' or 'testnet'",
+              "--new": "The network to set either 'mainnet' or 'testnet' (same as --set)",
+              "--set": "The network to set either 'mainnet' or 'testnet' (same as --new)",
             }
         },
     },

naeural_client/utils/config.py

@@ -94,7 +94,7 @@ def get_network():
   return os.environ.get(dAuth.DAUTH_NET_ENV_KEY, dAuth.DAUTH_SDK_NET_DEFAULT)
 
 def get_set_network(args):
-  net = args.new
+  net = args.new or args.set
   env_network = get_network()
   if net is None:
     log_with_color(f"Current network: {env_network}", color='b')

{naeural_client-2.7.3.dist-info → naeural_client-2.7.5.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
 naeural_client/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-naeural_client/_ver.py,sha256=nDVrulMfL35a57x2FvSgElM6f3wFtjsC43Smx4Z-Jlk,330
+naeural_client/_ver.py,sha256=fzU2D33TdF4AMAfvqYcWnQR2ihxWc-UHM259WZKYV5M,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
@@ -14,7 +14,7 @@ naeural_client/base/webapp_pipeline.py,sha256=ZNGqZ36DY076XVDfGu2Q61kCt3kxIJ4Mi4
 naeural_client/base/payload/__init__.py,sha256=y8fBI8tG2ObNfaXFWjyWZXwu878FRYj_I8GIbHT4GKE,29
 naeural_client/base/payload/payload.py,sha256=x-au7l67Z_vfn_4R2C_pjZCaFuUVXHngJiGOfIAYVdE,2690
 naeural_client/bc/__init__.py,sha256=FQj23D1PrY06NUOARiKQi4cdj0-VxnoYgYDEht8lpr8,158
-naeural_client/bc/base.py,sha256=H2ke33T_Iflf_viGvi7ceyJ5S_I_aJLk9UZoTckTzpk,45988
+naeural_client/bc/base.py,sha256=sTdJs_qcg7SlanxizZ2IfPilUR_z7hsBhcFO1fl-Jw0,46457
 naeural_client/bc/chain.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 naeural_client/bc/ec.py,sha256=-HPfKpYAqy_eZpiJf3gWR2L4ZDDP7fZY2uwdNYYmS80,23868
 naeural_client/certs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -22,7 +22,7 @@ naeural_client/certs/r9092118.ala.eu-central-1.emqxsl.com.crt,sha256=y-6io0tseyx
 naeural_client/certs/s624dbd4.ala.us-east-1.emqxsl.com.crt,sha256=y-6io0tseyx9-a4Pmde1z1gPULtJNSYUpG_YFkYaMKU,1337
 naeural_client/cli/README.md,sha256=WPdI_EjzAbUW1aPyj1sSR8rLydcJKZtoiaEtklQrjHo,74
 naeural_client/cli/cli.py,sha256=EC7-ehOMQJ_Dq7R9TTrajpvQWwdalAOgb1JAeBGHF50,3830
-naeural_client/cli/cli_commands.py,sha256=Ztm1qXUN58OZb-CO6TzWlwCgZyzCxK5C1s49lz6fNmQ,3088
+naeural_client/cli/cli_commands.py,sha256=dW7br6XaejTfOaTZZeU8xDbFgg4qZPYGoRJqz_Afsno,3195
 naeural_client/cli/nodes.py,sha256=A-MqGjI_ufZ7SnlVyMOzlqWQASRvKvF6cz9AGxlbYx4,5037
 naeural_client/cli/oracles.py,sha256=Y_PzHshfSERS_Utjjtw5d_BsQRdGr6P4L6uW8yTdA0M,4809
 naeural_client/code_cheker/__init__.py,sha256=pwkdeZGVL16ZA4Qf2mRahEhoOvKhL7FyuQbMFLr1E5M,33
@@ -81,11 +81,11 @@ naeural_client/logging/tzlocal/win32.py,sha256=zBoj0vFVrGhnCm_f7xmYzGym4-fV-4Ij2
 naeural_client/logging/tzlocal/windows_tz.py,sha256=Sv9okktjZJfRGGUOOppsvQuX_eXyXUxkSKCAFmWT9Hw,34203
 naeural_client/utils/__init__.py,sha256=mAnke3-MeRzz3nhQvhuHqLnpaaCSmDxicd7Ck9uwpmI,77
 naeural_client/utils/comm_utils.py,sha256=4cS9llRr_pK_3rNgDcRMCQwYPO0kcNU7AdWy_LtMyCY,1072
-naeural_client/utils/config.py,sha256=GzduH5_ZFN39RBdpICDKhx2ZqXen5fF-JJ0RoEcF2wQ,7401
+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.3.dist-info/METADATA,sha256=eFUx-ggIYpO0_8WcUqUVJG9IWyS1ULDRh1OBbKpMvnM,12353
-naeural_client-2.7.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-naeural_client-2.7.3.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
-naeural_client-2.7.3.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-naeural_client-2.7.3.dist-info/RECORD,,
+naeural_client-2.7.5.dist-info/METADATA,sha256=_jpKW1DCVrbH8SG_EBGU0h-P_IJJt_sQlxR-swuuRwc,12353
+naeural_client-2.7.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+naeural_client-2.7.5.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
+naeural_client-2.7.5.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+naeural_client-2.7.5.dist-info/RECORD,,