naeural-client 3.1.5__py3-none-any.whl → 3.2.2__py3-none-any.whl

naeural_client/utils/config.py

@@ -2,10 +2,8 @@ import json
 import os
 from pathlib import Path
 import shutil
-from pandas import DataFrame
-from datetime import datetime
 
-from naeural_client.const.base import BCct, dAuth
+from naeural_client.const.base import BCct, dAuth, EE_SDK_ALIAS_DEFAULT, EE_SDK_ALIAS_ENV_KEY 
 from naeural_client._ver import __VER__ as version
 
 from naeural_client.logging.base_logger import SDK_HOME, BaseLogger
@@ -23,6 +21,16 @@ EE_TARGET_NODE=
 
 """
 
+def _create_bc_engine():
+  from naeural_client.bc import DefaultBlockEngine
+  from naeural_client import Logger
+  return DefaultBlockEngine(
+    name="default", 
+    log=Logger("CLI", silent=True),
+    user_config=True, # this is must to use the user config
+  )
+  
+
 def seconds_to_short_format(seconds):
   """
   Converts a duration in seconds into a short human-readable format: "Xd HH:MM:SS".
@@ -99,6 +107,25 @@ def get_user_config_file():
 def get_network():
   return os.environ.get(dAuth.DAUTH_NET_ENV_KEY, dAuth.DAUTH_SDK_NET_DEFAULT)
 
+def get_alias():
+  return os.environ.get(EE_SDK_ALIAS_ENV_KEY, EE_SDK_ALIAS_DEFAULT)
+
+def set_client_alias(alias : str):
+  config_file = get_user_config_file()
+  # open config_file and update EE_SDK_ALIAS
+  with config_file.open("r") as file:
+    lines = file.readlines()
+  with config_file.open("w") as file:
+    found = False
+    for line in lines:
+      if line.startswith(EE_SDK_ALIAS_ENV_KEY):
+        line = f"{EE_SDK_ALIAS_ENV_KEY}={alias}\n"
+        found = True
+      file.write(line)
+    if not found:
+      file.write(f"{EE_SDK_ALIAS_ENV_KEY}={alias}\n")
+  log_with_color(f"Alias set to {alias}", color='b')
+  return 
 
 def get_networks(args):
   """
@@ -131,12 +158,21 @@ def get_set_network(args):
         file.write(f"EE_EVM_NET={net}\n")
     log_with_color(f"Network set to {net}", color='b')
   return
+
+def get_set_alias(args):
+  alias = args.set
+  if alias is None:
+    log_with_color(f"Client v{version} alias: {get_alias()}", color='b')
+  else:
+    set_client_alias(alias)
+  return
+    
   
 
 def reset_config(*larg, keep_existing=False, **kwargs):
   """
-  Resets the configuration by creating a ~/.naeural folder and populating
-  ~/.naeural/config with values from a local .env file, if it exists.
+  Resets the configuration by creating a ~/.ratio1 folder and populating
+  ~/.ratio1/config with values from a local .env file, if it exists.
   """
   log_with_color(f"Client v{version} resetting the configuration...", color='y')
   # Define the target config folder and file
@@ -146,13 +182,13 @@ def reset_config(*larg, keep_existing=False, **kwargs):
   local_pem = Path(LOCAL_PEM_PATH)
   target_pem = config_dir / BCct.USER_PEM_FILE
   
-  # Create the ~/.naeural folder if it doesn't exist
+  # Create the ~/.ratio1 folder if it doesn't exist
   config_dir.mkdir(parents=True, exist_ok=True)
 
   # Check if the current folder has a .env file
   current_env_file = Path(".env")
   if current_env_file.exists():
-    # Copy .env content to ~/.naeural/config
+    # Copy .env content to ~/.ratio1/config
     shutil.copy(current_env_file, config_file)
     log_with_color(
       f"Configuration has been reset using {current_env_file} into {config_file}", 
@@ -208,19 +244,21 @@ def show_version(silent=True):
   
   # TODO: get the epoch from the SDK  - AFTER moving get_epoch_id from core
   
-
+  log_with_color(f"Ratio1 client v{version}:\n", 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"Ratio1 network: {get_network()}", color='b')
   log_with_color(f"Network Epoch:  {sess.bc_engine.get_current_epoch()}", color='b')
   log_with_color(f"SDK addr:       {sess.get_client_address()}", color='b')
   log_with_color(f"SDK ETH addr:   {sess.bc_engine.eth_address}", color='b')
+  log_with_color(f"SDK alias:      {sess.name}", color='b')
   return
+
+
   
 
 def show_config(args):
   """
