tts-data-utils 0.7.3__tar.gz → 0.7.4__tar.gz

{tts_data_utils-0.7.3/src/tts_data_utils.egg-info → tts_data_utils-0.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tts-data-utils
-Version: 0.7.3
+Version: 0.7.4
 Summary: Utilities for working with 2D data.
 Author: muszynsk
 Author-email: muszynsk <matt.muszynski@jpl.nasa.gov>

{tts_data_utils-0.7.3 → tts_data_utils-0.7.4}/src/tts_data_utils/core/data_container.py

@@ -238,7 +238,7 @@ class DataContainer(ABC):
         table_builder = DocxTable(template, self.records, headers=self._repr_cols, row_styles=[r.default_rich_text_row_style for r in self.records])
         return table_builder.render()
 
-    def power_table(self, superheader=None, columns=None, bypass_styles=False, row_styles=None, cell_styles=None, **kwargs):
+    def power_table(self, superheader=None, columns=None, bypass_styles=False, row_styles=None, cell_styles=None, expand_blocks='subcontainers', add_filters=None, add_sorting=None, **kwargs):
         """
         Produce a rich, interactive HTML table representation of this DataContainer.
 
@@ -257,12 +257,27 @@ class DataContainer(ABC):
         :type row_styles: list[dict[str, str]]
         :param cell_styles: Custom CSS for each cell. Must match `self.records` length.
         :type cell_styles: list[list[dict[str, str]]]
-        :param kwargs: Passthrough arguments for PowerTable (e.g., `id`, `add_filters`).
+        :param expand_blocks: Controls how nested content is rendered. If 'subcontainers', 
+                              automatically expands all subcontainers. Otherwise, provide a list 
+                              of HtmlComponent objects matching the length of `self.records` to 
+                              explicitly define expandable content for each row.
+        :type expand_blocks: str | list[HtmlComponent]
+        :param add_filters: Enable column filtering. Options: 'local', 'django', or None.
+        :type add_filters: str, optional
+        :param add_sorting: Enable column sorting. Options: 'local', 'django', or None.
+        :type add_sorting: str, optional
+        :param kwargs: Additional passthrough arguments for PowerTable (e.g., `id`, `class_name`).
         :return: A rendered PowerTable component.
+
         """
 
         # TO DO: Rethink how we handle repr_cols here when you're not so braindead
-        row_data = [(r.values, [subcontainer_obj.power_table(subcontainer_name) for subcontainer_name, subcontainer_obj in r.subcontainers.items()]) for r in self.records]
+        if expand_blocks == 'subcontainers':
+            row_data = [(r.values, [subcontainer_obj.power_table(subcontainer_name) for subcontainer_name, subcontainer_obj in r.subcontainers.items()]) for r in self.records]
+        else:
+            if len(self.records) != len(expand_blocks):
+                raise ValueError("The number of expand blocks must match the number of records")
+            row_data = [(r.values, e) for r, e in zip(self.records, expand_blocks)]
 
         if columns is not None:
             repr_cols = columns
@@ -296,6 +311,8 @@ class DataContainer(ABC):
             row_data=row_data,
             row_styles=row_styles,
             cell_styles=cell_styles,
+            add_filters=add_filters,
+            add_sorting=add_sorting,
             **kwargs
             )
         if superheader:
@@ -1696,11 +1713,12 @@ class DataContainer(ABC):
         records_copy = copy(self.records)
         if by is None and lam is None: 
             by = self.default_time_label
-            records_copy.sort(key=lambda r: r.source[by], reverse=reverse)
+            records_copy.sort(key=lambda r: r.source[by] if r.source[by] is not None else '', reverse=reverse)
         elif lam is not None:
             records_copy.sort(key=lam, reverse=reverse)
         else:
-            records_copy.sort(key=lambda r: r.values[by], reverse=reverse)
+            # Handle None values by treating them as empty strings for sorting
+            records_copy.sort(key=lambda r: r.values.get(by, '') if r.values.get(by) is not None else '', reverse=reverse)
         return self._copy(records_copy)
         
     def append(self, items, cast_fields=False, fill=False):

