naeural-client 2.7.29__py3-none-any.whl → 2.7.31__py3-none-any.whl

naeural_client/_ver.py

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

naeural_client/const/evm_net.py

@@ -8,38 +8,42 @@ class EvmNetData:
   EE_EPOCH_INTERVAL_SECONDS_KEY = 'EE_EPOCH_INTERVAL_SECONDS'
   
   EE_SUPERVISOR_MIN_AVAIL_PRC_KEY = 'EE_SUPERVISOR_MIN_AVAIL_PRC'
-  
+
+  EE_ORACLE_API_URL_KEY = 'EE_ORACLE_API_URL'
   
 EVM_NET_DATA = {
   'mainnet': {
-    EvmNetData.DAUTH_URL_KEY                    : "https://dauth-main.ratio1.ai/get_auth_data",
+    EvmNetData.DAUTH_URL_KEY                    : "https://dauth.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.98,
+    EvmNetData.EE_ORACLE_API_URL_KEY            : "https://oracle.ratio1.ai",
   },        
 
   'testnet': {
-    EvmNetData.DAUTH_URL_KEY                    : "https://dauth-test.ratio1.ai/get_auth_data",
+    EvmNetData.DAUTH_URL_KEY                    : "https://testnet-dauth.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,
+    EvmNetData.EE_ORACLE_API_URL_KEY             : "https://testnet-oracle.ratio1.ai",
   },
 
   
   'devnet' : {
-    EvmNetData.DAUTH_URL_KEY                    : "https://dauth-devnet.ratio1.ngrok.app/get_auth_data",
+    EvmNetData.DAUTH_URL_KEY                    : "https://devnet-dauth.ratio1.ai/get_auth_data",
     EvmNetData.DAUTH_ND_ADDR_KEY                : "0x9f49fc29366F1C8285d42e7E82cA0bb668B32CeA",
     EvmNetData.DAUTH_RPC_KEY                    : "https://base-sepolia.public.blastapi.io",
     EvmNetData.EE_GENESIS_EPOCH_DATE_KEY        : "2025-02-12 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,
+    EvmNetData.EE_ORACLE_API_URL_KEY            : "https://devnet-oracle.ratio1.ai",
   },
 
 }

naeural_client/logging/base_logger.py

@@ -1122,7 +1122,7 @@ class BaseLogger(object):
   def _maybe_migrate_folder(self):
     user_base_folder = BaseLogger.get_user_folder(as_str=True, include_sdk_home=True)
     if user_base_folder in self._base_folder:
-      BaseLogger.maybe_migrate_user_folder(verbose=True)
+      BaseLogger.maybe_migrate_user_folder()
     return
 
   def _configure_data_and_dirs(self, config_file, config_file_encoding=None):

naeural_client/utils/config.py

@@ -327,7 +327,7 @@ def maybe_init_config():
   """
   config_file = get_user_config_file()
   if not config_file.exists():
-    BaseLogger.maybe_migrate_user_folder(verbose=True)
+    BaseLogger.maybe_migrate_user_folder()
     if not config_file.exists():
       log_with_color(f"No configuration file found at {config_file}. Initializing configuration...", color="y")
       reset_config(keep_existing=True)

naeural_client/utils/oracle_sync/oracle_tester.py

@@ -11,11 +11,10 @@ from collections import defaultdict
 from naeural_client import Logger
 from naeural_client.bc import DefaultBlockEngine
 from naeural_client.utils.config import log_with_color, get_user_folder
-
+from naeural_client.const.evm_net import EvmNetData
 
 
 class OracleTesterConstants:
-  BASE_URL = "https://naeural-oracle.ngrok.app"
   TEST_ENDPOINT = "/node_epochs_range"
   CURRENT_EPOCH_ENDPOINT = "/current_epoch"
   ACTIVE_NODES_ENDPOINT = "/active_nodes_list"
@@ -38,7 +37,6 @@ class OracleTester:
   ):
     self.bc = bce
     self.log = log
-    self.BASE_URL = ct.BASE_URL
     self.TEST_ENDPOINT = ct.TEST_ENDPOINT
     self.CURRENT_EPOCH_ENDPOINT = ct.CURRENT_EPOCH_ENDPOINT
     self.ACTIVE_NODES_ENDPOINT = ct.ACTIVE_NODES_ENDPOINT
@@ -56,6 +54,27 @@ class OracleTester:
 
   """UTILS"""
   if True:
+    def get_base_url(self, network=None):
+      """
+      Get the base URL for the oracle API server.
+      Parameters
+      ----------
+      network : str or None
+          The network for which to get the base URL. Default None.
+          If None, the network from the user config will be used.
+
+      Returns
+      -------
+      str
+          The base URL for the oracle API server.
+      """
+      network = network or self.bc.evm_network
+      res = self.bc.get_network_data(network=network).get(EvmNetData.EE_ORACLE_API_URL_KEY)
+      if res is None:
+        msg_end = f" for the network: {network}" if network is not None else ""
+        raise ValueError(f"Failed to get the base URL{msg_end}.")
+      return res
+
     def maybe_register_node(self, node_addr: str, eth_address: str, alias: str = None):
       if node_addr is None:
         return
@@ -239,7 +258,7 @@ class OracleTester:
       return stats_dict
   """END RESPONSE HANDLING"""
 
-  def gather(self, nodes, request_kwargs=None, debug=False, rounds=None):
+  def gather(self, nodes, request_kwargs=None, debug=False, rounds=None, network=None):
     """
     Gather data from the oracle server for the given nodes.
 
