sapiopycommons 2025.10.16a785__py3-none-any.whl → 2025.10.20a789__py3-none-any.whl

sapiopycommons/ai/request_validation.py

@@ -34,20 +34,19 @@ class BinaryValidation(InputValidation):
     """
     A class representing a validation requirement for a binary input.
     """
-    func: Callable[[int, bytes], list[str]] | None
+    func: Callable[[bytes], list[str]] | None
 
     def __init__(self, index: int, max_entries: int | None = None,
                  allow_empty_input: bool = False, allow_empty_entries: bool = False,
-                 func: Callable[[int, bytes], list[str]] | None = None):
+                 func: Callable[[bytes], list[str]] | None = None):
         """
         :param index: The index of the input to validate.
         :param max_entries: The maximum number of entries allowed for this input. If None, then there is no limit.
         :param allow_empty_input: If true, then the input can be completely empty.
         :param allow_empty_entries: If true, then individual entries in the input can be empty
-        :param func: An optional function to run on each entry in the input. The function should take the index of
-            the input and the entry as arguments, and return a list of error messages if the entry is not valid. If the
-            entry is valid, the function should return an empty list. This function will not be called if the input or
-            entry are empty.
+        :param func: An optional function to run on each entry in the input. The function should take the entry as an
+            argument, and return a list of error messages if the entry is not valid. If the entry is valid, the function
+            should return an empty list. This function will not be called if the input or entry are empty.
         """
         super().__init__(index, max_entries, allow_empty_input, allow_empty_entries)
         self.func = func
@@ -59,12 +58,12 @@ class CsvValidation(InputValidation):
     """
     required_headers: list[str] | None = None
 
-    func: Callable[[int, dict[str, Any]], list[str]] | None
+    func: Callable[[dict[str, Any]], list[str]] | None
 
     def __init__(self, index: int, max_entries: int | None = None,
                  allow_empty_input: bool = False, allow_empty_entries: bool = False,
                  required_headers: list[str] | None = None,
-                 func: Callable[[int, dict[str, Any]], list[str]] | None = None):
+                 func: Callable[[dict[str, Any]], list[str]] | None = None):
         """
         :param index: The index of the input to validate.
         :param max_entries: The maximum number of entries allowed for this input. If None, then there is no limit.
@@ -72,10 +71,9 @@ class CsvValidation(InputValidation):
         :param allow_empty_entries: If true, then individual entries in the input can be empty.
         :param required_headers: A list of headers that must be present in the CSV input. If None, then no header
             validation will be performed.
-        :param func: An optional function to run on each entry in the input. The function should take the index of
-            the input and the entry as arguments, and return a list of error messages if the entry is not valid. If the
-            entry is valid, the function should return an empty list. This function will not be called if the input or
-            entry are empty.
+        :param func: An optional function to run on each entry in the input. The function should take the entry as an
+            argument, and return a list of error messages if the entry is not valid. If the entry is valid, the function
+            should return an empty list. This function will not be called if the input or entry are empty.
         """
         super().__init__(index, max_entries, allow_empty_input, allow_empty_entries)
         self.required_headers = required_headers
@@ -88,12 +86,12 @@ class JsonValidation(InputValidation):
     """
     json_requirements: dict[str, JsonKeyValidation]
 
-    func: Callable[[int, dict[str, Any]], list[str]] | None
+    func: Callable[[dict[str, Any]], list[str]] | None
 
     def __init__(self, index: int, max_entries: int | None = None,
                  allow_empty_input: bool = False, allow_empty_entries: bool = False,
                  json_requirements: list[JsonKeyValidation] | None = None,
-                 func: Callable[[int, dict[str, Any]], list[str]] | None = None):
+                 func: Callable[[dict[str, Any]], list[str]] | None = None):
         """
         :param index: The index of the input to validate.
         :param max_entries: The maximum number of entries allowed for this input. If None, then there is no limit.
@@ -102,10 +100,9 @@ class JsonValidation(InputValidation):
         :param json_requirements: A list of JSON requirements to validate for JSON inputs. Each requirement
             specifies a key to validate, the expected type of the value for that key, and any nested requirements
             for that key. Only applicable to JSON inputs.
-        :param func: An optional function to run on each entry in the input. The function should take the index of
-            the input and the entry as arguments, and return a list of error messages if the entry is not valid. If the
-            entry is valid, the function should return an empty list. This function will not be called if the input or
-            entry are empty.
+        :param func: An optional function to run on each entry in the input. The function should take the entry as an
+            argument, and return a list of error messages if the entry is not valid. If the entry is valid, the function
+            should return an empty list. This function will not be called if the input or entry are empty.
         """
         super().__init__(index, max_entries, allow_empty_input, allow_empty_entries)
         self.json_requirements = {}
