dragon-ml-toolbox 3.12.4__tar.gz → 3.12.6__tar.gz

{dragon_ml_toolbox-3.12.4/dragon_ml_toolbox.egg-info → dragon_ml_toolbox-3.12.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dragon-ml-toolbox
-Version: 3.12.4
+Version: 3.12.6
 Summary: A collection of tools for data science and machine learning projects.
 Author-email: Karl Loza <luigiloza@gmail.com>
 License-Expression: MIT

{dragon_ml_toolbox-3.12.4 → dragon_ml_toolbox-3.12.6/dragon_ml_toolbox.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dragon-ml-toolbox
-Version: 3.12.4
+Version: 3.12.6
 Summary: A collection of tools for data science and machine learning projects.
 Author-email: Karl Loza <luigiloza@gmail.com>
 License-Expression: MIT

{dragon_ml_toolbox-3.12.4 → dragon_ml_toolbox-3.12.6}/ml_tools/GUI_tools.py

@@ -191,13 +191,14 @@ class GUIFactory:
         }
         return sg.Button(text.title(), key=key, **style_args)
 
-    def make_frame(self, title: str, layout: List[List[Union[sg.Element, sg.Column]]], **kwargs) -> sg.Frame:
+    def make_frame(self, title: str, layout: List[List[Union[sg.Element, sg.Column]]], center_layout: bool = False, **kwargs) -> sg.Frame:
         """
         Creates a styled frame around a given layout.
 
         Args:
             title (str): The title displayed on the frame's border.
             layout (list): The layout to enclose within the frame.
+            center_layout (bool): If True, the content within the frame will be horizontally centered.
             **kwargs: Override default styles or add other sg.Frame parameters
                       (e.g., `title_color='red'`, `relief=sg.RELIEF_SUNKEN`).
         """
@@ -210,6 +211,10 @@ class GUIFactory:
             "background_color": sg.theme_background_color(),
             **kwargs
         }
+        
+        if center_layout:
+            style_args["element_justification"] = 'center'
+        
         return sg.Frame(title, layout, **style_args)
 
     # --- General-Purpose Layout Generators ---
@@ -218,7 +223,8 @@ class GUIFactory:
         data_dict: Dict[str, Union[Tuple[Union[int,float,None], Union[int,float,None]],List[Union[int,float,None]]]],
         is_target: bool = False,
         layout_mode: Literal["grid", "row"] = 'grid',
-        features_per_column: int = 4
+        number_columns: int = 5,
+        center_layout: bool = True
     ) -> List[List[sg.Column]]:
         """
         Generates a layout for continuous features or targets.
@@ -227,7 +233,8 @@ class GUIFactory:
             data_dict (dict): Keys are feature names, values are (min, max) tuples.
             is_target (bool): If True, creates disabled inputs for displaying results.
             layout_mode (str): 'grid' for a multi-row grid layout, or 'row' for a single horizontal row.
-            features_per_column (int): Number of features per column when `layout_mode` is 'grid'.
+            number_columns (int): Number of columns when `layout_mode` is 'grid'.
+            center_layout (bool): If True, the entire grid will be horizontally centered.
 
         Returns:
             A list of lists of sg.Column elements, ready to be used in a window layout.
@@ -236,7 +243,7 @@ class GUIFactory:
         bg_color = sg.theme_background_color()
         label_font = (cfg.fonts.font_family, cfg.fonts.label_size, cfg.fonts.label_style) # type: ignore
         
-        columns = []
+        all_feature_layouts = []
         for name, value in data_dict.items():
             if value is None:
                 raise ValueError(f"Feature '{name}' was assigned a 'None' value.")
@@ -264,24 +271,25 @@ class GUIFactory:
                 layout = [[label], [element]]
             else:
                 range_font = (cfg.fonts.font_family, cfg.fonts.range_size) # type: ignore
-                range_text = sg.Text(f"Range: {val_min}-{val_max}", font=range_font, background_color=bg_color) # type: ignore
+                range_text = sg.Text(f"Range: {val_min} - {val_max}", font=range_font, background_color=bg_color) # type: ignore
                 layout = [[label], [element], [range_text]]
             
             # each feature is wrapped as a column element
             layout.append([sg.Text(" ", font=(cfg.fonts.font_family, 2), background_color=bg_color)]) # type: ignore
-            columns.append(sg.Column(layout, background_color=bg_color))
+            all_feature_layouts.append(sg.Column(layout, background_color=bg_color))
 
         if layout_mode == 'row':
-            return [columns] # A single row containing all columns
+            return [all_feature_layouts] # A single row containing all features
         
-        # Default to 'grid' layout
-        return [columns[i:i + features_per_column] for i in range(0, len(columns), features_per_column)]
+        # Default to 'grid' layout: delegate to the helper method
+        return self._build_grid_layout(all_feature_layouts, number_columns, bg_color, center_layout) # type: ignore
 
     def generate_combo_layout(
         self,
         data_dict: Dict[str, Union[List[Any],Tuple[Any,...]]],
         layout_mode: Literal["grid", "row"] = 'grid',
-        features_per_column: int = 4
+        number_columns: int = 5,
+        center_layout: bool = True
     ) -> List[List[sg.Column]]:
         """
         Generates a layout for categorical or binary features using Combo boxes.
@@ -289,7 +297,8 @@ class GUIFactory:
         Args:
             data_dict (dict): Keys are feature names, values are lists of options.
             layout_mode (str): 'grid' for a multi-row grid layout, or 'row' for a single horizontal row.
