WS-1114: Annihilator Fixes

apps/cli/executables/pexable/ws_annihilator/ws_annihilator/annihilator.py

@@ -7,13 +7,12 @@ import logging
 import os
 import pathlib
 import shutil
-from enum import Enum
-
-import requests
+import sys
 from argparse import ArgumentParser
+from enum import Enum
 from typing import Dict, List
 
-import sys
+import requests
 from pycapo import CapoConfig
 
 logger = logging.getLogger(__name__)
@@ -166,8 +165,8 @@ class Annihilator:
         # catch empty string response
         if dir_list:
             for stale in dir_list.split(","):
-                # catch empty string directory or whitespace only directory
-                if stale and not stale.isspace():
+                # catch empty string directory or whitespace only directory or VLASS directory (VLASS will handle VLASS)
+                if stale and not stale.isspace() and not stale.startswith("VLASS"):
                     name_list.append(pathlib.Path(str(stale)).stem)
 
         return name_list

services/workflow/workflow/server.py

@@ -553,11 +553,17 @@ class WorkflowRequestRestService:
         directory = self.request.json_body["directory"]
         update_to = eval(self.request.json_body["update_to"])
         req = self.request.info.lookup_workflow_request_by_directory(directory)
-        self.request.info.update_request_cleaned(req, update_to)
-        return Response(
-            status_code=http.HTTPStatus.OK,
-            body=f"SUCCESS: Updated workflow request #{req.workflow_request_id} to {update_to}",
-        )
+        if req:
+            self.request.info.update_request_cleaned(req, update_to)
+            return Response(
+                status_code=http.HTTPStatus.OK,
+                body=f"SUCCESS: Updated workflow request #{req.workflow_request_id} to {update_to}",
+            )
+        else:
+            return Response(
+                status_code=http.HTTPStatus.OK,
+                body=f"SKIPPED: Directory {directory} does not belong to the current system.",
+            )
 
 
 @view_defaults(route_name="workflow_request_files", renderer="json")