@@ -185,12 +182,12 @@ class TextValidation(InputValidation):
     disallowed_characters: str | None = None
     regex: str | None = None
 
-    func: Callable[[int, str], list[str]] | None = None
+    func: Callable[[str], list[str]] | None = None
 
     def __init__(self, index: int, max_entries: int | None = None,
                  allow_empty_input: bool = False, allow_empty_entries: bool = False, flatten: bool = False,
                  disallow_characters: str | None = None, regex: str | None = None,
-                 func: Callable[[int, str], list[str]] | None = None):
+                 func: Callable[[str], list[str]] | None = None):
         """
         :param index: The index of the input to validate.
         :param max_entries: The maximum number of entries allowed for this input. If None, then there is no limit.
@@ -202,11 +199,10 @@ class TextValidation(InputValidation):
             empty.
         :param regex: An optional regular expression that each entry in the input must fully match. If None, then no
             regex validation will be performed. This parameter will not be used if the input or entry are empty.
-        :param func: An optional function to run on each entry in the input. The function should take the index of
-            the input and the entry as arguments, and return a list of error messages if the entry is not valid. If the
-            entry is valid, the function should return an empty list. The function will only be called if the entry
-            passes those previous checks (e.g. not empty, doesn't include disallowed characters,
-            passes the regex, etc.).
+        :param func: An optional function to run on each entry in the input. The function should take the entry as an
+            arguments, and return a list of error messages if the entry is not valid. If the entry is valid, the
+            function should return an empty list. The function will only be called if the entry passes those previous
+            checks (e.g. not empty, doesn't include disallowed characters, passes the regex, etc.).
         """
         super().__init__(index, max_entries, allow_empty_input, allow_empty_entries)
         self.flatten = flatten
@@ -302,7 +298,10 @@ class InputValidator:
                     if not r.allow_empty_entries:
                         errors.append(f"Entry {i} of input {index} is empty or contains only whitespace.")
                 elif r.func:
-                    errors.extend(r.func(i, entry))
+                    func_errors: list[str] = r.func(entry)
+                    if func_errors:
+                        for error in func_errors:
+                            errors.append(f"Error in entry {i} of input {index}: {error}")
         return errors
 
     def validate_input_csv(self, index: int, r: CsvValidation) -> list[str]:
@@ -335,7 +334,10 @@ class InputValidator:
                     if not r.allow_empty_entries:
                         errors.append(f"Entry {i} of input {index} is empty or contains only whitespace.")
                 elif r.func:
-                    errors.extend(r.func(i, entry))
+                    func_errors: list[str] = r.func(entry)
+                    if func_errors:
+                        for error in func_errors:
+                            errors.append(f"Error in entry {i} of input {index}: {error}")
         return errors
 
     def validate_input_json(self, index: int, r: JsonValidation) -> list[str]:
@@ -360,7 +362,10 @@ class InputValidator:
                     if not r.allow_empty_entries:
                         errors.append(f"Entry {i} of input {index} is empty.")
                 elif r.func:
-                    errors.extend(r.func(i, entry))
+                    func_errors: list[str] = r.func(entry)
+                    if func_errors:
+                        for error in func_errors:
+                            errors.append(f"Error in entry {i} of input {index}: {error}")
 
         for key, rk in r.json_requirements.items():
             for i, entry in enumerate(input_json):
@@ -462,7 +467,10 @@ class InputValidator:
                         errors.append(f"Entry {i} of input {index} does not fully match the expected regex format "
                                       f"{r.regex}.")
                 elif r.func:
-                    errors.extend(r.func(i, entry))
+                    func_errors: list[str] = r.func(entry)
+                    if func_errors:
+                        for error in func_errors:
+                            errors.append(f"Error in entry {i} of input {index}: {error}")
         if errors and r.flatten:
             errors.append(f"Note that input flattening is enabled for input {index}, which may increase the number "
                           f"of entries reported in the above errors. Flattening splits each entry on newlines, removes "

{sapiopycommons-2025.10.16a785.dist-info → sapiopycommons-2025.10.20a789.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sapiopycommons
-Version: 2025.10.16a785
+Version: 2025.10.20a789
 Summary: Official Sapio Python API Utilities Package
 Project-URL: Homepage, https://github.com/sapiosciences
 Author-email: Jonathan Steck <jsteck@sapiosciences.com>, Yechen Qiao <yqiao@sapiosciences.com>

{sapiopycommons-2025.10.16a785.dist-info → sapiopycommons-2025.10.20a789.dist-info}/RECORD

@@ -4,7 +4,7 @@ sapiopycommons/ai/agent_service_base.py,sha256=eTJunFQoxLc0risWiQIkQK946XpHzSFO3
 sapiopycommons/ai/converter_service_base.py,sha256=HiUXmwqv1STgyQeF9_eTFXzjIFXp5-NJ7sEhMpV3aAU,6351
 sapiopycommons/ai/external_credentials.py,sha256=ki_xIH4J843b_sSwEa8YHr8vW9erVv-jowZJXSgPQs8,4347
 sapiopycommons/ai/protobuf_utils.py,sha256=cBjbxoFAwU02kNUxEce95WnMU2CMuDD-qFaeWgvQJMQ,24599
-sapiopycommons/ai/request_validation.py,sha256=TD2EUi_G5cy1OOVK1AmY2SQc3PEoAKGWs2pT8Qnp2Oo,25092
+sapiopycommons/ai/request_validation.py,sha256=dsCZXWDSHLm7pGywArB_GRymXxo1l-eGMn6veUwSg20,25641
 sapiopycommons/ai/server.py,sha256=gutSskn_Fenq1uz0DDMvjx4QVFiKt2WVEP3-01a69eU,6384
 sapiopycommons/ai/test_client.py,sha256=IRZ-8prhg7XMDmN9aC1MQr5mSkMgfT37aLsOy-VB-MU,20495
 sapiopycommons/ai/protoapi/externalcredentials/external_credentials_pb2.py,sha256=mEonoj6Iq-AyvO4m3YsPYu85aZfD1E0a0cL8B9yPfEo,2481
@@ -106,7 +106,7 @@ sapiopycommons/webhook/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 sapiopycommons/webhook/webhook_context.py,sha256=D793uLsb1691SalaPnBUk3rOSxn_hYLhdvkaIxjNXss,1909
 sapiopycommons/webhook/webhook_handlers.py,sha256=7o_wXOruhT9auNh8OfhJAh4WhhiPKij67FMBSpGPICc,39939
 sapiopycommons/webhook/webservice_handlers.py,sha256=cvW6Mk_110BzYqkbk63Kg7jWrltBCDALOlkJRu8h4VQ,14300
-sapiopycommons-2025.10.16a785.dist-info/METADATA,sha256=2yQ4MjvJOysrdpojvELXBXHk9Pk_hDU7D1cl3k6zHKQ,3143
-sapiopycommons-2025.10.16a785.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-sapiopycommons-2025.10.16a785.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-sapiopycommons-2025.10.16a785.dist-info/RECORD,,
+sapiopycommons-2025.10.20a789.dist-info/METADATA,sha256=LW1ECHFl-cG6BPslNdeFfIGKFHCxPgtivYUg9mqsnSQ,3143
+sapiopycommons-2025.10.20a789.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+sapiopycommons-2025.10.20a789.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+sapiopycommons-2025.10.20a789.dist-info/RECORD,,