machineconfig 4.1__py3-none-any.whl → 4.2__py3-none-any.whl

machineconfig/cluster/sessions_managers/utils/load_balancer.py

@@ -1,162 +1,47 @@
 
 from machineconfig.utils.schemas.layouts.layout_types import TabConfig, LayoutConfig
-from machineconfig.utils.accessories import split_list
-from typing import Literal
+# from machineconfig.utils.accessories import split_list
+from typing import Literal, Protocol
+from machineconfig.cluster.sessions_managers.utils.load_balancer_helper import restrict_num_tabs_helper1, restrict_num_tabs_helper2, restrict_num_tabs_helper3, restrict_num_tabs_helper4
 
+class COMMAND_SPLITTER(Protocol):
+    def __call__(self, command: str, to: int) -> list[str]: ...
 
 
-def split_tabs_by_weight(tabs: list[TabConfig], max_weight: int) -> list[list[TabConfig]]:
-    """Split tabs into chunks where each chunk's total weight <= max_weight."""
-    chunks: list[list[TabConfig]] = []
-    current_chunk: list[TabConfig] = []
-    current_weight = 0
-    for tab in tabs:
-        tab_weight = tab.get("tabWeight", 1)
-        if current_weight + tab_weight > max_weight and current_chunk:
-            chunks.append(current_chunk)
-            current_chunk = [tab]
-            current_weight = tab_weight
-        else:
-            current_chunk.append(tab)
-            current_weight += tab_weight
-    
-    if current_chunk:
-        chunks.append(current_chunk)
-    
-    return chunks
-
-
-def combine_tabs_into_super_tabs(tabs: list[TabConfig], num_super_tabs: int) -> list[TabConfig]:
-    """Combine tabs into num_super_tabs super tabs with combined commands."""
-    if len(tabs) <= num_super_tabs:
-        return tabs  # No need to combine
-    
-    tab_groups = split_list(tabs, to=num_super_tabs)
-    super_tabs: list[TabConfig] = []
-    for idx, group in enumerate(tab_groups):
-        if len(group) == 1:
-            super_tabs.append(group[0])
-        else:
-            combined_command = "; ".join(tab["command"] for tab in group)
-            combined_name = f"super_tab_{idx+1}"
-            # Use startDir of the first tab
-            start_dir = group[0]["startDir"]
-            # Sum weights
-            total_weight = sum(tab.get("tabWeight", 1) for tab in group)
-            super_tabs.append({
-                "tabName": combined_name,
-                "startDir": start_dir,
-                "command": combined_command,
-                "tabWeight": total_weight
-            })
-    return super_tabs
-
-
-def combine_tabs_by_weight_into_super_tabs(tabs: list[TabConfig], max_weight: int) -> list[TabConfig]:
-    """Combine tabs into super tabs where each super tab has weight <= max_weight."""
-    tab_groups = split_tabs_by_weight(tabs, max_weight=max_weight)
-    super_tabs: list[TabConfig] = []
-    for idx, group in enumerate(tab_groups):
-        if len(group) == 1:
-            super_tabs.append(group[0])
-        else:
-            combined_command = "; ".join(tab["command"] for tab in group)
-            combined_name = f"super_tab_{idx+1}"
-            start_dir = group[0]["startDir"]
-            total_weight = sum(tab.get("tabWeight", 1) for tab in group)
-            super_tabs.append({
-                "tabName": combined_name,
-                "startDir": start_dir,
-                "command": combined_command,
-                "tabWeight": total_weight
-            })
-    return super_tabs
-
-
-def restrict_num_tabs(layout_configs: list[LayoutConfig], max_thresh: int, threshold_type: Literal["number", "weight"], breaking_method: Literal["moreLayouts", "combineTabs"]) -> list[LayoutConfig]:
+def limit_tab_num(layout_configs: list[LayoutConfig], max_thresh: int, threshold_type: Literal["number", "weight"], breaking_method: Literal["moreLayouts", "combineTabs"]) -> list[LayoutConfig]:
     match threshold_type, breaking_method:
         case "number", "moreLayouts":
