nodeocc 1.0.19.post1__tar.gz → 1.0.21__tar.gz

{nodeocc-1.0.19.post1 → nodeocc-1.0.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nodeocc
-Version: 1.0.19.post1
+Version: 1.0.21
 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.19.post1 → nodeocc-1.0.21}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "nodeocc"
-version = "1.0.19-1"
+version = "1.0.21"
 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.19.post1 → nodeocc-1.0.21}/src/model/infrastructure.py

@@ -98,4 +98,4 @@ class Infrastructure:
         return sorted(self.nodes, key=lambda x: self.prior.index(x.gpu_model.split(',')[0]) if x.gpu_model.split(',')[0] in self.prior else -1)
 
     def get_next_maintenance(self):
-        return sorted(self.maintenances, key=lambda x: to_datetime(x.get('start_time')))[0] if len(self.maintenances) else None
+        return sorted(self.maintenances, key=lambda x: to_datetime(x.start_time))[0] if len(self.maintenances) else None

{nodeocc-1.0.19.post1 → nodeocc-1.0.21}/src/nodeocc.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nodeocc
-Version: 1.0.19.post1
+Version: 1.0.21
 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.19.post1 → nodeocc-1.0.21}/src/view/curses_multiwindow.py

@@ -93,6 +93,8 @@ class Singleton:
     def clean_port_files(self):
         nodename = socket.getfqdn().split('.')[0]
         bp = os.path.join(self.basepath, nodename)
+        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
@@ -167,6 +169,8 @@ class Singleton:
         """
         nodename = socket.getfqdn().split('.')[0]
         bp = os.path.join(self.basepath, nodename)
+        if not os.path.exists(bp):
+            return []
         portfiles = [os.path.join(bp, f) for f in os.listdir(bp)
                      if f.endswith('.portfile') and 'master_' in f]
         portfiles = [f for f in portfiles if is_file_readable_byall(f) and is_file_writable_byall(f)]

{nodeocc-1.0.19.post1 → nodeocc-1.0.21}/src/view/utils.py

@@ -3,7 +3,6 @@ import re
 import numpy as np
 
 
-
 def is_student_viz(user):
     return user.user_group in ('studenti', 'tesisti') and not is_cvcs_viz(user)
 
@@ -27,7 +26,7 @@ def to_datetime(time_str):
 def to_datetime(time_str):
     try:
         dt = np.datetime64(re.match(r'\d+\s+(.*)\n', str(time_str)).group(1))
-    except:
+    except BaseException:
         dt = np.datetime64(str(time_str))
     return dt
 
@@ -38,8 +37,8 @@ def maintenance_status(infrastructure):
     if len(infrastructure.maintenances):
         # time format: '0   2023-12-04 14:00:00\nName: StartTime, dtype: datetime64[ns]'
         next_maintenance = infrastructure.get_next_maintenance()
-        start_time = to_datetime(next_maintenance.get('start_time'))
-        end_time = to_datetime(next_maintenance.get('end_time'))
+        start_time = to_datetime(next_maintenance.start_time)
+        end_time = to_datetime(next_maintenance.end_time)
         time_to_maintenance = (start_time - np.datetime64('now')).astype(float)
         # TODO: fix timezone
         if time_to_maintenance < 0 and (end_time - np.datetime64('now')) > 0: