ratio1 3.4.35__py3-none-any.whl → 3.4.37__py3-none-any.whl

ratio1/_ver.py

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

ratio1/base/generic_session.py

@@ -27,7 +27,6 @@ from ..const import (
   BLOCKCHAIN_CONFIG, SESSION_CT, NET_CONFIG
 )
 from ..const import comms as comm_ct
-from ..const.evm_net import EVM_NET_DATA, EvmNetData
 from ..const import DEEPLOY_CT
 from ..io_formatter import IOFormatterWrapper
 from ..logging import Logger
@@ -1548,7 +1547,7 @@ class GenericSession(BaseDecentrAIObject):
           If no oracles are found for the wallet on the current network
       """
       current_network = block_engine.current_evm_network
-      api_base_url = EVM_NET_DATA[current_network][EvmNetData.EE_DEEPLOY_API_URL_KEY]
+      api_base_url = block_engine.get_deeploy_url()
 
       wallet_nodes = block_engine.web3_get_wallet_nodes(block_engine.eth_address)
       oracles_on_the_network = block_engine.web3_get_oracles(current_network)
@@ -1750,6 +1749,13 @@ class GenericSession(BaseDecentrAIObject):
       dct_aliases = {v: k for k, v in self.__dct_node_address_to_alias.items()}
       return dct_aliases
 
+    def get_node_address(self, node):
+      """
+      A public wrapper for __get_node_address.
+      """
+      return self.__get_node_address(node)
+
+
     def __get_node_address(self, node):
       """
       Get the address of a node. If node is an address, return it. Else, return the address of the node.
@@ -2317,6 +2323,19 @@ class GenericSession(BaseDecentrAIObject):
 
       return active_supervisors
 
