nodeocc 1.0.24__tar.gz → 1.0.26__tar.gz

{nodeocc-1.0.24 → nodeocc-1.0.26}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: nodeocc
-Version: 1.0.24
+Version: 1.0.26
 Summary: TUI application for viewing the status of GPU allocations on a Slurm cluster
 Author: Matteo Boschini
 Maintainer: Lorenzo Bonicelli, Aniello Panariello

{nodeocc-1.0.24 → nodeocc-1.0.26}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "nodeocc"
-version = "1.0.24"
+version = "1.0.26"
 authors = [{ name = "Matteo Boschini" }]
 maintainers = [{ name = "Lorenzo Bonicelli" }, { name = "Aniello Panariello" }]
 description = "TUI application for viewing the status of GPU allocations on a Slurm cluster"

{nodeocc-1.0.24 → nodeocc-1.0.26}/src/controller/controller.py

@@ -8,7 +8,7 @@ import numpy as np
 
 conf_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 print(conf_path)
-sys.path.append(conf_path)
+sys.path.insert(0, conf_path)
 from curses import wrapper
 from view.curses_multiwindow import main, Singleton, try_open_socket_as_slave
 
@@ -23,6 +23,9 @@ import time
 import json
 import argparse
 import traceback
+import socket
+import re
+from urllib.request import urlopen
 from model.infrastructure import Infrastructure
 from model.job import Job
 import asyncio
@@ -30,36 +33,28 @@ import importlib.metadata
 
 program_name = 'nodeocc'
 version_number = importlib.metadata.version(program_name)
-updated = False
 
-BBLUE = '\033[1;34m'
-END = '\033[0m'
-try:
-    url = "https://pypi.python.org/pypi/nodeocc/json"
-    import requests
-    newest_version = json.loads(requests.get(url).text)['info']['version']
-    print(BBLUE, end='')
-    if int(newest_version.split('.')[0]) > int(version_number.split('.')[0]):
-        print(f"New major version available: {newest_version} (current: {version_number})")
-        print(f"Please update with 'pip install {program_name} --upgrade'")
-        time.sleep(7)
-    elif int(newest_version.split('.')[1]) > int(version_number.split('.')[1]):
-        print(f"New minor version available: {newest_version} (current: {version_number})")
-        print(f"Please update with 'pip install {program_name} --upgrade'")
-        time.sleep(7)
-    elif int(newest_version.split('.')[2]) > int(version_number.split('.')[2]):
-        print(f"New patch version available: {newest_version} (current: {version_number})")
-        print(f"Please update with 'pip install {program_name} --upgrade'")
-        time.sleep(7)
-    else:
-        print(f"Up to date: {version_number}")
-        updated = True
-        time.sleep(3)
-    print(END, end='')
-except Exception as e:
-    print(f"{BBLUE}Could not get newest version from pip, check if {program_name} is up to date{END}")
-    newest_version = '?.?.?'
-    time.sleep(5)
+
+def _version_tuple(v):
+    return tuple(int(x) for x in re.findall(r'\d+', str(v)))
+
+
+def check_latest_version(cur_version, timeout_sec=1.2):
+    """
+    Fast, non-blocking-ish version check:
+    - short timeout
+    - no startup sleeps/pauses
+    - graceful fallback to current version on errors
+    """
+    try:
+        url = f"https://pypi.python.org/pypi/{program_name}/json"
+        with urlopen(url, timeout=timeout_sec) as response:
+            payload = json.loads(response.read().decode('utf-8'))
+        newest = payload['info']['version']
+        is_updated = _version_tuple(cur_version) >= _version_tuple(newest)
+        return newest, is_updated
+    except Exception:
+        return cur_version, True
 
 BEGIN_DELIM = "!{$"
 END_DELIM_ENCODED = "!}$".encode('utf-8')
@@ -74,11 +69,18 @@ parser.add_argument('--debug', action='store_true', help='Enable logging')
 parser.add_argument('--override', action='store_true', help='Enable logging')
 parser.add_argument('--master_only', action='store_true', help='Disable all prints - only run in background')
 parser.add_argument('--basepath', type=str, default='/tmp', help='Base path for nodeocc. Must be readable by all users')
