naeural-client 2.6.37__py3-none-any.whl → 2.6.39__py3-none-any.whl

naeural_client/_ver.py

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

naeural_client/cli/oracles.py

@@ -95,26 +95,10 @@ TODO: (future)
   - check ETH signature of the oracle data
 
 """
-import requests
 
 from naeural_client.utils.config import log_with_color
-from naeural_client import Logger
-from naeural_client.bc import DefaultBlockEngine
-from naeural_client.utils.oracle_sync.multiple_requests import oracle_tester_init, handle_command_results
+from naeural_client.utils.oracle_sync.oracle_tester import oracle_tester_init, handle_command_results
 
-"""
-TODOs:
-  - test NEPCTL command in CLI too
-  - check ETH signature of the oracle data
-"""
-
-
-def _check_response(data):
-  res = True
-  log = Logger("NEPCTL", base_folder=".", app_folder="_local_cache", silent=True)
-  bc = DefaultBlockEngine(name='test', log=log)
-  print(bc.address)
-  return res
 
 def get_availability(args):
   """

naeural_client/logging/base_logger.py

@@ -460,20 +460,37 @@ class BaseLogger(object):
     import platform
     import subprocess
     import re
+    import multiprocessing
     str_system = platform.system()
     if str_system == "Windows":
       self.processor_platform = platform.processor()
+      
     elif str_system == "Darwin":
       os.environ['PATH'] = os.environ['PATH'] + os.pathsep + '/usr/sbin'
       command ="sysctl -n machdep.cpu.brand_string"
       self.processor_platform = subprocess.check_output(command, shell=True).strip().decode('utf-8')
+      
     elif str_system == "Linux":
       command = "cat /proc/cpuinfo"
       all_info = subprocess.check_output(command, shell=True).decode().strip()
+      proc_platform = None
       for line in all_info.split("\n"):
         if "model name" in line:
-          self.processor_platform = re.sub( ".*model name.*:", "", line,1)    
+          proc_platform = re.sub( ".*model name.*:", "", line,1)    
           break
+      if proc_platform is None:
+        cores = multiprocessing.cpu_count()
+        proc_platform = "Unknown"
+        try:
+          lscpu_out = subprocess.check_output("lscpu", shell=True).decode().strip()
+          match_vendor = re.search(r"Vendor ID:\s+(.*)", lscpu_out)
+          if match_vendor:
+            proc_platform = match_vendor.group(1)
+        except:
+          pass          
+        proc_platform = f"{proc_platform} {cores} cores"
+      #endif no model name
+      self.processor_platform = proc_platform
     return
   
   def get_processor_platform(self):

naeural_client/utils/oracle_sync/{multiple_requests.py → oracle_tester.py}

@@ -10,7 +10,8 @@ from collections import defaultdict
 
 from naeural_client import Logger
 from naeural_client.bc import DefaultBlockEngine
-from naeural_client.utils.config import log_with_color
+from naeural_client.utils.config import log_with_color, get_user_folder
+
 
 
 class OracleTesterConstants:
@@ -23,6 +24,7 @@ class OracleTesterConstants:
   MAX_REQUEST_ROUNDS = 10
   FREQUENCY = "frequency"
   ORACLE_DATA = "oracle_data"
+  DEFAULT_MIN_CERTAINTY_PRC = 0.98
 
 
 ct = OracleTesterConstants
