dragon-ml-toolbox 3.12.4__py3-none-any.whl → 3.12.5__py3-none-any.whl

{dragon_ml_toolbox-3.12.4.dist-info → dragon_ml_toolbox-3.12.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dragon-ml-toolbox
-Version: 3.12.4
+Version: 3.12.5
 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.dist-info → dragon_ml_toolbox-3.12.5.dist-info}/RECORD

@@ -1,7 +1,7 @@
-dragon_ml_toolbox-3.12.4.dist-info/licenses/LICENSE,sha256=2uUFNy7D0TLgHim1K5s3DIJ4q_KvxEXVilnU20cWliY,1066
-dragon_ml_toolbox-3.12.4.dist-info/licenses/LICENSE-THIRD-PARTY.md,sha256=lY4_rJPnLnMu7YBQaY-_iz1JRDcLdQzNCyeLAF1glJY,1837
+dragon_ml_toolbox-3.12.5.dist-info/licenses/LICENSE,sha256=2uUFNy7D0TLgHim1K5s3DIJ4q_KvxEXVilnU20cWliY,1066
+dragon_ml_toolbox-3.12.5.dist-info/licenses/LICENSE-THIRD-PARTY.md,sha256=lY4_rJPnLnMu7YBQaY-_iz1JRDcLdQzNCyeLAF1glJY,1837
 ml_tools/ETL_engineering.py,sha256=yeZsW_7zRvEcuMZbM4E2GV1dxwBoWIeJAcFFk2AK0fY,39502
-ml_tools/GUI_tools.py,sha256=H-S-6qiGQDb8SIp8KXMQRidpTRezOqBz0jaRedUlawA,43328
+ml_tools/GUI_tools.py,sha256=YlV_hkBHef5W7cw905SC4drfLDflkGvukjAiFlXHtZs,44448
 ml_tools/MICE_imputation.py,sha256=7CDsIQxx5Jb_DwPAmWmz3FXcn85sUyH7g9UcZ1_E07s,11412
 ml_tools/ML_callbacks.py,sha256=g_9nSzoA22UJOQZCPKeDz-Ayh0ECFZLzRd6rZ8SokrE,13080
 ml_tools/ML_evaluation.py,sha256=oiDV6HItQloUUKCUpltV-2pogubWLBieGpc-VUwosAQ,10106
@@ -20,7 +20,7 @@ ml_tools/keys.py,sha256=3YVbcYARSjE3vKr_6PavJSf7vXvlos7szu3qva4T3Ts,781
 ml_tools/logger.py,sha256=UkbiU9ihBhw9VKyn3rZzisdClWV94EBV6B09_D0iUU0,6026
 ml_tools/path_manager.py,sha256=1LD9JFzqVyJQl2kTA7tK930_IV3qxfiV4cMIBzItytY,8309
 ml_tools/utilities.py,sha256=Vh4ZdI03g8EpgQL7KDwnAw2vtBlHtx6KxCuAATxLvT4,24208
-dragon_ml_toolbox-3.12.4.dist-info/METADATA,sha256=Bxg7mUA0PgndAOYuUOff1aIDYtaow3pNPk2pcfFcMCM,3274
-dragon_ml_toolbox-3.12.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dragon_ml_toolbox-3.12.4.dist-info/top_level.txt,sha256=wm-oxax3ciyez6VoO4zsFd-gSok2VipYXnbg3TH9PtU,9
-dragon_ml_toolbox-3.12.4.dist-info/RECORD,,
+dragon_ml_toolbox-3.12.5.dist-info/METADATA,sha256=EZ6Q1F6Ysc2Vtfk02_2EVL6f-vxW007i0Yx5U8aRgSg,3274
+dragon_ml_toolbox-3.12.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dragon_ml_toolbox-3.12.5.dist-info/top_level.txt,sha256=wm-oxax3ciyez6VoO4zsFd-gSok2VipYXnbg3TH9PtU,9
+dragon_ml_toolbox-3.12.5.dist-info/RECORD,,

ml_tools/GUI_tools.py

@@ -218,7 +218,7 @@ 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
     ) -> List[List[sg.Column]]:
         """
         Generates a layout for continuous features or targets.
@@ -227,7 +227,7 @@ 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'.
 
         Returns:
             A list of lists of sg.Column elements, ready to be used in a window layout.
@@ -236,7 +236,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.")
@@ -269,19 +269,19 @@ class GUIFactory:
             
             # 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) # 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
     ) -> List[List[sg.Column]]:
         """
         Generates a layout for categorical or binary features using Combo boxes.
@@ -289,7 +289,7 @@ 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'.
 
         Returns:
             A list of lists of sg.Column elements, ready to be used in a window layout.
@@ -298,7 +298,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 +309,19 @@ 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) # 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
     ) -> List[List[sg.Column]]:
         """
         Generates a layout for features using Listbox elements for multiple selections.
@@ -332,7 +332,7 @@ 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'.
 
         Returns:
             A list of lists of sg.Column elements, ready to be used in a window layout.
@@ -341,7 +341,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 +360,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) # type: ignore
 
     # --- Window Creation ---
     def create_window(self, title: str, layout: List[List[sg.Element]], **kwargs) -> sg.Window:
@@ -395,6 +395,24 @@ 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) -> 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
+        return [gui_columns]
 
 
 # --- Exception Handling Decorator ---