-            features_per_column (int): Number of features per column when `layout_mode` is 'grid'.
+            number_columns (int): Number of columns when `layout_mode` is 'grid'.
+            center_layout (bool): If True, the entire grid will be horizontally centered.
 
         Returns:
             A list of lists of sg.Column elements, ready to be used in a window layout.
@@ -298,7 +307,7 @@ class GUIFactory:
         bg_color = sg.theme_background_color()
         label_font = (cfg.fonts.font_family, cfg.fonts.label_size, cfg.fonts.label_style) # type: ignore
 
-        columns = []
+        all_feature_layouts = []
         for name, values in data_dict.items():
             label = sg.Text(name, font=label_font, background_color=bg_color, key=f"_text_{name}")
             element = sg.Combo(
@@ -309,19 +318,20 @@ class GUIFactory:
             layout = [[label], [element]]
             layout.append([sg.Text(" ", font=(cfg.fonts.font_family, 2), background_color=bg_color)]) # type: ignore
             # each feature is wrapped in a Column element
-            columns.append(sg.Column(layout, background_color=bg_color))
+            all_feature_layouts.append(sg.Column(layout, background_color=bg_color))
 
         if layout_mode == 'row':
-            return [columns] # A single row containing all columns
+            return [all_feature_layouts] # A single row containing all features
             
-        # Default to 'grid' layout
-        return [columns[i:i + features_per_column] for i in range(0, len(columns), features_per_column)]
+        # Default to 'grid' layout: delegate to the helper method
+        return self._build_grid_layout(all_feature_layouts, number_columns, bg_color, center_layout) # type: ignore
     
     def generate_multiselect_layout(
         self,
         data_dict: Dict[str, Union[List[Any], Tuple[Any, ...]]],
         layout_mode: Literal["grid", "row"] = 'grid',
-        features_per_column: int = 4
+        number_columns: int = 5,
+        center_layout: bool = True
     ) -> List[List[sg.Column]]:
         """
         Generates a layout for features using Listbox elements for multiple selections.
@@ -332,7 +342,8 @@ class GUIFactory:
         Args:
             data_dict (dict): Keys are feature names, values are lists of options.
             layout_mode (str): 'grid' for a multi-row grid layout, or 'row' for a single horizontal row.
-            features_per_column (int): Number of features per column when `layout_mode` is 'grid'.
+            number_columns (int): Number of columns when `layout_mode` is 'grid'.
+            center_layout (bool): If True, the entire grid will be horizontally centered.
 
         Returns:
             A list of lists of sg.Column elements, ready to be used in a window layout.
@@ -341,7 +352,7 @@ class GUIFactory:
         bg_color = sg.theme_background_color()
         label_font = (cfg.fonts.font_family, cfg.fonts.label_size, cfg.fonts.label_style) # type: ignore
 
-        columns = []
+        all_feature_layouts = []
         for name, values in data_dict.items():
             label = sg.Text(name, font=label_font, background_color=bg_color, key=f"_text_{name}")
 
@@ -360,13 +371,13 @@ class GUIFactory:
             layout.append([sg.Text(" ", font=(cfg.fonts.font_family, 2), background_color=bg_color)]) # type: ignore
 
             # Each feature is wrapped in a Column element for proper alignment.
-            columns.append(sg.Column(layout, background_color=bg_color))
+            all_feature_layouts.append(sg.Column(layout, background_color=bg_color))
 
         if layout_mode == 'row':
-            return [columns]  # A single row containing all columns
+            return [all_feature_layouts]  # A single row containing all features
 
-        # Default to 'grid' layout
-        return [columns[i:i + features_per_column] for i in range(0, len(columns), features_per_column)]
+        # Default to 'grid' layout: delegate to the helper method
+        return self._build_grid_layout(all_feature_layouts, number_columns, bg_color, center_layout) # type: ignore
 
     # --- Window Creation ---
     def create_window(self, title: str, layout: List[List[sg.Element]], **kwargs) -> sg.Window:
@@ -395,6 +406,29 @@ class GUIFactory:
         if cfg.max_size: window.TKroot.maxsize(*cfg.max_size)
         
         return window
+    
+    def _build_grid_layout(self, all_feature_layouts: List[sg.Column], num_columns: int, bg_color: str, center_layout: bool = True) -> List[List[sg.Column]]:
+        """
+        Private helper to distribute feature layouts vertically into a grid of columns.
+        """
+        # Distribute features vertically into the specified number of columns
+        final_columns = [[] for _ in range(num_columns)]
+        for i, feature_layout in enumerate(all_feature_layouts):
+            # Use modulo to distribute features in a round-robin fashion
+            target_column_index = i % num_columns
+            final_columns[target_column_index].append(feature_layout)
+
+        # Wrap each list of features in its own sg.Column element, ensuring the
+        # inner layout is a list of rows [[c] for c in col].
+        gui_columns = [sg.Column([[c] for c in col], background_color=bg_color) for col in final_columns]
+
+        # Return a single row containing all the generated vertical columns
+        if center_layout:
+            # Return a single row containing the columns, centered with Push elements.
+            return [[sg.Push()] + gui_columns + [sg.Push()]] # type: ignore
+        else:
+            # Return a single row containing just the columns.
+            return [gui_columns]
 
 
 # --- Exception Handling Decorator ---

{dragon_ml_toolbox-3.12.4 → dragon_ml_toolbox-3.12.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dragon-ml-toolbox"
-version = "3.12.4"
+version = "3.12.6"
 description = "A collection of tools for data science and machine learning projects."
 authors = [
     { name = "Karl Loza", email = "luigiloza@gmail.com" }