First pass at types update

The rest is just string_format, which does not appear to be flexed by
conformance.

Author: stefanvanburen

protovalidate/internal/constraints.py

@@ -36,14 +36,14 @@ def make_duration(msg: message.Message) -> celtypes.DurationType:
 
 
 def make_timestamp(msg: message.Message) -> celtypes.TimestampType:
-    return make_duration(msg) + celtypes.TimestampType(1970, 1, 1)
+    return celtypes.TimestampType(1970, 1, 1) + make_duration(msg)
 
 
 def unwrap(msg: message.Message) -> celtypes.Value:
     return _field_to_cel(msg, msg.DESCRIPTOR.fields_by_name["value"])
 
 
-_MSG_TYPE_URL_TO_CTOR = {
+_MSG_TYPE_URL_TO_CTOR: dict[str, typing.Callable[..., celtypes.Value]] = {
     "google.protobuf.Duration": make_duration,
     "google.protobuf.Timestamp": make_timestamp,
     "google.protobuf.StringValue": unwrap,
@@ -89,7 +89,7 @@ def _msg_to_cel(msg: message.Message) -> celtypes.Value:
     return MessageType(msg)
 
 
-_TYPE_TO_CTOR = {
+_TYPE_TO_CTOR: dict[str, typing.Callable[..., celtypes.Value]] = {
     descriptor.FieldDescriptor.TYPE_MESSAGE: _msg_to_cel,
     descriptor.FieldDescriptor.TYPE_GROUP: _msg_to_cel,
     descriptor.FieldDescriptor.TYPE_ENUM: celtypes.IntType,

protovalidate/internal/extra_func.py

@@ -143,11 +143,11 @@ def is_ip_prefix(val: celtypes.Value, *args) -> celpy.Result:
         raise celpy.CELEvalError(msg)
     try:
         if version is None:
-            ip_network(val, strict=strict)
+            ip_network(val, strict=bool(strict))
         elif version == 4:
-            IPv4Network(val, strict=strict)
+            IPv4Network(val, strict=bool(strict))
         elif version == 6:
-            IPv6Network(val, strict=strict)
+            IPv6Network(val, strict=bool(strict))
         else:
             msg = "invalid argument, expected 4 or 6"
             raise celpy.CELEvalError(msg)
@@ -164,7 +164,7 @@ def is_email(string: celtypes.Value) -> celpy.Result:
 
 
 def is_uri(string: celtypes.Value) -> celpy.Result:
-    url = urlparse.urlparse(string)
+    url = urlparse.urlparse(str(string))
     # urlparse correctly reads the scheme from URNs but parses everything
     # after (except the query string) as the path.
     if url.scheme == "urn":
@@ -182,7 +182,7 @@ def is_uri(string: celtypes.Value) -> celpy.Result:
 
 
 def is_uri_ref(string: celtypes.Value) -> celpy.Result:
-    url = urlparse.urlparse(string)
+    url = urlparse.urlparse(str(string))
     if not all([url.scheme, url.path]) and url.fragment:
         return celtypes.BoolType(False)
     return celtypes.BoolType(True)

protovalidate/internal/string_format.py

@@ -42,9 +42,9 @@ def __init__(self, locale: str):
 
     def format(self, fmt: celtypes.Value, args: celtypes.Value) -> celpy.Result:
         if not isinstance(fmt, celtypes.StringType):
-            return celpy.native_to_cel(celpy.new_error("format() requires a string as the first argument"))
+            return celpy.CELEvalError("format() requires a string as the first argument")
         if not isinstance(args, celtypes.ListType):
-            return celpy.native_to_cel(celpy.new_error("format() requires a list as the second argument"))
+            return celpy.CELEvalError("format() requires a list as the second argument")
         # printf style formatting
         i = 0
         j = 0