machineconfig 1.94__py3-none-any.whl → 1.95__py3-none-any.whl

machineconfig/utils/procs.py

@@ -6,16 +6,20 @@ from tqdm import tqdm
 from pytz import timezone
 from machineconfig.utils.utils import display_options
 from typing import Optional
+from rich.console import Console
+from rich.panel import Panel
+
+console = Console()
+
+BOX_WIDTH = 78  # width for box drawing
 
 pd.options.display.max_rows = 10000
 
 
 def get_processes_accessing_file(path: str):
-    print(f"""
-╔{'═'*78}╗
-║ 🔍  SEARCHING FOR PROCESSES ACCESSING FILE                                     ║
-╚{'═'*78}╝
-""")
+    # header for searching processes
+    title = "🔍  SEARCHING FOR PROCESSES ACCESSING FILE"
+    console.print(Panel(title, title="[bold blue]Process Info[/bold blue]", border_style="blue"))
     res: dict[int, list[str]] = {}
     for proc in tqdm(psutil.process_iter(), desc="🔎 Scanning processes"):
         try:
@@ -26,7 +30,7 @@ def get_processes_accessing_file(path: str):
         if len(tmp) > 0:
             res[proc.pid] = tmp
     df = pd.DataFrame(res.items(), columns=['pid', 'files'])
-    print(f"\n✅ Found {len(res)} processes accessing the specified file\n{'─'*80}\n")
+    console.print(Panel(f"✅ Found {len(res)} processes accessing the specified file", title="[bold blue]Process Info[/bold blue]", border_style="blue"))
     return df
 
 
@@ -45,11 +49,9 @@ def kill_process(name: str):
 
 class ProcessManager:
     def __init__(self):
-        print(f"""
-╔{'═'*78}╗
-║ 📊  INITIALIZING PROCESS MANAGER                                               ║
-╚{'═'*78}╝
-""")
+        # header for initializing process manager
+        title = "📊  INITIALIZING PROCESS MANAGER"
+        console.print(Panel(title, title="[bold blue]Process Info[/bold blue]", border_style="blue"))
         process_info = []
         for proc in tqdm(psutil.process_iter(), desc="🔍 Reading system processes"):
             try:
@@ -61,14 +63,12 @@ class ProcessManager:
         df['create_time'] = pd.to_datetime(df['create_time'], unit='s', utc=True).apply(lambda x: x.tz_convert(timezone('Australia/Adelaide')))
         df = df.sort_values(by='memory_usage_mb', ascending=False).reset_index(drop=True)
         self.df = df
-        print(f"✅ Process Manager initialized with {len(df)} processes\n{'─'*80}\n")
+        console.print(Panel(f"✅ Process Manager initialized with {len(df)} processes", title="[bold blue]Process Info[/bold blue]", border_style="blue"))
 
     def choose_and_kill(self):
-        print(f"""
-╔{'═'*78}╗
-║ 🎯  INTERACTIVE PROCESS SELECTION AND TERMINATION                              ║
-╚{'═'*78}╝
-""")
+        # header for interactive process selection
+        title = "🎯  INTERACTIVE PROCESS SELECTION AND TERMINATION"
+        console.print(Panel(title, title="[bold blue]Process Info[/bold blue]", border_style="blue"))
         options = str(self.df).split("\n")[1:]
         res = display_options(options=str(self.df).split("\n"), msg="📋 Select processes to manage:", fzf=True, multi=True)
         indices = [options.index(val) for val in res]
@@ -91,26 +91,22 @@ class ProcessManager:
             for idx2, row in sub_sub_df.iterrows():
                 Struct(row.to_dict()).print(as_config=True, title=f"🎯 Target Process {idx2}")
             _ = self.kill(pids=sub_sub_df.pid.to_list()) if input("\n⚠️  Confirm termination? y/[n] ").lower() == "y" else None
-        print(f"\n🔔 No processes were terminated.\n{'─'*80}\n")
+        console.print(Panel("🔔 No processes were terminated.", title="[bold blue]Process Info[/bold blue]", border_style="blue"))
 
     def filter_and_kill(self, name: Optional[str] = None):
-        print(f"""
-╔{'═'*78}╗
-║ 🔍  FILTERING AND TERMINATING PROCESSES BY NAME                                ║
-╚{'═'*78}╝
-""")
+        # header for filtering processes by name
+        title = "🔍  FILTERING AND TERMINATING PROCESSES BY NAME"
+        console.print(Panel(title, title="[bold blue]Process Info[/bold blue]", border_style="blue"))
         _ = 20
         df_sub = self.df.query(f"name == '{name}' ").sort_values(by='create_time', ascending=True)
         print(f"🎯 Found {len(df_sub)} processes matching name: '{name}'")
         self.kill(pids=df_sub.pid.to_list())
