Merge pull request #4 from riniangreani/fix_canfar_running_sessions

Fix canfar running sessions

Author: Sebokolodi

automation/canfar_polling.py

@@ -83,7 +83,11 @@ def build_running_canfar_session_set(session_df) -> set[str]:
     if "status" not in session_df.columns or "id" not in session_df.columns:
         return set()
 
-    running = session_df[session_df["status"].astype(str).str.lower() == "running"]
+    running = session_df[
+    session_df["status"].astype(str).str.lower().isin(
+        ["pending", "running", "terminating", "succeeded", "completed"]
+    )
+]
     return {str(x).strip() for x in running["id"].dropna().tolist() if str(x).strip()}
 
 
@@ -107,6 +111,7 @@ async def _fetch_prefect_completed_flow_runs(limit: int = 200):
 async def _fail_flow_run(flow_run_id, reason: str) -> None:
     """Mark the specified flow-run as FAILED with the given reason/message."""
     async with get_client() as client:
+        await client.cancel_flow_run(flow_run_id=flow_run_id)
         await client.set_flow_run_state(
             flow_run_id=flow_run_id,
             state=Failed(message=reason),

possum_pipeline_control/check_status_and_launch_3Dpipeline_v2.py

@@ -493,8 +493,7 @@ def run_prefect_db_backup():
     ts = datetime.now(timezone.utc).strftime("%Y-%m-%dT%H%M%SZ")
     OUTDIR = Path.home() / "prefect-backups"
     OUTDIR.mkdir(parents=True, exist_ok=True)
-    db_file_name = f"prefect-{ts}.sql"
-    db_backup = OUTDIR / db_file_name
+    db_backup = OUTDIR / f"prefect-{ts}.sql"
 
     cmd = ["bash", bkpscript, str(db_backup)]
     result = subprocess.run(cmd, capture_output=True, text=True)
@@ -514,14 +513,9 @@ def run_prefect_db_backup():
         )
     # --- Copy to CANFAR ---
     print("Copying the backup to CANFAR...")
-    try:
-        client = Client()
-        VOS_FOLDER = "arc:projects/CIRADA/polarimetry/software/prefect-backups"
-        remote_file = f"{VOS_FOLDER}/{db_file_name}"
-        client.copy(str(db_backup), remote_file)
-        print("Backup completed successfully")    
-    except Exception as e:
-        print(f"Failed to copy backup to CANFAR: {e}")  
+    client = Client()
+    client.copy(str(db_backup), "arc:projects/CIRADA/polarimetry/software/prefect-backups")
+    print("Backup completed successfully")    
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(