addftool 0.1.3__py3-none-any.whl → 0.1.4__py3-none-any.whl

addftool/process/__init__.py

@@ -7,8 +7,7 @@ from .utils import get_processes, get_process_using_rocm, get_process_using_cuda
 def add_killer_args(subparsers):
     process_killer_parser = subparsers.add_parser('kill', help='process kill')
 
-    process_killer_parser.add_argument("--prefix", help="prefix of command", default=None)
-    process_killer_parser.add_argument("--contains", help="contains of command", default=None)
+    process_killer_parser.add_argument("-c", "--contains", help="contains of command", action='store_true', default=False)
     process_killer_parser.add_argument("--timeout", help="timeout of command", default=5, type=int)
     process_killer_parser.add_argument("--try_count", help="try count of command", default=3, type=int)
 
@@ -17,6 +16,8 @@ def add_killer_args(subparsers):
 
     process_killer_parser.add_argument("-v", "--view", help="view process", action='store_true', default=False)
 
+    process_killer_parser.add_argument("name", nargs='?', help="name of process", type=str, default="")
+
 
 def kill_process(processes, timeout=5, try_count=3):
     for process in processes:
@@ -57,8 +58,8 @@ def kill_process(processes, timeout=5, try_count=3):
         exit(1)
 
 
-def find_and_kill_process(prefix=None, contains=None, use_rocm=False, use_cuda=False, timeout=5, try_count=3, only_view=False):
-    do_not_do_anything = prefix is None and contains is None
+def find_and_kill_process(command="", contains=False, use_rocm=False, use_cuda=False, timeout=5, try_count=3, only_view=False):
+    do_not_do_anything = command is None or len(command) == 0
     if use_rocm:
         processes = get_process_using_rocm()
     elif use_cuda:
@@ -67,7 +68,7 @@ def find_and_kill_process(prefix=None, contains=None, use_rocm=False, use_cuda=F
         print("Use top or htop to find the process you want to kill")
         return
     else:
-        processes = get_processes(command_prefix=prefix, prefix_contains=contains)
+        processes = get_processes(command=command, contains=contains)
     
     if only_view:
         print(f"Found {len(processes)} processes")
@@ -82,6 +83,6 @@ def find_and_kill_process(prefix=None, contains=None, use_rocm=False, use_cuda=F
 
 def killer_main(args):
     find_and_kill_process(
-        args.prefix, args.contains, use_rocm=args.rocm, use_cuda=args.cuda, 
+        args.name, args.contains, use_rocm=args.rocm, use_cuda=args.cuda, 
         timeout=args.timeout, try_count=args.try_count, only_view=args.view,
     )

addftool/process/utils.py

@@ -2,7 +2,7 @@ import psutil
 import subprocess
 
 
-def get_processes(command_prefix=None, prefix_contains=None, pids=None):
+def get_processes(command="", contains=False, pids=None):
     """获取进程的PID和命令"""
     
     processes = []
@@ -14,10 +14,11 @@ def get_processes(command_prefix=None, prefix_contains=None, pids=None):
                 continue
             if pids is not None and pid not in pids:
                 continue
-            if command_prefix and not cmdline[0] == command_prefix:
-                continue
-            if prefix_contains and prefix_contains not in cmdline[0]:
-                continue
+            if len(command) > 0:
+                if contains and command not in cmdline[0]:
+                    continue
+                if not contains and command != cmdline[0]:
+                    continue
             if len(cmdline) > 1 and cmdline[1].endswith('addf'):
                 continue
             processes.append({'pid': pid, 'command': cmdline})

{addftool-0.1.3.dist-info → addftool-0.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: addftool
-Version: 0.1.3
+Version: 0.1.4
 Requires-Dist: cryptography
 Requires-Dist: requests
 Requires-Dist: PyYAML

addftool-0.1.4.dist-info/RECORD

@@ -0,0 +1,12 @@
+addftool/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+addftool/addf_portal.py,sha256=U52TdNcwWOEvv_C5r-guWYxn3ntzwYI2eBzJIE7IdcY,493
+addftool/blob.py,sha256=NZOItDyFUIdV1tfhJZJJBEzGy296CE5NCictTzP4OPc,8282
+addftool/tool.py,sha256=EuKQ2t2InN7yB-_oYLcdsA7vRqzRGTunwIxplUSqEG0,2054
+addftool/util.py,sha256=Q3A68vJDxgfeNiEFmk54HuMuworVndocXpSbVpvGMfc,362
+addftool/process/__init__.py,sha256=OB-cZXP1jK7l8uN8nKfhg_bCX6Slz6DeeBpEodt-IK4,3515
+addftool/process/utils.py,sha256=me4HqMz5OgRcQMUJmVhKdTJh4SW5BB-pd_lq7g8-UwE,2252
+addftool-0.1.4.dist-info/METADATA,sha256=ohQCdQdVevHRzMRu7ByPhBGxqPlxmEKnDxNmfcy_WII,148
+addftool-0.1.4.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+addftool-0.1.4.dist-info/entry_points.txt,sha256=9lkmuWMInwUAtev8w8poNkNd7iML9Bjd5CBCFVxg2b8,111
+addftool-0.1.4.dist-info/top_level.txt,sha256=jqj56-plrBbyzY0tIxB6wPzjAA8kte4hUlajyyQygN4,9
+addftool-0.1.4.dist-info/RECORD,,

addftool-0.1.3.dist-info/RECORD

@@ -1,12 +0,0 @@
-addftool/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-addftool/addf_portal.py,sha256=U52TdNcwWOEvv_C5r-guWYxn3ntzwYI2eBzJIE7IdcY,493
-addftool/blob.py,sha256=NZOItDyFUIdV1tfhJZJJBEzGy296CE5NCictTzP4OPc,8282
-addftool/tool.py,sha256=EuKQ2t2InN7yB-_oYLcdsA7vRqzRGTunwIxplUSqEG0,2054
-addftool/util.py,sha256=Q3A68vJDxgfeNiEFmk54HuMuworVndocXpSbVpvGMfc,362
-addftool/process/__init__.py,sha256=EFJ90RcF04M4imGm5NLgb9rmpwxBslZUL_4LKA52uv8,3487
-addftool/process/utils.py,sha256=kS1bYYiWymB1_SObqQLfGiVbZdCJqd57SO6DrwN5H1s,2246
-addftool-0.1.3.dist-info/METADATA,sha256=YwSmBYP8v9T_PnVr-3WM-V2KkCcPg17IwMKllfp-pc0,148
-addftool-0.1.3.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-addftool-0.1.3.dist-info/entry_points.txt,sha256=9lkmuWMInwUAtev8w8poNkNd7iML9Bjd5CBCFVxg2b8,111
-addftool-0.1.3.dist-info/top_level.txt,sha256=jqj56-plrBbyzY0tIxB6wPzjAA8kte4hUlajyyQygN4,9
-addftool-0.1.3.dist-info/RECORD,,