Fixes parameter tests

modules/openapi-json-schema-generator/src/main/resources/python/api_client.hbs

@@ -32,15 +32,6 @@ _FieldValue: typing_extensions.TypeAlias = typing.Union[str, bytes]
 _FieldValueTuple: typing_extensions.TypeAlias = typing.Union[_FieldValue, typing.Tuple[str, _FieldValue], typing.Tuple[str, _FieldValue, str]]
 
 class RequestField(fields.RequestField):
- @classmethod
- def from_tuples(
- cls,
- fieldname: str,
- value: _FieldValueTuple,
- header_formatter: typing.Optional[typing.Callable[[str, _FieldValue], str]] = None
- ) -> RequestField:
- return super().from_tuples(fieldname, value, header_formatter) # type: ignore
-
  def __eq__(self, other):
  if not isinstance(other, RequestField):
  return False
@@ -1334,7 +1325,7 @@ class RequestBody(StyleFormSerializer, JSONDetector):
  request_field.make_multipart(content_type='application/octet-stream')
  elif isinstance(value, schemas.FileIO):
  # TODO use content.encoding to limit allowed content types if they are present
- request_field = RequestField.from_tuples(key, (os.path.basename(str(value.name)), value.read()))
+ request_field = RequestField(key, data=value.read(), filename=os.path.basename(str(value.name)))
  value.close()
  else:
  request_field = cls.__multipart_json_item(key=key, value=value)

samples/openapi3/client/petstore/python/src/petstore_api/api_client.py

@@ -1336,7 +1336,7 @@ def __multipart_form_item(cls, key: str, value: schemas.Schema) -> RequestField:
  request_field.make_multipart(content_type='application/octet-stream')
  elif isinstance(value, schemas.FileIO):
  # TODO use content.encoding to limit allowed content types if they are present
- request_field = RequestField.from_tuples(key, (os.path.basename(str(value.name)), value.read()))
+ request_field = RequestField(key, data=value.read(), filename=os.path.basename(str(value.name)))
  value.close()
  else:
  request_field = cls.__multipart_json_item(key=key, value=value)

samples/openapi3/client/petstore/python/tests_manual/test_parameters.py

@@ -76,13 +76,13 @@ def test_query_style_form_serialization(self):
  ),
  )
  for test_case in test_cases:
- class Parameter(api_client.QueryParameter):
+ class ParameterA(api_client.QueryParameter):
  name='color'
  style=api_client.ParameterStyle.FORM
  schema=schemas.AnyTypeSchema
  explode=test_case.explode
 
- serialization = Parameter.serialize(test_case.payload)
+ serialization = ParameterA.serialize(test_case.payload)
  self.assertEqual(serialization, test_case.expected_serialization)
 
  with self.assertRaises(exceptions.ApiValueError):
@@ -150,13 +150,13 @@ def test_cookie_style_form_serialization(self):
  ),
  )
  for test_case in test_cases:
- class Parameter(api_client.CookieParameter):
+ class ParameterA(api_client.CookieParameter):
  name='color'
  style=api_client.ParameterStyle.FORM
  schema=schemas.AnyTypeSchema
  explode=test_case.explode
 
- serialization = Parameter.serialize(test_case.payload)
+ serialization = ParameterA.serialize(test_case.payload)
  self.assertEqual(serialization, test_case.expected_serialization)
 
  with self.assertRaises(exceptions.ApiValueError):
@@ -224,13 +224,13 @@ def test_style_simple_in_path_serialization(self):
  ),
  )
  for test_case in test_cases:
- class Parameter(api_client.PathParameter):
+ class ParameterA(api_client.PathParameter):
  name='color'
  style=api_client.ParameterStyle.SIMPLE
  schema=schemas.AnyTypeSchema
  explode=test_case.explode
 
- serialization = Parameter.serialize(test_case.payload)
+ serialization = ParameterA.serialize(test_case.payload)
  self.assertEqual(serialization, test_case.expected_serialization)
 
  with self.assertRaises(exceptions.ApiValueError):
@@ -298,13 +298,13 @@ def test_style_simple_in_header_serialization(self):
  ),
  )
  for test_case in test_cases:
- class Parameter(api_client.HeaderParameter):
+ class ParameterA(api_client.HeaderParameter):
  name='color'
  style=api_client.ParameterStyle.SIMPLE
  schema=schemas.AnyTypeSchema
  explode=test_case.explode
 
- serialization = Parameter.serialize(test_case.payload)
+ serialization = ParameterA.serialize(test_case.payload)
  self.assertEqual(serialization, test_case.expected_serialization)
 
  with self.assertRaises(exceptions.ApiValueError):
@@ -372,13 +372,13 @@ def test_style_label_in_path_serialization(self):
  ),
  )
  for test_case in test_cases:
- class Parameter(api_client.PathParameter):
+ class ParameterA(api_client.PathParameter):
  name='color'
  style=api_client.ParameterStyle.LABEL
  schema=schemas.AnyTypeSchema
  explode=test_case.explode
 