-  Displays the current configuration from ~/.naeural/config.
+  Displays the current configuration from ~/.ratio1/config.
   """
   show_version(silent=not args.verbose)
   config_file = get_user_config_file()
@@ -228,79 +266,18 @@ def show_config(args):
     keys = []
     with config_file.open("r") as file:
       lines = file.readlines()
-      keys = [line.strip().split("=")[0] for line in lines if "=" in line]
-    log_with_color(f"Current config {config_file} has {len(keys)} keys: {keys}", color='d')
+      keys = [line.strip().split("=")[0] for line in lines if "=" in line and not line.strip().startswith("#")]
+      commments = [line.strip() for line in lines if line.strip().startswith("#")]
+    log_with_color(f"Current config {config_file} has {len(keys)} keys and {len(commments)} comments\n", color='d')
   else:
     log_with_color(f"No configuration found at {config_file}. Please run `reset_config` first.", color="r")
   return
 
-def get_apps(args):
-  """
-  Shows the apps running on a given node, if the client is allowed on that node.
-  Parameters
-  ----------
-  args : argparse.Namespace
-      Arguments passed to the function.
 
-  """
-  verbose = args.verbose
-  node = args.node
-  show_full = args.full
-  as_json = args.json
-
-  # 1. Init session
-  from naeural_client import Session
-  sess = Session(
-    silent=not verbose
-  )
-
-  # 2. Wait for node to appear online
-  found = sess.wait_for_node(node)
-  if not found:
-    log_with_color(f'Node {node} not found. Please check the configuration.', color='r')
-    return
-  # 3. Check if the node is peered with the client
-  is_allowed = sess.is_peered(node)
-  if not is_allowed:
-    log_with_color(f"Node {node} is not peered with the client. Please check the configuration.", color='r')
-    return
-  # 4. Wait for node to send the configuration.
-  sess.wait_for_node_configs(node)
-  apps = sess.get_active_pipelines(node)
-  if apps is None:
-    log_with_color(f"No apps found on node {node}. Client might not be authorized", color='r')
-    return
-  # 5. Maybe exclude admin application.
-  if not show_full:
-    apps = {k: v for k, v in apps.items() if str(k).lower() != 'admin_pipeline'}
-  # 6. Show the apps
-  if as_json:
-    # Will print a big JSON with all the app configurations.
-    json_data = {k: v.get_full_config() for k, v in apps.items()}
-    log_with_color(json.dumps(json_data, indent=2))
-  else:
-    lst_plugin_instance_data = []
-    for pipeline_name, pipeline in apps.items():
-      for instance in pipeline.lst_plugin_instances:
-        lst_plugin_instance_data.append({
-          'APP': pipeline_name,
-          'PLUGIN': instance.signature,
-          'ID': instance.instance_id
-        })
-      # endfor instances in app
-    # endfor apps
-    apps_df = DataFrame(lst_plugin_instance_data)
-    last_seen = sess.get_last_seen_time(node)
-    is_online = sess.check_node_online(node)
-    node_status = 'Online' if is_online else 'Offline'
-    last_seen_str = datetime.fromtimestamp(last_seen).strftime('%Y-%m-%d %H:%M:%S') if last_seen else None
-    log_with_color(f"Apps on node {node} [{node_status}| Last seen: {last_seen_str}]:\n{apps_df}", color='b')
-  # endif show as json
-  return
 
 def load_user_defined_config(verbose=False):
   """
-  Loads the ~/.naeural/config file into the current environment.
+  Loads the ~/.ratio1/config file into the current environment.
   """
   config_file = get_user_config_file()
   result = False
@@ -340,3 +317,15 @@ def maybe_init_config():
       return False
     # config_file still does not exist even after attempting the migration.
   return load_user_defined_config()
+
+
+
+def get_eth_addr(args):
+  """
+  Gets the ETH address given a node address.
+  """
+  node = args.node
+  eng = _create_bc_engine()
+  eth_addr = eng.get_eth_address(node)
+  log_with_color(f"ETH address for node {node}: {eth_addr}", color='b')
+  return

naeural_client/utils/oracle_sync/oracle_tester.py

@@ -482,7 +482,7 @@ class OracleTester:
         msg = f"No data available for {node_eth_addr}. Please check the address or contact support."
       else:
         for epoch, avail, cert in zip(epochs, avails, certs):
-          msg += f"   - Epoch {f'#{epoch}':>4}: {avail:3} ({cert * 100:5.1f}%)\n"
+          msg += f"   - Epoch {f'#{epoch}':>4}: {avail:3} ({cert * 100:5.1f}% certainty)\n"
       # endif data available
       return msg
 

{naeural_client-3.1.5.dist-info → naeural_client-3.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naeural_client
-Version: 3.1.5
+Version: 3.2.2
 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
@@ -88,18 +88,18 @@ Comprehensive documentation for the Ratio1 SDK is currently a work in progress.
 
 Starting with version 2.6+, the Ratio1 SDK automatically performs self-configuration using **dAuth**—the Ratio1 decentralized self-authentication system. To begin integrating with the Ratio1 network, follow these steps:
 
-### 1. Start a Local Edge Node
+### 1. Start a Local Edge Node (testnet)
 
 Launch a local Ratio1 Edge Node using Docker:
 
 ```bash
-docker run -d --name=r1node naeural/edge_node:develop
+docker run -d --name=r1node naeural/edge_node:testnet
 ```
 
 if you want to have a persistent volume for the node, you can use the following command:
 
 ```bash
-docker run -d --name=r1node --rm --pull=always -v r1vol:/edge_node/_local_cache naeural/edge_node:develop
+docker run -d --name=r1node --rm --pull=always -v r1vol:/edge_node/_local_cache naeural/edge_node:testnet
 ```
 This way the node will store its data in the `r1vol` volume, and you can stop and start the node without losing data you might have stored in the node via deployed jobs from your SDK. We also added the `--pull=always` flag to ensure that the latest version of the node is always pulled from the Docker Hub.
 

{naeural_client-3.1.5.dist-info → naeural_client-3.2.2.dist-info}/RECORD

@@ -1,49 +1,49 @@
 naeural_client/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-naeural_client/_ver.py,sha256=PbAG-kxJyDZltzev3x8qCNcrsW_v0KI6VtkW9ReP848,330
-naeural_client/base_decentra_object.py,sha256=C4iwZTkhKNBS4VHlJs5DfElRYLo4Q9l1V1DNVSk1fyQ,4412
+naeural_client/_ver.py,sha256=NOz7aEJ1WJsh43U4LtIYy2q2MqQlpRN564G-nIQDATM,330
+naeural_client/base_decentra_object.py,sha256=iXvAAf6wPnGWzeeiRfwLojVoan-m1e_VsyPzjUQuENo,4492
 naeural_client/plugins_manager_mixin.py,sha256=X1JdGLDz0gN1rPnTN_5mJXR8JmqoBFQISJXmPR9yvCo,11106
 naeural_client/base/__init__.py,sha256=hACh83_cIv7-PwYMM3bQm2IBmNqiHw-3PAfDfAEKz9A,259
 naeural_client/base/distributed_custom_code_presets.py,sha256=cvz5R88P6Z5V61Ce1vHVVh8bOkgXd6gve_vdESDNAsg,2544
-naeural_client/base/generic_session.py,sha256=m7EYxqRb975H-Y1fTJVSl43zZfH028ZsgH-iyira4a4,116724
-naeural_client/base/instance.py,sha256=bDb9y9ez1vLEGGOCAACQoil7Dw-h7UAwCc18IEfqEas,20789
-naeural_client/base/pipeline.py,sha256=GYqDd59QQEn7_MTM_dhWsZtdit5q3rECC8HEivWXowo,60068
+naeural_client/base/generic_session.py,sha256=ATB1k_mQ_efvek_ZgsYYex3G4ouhXds3CHRz1_lOKZM,127702
+naeural_client/base/instance.py,sha256=annR9qt6zqzIyf_AVzAIfxWHF8Y_zEjviels2MNfcPM,21916
+naeural_client/base/pipeline.py,sha256=5IJnb8SRiCDJ3IRl02gEMXxjugGedyhu6xESP33GMpo,62521
 naeural_client/base/plugin_template.py,sha256=7YAFaND2iXoZLgtunjYkFf_TBGieFr3VdNLO3vCqzmM,138795
 naeural_client/base/responses.py,sha256=ZKBZmRhYDv8M8mQ5C_ahGsQvtWH4b9ImRcuerQdZmNw,6937
 naeural_client/base/transaction.py,sha256=bfs6td5M0fINgPQNxhrl_AUjb1YiilLDQ-Cd_o3OR_E,5146
 naeural_client/base/webapp_pipeline.py,sha256=ZNGqZ36DY076XVDfGu2Q61kCt3kxIJ4Mi4QbPZuDVn0,2791
 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=LGUw0oX3ALUHRO8PUWkuRrZMATEjM_y7WHJ11Pw0BcU,44749
+naeural_client/bc/__init__.py,sha256=BI5pcqHdhwnMdbWTYDLW1cVP_844VtLra-lz7xprgsk,171
+naeural_client/bc/base.py,sha256=zFrBp2zI1EdDYOP9NVrVAga-guDhx2n5taEGWfdqnW8,44755
 naeural_client/bc/chain.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 naeural_client/bc/ec.py,sha256=FwlkWmJvQ9aHuf_BZX1CWSUAxw6OZ9jBparLIWcs_e4,18933
-naeural_client/bc/evm.py,sha256=jYo50-8RB1e-KK5j1JmMPbp9-UuTe5J_-4Zrf1MAXRc,26108
+naeural_client/bc/evm.py,sha256=knccBb8Whdo2V1E_kmxJVHGV10-_Eoj2AFV7FVjJwj4,26508
 naeural_client/certs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 naeural_client/certs/a0d9818f.ala.eu-central-1.emqxsl.com.crt,sha256=y-6io0tseyx9-a4Pmde1z1gPULtJNSYUpG_YFkYaMKU,1337
 naeural_client/certs/r9092118.ala.eu-central-1.emqxsl.com.crt,sha256=y-6io0tseyx9-a4Pmde1z1gPULtJNSYUpG_YFkYaMKU,1337
 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=MH43FKpUfEG5Y8x8n1KZQh3UaSiLOwyvrWiYp_wLVW4,4070
-naeural_client/cli/cli_commands.py,sha256=XfZGVCSD2-rUr2EdQXOxxN2VwQd2f2aTMeSgRzXnuvs,3829
-naeural_client/cli/nodes.py,sha256=F7_qGplqOnrU2vLqBYFFn3ifgSoWHarHPrx89I6JI9w,5816
-naeural_client/cli/oracles.py,sha256=Y_PzHshfSERS_Utjjtw5d_BsQRdGr6P4L6uW8yTdA0M,4809
+naeural_client/cli/cli.py,sha256=paF9PuS1aSOkZuchMprKQ227acQl1nYVgOsNz7l-OU4,4117
+naeural_client/cli/cli_commands.py,sha256=7yK57VSxFuVvcku4x-STXERA3nnsotPMUJQWW__xPhA,4438
+naeural_client/cli/nodes.py,sha256=8ZbRPIInIXnxGZMiyH_V5M2qRyjwbyR0lEdCUp5M2wI,8384
+naeural_client/cli/oracles.py,sha256=EO24pUfMY4rhTjQMQnGn0cPF02e5se_3KUKl0nDI71E,4925
 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
 naeural_client/comm/__init__.py,sha256=za3B2HUKNXzYtjElMgGM9xbxNsdQfFY4JB_YzdyFkVU,76
 naeural_client/comm/amqp_wrapper.py,sha256=hzj6ih07DnLQy2VSfA88giDIFHaCp9uSdGLTA-IFE4s,8535
-naeural_client/comm/mqtt_wrapper.py,sha256=Ig3bFZkCbWd4y_Whn2PPa91Z3aLgNbNPau6Tn5yLPZ8,16167
+naeural_client/comm/mqtt_wrapper.py,sha256=lxXOPFoH9NCtxoAuf4vkA5WZA-Vj1szE_y01N_Dwb8s,16317
 naeural_client/const/README.md,sha256=6OHesr-f5NBuuJGryEoi_TCu2XdlhfQYlDKx_IJoXeg,177
 naeural_client/const/__init__.py,sha256=MM6Zib6i7M2qWcMkLtLx14zqU-lE-u2uPHjNvbh2jAM,478
 naeural_client/const/apps.py,sha256=ePBiJXLuPfFOKuw-LJrT9OWbaodU7QApfDurIPNDoB4,655
-naeural_client/const/base.py,sha256=zfJyGGdrNz_OA5i_6cQxH2lEeJ4PO3092NrwM_gZ_U8,5670
+naeural_client/const/base.py,sha256=3Q8Mn3LE4jte1ubBEas3z-ukw8ix_FrvsegY820P6do,5739
 naeural_client/const/comms.py,sha256=La6JXWHexH8CfcBCKyT4fCIoeaoZlcm7KtZ57ab4ZgU,2201
-naeural_client/const/environment.py,sha256=RpdDhDgB8NgRoFTk28eODigf9y0WcT9lul6mBOD029w,879
+naeural_client/const/environment.py,sha256=o02BhlrRR4gOOedZtK94FSyZ1dlmDL-BwcDG91CiogQ,962
 naeural_client/const/evm_net.py,sha256=oU_c6jUjWsFlslt2JFD1-bTOS06N7EGv88Rb6gF9xIQ,3221
 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
-naeural_client/const/payload.py,sha256=u_FLn19EJCDo4UqVfUX9ExikFWE-YFEhkj-Ij8an0VQ,6600
+naeural_client/const/payload.py,sha256=L4AV4ePu_aT85utH9_UujVW_j_Jl9ZpN9o_y1hGT3wQ,6677
 naeural_client/default/__init__.py,sha256=ozU6CMMuWl0LhG8Ae3LrZ65a6tLrptfscVYGf83zjxM,46
 naeural_client/default/instance/__init__.py,sha256=_cr6a9gProAZKL9_uz855q2pWt2jHwqE16ed8sm6V8I,653
 naeural_client/default/instance/chain_dist_custom_job_01_plugin.py,sha256=QtHi3uXKsVs9eyMgbnvBVbMylErhV1Du4X2-7zDL7Y0,1915
@@ -94,11 +94,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=QamxSnF6rqw91VhMWZoeO1EYUKjqWa-D8VFC1tIzTTM,10517
+naeural_client/utils/config.py,sha256=ohZFdIaRLwcWK0sh0loDD7JS9bsC9mqsFYairWZSVNg,9814
 naeural_client/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
-naeural_client/utils/oracle_sync/oracle_tester.py,sha256=X-923ccjkr6_kzbbiuAAcWSIhMtBDOH2VURjTh55apQ,27235
-naeural_client-3.1.5.dist-info/METADATA,sha256=WxmVtxYHKNdNGJek9MXCKaUTPb8aDcG2ALB-7oViUZs,12353
-naeural_client-3.1.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-naeural_client-3.1.5.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
-naeural_client-3.1.5.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-naeural_client-3.1.5.dist-info/RECORD,,
+naeural_client/utils/oracle_sync/oracle_tester.py,sha256=QwfBqXxPIOTVT6WVySkkxPnU3eJVvoyOEbq1ZQRuPRw,27245
+naeural_client-3.2.2.dist-info/METADATA,sha256=uj-o5GbwAvg3Uxx9MKKVUiLYkfCNX2WV8vnkn9aPWTk,12363
+naeural_client-3.2.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+naeural_client-3.2.2.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
+naeural_client-3.2.2.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+naeural_client-3.2.2.dist-info/RECORD,,