@@ -253,6 +272,12 @@ class OracleTester:
         The request kwargs to be used for the request. Default None.
     debug : bool
         Whether to enable debug mode or not. If enabled the function will exit after one request round.
+    rounds : int
+        The number of rounds to be executed. Default None. If None, self.max_request_rounds will be used.
+    network : str
+        The network for which to gather data. Default None.
+        If None, the network from the user config will be used.
+        In case the network is not found in the user config, the testnet will be used.
 
     Returns
     -------
@@ -266,7 +291,7 @@ class OracleTester:
     while not self.done(rounds):
       try:
         self.P(f'Starting request round {self.request_rounds + 1} for {len(nodes)} nodes...')
-        current_url = self.BASE_URL + self.TEST_ENDPOINT
+        current_url = self.get_base_url(network=network) + self.TEST_ENDPOINT
         # TODO: maybe shuffle the nodes list in order to avoid
         #  the same order of requests in each round
         #  relevant if the number of nodes is divisible by the number of oracles.
@@ -309,7 +334,7 @@ class OracleTester:
     self.P(f'Finished gathering data for {len(nodes)} nodes and {self.max_request_rounds}.')
     return responses, stats_dict
 
-  def gather_and_compare(self, nodes, request_kwargs=None, debug=False, rounds=None):
+  def gather_and_compare(self, nodes, request_kwargs=None, debug=False, rounds=None, network=None):
     """
     Gather data from the oracle server for the given nodes and compare the results between oracles.
 
@@ -323,6 +348,12 @@ class OracleTester:
         The request kwargs to be used for the request. Default None.
     debug : bool
         Whether to enable debug mode or not. If enabled the function will exit after one request round.
+    rounds : int
+        The number of rounds to be executed. Default None. If None, self.max_request_rounds will be used.
+    network : str
+        The network for which to gather data. Default None.
+        If None, the network from the user config will be used.
+        In case the network is not found in the user config, the testnet will be used.
 
     Returns
     -------
@@ -333,7 +364,8 @@ class OracleTester:
       nodes=nodes,
       request_kwargs=request_kwargs,
       debug=debug,
-      rounds=rounds
+      rounds=rounds,
+      network=network
     )
     # Statistics for each node of each epoch
     epochs_nodes_stats = {}
@@ -381,15 +413,15 @@ class OracleTester:
 
     return responses, stats_dict
 
-  def get_current_epoch(self):
-    epoch_url = self.BASE_URL + self.CURRENT_EPOCH_ENDPOINT
+  def get_current_epoch(self, network=None):
+    epoch_url = self.get_base_url(network=network) + self.CURRENT_EPOCH_ENDPOINT
     response = self.make_request(epoch_url)
     if response:
       return response.get("result", {}).get("current_epoch", 1)
     return None
 
-  def get_active_nodes(self):
-    active_nodes_url = self.BASE_URL + self.ACTIVE_NODES_ENDPOINT
+  def get_active_nodes(self, network=None):
+    active_nodes_url = self.get_base_url(network=network) + self.ACTIVE_NODES_ENDPOINT
     response = self.make_request(active_nodes_url)
     result = []
     if response:
@@ -589,10 +621,15 @@ def oracle_tester_init(silent=True, **kwargs):
   return tester
 
 def test_commands():
-  tester = oracle_tester_init()
-  start = 78
-  end = 85
-  node_eth_addr = "<node_eth_address>"
+  from naeural_client.utils.config import load_user_defined_config
+  load_user_defined_config()
+  tester = oracle_tester_init(max_requests_rounds=30)
+  start = 10
+  end = 10
+  # node_eth_addr = "0x7C07758C23DF14c2fF4b016F0ad58F2D4aF329a7"  # r1s-ssj-1
+  # node_eth_addr = "0xdc4fDFd5B86aeA7BaB17d4742B7c39A2728Ff59B"  # r1s-02
+  # node_eth_addr = "0x93B04EF1152D81A0847C2272860a8a5C70280E14"  # tr1s-aid02
+  node_eth_addr = '0x37379B80c7657620E5631832c4437B51D67A88cB'  # dr1s-db-1
 
   # Single round
   tester.P(f'Test single round: Epochs {start} to {end}', show=True)
@@ -601,12 +638,12 @@ def test_commands():
 
   # Multiple rounds
   tester.P(f'Test multiple rounds: Epochs {start} to {end}', show=True)
-  res = tester.execute_command(node_eth_addr=node_eth_addr, start=start, end=end, rounds=5)
+  res = tester.execute_command(node_eth_addr=node_eth_addr, start=start, end=end, rounds=3)
   handle_command_results(res)
 
   # Debug mode
   tester.P(f'Test debug mode: Epochs {start} to {end}', show=True)
-  res = tester.execute_command(node_eth_addr=node_eth_addr, start=80, end=85, debug=True)
+  res = tester.execute_command(node_eth_addr=node_eth_addr, start=5, end=7, debug=True)
   handle_command_results(res)
   return
 
@@ -694,8 +731,8 @@ def oracle_test(N=10):
 
 # Main loop
 def main():
-  TEST_COMMANDS = False
-  TEST_ORACLE = True
+  TEST_COMMANDS = True
+  TEST_ORACLE = False
   if TEST_COMMANDS:
     test_commands()
 

{naeural_client-2.7.29.dist-info → naeural_client-2.7.31.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
 naeural_client/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-naeural_client/_ver.py,sha256=JqBpFIjrfwZRS_X2fLTG2ivMFcGrMcEOLgQ2jSW3iOY,331
+naeural_client/_ver.py,sha256=txvzfbhMSo8ZJdttNBeVblWMbw5beX2aZ0Rf_eZ4JtA,331
 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
@@ -38,7 +38,7 @@ naeural_client/const/apps.py,sha256=ePBiJXLuPfFOKuw-LJrT9OWbaodU7QApfDurIPNDoB4,
 naeural_client/const/base.py,sha256=zfJyGGdrNz_OA5i_6cQxH2lEeJ4PO3092NrwM_gZ_U8,5670
 naeural_client/const/comms.py,sha256=La6JXWHexH8CfcBCKyT4fCIoeaoZlcm7KtZ57ab4ZgU,2201
 naeural_client/const/environment.py,sha256=RpdDhDgB8NgRoFTk28eODigf9y0WcT9lul6mBOD029w,879
-naeural_client/const/evm_net.py,sha256=mOSvsJnir1v_BrmKS51xIy9ddlZnQwlXWenzGXmXMOE,2606
+naeural_client/const/evm_net.py,sha256=IEX8t7OcDwONfYcqooZjmgsbFeWy6VynKHK-7nZD0KM,2891
 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
@@ -61,7 +61,7 @@ naeural_client/io_formatter/default/a_dummy.py,sha256=qr9eUizQ-NN5jdXVzkaZKMaf9K
 naeural_client/io_formatter/default/aixp1.py,sha256=MX0TeUR4APA-qN3vUC6uzcz8Pssz5lgrQWo7td5Ri1A,3052
 naeural_client/io_formatter/default/default.py,sha256=gEy78cP2D5s0y8vQh4aHuxqz7D10gGfuiKF311QhrpE,494
 naeural_client/logging/__init__.py,sha256=b79X45VC6c37u32flKB2GAK9f-RR0ocwP0JDCy0t7QQ,33
-naeural_client/logging/base_logger.py,sha256=c-ZSMHc_eO84MKrLOJcClxvhQydFD8W0LoWe5_hu2ag,69611
+naeural_client/logging/base_logger.py,sha256=qqqMX30Vmh5Dz8YYaeL_ainQPTP5FsX1Y4QMbsIG5Rg,69599
 naeural_client/logging/small_logger.py,sha256=m12hCb_H4XifJYYfgCAOUDkcXm-h4pSODnFf277OFVI,2937
 naeural_client/logging/logger_mixins/__init__.py,sha256=yQO7umlRvz63FeWpi-F9GRmC_MOHcNW6R6pwvZZBy3A,600
 naeural_client/logging/logger_mixins/class_instance_mixin.py,sha256=xUXE2VZgmrlrSrvw0f6GF1jlTnVLeVkIiG0bhlBfq3o,2741
@@ -83,11 +83,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=IG7-rRYBWCqCiI2kDesFmY8gld0Ku9xWgzNPE1rwVcA,10352
+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=GmZwu2JM9_UB2K-4rKB3o0RgWLqM-7Im6HwBnQLXmHI,25312
-naeural_client-2.7.29.dist-info/METADATA,sha256=rWf_TRBs9LncFBWUHz9UAWuou8d5U3Y9vWXiXPN0410,12354
-naeural_client-2.7.29.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-naeural_client-2.7.29.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
-naeural_client-2.7.29.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-naeural_client-2.7.29.dist-info/RECORD,,
+naeural_client/utils/oracle_sync/oracle_tester.py,sha256=X-923ccjkr6_kzbbiuAAcWSIhMtBDOH2VURjTh55apQ,27235
+naeural_client-2.7.31.dist-info/METADATA,sha256=0GqYz-TDWNENqA9JIZesUQajhYoUFL39urhid0YxPlo,12354
+naeural_client-2.7.31.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+naeural_client-2.7.31.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
+naeural_client-2.7.31.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+naeural_client-2.7.31.dist-info/RECORD,,