-            return _restrict_num_tabs_helper1(layout_configs=layout_configs, max_thresh=max_thresh, threshold_type=threshold_type, breaking_method=breaking_method)
+            return restrict_num_tabs_helper1(layout_configs=layout_configs, max_thresh=max_thresh, threshold_type=threshold_type, breaking_method=breaking_method)
         case "number", "combineTabs":
-            return _restrict_num_tabs_helper2(layout_configs=layout_configs, max_thresh=max_thresh, threshold_type=threshold_type, breaking_method=breaking_method)
+            return restrict_num_tabs_helper2(layout_configs=layout_configs, max_thresh=max_thresh, threshold_type=threshold_type, breaking_method=breaking_method)
         case "weight", "moreLayouts":
-            return _restrict_num_tabs_helper3(layout_configs=layout_configs, max_thresh=max_thresh, threshold_type=threshold_type, breaking_method=breaking_method)
+            return restrict_num_tabs_helper3(layout_configs=layout_configs, max_thresh=max_thresh, threshold_type=threshold_type, breaking_method=breaking_method)
         case "weight", "combineTabs":
-            return _restrict_num_tabs_helper4(layout_configs=layout_configs, max_thresh=max_thresh, threshold_type=threshold_type, breaking_method=breaking_method)
+            return restrict_num_tabs_helper4(layout_configs=layout_configs, max_thresh=max_thresh, threshold_type=threshold_type, breaking_method=breaking_method)
         case _:
             raise NotImplementedError(f"The combination {threshold_type}, {breaking_method} is not implemented")
-
-
-def _restrict_num_tabs_helper1(layout_configs: list[LayoutConfig], max_thresh: int, threshold_type: Literal["number"], breaking_method: Literal["moreLayouts"]) -> list[LayoutConfig]:
-    """When threshold is exceeded, create more layouts with max_thresh tabs each."""
-    new_layout_configs: list[LayoutConfig] = []
-    for a_layout_config in layout_configs:
-        if len(a_layout_config["layoutTabs"]) > max_thresh:
-            print(f"Layout '{a_layout_config['layoutName']}' has too many tabs ({len(a_layout_config['layoutTabs'])} > {max_thresh}). Splitting into multiple layouts.")
-            tab_chunks = split_list(a_layout_config["layoutTabs"], every=max_thresh)
-            for idx, tab_chunk in enumerate(tab_chunks):
-                new_layout_configs.append({
-                    "layoutName": f"{a_layout_config['layoutName']}_part{idx+1}",
-                    "layoutTabs": tab_chunk
-                })
-        else:
-            print(f"Layout '{a_layout_config['layoutName']}' has acceptable number of tabs ({len(a_layout_config['layoutTabs'])} <= {max_thresh}). Keeping as is.")
-            new_layout_configs.append(a_layout_config)
-    return new_layout_configs
-
-
-def _restrict_num_tabs_helper2(layout_configs: list[LayoutConfig], max_thresh: int, threshold_type: Literal["number"], breaking_method: Literal["combineTabs"]) -> list[LayoutConfig]:
-    """When threshold is exceeded, combine tabs into super tabs to reduce count to max_thresh."""
-    new_layout_configs: list[LayoutConfig] = []
-    for a_layout_config in layout_configs:
-        num_tabs = len(a_layout_config["layoutTabs"])
-        if num_tabs > max_thresh:
-            print(f"Layout '{a_layout_config['layoutName']}' has too many tabs ({num_tabs} > {max_thresh}). Combining into {max_thresh} super tabs.")
-            super_tabs = combine_tabs_into_super_tabs(a_layout_config["layoutTabs"], num_super_tabs=max_thresh)
-            new_layout_configs.append({
-                "layoutName": a_layout_config["layoutName"],
-                "layoutTabs": super_tabs
-            })
-        else:
-            print(f"Layout '{a_layout_config['layoutName']}' has acceptable number of tabs ({num_tabs} <= {max_thresh}). Keeping as is.")
-            new_layout_configs.append(a_layout_config)
-    return new_layout_configs
-
-
-def _restrict_num_tabs_helper3(layout_configs: list[LayoutConfig], max_thresh: int, threshold_type: Literal["weight"], breaking_method: Literal["moreLayouts"]) -> list[LayoutConfig]:
-    """When threshold is exceeded, create more layouts with max_thresh total weight each."""
-    new_layout_configs: list[LayoutConfig] = []
-    for a_layout_config in layout_configs:
-        layout_weight = sum(tab.get("tabWeight", 1) for tab in a_layout_config["layoutTabs"])
-        if layout_weight > max_thresh:
-            print(f"Layout '{a_layout_config['layoutName']}' has too much weight ({layout_weight} > {max_thresh}). Splitting into multiple layouts.")
-            tab_chunks = split_tabs_by_weight(a_layout_config["layoutTabs"], max_weight=max_thresh)
-            for idx, tab_chunk in enumerate(tab_chunks):
-                new_layout_configs.append({
-                    "layoutName": f"{a_layout_config['layoutName']}_part{idx+1}",
-                    "layoutTabs": tab_chunk
-                })
-        else:
-            print(f"Layout '{a_layout_config['layoutName']}' has acceptable total weight ({layout_weight} <= {max_thresh}). Keeping as is.")
-            new_layout_configs.append(a_layout_config)
-    return new_layout_configs
-
-
-def _restrict_num_tabs_helper4(layout_configs: list[LayoutConfig], max_thresh: int, threshold_type: Literal["weight"], breaking_method: Literal["combineTabs"]) -> list[LayoutConfig]:
-    """When threshold is exceeded, combine tabs into super tabs with weight <= max_thresh."""
+def limit_tab_weight(layout_configs: list[LayoutConfig], max_weight: int, command_splitter: COMMAND_SPLITTER) -> list[LayoutConfig]:
     new_layout_configs: list[LayoutConfig] = []
     for a_layout_config in layout_configs:
