nodeocc 1.0.19.post1__tar.gz → 1.0.20__tar.gz

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

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

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

@@ -1,4 +1,4 @@
-from typing import List
+from typing import List, Optional
 
 from view.utils import to_datetime
 
@@ -46,9 +46,7 @@ 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:
@@ -84,8 +82,7 @@ class Infrastructure:
 
     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()
         }
 
@@ -94,8 +91,11 @@ 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):
-        return sorted(self.maintenances, key=lambda x: to_datetime(x.get('start_time')))[0] if len(self.maintenances) else None
+    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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nodeocc
-Version: 1.0.19.post1
+Version: 1.0.20
 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.20}/src/view/utils.py

@@ -38,8 +38,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: