fix anyof validation for python (#789)

* fix anyof validation for python

* all python tests work

generator/konfig-generator-api/src/main/resources/python/exceptions.handlebars

@@ -90,48 +90,6 @@ class ApiException(OpenApiException):
         return error_message
 
 
-class AnyOfValidationError(OpenApiException):
-    def __init__(self, error_list: typing.List[typing.Union[ApiTypeError, ApiValueError]]):
-        self.error_list = error_list
-        sub_msgs: typing.List[str] = []
-        for type_error in error_list:
-            sub_msgs.append(str(type_error))
-        num_validation_errors = len(self.error_list)
-        if num_validation_errors == 1:
-            super().__init__(sub_msgs[0])
-        else:
-            # create a string that says how many validation errors there were and
-            # prints each sub_msg out using a bulleted list of messages
-            msg = "{} validation error{} detected: \n".format(num_validation_errors, "s" if num_validation_errors > 1 else "")
-            for i, sub_msg in enumerate(sub_msgs):
-                msg += " {}. {}\n".format(i+1, sub_msg)
-            super().__init__(msg)
-
-
-class InvalidHostConfigurationError(ClientConfigurationError):
-    def __init__(self, host: str, reason: str):
-        self.host = host
-        self.reason = reason
-        super().__init__('Invalid host: "{}", {}'.format(self.host, self.reason))
-
-
-class MissingRequiredPropertiesError(ApiTypeError):
-    def __init__(self, msg: str):
-        super().__init__(msg)
-
-
-class MissingRequiredParametersError(ApiTypeError):
-    def __init__(self, error: TypeError):
-        self.error = error
-        error_str = str(error)
-        self.msg = error_str
-        if "__new__()" in error_str:
-            # parse error to reformat
-            missing_parameters = error_str.split(":")[1].strip()
-            number_of_parameters = error_str.split("missing")[1].split("required")[0].strip()
-            self.msg = "Missing {} required parameter{}: {}".format(number_of_parameters, "s" if int(number_of_parameters) > 1 else "", missing_parameters)
-        super().__init__(self.msg)
-
 class SchemaValidationError(OpenApiException):
     def __init__(self, validation_errors: typing.List[typing.Union[ApiValueError, ApiTypeError]]):
         """ Aggregates schema validation errors
@@ -182,3 +140,45 @@ class SchemaValidationError(OpenApiException):
         num_validation_errors = len(self.validation_errors)
         self.msg = "{} invalid argument{}. {}".format(num_validation_errors, "s" if num_validation_errors > 1 else "", sub_msg)
         super().__init__(self.msg)
+
+class AnyOfValidationError(OpenApiException):
+    def __init__(self, error_list: typing.List[typing.Union[ApiTypeError, ApiValueError, SchemaValidationError]]):
+        self.error_list = error_list
+        sub_msgs: typing.List[str] = []
+        for type_error in error_list:
+            sub_msgs.append(str(type_error))
+        num_validation_errors = len(self.error_list)
+        if num_validation_errors == 1:
+            super().__init__(sub_msgs[0])
+        else:
+            # create a string that says how many validation errors there were and
+            # prints each sub_msg out using a bulleted list of messages
+            msg = "{} validation error{} detected: \n".format(num_validation_errors, "s" if num_validation_errors > 1 else "")
+            for i, sub_msg in enumerate(sub_msgs):
+                msg += " {}. {}\n".format(i+1, sub_msg)
+            super().__init__(msg)
+
+
+class InvalidHostConfigurationError(ClientConfigurationError):
+    def __init__(self, host: str, reason: str):
+        self.host = host
+        self.reason = reason
+        super().__init__('Invalid host: "{}", {}'.format(self.host, self.reason))
+
+
+class MissingRequiredPropertiesError(ApiTypeError):
+    def __init__(self, msg: str):
+        super().__init__(msg)
+
+
+class MissingRequiredParametersError(ApiTypeError):
+    def __init__(self, error: TypeError):
+        self.error = error
+        error_str = str(error)
+        self.msg = error_str
+        if "__new__()" in error_str:
+            # parse error to reformat
+            missing_parameters = error_str.split(":")[1].strip()
+            number_of_parameters = error_str.split("missing")[1].split("required")[0].strip()
+            self.msg = "Missing {} required parameter{}: {}".format(number_of_parameters, "s" if int(number_of_parameters) > 1 else "", missing_parameters)
+        super().__init__(self.msg)

generator/konfig-generator-api/src/main/resources/python/schemas.handlebars

@@ -1870,7 +1870,7 @@ class ComposedBase(Discriminable):
                 continue
             try:
                 path_to_schemas = oneof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
-            except (ApiValueError, ApiTypeError) as ex:
+            except (ApiValueError, ApiTypeError, SchemaValidationError) as ex:
                 if discriminated_cls is not None and oneof_cls is discriminated_cls:
                 {{#if nonCompliantUseDiscriminatorIfCompositionFails}}
                     """
@@ -1929,7 +1929,7 @@ class ComposedBase(Discriminable):
 
             try:
                 other_path_to_schemas = anyof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
-            except (ApiValueError, ApiTypeError) as ex:
+            except (ApiValueError, ApiTypeError, SchemaValidationError) as ex:
                 if discriminated_cls is not None and anyof_cls is discriminated_cls:
                     raise ex
                 exceptions.append(ex)

generator/konfig-integration-tests/sdks/leap-workflows/api-fixed.json

@@ -38,8 +38,6 @@
           }
         ],
         "description": "This endpoint lets the user run a specified workflow with the provided workflow definition.",
-        "parameters": [
-        ],
         "requestBody": {
           "required": true,
           "content": {

generator/konfig-integration-tests/sdks/leap-workflows/python-leap-workflows/sdks/python/leap_workflows/api_client.py

@@ -29,6 +29,8 @@
 from urllib.parse import urlparse, quote
 from urllib3.fields import RequestField as RequestFieldBase
 from urllib3.fields import guess_content_type
+from dateutil import parser
+from datetime import datetime as dt
 
 import frozendict
 
@@ -52,6 +54,7 @@
     unset,
 )
 
+
 @dataclass
 class MappedArgs:
     body: typing.Any = None

generator/konfig-integration-tests/sdks/leap-workflows/python-leap-workflows/sdks/python/leap_workflows/configuration.py

@@ -139,6 +139,8 @@ def __init__(self, host=None,
         else:
             raise ClientConfigurationError('API Key "api_key" is required')
         if x_api_key:
+            if type(x_api_key) is not str:
+                raise ClientConfigurationError("x_api_key must be a string")
             self.api_key['api_key'] = x_api_key
         elif api_key is None:
             raise ClientConfigurationError('API Key "api_key" is required')

generator/konfig-integration-tests/sdks/leap-workflows/python-leap-workflows/sdks/python/leap_workflows/exceptions.py

@@ -98,48 +98,6 @@ def __str__(self):
         return error_message
 
 
-class AnyOfValidationError(OpenApiException):
-    def __init__(self, error_list: typing.List[typing.Union[ApiTypeError, ApiValueError]]):
-        self.error_list = error_list
-        sub_msgs: typing.List[str] = []
-        for type_error in error_list:
-            sub_msgs.append(str(type_error))
-        num_validation_errors = len(self.error_list)
-        if num_validation_errors == 1:
-            super().__init__(sub_msgs[0])
-        else:
-            # create a string that says how many validation errors there were and
-            # prints each sub_msg out using a bulleted list of messages
-            msg = "{} validation error{} detected: \n".format(num_validation_errors, "s" if num_validation_errors > 1 else "")
-            for i, sub_msg in enumerate(sub_msgs):
-                msg += " {}. {}\n".format(i+1, sub_msg)
-            super().__init__(msg)
-
-
-class InvalidHostConfigurationError(ClientConfigurationError):
-    def __init__(self, host: str, reason: str):
-        self.host = host
-        self.reason = reason
-        super().__init__('Invalid host: "{}", {}'.format(self.host, self.reason))
-
-
-class MissingRequiredPropertiesError(ApiTypeError):
-    def __init__(self, msg: str):
-        super().__init__(msg)
-
-
-class MissingRequiredParametersError(ApiTypeError):
-    def __init__(self, error: TypeError):
-        self.error = error
-        error_str = str(error)
-        self.msg = error_str
-        if "__new__()" in error_str:
-            # parse error to reformat
-            missing_parameters = error_str.split(":")[1].strip()
-            number_of_parameters = error_str.split("missing")[1].split("required")[0].strip()
-            self.msg = "Missing {} required parameter{}: {}".format(number_of_parameters, "s" if int(number_of_parameters) > 1 else "", missing_parameters)
-        super().__init__(self.msg)
-
 class SchemaValidationError(OpenApiException):
     def __init__(self, validation_errors: typing.List[typing.Union[ApiValueError, ApiTypeError]]):
         """ Aggregates schema validation errors
@@ -190,3 +148,45 @@ def __init__(self, validation_errors: typing.List[typing.Union[ApiValueError, Ap
         num_validation_errors = len(self.validation_errors)
         self.msg = "{} invalid argument{}. {}".format(num_validation_errors, "s" if num_validation_errors > 1 else "", sub_msg)
         super().__init__(self.msg)
+
+class AnyOfValidationError(OpenApiException):
+    def __init__(self, error_list: typing.List[typing.Union[ApiTypeError, ApiValueError, SchemaValidationError]]):
+        self.error_list = error_list
+        sub_msgs: typing.List[str] = []
+        for type_error in error_list:
+            sub_msgs.append(str(type_error))
+        num_validation_errors = len(self.error_list)
+        if num_validation_errors == 1:
+            super().__init__(sub_msgs[0])
+        else:
+            # create a string that says how many validation errors there were and
+            # prints each sub_msg out using a bulleted list of messages
+            msg = "{} validation error{} detected: \n".format(num_validation_errors, "s" if num_validation_errors > 1 else "")
+            for i, sub_msg in enumerate(sub_msgs):
+                msg += " {}. {}\n".format(i+1, sub_msg)
+            super().__init__(msg)
+
+
+class InvalidHostConfigurationError(ClientConfigurationError):
+    def __init__(self, host: str, reason: str):
+        self.host = host
+        self.reason = reason
+        super().__init__('Invalid host: "{}", {}'.format(self.host, self.reason))
+
+
+class MissingRequiredPropertiesError(ApiTypeError):
+    def __init__(self, msg: str):
+        super().__init__(msg)
+
+
+class MissingRequiredParametersError(ApiTypeError):
+    def __init__(self, error: TypeError):
+        self.error = error
+        error_str = str(error)
+        self.msg = error_str
+        if "__new__()" in error_str:
+            # parse error to reformat
+            missing_parameters = error_str.split(":")[1].strip()
+            number_of_parameters = error_str.split("missing")[1].split("required")[0].strip()
+            self.msg = "Missing {} required parameter{}: {}".format(number_of_parameters, "s" if int(number_of_parameters) > 1 else "", missing_parameters)
+        super().__init__(self.msg)

generator/konfig-integration-tests/sdks/leap-workflows/python-leap-workflows/sdks/python/leap_workflows/paths/v1_runs/post.py

@@ -353,6 +353,7 @@ def workflow(
         ApiResponseFor200,
         api_client.ApiResponseWithoutDeserialization,
     ]:
+        """ This endpoint lets the user run a specified workflow with the provided workflow definition. """
         args = self._workflow_mapped_args(
             workflow_id=workflow_id,
             webhook_url=webhook_url,
@@ -395,6 +396,7 @@ def post(
         ApiResponseFor200,
         api_client.ApiResponseWithoutDeserialization,
     ]:
+        """ This endpoint lets the user run a specified workflow with the provided workflow definition. """
         args = self._workflow_mapped_args(
             workflow_id=workflow_id,
             webhook_url=webhook_url,

generator/konfig-integration-tests/sdks/leap-workflows/python-leap-workflows/sdks/python/leap_workflows/paths/v1_runs/post.pyi

@@ -344,6 +344,7 @@ class Workflow(BaseApi):
         ApiResponseFor200,
         api_client.ApiResponseWithoutDeserialization,
     ]:
+        """ This endpoint lets the user run a specified workflow with the provided workflow definition. """
         args = self._workflow_mapped_args(
             workflow_id=workflow_id,
             webhook_url=webhook_url,
@@ -386,6 +387,7 @@ class ApiForpost(BaseApi):
         ApiResponseFor200,
         api_client.ApiResponseWithoutDeserialization,
     ]:
+        """ This endpoint lets the user run a specified workflow with the provided workflow definition. """
         args = self._workflow_mapped_args(
             workflow_id=workflow_id,
             webhook_url=webhook_url,

generator/konfig-integration-tests/sdks/leap-workflows/python-leap-workflows/sdks/python/leap_workflows/paths/v1_runs_workflow_run_id/get.py

@@ -346,6 +346,7 @@ def get_workflow_run(
         ApiResponseFor200,
         api_client.ApiResponseWithoutDeserialization,
     ]:
+        """ This endpoint retrieves the details of a specific workflow run using its `workflow_run_id`. """
         args = self._get_workflow_run_mapped_args(
             workflow_run_id=workflow_run_id,
         )
@@ -380,6 +381,7 @@ def get(
         ApiResponseFor200,
         api_client.ApiResponseWithoutDeserialization,
     ]:
+        """ This endpoint retrieves the details of a specific workflow run using its `workflow_run_id`. """
         args = self._get_workflow_run_mapped_args(
             workflow_run_id=workflow_run_id,
         )

generator/konfig-integration-tests/sdks/leap-workflows/python-leap-workflows/sdks/python/leap_workflows/paths/v1_runs_workflow_run_id/get.pyi

@@ -337,6 +337,7 @@ class GetWorkflowRun(BaseApi):
         ApiResponseFor200,
         api_client.ApiResponseWithoutDeserialization,
     ]:
+        """ This endpoint retrieves the details of a specific workflow run using its `workflow_run_id`. """
         args = self._get_workflow_run_mapped_args(
             workflow_run_id=workflow_run_id,
         )
@@ -371,6 +372,7 @@ class ApiForget(BaseApi):
         ApiResponseFor200,
         api_client.ApiResponseWithoutDeserialization,
     ]:
+        """ This endpoint retrieves the details of a specific workflow run using its `workflow_run_id`. """
         args = self._get_workflow_run_mapped_args(
             workflow_run_id=workflow_run_id,
         )