+parser.add_argument('--diag', action='store_true', help='Run one-shot diagnostics and exit')
 args = parser.parse_args()
 
 # check basepath is readable
 assert os.access(args.basepath, os.R_OK), f"Base path {args.basepath} not readable"
 
+# Keep startup snappy for daemon/diagnostics; check updates only in interactive mode.
+if args.master_only or args.diag:
+    newest_version, updated = version_number, True
+else:
+    newest_version, updated = check_latest_version(version_number)
+
 # export args
 orig_instance = Singleton.getInstance(args)
 
@@ -177,49 +179,61 @@ async def get_data_slave(instance):
         # listen for data from master
         # instance.sock.settimeout(6.5)
         data, _ = instance.sock.recvfrom(MAX_BUF)
-        decoded_data = data.decode('utf-8')
-        if BEGIN_DELIM in decoded_data:
-            n_msgs_remaining = int(decoded_data.split(BEGIN_DELIM)[0])
-            # msg_len += len(str(msg_len)) message len is deprecated and used for n_msgs_remaining
-            instance.timeme(f"received first message of {n_msgs_remaining} (total len {len(data)} bytes)")
-
-            inf, jobs, avg_wait_time, decoded_msg = decode_msg_slave(data)
-            instance.timeme(f"- receive")
-            orig_timestamp = float(decoded_msg['ts'])
-
-            total_msg_n = n_msgs_remaining
-            msg_store = {i: [] for i in range(total_msg_n)}
-            while n_msgs_remaining > 0:
-                data, _ = instance.sock.recvfrom(MAX_BUF)
-                back_msg_idx = int(data.decode('utf-8').split(EXTRA_MSG_BEGIN_DELIM)[0])
-                msg_idx = total_msg_n - back_msg_idx - 1
-                _, new_jobs, _, new_ts = decode_msg_slave(data, delim=EXTRA_MSG_BEGIN_DELIM)
-
-                # check if timestamp is the same
-                if float(new_ts['ts']) != orig_timestamp:
-                    instance.timeme(f"Timestamp mismatch, skipping")
-                    return inf, jobs, avg_wait_time  # return what we have
-
-                msg_store[msg_idx] += new_jobs
-
-                n_msgs_remaining -= 1
-                instance.timeme(f"- extra receive, {n_msgs_remaining} remaining")
-
-            # sort and merge
-            for msg_idx in range(total_msg_n):
-                if len(msg_store[msg_idx]) == 0:
-                    instance.log(f"Empty message {msg_idx}")
-                jobs += msg_store[msg_idx]
-        else:
-            instance.timeme(f"- no data")
-            return None, None, None, None
+        decoded_data = data.decode('utf-8', errors='replace')
+        if BEGIN_DELIM not in decoded_data:
+            if EXTRA_MSG_BEGIN_DELIM in decoded_data:
+                instance.log("Received extra packet before main packet, discarding")
+            else:
+                instance.log("Received packet without known delimiters, discarding")
+            return None, None, None
+
+        n_msgs_remaining = int(decoded_data.split(BEGIN_DELIM)[0])
+        # msg_len += len(str(msg_len)) message len is deprecated and used for n_msgs_remaining
+        instance.timeme(f"received first message of {n_msgs_remaining} (total len {len(data)} bytes)")
+
+        inf, jobs, avg_wait_time, decoded_msg = decode_msg_slave(data)
+        instance.timeme(f"- receive")
+        orig_timestamp = float(decoded_msg['ts'])
+
+        total_msg_n = n_msgs_remaining
+        msg_store = {i: [] for i in range(total_msg_n)}
+        while n_msgs_remaining > 0:
+            data, _ = instance.sock.recvfrom(MAX_BUF)
+            decoded_extra = data.decode('utf-8', errors='replace')
+            if EXTRA_MSG_BEGIN_DELIM not in decoded_extra:
+                instance.log("Received non-extra packet while waiting for extra packets, skipping")
+                continue
+
+            back_msg_idx = int(decoded_extra.split(EXTRA_MSG_BEGIN_DELIM)[0])
+            msg_idx = total_msg_n - back_msg_idx - 1
+            if msg_idx < 0 or msg_idx >= total_msg_n:
+                instance.log(f"Invalid extra packet index: {msg_idx}, skipping")
+                continue
+
+            _, new_jobs, _, new_ts = decode_msg_slave(data, delim=EXTRA_MSG_BEGIN_DELIM)
+
+            # check if timestamp is the same
+            if float(new_ts['ts']) != orig_timestamp:
+                instance.timeme(f"Timestamp mismatch, skipping")
+                return inf, jobs, avg_wait_time  # return what we have
+
+            msg_store[msg_idx] += new_jobs
+
+            n_msgs_remaining -= 1
+            instance.timeme(f"- extra receive, {n_msgs_remaining} remaining")
+
+        # sort and merge
+        for msg_idx in range(total_msg_n):
+            if len(msg_store[msg_idx]) == 0:
+                instance.log(f"Empty message {msg_idx}")
+            jobs += msg_store[msg_idx]
 
         n_timeout = 0
 
-    except BlockingIOError as e:
+    except BlockingIOError:
         pass
 
-    except TimeoutError as e:
+    except TimeoutError:
         n_timeout += 1
         instance.log(f"TIMEOUT {n_timeout}/{TIMEOUT_MAX}")
         if n_timeout > TIMEOUT_MAX:
@@ -227,6 +241,10 @@ async def get_data_slave(instance):
 
         time.sleep(random.randint(100, 10000) / 1000)
 
+    except Exception as e:
+        instance.err(f"Exception while receiving data from master: {e}")
+        instance.err(traceback.format_exc())
+
     return inf, jobs, avg_wait_time
 
 
@@ -274,7 +292,53 @@ def display_main(stdscr):
     return asyncio.run(main(stdscr))
 
 
+def run_diagnostics(instance: Singleton):
+    hostname = socket.getfqdn().split('.')[0]
+    print(f"Diagnostics for nodeocc on host: {hostname}")
+    print(f"Base path: {instance.basepath}")
+    print(f"Role detected: {'master' if instance.is_master else 'slave'}")
+    print("")
+
+    try:
+        port_files = instance.get_port_files()
+        print(f"Visible port files: {len(port_files)}")
+        for pf in port_files:
+            try:
+                pid = Path(pf).read_text().strip()
+            except Exception:
+                pid = "?"
+            print(f"  - {pf} (pid={pid})")
+    except Exception as e:
+        print(f"Could not list port files: {e}")
+
+    print("")
+
+    if instance.is_master:
+        print("Running one master update cycle...")
+        try:
+            inf, jobs = update_data_master(instance)
+            print(f"Master update OK. Nodes={len(inf.nodes)}, Jobs={len(jobs)}, Port={instance.port}")
+        except Exception as e:
+            print(f"Master update FAILED: {e}")
+            print(traceback.format_exc())
+    else:
+        print("Waiting for one packet from master...")
+        try:
+            inf, jobs, _ = asyncio.run(get_data_slave(instance))
+            if inf is None or jobs is None:
+                print("No valid payload received from master.")
+            else:
+                print(f"Slave receive OK. Jobs in snapshot={len(jobs)}")
+        except Exception as e:
+            print(f"Slave receive FAILED: {e}")
+            print(traceback.format_exc())
+
+
 def _main():
+    if args.diag:
+        run_diagnostics(orig_instance)
+        return
+
     if args.master_only:
         assert orig_instance.is_master, "Instance is not `master`, run with `force_override` to override"
 

{nodeocc-1.0.24 → nodeocc-1.0.26}/src/nodeocc.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: nodeocc
-Version: 1.0.24
+Version: 1.0.26
 Summary: TUI application for viewing the status of GPU allocations on a Slurm cluster
 Author: Matteo Boschini
 Maintainer: Lorenzo Bonicelli, Aniello Panariello

{nodeocc-1.0.24 → nodeocc-1.0.26}/src/readers/slurmreader.py

@@ -45,24 +45,64 @@ def _node_from_sinfo(x):
     return n
 
 
-def _parse_gpu_models(line):
-    line = line[0].split(',')
-    if line[0] == '(null)':
+def _parse_gpu_count(gres):
+    if not isinstance(gres, str):
+        return 0
+    gres = gres.strip()
+    if gres in ('(null)', ''):
+        return 0
+
+    n_gpu = 0
+    for token in gres.split(','):
+        token = token.strip()
+        if not token.lower().startswith('gpu'):
+            continue
+        token_core = token.split('(')[0]
+        parts = token_core.split(':')
+        count = None
+
+        if len(parts) >= 2 and re.fullmatch(r'\d+', parts[-1]):
+            count = int(parts[-1])
+        elif len(parts) >= 3 and re.fullmatch(r'\d+', parts[-2]):
+            count = int(parts[-2])
+
+        n_gpu += count if count is not None else 1
+    return n_gpu
+
+
+def _parse_gpu_models(gres):
+    if not isinstance(gres, str):
         return 'n/a'