-        layout_weight = sum(tab.get("tabWeight", 1) for tab in a_layout_config["layoutTabs"])
-        if layout_weight > max_thresh:
-            print(f"Layout '{a_layout_config['layoutName']}' has too much weight ({layout_weight} > {max_thresh}). Combining into super tabs with weight <= {max_thresh}.")
-            super_tabs = combine_tabs_by_weight_into_super_tabs(a_layout_config["layoutTabs"], max_weight=max_thresh)
-            new_layout_configs.append({
-                "layoutName": a_layout_config["layoutName"],
-                "layoutTabs": super_tabs
-            })
-        else:
-            print(f"Layout '{a_layout_config['layoutName']}' has acceptable total weight ({layout_weight} <= {max_thresh}). Keeping as is.")
-            new_layout_configs.append(a_layout_config)
+        new_tabs: list[TabConfig] = []
+        for tab in a_layout_config["layoutTabs"]:
+            tab_weight = tab.get("tabWeight", 1)
+            if tab_weight > max_weight:
+                print(f"Tab '{tab['tabName']}' in layout '{a_layout_config['layoutName']}' has too much weight ({tab_weight} > {max_weight}). Splitting command.")
+                split_commands = command_splitter(tab["command"], to=max_weight)
+                for idx, cmd in enumerate(split_commands):
+                    new_tabs.append({
+                        "tabName": f"{tab['tabName']}_part{idx+1}",
+                        "startDir": tab["startDir"],
+                        "command": cmd,
+                        "tabWeight": max_weight
+                    })
+            else:
+                new_tabs.append(tab)
+        new_layout_configs.append({
+            "layoutName": a_layout_config["layoutName"],
+            "layoutTabs": new_tabs
+        })
     return new_layout_configs
 
 

machineconfig/cluster/sessions_managers/utils/load_balancer_helper.py

