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

naeural_client/_ver.py

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

naeural_client/base/generic_session.py

@@ -45,7 +45,7 @@ from ..utils.config import (
 
 DEBUG_MQTT_SERVER = "r9092118.ala.eu-central-1.emqxsl.com"
 SDK_NETCONFIG_REQUEST_DELAY = 300
-
+SHOW_PENDING_THRESHOLD = 3600
 
 
 
@@ -3319,6 +3319,50 @@ class GenericSession(BaseDecentrAIObject):
       return dct_result
 
 
+  def date_to_readable(self, date, check_none=False, start_time=None, pending_threshold=SHOW_PENDING_THRESHOLD):
+    """
+    Convert a date to a human-readable format.
+
+    Parameters
+    ----------
+
+    date : str
+        The date to convert.
+    check_none : bool, optional
+        If True, and the date is None it will check if too much time passed from the start time.
+        If too much time passed, it will return 'Error!', otherwise, it will return 'Pending'.
+        If False, it will return 'Never' if the date is None.
+        Defaults to False.
+    start_time : str, optional
+        The start time to compare with the date in case it is None. Defaults to None.
+    pending_threshold : int, optional
+        The threshold in seconds to consider a date as pending. Defaults to SHOW_PENDING_THRESHOLD.
+        If the time passed since start_time is greater than pending_threshold and
+        check_none is set to True, it will return 'Error!'.
+
+    Returns
+    -------
+
+    str
+        The human-readable date.
+    """
+    if date is None:
+      if not check_none or start_time is None:
+        return 'Never'
+      # endif not check_none
+      start_dt = self.log.str_to_date(start_time, fmt='%Y-%m-%d %H:%M:%S.%f')
+      since_start = (dt.now() - start_dt).total_seconds()
+      if since_start > pending_threshold:
+        return 'Error!'
+      return 'Pending'
+    # endif date is None
+    if date.startswith('1970'):
+      return 'Never'
+    if '.' in date:
+      date = date.split('.')[0]
+    return date
+
+
   def get_nodes_apps(
     self, 
     node=None, 
@@ -3409,16 +3453,18 @@ class GenericSession(BaseDecentrAIObject):
             if len(instance_status) == 0:
               # this instance is only present in config but is NOT loaded so ignore it
               continue
-            start_time = instance_status.get('INIT_TIMESTAMP')
-            last_probe = instance_status.get('EXEC_TIMESTAMP')
-            last_data = instance_status.get('LAST_PAYLOAD_TIME')
-            dates = [start_time, last_probe, last_data]
-            for i in range(len(dates)):
-              if isinstance(dates[i], str):
-                if dates[i].startswith('1970'):
-                  dates[i] = 'Never'
-                elif '.' in dates[i]:
-                  dates[i] = dates[i].split('.')[0]
+            start_time = instance_status.get(HB.ACTIVE_PLUGINS_INFO.INIT_TIMESTAMP)
+            last_probe = instance_status.get(HB.ACTIVE_PLUGINS_INFO.EXEC_TIMESTAMP)
+            last_data = instance_status.get(HB.ACTIVE_PLUGINS_INFO.LAST_PAYLOAD_TIME)
+            dates = [start_time, last_data]
+            error_dates = [
+              instance_status.get(HB.ACTIVE_PLUGINS_INFO.FIRST_ERROR_TIME),
+              instance_status.get(HB.ACTIVE_PLUGINS_INFO.LAST_ERROR_TIME),
+            ]
+            dates = [self.date_to_readable(x, check_none=False) for x in dates]
+            error_dates = [self.date_to_readable(x, check_none=False) for x in error_dates]
+            last_probe = self.date_to_readable(last_probe, check_none=True, start_time=start_time)
+
             lst_plugin_instance_data.append({
               'Node'  : node,
               'Owner' : pipeline_owner,
@@ -3427,8 +3473,9 @@ class GenericSession(BaseDecentrAIObject):
               'Plugin': instance.signature,
               'Id': instance.instance_id,
               'Start' : dates[0],
-              'Probe' : dates[1],
-              'Data' : dates[2],
+              'Probe' : last_probe,
+              'Data' : dates[1],
+              'LastError': error_dates[1],
             })
           # endfor instances in app
         # endfor apps
@@ -3438,7 +3485,8 @@ class GenericSession(BaseDecentrAIObject):
       log_with_color(f'Node(s) {nodes} not found. Please check the configuration.', color='r')
       return 
     if as_df:
-      df = pd.DataFrame(lst_plugin_instance_data)
+      color_condition = lambda x: (x['LastError'] != 'Never' or x['Probe'] == 'Error!')
+      df = self.log.colored_dataframe(lst_plugin_instance_data, color_condition=color_condition)
       if not (df.empty or df.shape[0] == 0):
         df['Node'] = df['Node'].apply(lambda x: self._shorten_addr(x))
         df['Owner'] = df['Owner'].apply(lambda x: self._shorten_addr(x))

naeural_client/logging/logger_mixins/utils_mixin.py

@@ -7,12 +7,82 @@ import hashlib
 import numpy as np
 import traceback
 import random
+import pandas as pd
 from queue import Queue
 
 from collections import OrderedDict, deque, defaultdict
 
 from io import BytesIO, TextIOWrapper
 
+class ColorDataFrame(pd.DataFrame):
+  """
+  A DataFrame subclass that colors specific rows red when printed in a console.
+
+  Parameters
+  ----------
+  *args : tuple
+    Positional arguments passed to the pd.DataFrame constructor.
+  color_condition : callable, optional
+    A function that takes a row (pd.Series) and returns True if the row should be
+    highlighted in red, or False otherwise.
+  **kwargs : dict
+    Keyword arguments passed to the pd.DataFrame constructor.
+
+  Returns
+  -------
+  ColorDataFrame
+    A subclass of DataFrame that overrides the to_string method for coloring.
+
+  Examples
+  --------
+  
+  df = ColorDataFrame(
+    df,
+    color_condition=lambda row: row['value'] > 9
+  )
+  print(df)
+  """
+
+  _metadata = ['_color_condition']
+
+  def __init__(self, *args, color_condition=lambda row: False, **kwargs):
+    super().__init__(*args, **kwargs)
+    # Store the condition function as an attribute
+    self._color_condition = color_condition
+    return
+
+  def to_string(self, *args, **kwargs):
+    """
+    Overridden version of to_string that applies ANSI colors to rows
+    matching the condition.
+    """
+    original_string = super().to_string(*args, **kwargs)
+    # Split the original string into lines
+    lines = original_string.split('\n')
+
+    header_lines = lines[:1]
+    data_lines = lines[1:]
+
+    colored_data_lines = []
+    for row_index, row_line in enumerate(data_lines):
+      # Attempt to parse the index from the leftmost part of each row line
+      try:
+        # The row's index in the actual DataFrame
+        df_index = self.index[row_index]
+      except IndexError:
+        colored_data_lines.append(row_line)
+        continue
+
+      # Check if row meets the color condition
+      if self._color_condition(self.loc[df_index]):
+        # Red color ANSI: \033[91m ... \033[0m
+        row_line = f"\033[91m{row_line}\033[0m"
+
+      colored_data_lines.append(row_line)
+
+    return "\n".join(header_lines + colored_data_lines)
+
+
 
 adjectives = [
   'able', 'arco', 'arty', 'awed', 'awny', 'bald', 'base', 'bass', 'bent', 'best', 'boxy', 
@@ -64,6 +134,14 @@ class _UtilsMixin(object):
 
   def __init__(self):
     super(_UtilsMixin, self).__init__()
+    
+    
+  @staticmethod
+  def colored_dataframe(df, color_condition=lambda row: False):
+    """
+    A DataFrame subclass that colors specific rows red when printed in a console.
+    """
+    return ColorDataFrame(df, color_condition=color_condition)
 
   @staticmethod
   def get_function_parameters(function):

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

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

@@ -1,10 +1,10 @@
 naeural_client/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-naeural_client/_ver.py,sha256=NOz7aEJ1WJsh43U4LtIYy2q2MqQlpRN564G-nIQDATM,330
+naeural_client/_ver.py,sha256=NqGZgRNQnimSeJA03BGa0lVm-mFJ6vDk6i-aLlC7aQA,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=ATB1k_mQ_efvek_ZgsYYex3G4ouhXds3CHRz1_lOKZM,127702
+naeural_client/base/generic_session.py,sha256=c0UV6Gkz5QF7hSBIckf_DHS0EN3S9V2ekrwILgKRYVk,129690
 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
@@ -86,7 +86,7 @@ naeural_client/logging/logger_mixins/process_mixin.py,sha256=ZO7S1mvKWwH_UIqv7JG
 naeural_client/logging/logger_mixins/resource_size_mixin.py,sha256=EdCeFM8Ol8q_OTOmsj5Q2uKPvkqkoNdcXSZjw4FgAh4,2297
 naeural_client/logging/logger_mixins/timers_mixin.py,sha256=6D1HlLB97TpIwJEqj4UPBf1Md2HVORlSWtwXqnKyab4,17315
 naeural_client/logging/logger_mixins/upload_mixin.py,sha256=mvooNlNDNa_9D906d5qkfzTcvvsAuBOResoGCZ5IFnE,7697
-naeural_client/logging/logger_mixins/utils_mixin.py,sha256=G07keY2KhMQB094MIuw4ao6-_NCvoKyomp0j-tASOk0,22658
+naeural_client/logging/logger_mixins/utils_mixin.py,sha256=bD__K6CdSt99UTHdJkvb58cTlOWBouvPgUeifBHfrH4,24897
 naeural_client/logging/tzlocal/__init__.py,sha256=PBLaZSFatmJp2fX4Bwalwc5LgWX9Vcw-FWHnBvW1k8E,384
 naeural_client/logging/tzlocal/unix.py,sha256=Cgpzg1jxrcSivyT5xFRX69W5XkF5ollvXPr976RIbmA,7268
 naeural_client/logging/tzlocal/utils.py,sha256=6F2QE3b8xiKwBriQaT0jrgBeyrKhCj6b-eSCEywLSMg,3094
@@ -97,8 +97,8 @@ naeural_client/utils/comm_utils.py,sha256=4cS9llRr_pK_3rNgDcRMCQwYPO0kcNU7AdWy_L
 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=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,,
+naeural_client-3.2.3.dist-info/METADATA,sha256=r1vZWhhIFRBPhcEL-Jedn3lipOZZiDqKaPeytiviyBo,12363
+naeural_client-3.2.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+naeural_client-3.2.3.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
+naeural_client-3.2.3.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+naeural_client-3.2.3.dist-info/RECORD,,