feat: removal of repeated code in input validation

Refs: 251
gchq · Dec 5, 2023 · ba21a32 · ba21a32
1 parent 0c1e914
commit ba21a32
Showing 1 changed file with 6 additions and 13 deletions.
diff --git a/coreax/validation.py b/coreax/validation.py
@@ -101,21 +101,14 @@ def cast_as_type(x: Any, object_name: str, type_caster: Callable) -> Any:
     """
     try:
         return type_caster(x)
-    except TypeError as e:
-        error_text = (
-            f"{object_name} cannot be cast using {type_caster}. " f"Given value {x}.\n"
-        )
+    except (TypeError, ValueError) as e:
+        error_text = f"{object_name} cannot be cast using {type_caster}. \n"
         if hasattr(e, "message"):
             error_text += e.message
         else:
             error_text += str(e)
-        raise TypeError(error_text)
-    except ValueError as e:
-        error_text = (
-            f"{object_name} cannot be cast using {type_caster}. " f"Given value {x}.\n"
-        )
-        if hasattr(e, "message"):
-            error_text += e.message
+
+        if isinstance(e, TypeError):
+            raise TypeError(error_text)
         else:
-            error_text += str(e)
-        raise ValueError(error_text)
+            raise ValueError(error_text)