machineconfig 4.1__tar.gz → 4.2__tar.gz

{machineconfig-4.1/src/machineconfig.egg-info → machineconfig-4.2}/PKG-INFO

@@ -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 → machineconfig-4.2}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "4.01"
+version = "4.02"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}

machineconfig-4.2/src/machineconfig/cluster/sessions_managers/utils/load_balancer.py

@@ -0,0 +1,53 @@
+
+from machineconfig.utils.schemas.layouts.layout_types import TabConfig, LayoutConfig
+# 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 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)
+        case "number", "combineTabs":
+            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)
+        case "weight", "combineTabs":
+            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 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:
+        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
+
+
+def run(layouts: list[LayoutConfig]):
+    from machineconfig.cluster.sessions_managers.zellij_local_manager import ZellijLocalManager
+    manager = ZellijLocalManager(session_layouts=layouts)
+    manager.start_all_sessions(poll_interval=2, poll_seconds=2)
+    manager.run_monitoring_routine(wait_ms=2000)
+    manager.kill_all_sessions()

machineconfig-4.1/src/machineconfig/cluster/sessions_managers/utils/load_balancer.py → machineconfig-4.2/src/machineconfig/cluster/sessions_managers/utils/load_balancer_helper.py

@@ -1,8 +1,7 @@
-
-from machineconfig.utils.schemas.layouts.layout_types import TabConfig, LayoutConfig
 from machineconfig.utils.accessories import split_list
-from typing import Literal
+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]]:
@@ -73,21 +72,7 @@ def combine_tabs_by_weight_into_super_tabs(tabs: list[TabConfig], max_weight: in
     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]:
-    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)
-        case "number", "combineTabs":
-            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)
-        case "weight", "combineTabs":
-            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]:
+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:
@@ -105,7 +90,7 @@ def _restrict_num_tabs_helper1(layout_configs: list[LayoutConfig], max_thresh: i
     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]:
+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:
@@ -123,7 +108,7 @@ def _restrict_num_tabs_helper2(layout_configs: list[LayoutConfig], max_thresh: i
     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]:
+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:
@@ -142,7 +127,7 @@ def _restrict_num_tabs_helper3(layout_configs: list[LayoutConfig], max_thresh: i
     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]:
+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:
@@ -158,11 +143,3 @@ def _restrict_num_tabs_helper4(layout_configs: list[LayoutConfig], max_thresh: i
             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 run(layouts: list[LayoutConfig]):
-    from machineconfig.cluster.sessions_managers.zellij_local_manager import ZellijLocalManager
-    manager = ZellijLocalManager(session_layouts=layouts)
-    manager.start_all_sessions(poll_interval=2, poll_seconds=2)
-    manager.run_monitoring_routine(wait_ms=2000)
-    manager.kill_all_sessions()

{machineconfig-4.1 → machineconfig-4.2/src/machineconfig.egg-info}/PKG-INFO

@@ -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 → machineconfig-4.2}/src/machineconfig.egg-info/SOURCES.txt

@@ -30,6 +30,7 @@ src/machineconfig/cluster/sessions_managers/zellij_remote.py
 src/machineconfig/cluster/sessions_managers/zellij_remote_manager.py
 src/machineconfig/cluster/sessions_managers/utils/enhanced_command_runner.py
 src/machineconfig/cluster/sessions_managers/utils/load_balancer.py
+src/machineconfig/cluster/sessions_managers/utils/load_balancer_helper.py
 src/machineconfig/cluster/sessions_managers/wt_utils/layout_generator.py
 src/machineconfig/cluster/sessions_managers/wt_utils/process_monitor.py
 src/machineconfig/cluster/sessions_managers/wt_utils/remote_executor.py