-        print(f"{'─'*80}\n")
+        console.print(Panel("", title="[bold blue]Process Info[/bold blue]", border_style="blue"))
 
     def kill(self, names: Optional[list[str]] = None, pids: Optional[list[int]] = None, commands: Optional[list[str]] = None):
-        print(f"""
-╔{'═'*78}╗
-║ 💀  PROCESS TERMINATION                                                        ║
-╚{'═'*78}╝
-""")
+        # header for process termination
+        title = "💀  PROCESS TERMINATION"
+        console.print(Panel(title, title="[bold blue]Process Info[/bold blue]", border_style="blue"))
         if names is None and pids is None and commands is None:
             print("❌ Error: No termination targets specified (names, pids, or commands)")
             raise ValueError('names, pids and commands cannot all be None')
@@ -151,7 +147,7 @@ class ProcessManager:
             else: 
                 print(f'❓ No process has "{command}" in its command.')
         
-        print(f"\n✅ Termination complete: {killed_count} processes terminated\n{'─'*80}\n")
+        console.print(Panel(f"✅ Termination complete: {killed_count} processes terminated", title="[bold blue]Process Info[/bold blue]", border_style="blue"))
 
 
 def get_age(create_time: float):

machineconfig/utils/scheduling.py

@@ -10,6 +10,8 @@ import platform
 import subprocess
 from typing import Optional
 # from crocodile.meta import Scheduler
+from rich.console import Console
+from rich.panel import Panel
 
 
 SCHEDULER_DEFAULT_ROOT = P.home().joinpath("dotfiles/scripts/.scheduler")
@@ -111,11 +113,10 @@ def main(root: Optional[str] = None, ignore_conditions: bool=True):
     else: root_resolved = P(root).expanduser().absolute()
     tasks_dirs = root_resolved.search(files=False, folders=True).filter(lambda x: x.joinpath("task.py").exists())
 
-    print(f"""
-╔{'═'*78}╗
-║ 📂  TASK SCHEDULER INITIALIZED                                                ║
-╚{'═'*78}╝
-""")
+    # Print a fancy box using rich
+    console = Console()
+    console.print(Panel("TASK SCHEDULER INITIALIZED", title="Status", expand=False))
+
     print(f"📁 Root directory resolved: {root_resolved}")
 
     tasks: list[Task] = []
@@ -189,12 +190,11 @@ def should_task_run(task: Task, tolerance_mins: int = 1440) -> tuple[bool, Optio
 def run_task(task: Task) -> Report:
     start_time = datetime.now()
 
-    print(f"""
-╔{'═'*78}╗
-║ 🚀  RUNNING TASK                                                              ║
-╚{'═'*78}╝
-""")
-    print(f"🔧 Task Name: {task.name}")
+    # Print a fancy box using rich
+    console = Console()
+    console.print(Panel("RUNNING TASK", title="Status", expand=False))
+
+    print(f"Task: {task.name}")
 
     shell_script = get_shell_script_executing_python_file(python_file=task.task_root.joinpath("task.py").to_str(), ve_name=task.venv)
     shell_script_root = P.tmp().joinpath(f"tmp_scripts/scheduler/{task.name}").create()

machineconfig/utils/utils.py

@@ -5,10 +5,12 @@ Utils
 from crocodile.file_management import P
 # import crocodile.environment as env
 import machineconfig
-from machineconfig.utils.utils_options import check_tool_exists, choose_cloud_interactively, choose_multiple_options, choose_one_option, choose_ssh_host, display_options
-from machineconfig.utils.utils_links import build_links, symlink_copy, symlink_func
-from machineconfig.utils.utils_code import get_shell_script_executing_python_file, get_shell_file_executing_python_script, write_shell_script_to_default_program_path, print_code, PROGRAM_PATH
-from machineconfig.utils.utils_path import sanitize_path, match_file_name
+from machineconfig.utils.options import check_tool_exists, choose_cloud_interactively, choose_multiple_options, choose_one_option, choose_ssh_host, display_options
+from rich.console import Console
+from rich.panel import Panel
+from machineconfig.utils.links import build_links, symlink_copy, symlink_func
+from machineconfig.utils.code import get_shell_script_executing_python_file, get_shell_file_executing_python_script, write_shell_script_to_default_program_path, print_code, PROGRAM_PATH
+from machineconfig.utils.path import sanitize_path, match_file_name
 
 # Split into multiple assignments to fix incompatible tuple sizes
 _ = get_shell_script_executing_python_file, get_shell_file_executing_python_script, print_code, PROGRAM_PATH, display_options, write_shell_script_to_default_program_path
@@ -58,11 +60,8 @@ def check_dotfiles_version_is_beyond(commit_dtm: str, update: bool=False):
     dtm = datetime(dtm.year, dtm.month, dtm.day, dtm.hour, dtm.minute, dtm.second)
     res =  dtm > datetime.fromisoformat(commit_dtm)
     if res is False and update is True:
-        print(f"""
-{'=' * 60}
-🔄 UPDATE REQUIRED | Updating dotfiles because {dtm} < {datetime.fromisoformat(commit_dtm)}
-{'=' * 60}
-""")
+        console = Console()
+        console.print(Panel(f"🔄 UPDATE REQUIRED | Updating dotfiles because {dtm} < {datetime.fromisoformat(commit_dtm)}", border_style="bold blue", expand=False))
         from machineconfig.scripts.python.cloud_repo_sync import main
         main(cloud=None, path=dotfiles_path)
     return res
@@ -76,18 +75,12 @@ def wait_for_jobs_to_finish(root: P, pattern: str, wait_for_n_jobs: int, max_wai
         counter  =  len(parts)
         if counter == wait_for_n_jobs:
             wait_finished = True
-            print(f"""
-{'=' * 60}
-✅ JOB COMPLETE | {counter} Jobs finished successfully. Exiting.
-{'=' * 60}
-""")
+            console = Console()
+            console.print(Panel(f"✅ JOB COMPLETE | {counter} Jobs finished successfully. Exiting.", border_style="bold blue", expand=False))
             return True
         if (time.time() - t0) > 60 * max_wait_minutes:
-            print(f"""
-{'=' * 60}
-⏱️  TIMEOUT | Waited for {max_wait_minutes} minutes. Exiting.
-{'=' * 60}
-""")
+            console = Console()
+            console.print(Panel(f"⏱️  TIMEOUT | Waited for {max_wait_minutes} minutes. Exiting.", border_style="bold blue", expand=False))
             return False
         print(f"""
 ⏳ PROGRESS | {counter}/{wait_for_n_jobs} jobs finished. Waiting for {wait_for_n_jobs - counter} more jobs to complete, sleeping for 60 seconds.

machineconfig/utils/ve.py

@@ -5,7 +5,6 @@ from crocodile.core import Struct, List
 from crocodile.file_management import P
 
 import platform
-from dataclasses import dataclass
 from typing import Optional, Literal
 
 from machineconfig.utils.ve_utils.ve1 import get_installed_interpreters
@@ -16,39 +15,24 @@ from machineconfig.utils.ve_utils.ve2 import get_bash_ve_install_script
 from machineconfig.utils.ve_utils.ve2 import get_ps1_ve_install_script
 from machineconfig.utils.ve_utils.ve2 import create_symlinks
 from machineconfig.utils.ve_utils.ve2 import make_installation_recipe
-
-
-
-@dataclass
-class VE_Specs:
-    ve_name: str
-    py_version: str
-    ipy_profile: str
-    os: str
-
-
-@dataclass
-class VE_INI:
-    specs: VE_Specs
+from rich.console import Console
+from rich.panel import Panel
 
 
 def get_ve_install_script(ve_name: Optional[str] = None, py_version: Optional[str] = None,
                           install_crocodile_and_machineconfig: Optional[bool] = None,
                           delete_if_exists: bool=True,
                           ) -> str:
-    from rich.console import Console
     console = Console()
     if py_version is None:
-        print("""
+        console.print(Panel("""
 {'=' * 60}
 🔍 AVAILABLE PYTHON VERSIONS
 {'=' * 60}
-""")
+""", title="Python Versions", expand=False))
         res = get_installed_interpreters()
         List(res).print()
-        print("""
-{'=' * 60}
-""")
+        console.print(Panel("", title="Python Versions", expand=False))
         dotted_py_version = input("🔢 Enter python version (3.11): ") or "3.11"
     else:
         dotted_py_version = py_version

machineconfig/utils/ve_utils/ve2.py

@@ -4,9 +4,22 @@ from crocodile.file_management import P, Read
 
 
 from typing import Literal
-
+from dataclasses import dataclass
 from machineconfig.utils.utils import LIBRARY_ROOT
-from machineconfig.utils.ve import VE_INI, VE_Specs
+
+
+
+@dataclass
+class VE_Specs:
+    ve_name: str
+    py_version: str
+    ipy_profile: str
+    os: str
+
+
+@dataclass
+class VE_INI:
+    specs: VE_Specs
 
 
 def get_install_requirements_template(repo_root: P, requirements_subpath: str, ve_name: str, system: Literal["Windows", "Linux"]):

{machineconfig-1.94.dist-info → machineconfig-1.95.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 1.94
+Version: 1.95
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -9,7 +9,7 @@ Project-URL: Bug Tracker, https://github.com/thisismygitrepo/machineconfig/issue
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: crocodile
 Requires-Dist: rich>=14.0.0
@@ -27,6 +27,8 @@ Requires-Dist: pyfzf>=0.3.1
 Requires-Dist: call-function-with-timeout>=1.1.1
 Provides-Extra: windows
 Requires-Dist: pywin32; extra == "windows"
+Provides-Extra: docs
+Requires-Dist: pdoc>=15.0.2; extra == "docs"
 
 
 <p align="center">