Add reporting of multiple errors

tests/test_events.py

@@ -53,6 +53,12 @@ async def test_events_limit_out_of_range_negative():
         _ = await get_events(None, "", None, limit=-1)
 
 
+async def test_events_multiple_errors():
+    msg = "target_values are required when target_type is provided, skip must be a positive integer"
+    with pytest.raises(ValueError, match=msg):
+        _ = await get_events(None, "", None, target_type=TargetType.SERVICE_AREA, skip=-1)
+
+
 # ------------------------------------------------------------
 # Tests that need the event session and a token
 # ------------------------------------------------------------

tests/test_reports.py

@@ -33,6 +33,12 @@ async def test_reports_limit_out_of_range_negative():
         _ = await get_reports(None, "", None, limit=-1)
 
 
+async def test_reports_multiple_errors():
+    msg = "skip must be a positive integer, limit must be an integer"
+    with pytest.raises(ValueError, match=msg):
+        _ = await get_reports(None, "", None, skip=-1, limit="9")
+
+
 # ------------------------------------------------------------
 # Tests that need the report session and a token.
 # Mostly the tests checks that the query parameters are

toadr3/events.py

@@ -192,23 +192,27 @@ def _check_arguments(
     ValueError
         If the query parameters are invalid.
     """
+    errors = []
     if target_type is not None and target_values is None:
-        raise ValueError("target_values are required when target_type is provided")
+        errors.append("target_values are required when target_type is provided")
 
     if target_values is not None and target_type is None:
-        raise ValueError("target_type is required when target_values are provided")
+        errors.append("target_type is required when target_values are provided")
 
     if target_values is not None and not isinstance(target_values, list):
-        raise ValueError("target_values must be a list of strings")
+        errors.append("target_values must be a list of strings")
 
     if skip is not None and not isinstance(skip, int):
-        raise ValueError("skip must be an integer")
+        errors.append("skip must be an integer")
 
-    if skip is not None and skip < 0:
-        raise ValueError("skip must be a positive integer")
+    if skip is not None and isinstance(skip, int) and skip < 0:
+        errors.append("skip must be a positive integer")
 
     if limit is not None and not isinstance(limit, int):
-        raise ValueError("limit must be an integer")
+        errors.append("limit must be an integer")
 
-    if limit is not None and not limit >= 0:
-        raise ValueError("limit must be a positive integer")
+    if limit is not None and isinstance(limit, int) and limit < 0:
+        errors.append("limit must be a positive integer")
+
+    if errors:
+        raise ValueError(", ".join(errors))

toadr3/reports.py

@@ -139,14 +139,18 @@ def _check_arguments(skip: int | None, limit: int | None):
     ValueError
         If the query parameters are invalid.
     """
+    errors = []
     if skip is not None and not isinstance(skip, int):
-        raise ValueError("skip must be an integer")
+        errors.append("skip must be an integer")
 
-    if skip is not None and skip < 0:
-        raise ValueError("skip must be a positive integer")
+    if skip is not None and isinstance(skip, int) and skip < 0:
+        errors.append("skip must be a positive integer")
 
     if limit is not None and not isinstance(limit, int):
-        raise ValueError("limit must be an integer")
+        errors.append("limit must be an integer")
 
-    if limit is not None and not limit >= 0:
-        raise ValueError("limit must be a positive integer")
+    if limit is not None and isinstance(limit, int) and limit < 0:
+        errors.append("limit must be a positive integer")
+
+    if errors:
+        raise ValueError(", ".join(errors))