nodeocc 1.0.10__tar.gz → 1.0.12__tar.gz

{nodeocc-1.0.10 → nodeocc-1.0.12}/PKG-INFO

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

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

@@ -60,7 +60,6 @@ except Exception as e:
     newest_version = '?.?.?'
     time.sleep(5)
 
-
 BEGIN_DELIM = "!{$"
 END_DELIM_ENCODED = "!}$".encode('utf-8')
 EXTRA_MSG_BEGIN_DELIM = "!{#"
@@ -81,13 +80,17 @@ assert os.access(args.basepath, os.R_OK), f"Base path {args.basepath} not readab
 # export args
 orig_instance = Singleton.getInstance(args)
 
-last_update = os.path.getmtime(conf_path + "/view/slurm_viz.py")
-if os.path.getmtime(conf_path + "/view/slurm_list.py") > last_update:
-    last_update = os.path.getmtime(conf_path + "/view/slurm_list.py")
-if os.path.getmtime(conf_path + "/view/styles.py") > last_update:
-    last_update = os.path.getmtime(conf_path + "/view/styles.py")
-if os.path.getmtime(conf_path + "/readers/slurmreader.py") > last_update:
-    last_update = os.path.getmtime(conf_path + "/readers/slurmreader.py")
+try:
+    last_update = os.path.getmtime(conf_path + "/view/slurm_viz.py")
+    if os.path.getmtime(conf_path + "/view/slurm_list.py") > last_update:
+        last_update = os.path.getmtime(conf_path + "/view/slurm_list.py")
+    if os.path.getmtime(conf_path + "/view/styles.py") > last_update:
+        last_update = os.path.getmtime(conf_path + "/view/styles.py")
+    if os.path.getmtime(conf_path + "/readers/slurmreader.py") > last_update:
+        last_update = os.path.getmtime(conf_path + "/readers/slurmreader.py")
+except Exception as e:
+    orig_instance.err(f"Could not get last update time: {e}")
+    last_update = time.time()
 
 
 def get_avg_wait_time(instance: Singleton):
@@ -301,8 +304,7 @@ def _main():
         wrapper(display_main)
 
 
-if __name__ == '__main__':
-    _main()
+_main()
 
 orig_instance.cleanup()
 exit(0)

{nodeocc-1.0.10 → nodeocc-1.0.12}/src/nodeocc.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nodeocc
-Version: 1.0.10
+Version: 1.0.12
 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.10 → nodeocc-1.0.12}/src/view/curses_multiwindow.py

@@ -13,6 +13,7 @@ import traceback
 from logging.handlers import RotatingFileHandler
 from pathlib import Path
 from view import update_views
+import stat
 
 a_filter_values = [None, 'me', 'prod', 'stud', 'cvcs']
 
@@ -35,6 +36,14 @@ BUTTON_ACTIONS = {
 }
 
 
+def is_file_writable_byall(file_path):
+    return os.stat(file_path).st_mode & stat.S_IWOTH
+
+
+def is_file_readable_byall(file_path):
+    return os.stat(file_path).st_mode & stat.S_IROTH
+
+
 def try_open_socket_as_slave(instance):
     if not instance.port_file_exists():
         raise Exception("No master running")
@@ -89,7 +98,7 @@ class Singleton:
 
     def clean_port_files(self):
         for f in os.listdir(self.basepath):
-            if f.endswith('.port'):
+            if f.endswith('.port') and is_file_writable_byall(os.path.join(self.basepath, f)):
                 os.system(f"rm {os.path.join(self.basepath, f)}")
 
     def __init__(self, args=None):
@@ -99,6 +108,9 @@ class Singleton:
         else:
             Singleton.__instance = self
 
+        self.args = args
+        self.setup_logging()
+
         self.try_open_counter = 0
         self.voff = 0
         self.mouse_state = {}
@@ -110,7 +122,6 @@ class Singleton:
         self.fetch_fn = None
         self.view_mode = 'gpu'
         self.job_id_type = 'agg'
-        self.args = args
 
         self.show_account = False
         self.show_prio = False
@@ -147,8 +158,6 @@ class Singleton:
 
         self.is_master = not self.check_existing_master_running()
 
-        self.setup_logging()
-
         if self.is_master:
             # clean up old port files
             self.clean_port_files()
@@ -158,8 +167,11 @@ class Singleton:
 
     def get_port_file_name(self):
         if self.port_file_exists():
-            fname = [f for f in os.listdir(self.basepath) if f.endswith('.port')][0]
-            return fname, os.path.join(self.basepath, fname)
+            portfiles = [f for f in os.listdir(self.basepath) if f.endswith('.port')]
+            portfiles = [(f, os.path.join(self.basepath, f)) for f in portfiles]
+            portfiles = [(fname, fpath) for fname, fpath in portfiles if is_file_readable_byall(fpath) and is_file_writable_byall(fpath)][0]
+
+            return portfiles[0], portfiles[1]
         return None
 
     def check_existing_master_running(self):
@@ -171,7 +183,15 @@ class Singleton:
         return False
 
     def port_file_exists(self):
-        return len([f for f in os.listdir(self.basepath) if f.endswith('.port')]) > 0
+        """
+        Check if a port file exists in the basepath and the file has 666 permissions
+        """
+        portfiles = [f for f in os.listdir(self.basepath) if f.endswith('.port')]
+        if len(portfiles) == 0:
+            return False
+        portfiles = [os.path.join(self.basepath, f) for f in portfiles]
+        portfiles = [f for f in portfiles if is_file_readable_byall(f) and is_file_writable_byall(f)]
+        return len(portfiles) > 0
 
     def create_socket_as_master(self):
         # create udp socket for broadcasting
@@ -191,8 +211,10 @@ class Singleton:
         # get pid of current process
         self.pid = os.getpid()
 
-        # create file to store port
-        Path(self.basepath, f'{self.port}.port').write_text(str(self.pid))
+        # create file to store port with 666 permissions to file
+        filepath = Path(self.basepath, f'{self.port}.port')
+        filepath.write_text(str(self.pid))
+        os.chmod(filepath, 0o666)
 
         return self.port