+    def get_last_hb(self):
+      """
+      Get the last heartbeat of all nodes.
+
+      Returns
+      -------
+      dict
+          A dictionary with the last heartbeat of all nodes.
+          Where the key is the node address and the value is the last heartbeat.
+      """
+      return self._dct_online_nodes_last_heartbeat
+
+
     def attach_to_pipeline(self, *,
                            node,
                            name,
@@ -3307,21 +3326,6 @@ class GenericSession(BaseDecentrAIObject):
       if target_nodes_count == 0 and len(target_nodes) == 0:
         raise ValueError("You must specify at least one target node to deploy the container app.")
 
-      # Check if PK exists
-      if not os.path.isfile(signer_private_key_path):
-        raise ValueError("Private key path is not valid.")
-
-      # Create a block engine instance with the private key
-      block_engine = DefaultBlockEngine(
-        log=logger,
-        name="deeploy_launch_container_app",
-        config={
-          BCct.K_PEM_FILE: signer_private_key_path,
-          BCct.K_PASSWORD: signer_private_key_password,
-        }
-      )
-
-      current_network, api_base_url = self.__validate_deeploy_network_and_get_api_url(block_engine)
       #####################################################
 
       assert callable(message_handler), "The `message_handler` method parameter must be provided."
@@ -3354,43 +3358,126 @@ class GenericSession(BaseDecentrAIObject):
 
 
       #####################################################
-      request_data = {DEEPLOY_CT.DEEPLOY_KEYS.REQUEST: {
-        DEEPLOY_CT.DEEPLOY_KEYS.APP_ALIAS: name,
-        DEEPLOY_CT.DEEPLOY_KEYS.PLUGIN_SIGNATURE: signature,
-        DEEPLOY_CT.DEEPLOY_KEYS.TARGET_NODES: target_nodes,
-        DEEPLOY_CT.DEEPLOY_KEYS.TARGET_NODES_COUNT: target_nodes_count,
-      }}
-
-      request_data[DEEPLOY_CT.DEEPLOY_KEYS.REQUEST][DEEPLOY_CT.DEEPLOY_KEYS.APP_PARAMS] = {
-        'TELEGRAM_BOT_TOKEN': telegram_bot_token,
-        'TELEGRAM_BOT_NAME': telegram_bot_name,
-        'MESSAGE_HANDLER': func_base64_code,
-        'MESSAGE_HANDLER_ARGS': func_args,  # mandatory message and user
-        'MESSAGE_HANDLER_NAME': func_name,  # not mandatory
-        'PROCESSING_HANDLER': proc_func_base64_code,  # not mandatory
-        'PROCESSING_HANDLER_ARGS': proc_func_args,  # not mandatory
+      app_params = {
+        DEEPLOY_CT.DEEPLOY_KEYS.APP_PARAMS_TELEGRAM_BOT_TOKEN: telegram_bot_token,
+        DEEPLOY_CT.DEEPLOY_KEYS.APP_PARAMS_TELEGRAM_BOT_NAME: telegram_bot_name,
+        DEEPLOY_CT.DEEPLOY_KEYS.APP_PARAMS_MESSAGE_HANDLER: func_base64_code,
+        DEEPLOY_CT.DEEPLOY_KEYS.APP_PARAMS_MESSAGE_HANDLER_ARGS: func_args,  # mandatory message and user
+        DEEPLOY_CT.DEEPLOY_KEYS.APP_PARAMS_MESSAGE_HANDLER_NAME: func_name,  # not mandatory
+        DEEPLOY_CT.DEEPLOY_KEYS.APP_PARAMS_PROCESSING_HANDLER: proc_func_base64_code,  # not mandatory
+        DEEPLOY_CT.DEEPLOY_KEYS.APP_PARAMS_PROCESSING_HANDLER_ARGS: proc_func_args,  # not mandatory
       }
 
+      api_base_url, request_body = self.__generate_deeploy_request(
+        logger=logger,
+        signer_private_key_path=signer_private_key_path,
+        signer_private_key_password=signer_private_key_password,
+        app_alias=name,
+        signature=signature,
+        target_nodes=target_nodes,
+        target_nodes_count=target_nodes_count,
+        app_params=app_params
+      )
+
+
       try:
-        # Set the nonce for the request
-        nonce = f"0x{int(time.time() * 1000):x}"
-        request_data[DEEPLOY_CT.DEEPLOY_KEYS.REQUEST][DEEPLOY_CT.DEEPLOY_KEYS.NONCE] = nonce
+        # Send request
+        response = requests.post(f"{api_base_url}/{DEEPLOY_CT.DEEPLOY_REQUEST_PATHS.CREATE_PIPELINE}", json=request_body)
+        return response.json()
+      except Exception as e:
+        logger.P(f"Error during deeploy_simple_telegram_bot: {e}", color='r', show=True)
+        raise e
 
-        # Sign the payload using eth_sign_payload
-        signature = block_engine.eth_sign_payload(
-          payload=request_data[DEEPLOY_CT.DEEPLOY_KEYS.REQUEST],
-          indent=1,
-          no_hash=True,
-          message_prefix="Please sign this message for Deeploy: "
-        )
+    def deeploy_custom_code(self,
+                            signer_private_key_path: str,
+                            logger,
+                            custom_code=None,
+                            target_nodes=[],
+                            target_nodes_count=0,
+                            signer_private_key_password='',
+                            name="deeploy_custom_code",
+                            signature=PLUGIN_SIGNATURES.CUSTOM_EXEC_01,
+                            config={},
+                            ):
+      """
+      Deploy custom Python code on the Ratio1 Edge Protocol network using the Deeploy API.
+      Parameters
+      ----------
+      signer_private_key_path : str
+          Path to the PEM file containing the private key used for signing the deployment request
+          
+      logger : Logger
+          Logger instance for recording deployment activities and errors
+          
+      custom_code : callable
+          Python function to deploy. Must be a callable function that will be serialized and deployed to edge nodes.
+          The function will be validated for syntax errors before deployment.
+          
+      target_nodes : list, optional
+          List of specific node addresses to deploy the custom code to.
+          If empty, uses target_nodes_count instead. Defaults to []
+          
+      target_nodes_count : int, optional
+          Number of nodes to deploy to when target_nodes is not specified. Defaults to 0
+          
+      signer_private_key_password : str, optional
+          Password for the private key file if it's encrypted. Defaults to ''
+          
+      name : str, optional
+          Application alias/name for identification. Defaults to "deeploy_custom_code"
+          
+      signature : str, optional
+          The signature of the plugin that will be used. Defaults to PLUGIN_SIGNATURES.CUSTOM_EXEC_01
+          
+      config : dict, optional
+          Additional configuration parameters to pass to the deployed custom code.
+          These parameters will be available to the custom code at runtime. Defaults to {}
+
+      Returns
+      -------
+      dict
+          JSON response from the Deeploy API containing deployment status and details
 
+      """
+      if target_nodes_count == 0 and len(target_nodes) == 0:
+        raise ValueError("You must specify at least one target node to deploy the container app.")
+
+      #####################################################
+
+      assert callable(custom_code), "The `custom_code` method parameter must be provided."
+
+      base_code_checker_inst = BaseCodeChecker()
+
+      plain_code = base_code_checker_inst.get_function_source_code(custom_code)
+      custom_code_base64, error_messages = base_code_checker_inst.code_to_base64(plain_code, return_errors=True)
+      if error_messages:
+        raise ValueError(f"Custom code has errors: {error_messages}")
+      #####################################################
+      app_params = {
+        DEEPLOY_CT.DEEPLOY_KEYS.APP_PARAMS_CODE: custom_code_base64,
+        **config
+      }
+
+      api_base_url, request_body = self.__generate_deeploy_request(
+        logger=logger,
+        signer_private_key_path=signer_private_key_path,
+        signer_private_key_password=signer_private_key_password,
+        app_alias=name,
+        signature=signature,
+        target_nodes=target_nodes,
+        target_nodes_count=target_nodes_count,
+        app_params=app_params
+      )
+
+      try:
         # Send request
-        response = requests.post(f"{api_base_url}/{DEEPLOY_CT.DEEPLOY_REQUEST_PATHS.CREATE_PIPELINE}", json=request_data)
+        response = requests.post(f"{api_base_url}/{DEEPLOY_CT.DEEPLOY_REQUEST_PATHS.CREATE_PIPELINE}", json=request_body)
         return response.json()
       except Exception as e:
-        logger.P(f"Error during deeploy_launch_container_app: {e}", color='r', show=True)
+        logger.P(f"Error during deeploy_custom_code: {e}", color='r', show=True)
         raise e
 
+
     def deeploy_close(self, logger,
                       signer_private_key_path: str,
                       app_id: str,
@@ -3471,37 +3558,157 @@ class GenericSession(BaseDecentrAIObject):
       --------
       deeploy_launch_container_app : Deploy a new containerized application
       """
+
+
+      api_base_url, request_body = self.__generate_deeploy_request(
+        logger=logger,
+        signer_private_key_path=signer_private_key_path,
+        signer_private_key_password=signer_private_key_password,
+        request_params={
+          DEEPLOY_CT.DEEPLOY_KEYS.APP_ID: app_id,
+          DEEPLOY_CT.DEEPLOY_KEYS.TARGET_NODES: target_nodes,
+        }
+      )
+
+      endpoint = DEEPLOY_CT.DEEPLOY_REQUEST_PATHS.DELETE_PIPELINE
+      response = requests.post(f"{api_base_url}/{endpoint}", json=request_body)
+      return response.json()
+
+    def __generate_deeploy_request(self,
+                                   logger,
+                                   signer_private_key_path,
+                                   signer_private_key_password,
+                                   app_alias=None,
+                                   signature=None,
+                                   target_nodes=None,
+                                   target_nodes_count=0,
+                                   app_params={},
+                                   request_params={}):
+      """
+      Generate a signed Deeploy API request for deploying applications to edge nodes.
+      
+      This method creates a properly formatted and cryptographically signed request
+      that can be sent to the Deeploy API for deploying various types of applications
+      (containers, custom code, Telegram bots, etc.) to the Ratio1 Edge Protocol network.
+
+      Parameters
+      ----------
+      logger : Logger
+          Logger instance for recording request generation activities and errors
+          
+      signer_private_key_path : str
+          Path to the PEM file containing the private key used for signing the request
+          
+      signer_private_key_password : str
+          Password for the private key file if it's encrypted
+          
+      app_alias : str, optional
+          Application alias/name for identification in the Deeploy system.
+          Required for creation requests, not needed for deletion or query operations.
+          Defaults to None
+          
+      signature : str, optional
+          The plugin signature that identifies the type of application to deploy
+          (e.g., CONTAINER_APP_RUNNER, TELEGRAM_BASIC_BOT_01, CUSTOM_EXEC_01).
+          Required for creation requests, not needed for deletion or query operations.
+          Defaults to None
+          
+      target_nodes : list, optional
+          List of specific node addresses to deploy the application to.
+          If empty, uses target_nodes_count instead.
+          Required for creation requests, optional for other operations.
+          Defaults to None
+          
+      target_nodes_count : int, optional
+          Number of nodes to deploy to when target_nodes is not specified.
+          Used when you want Deeploy to automatically select nodes.
+          Defaults to 0
+          
+      app_params : dict, optional
+          Application-specific parameters that will be passed to the deployed application.
+          These parameters vary depending on the application type and signature.
+          Defaults to {}
+          
+      request_params : dict, optional
+          Additional parameters to include in the request payload.
+          These are typically metadata or configuration options for the deployment process.
+          Defaults to {}
+
+      Returns
+      -------
+      tuple
+          A tuple containing (api_base_url, request_body) where:
+          - api_base_url (str): The base URL for the Deeploy API endpoint
+          - request_body (dict): The complete signed request payload ready for HTTP transmission
+
+      Examples
+      --------
+      Generate a request for deploying a container application:
+      
+      >>> api_url, request = session.__generate_deeploy_request(
+      ...     logger=my_logger,
+      ...     signer_private_key_path="/path/to/private_key.pem",
+      ...     signer_private_key_password="",
+      ...     app_alias="my_web_app",
+      ...     signature="CONTAINER_APP_RUNNER",
+      ...     target_nodes=["node1_address", "node2_address"],
+      ...     target_nodes_count=0,
+      ...     app_params={"image": "nginx:latest", "port": 80}
+      ... )
+      
+      Generate a request for deleting an application (no signature/app_alias needed):
+      
+      >>> api_url, request = session.__generate_deeploy_request(
+      ...     logger=my_logger,
+      ...     signer_private_key_path="/path/to/private_key.pem",
+      ...     signer_private_key_password="",
+      ...     request_params={"app_id": "my_app_12345", "target_nodes": ["node1_address"]}
+      ... )
+      """
+
+      request_body = {DEEPLOY_CT.DEEPLOY_KEYS.REQUEST: {
+        DEEPLOY_CT.DEEPLOY_KEYS.TARGET_NODES_COUNT: target_nodes_count,
+        **request_params
+      }}
+
+      # Add creation-specific fields only if provided
+      if app_alias is not None:
+        request_body[DEEPLOY_CT.DEEPLOY_KEYS.REQUEST][DEEPLOY_CT.DEEPLOY_KEYS.APP_ALIAS] = app_alias
+      if signature is not None:
+        request_body[DEEPLOY_CT.DEEPLOY_KEYS.REQUEST][DEEPLOY_CT.DEEPLOY_KEYS.PLUGIN_SIGNATURE] = signature
+      if target_nodes is not None:
+        request_body[DEEPLOY_CT.DEEPLOY_KEYS.REQUEST][DEEPLOY_CT.DEEPLOY_KEYS.TARGET_NODES] = target_nodes
+      if app_params:
+        request_body[DEEPLOY_CT.DEEPLOY_KEYS.REQUEST][DEEPLOY_CT.DEEPLOY_KEYS.APP_PARAMS] = app_params
+
+      # Check if PK exists
+      if not os.path.isfile(signer_private_key_path):
+        raise ValueError("Private key path is not valid.")
+
       # Create a block engine instance with the private key
       block_engine = DefaultBlockEngine(
         log=logger,
-        name="deeploy_close",
+        name="deeploy_request_block_engine",
         config={
           BCct.K_PEM_FILE: signer_private_key_path,
           BCct.K_PASSWORD: signer_private_key_password,
         }
       )
 
-      current_network, api_base_url = self.__validate_deeploy_network_and_get_api_url(block_engine)
-
-      endpoint = DEEPLOY_CT.DEEPLOY_REQUEST_PATHS.DELETE_PIPELINE
-      request_data = {DEEPLOY_CT.DEEPLOY_KEYS.REQUEST: {}}
-      request_data[DEEPLOY_CT.DEEPLOY_KEYS.REQUEST][DEEPLOY_CT.DEEPLOY_KEYS.APP_ID] = app_id
-      request_data[DEEPLOY_CT.DEEPLOY_KEYS.REQUEST][DEEPLOY_CT.DEEPLOY_KEYS.TARGET_NODES] = target_nodes
-
+      # Set the nonce for the request
       nonce = f"0x{int(time.time() * 1000):x}"
-      request_data[DEEPLOY_CT.DEEPLOY_KEYS.REQUEST][DEEPLOY_CT.DEEPLOY_KEYS.NONCE] = nonce
+      request_body[DEEPLOY_CT.DEEPLOY_KEYS.REQUEST][DEEPLOY_CT.DEEPLOY_KEYS.NONCE] = nonce
 
       # Sign the payload using eth_sign_payload
       block_engine.eth_sign_payload(
-        payload=request_data[DEEPLOY_CT.DEEPLOY_KEYS.REQUEST],
+        payload=request_body[DEEPLOY_CT.DEEPLOY_KEYS.REQUEST],
         indent=1,
         no_hash=True,
         message_prefix="Please sign this message for Deeploy: "
       )
 
-      response = requests.post(f"{api_base_url}/{endpoint}", json=request_data)
-      return response.json()
-
+      _, api_base_url = self.__validate_deeploy_network_and_get_api_url(block_engine)
+      return api_base_url, request_body
 
     def __is_assets_valid(self, assets, mandatory=True, raise_exception=True, default_field_values=None):
       if assets is None:

ratio1/bc/evm.py

@@ -11,6 +11,7 @@ from eth_utils import keccak, to_checksum_address
 from eth_account.messages import encode_defunct
 
 from ..const.base import EE_VPN_IMPL_ENV_KEY, dAuth, BCctbase, ETHVarTypes, EVM_ABI_DATA
+from ..const.evm_net import EVM_NET_DATA, EvmNetData
 
 EE_VPN_IMPL = str(os.environ.get(EE_VPN_IMPL_ENV_KEY, False)).lower() in [
   'true', '1', 'yes', 'y', 't', 'on'
@@ -1291,4 +1292,19 @@ class _EVMMixin:
           "r1Balance": float(r1_balance),
         }
 
-      return balances
+      return balances
+
+
+  def get_deeploy_url(self):
+    """
+    Returns the deeploy URL from the environment or the network data
+
+    Returns
+    -------
+    str
+      the deeploy URL.
+
+    """
+    current_network = self.current_evm_network
+    deeploy_api_base_url = EVM_NET_DATA[current_network][EvmNetData.EE_DEEPLOY_API_URL_KEY]
+    return deeploy_api_base_url

ratio1/cli/cli_commands.py

@@ -10,9 +10,9 @@ and it is used by cli.py
 """
 
 from ratio1.cli.nodes import (
-  get_nodes, get_supervisors, 
+  get_nodes, get_supervisors,
   restart_node, shutdown_node,
-  get_apps
+  get_apps, inspect_node
 )
 from ratio1.cli.oracles import get_availability, oracle_rollout
 from ratio1.utils.config import (
@@ -42,6 +42,10 @@ CLI_COMMANDS = {
         "supervisors": {
             "func": get_supervisors, # DONE
             "description": "Get the list of available supervisor oracles",
+            "params": {
+                "--eth" : "Use a specific node (flag)",
+                "--wide" : "Display all available information (flag)",
+            }
         },
         "eth" : {
             "func": get_eth_addr,
@@ -118,14 +122,16 @@ CLI_COMMANDS = {
         "func": restart_node,
         "description": "Restart a node",
         "params": {
-            "node": "The node to restart"
+            "node": "The node to restart",
+            "--ignore-peering": "Ignore peering when running the command (flag)",
         }
     },
     "shutdown": {
         "func": shutdown_node,
         "description": "Shutdown a node",
         "params": {
-            "node": "The node to shutdown"
+            "node": "The node to shutdown",
+            "--ignore-peering": "Ignore peering when running the command (flag)",
         }
     },
     "update": {
@@ -137,6 +143,14 @@ CLI_COMMANDS = {
     },
     "oracle-rollout": {
         "func": oracle_rollout,
-        "description": "Rollout update on all nodes in the network. The rollout order is seed nodes -> oracle nodes -> all other edge nodes. This command is needed when defining new environment variables in seed nodes, in order to make it available to all nodes in the network.",
-    }
+        "description": "Rollout update on all nodes in the network. The rollout order is seed nodes -> oracle nodes -> all other edge nodes. This command is needed when defining new environment variables in seed nodes, in order to make it available to all nodes in the network."
+    },
+    "inspect": {
+        "func": inspect_node,
+        "description": "Inspect a node by address or alias.",
+        "params": {
+            "node": "The node address or alias to inspect",
+            "--wide": "Display all available information (flag)"
+        }
+    },
 }

ratio1/cli/nodes.py

@@ -115,10 +115,15 @@ def get_supervisors(args):
     online_only=True,
     supervisors_only=True,
     return_session=True,
+    eth=args.eth,
+    all_info=args.wide,    
   )
   df, supervisor, super_alias, nr_supers, elapsed, sess = res
   FILTERED = ['Oracle', 'State']
   df = df[[c for c in df.columns if c not in FILTERED]]
+
+  import pandas as pd
+  pd.set_option('display.float_format', '{:.4f}'.format)
   
   if supervisor == "ERROR":
     log_with_color(f"No supervisors or no comms available in {elapsed:.1f}s. Please check your settings.", color='r')
@@ -206,8 +211,8 @@ def get_apps(args):
 def _send_command_to_node(args, command, ignore_not_found=False):
   node = args.node
   silent = not args.verbose   
+  ignore_peering = args.ignore_peering
 
-  
   t1 = time()
   df, _, _, _, _, sess = _get_netstats(
     silent=silent, online_only=True, return_session=True, all_info=True,
@@ -228,17 +233,21 @@ def _send_command_to_node(args, command, ignore_not_found=False):
     node_addr = df_found.Address.values[0]   
     log_with_color(f"{df_found}")
   else:
-    log_with_color("Node '{}' <{}> not found in network (toal {} nodes, {} peered).".format(
+    log_with_color("Node '{}' <{}> not found in network (total {} nodes, {} peered).".format(
       node, node_addr, df.shape[0], df.Peered.sum()), color='r'
     )
     node_addr = node
-    
+
+  if not peered and not ignore_peering:
+    log_with_color(f"Node '{node}' <{node_addr}> not peered, exiting...", color='r')
+    return
+
   if not peered:
     if found:
       log_with_color(f"Node '{node}' <{node_addr}> is not peered.", color='r')
     else:
       log_with_color(f"Node '{node}' <{node_addr}> may not accept this command.", color='r')
-    
+
   # TODO: currently this is based on node alias, but we should be based on node address
   #       and maybe even node alias
   if (found and peered) or ignore_not_found:
@@ -266,6 +275,7 @@ def restart_node(args):
       Arguments passed to the function.
   """
   node = args.node
+
   log_with_color(f"Attempting to restart node <{node}>", color='b')
   _send_command_to_node(args, COMMANDS.RESTART, ignore_not_found=True)
   return
@@ -281,7 +291,138 @@ def shutdown_node(args):
       Arguments passed to the function.
   """
   node = args.node
+
   log_with_color(f"Attempting to shutdown node <{node}>", color='b')
   _send_command_to_node(args, COMMANDS.STOP, ignore_not_found=True)
   return
 
+
+def inspect_node(args):
+  """
+  This function is used to inspect the node info.
+
+  Parameters
+  ----------
+  args : argparse.Namespace
+      Arguments passed to the function.
+  """
+  node = args.node
+  wide = args.wide
+  silent = not args.verbose
+
+  if not silent:
+    log_with_color(f"Inspecting node <{node}>", color='b')
+
+  from ratio1 import Session
+  session = Session(
+    silent=silent
+  )
+  try:
+    node_address = session.get_node_address(node)
+    last_hb = session.get_last_hb()
+    node_last_hb = last_hb.get(node_address)
+
+    if not node_last_hb:
+      # No last HB was found for specified Address, ETH Address or alias.
+      raise ValueError("Could not find a node by provided address/alias.")
+
+    # Display node stats from HB:
+    _display_node_stats_for_hb(node_last_hb, wide)
+
+  except Exception as e:
+    log_with_color(f"An error occurred while trying to get node info: {e}", color='r')
+  finally:
+    session.close()
+  return
+
+
+def _display_node_stats_for_hb(node_hb, wide=False):
+  """
+  Display main system information from node heartbeat data.
+  
+  Parameters
+  ----------
+  node_hb : dict
+      Node heartbeat data containing system information
+  wide: bool
+      If True, display all plugins.
+  """
+  from ratio1 import HEARTBEAT_DATA
+  from ratio1.utils.config import log_with_color
+  from ratio1.const.base import BCctbase
+  from ratio1 import PAYLOAD_DATA
+
+  # Extract basic node info
+  ee_id = node_hb.get(HEARTBEAT_DATA.EE_ID, 'Unknown')
+  node_addr = node_hb.get(HEARTBEAT_DATA.EE_ADDR, 'Unknown')
+  eth_addr = node_hb.get(BCctbase.ETH_SENDER, 'Unknown')
+  ee_version = node_hb.get(PAYLOAD_DATA.EE_VERSION, 'Unknown')
+  uptime = node_hb.get(HEARTBEAT_DATA.UPTIME, 0)
+  
+  # Display node header
+  log_with_color(f"\n=== Node Information ===", color='b')
+  log_with_color(f"Node alias: {ee_id}", color='g')
+  log_with_color(f"Address: {node_addr}", color='g')
+  log_with_color(f"ETH Address: {eth_addr}", color='g')
+  log_with_color(f"Edge Node Version: {ee_version}", color='g')
+  log_with_color(f"Uptime: {uptime:.1f} seconds ({uptime/3600:.1f} hours)", color='g')
+  
+  # CPU Information
+  cpu_info = node_hb.get(HEARTBEAT_DATA.CPU, 'Unknown')
+  cpu_cores = node_hb.get(HEARTBEAT_DATA.CPU_NR_CORES, 0)
+  cpu_used = node_hb.get(HEARTBEAT_DATA.CPU_USED, 0)
+  
+  log_with_color(f"\n=== CPU Information ===", color='b')
+  log_with_color(f"Processor: {cpu_info}", color='y')
+  log_with_color(f"Cores: {cpu_cores}", color='y')
+  log_with_color(f"Usage: {cpu_used:.1f}%", color='y')
+  
+  # Memory Information
+  total_memory = node_hb.get(HEARTBEAT_DATA.MACHINE_MEMORY, 0)
+  available_memory = node_hb.get(HEARTBEAT_DATA.AVAILABLE_MEMORY, 0)
+  process_memory = node_hb.get(HEARTBEAT_DATA.PROCESS_MEMORY, 0)
+  is_alert_ram = node_hb.get(HEARTBEAT_DATA.IS_ALERT_RAM, False)
+  
+  used_memory = total_memory - available_memory if total_memory and available_memory else 0
+  memory_usage_pct = (used_memory / total_memory * 100) if total_memory > 0 else 0
+  
+  log_with_color(f"\n=== Memory Information ===", color='b')
+  log_with_color(f"Total Memory: {total_memory:.2f} GB", color='y')
+  log_with_color(f"Available Memory: {available_memory:.2f} GB", color='y')
+  log_with_color(f"Used Memory: {used_memory:.2f} GB ({memory_usage_pct:.1f}%)", color='y')
+  log_with_color(f"Process Memory: {process_memory:.2f} GB", color='y')
+  if is_alert_ram:
+    log_with_color(f"RAM Alert: True", color='r')
+  
+  # Disk Information
+  total_disk = node_hb.get(HEARTBEAT_DATA.TOTAL_DISK, 0)
+  available_disk = node_hb.get(HEARTBEAT_DATA.AVAILABLE_DISK, 0)
+  
+  used_disk = total_disk - available_disk if total_disk and available_disk else 0
+  disk_usage_pct = (used_disk / total_disk * 100) if total_disk > 0 else 0
+  
+  log_with_color(f"\n=== Disk Information ===", color='b')
+  log_with_color(f"Total Disk: {total_disk:.2f} GB", color='y')
+  log_with_color(f"Available Disk: {available_disk:.2f} GB", color='y')
+  log_with_color(f"Used Disk: {used_disk:.2f} GB ({disk_usage_pct:.1f}%)", color='y')
+  
+  # Active Plugins
+  active_plugins = node_hb.get(HEARTBEAT_DATA.ACTIVE_PLUGINS, [])
+  log_with_color(f"\n=== Active Plugins ===", color='b')
+  log_with_color(f"Number of Active Plugins: {len(active_plugins)}", color='y')
+  
+  if active_plugins:
+    plugins_to_display = 99999 if wide else 5
+    for i, plugin in enumerate(active_plugins[:plugins_to_display]):  # Show first 5 plugins
+      stream_id = plugin.get(HEARTBEAT_DATA.ACTIVE_PLUGINS_INFO.STREAM_ID, 'Unknown')
+      signature = plugin.get(HEARTBEAT_DATA.ACTIVE_PLUGINS_INFO.SIGNATURE, 'Unknown')
+      instance_id = plugin.get(HEARTBEAT_DATA.ACTIVE_PLUGINS_INFO.INSTANCE_ID, 'Unknown')
+      total_payload = plugin.get(HEARTBEAT_DATA.ACTIVE_PLUGINS_INFO.TOTAL_PAYLOAD_COUNT, 0)
+      log_with_color(f"  {i+1}. {stream_id} {signature} ({instance_id}) - {total_payload} payloads", color='w')
+    
+    if len(active_plugins) > plugins_to_display:
+      log_with_color(f"  ... and {len(active_plugins) - plugins_to_display} more plugins", color='w')
+  
+  log_with_color(f"\n", color='w')  # Add final newline for spacing
+
+  return

ratio1/cli/oracles.py

@@ -188,11 +188,12 @@ if True:
     return all_online_nodes
 
 
-  def _send_restart_command(nodes, timeout_min=0, timeout_max=0, verbose=True):
+  def _send_restart_command(session, nodes, timeout_min=0, timeout_max=0, verbose=True):
     """
     Send a restart command to the specified nodes.
 
     Parameters:
+      session (Session): Session object.
       nodes (list): List of node addresses to send the restart command to.
       timeout_min (int): Minimum timeout in seconds for the command to complete.
       timeout_max (int): Maximum timeout in seconds for the command to complete.
@@ -200,15 +201,16 @@ if True:
     """
     for node in nodes:
       # Create an args object that restart_node expects
-      args = Namespace(node=node, verbose=verbose)
-      restart_node(args)
+      session._send_command_restart_node(node)
       timeout = randint(timeout_min, timeout_max)
-      log_with_color(f"Waiting {timeout} seconds before next restart...", color='y')
+      log_with_color("".join([f"Restarting {node} | ",
+                              f"Waiting {timeout} seconds before next restart..."]),
+                     color='y')
       sleep(timeout)
     return
 
 
-  def oracle_rollout():
+  def oracle_rollout(args):
     """
     This function performs an oracle rollout by restarting seed nodes, oracle nodes, and edge nodes in sequence.
     It first restarts the seed nodes, waits for a specified time, then restarts all oracle nodes except the seed nodes,
@@ -216,17 +218,25 @@ if True:
 
     This function is needed in order to ensure that all nodes in the network receive the new configuration defined on the seed nodes.
     """
-    session = Session()
+    silent = not args.verbose
+    session = Session(
+      silent=True
+    )
     current_network = session.bc_engine.current_evm_network
     session.close()
+
     log_with_color(f"ATTENTION! Current network: {current_network}", color='y')
-    log_with_color(f"Are you sure you want to restart all nodes on the network {current_network}?", color='b')
-    user_confirmation = input(f"Write down 'RESTART ALL on {current_network}' in order to proceed...")
+    log_with_color(f"Are you sure you want to restart ALL nodes on the network {current_network}?", color='b')
+    user_confirmation = input(f"Write down 'RESTART ALL on {current_network}' in order to proceed...\n >")
 
     if user_confirmation != f"RESTART ALL on {current_network}":
       log_with_color("Aborted by user...", color='y')
       return
 
+    session = Session(
+      silent=silent
+    )
+
     seed_nodes_addresses = _get_seed_nodes(current_network)
 
     all_online_nodes = _get_all_online_nodes()
@@ -237,8 +247,8 @@ if True:
     ]
 
     # 1. Send restart command to Seed Nodes.
-    log_with_color(f"Sending restart commands to seed nodes: {seed_nodes_addresses}", color='b')
-    _send_restart_command(seed_nodes_addresses)
+    log_with_color(f"Sending restart commands to {len(seed_nodes_addresses)} seed nodes: {seed_nodes_addresses}", color='b')
+    _send_restart_command(session=session, nodes=seed_nodes_addresses)
 
     # Remove seed node addresses from all_nodes_addresses
     log_with_color(
@@ -247,14 +257,15 @@ if True:
     sleep(30)
 
     # 2. Send restart commands to all Oracle nodes, except seed nodes.
-    log_with_color(f"Sending restart commands to all Oracle nodes, except seed nodes: {remaining_nodes}", color='b')
     oracle_nodes_addresses = [
       node['address']
       for node in remaining_nodes
       if node['oracle'] == True
     ]
 
-    _send_restart_command(nodes=oracle_nodes_addresses)
+    log_with_color(f"Sending restart commands to {len(oracle_nodes_addresses)} Non-Seed Oracle nodes, except seed nodes: {remaining_nodes}", color='b')
+
+    _send_restart_command(session=session, nodes=oracle_nodes_addresses)
 
     # Remove oracle node addresses from all_nodes_addresses
     remaining_nodes_addresses = [
@@ -269,12 +280,22 @@ if True:
     sleep(30)
 
     # 3. Send restart command to all remaining edge nodes.
-    log_with_color(f"Sending restart commands to all remaining edge nodes: {remaining_nodes_addresses}", color='b')
+    log_with_color(f"Sending restart commands to {len(remaining_nodes_addresses)} remaining edge nodes: {remaining_nodes_addresses}", color='b')
 
-    _send_restart_command(nodes=remaining_nodes_addresses, timeout_min=5, timeout_max=25)
+    _send_restart_command(session=session, nodes=remaining_nodes_addresses, timeout_min=5, timeout_max=25)
 
+    restarted_seed_nodes_count = len(seed_nodes_addresses)
+    restarted_oracle_nodes_count = len(oracle_nodes_addresses)
+    restarted_edge_nodes_count = len(remaining_nodes_addresses)
+    total_restarted_nodes_count = restarted_seed_nodes_count + restarted_oracle_nodes_count + restarted_edge_nodes_count
     log_with_color(f"All nodes restarted successfully.", color='g')
+    log_with_color("======================================================", color='b')
+    log_with_color(f"Total restarted {total_restarted_nodes_count} Nodes", color='b')
+    log_with_color(f"Restarted {restarted_seed_nodes_count} Seed Oracle Nodes", color='b')
+    log_with_color(f"Restarted {restarted_oracle_nodes_count} Non-Seed Oracle Nodes", color='b')
+    log_with_color(f"Restarted {restarted_edge_nodes_count} Edge Nodes", color='b')
 
+    session.close()
     return
 
 

ratio1/const/apps.py

@@ -8,6 +8,7 @@ class PLUGIN_SIGNATURES:
   CUSTOM_WEBAPI_01 = 'CUSTOM_CODE_FASTAPI_01'
   GENERIC_WEB_APP = 'GENERIC_WEB_APP'
   GENERIC_HTTP_SERVER = 'GENERIC_HTTP_SERVER'
+  CUSTOM_EXEC_01 = 'CUSTOM_EXEC_01'
   CHAIN_DIST_CUSTOM_JOB_01 = 'PROCESS_REAL_TIME_COLLECTED_DATA_CUSTOM_EXEC_CHAIN_DIST'
   TELEGRAM_BASIC_BOT_01 = 'TELEGRAM_BASIC_BOT_01'  
   TELEGRAM_CONVERSATIONAL_BOT_01 = 'TELEGRAM_CONVERSATIONAL_BOT_01'

ratio1/const/plugins/deeploy_const.py

@@ -40,6 +40,20 @@ class DEEPLOY_KEYS:
   APP_PARAMS_ENV = "ENV"
   APP_PARAMS_DYNAMIC_ENV = "DYNAMIC_ENV"
   APP_PARAMS_PORT = "PORT"
+
+  # Telegram Bot App Params:
+  APP_PARAMS_TELEGRAM_BOT_TOKEN="TELEGRAM_BOT_TOKEN"
+  APP_PARAMS_TELEGRAM_BOT_NAME="TELEGRAM_BOT_NAME"
+  APP_PARAMS_MESSAGE_HANDLER="MESSAGE_HANDLER"
+  APP_PARAMS_MESSAGE_HANDLER_ARGS="MESSAGE_HANDLER_ARGS"
+  APP_PARAMS_MESSAGE_HANDLER_NAME="MESSAGE_HANDLER_NAME"
+  APP_PARAMS_PROCESSING_HANDLER="PROCESSING_HANDLER"
+  APP_PARAMS_PROCESSING_HANDLER_ARGS="PROCESSING_HANDLER_ARGS"
+
+  # Custom Code App Params:
+  APP_PARAMS_CODE="CODE"
+
+  #########################
   # Auth result keys
   SENDER = "sender"
   SENDER_ORACLES = "sender_oracles"

{ratio1-3.4.35.dist-info → ratio1-3.4.37.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ratio1
-Version: 3.4.35
+Version: 3.4.37
 Summary: `ratio1` or Ration1 SDK is the Python SDK required for client app development for the Ratio1 ecosystem
 Project-URL: Homepage, https://github.com/Ratio1/ratio1_sdk
 Project-URL: Bug Tracker, https://github.com/Ratio1/ratio1_sdk/issues

{ratio1-3.4.35.dist-info → ratio1-3.4.37.dist-info}/RECORD

@@ -1,10 +1,10 @@
 ratio1/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-ratio1/_ver.py,sha256=pHqZXtYJ5e4ilTh4g-9Si4AesocEZe-Fbs_lL0nGnY8,331
+ratio1/_ver.py,sha256=jOqTWk2eCBYGGmkIbQvD17_xFaS8OOkly_YtMQztOZ4,331
 ratio1/base_decentra_object.py,sha256=iXvAAf6wPnGWzeeiRfwLojVoan-m1e_VsyPzjUQuENo,4492
 ratio1/plugins_manager_mixin.py,sha256=X1JdGLDz0gN1rPnTN_5mJXR8JmqoBFQISJXmPR9yvCo,11106
 ratio1/base/__init__.py,sha256=hACh83_cIv7-PwYMM3bQm2IBmNqiHw-3PAfDfAEKz9A,259
 ratio1/base/distributed_custom_code_presets.py,sha256=cvz5R88P6Z5V61Ce1vHVVh8bOkgXd6gve_vdESDNAsg,2544
-ratio1/base/generic_session.py,sha256=5JaPqqfOsAs7mFhHxByPfyjrQ-2UXAlgufIRKF-fzkM,171055
+ratio1/base/generic_session.py,sha256=fzpAIqRJbwiBrpFqHXCHxvakAves7cbXRrHURLelffI,179566
 ratio1/base/instance.py,sha256=oQvwzzRvir7851wyhDx_BwN6y_VgsNWwYo53vN33QI4,21914
 ratio1/base/pipeline.py,sha256=szoHrk1qBdY6NKPUk3tUTsJx3XzYp5C2GTOlzRiQi48,62489
 ratio1/base/plugin_template.py,sha256=Gs438cSkhvxPujE4CRH_32pcuZaVwI9kia8E4VDRpSU,138794
@@ -17,7 +17,7 @@ ratio1/bc/__init__.py,sha256=BI5pcqHdhwnMdbWTYDLW1cVP_844VtLra-lz7xprgsk,171
 ratio1/bc/base.py,sha256=g7tARNgi_0N1p9HpvqRDWDVYxuqU7W6S0q3ARC6oxKk,45870
 ratio1/bc/chain.py,sha256=HCTQGnmuKqTvUo95OKdg8rL2jhKfSMwrich2e_7Nyms,2336
 ratio1/bc/ec.py,sha256=FwlkWmJvQ9aHuf_BZX1CWSUAxw6OZ9jBparLIWcs_e4,18933
-ratio1/bc/evm.py,sha256=SP8g16i8U1xsAaagBRTuDG4CLPIcUvTM_Mu957HNg6c,40677
+ratio1/bc/evm.py,sha256=t0nYCyeGCotzfEKHVDtbtID8pATqofb-uPaPfz6t3lU,41074
 ratio1/certs/51.15.142.167.crt,sha256=rLxkwDIQm-u6Kw570NmdSFgjSChcdSJvXPxr4Mj-EU8,1167
 ratio1/certs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ratio1/certs/a0d9818f.ala.eu-central-1.emqxsl.com.crt,sha256=y-6io0tseyx9-a4Pmde1z1gPULtJNSYUpG_YFkYaMKU,1337
@@ -25,9 +25,9 @@ ratio1/certs/r9092118.ala.eu-central-1.emqxsl.com.crt,sha256=y-6io0tseyx9-a4Pmde
 ratio1/certs/s624dbd4.ala.us-east-1.emqxsl.com.crt,sha256=y-6io0tseyx9-a4Pmde1z1gPULtJNSYUpG_YFkYaMKU,1337
 ratio1/cli/README.md,sha256=YsT23YcZBRyTKReNZPxD762YqstSWKWz4iZe_UJELPc,73
 ratio1/cli/cli.py,sha256=D8UCtdTQKi1IqB_PAi3k2FfaM-rnfxmlrOzM4OJBOsA,4352
-ratio1/cli/cli_commands.py,sha256=OjfAHNCytNd0gD7ZqUttWjTpWKu65cvMDRMrag5YxoI,5675
-ratio1/cli/nodes.py,sha256=sxiI81Lf6v5ff2Tv9aRbcm2gYIVk4F4-oe6Gl3c2h5E,8845
-ratio1/cli/oracles.py,sha256=3jtWHy7EgPYJ2_bPYq-2dARHJjSDGqUsMLrM_xePjZE,9998
+ratio1/cli/cli_commands.py,sha256=aoPnASJ3uPHWqABLCL-E6J3U0npK7kxX8U07s_aR9qA,6290
+ratio1/cli/nodes.py,sha256=0QjAbAhn_KrrjiGUXQ0GhnxCM-Zvxhx32FNcQd9hhHI,14237
+ratio1/cli/oracles.py,sha256=HTQAKEwe-j0E00JKKPCH1GXjelyy0IAjzLZIx8qtimU,11141
 ratio1/cli/package_update.py,sha256=uRMPW5XV3fBdB_eZfoQDA1SKnJzTJvyfpRJA6T3ZZlQ,4000
 ratio1/code_cheker/__init__.py,sha256=pwkdeZGVL16ZA4Qf2mRahEhoOvKhL7FyuQbMFLr1E5M,33
 ratio1/code_cheker/base.py,sha256=hMnM94xro_r0Kze2KLwr00TKZ1HgshlxXmwql_SEz5I,19066
@@ -38,7 +38,7 @@ ratio1/comm/base_comm_wrapper.py,sha256=oJwMtQYGumxZz1lKvDEgFwLhC1LzZFsGTP9hxBH7
 ratio1/comm/mqtt_wrapper.py,sha256=QQ6IXcurchjY8Pp48t4SF1ZpE_GXaZTrgILzoMewefI,14397
 ratio1/const/README.md,sha256=6OHesr-f5NBuuJGryEoi_TCu2XdlhfQYlDKx_IJoXeg,177
 ratio1/const/__init__.py,sha256=mcSaDgSYV2xbOS8Api72dDPO6kPBRjnYjBPAh9cAgaU,558
-ratio1/const/apps.py,sha256=zPPLiPUGu-FR9UNfA2A3bYP9QZng_FAgrIdhjvTLqXI,749
+ratio1/const/apps.py,sha256=0NiuoAPak0HjEULF3fs3xaUH8IRSZ0i4fZw7T2fEd_g,785
 ratio1/const/base.py,sha256=0K1zhAkU_LmZosnz1UMmBhmYpVt5QVBPy9FkeLQlAFY,5955
 ratio1/const/comms.py,sha256=qEYX4ciYg8SYWSDZZTUYxzpR1--2a7UusrWzAq0hxo8,2259
 ratio1/const/environment.py,sha256=632L5GrcNqF3-JhvrC6kXzXwLMcihRgMlOkLurnOwGY,1031
@@ -47,7 +47,7 @@ ratio1/const/formatter.py,sha256=AW3bWlqf39uaqV4BBUuW95qKYfF2OkkU4f9hy3kSVhM,200
 ratio1/const/heartbeat.py,sha256=diQcAUZDNL2oJpWgh4JORhfBB6dvLa8ZW7Ce-xM-IcU,2655
 ratio1/const/misc.py,sha256=VDCwwpf5bl9ltx9rzT2WPVP8B3mZFRufU1tSS5MO240,413
 ratio1/const/payload.py,sha256=0rzfC__amwAIeTA8WIVteohMDN5zbBg4txis57Qh0PM,6844
-ratio1/const/plugins/deeploy_const.py,sha256=fuqtjMggNf8gxzF0jfgNswXJndBI0NRqwxnDxCr_5PE,12820
+ratio1/const/plugins/deeploy_const.py,sha256=8QcIf7zo_gSC6SdHqQVecn4yOUKCPMXzHC9zgGW5-3E,13314
 ratio1/default/__init__.py,sha256=ozU6CMMuWl0LhG8Ae3LrZ65a6tLrptfscVYGf83zjxM,46
 ratio1/default/instance/__init__.py,sha256=JQiqTFm_U5__z4bTlvT033hUOSIDCtrQ-evMrhT6JdA,741
 ratio1/default/instance/chain_dist_custom_job_01_plugin.py,sha256=QtHi3uXKsVs9eyMgbnvBVbMylErhV1Du4X2-7zDL7Y0,1915
@@ -103,8 +103,8 @@ ratio1/utils/comm_utils.py,sha256=4cS9llRr_pK_3rNgDcRMCQwYPO0kcNU7AdWy_LtMyCY,10
 ratio1/utils/config.py,sha256=IMXAN9bpHePKEuTFGRRqFJXz_vBa-wi7s9gLhFEheRY,9953
 ratio1/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
 ratio1/utils/oracle_sync/oracle_tester.py,sha256=aJOPcZhtbw1XPqsFG4qYpfv2Taj5-qRXbwJzrPyeXDE,27465
-ratio1-3.4.35.dist-info/METADATA,sha256=arH4DtBvwCO6pj66DbN7mKfsUzwN06VmawDYIPDMntU,12248
-ratio1-3.4.35.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ratio1-3.4.35.dist-info/entry_points.txt,sha256=DR_olREzU1egwmgek3s4GfQslBi-KR7lXsd4ap0TFxE,46
-ratio1-3.4.35.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-ratio1-3.4.35.dist-info/RECORD,,
+ratio1-3.4.37.dist-info/METADATA,sha256=MucFLKDGwWBSuCwv4mRGLP5dYZT30PMK7IclS32gauc,12248
+ratio1-3.4.37.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ratio1-3.4.37.dist-info/entry_points.txt,sha256=DR_olREzU1egwmgek3s4GfQslBi-KR7lXsd4ap0TFxE,46
+ratio1-3.4.37.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+ratio1-3.4.37.dist-info/RECORD,,