@@ -0,0 +1,145 @@
+from machineconfig.utils.accessories import split_list
+from machineconfig.utils.schemas.layouts.layout_types import TabConfig, LayoutConfig
+
+from typing import Literal
+
+
+def split_tabs_by_weight(tabs: list[TabConfig], max_weight: int) -> list[list[TabConfig]]:
+    """Split tabs into chunks where each chunk's total weight <= max_weight."""
+    chunks: list[list[TabConfig]] = []
+    current_chunk: list[TabConfig] = []
+    current_weight = 0
+    for tab in tabs:
+        tab_weight = tab.get("tabWeight", 1)
+        if current_weight + tab_weight > max_weight and current_chunk:
+            chunks.append(current_chunk)
+            current_chunk = [tab]
+            current_weight = tab_weight
+        else:
+            current_chunk.append(tab)
+            current_weight += tab_weight
+    
+    if current_chunk:
+        chunks.append(current_chunk)
+    
+    return chunks
+
+
+def combine_tabs_into_super_tabs(tabs: list[TabConfig], num_super_tabs: int) -> list[TabConfig]:
+    """Combine tabs into num_super_tabs super tabs with combined commands."""
+    if len(tabs) <= num_super_tabs:
+        return tabs  # No need to combine
+    
+    tab_groups = split_list(tabs, to=num_super_tabs)
+    super_tabs: list[TabConfig] = []
+    for idx, group in enumerate(tab_groups):
+        if len(group) == 1:
+            super_tabs.append(group[0])
+        else:
+            combined_command = "; ".join(tab["command"] for tab in group)
+            combined_name = f"super_tab_{idx+1}"
+            # Use startDir of the first tab
+            start_dir = group[0]["startDir"]
+            # Sum weights
+            total_weight = sum(tab.get("tabWeight", 1) for tab in group)
+            super_tabs.append({
+                "tabName": combined_name,
+                "startDir": start_dir,
+                "command": combined_command,
+                "tabWeight": total_weight
+            })
+    return super_tabs
+
+
+def combine_tabs_by_weight_into_super_tabs(tabs: list[TabConfig], max_weight: int) -> list[TabConfig]:
+    """Combine tabs into super tabs where each super tab has weight <= max_weight."""
+    tab_groups = split_tabs_by_weight(tabs, max_weight=max_weight)
+    super_tabs: list[TabConfig] = []
+    for idx, group in enumerate(tab_groups):
+        if len(group) == 1:
+            super_tabs.append(group[0])
+        else:
+            combined_command = "; ".join(tab["command"] for tab in group)
+            combined_name = f"super_tab_{idx+1}"
+            start_dir = group[0]["startDir"]
+            total_weight = sum(tab.get("tabWeight", 1) for tab in group)
+            super_tabs.append({
+                "tabName": combined_name,
+                "startDir": start_dir,
+                "command": combined_command,
+                "tabWeight": total_weight
+            })
+    return super_tabs
+
+
+def restrict_num_tabs_helper1(layout_configs: list[LayoutConfig], max_thresh: int, threshold_type: Literal["number"], breaking_method: Literal["moreLayouts"]) -> list[LayoutConfig]:
+    """When threshold is exceeded, create more layouts with max_thresh tabs each."""
+    new_layout_configs: list[LayoutConfig] = []
+    for a_layout_config in layout_configs:
+        if len(a_layout_config["layoutTabs"]) > max_thresh:
+            print(f"Layout '{a_layout_config['layoutName']}' has too many tabs ({len(a_layout_config['layoutTabs'])} > {max_thresh}). Splitting into multiple layouts.")
+            tab_chunks = split_list(a_layout_config["layoutTabs"], every=max_thresh)
+            for idx, tab_chunk in enumerate(tab_chunks):
+                new_layout_configs.append({
+                    "layoutName": f"{a_layout_config['layoutName']}_part{idx+1}",
+                    "layoutTabs": tab_chunk
+                })
+        else:
+            print(f"Layout '{a_layout_config['layoutName']}' has acceptable number of tabs ({len(a_layout_config['layoutTabs'])} <= {max_thresh}). Keeping as is.")
+            new_layout_configs.append(a_layout_config)
+    return new_layout_configs
+
+
+def restrict_num_tabs_helper2(layout_configs: list[LayoutConfig], max_thresh: int, threshold_type: Literal["number"], breaking_method: Literal["combineTabs"]) -> list[LayoutConfig]:
+    """When threshold is exceeded, combine tabs into super tabs to reduce count to max_thresh."""
+    new_layout_configs: list[LayoutConfig] = []
+    for a_layout_config in layout_configs:
+        num_tabs = len(a_layout_config["layoutTabs"])
+        if num_tabs > max_thresh:
+            print(f"Layout '{a_layout_config['layoutName']}' has too many tabs ({num_tabs} > {max_thresh}). Combining into {max_thresh} super tabs.")
+            super_tabs = combine_tabs_into_super_tabs(a_layout_config["layoutTabs"], num_super_tabs=max_thresh)
+            new_layout_configs.append({
+                "layoutName": a_layout_config["layoutName"],
+                "layoutTabs": super_tabs
+            })
+        else:
+            print(f"Layout '{a_layout_config['layoutName']}' has acceptable number of tabs ({num_tabs} <= {max_thresh}). Keeping as is.")
+            new_layout_configs.append(a_layout_config)
+    return new_layout_configs
+
+
+def restrict_num_tabs_helper3(layout_configs: list[LayoutConfig], max_thresh: int, threshold_type: Literal["weight"], breaking_method: Literal["moreLayouts"]) -> list[LayoutConfig]:
+    """When threshold is exceeded, create more layouts with max_thresh total weight each."""
+    new_layout_configs: list[LayoutConfig] = []
+    for a_layout_config in layout_configs:
+        layout_weight = sum(tab.get("tabWeight", 1) for tab in a_layout_config["layoutTabs"])
+        if layout_weight > max_thresh:
+            print(f"Layout '{a_layout_config['layoutName']}' has too much weight ({layout_weight} > {max_thresh}). Splitting into multiple layouts.")
+            tab_chunks = split_tabs_by_weight(a_layout_config["layoutTabs"], max_weight=max_thresh)
+            for idx, tab_chunk in enumerate(tab_chunks):
+                new_layout_configs.append({
+                    "layoutName": f"{a_layout_config['layoutName']}_part{idx+1}",
+                    "layoutTabs": tab_chunk
+                })
+        else:
+            print(f"Layout '{a_layout_config['layoutName']}' has acceptable total weight ({layout_weight} <= {max_thresh}). Keeping as is.")
+            new_layout_configs.append(a_layout_config)
+    return new_layout_configs
+
+
+def restrict_num_tabs_helper4(layout_configs: list[LayoutConfig], max_thresh: int, threshold_type: Literal["weight"], breaking_method: Literal["combineTabs"]) -> list[LayoutConfig]:
+    """When threshold is exceeded, combine tabs into super tabs with weight <= max_thresh."""
+    new_layout_configs: list[LayoutConfig] = []
+    for a_layout_config in layout_configs:
+        layout_weight = sum(tab.get("tabWeight", 1) for tab in a_layout_config["layoutTabs"])
+        if layout_weight > max_thresh:
+            print(f"Layout '{a_layout_config['layoutName']}' has too much weight ({layout_weight} > {max_thresh}). Combining into super tabs with weight <= {max_thresh}.")
+            super_tabs = combine_tabs_by_weight_into_super_tabs(a_layout_config["layoutTabs"], max_weight=max_thresh)
+            new_layout_configs.append({
+                "layoutName": a_layout_config["layoutName"],
+                "layoutTabs": super_tabs
+            })
+        else:
+            print(f"Layout '{a_layout_config['layoutName']}' has acceptable total weight ({layout_weight} <= {max_thresh}). Keeping as is.")
+            new_layout_configs.append(a_layout_config)
+    return new_layout_configs

