naeural-client 2.7.2__tar.gz → 2.7.4__tar.gz

{naeural_client-2.7.2 → naeural_client-2.7.4}/PKG-INFO

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

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

{naeural_client-2.7.2 → naeural_client-2.7.4}/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)) 
 
@@ -1492,6 +1516,23 @@ class BaseBlockEngine:
     network=None,
     **kwargs
   ):
+    """
+    Autocompletes the environment with the dAuth information.
+    Parameters
+    ----------
+    dauth_endp
+    add_env
+    debug
+    max_tries
+    network
+    kwargs
+
+    Returns
+    -------
+    None if the URL is invalid or the request failed.
+    dict with the dAuth information if the request got status 200(if errors occured, but
+    the status is still 200, an empty dictionary will be returned).
+    """
     from naeural_client._ver import __VER__ as sdk_version
     try:
       from ver import __VER__ as app_version
@@ -1503,16 +1544,21 @@ class BaseBlockEngine:
       core_version = None
       
     MIN_LEN = 10
-    dct_env = {}
+    # Default result in case of invalid URL should be None
+    # An empty dict will mean that the URL is valid, but the node
+    # does not have a license associated with it.
+    dct_env = None
     done = False
     tries = 0
     in_env = False
     url = dauth_endp
     dct_response = {}
-    
+
+    # 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:
       if DAUTH_ENV_KEY in os.environ:
         in_env = True
@@ -1525,14 +1571,15 @@ class BaseBlockEngine:
       #endif not in env
       
     if isinstance(url, str) and len(url) > 0:
+      # Valid URL
       if dauth_endp is None:
         if in_env:
           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,
@@ -1569,7 +1616,8 @@ class BaseBlockEngine:
               self.P(f"Signature from {server_alias} <{server_addr}> is valid.", color='g')
             else:
               self.P(f"Signature from {server_alias} <{server_addr}> is INVALID: {ver_result}", color='r')
-              return              
+              # Invalid response signature, thus return {}
+              return {}
 
             # whitelist
             whitelist = dct_dauth.pop(dAuth.DAUTH_WHITELIST, [])
@@ -1602,13 +1650,16 @@ class BaseBlockEngine:
           else:
             self.P(f"Error in dAuth response: {response.status_code} - {response.text}", color='r')
         except Exception as exc:
-          self.P(f"Error in dAuth URL request: {exc}. Received: {dct_response}", color='r')          
+          self.P(f"Error in dAuth URL request: {exc}. Received: {dct_response}", color='r')
+          # Request failed somewhere so dct_env will be set again to None.
+          dct_env = None
         #end try
         tries += 1
         if tries >= max_tries:
           done = True    
       #end while
     else:
+      # Invalid URL, thus dct_env will remain None
       self.P(f"dAuth URL is not invalid: {url}", color='r')
     #end if url is valid
     return dct_env

{naeural_client-2.7.2 → naeural_client-2.7.4}/pyproject.toml

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

{naeural_client-2.7.2 → naeural_client-2.7.4}/xperimental/_checks/auth_check.py

@@ -4,12 +4,13 @@ import json
 
 from naeural_client import Logger, const
 from naeural_client.bc import DefaultBlockEngine
+from naeural_client.utils.config import get_user_folder
 
 
 
 if __name__ == '__main__' :
   l = Logger(
-    "ENC", base_folder=".", app_folder="_local_cache",
+    "ENC", base_folder=str(get_user_folder()), app_folder="_local_cache",
     # silent=True,
   )
   eng1 = DefaultBlockEngine(
@@ -26,15 +27,17 @@ if __name__ == '__main__' :
       }
   )
   
-  to_use = eng2
+  to_use = eng1
   
   for _ in range(3):
     d = to_use.dauth_autocomplete(
+      # dauth_endp='N/Adhstrgredshtfnfnhgm',
       add_env=False,
       debug=True,
       max_tries=1,
       sender_alias='test1',
     )
+    print(f'Got the response: {d} !')
     # try:
     #   res = dict(
     #     name = d['result']['server_alias'],

naeural_client-2.7.2/xperimental/dauth/is_node_allowed.py → naeural_client-2.7.4/xperimental/_checks/web3_check.py

@@ -20,16 +20,15 @@ if __name__ == '__main__' :
       }
   )
   
-  network = 'mainnet'
+  network = None
   addresses = [
-    "0xe240d9cf8893d6bE9fb3Ac4C9CE1E504343b64a0",
-    "0x1Fe3222f6a2844364E2BDc796e0Df547ea26B815",    
-    "0x7C07758C23DF14c2fF4b016F0ad58F2D4aF329a7",        
+    "0xE486F0d594e9F26931fC10c29E6409AEBb7b5144",
+    "0x93B04EF1152D81A0847C2272860a8a5C70280E14",    
   ]
   
   for addr in addresses:
     is_active = eng.web3_is_node_licensed(
-      address=addr, network=network
+      address=addr, network=network, debug=True
     )
     l.P("{} {}".format(
         addr,
@@ -38,16 +37,14 @@ if __name__ == '__main__' :
       color='g' if is_active else 'r'
     )
     
-  oracles = eng.web3_get_oracles(network=network)
+  oracles = eng.web3_get_oracles(network=network, debug=True)
   l.P("\nOracles:\n {}".format(json.dumps(oracles, indent=2)), 
     color='b'
   )
   
   supervisors = [
-    "0xai_Amfnbt3N-qg2-qGtywZIPQBTVlAnoADVRmSAsdDhlQ-6",
-    "0xai_Aj1FpPQHISEBelp-tQ8cegwk434Dcl6xaHmuhZQT74if",
-    "0xai_A4cZdKZZdj9We5W7T-NJPdQuhH2c8-aMI3-r7XlT0jqn",
-    "0xai_AvuUcmXyn6U3z8XRagqG8_d2sKCDZ5FIDpkUlpUz3Iuh"
+    "0xai_AleLPKqUHV-iPc-76-rUvDkRWW4dFMIGKW1xFVcy65nH",
+    "0xai_A-Bn9grkqH1GUMTZUqHNzpX5DA6PqducH9_JKAlBx6YL",
   ]
   
   for supervisor in supervisors: