Updates custom error messages

Author: DrPaulSharp

RATapi/controls.py

@@ -155,7 +155,7 @@ def warn_setting_incorrect_properties(self, handler: ValidatorFunctionWrapHandle
                 f" controls procedure are:\n    "
                 f"{', '.join(fields.get('procedure', []))}\n",
             }
-            custom_error_list = custom_pydantic_validation_error(exc.errors(), custom_error_msgs)
+            custom_error_list = custom_pydantic_validation_error(exc.errors(include_url=False), custom_error_msgs)
             raise ValidationError.from_exception_data(exc.title, custom_error_list, hide_input=True) from None
 
         if isinstance(model_input, validated_self.__class__):

RATapi/project.py

@@ -649,13 +649,15 @@ def check_allowed_values(self, attribute: str, field_list: list[str], allowed_va
 
         """
         class_list = getattr(self, attribute)
-        for model in class_list:
+        for index, model in enumerate(class_list):
             for field in field_list:
                 value = getattr(model, field, "")
                 if value and value not in allowed_values:
                     raise ValueError(
-                        f'The value "{value}" in the "{field}" field of "{attribute}" must be defined in '
-                        f'"{values_defined_in[f"{attribute}.{field}"]}".',
+                        f'The value "{value}" used in the "{field}" field at index {index} of "{attribute}" '
+                        f'must be defined in "{values_defined_in[f"{attribute}.{field}"]}". Please either add '
+                        f'"{value}" to "{values_defined_in[f"{attribute}.{field}"]}" before including it in'
+                        f' "{attribute}", or remove it from "{attribute}.{field}" before attempting to delete it.',
                     )
 
     def check_allowed_source(self, attribute: str) -> None:
@@ -945,7 +947,7 @@ def wrapped_func(*args, **kwargs):
                 Project.model_validate(self)
             except ValidationError as exc:
                 class_list.data = previous_state
-                custom_error_list = custom_pydantic_validation_error(exc.errors())
+                custom_error_list = custom_pydantic_validation_error(exc.errors(include_url=False))
                 raise ValidationError.from_exception_data(exc.title, custom_error_list, hide_input=True) from None
             except (TypeError, ValueError):
                 class_list.data = previous_state

RATapi/utils/custom_errors.py

@@ -35,7 +35,7 @@ def custom_pydantic_validation_error(
         if error["type"] in custom_error_msgs:
             custom_error = pydantic_core.PydanticCustomError(error["type"], custom_error_msgs[error["type"]])
         else:
-            custom_error = pydantic_core.PydanticCustomError(error["type"], error["msg"])
+            custom_error = pydantic_core.PydanticCustomError(error["type"], error["msg"].replace(",", ":", 1))
         error["type"] = custom_error
         custom_error_list.append(error)