@@ -115,8 +117,10 @@ class OracleTester:
       """
       epoch_ids = result.get("epochs")
       epoch_vals = result.get("epochs_vals")
-      dict_certainty = result.get("oracle", {}).get("manager", {}).get("certainty", {})
-      is_valid = result.get("oracle", {}).get("manager", {}).get("valid", False)
+      manager_data = result.get("oracle", {}).get("manager", {})
+      dict_certainty = manager_data.get("certainty", {})
+      is_valid = manager_data.get("valid", False)
+      min_certainty_prc = manager_data.get("supervisor_min_avail_prc", ct.DEFAULT_MIN_CERTAINTY_PRC)
 
       current_epochs, current_avails, current_cert = [], [], []
       for epoch_id, epoch_val in zip(epoch_ids, epoch_vals):
@@ -124,7 +128,7 @@ class OracleTester:
         current_avails.append(epoch_val)
         current_cert.append(dict_certainty.get(str(epoch_id), 0))
       # endfor epochs
-      return current_epochs, current_avails, current_cert, is_valid
+      return current_epochs, current_avails, current_cert, is_valid, min_certainty_prc
 
     def handle_server_data(
         self, oracle_stats_dict: dict,
@@ -156,11 +160,13 @@ class OracleTester:
         }
       # endif first time for this sender
       current_stats = oracle_stats_dict[sender]
-      current_epochs, current_avails, current_certs, is_valid = self.compute_epochs_availability_and_certainty(result)
+      # TODO: maybe automate this (have only the list of keys to go through).
+      current_epochs, current_avails, current_certs, is_valid, min_certainty_prc = self.compute_epochs_availability_and_certainty(result)
       stats_epochs = current_stats.get("epochs", None)
       stats_avails = current_stats.get("avails", None)
       stats_certs = current_stats.get("certs", None)
       stats_is_valid = current_stats.get("is_valid", None)
+      stats_min_certainty_prc = current_stats.get("min_certainty_prc", None)
       mismatches = []
       if stats_epochs is not None and current_epochs != stats_epochs:
         mismatches.append(f"epochs: {current_epochs} != {stats_epochs}")
@@ -174,6 +180,9 @@ class OracleTester:
       if stats_is_valid is not None and is_valid != stats_is_valid:
         mismatches.append(f"validity: {is_valid} != {stats_is_valid}")
       # endif check for mismatch
+      if stats_min_certainty_prc is not None and min_certainty_prc != stats_min_certainty_prc:
+        mismatches.append(f"min_certainty_prc: {min_certainty_prc} != {stats_min_certainty_prc}")
+      # endif check for mismatch
 
       if len(mismatches) > 0:
         current_stats["errors"].append(f"Round {self.request_rounds}: {', '.join(mismatches)}")
@@ -187,6 +196,8 @@ class OracleTester:
           current_stats["certs"] = current_certs
         if stats_is_valid is None:
           current_stats["is_valid"] = is_valid
+        if stats_min_certainty_prc is None:
+          current_stats["min_certainty_prc"] = min_certainty_prc
       # endif valid data received
       return
 
@@ -298,6 +309,78 @@ 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):
+    """
+    Gather data from the oracle server for the given nodes and compare the results between oracles.
+
+    Parameters
+    ----------
+    nodes : list[dict] or list[str]
+        The list of nodes for which to gather data. Each node can be a dictionary containing the
+        address, eth_address, and alias of the node or a string containing the eth_address of the node.
+        Either way, the eth_address is required.
+    request_kwargs : dict
+        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.
+
+    Returns
+    -------
+    tuple
+        A tuple containing the responses and the stats dictionary.
+    """
+    responses, stats_dict = self.gather(
+      nodes=nodes,
+      request_kwargs=request_kwargs,
+      debug=debug,
+      rounds=rounds
+    )
+    # Statistics for each node of each epoch
+    epochs_nodes_stats = {}
+    # Statistics for each epoch of each node
+    nodes_epochs_stats = {}
+    for node_eth_addr, node_data in stats_dict.items():
+      oracle_data = node_data.get(ct.ORACLE_DATA, {})
+      errors = oracle_data.get("errors", [])
+      if len(errors) > 0:
+        self.P(f'#######################{node_eth_addr} errors########################')
+        self.P(f"Errors for {node_eth_addr}:\n" + '\n'.join(errors), color='r')
+        self.P(f'#######################{node_eth_addr} errors########################')
+      # endif
+
+      if node_eth_addr not in nodes_epochs_stats:
+        # This check should not be necessary, but just in case
+        nodes_epochs_stats[node_eth_addr] = {}
+      # endif first time for this node
+
+      epochs_stats = nodes_epochs_stats[node_eth_addr]
+      epochs = oracle_data.get("epochs", []),
+      avails = oracle_data.get("avails", []),
+      certs = oracle_data.get("certs", [])
+      min_certainty_prc = oracle_data.get("stats_min_certainty_prc", ct.DEFAULT_MIN_CERTAINTY_PRC)
+      for epoch, avail, cert in zip(epochs, avails, certs):
+        if epoch not in epochs_nodes_stats:
+          epochs_nodes_stats[epoch] = {}
+        # endif epoch not in stats
+        if epoch not in epochs_stats:
+          epochs_stats[epoch] = {}
+        # endif epoch not in stats
+        node_stats = epochs_nodes_stats[epoch]
+
+        if cert >= min_certainty_prc:
+          if avail not in epochs_stats[epoch]:
+            epochs_stats[epoch][avail] = set()
+          if avail not in node_stats:
+            node_stats[avail] = set()
+          # endif first time encountering this availability
+          epochs_stats[epoch][avail].add(node_eth_addr)
+          node_stats[avail].add(node_eth_addr)
+        # endif valid data
+      # endfor each epoch
+
+
+    return responses, stats_dict
+
   def get_current_epoch(self):
     epoch_url = self.BASE_URL + self.CURRENT_EPOCH_ENDPOINT
     response = self.make_request(epoch_url)
@@ -490,8 +573,14 @@ def handle_command_results(res):
   return
 
 def oracle_tester_init(silent=True, **kwargs):
-  log = Logger("R1CTL", base_folder=".", app_folder="_local_cache", silent=silent)
+  log = Logger(
+    "R1CTL",
+    base_folder=get_user_folder(),
+    app_folder="_local_cache",
+    silent=silent
+  )
   bc = DefaultBlockEngine(name='R1CTL', log=log)
+
   tester = OracleTester(
     bce=bc,
     log=log,
@@ -521,6 +610,40 @@ def test_commands():
   handle_command_results(res)
   return
 
+def oracle_check(N=10):
+  import random
+  random.seed(42)
+
+  tester = oracle_tester_init(
+    silent=True,
+    interval_seconds=0.2,
+  )
+  current_epoch = tester.get_current_epoch()
+  if current_epoch is None:
+    current_epoch = 100
+  nodes = tester.get_active_nodes()
+  rounds = 5
+  max_epochs = 10
+  max_nodes = 5
+
+  nodes = nodes[:max_nodes]
+  for i in range(N):
+    start = random.randint(1, current_epoch - 1)
+    end = random.randint(start, current_epoch - 1)
+    end = min(end, start + max_epochs - 1)
+
+    tester.P(f'Test {i + 1}/{N}: Epochs {start} to {end} with {rounds} rounds:', show=True)
+    tester.gather_and_compare(
+      nodes=nodes,
+      request_kwargs={
+        "start_epoch": start,
+        "end_epoch": end
+      },
+    )
+    tester.P(f'Finished test {i + 1}/{N}', show=True)
+  # endfor each test
+  return
+
 def oracle_test(N=10):
   import random
 

{naeural_client-2.6.37.dist-info → naeural_client-2.6.39.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
 naeural_client/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-naeural_client/_ver.py,sha256=Kz07pCrAEvKbAHrCINS6PyoSTVp83A2pwXAu8UB_eUc,331
+naeural_client/_ver.py,sha256=LKmpmF9zipVxTAWBLJnSORTzUky-UsiIPtU_RbkZbB8,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
@@ -23,7 +23,7 @@ naeural_client/cli/README.md,sha256=WPdI_EjzAbUW1aPyj1sSR8rLydcJKZtoiaEtklQrjHo,
 naeural_client/cli/cli.py,sha256=EC7-ehOMQJ_Dq7R9TTrajpvQWwdalAOgb1JAeBGHF50,3830
 naeural_client/cli/cli_commands.py,sha256=Gfims_TqaBi2QWM-6yxd_B_CETF8mmt7oEDPTg59lcI,2821
 naeural_client/cli/nodes.py,sha256=QXSniYy3Phr6buoVV-HUDRYuF5YQDUgf6nT6EzDyMJw,4909
-naeural_client/cli/oracles.py,sha256=g8h8kl3Mu6gU7JCs4a6WSDpvuVDGJgTHJbYJy7Iriw0,5210
+naeural_client/cli/oracles.py,sha256=Y_PzHshfSERS_Utjjtw5d_BsQRdGr6P4L6uW8yTdA0M,4809
 naeural_client/code_cheker/__init__.py,sha256=pwkdeZGVL16ZA4Qf2mRahEhoOvKhL7FyuQbMFLr1E5M,33
 naeural_client/code_cheker/base.py,sha256=lT5DRIFO5rqzsMNCmdMRfkAeevmezozehyfgmhnKpuI,19074
 naeural_client/code_cheker/checker.py,sha256=QWupeM7ToancVIq1tRUxRNUrI8B5l5eoY0kDU4-O5aE,7365
@@ -58,7 +58,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=dTGQeIQADPFPlNv-3TR4uXi61y-N6_TLOfosmONuKv8,67113
+naeural_client/logging/base_logger.py,sha256=sTdY0IudHyJKluKkJexyR4ZCZvO1XVKwKMjc1LeOL5E,67694
 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
@@ -82,9 +82,9 @@ naeural_client/utils/__init__.py,sha256=mAnke3-MeRzz3nhQvhuHqLnpaaCSmDxicd7Ck9uw
 naeural_client/utils/comm_utils.py,sha256=4cS9llRr_pK_3rNgDcRMCQwYPO0kcNU7AdWy_LtMyCY,1072
 naeural_client/utils/config.py,sha256=Ub5sw3NG6wskAF5C4s0WU0rzXHVLy70ZTRU0W8HUGTM,6403
 naeural_client/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
-naeural_client/utils/oracle_sync/multiple_requests.py,sha256=GLzROGZ0gI4d1PVWgW_JBUYZjEL4LqZvHvwelxDiPW4,20892
-naeural_client-2.6.37.dist-info/METADATA,sha256=geNzXBl8TAuOA9uhBLfAd5nk_YH0aa_BWfX0hX--INs,12354
-naeural_client-2.6.37.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-naeural_client-2.6.37.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
-naeural_client-2.6.37.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-naeural_client-2.6.37.dist-info/RECORD,,
+naeural_client/utils/oracle_sync/oracle_tester.py,sha256=wBetjbJ8Z6VjTn0y7aqxL59Z9Qy1sukJ4bGlykNf0vA,25307
+naeural_client-2.6.39.dist-info/METADATA,sha256=CS5uWfA_sKzkNFWHmh4N-iv22ym-wyL5NiEZVez-6Ys,12354
+naeural_client-2.6.39.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+naeural_client-2.6.39.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
+naeural_client-2.6.39.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+naeural_client-2.6.39.dist-info/RECORD,,