naeural-client 2.7.8__tar.gz → 2.7.10__tar.gz

{naeural_client-2.7.8 → naeural_client-2.7.10}/PKG-INFO

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

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

{naeural_client-2.7.8 → naeural_client-2.7.10}/naeural_client/bc/base.py

@@ -1424,6 +1424,10 @@ class BaseBlockEngine:
   @property
   def evm_network(self):
     return self.get_evm_network()
+  
+  def get_network_data(self, network=None):
+    assert isinstance(network, str) and network.lower() in dAuth.EVM_NET_DATA, f"Invalid network: {network}"
+    return dAuth.EVM_NET_DATA[network.lower()]
 
     
   def web3_is_node_licensed(self, address : str, network=None, debug=False) -> bool:
@@ -1437,19 +1441,14 @@ class BaseBlockEngine:
     """
     if network is None:
       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
-      rpc_url = dAuth.DAUTH_MAINNET_RPC
-    else:
-      contract_address = dAuth.DAUTH_TESTNET_ND_ADDR
-      rpc_url = dAuth.DAUTH_TESTNET_RPC
-      
+    network_data = self.get_network_data(network)
+    
+    contract_address = network_data[dAuth.EvmNetData.DAUTH_ND_ADDR_KEY]
+    rpc_url = network_data[dAuth.EvmNetData.DAUTH_RPC_KEY]
+          
     if debug:
       self.P(f"Checking if {address} ({network}) is allowed via {rpc_url}...")
     
@@ -1481,14 +1480,10 @@ class BaseBlockEngine:
     if network is None:
       network = BaseBlockEngine.get_evm_network()
 
-    assert network.lower() in ['mainnet', 'testnet'], f"Invalid network {network}"
+    network_data = self.get_network_data(network)
     
-    if network.lower() == 'mainnet':
-      contract_address = dAuth.DAUTH_MAINNET_ND_ADDR
-      rpc_url = dAuth.DAUTH_MAINNET_RPC
-    else:
-      contract_address = dAuth.DAUTH_TESTNET_ND_ADDR
-      rpc_url = dAuth.DAUTH_TESTNET_RPC
+    contract_address = network_data[dAuth.EvmNetData.DAUTH_ND_ADDR_KEY]
+    rpc_url = network_data[dAuth.EvmNetData.DAUTH_RPC_KEY]
 
     if debug:
       self.P(f"Getting oracles for {network} via {rpc_url}...")
@@ -1565,10 +1560,8 @@ class BaseBlockEngine:
         in_env = True
         url = os.environ[DAUTH_ENV_KEY]
       else:
-        if network == 'mainnet':
-          url = dAuth.DAUTH_MAINNET_URL
-        else:
-          url = dAuth.DAUTH_TESTNET_URL
+        network_data = self.get_network_data(network)
+        url = network_data[dAuth.EvmNetData.DAUTH_URL_KEY]
       #endif not in env
       
     if isinstance(url, str) and len(url) > 0:

{naeural_client-2.7.8 → naeural_client-2.7.10}/naeural_client/const/base.py

@@ -1,3 +1,8 @@
+from .evm_net import (
+  _DAUTH_ABI_IS_NODE_ACTIVE, _DAUTH_ABI_GET_SIGNERS,
+  EvmNetData, EVM_NET_DATA
+)
+
 EE_ID = 'EE_ID'
 SB_ID = 'SB_ID'  # change to SB_ID = EE_ID post mod from sb to ee
 
@@ -10,59 +15,22 @@ class BCctbase:
   ETH_SENDER= 'EE_ETH_SENDER'
 
 
-DAUTH_TESTNET_URL = 'https://dauth-test.ratio1.ai/get_auth_data'
-DAUTH_MAINNET_URL = 'https://dauth-main.ratio1.ai/get_auth_data'
 DAUTH_SUBKEY = 'auth'
 DAUTH_ENV_KEY = 'EE_DAUTH_URL'
 DAUTH_NONCE = 'nonce'
 DAUTH_VARS = [DAUTH_NONCE, BCctbase.SIGN, BCctbase.SENDER, BCctbase.HASH]
 
-_DAUTH_ABI_IS_NODE_ACTIVE = [{
-  "inputs": [
-    {
-      "internalType": "address",
-      "name": "nodeAddress",
-      "type": "address"
-    }
-  ],
-  "name": "isNodeActive",
-  "outputs": [
-    {
-      "internalType": "bool",
-      "name": "",
-      "type": "bool"
-    }
-  ],
-  "stateMutability": "view",
-  "type": "function"
-}]
-
-_DAUTH_ABI_GET_SIGNERS = [{
-  "inputs": [],
-  "name": "getSigners",
-  "outputs": [
-    {
-      "internalType": "address[]",
-      "name": "",
-      "type": "address[]"
-    }
-  ],
-  "stateMutability": "view",
-  "type": "function"
-}]
+
 
 
 
 class dAuth:
-  DAUTH_TESTNET_ND_ADDR = '0xE20198EE2B76eED916A568a47cdea9681f7c79BF'
-  DAUTH_MAINNET_ND_ADDR = '0xE20198EE2B76eED916A568a47cdea9681f7c79BF'
-  
+  EvmNetData = EvmNetData
+  EVM_NET_DATA = EVM_NET_DATA
+    
   DAUTH_NET_ENV_KEY = 'EE_EVM_NET'
   DAUTH_SDK_NET_DEFAULT = 'testnet'
-  
-  DAUTH_MAINNET_RPC = 'https://base-mainnet.public.blastapi.io'
-  DAUTH_TESTNET_RPC = 'https://base-sepolia.public.blastapi.io'
-  
+    
   DAUTH_SENDER_ALIAS = 'sender_alias'
   DAUTH_SENDER_ALIAS_DEFAULT = 'direct-call'
   DAUTH_SENDER_CORE_VER = 'sender_core_ver'
@@ -79,8 +47,6 @@ class dAuth:
   
   DAUTH_WHITELIST = 'whitelist'
   
-  DAUTH_TESTNET_URL = DAUTH_TESTNET_URL
-  DAUTH_MAINNET_URL = DAUTH_MAINNET_URL
   DAUTH_SUBKEY = DAUTH_SUBKEY
   DAUTH_NONCE = DAUTH_NONCE
   DAUTH_VARS = DAUTH_VARS

naeural_client-2.7.10/naeural_client/const/evm_net.py

@@ -0,0 +1,79 @@
+class EvmNetData:
+  DAUTH_URL_KEY = 'EE_DAUTH_URL'
+  DAUTH_ND_ADDR_KEY = 'EE_DAUTH_ND_ADDR'
+  DAUTH_RPC_KEY = 'EE_DAUTH_RPC'
+  
+  EE_GENESIS_EPOCH_DATE_KEY = 'EE_GENESIS_EPOCH_DATE'
+  EE_EPOCH_INTERVALS_KEY = 'EE_EPOCH_INTERVALS'
+  EE_EPOCH_INTERVAL_SECONDS_KEY = 'EE_EPOCH_INTERVAL_SECONDS'
+  
+  EE_SUPERVISOR_MIN_AVAIL_PRC_KEY = 'EE_SUPERVISOR_MIN_AVAIL_PRC'
+  
+  
+EVM_NET_DATA = {
+  'testnet': {
+    EvmNetData.DAUTH_URL_KEY                    : "https://dauth-test.ratio1.ai/get_auth_data",
+    EvmNetData.DAUTH_ND_ADDR_KEY                : "0xE20198EE2B76eED916A568a47cdea9681f7c79BF",
+    EvmNetData.DAUTH_RPC_KEY                    : "https://base-sepolia.public.blastapi.io",      
+    EvmNetData.EE_GENESIS_EPOCH_DATE_KEY        : "2025-02-05 16:00:00",
+    EvmNetData.EE_EPOCH_INTERVALS_KEY           : 24,
+    EvmNetData.EE_EPOCH_INTERVAL_SECONDS_KEY    : 3600,
+    EvmNetData.EE_SUPERVISOR_MIN_AVAIL_PRC_KEY  : 0.6,
+  },
+
+  'mainnet': {
+    EvmNetData.DAUTH_URL_KEY                    : "https://dauth-main.ratio1.ai/get_auth_data",
+    EvmNetData.DAUTH_ND_ADDR_KEY                : "0xE20198EE2B76eED916A568a47cdea9681f7c79BF",
+    EvmNetData.DAUTH_RPC_KEY                    : "https://base-mainnet.public.blastapi.io",
+    EvmNetData.EE_GENESIS_EPOCH_DATE_KEY        : "2025-02-05 16:00:00",
+    EvmNetData.EE_EPOCH_INTERVALS_KEY           : 24,
+    EvmNetData.EE_EPOCH_INTERVAL_SECONDS_KEY    : 3600,
+    EvmNetData.EE_SUPERVISOR_MIN_AVAIL_PRC_KEY  : 0.6,
+  },        
+  
+  'devnet' : {
+    EvmNetData.DAUTH_URL_KEY                    : "https://dauth-devnet.ratio1.ai/get_auth_data",
+    EvmNetData.DAUTH_ND_ADDR_KEY                : "TO_BE_DEFINED",
+    EvmNetData.DAUTH_RPC_KEY                    : "https://base-sepolia.public.blastapi.io",
+    EvmNetData.EE_GENESIS_EPOCH_DATE_KEY        : "2025-01-11 16:00:00",
+    EvmNetData.EE_EPOCH_INTERVALS_KEY           : 1,
+    EvmNetData.EE_EPOCH_INTERVAL_SECONDS_KEY    : 3600,
+    EvmNetData.EE_SUPERVISOR_MIN_AVAIL_PRC_KEY  : 0.6,
+  },
+
+}
+
+
+_DAUTH_ABI_IS_NODE_ACTIVE = [{
+  "inputs": [
+    {
+      "internalType": "address",
+      "name": "nodeAddress",
+      "type": "address"
+    }
+  ],
+  "name": "isNodeActive",
+  "outputs": [
+    {
+      "internalType": "bool",
+      "name": "",
+      "type": "bool"
+    }
+  ],
+  "stateMutability": "view",
+  "type": "function"
+}]
+
+_DAUTH_ABI_GET_SIGNERS = [{
+  "inputs": [],
+  "name": "getSigners",
+  "outputs": [
+    {
+      "internalType": "address[]",
+      "name": "",
+      "type": "address[]"
+    }
+  ],
+  "stateMutability": "view",
+  "type": "function"
+}]

{naeural_client-2.7.8 → naeural_client-2.7.10}/naeural_client/utils/config.py

@@ -179,18 +179,19 @@ def show_address(args):
   log_with_color(f"{sess.get_client_address()}", color='b')
   return
 
-def show_version():
+def show_version(silent=True):
   from naeural_client import Session
   sess = Session(
-    silent=True
+    silent=silent
   )  
   
   user_folder = get_user_folder()  
 
-  log_with_color(f"Ratio1 selected network: {get_network()}", color='b')
-  log_with_color(f"SDK folder: {user_folder}", color='b')
+  log_with_color(f"SDK folder:  {user_folder}", color='b')
   log_with_color(f"SDK version: {version}", color='b')
-  log_with_color(f"SDK Client address: {sess.get_client_address()}", color='b')
+  log_with_color(f"Ratio1 selected network: {get_network()}", color='b')
+  log_with_color(f"SDK Client address:      {sess.get_client_address()}", color='b')
+  log_with_color(f"SDK Client ETH address:  {sess.bc_engine.eth_address}", color='b')
   return
   
 
@@ -198,17 +199,16 @@ def show_config(args):
   """
   Displays the current configuration from ~/.naeural/config.
   """
-  show_version()
+  show_version(silent=not args.verbose)
   config_file = get_user_config_file()
   if config_file.exists():
+    keys = []
     with config_file.open("r") as file:
-      log_with_color(f"Current configuration ({config_file}):\n{file.read()}", color='d')
+      lines = file.readlines()
+      keys = [line.strip().split("=")[0] for line in lines if "=" in line]
+    log_with_color(f"Current configuration ({config_file}) has {keys}", color='d')
   else:
     log_with_color(f"No configuration found at {config_file}. Please run `reset_config` first.", color="r")
-  log_with_color("Current environment variables:", color='b')
-  for k in os.environ:
-    if k.startswith("EE_"):
-      log_with_color(f"{k}={os.environ[k]}", color='b')
   return
     
 

{naeural_client-2.7.8 → naeural_client-2.7.10}/pyproject.toml

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

{naeural_client-2.7.8 → naeural_client-2.7.10}/tutorials/ex01_part3_adv_filter.py

@@ -149,7 +149,7 @@ if __name__ == '__main__':
   #   in production, you would not need this code as the script can close 
   #   after the pipeline will be sent 
   session.wait(
-    seconds=120,            # we wait the session for 60 seconds
+    seconds=20,            # we wait the session for 60 seconds
     close_pipelines=True,   # we close the pipelines after the session
     close_session=True,     # we close the session after the session
   )