nodeocc 1.0.17__tar.gz → 1.0.19__tar.gz

{nodeocc-1.0.17 → nodeocc-1.0.19}/PKG-INFO

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

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

@@ -136,7 +136,6 @@ def update_data_master(instance: Singleton):
     queue_jobs = sorted(queue_jobs, key=lambda x: x['priority'], reverse=True)
     maxlen = min(JOB_LIMIT_PER_MSG, len(running_jobs) + len(queue_jobs))
 
-
     queue_jobs, extra_queue_jobs = queue_jobs[:maxlen - len(running_jobs)], queue_jobs[maxlen - len(running_jobs):]
     cur_timestamp = time.time()
     msg = json.dumps({'inf': inf.to_nested_dict(), 'jobs': running_jobs + queue_jobs, 'ts': str(cur_timestamp)})
@@ -195,7 +194,7 @@ async def get_data_slave(instance):
                 # check if timestamp is the same
                 if float(new_ts['ts']) != orig_timestamp:
                     instance.timeme(f"Timestamp mismatch, skipping")
-                    return inf, jobs, avg_wait_time # return what we have
+                    return inf, jobs, avg_wait_time  # return what we have
 
                 msg_store[msg_idx] += new_jobs
 

{nodeocc-1.0.17 → nodeocc-1.0.19}/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.start_time))[0] if len(self.maintenances) else None

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

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

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

{nodeocc-1.0.17 → nodeocc-1.0.19}/src/view/curses_multiwindow.py

@@ -92,16 +92,17 @@ class Singleton:
 
     def clean_port_files(self):
         nodename = socket.getfqdn().split('.')[0]
-        for f in os.listdir(self.basepath):
-            if nodename in f and 'master_' in f and f.endswith('.portfile') and is_file_writable_byall(os.path.join(self.basepath, f)):
+        bp = os.path.join(self.basepath, nodename)
+        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
-                pid = Path(os.path.join(self.basepath, f)).read_text()
+                pid = Path(os.path.join(bp, f)).read_text()
                 # assert no process is running
                 if psutil.pid_exists(int(pid)):
                     self.log(f"Process {pid} is still running, killing self")
                     return False
 
-                os.system(f"rm {os.path.join(self.basepath, f)}")
+                os.system(f"rm {os.path.join(bp, f)}")
         return True
 
     def __init__(self, args=None):
@@ -165,8 +166,9 @@ class Singleton:
         Check if a port file exists in the basepath and the file has 666 permissions
         """
         nodename = socket.getfqdn().split('.')[0]
-        portfiles = [os.path.join(self.basepath, f) for f in os.listdir(self.basepath)
-                     if f.endswith('.portfile') and 'master_' in f and nodename in f]
+        bp = os.path.join(self.basepath, nodename)
+        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)]
         return portfiles
 
@@ -197,7 +199,11 @@ class Singleton:
 
         try:
             # create file to store port with 666 permissions to file
-            filepath = Path(self.basepath, f'{nodename}_master_{self.port}.portfile')
+            # file is in folder basepath/nodename/master_{port}.portfile
+            bp = os.path.join(self.basepath, nodename)
+            if not os.path.exists(bp):
+                os.makedirs(bp, mode=0o777)
+            filepath = Path(os.path.join(bp, f"master_{self.port}.portfile"))
             filepath.write_text(str(self.pid))
             os.chmod(filepath, 0o666)
 

{nodeocc-1.0.17 → nodeocc-1.0.19}/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.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: