machineconfig 5.91__py3-none-any.whl → 5.93__py3-none-any.whl

machineconfig/utils/procs.py

@@ -2,12 +2,11 @@
 
 import psutil
 from rich.progress import Progress, SpinnerColumn, TextColumn
-from zoneinfo import ZoneInfo
 from machineconfig.utils.options import choose_from_options
-from typing import Optional, Any
+from typing import Optional, TypedDict, List, Dict
 from rich.console import Console
 from rich.panel import Panel
-from datetime import datetime, timezone
+from datetime import datetime
 from machineconfig.utils.accessories import pprint
 
 console = Console()
@@ -15,11 +14,29 @@ console = Console()
 BOX_WIDTH = 78  # width for box drawing
 
 
-def get_processes_accessing_file(path: str):
+class ProcessInfo(TypedDict):
+    """TypedDict for process information."""
+    command: str
+    pid: int
+    name: str
+    username: str
+    cpu_percent: float
+    memory_usage_mb: float
+    status: str
+    create_time: datetime
+
+
+class FileAccessInfo(TypedDict):
+    """TypedDict for file access information."""
+    pid: int
+    files: List[str]
+
+
+def get_processes_accessing_file(path: str) -> List[FileAccessInfo]:
     # 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]] = {}
+    res: Dict[int, List[str]] = {}
 
     with Progress(SpinnerColumn(), TextColumn("[progress.description]{task.description}")) as progress:
         progress.add_task("🔎 Scanning processes...", total=None)
@@ -34,7 +51,7 @@ def get_processes_accessing_file(path: str):
                 res[proc.pid] = tmp
 
     # Convert to list of dictionaries for consistent data structure
-    result_data = [{"pid": pid, "files": files} for pid, files in res.items()]
+    result_data: List[FileAccessInfo] = [{"pid": pid, "files": files} for pid, files in res.items()]
     console.print(Panel(f"✅ Found {len(res)} processes accessing the specified file", title="[bold blue]Process Info[/bold blue]", border_style="blue"))
     return result_data
 
@@ -57,15 +74,13 @@ class ProcessManager:
         # 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 = []
+        process_info: List[ProcessInfo] = []
         with Progress(SpinnerColumn(), TextColumn("[progress.description]{task.description}")) as progress:
             progress.add_task("🔍 Reading system processes...", total=None)
             for proc in psutil.process_iter():
                 try:
                     mem_usage_mb = proc.memory_info().rss / (1024 * 1024)
-                    # Convert create_time to local timezone
-                    create_time_utc = datetime.fromtimestamp(proc.create_time(), tz=timezone.utc)
-                    create_time_local = create_time_utc.astimezone(ZoneInfo("Australia/Adelaide"))
+                    create_time = datetime.fromtimestamp(proc.create_time(), tz=None)
 
                     process_info.append(
                         {
@@ -75,7 +90,7 @@ class ProcessManager:
                             "cpu_percent": proc.cpu_percent(),
                             "memory_usage_mb": mem_usage_mb,
                             "status": proc.status(),
-                            "create_time": create_time_local,
+                            "create_time": create_time,
                             "command": " ".join(proc.cmdline()),
                         }
                     )
@@ -93,8 +108,8 @@ class ProcessManager:
             return ""
 
         # Create header
-        _headers = ["PID", "Name", "Username", "CPU%", "Memory(MB)", "Status", "Create Time", "Command"]
-        header_line = f"{'PID':<8} {'Name':<20} {'Username':<12} {'CPU%':<8} {'Memory(MB)':<12} {'Status':<12} {'Create Time':<20} {'Command':<50}"
+        _headers = ["Command", "PID", "Name", "Username", "CPU%", "Memory(MB)", "Status", "Create Time"]
+        header_line = f"{'Command':<50} {'PID':<8} {'Name':<20} {'Username':<12} {'CPU%':<8} {'Memory(MB)':<12} {'Status':<12} {'Create Time':<20}"
         separator = "-" * len(header_line)
 
         lines = [header_line, separator]
@@ -105,7 +120,7 @@ class ProcessManager:
             # Truncate command if too long
             command = process["command"][:47] + "..." if len(process["command"]) > 50 else process["command"]
 
-            line = f"{process['pid']:<8} {process['name'][:19]:<20} {process['username'][:11]:<12} {process['cpu_percent']:<8.1f} {process['memory_usage_mb']:<12.2f} {process['status'][:11]:<12} {create_time_str:<20} {command:<50}"
+            line = f"{command:<50} {process['pid']:<8} {process['name'][:19]:<20} {process['username'][:11]:<12} {process['cpu_percent']:<8.1f} {process['memory_usage_mb']:<12.2f} {process['status'][:11]:<12} {create_time_str:<20}"
             lines.append(line)
 
         return "\n".join(lines)
@@ -129,7 +144,7 @@ class ProcessManager:
             print(f"PID: {process['pid']}, Name: {process['name']}, Memory: {process['memory_usage_mb']:.2f}MB")
 
         for idx, process in enumerate(selected_processes):
-            pprint(process, f"📌 Process {idx}")
+            pprint(dict(process), f"📌 Process {idx}")
 
         kill_all = input("\n⚠️  Confirm killing ALL selected processes? y/[n] ").lower() == "y"
         if kill_all:
@@ -141,7 +156,7 @@ class ProcessManager:
             indices = [int(val) for val in kill_by_index.split(" ")]
             target_processes = [selected_processes[i] for i in indices]
             for idx2, process in enumerate(target_processes):
-                pprint(process, f"🎯 Target Process {idx2}")
+                pprint(dict(process), f"🎯 Target Process {idx2}")
             _ = self.kill(pids=[p["pid"] for p in target_processes]) if input("\n⚠️  Confirm termination? y/[n] ").lower() == "y" else None
         console.print(Panel("🔔 No processes were terminated.", title="[bold blue]Process Info[/bold blue]", border_style="blue"))
 
@@ -188,7 +203,7 @@ class ProcessManager:
             try:
                 proc = psutil.Process(pid)
                 proc_name = proc.name()
-                proc_lifetime = get_age(proc.create_time())
+                proc_lifetime = get_age(datetime.fromtimestamp(proc.create_time(), tz=None))
                 proc.kill()
                 print(f'💀 Killed process with PID {pid} and name "{proc_name}". It lived {proc_lifetime}. RIP 🪦💐')
                 killed_count += 1
@@ -208,32 +223,10 @@ class ProcessManager:
         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: Any) -> str:
-    """Calculate age from create_time which can be either float timestamp or datetime object."""
-    try:
-        if isinstance(create_time, (int, float)):
-            # Handle timestampz
-            create_time_utc = datetime.fromtimestamp(create_time, tz=timezone.utc)
-            create_time_local = create_time_utc.astimezone(ZoneInfo("Australia/Adelaide"))
-        else:
-            # Already a datetime object
-            create_time_local = create_time
-
-        now_local = datetime.now(tz=ZoneInfo("Australia/Adelaide"))
-        age = now_local - create_time_local
-        return str(age)
-    except Exception as e:
-        try:
-            # Fallback without timezone
-            if isinstance(create_time, (int, float)):
-                create_time_dt = datetime.fromtimestamp(create_time)
-            else:
-                create_time_dt = create_time.replace(tzinfo=None) if create_time.tzinfo else create_time
-            now_dt = datetime.now()
-            age = now_dt - create_time_dt
-            return str(age)
-        except Exception as ee:
-            return f"unknown due to {ee} and {e}"
+def get_age(create_time: datetime) -> str:
+    dtm_now = datetime.now()
+    delta = dtm_now - create_time
+    return str(delta).split(".")[0]  # remove microseconds
 
 
 def main():

{machineconfig-5.91.dist-info → machineconfig-5.93.dist-info}/METADATA

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

{machineconfig-5.91.dist-info → machineconfig-5.93.dist-info}/RECORD

@@ -392,7 +392,7 @@ machineconfig/utils/notifications.py,sha256=tuXIudcip0tEioG-bm8BbLr3FMDve4f6Bktl
 machineconfig/utils/options.py,sha256=vUO4Kej-vDOv64wHr2HNDyu6PATURpjd7xp6N8OOoJg,7083
 machineconfig/utils/path_extended.py,sha256=4RhL0twcIG2kJxmC4r_YzaiTxrYkSRbdh9SO5ObMABw,53122
 machineconfig/utils/path_helper.py,sha256=0e3Xh3BAEv27oqcezNeVLHJllGmLEgLH4T1l90m-650,8014
-machineconfig/utils/procs.py,sha256=w75oGKfR7FpT1pGTGd2XscnEOO0IHBWxohLbi69hLqg,11418
+machineconfig/utils/procs.py,sha256=rw8LR8MjGgvtrpcgxb3hudq2B9fkkpYUXe9x5-FgHuc,10694
 machineconfig/utils/scheduler.py,sha256=jZ_1yghqA3-aINPRmE_76gboqJc0UElroR7urNOfXKs,14940
 machineconfig/utils/scheduling.py,sha256=RF1iXJpqf4Dg18jdZWtBixz97KAHC6VKYqTFSpdLWuc,11188
 machineconfig/utils/source_of_truth.py,sha256=ZAnCRltiM07ig--P6g9_6nEAvNFC4X4ERFTVcvpIYsE,764
@@ -421,8 +421,8 @@ machineconfig/utils/schemas/installer/installer_types.py,sha256=QClRY61QaduBPJoS
 machineconfig/utils/schemas/layouts/layout_types.py,sha256=TcqlZdGVoH8htG5fHn1KWXhRdPueAcoyApppZsPAPto,2020
 machineconfig/utils/schemas/repos/repos_types.py,sha256=ECVr-3IVIo8yjmYmVXX2mnDDN1SLSwvQIhx4KDDQHBQ,405
 machineconfig/utils/ssh_utils/utils.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-machineconfig-5.91.dist-info/METADATA,sha256=GhvLlUJSx4c1ZSW0-rkO3Okoh-yx_b4oJSKIo6Dpj3M,3012
-machineconfig-5.91.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-machineconfig-5.91.dist-info/entry_points.txt,sha256=M0jwN_brZdXWhmNVeXLvdKxfkv8WhhXFZYcuKBA9qnk,418
-machineconfig-5.91.dist-info/top_level.txt,sha256=porRtB8qms8fOIUJgK-tO83_FeH6Bpe12oUVC670teA,14
-machineconfig-5.91.dist-info/RECORD,,
+machineconfig-5.93.dist-info/METADATA,sha256=ppdZOK8vxv-rB6t3fOorFFUKn6JRjcHuLtiNDldb-HQ,3012
+machineconfig-5.93.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+machineconfig-5.93.dist-info/entry_points.txt,sha256=M0jwN_brZdXWhmNVeXLvdKxfkv8WhhXFZYcuKBA9qnk,418
+machineconfig-5.93.dist-info/top_level.txt,sha256=porRtB8qms8fOIUJgK-tO83_FeH6Bpe12oUVC670teA,14
+machineconfig-5.93.dist-info/RECORD,,