-    else:
-        if len(line) == 1:
-            return line[0].split(':')[1]
+    gres = gres.strip()
+    if gres in ('(null)', ''):
+        return 'n/a'
+
+    models = []
+    for token in gres.split(','):
+        token = token.strip()
+        if not token.lower().startswith('gpu'):
+            continue
+        token_core = token.split('(')[0]
+        parts = token_core.split(':')
+        if len(parts) >= 3 and not re.fullmatch(r'\d+', parts[1]):
+            model = parts[1]
+        elif len(parts) == 2 and not re.fullmatch(r'\d+', parts[1]):
+            model = parts[1]
+        elif len(parts) == 2 and re.fullmatch(r'\d+', parts[1]):
+            model = 'gpu'
         else:
-            # return line[0].split(':')[1] + ',' + line[1].split(':')[1]
-            return ','.join([x.split(':')[1] for x in line])
+            model = 'n/a'
+        if model not in models:
+            models.append(model)
+
+    return ','.join(models) if models else 'n/a'
 
 
 def _read_nodes(reservations=None, pending_res=None, return_raw=False):
     sinfo_df = pd.read_csv(StringIO(os.popen(r'sinfo -N -o "%N;%G;%t;%m;%c;%f"').read()), sep=';')
     sinfo_df = _split_column(sinfo_df, 'NODELIST').drop_duplicates()
-    sinfo_df.loc[:, 'n_gpu'] = sinfo_df['GRES'].apply(lambda x: 0 if x.split('(')[0].split(':')[0] in ('(null)', '') else int(x.split('(')[0].split(':')[-1]))
-    # sinfo_df['m_gpu'] = sinfo_df['GRES'].str.split(':').apply(lambda x: 'n/a' if x[0] in ('(null)', '') else x[1])
-    sinfo_df.loc[:, 'm_gpu'] = sinfo_df['GRES'].str.split(';').apply(_parse_gpu_models)
+    sinfo_df.loc[:, 'n_gpu'] = sinfo_df['GRES'].apply(_parse_gpu_count)
+    sinfo_df.loc[:, 'm_gpu'] = sinfo_df['GRES'].apply(_parse_gpu_models)
     sinfo_df['reserved'] = 'no'
     if reservations is not None:
         sinfo_df.loc[sinfo_df['NODELIST'].isin(reservations.Nodes.unique()), 'reserved'] = 'yes'

{nodeocc-1.0.24 → nodeocc-1.0.26}/src/view/__init__.py

@@ -3,6 +3,8 @@ from . import slurm_list, slurm_viz, styles
 
 def update_views(stdscr, instance, filter):
     if instance.jobs is None or instance.inf is None:
+        instance.rens = "No data received from master yet.\nTry running with --debug or --diag."
+        instance.nocc = "Waiting for infrastructure snapshot..."
         return
 
     instance.rens = slurm_list.view_list(
@@ -11,5 +13,11 @@ def update_views(stdscr, instance, filter):
             instance, 'job_id_type') else 'agg')
     instance.timeme(f"- print job list")
 
-    instance.nocc = slurm_viz.view_viz(instance.inf, instance.jobs, stylefn=styles.crsstyler, mode=instance.view_mode if hasattr(instance, 'view_mode') else 'gpu')
+    instance.nocc = slurm_viz.view_viz(
+        instance.inf,
+        instance.jobs,
+        stylefn=styles.crsstyler,
+        mode=instance.view_mode if hasattr(instance, 'view_mode') else 'gpu',
+        panel_width=instance.right_width if hasattr(instance, 'right_width') else None,
+    )
     instance.timeme(f"- view nodeocc")

{nodeocc-1.0.24 → nodeocc-1.0.26}/src/view/curses_multiwindow.py

@@ -35,6 +35,11 @@ BUTTON_ACTIONS = {
     'info': [ord('i')],
 }
 
