nodeocc 1.0.25__tar.gz → 1.0.26__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nodeocc
-Version: 1.0.25
+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.25 → nodeocc-1.0.26}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "nodeocc"
-version = "1.0.25"
+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.25 → nodeocc-1.0.26}/src/controller/controller.py

@@ -24,6 +24,8 @@ 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
@@ -31,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')
@@ -81,6 +75,12 @@ 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)
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nodeocc
-Version: 1.0.25
+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.25 → nodeocc-1.0.26}/src/readers/slurmreader.py

@@ -57,9 +57,16 @@ def _parse_gpu_count(gres):
         token = token.strip()
         if not token.lower().startswith('gpu'):
             continue
-        last_field = token.split(':')[-1].split('(')[0]
-        match = re.search(r'\d+', last_field)
-        n_gpu += int(match.group(0)) if match else 1
+        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
 
 
@@ -75,10 +82,13 @@ def _parse_gpu_models(gres):
         token = token.strip()
         if not token.lower().startswith('gpu'):
             continue
-        parts = token.split(':')
-        if len(parts) >= 3:
+        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:
+        elif len(parts) == 2 and re.fullmatch(r'\d+', parts[1]):
             model = 'gpu'
         else:
             model = 'n/a'

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

@@ -13,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.25 → 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
@@ -476,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"
@@ -489,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
@@ -513,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:
@@ -606,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()
@@ -712,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.25 → 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.25 → 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'