bmtool 0.5.6.2__py3-none-any.whl → 0.5.7.1__py3-none-any.whl

bmtool/SLURM.py

@@ -2,6 +2,7 @@ import time
 import os
 import subprocess
 import json
+import requests
 
 
 def check_job_status(job_id):
@@ -18,9 +19,9 @@ def check_job_status(job_id):
         result = subprocess.run(['scontrol', 'show', 'job', job_id], capture_output=True, text=True)
         if result.returncode != 0:
             # this check is not needed if check_interval is less than 5 min (~300 seconds)
-            #if 'slurm_load_jobs error: Invalid job id specified' in result.stderr:
-            #    return 'COMPLETED'  # Treat invalid job ID as completed because scontrol expires and removed job info when done.
-            raise Exception(f"Error checking job status: {result.stderr}")
+            if 'slurm_load_jobs error: Invalid job id specified' in result.stderr:
+                return 'COMPLETED'  # Treat invalid job ID as completed because scontrol expires and removed job info when done.
+            #raise Exception(f"Error checking job status: {result.stderr}")
 
         job_state = None
         for line in result.stdout.split('\n'):
@@ -57,6 +58,25 @@ def submit_job(script_path):
     return job_id
 
 
+def send_teams_message(webhook,message):
+    """Sends a message to a teams channel or chat
+
+    Args:
+        webhook (str): A microsoft teams webhook
+        message (str): A message to send in the chat/channel
+    """
+    message = {
+        "text": f"{message}" 
+    }
+
+    # Send POST request to trigger the flow
+    response = requests.post(
+        webhook,
+        json=message,  # Using 'json' instead of 'data' for automatic serialization
+        headers={'Content-Type': 'application/json'}
+    )
+
+
 class seedSweep:
     def __init__(self, json_file_path, param_name):
         """
@@ -239,6 +259,31 @@ export OUTPUT_DIR={case_output_dir}
             if status not in self.status_list:
                 return False
         return True
+    
+    def check_block_completed(self):
+        """checks if all the jobs in the block have been completed by slurm
+
+        Returns:
+            bool: True if all block jobs have been ran, false if job is still running
+        """
+        for job_id in self.job_ids:
+            status = check_job_status(job_id)
+            if status != 'COMPLETED': # can add PENDING here for debugging NOT FOR ACTUALLY USING IT 
+                return False
+        return True
+
+
+    def check_block_running(self):
+        """checks if a job is running
+
+        Returns:
+            bool: True if jobs are RUNNING false if anything else
+        """
+        for job_id in self.job_ids:
+            status = check_job_status(job_id)
+            if status != 'RUNNING': # 
+                return False
+        return True
 
 
 class SequentialBlockRunner:
@@ -249,13 +294,15 @@ class SequentialBlockRunner:
         blocks (list): List of SimulationBlock instances to be run.
         json_editor (seedSweep or multiSweep): Instance of seedSweep to edit JSON file.
         param_values (list): List of values for the parameter to be modified.
+        webhook (str): a microsoft webhook for teams. When used will send teams messages to the hook!
     """
 
-    def __init__(self, blocks, json_editor=None, param_values=None, check_interval=200):
+    def __init__(self, blocks, json_editor=None, param_values=None, check_interval=200,webhook=None):
         self.blocks = blocks
         self.json_editor = json_editor
         self.param_values = param_values
         self.check_interval = check_interval
+        self.webhook = webhook
 
     def submit_blocks_sequentially(self):
         """
@@ -283,12 +330,23 @@ class SequentialBlockRunner:
             # Submit the block
             print(f"Submitting block: {block.block_name}", flush=True)
             block.submit_block()
-            
+            if self.webhook:
+                message = f"SIMULATION UPDATE: Block {i} has been submitted! There are {(len(self.blocks)-1)-i} left to be submitted"
+                send_teams_message(self.webhook,message)
+
             # Wait for the block to complete
-            while not block.check_block_status():
-                print(f"Waiting for block {block.block_name} to complete...", flush=True)
-                time.sleep(self.check_interval)
+            if i == len(self.blocks) - 1:  # Corrected index to check the last block
+                while not block.check_block_completed():
+                    print(f"Waiting for the last block {i} to complete...")
+                    time.sleep(self.check_interval)
+            else:  # Not the last block so if job is running lets start a new one (checks status list)
+                while not block.check_block_status():
+                    print(f"Waiting for block {i} to complete...")
+                    time.sleep(self.check_interval)
             
             print(f"Block {block.block_name} completed.", flush=True)
         print("All blocks are done!",flush=True)
+        if self.webhook:
+            message = "SIMULATION UPDATE: Simulation are Done!"
+            send_teams_message(self.webhook,message)
 

{bmtool-0.5.6.2.dist-info → bmtool-0.5.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bmtool
-Version: 0.5.6.2
+Version: 0.5.7.1
 Summary: BMTool
 Home-page: https://github.com/cyneuro/bmtool
 Download-URL: 

{bmtool-0.5.6.2.dist-info → bmtool-0.5.7.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-bmtool/SLURM.py,sha256=8XbzNLIQfE_lNRd_Z8ya2PEDT4TqhVnDZkil-ckLUCU,11508
+bmtool/SLURM.py,sha256=AX5MKV7dD-XwS8SROnW1IyesZ3jDwMf0txO6mHxTbuw,13694
 bmtool/__init__.py,sha256=ZStTNkAJHJxG7Pwiy5UgCzC4KlhMS5pUNPtUJZVwL_Y,136
 bmtool/__main__.py,sha256=TmFkmDxjZ6250nYD4cgGhn-tbJeEm0u-EMz2ajAN9vE,650
 bmtool/bmplot.py,sha256=-kw4VOcTnA22JVQi1PzH2E308pcmY1Xo7oqgCnm0cC8,46260
@@ -16,9 +16,9 @@ bmtool/util/commands.py,sha256=zJF-fiLk0b8LyzHDfvewUyS7iumOxVnj33IkJDzux4M,64396
 bmtool/util/util.py,sha256=24E5rUoDU86nqypDF4uZJkuJKO1BrwrQE8lZzAxu1kw,56770
 bmtool/util/neuron/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bmtool/util/neuron/celltuner.py,sha256=xSRpRN6DhPFz4q5buq_W8UmsD7BbUrkzYBEbKVloYss,87194
-bmtool-0.5.6.2.dist-info/LICENSE,sha256=qrXg2jj6kz5d0EnN11hllcQt2fcWVNumx0xNbV05nyM,1068
-bmtool-0.5.6.2.dist-info/METADATA,sha256=Gf0JkdWfaJgYR3_mx-nlr3y2S_5i0kZT5sCckT-Up0E,24107
-bmtool-0.5.6.2.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-bmtool-0.5.6.2.dist-info/entry_points.txt,sha256=0-BHZ6nUnh0twWw9SXNTiRmKjDnb1VO2DfG_-oprhAc,45
-bmtool-0.5.6.2.dist-info/top_level.txt,sha256=gpd2Sj-L9tWbuJEd5E8C8S8XkNm5yUE76klUYcM-eWM,7
-bmtool-0.5.6.2.dist-info/RECORD,,
+bmtool-0.5.7.1.dist-info/LICENSE,sha256=qrXg2jj6kz5d0EnN11hllcQt2fcWVNumx0xNbV05nyM,1068
+bmtool-0.5.7.1.dist-info/METADATA,sha256=cgwZVmUCp3LN20uI_TD0FkTlxfvlNDei3HlW1-PVHi4,24107
+bmtool-0.5.7.1.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+bmtool-0.5.7.1.dist-info/entry_points.txt,sha256=0-BHZ6nUnh0twWw9SXNTiRmKjDnb1VO2DfG_-oprhAc,45
+bmtool-0.5.7.1.dist-info/top_level.txt,sha256=gpd2Sj-L9tWbuJEd5E8C8S8XkNm5yUE76klUYcM-eWM,7
+bmtool-0.5.7.1.dist-info/RECORD,,