- serialization = Parameter.serialize(test_case.payload)
+ serialization = ParameterA.serialize(test_case.payload)
  self.assertEqual(serialization, test_case.expected_serialization)
 
  with self.assertRaises(exceptions.ApiValueError):
@@ -446,13 +446,13 @@ def test_style_matrix_in_path_serialization(self):
  ),
  )
  for test_case in test_cases:
- class Parameter(api_client.PathParameter):
+ class ParameterA(api_client.PathParameter):
  name='color'
  style=api_client.ParameterStyle.MATRIX
  schema=schemas.AnyTypeSchema
  explode=test_case.explode
 
- serialization = Parameter.serialize(test_case.payload)
+ serialization = ParameterA.serialize(test_case.payload)
  self.assertEqual(serialization, test_case.expected_serialization)
 
  with self.assertRaises(exceptions.ApiValueError):
@@ -510,13 +510,13 @@ def test_style_space_delimited_serialization(self):
  ),
  )
  for test_case in test_cases:
- class Parameter(api_client.QueryParameter):
+ class ParameterA(api_client.QueryParameter):
  name='color'
  style=api_client.ParameterStyle.SPACE_DELIMITED
  schema=schemas.AnyTypeSchema
  explode=test_case.explode
 
- serialization = Parameter.serialize(test_case.payload)
+ serialization = ParameterA.serialize(test_case.payload)
  self.assertEqual(serialization, test_case.expected_serialization)
 
  with self.assertRaises(exceptions.ApiValueError):
@@ -574,13 +574,13 @@ def test_style_pipe_delimited_serialization(self):
  ),
  )
  for test_case in test_cases:
- class Parameter(api_client.QueryParameter):
+ class ParameterA(api_client.QueryParameter):
  name='color'
  style=api_client.ParameterStyle.PIPE_DELIMITED
  schema=schemas.AnyTypeSchema
  explode=test_case.explode
 
- serialization = Parameter.serialize(test_case.payload)
+ serialization = ParameterA.serialize(test_case.payload)
  self.assertEqual(serialization, test_case.expected_serialization)
 
  with self.assertRaises(exceptions.ApiValueError):
@@ -638,11 +638,11 @@ def test_path_params_no_style(self):
  ),
  )
  for test_case in test_cases:
- class Parameter(api_client.PathParameter):
+ class ParameterA(api_client.PathParameter):
  name='color'
  schema=schemas.AnyTypeSchema
 
- serialization = Parameter.serialize(test_case.payload)
+ serialization = ParameterA.serialize(test_case.payload)
  self.assertEqual(serialization, test_case.expected_serialization)
 
  with self.assertRaises(exceptions.ApiValueError):
@@ -697,11 +697,11 @@ def test_header_params_no_style(self):
  ),
  )
  for test_case in test_cases:
- class Parameter(api_client.HeaderParameter):
+ class ParameterA(api_client.HeaderParameter):
  name='color'
  schema=schemas.AnyTypeSchema
 
- serialization = Parameter.serialize(test_case.payload)
+ serialization = ParameterA.serialize(test_case.payload)
  self.assertEqual(serialization, test_case.expected_serialization)
 
  with self.assertRaises(exceptions.ApiValueError):
@@ -756,11 +756,11 @@ def test_query_params_no_style(self):
  ),
  )
  for test_case in test_cases:
- class Parameter(api_client.QueryParameter):
+ class ParameterA(api_client.QueryParameter):
  name='color'
  schema=schemas.AnyTypeSchema
 
- serialization = Parameter.serialize(test_case.payload)
+ serialization = ParameterA.serialize(test_case.payload)
  self.assertEqual(serialization, test_case.expected_serialization)
 
  with self.assertRaises(exceptions.ApiValueError):
@@ -815,11 +815,11 @@ def test_cookie_params_no_style(self):
  ),
  )
  for test_case in test_cases:
- class Parameter(api_client.CookieParameter):
+ class ParameterA(api_client.CookieParameter):
  name='color'
  schema=schemas.AnyTypeSchema
 
- serialization = Parameter.serialize(test_case.payload)
+ serialization = ParameterA.serialize(test_case.payload)
  self.assertEqual(serialization, test_case.expected_serialization)
 
  with self.assertRaises(exceptions.ApiValueError):
@@ -889,7 +889,7 @@ class __MediaType(api_client.MediaType):
  schema = schemas.AnyTypeSchema
 
  name='color'
- content = ('application/json', __MediaType)
+ content = {'application/json': __MediaType}
 
  serialization = Parameter.serialize(test_case.payload)
  self.assertEqual(serialization, test_case.expected_serialization)
@@ -953,7 +953,7 @@ class __MediaType(api_client.MediaType):
  schema = schemas.AnyTypeSchema
 
  name='color'
- content=('application/json', __MediaType)
+ content={'application/json': __MediaType}
 
  serialization = Parameter.serialize(test_case.payload)
  self.assertEqual(serialization, test_case.expected_serialization)
@@ -967,7 +967,7 @@ class __MediaType(api_client.MediaType):
  schema = schemas.AnyTypeSchema
 
  name='color'
- content=('text/plain', __MediaType)
+ content={'text/plain': __MediaType}
 
  Parameter.serialize(None)