Handle invalid UUID on queries

src/MCPClient/lib/clientScripts/archivematicaCreateMETSMetadataXML.py

@@ -26,6 +26,7 @@
 import namespaces as ns
 import requests
 from databaseFunctions import insertIntoEvents
+from django.core.exceptions import ValidationError
 from importlib_metadata import version
 from lxml import etree
 from main import models
@@ -62,7 +63,7 @@
                         sip_id=sip_uuid,
                         currentlocation=f"%SIPDirectory%{xml_rel_path}".encode(),
                     )
-                except models.File.DoesNotExist:
+                except (models.File.DoesNotExist, ValidationError):
                     xml_metadata_errors.append(f"No uuid for file: {xml_rel_path}")
                     continue
                 valid, errors = _validate_xml(tree, schema_uri)

src/MCPClient/lib/clientScripts/archivematicaCreateMETSReingest.py

@@ -7,6 +7,7 @@
 import create_mets_v2 as createmets2
 import metsrw
 import namespaces as ns
+from django.core.exceptions import ValidationError
 from lxml import etree
 from main import models
 
@@ -562,12 +563,12 @@ def update_metadata_csv(job, mets, metadata_csv, sip_uuid, sip_dir, state):
             file_obj = models.File.objects.get(
                 sip_id=str(sip_uuid), originallocation__endswith="%" + f
             )
-        except models.File.DoesNotExist:
+        except (models.File.DoesNotExist, ValidationError):
             try:
                 file_obj = models.File.objects.get(
                     sip_id=sip_uuid, currentlocation__endswith="%" + f
                 )
-            except models.File.DoesNotExist:
+            except (models.File.DoesNotExist, ValidationError):
                 pass
         if file_obj is not None:
             fsentry = mets.get_file(file_uuid=str(file_obj.uuid))

src/MCPClient/lib/clientScripts/archivematicaCreateMETSRightsDspaceMDRef.py

@@ -24,6 +24,7 @@
 
 import lxml.etree as etree
 import namespaces as ns
+from django.core.exceptions import ValidationError
 from main.models import File
 
 # dashboard
@@ -64,7 +65,7 @@
             mets = File.objects.get(
                 currentlocation=path.encode(), transfer_id=transferUUID
             )
-        except File.DoesNotExist:
+        except (File.DoesNotExist, ValidationError):
             pass
         else:
             metsFileUUID = mets.uuid
@@ -91,7 +92,7 @@
                 f = File.objects.get(
                     currentlocation=path.encode(), transfer_id=transferUUID
                 )
-            except File.DoesNotExist:
+            except (File.DoesNotExist, ValidationError):
                 pass
             else:
                 metsFileUUID = f.uuid

src/MCPClient/lib/clientScripts/archivematicaCreateMETSTrim.py

@@ -26,6 +26,7 @@
 
 import lxml.etree as etree
 import namespaces as ns
+from django.core.exceptions import ValidationError
 from main.models import File
 
 # dashboard
@@ -124,7 +125,7 @@
             filegrpuuid=fileUUID,
             filegrpuse="TRIM file metadata",
         )
-    except File.DoesNotExist:
+    except (File.DoesNotExist, ValidationError):
         job.pyprint("no metadata for original file: ", fileUUID, file=sys.stderr)
         return None
     else:
@@ -163,7 +164,7 @@
             filegrpuuid=fileUUID,
             filegrpuse="TRIM file metadata",
         )
-    except File.DoesNotExist:
+    except (File.DoesNotExist, ValidationError):
         job.pyprint("no metadata for original file: ", fileUUID, file=sys.stderr)
         return None
     else:

src/MCPClient/lib/clientScripts/archivematica_clamscan.py

@@ -39,6 +39,7 @@
 from custom_handlers import get_script_logger
 from databaseFunctions import insertIntoEvents
 from main.models import Event, File
+from django.core.exceptions import ValidationError
 
 logger = get_script_logger("archivematica.mcp.client.clamscan")
 
@@ -291,7 +292,7 @@
     if file_uuid != "None":
         try:
             return File.objects.get(uuid=file_uuid).size
-        except File.DoesNotExist:
+        except (File.DoesNotExist, ValidationError):
             pass
     # Our fallback.
     try:

src/MCPClient/lib/clientScripts/assign_uuids_to_directories.py

@@ -41,6 +41,7 @@
 from archivematicaFunctions import get_dir_uuids, format_subdir_path, str2bool
 
 from django.db import transaction
+from django.core.exceptions import ValidationError
 
 logger = get_script_logger("archivematica.mcp.client.assignUUIDsToDirectories")
 
@@ -92,7 +93,7 @@
         transfer_mdl.diruuids = True
         transfer_mdl.save()
         return transfer_mdl
-    except Transfer.DoesNotExist:
+    except (Transfer.DoesNotExist, ValidationError):
         logger.warning("There is no transfer with UUID %s", transfer_uuid)
         raise DirsUUIDsException
 

src/MCPClient/lib/clientScripts/bind_pids.py

@@ -48,6 +48,7 @@
 django.setup()
 from django.db import transaction
 from lxml import etree
+from django.core.exceptions import ValidationError
 
 # dashboard
 from main.models import DashboardSetting, Directory, SIP
@@ -102,7 +103,7 @@
 def _get_sip(sip_uuid):
     try:
         return SIP.objects.get(uuid=sip_uuid)
-    except SIP.DoesNotExist:
+    except (SIP.DoesNotExist, ValidationError):
         raise BindPIDsException
 
 

src/MCPClient/lib/clientScripts/characterize_file.py

@@ -25,6 +25,7 @@
 from dicts import replace_string_values, ReplacementDict
 
 from lib import setup_dicts
+from django.core.exceptions import ValidationError
 
 
 def concurrent_instances():
@@ -43,7 +44,7 @@ def main(job, file_path, file_uuid, sip_uuid):
 
     try:
         format = FormatVersion.active.get(fileformatversion__file_uuid=file_uuid)
-    except FormatVersion.DoesNotExist:
+    except (FormatVersion.DoesNotExist, ValidationError):
         rules = format = None
 
     if format:

src/MCPClient/lib/clientScripts/create_mets_v2.py

@@ -75,7 +75,7 @@
 from change_names import change_name
 
 from bagit import Bag, BagError
-
+from django.core.exceptions import ValidationError
 
 SIP_DIR_VAR = r"%SIPDirectory%"
 
@@ -1070,7 +1070,7 @@
             }
             try:
                 f = File.objects.get(**kwargs)
-            except File.DoesNotExist:
+            except (File.DoesNotExist, ValidationError):
                 job.pyprint(
                     'No uuid for file: "', directoryPathSTR, '"', file=sys.stderr
                 )
@@ -1203,7 +1203,7 @@
                 # Derived files should be in the original file's group
                 try:
                     d = Derivation.objects.get(derived_file_id=f.uuid)
-                except Derivation.DoesNotExist:
+                except (Derivation.DoesNotExist, ValidationError):
                     job.pyprint(
                         "Fatal error: unable to locate a Derivation object"
                         " where the derived file is {}".format(f.uuid)

src/MCPClient/lib/clientScripts/create_sip_from_transfer_objects.py

@@ -33,6 +33,7 @@
 
 # archivematicaCommon
 import archivematicaFunctions
+from django.core.exceptions import ValidationError
 
 
 def call(jobs):
@@ -117,7 +118,7 @@ def call(jobs):
                         unituuid=transferUUID,
                         variable="activeAgent",
                     )
-                except UnitVariable.DoesNotExist:
+                except (UnitVariable.DoesNotExist, ValidationError):
                     unit_variable = None
                 if unit_variable:
                     try:

src/MCPClient/lib/clientScripts/create_transfer_mets.py

@@ -24,6 +24,7 @@
 import uuid
 
 import django
+from django.core.exceptions import ValidationError
 from django.db.models import Prefetch
 from lxml import etree
 
@@ -85,7 +86,7 @@
 
     try:
         transfer = Transfer.objects.get(uuid=transfer_uuid)
-    except Transfer.DoesNotExist:
+    except (Transfer.DoesNotExist, ValidationError):
         logger.info("No record in database for transfer: %s", transfer_uuid)
         raise
 

src/MCPClient/lib/clientScripts/dip_generation_helper.py

@@ -6,14 +6,10 @@
 import django
 from agentarchives import archivesspace
 from custom_handlers import get_script_logger
+from django.core.exceptions import ValidationError
 from django.db.models import Q
 from main import models
 
-# dashboard
-# archivematicaCommon
-# Third party dependencies, alphabetical by import source
-# initialize Django (required for Django 1.7)
-
 django.setup()
 from django.db import transaction
 
@@ -105,7 +101,7 @@ def parse_archivesspace_ids(sip_path, sip_uuid):
                 | Q(originallocation=b"%SIPDirectory%objects/" + filename.encode()),
                 sip_id=sip_uuid,
             )
-        except models.File.DoesNotExist:
+        except (models.File.DoesNotExist, ValidationError):
             logger.error("%s not found in database, skipping", filename)
             continue
         except models.File.MultipleObjectsReturned:

src/MCPClient/lib/clientScripts/extract_maildir_attachments.py

@@ -29,6 +29,7 @@
 
 django.setup()
 from django.db import transaction
+from django.core.exceptions import ValidationError
 
 # dashboard
 from main.models import File
@@ -84,7 +85,7 @@ def getFileUUIDofSourceFile(transferUUID, sourceFilePath):
             transfer_id=transferUUID,
             currentlocation__startswith=sourceFilePath,
         ).uuid
-    except File.DoesNotExist:
+    except (File.DoesNotExist, ValidationError):
         return ""
 
 

src/MCPClient/lib/clientScripts/index_aip.py

@@ -9,6 +9,7 @@
 import identifier_functions
 import storageService as storage_service
 from custom_handlers import get_script_logger
+from django.core.exceptions import ValidationError
 from main.models import UnitVariable
 
 # dashboard
@@ -70,7 +71,7 @@ def index_aip(job):
                 unittype="SIP", unituuid=sip_uuid, variable="AIPsinAIC"
             )
             aips_in_aic = uv.variablevalue
-        except UnitVariable.DoesNotExist:
+        except (UnitVariable.DoesNotExist, ValidationError):
             pass
     # Delete ES index before creating new one if reingesting
     if "REIN" in sip_type:

src/MCPClient/lib/clientScripts/manual_normalization_create_metadata_and_restructure.py

@@ -25,6 +25,7 @@
 # archivematicaCommon
 import databaseFunctions
 import fileOperations
+from django.core.exceptions import ValidationError
 
 
 def main(job):
@@ -61,7 +62,7 @@ def main(job):
             filegrpuse="original",
             sip_id=SIPUUID,
         )
-    except (File.DoesNotExist, File.MultipleObjectsReturned) as e:
+    except (File.DoesNotExist, File.MultipleObjectsReturned, ValidationError) as e:
         # Original file was not found, or there is more than one original file with
         # the same filename (differing extensions)
         # Look for a CSV that will specify the mapping
@@ -84,7 +85,7 @@ def main(job):
                 printfn=job.pyprint,
             )
             if original is None:
-                if isinstance(e, File.DoesNotExist):
+                if isinstance(e, File.DoesNotExist, ValidationError):
                     job.print_error(
                         "No matching file for: {}".format(
                             filePath.replace(SIPDirectory, "%SIPDirectory%")
@@ -106,7 +107,7 @@ def main(job):
                 sip_id=SIPUUID,
             )
         else:
-            if isinstance(e, File.DoesNotExist):
+            if isinstance(e, File.DoesNotExist, ValidationError):
                 job.print_error(
                     "No matching file for: ",
                     filePath.replace(SIPDirectory, "%SIPDirectory%", 1),
@@ -158,7 +159,7 @@ def main(job):
             "Updated the eventOutcomeDetailNote of an existing normalization"
             " Event for file {}. Not creating a Derivation object".format(fileUUID)
         )
-    except Event.DoesNotExist:
+    except (Event.DoesNotExist, ValidationError):
         # No normalization event was created in normalize.py - probably manually
         # normalized during Ingest
         derivationEventUUID = str(uuid.uuid4())

src/MCPClient/lib/clientScripts/manual_normalization_move_access_files_to_dip.py

@@ -32,6 +32,7 @@
 
 # --sipUUID "%SIPUUID%" --sipDirectory "%SIPDirectory%" --filePath "%relativeLocation%"
 from optparse import OptionParser
+from django.core.exceptions import ValidationError
 
 
 def main(job):
@@ -69,9 +70,9 @@ def main(job):
         }
         try:
             f = File.objects.get(currentlocation__startswith=filePathLike, **kwargs)
-        except (File.DoesNotExist, File.MultipleObjectsReturned):
+        except (File.DoesNotExist, File.MultipleObjectsReturned, ValidationError):
             f = File.objects.get(currentlocation=filePathLike2.encode(), **kwargs)
-    except (File.DoesNotExist, File.MultipleObjectsReturned) as e:
+    except (File.DoesNotExist, File.MultipleObjectsReturned, ValidationError) as e:
         # Original file was not found, or there is more than one original file with
         # the same filename (differing extensions)
         # Look for a CSV that will specify the mapping
@@ -90,7 +91,7 @@ def main(job):
                 csv_path, "access", access_file, unitIdentifier, printfn=job.pyprint
             )
             if original is None:
-                if isinstance(e, File.DoesNotExist):
+                if isinstance(e, File.DoesNotExist, ValidationError):
                     job.print_error(
                         "No matching file for: {}".format(
                             opts.filePath.replace(opts.sipDirectory, "%SIPDirectory%")
@@ -113,7 +114,7 @@ def main(job):
             }
             f = File.objects.get(**kwargs)
         else:
-            if isinstance(e, File.DoesNotExist):
+            if isinstance(e, File.DoesNotExist, ValidationError):
                 job.print_error(
                     "No matching file for: ",
                     opts.filePath.replace(opts.SIPDirectory, "%SIPDirectory%", 1),

src/MCPClient/lib/clientScripts/move_to_backlog.py

@@ -29,7 +29,7 @@
 
 from bagit import make_bag
 import metsrw
-
+from django.core.exceptions import ValidationError
 
 logger = get_script_logger("archivematica.mcp.client.move_to_backlog")
 
@@ -134,7 +134,7 @@
         var = UnitVariable.objects.get(
             unittype="Transfer", unituuid=transfer_id, variable="activeAgent"
         )
-    except UnitVariable.DoesNotExist:
+    except (UnitVariable.DoesNotExist, ValidationError):
         pass
     else:
         query |= Q(id=var.variablevalue)