+RIGHT_WIDTH_GPU = 33
+RIGHT_WIDTH_INFO = 39
+# Keep a single stable width across modes; use the widest one so info fields are not cut.
+RIGHT_WIDTH_UNIFIED = max(RIGHT_WIDTH_GPU, RIGHT_WIDTH_INFO)
+
 
 def is_file_writable_byall(file_path):
     return os.stat(file_path).st_mode & stat.S_IWOTH
@@ -44,12 +49,49 @@ def is_file_readable_byall(file_path):
     return os.stat(file_path).st_mode & stat.S_IROTH
 
 
+def is_nodeocc_process(pid):
+    try:
+        cmdline = ' '.join(psutil.Process(int(pid)).cmdline())
+        return ('nodeocc' in cmdline) or ('controller.py' in cmdline)
+    except Exception:
+        return False
+
+
+def port_from_portfile(portfile_path):
+    try:
+        return int(Path(portfile_path).name.split('.')[0].split('master_')[1])
+    except Exception:
+        return None
+
+
+def process_has_udp_port(pid, port):
+    if port is None:
+        return False
+    try:
+        proc = psutil.Process(int(pid))
+        for conn in proc.connections(kind='udp'):
+            if conn.laddr and conn.laddr.port == int(port):
+                return True
+    except Exception:
+        return False
+    return False
+
+
 def try_open_socket_as_slave(instance, force=False):
     if len(instance.get_port_files()) == 0:
         raise Exception("No master running")
 
-    cur_port = [int(f.split('.')[0].split('master_')[1]) for f in instance.get_port_files()
-                if (pid := Path(f).read_text()) and psutil.pid_exists(int(pid))][0]
+    active_ports = []
+    for f in instance.get_port_files():
+        pid = Path(f).read_text().strip()
+        port = port_from_portfile(f)
+        if pid and is_nodeocc_process(pid) and process_has_udp_port(pid, port):
+            active_ports.append(port)
+
+    if len(active_ports) == 0:
+        raise Exception("No active master process found from port files")
+
+    cur_port = active_ports[0]
 
     if hasattr(instance, 'port'):
         # check if port file has same name
@@ -96,15 +138,20 @@ class Singleton:
         if not os.path.exists(bp):
             return True
         for f in os.listdir(bp):
-            if 'master_' in f and f.endswith('.portfile') and is_file_writable_byall(os.path.join(bp, f)):
-                # read pid from file
-                pid = Path(os.path.join(bp, f)).read_text()
-                # assert no process is running
-                if psutil.pid_exists(int(pid)) and not force:
-                    self.log(f"Process {pid} is still running, killing self")
+            fp = os.path.join(bp, f)
+            if 'master_' in f and f.endswith('.portfile') and is_file_writable_byall(fp):
+                pid = Path(fp).read_text().strip()
+                port = port_from_portfile(fp)
+                if not pid:
+                    os.remove(fp)
+                    continue
+                if pid == str(os.getpid()):
+                    os.remove(fp)
+                    continue
+                if (not force) and is_nodeocc_process(pid) and process_has_udp_port(pid, port):
+                    self.log(f"Process {pid} is still running, keeping existing master")
                     return False
-
-                os.system(f"rm {os.path.join(bp, f)}")
+                os.remove(fp)
         return True
 
     def __init__(self, args=None):
@@ -115,6 +162,7 @@ class Singleton:
             Singleton.__instance = self
 
         self.args = args
+        self.basepath = self.args.basepath
         self.setup_logging()
 
         self.try_open_counter = 0
@@ -141,11 +189,13 @@ class Singleton:
         self.k = -1
 
         # check if user group is 'student' or 'tesisti'
-        user_group = grp.getgrgid(os.getgid()).gr_name
+        try:
+            user_group = grp.getgrgid(os.getgid()).gr_name
+        except KeyError:
+            user_group = ''
+            self.err(f"Could not resolve gid {os.getgid()} via grp.getgrgid")
         self.cur_partition = 'stud' if user_group in ['studenti', 'tesisti'] else 'prod'
 
-        self.basepath = self.args.basepath
-
         self.is_master = not self.check_existing_master_running()
 
         if self.is_master or args.override:
@@ -158,9 +208,16 @@ class Singleton:
         if len(portfiles) > 0:
             for f in portfiles:
                 # check if process is still running
-                pid = Path(f).read_text()
-                if pid and int(pid) != os.getpid():
-                    return psutil.pid_exists(int(pid))
+                pid = Path(f).read_text().strip()
+                if not pid:
+                    continue
+                try:
+                    pid_int = int(pid)
+                except ValueError:
+                    continue
+                port = port_from_portfile(f)
+                if pid_int != os.getpid() and is_nodeocc_process(pid_int) and process_has_udp_port(pid_int, port):
+                    return True
         return False
 
     def get_port_files(self):
@@ -182,11 +239,6 @@ class Singleton:
         # get pid of current process
         self.pid = os.getpid()
 
-        # clean up old port files
-        kill_ok = self.clean_port_files(force=force)
-        if not kill_ok:
-            return None
-
         try:
             # create file to store port with 666 permissions to file
             # file is in folder basepath/nodename/master_{port}.portfile
@@ -211,10 +263,15 @@ class Singleton:
             # check if file exists
             if filepath.exists():
                 # delete file
-                os.system(f"rm {filepath}")
+                os.remove(filepath)
             return None
 
     def create_socket_as_master(self, force=False):
+        # clean up old port files before creating the socket to avoid inconsistent state
+        kill_ok = self.clean_port_files(force=force)
+        if not kill_ok:
+            return None
+
         # create udp socket for broadcasting
         self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, socket.IPPROTO_UDP)
 
@@ -248,8 +305,6 @@ class Singleton:
             self.sock.settimeout(6.5)
             self.log(f"Socket opened on port {self.port}")
 
-            self.update_port_file(force=force)
-
             self.try_open_counter = 0
             return self.port
         except Exception as e:
@@ -426,7 +481,7 @@ def handle_keys(stdscr, instance):
         instance.sort_by_prio = not instance.sort_by_prio
     elif k in BUTTON_ACTIONS['res_view_mode']:
         instance.view_mode = {"gpu": "ram", "ram": "cpu", "cpu": "gpu", "info": "gpu"}[instance.view_mode]
-        instance.right_width = 33 if instance.view_mode != 'info' else 39
+        instance.right_width = RIGHT_WIDTH_UNIFIED
         stdscr.clear()
     elif k in BUTTON_ACTIONS['job_id_type']:
         instance.job_id_type = "true" if instance.job_id_type == "agg" else "agg"
@@ -439,7 +494,7 @@ def handle_keys(stdscr, instance):
         instance.show_prio = not instance.show_prio
     elif k in BUTTON_ACTIONS['info']:
         instance.view_mode = 'info' if instance.view_mode != 'info' else 'gpu'
-        instance.right_width = 33 if instance.view_mode != 'info' else 39
+        instance.right_width = RIGHT_WIDTH_UNIFIED
         stdscr.clear()
     elif k in BUTTON_ACTIONS['up_tab']:
         # get screen size
@@ -463,7 +518,7 @@ def update_screen(stdscr, instance):
     if instance.k in BUTTON_ACTIONS['refresh']:
         stdscr.clear()
 
-    totsize = 106
+    totsize = 106 + max(0, RIGHT_WIDTH_UNIFIED - RIGHT_WIDTH_GPU)
     if instance.show_account:
         totsize += 10
     if instance.show_prio:
@@ -556,8 +611,14 @@ def update_screen(stdscr, instance):
     # get slurm user partition
     # stdscr.addstr(lines - 1, xoffset + 62 + 2, f'(Avg time {instance.avg_wait_time})', curses.color_pair(2))
 
-    signature = instance.signature if instance.updated else f'{instance.version} -> {instance.newest_version}'
-    stdscr.addstr(lines - 1, columns - 2 - len(signature), signature, curses.color_pair(2) if instance.updated else curses.color_pair(3))
+    if instance.updated:
+        signature = instance.signature
+        sig_style = curses.color_pair(2)
+    else:
+        signature = f'{instance.signature} (new {instance.newest_version})'
+        sig_style = curses.color_pair(4)
+
+    stdscr.addstr(lines - 1, columns - 2 - len(signature), signature, sig_style)
 
     stdscr.refresh()
     curses.doupdate()
@@ -662,7 +723,7 @@ async def main(stdscr):
     # status
 
     instance.a_filter = 0
-    instance.right_width = 33
+    instance.right_width = RIGHT_WIDTH_UNIFIED
 
     stdscr.clear()
 

{nodeocc-1.0.24 → nodeocc-1.0.26}/src/view/slurm_list.py

@@ -44,7 +44,7 @@ def _joblet_format(instance, job, width=74, jobid_type='agg'):
             mem = round(joblet.mem / 1024)
         joblet_repr += _format_to(f'{mem}G', 4, 'right')
         joblet_repr += ' '
-        if instance.view_mode in ('gpu', 'ram'):
+        if instance.view_mode in ('gpu', 'ram', 'info'):
             joblet_repr += _format_to((f'{joblet.n_gpus}gp' if joblet.n_gpus > 0 else " - "), 3, 'left')
         elif instance.view_mode == 'cpu':
             joblet_repr += _format_to((f'{joblet.cpus}cp' if joblet.cpus > 0 else " - "), 3, 'left')

{nodeocc-1.0.24 → nodeocc-1.0.26}/src/view/slurm_viz.py

@@ -101,6 +101,20 @@ cpu_paused = '▚'
 cpu_down = '⨯'
 
 GLOBAL_NODES = None
+BASE_PANEL_WIDTH = 33
+
+
+def _center_panel_content(text, panel_width, base_width=BASE_PANEL_WIDTH):
+    if panel_width is None or panel_width <= base_width:
+        return text
+
+    pad = max(0, (panel_width - base_width) // 2)
+    if pad == 0:
+        return text
+
+    lines = text.split('\n')
+    lines = [(' ' * pad + line) if line else line for line in lines]
+    return '\n'.join(lines)
 
 
 def get_ram_block(megs):
@@ -138,15 +152,15 @@ def get_node_status(node, jobs):
         return None  # white?
 
 
-def view_viz(infrastructure, jobs, work=True, stylefn=cmdstyle, current_user=None, mode='gpu'):
+def view_viz(infrastructure, jobs, work=True, stylefn=cmdstyle, current_user=None, mode='gpu', panel_width=None):
     if mode == 'gpu':
-        return view_viz_gpu(infrastructure, jobs, work, stylefn, current_user)
+        return _center_panel_content(view_viz_gpu(infrastructure, jobs, work, stylefn, current_user), panel_width)
     elif mode == 'ram':
-        return view_viz_ram(infrastructure, jobs, work, stylefn, current_user)
+        return _center_panel_content(view_viz_ram(infrastructure, jobs, work, stylefn, current_user), panel_width)
     elif mode == 'cpu':
-        return view_viz_cpu(infrastructure, jobs, work, stylefn, current_user)
+        return _center_panel_content(view_viz_cpu(infrastructure, jobs, work, stylefn, current_user), panel_width)
     elif mode == 'info':
-        return view_viz_info(infrastructure, jobs, work, stylefn, current_user)
+        return view_viz_info(infrastructure, jobs, work, stylefn, current_user, panel_width)
 
 
 def view_viz_ram(infrastructure, jobs, work=True, stylefn=cmdstyle, current_user=None):
@@ -519,7 +533,7 @@ def view_viz_cpu(infrastructure, jobs, work=True, stylefn=cmdstyle, current_user
     return RetScope.return_string
 
 
-def view_viz_info(infrastructure, jobs, work=True, stylefn=cmdstyle, current_user=None):
+def view_viz_info(infrastructure, jobs, work=True, stylefn=cmdstyle, current_user=None, panel_width=None):
     # this is for hot reload
     if not work:
         return "UPDATE IN PROGRESS - PLZ W8 M8 B8"
@@ -555,6 +569,7 @@ def view_viz_info(infrastructure, jobs, work=True, stylefn=cmdstyle, current_use
         # max_ram_len = max([len(str(n.mem // 1024)) for n in nodes])
         feat_str = stylefn("GREEN", "FEATURES")
         RetScope.return_string += f'{"":{gpu_name_chars}} GPU {feat_str}\n'
+
         for i, n in GLOBAL_NODES.iterrows():
             gpu_model = n.m_gpu  # if n.m_gpu is not None else 'N/A'
             # gpu_mem = n.gpu_mem if n.gpu_mem is not None else 'N/A'