{machineconfig-4.1.dist-info → machineconfig-4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 4.1
+Version: 4.2
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0

{machineconfig-4.1.dist-info → machineconfig-4.2.dist-info}/RECORD

@@ -20,7 +20,8 @@ machineconfig/cluster/sessions_managers/zellij_local_manager.py,sha256=4ap0Gtd8w
 machineconfig/cluster/sessions_managers/zellij_remote.py,sha256=3gz-wgqVW7B-4CgvJq0fiDh8691h4yeK3Xh3CfSPc2s,8749
 machineconfig/cluster/sessions_managers/zellij_remote_manager.py,sha256=T-j1KMV7mDTeGSHC5To0_JmqNtjSR_LVZT9VanP4lyI,8313
 machineconfig/cluster/sessions_managers/utils/enhanced_command_runner.py,sha256=3vcQVg-HHa_WTxBGPtKMAdoSqJVa2EO5KAtrY8a6I3c,5264
-machineconfig/cluster/sessions_managers/utils/load_balancer.py,sha256=ODnYCkMwpnD9ooMemJsaADAnmFSGELTW5QKJwepajL4,9051
+machineconfig/cluster/sessions_managers/utils/load_balancer.py,sha256=q9k3ofvgcZzx_oKtaymWf75JpDAs5pagwRRYzfVgu30,3176
+machineconfig/cluster/sessions_managers/utils/load_balancer_helper.py,sha256=i5TRittC1IWTgMZNyG8AR5qq-3WrGp3xgIx2m5ktT7g,7526
 machineconfig/cluster/sessions_managers/wt_utils/layout_generator.py,sha256=CFGcZPFTZQJtFf0OvMUHhadZ0qbImCP3wxvbWYVcVYo,7445
 machineconfig/cluster/sessions_managers/wt_utils/process_monitor.py,sha256=Mitm7mKiKl5lT0OiEUHAqVg2Q21RjsKO1-hpJTHJ5lM,15196
 machineconfig/cluster/sessions_managers/wt_utils/remote_executor.py,sha256=lApUy67_WhfaBXqt0meZSx_QvwiXjN0YLdyE3c7kP_s,6744
@@ -405,8 +406,8 @@ machineconfig/utils/schemas/fire_agents/fire_agents_input.py,sha256=CCs5ebomW1ac
 machineconfig/utils/schemas/installer/installer_types.py,sha256=DLagmIe0G5-xg7HZ9VrlFCDk1gIbwvX7O4gZjwq0wh0,1326
 machineconfig/utils/schemas/layouts/layout_types.py,sha256=TcqlZdGVoH8htG5fHn1KWXhRdPueAcoyApppZsPAPto,2020
 machineconfig/utils/schemas/repos/repos_types.py,sha256=ECVr-3IVIo8yjmYmVXX2mnDDN1SLSwvQIhx4KDDQHBQ,405
-machineconfig-4.1.dist-info/METADATA,sha256=b3JCS_zyxDLbFlIDEu5k4EdmkuOHwIIclgCSorz6Jdg,7031
-machineconfig-4.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-machineconfig-4.1.dist-info/entry_points.txt,sha256=c6ea0waVseT1rbfz1bw3k-eph2yVaB67x9hx64Mpvfs,1066
-machineconfig-4.1.dist-info/top_level.txt,sha256=porRtB8qms8fOIUJgK-tO83_FeH6Bpe12oUVC670teA,14
-machineconfig-4.1.dist-info/RECORD,,
+machineconfig-4.2.dist-info/METADATA,sha256=rffGO9RS2gCZbESOyc4G44R-Txmfx8SAOlpSQcZGXhY,7031
+machineconfig-4.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+machineconfig-4.2.dist-info/entry_points.txt,sha256=c6ea0waVseT1rbfz1bw3k-eph2yVaB67x9hx64Mpvfs,1066
+machineconfig-4.2.dist-info/top_level.txt,sha256=porRtB8qms8fOIUJgK-tO83_FeH6Bpe12oUVC670teA,14
+machineconfig-4.2.dist-info/RECORD,,