nodeocc 1.0.18__tar.gz → 1.0.19.post1__tar.gz

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

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

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

@@ -1,5 +1,7 @@
 from typing import List
 
+from view.utils import to_datetime
+
 
 class Node:
     """
@@ -34,7 +36,7 @@ class Maintenance:
         self.end_time = end_time
 
     def __repr__(self):
-        return f'RESERVATION {self.start_time} - {self.end_time} on {",".join(self.nodes)}'
+        return f'RESERVATION - From: {self.start_time} To: {self.end_time} on {",".join(self.nodes)}'
 
     @staticmethod
     def from_dict(d):
@@ -94,3 +96,6 @@ class Infrastructure:
     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

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

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

@@ -1,4 +1,3 @@
-import curses
 from . import slurm_list, slurm_viz, styles
 
 

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

@@ -1,6 +1,8 @@
-import numpy as np
 import re
 
+import numpy as np
+
+
 
 def is_student_viz(user):
     return user.user_group in ('studenti', 'tesisti') and not is_cvcs_viz(user)
@@ -22,7 +24,7 @@ def to_datetime(time_str):
     return np.datetime64(re.match(r'\d+\s+(.*)\n', str(time_str)).group(1))
 
 
-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:
@@ -35,9 +37,9 @@ def maintenance_status(infrastructure):
     waitString = ''
     if len(infrastructure.maintenances):
         # time format: '0   2023-12-04 14:00:00\nName: StartTime, dtype: datetime64[ns]'
-        next_maintenance = sorted(infrastructure.maintenances, key=lambda x: to_datetime(x['start_time']))[0]
-        start_time = to_datetime(next_maintenance['start_time'])
-        end_time = to_datetime(next_maintenance['end_time'])
+        next_maintenance = infrastructure.get_next_maintenance()
+        start_time = to_datetime(next_maintenance.get('start_time'))
+        end_time = to_datetime(next_maintenance.get('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: