Add latest 2.0 fixes to main

apps/cli/executables/pexable/casa_envoy/casa_envoy/foundation.py

@@ -59,7 +59,9 @@ class GeneralFoundation(FoundationIF):
 
             # move provided files from parent directory into working directory for CASA
             for file in provided_files:
-                shutil.copy(file.strip(), self.working_dir)
+                stripped_file = file.strip()
+                if stripped_file:
+                    shutil.copy(stripped_file, self.working_dir)
 
         self.logger.info("DATA FOUNDATION COMPLETE!")
 

shared/workspaces/workspaces/capability/schema.py

@@ -181,22 +181,26 @@ class QaPass(Action):
     @staticmethod
     def check_still_running(version: CapabilityVersion) -> bool:
         workflow_service_url = CapoConfig().settings(WORKFLOW_SETTINGS_KEY).serviceUrl
-        response = requests.get(
-            f"{workflow_service_url}/workflows/{version.capability.name}/requests/"
-            f"{version.current_execution.current_workflow_request_id}/htcondor_id"
-        )
-        if json.loads(response.content.decode())["htcondor_job_id"] == "None":
+        if version.current_execution.current_workflow_request_id:
+            response = requests.get(
+                f"{workflow_service_url}/workflows/{version.capability.name}/requests/"
+                f"{version.current_execution.current_workflow_request_id}/htcondor_id"
+            )
+            if json.loads(response.content.decode())["htcondor_job_id"] == "None":
+                return False
+            return True
+        else:
             return False
-        return True
 
     @staticmethod
     def _run_qa_fail_workflow(version: CapabilityVersion):
         workflow_service_url = CapoConfig().settings(WORKFLOW_SETTINGS_KEY).serviceUrl
         logger.info(f"QA Failing version: {version.__json__()}")
-        requests.post(
-            f"{workflow_service_url}/workflows/{version.capability.name}/requests/"
-            f"{version.current_execution.current_workflow_request_id}/qa_fail"
-        )
+        if version.current_execution.current_workflow_request_id:
+            requests.post(
+                f"{workflow_service_url}/workflows/{version.capability.name}/requests/"
+                f"{version.current_execution.current_workflow_request_id}/qa_fail"
+            )
 
     @staticmethod
     def _abort_running_execution(version: CapabilityVersion):