nodeocc 1.0.20__tar.gz → 1.0.22__tar.gz

{nodeocc-1.0.20 → nodeocc-1.0.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nodeocc
-Version: 1.0.20
+Version: 1.0.22
 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.20 → nodeocc-1.0.22}/pyproject.toml

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

@@ -1,4 +1,4 @@
-from typing import List, Optional
+from typing import List
 
 from view.utils import to_datetime
 
@@ -46,7 +46,9 @@ class Maintenance:
         return m
 
     def to_nested_dict(self):
-        return {k: v for k, v in self.__dict__.items()}
+        return {
+            k: v for k, v in self.__dict__.items()
+        }
 
 
 class Infrastructure:
@@ -76,13 +78,16 @@ class Infrastructure:
         for k, v in d.items():
             if k == 'nodes':
                 setattr(i, k, [Node(**n) for n in v])
+            elif k == 'maintenances':
+                setattr(i, k, [Maintenance.from_dict(m) for m in v])
             else:
                 setattr(i, k, v)
         return i
 
     def to_nested_dict(self):
         return {
-            k: ([n.__dict__ for n in self.nodes] if k == 'nodes' else ([n.to_nested_dict() for n in self.maintenances] if k == 'maintenances' else v))
+            k: ([n.__dict__ for n in self.nodes] if k == 'nodes' else
+                ([n.to_nested_dict() for n in self.maintenances] if k == 'maintenances' else v))
             for k, v in self.__dict__.items()
         }
 
@@ -91,11 +96,8 @@ class Infrastructure:
             f"\n\nlimits:({self.gpu_limit_pu}:{self.gpu_limit_grp}),({self.gpu_limit_stu}:{self.gpu_limit_stugrp})"
 
     def get_sorted_nodes(self):
+
         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) -> Optional[Maintenance]:
-        if self.maintenances:
-            if hasattr(self.maintenances[0], 'start_time'):  # if it is the master this is a dict
-                return sorted(self.maintenances, key=lambda x: to_datetime(x.start_time))[0]
-            return Maintenance(**sorted(self.maintenances, key=lambda x: to_datetime(x.get('start_time')))[0])
-        return None
+    def get_next_maintenance(self):
+        return sorted(self.maintenances, key=lambda x: to_datetime(x.start_time))[0] if len(self.maintenances) else None

{nodeocc-1.0.20 → nodeocc-1.0.22}/src/nodeocc.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nodeocc
-Version: 1.0.20
+Version: 1.0.22
 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.20 → nodeocc-1.0.22}/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.20 → nodeocc-1.0.22}/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