{tts_data_utils-0.7.3 → tts_data_utils-0.7.4}/src/tts_data_utils/core/visual_diff.py

@@ -8,7 +8,7 @@ from jpl_time import Time
 from jpl_time.jpl_time import TimeConversionError
 
 #Teamtool Studio Imports
-# None
+from tts_html_utils.core.palette import VisDiffPalette
 
 #This Library Imports
 from tts_data_utils.core.data_container import DataContainer
@@ -33,26 +33,6 @@ class VisualDiffItem(DataItem):
       the `_mismatched_keys` list.
     """
 
-    PALETTE = {
-        'green': {'background-color': '#95FB95', 'color': '#333333'},
-        'blue': {'background-color': '#ADC4DF', 'color': '#333333'},
-        'grey': {'background-color': '#BDBEBD', 'color': '#BDBEBD'},
-        'red': {'background-color': '#FF614A', 'color': '#333333'},
-        'white': {'background-color': '#FFFFF', 'color': '#333333'},
-        'error': {'background-color': '#000000', 'color': '#FF614A'}
-        }
-
-
-    MATCH_STATUS_COLORS = {
-        'insert':   PALETTE['green'],
-        'replace':  PALETTE['blue'],
-        'delete':   PALETTE['red'],
-        'equal':    PALETTE['white'],
-        'empty_from_delete':  PALETTE['grey'], 
-        'empty_from_insert': PALETTE['grey'],
-        'unmatched': PALETTE['red'],
-    }
-
     DICT_VALID_KEYS = [
         ('_visdiff_index', (int, None)),
         ('_visdiff_match', (str, None)),
@@ -71,8 +51,7 @@ class VisualDiffItem(DataItem):
         """
         Returns the CSS style dictionary for the table row based on the match status.
         """
-        return self.MATCH_STATUS_COLORS[self['_visdiff_match']]
-
+        return VisDiffPalette()[self['_visdiff_match']]
     @property
     def default_html_cell_styles(self):
         """

{tts_data_utils-0.7.3 → tts_data_utils-0.7.4}/src/tts_data_utils/multimission/evr.py

@@ -5,21 +5,12 @@ from datetime import datetime
 
 #JPL Imports
 from jpl_time import Time
+from tts_html_utils.core.palette import EvrPalette
 
 #This Library Imports
 from tts_data_utils.core.data_container import DataContainer
 from tts_data_utils.core.data_item import DataItem
 
-EVR_LEVEL_COLORS = {
-    'DIAGNOSTIC':  {'background-color': '#90ED91', 'color': '#333333'},
-    'COMMAND':     {'background-color': '#0D00FF', 'color': '#F1F1F2'},
-    'ACTIVITY_LO': {'background-color': '#D3D3D3', 'color': '#333333'},
-    'ACTIVITY_HI': {'background-color': '#666666', 'color': '#F1F1F2'},
-    'WARNING_LO':  {'background-color': '#F0F001', 'color': '#333333'},
-    'WARNING_HI':  {'background-color': '#FEA500', 'color': '#333333'},
-    'FATAL':       {'background-color': '#FF5E66', 'color': '#F1F1F2'} ,
-    'SIM ERROR':       {'background-color': '#FF5E66', 'color': '#F1F1F2'} 
-}
 
 class EvrItem(DataItem):
     """
@@ -94,7 +85,7 @@ class EvrItem(DataItem):
     @property
     def default_html_row_style(self):
         """Returns row styling based on the EVR severity level."""
-        return EVR_LEVEL_COLORS[self.level]
+        return EvrPalette[self.level]
     
     @property
     def time(self):
@@ -278,7 +269,7 @@ class EvrGapItem(DataItem):
     @property
     def default_html_row_style(self):
         """Styles the row based on the severity of the missing EVRs."""
-        return EVR_LEVEL_COLORS[self.level]
+        return EvrPalette[self.level]
     
     @property
     def time(self):

{tts_data_utils-0.7.3 → tts_data_utils-0.7.4/src/tts_data_utils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tts-data-utils
-Version: 0.7.3
+Version: 0.7.4
 Summary: Utilities for working with 2D data.
 Author: muszynsk
 Author-email: muszynsk <matt.muszynski@jpl.nasa.gov>