Adds array unset return value

spacether · spacether · commit bedc6e58faec · 2023-07-17T19:42:27.000-07:00
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_output_type_base.hbs b/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_output_type_base.hbs
@@ -46,16 +46,32 @@ typing_extensions.Literal[{{#each ../enumInfo.typeToValues.integer}}{{value}}{{#
                             {{#eq this "array"}}
                                 {{#if arrayOutputJsonPathPiece}}
                                     {{#if fullRefModule}}
+                                        {{#if optional}}
+typing.Union[{{fullRefModule}}.{{arrayOutputJsonPathPiece.camelCase}}, schemas.Unset]{{endChar}}
+                                        {{else}}
 {{fullRefModule}}.{{arrayOutputJsonPathPiece.camelCase}}{{endChar}}
+                                        {{/if}}
                                     {{else}}
                                         {{#if selfReference}}
+                                            {{#if optional}}
+typing.Union['{{arrayOutputJsonPathPiece.camelCase}}', schemas.Unset]{{endChar}}
+                                            {{else}}
 '{{arrayOutputJsonPathPiece.camelCase}}'{{endChar}}
+                                            {{/if}}
                                         {{else}}
+                                            {{#if optional}}
+typing.Union[{{arrayOutputJsonPathPiece.camelCase}}, schemas.Unset]{{endChar}}
+                                            {{else}}
 {{arrayOutputJsonPathPiece.camelCase}}{{endChar}}
+                                            {{/if}}
                                         {{/if}}
                                     {{/if}}
                                 {{else}}
+                                    {{#if optional}}
+typing.Union[typing.Tuple[schemas.OUTPUT_BASE_TYPES], schemas.Unset]{{endChar}}
+                                    {{else}}
 typing.Tuple[schemas.OUTPUT_BASE_TYPES]{{endChar}}
+                                    {{/if}}
                                 {{/if}}
                             {{else}}
                                 {{#eq this "object"}}
diff --git a/samples/openapi3/client/petstore/python/src/petstore_api/components/schema/array_of_array_of_number_only.py b/samples/openapi3/client/petstore/python/src/petstore_api/components/schema/array_of_array_of_number_only.py
@@ -141,7 +141,7 @@ class ArrayOfArrayOfNumberOnlyDict(schemas.immutabledict[str, schemas.OUTPUT_BAS
     })
     
     @property
-    def get_array_array_number(self) -> ArrayArrayNumberTuple:
+    def get_array_array_number(self) -> typing.Union[ArrayArrayNumberTuple, schemas.Unset]:
         val = self.get("ArrayArrayNumber", schemas.unset)
         if val is schemas.unset:
             return val
diff --git a/samples/openapi3/client/petstore/python/src/petstore_api/components/schema/array_of_number_only.py b/samples/openapi3/client/petstore/python/src/petstore_api/components/schema/array_of_number_only.py
@@ -83,7 +83,7 @@ class ArrayOfNumberOnlyDict(schemas.immutabledict[str, schemas.OUTPUT_BASE_TYPES
     })
     
     @property
-    def get_array_number(self) -> ArrayNumberTuple:
+    def get_array_number(self) -> typing.Union[ArrayNumberTuple, schemas.Unset]:
         val = self.get("ArrayNumber", schemas.unset)
         if val is schemas.unset:
             return val
diff --git a/samples/openapi3/client/petstore/python/src/petstore_api/components/schema/array_test.py b/samples/openapi3/client/petstore/python/src/petstore_api/components/schema/array_test.py
@@ -308,7 +308,7 @@ class ArrayTestDict(schemas.immutabledict[str, schemas.OUTPUT_BASE_TYPES]):
     })
     
     @property
-    def get_array_of_string(self) -> ArrayOfStringTuple:
+    def get_array_of_string(self) -> typing.Union[ArrayOfStringTuple, schemas.Unset]:
         val = self.get("array_of_string", schemas.unset)
         if val is schemas.unset:
             return val
@@ -318,7 +318,7 @@ def get_array_of_string(self) -> ArrayOfStringTuple:
         )
     
     @property
-    def get_array_array_of_integer(self) -> ArrayArrayOfIntegerTuple:
+    def get_array_array_of_integer(self) -> typing.Union[ArrayArrayOfIntegerTuple, schemas.Unset]:
         val = self.get("array_array_of_integer", schemas.unset)
         if val is schemas.unset:
             return val
@@ -328,7 +328,7 @@ def get_array_array_of_integer(self) -> ArrayArrayOfIntegerTuple:
         )
     
     @property
-    def get_array_array_of_model(self) -> ArrayArrayOfModelTuple:
+    def get_array_array_of_model(self) -> typing.Union[ArrayArrayOfModelTuple, schemas.Unset]:
         val = self.get("array_array_of_model", schemas.unset)
         if val is schemas.unset:
             return val
diff --git a/samples/openapi3/client/petstore/python/src/petstore_api/components/schema/drawing.py b/samples/openapi3/client/petstore/python/src/petstore_api/components/schema/drawing.py
@@ -149,7 +149,7 @@ def get_nullable_shape(self) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.
         )
     
     @property
-    def get_shapes(self) -> ShapesTuple:
+    def get_shapes(self) -> typing.Union[ShapesTuple, schemas.Unset]:
         val = self.get("shapes", schemas.unset)
         if val is schemas.unset:
             return val
diff --git a/samples/openapi3/client/petstore/python/src/petstore_api/components/schema/enum_arrays.py b/samples/openapi3/client/petstore/python/src/petstore_api/components/schema/enum_arrays.py
@@ -224,7 +224,7 @@ def get_just_symbol(self) -> typing.Union[typing_extensions.Literal[">=", "$"],
         )
     
     @property
-    def get_array_enum(self) -> ArrayEnumTuple:
+    def get_array_enum(self) -> typing.Union[ArrayEnumTuple, schemas.Unset]:
         val = self.get("array_enum", schemas.unset)
         if val is schemas.unset:
             return val
diff --git a/samples/openapi3/client/petstore/python/src/petstore_api/components/schema/file_schema_test_class.py b/samples/openapi3/client/petstore/python/src/petstore_api/components/schema/file_schema_test_class.py
@@ -98,7 +98,7 @@ def get_file(self) -> file.FileDict:
         )
     
     @property
-    def get_files(self) -> FilesTuple:
+    def get_files(self) -> typing.Union[FilesTuple, schemas.Unset]:
         val = self.get("files", schemas.unset)
         if val is schemas.unset:
             return val
diff --git a/samples/openapi3/client/petstore/python/src/petstore_api/components/schema/format_test.py b/samples/openapi3/client/petstore/python/src/petstore_api/components/schema/format_test.py
@@ -357,7 +357,7 @@ def get_float64(self) -> typing.Union[int, float, schemas.Unset]:
         )
     
     @property
-    def get_array_with_unique_items(self) -> ArrayWithUniqueItemsTuple:
+    def get_array_with_unique_items(self) -> typing.Union[ArrayWithUniqueItemsTuple, schemas.Unset]:
         val = self.get("arrayWithUniqueItems", schemas.unset)
         if val is schemas.unset:
             return val
diff --git a/samples/openapi3/client/petstore/python/src/petstore_api/components/schema/nullable_class.py b/samples/openapi3/client/petstore/python/src/petstore_api/components/schema/nullable_class.py
@@ -984,7 +984,7 @@ def get_datetime_propy(self) -> typing.Union[
     @property
     def get_array_nullable_propy(self) -> typing.Union[
         typing.Union[None, schemas.Unset],
-        ArrayNullablePropTuple,
+        typing.Union[ArrayNullablePropTuple, schemas.Unset],
     ]:
         val = self.get("array_nullable_prop", schemas.unset)
         if val is schemas.unset:
@@ -1000,7 +1000,7 @@ def get_array_nullable_propy(self) -> typing.Union[
     @property
     def get_array_and_items_nullable_propy(self) -> typing.Union[
         typing.Union[None, schemas.Unset],
-        ArrayAndItemsNullablePropTuple,
+        typing.Union[ArrayAndItemsNullablePropTuple, schemas.Unset],
     ]:
         val = self.get("array_and_items_nullable_prop", schemas.unset)
         if val is schemas.unset:
@@ -1014,7 +1014,7 @@ def get_array_and_items_nullable_propy(self) -> typing.Union[
         )
     
     @property
-    def get_array_items_nullable(self) -> ArrayItemsNullableTuple:
+    def get_array_items_nullable(self) -> typing.Union[ArrayItemsNullableTuple, schemas.Unset]:
         val = self.get("array_items_nullable", schemas.unset)
         if val is schemas.unset:
             return val
diff --git a/samples/openapi3/client/petstore/python/src/petstore_api/components/schema/pet.py b/samples/openapi3/client/petstore/python/src/petstore_api/components/schema/pet.py
@@ -266,7 +266,7 @@ def get_category(self) -> category.CategoryDict:
         )
     
     @property
-    def get_tags(self) -> TagsTuple:
+    def get_tags(self) -> typing.Union[TagsTuple, schemas.Unset]:
         val = self.get("tags", schemas.unset)
         if val is schemas.unset:
             return val
diff --git a/samples/openapi3/client/petstore/python/src/petstore_api/paths/fake/get/operation.py b/samples/openapi3/client/petstore/python/src/petstore_api/paths/fake/get/operation.py
@@ -84,7 +84,7 @@ def get_enum_query_integer(self) -> typing.Union[typing_extensions.Literal[1, -2
         )
     
     @property
-    def get_enum_query_string_array(self) -> parameter_2_schema.SchemaTuple:
+    def get_enum_query_string_array(self) -> typing.Union[parameter_2_schema.SchemaTuple, schemas.Unset]:
         val = self.get("enum_query_string_array", schemas.unset)
         if val is schemas.unset:
             return val
@@ -177,7 +177,7 @@ def get_enum_header_string(self) -> typing.Union[typing_extensions.Literal["_abc
         )
     
     @property
-    def get_enum_header_string_array(self) -> parameter_0_schema.SchemaTuple:
+    def get_enum_header_string_array(self) -> typing.Union[parameter_0_schema.SchemaTuple, schemas.Unset]:
         val = self.get("enum_header_string_array", schemas.unset)
         if val is schemas.unset:
             return val
diff --git a/samples/openapi3/client/petstore/python/src/petstore_api/paths/fake/get/request_body/content/application_x_www_form_urlencoded/schema.py b/samples/openapi3/client/petstore/python/src/petstore_api/paths/fake/get/request_body/content/application_x_www_form_urlencoded/schema.py
@@ -230,7 +230,7 @@ class SchemaDict(schemas.immutabledict[str, schemas.OUTPUT_BASE_TYPES]):
     })
     
     @property
-    def get_enum_form_string_array(self) -> EnumFormStringArrayTuple:
+    def get_enum_form_string_array(self) -> typing.Union[EnumFormStringArrayTuple, schemas.Unset]:
         val = self.get("enum_form_string_array", schemas.unset)
         if val is schemas.unset:
             return val
diff --git a/samples/openapi3/client/petstore/python/src/petstore_api/paths/fake_upload_files/post/request_body/content/multipart_form_data/schema.py b/samples/openapi3/client/petstore/python/src/petstore_api/paths/fake_upload_files/post/request_body/content/multipart_form_data/schema.py
@@ -85,7 +85,7 @@ class SchemaDict(schemas.immutabledict[str, schemas.OUTPUT_BASE_TYPES]):
     })
     
     @property
-    def get_files(self) -> FilesTuple:
+    def get_files(self) -> typing.Union[FilesTuple, schemas.Unset]:
         val = self.get("files", schemas.unset)
         if val is schemas.unset:
             return val

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ def get_nullable_shape(self) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.`
`149`	`149`	`)`
`150`	`150`
`151`	`151`	`@property`
`152`		`- def get_shapes(self) -> ShapesTuple:`
	`152`	`+ def get_shapes(self) -> typing.Union[ShapesTuple, schemas.Unset]:`
`153`	`153`	`val = self.get("shapes", schemas.unset)`
`154`	`154`	`if val is schemas.unset:`
`155`	`155`	`return val`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ def get_just_symbol(self) -> typing.Union[typing_extensions.Literal[">=", "$"],`
`224`	`224`	`)`
`225`	`225`
`226`	`226`	`@property`
`227`		`- def get_array_enum(self) -> ArrayEnumTuple:`
	`227`	`+ def get_array_enum(self) -> typing.Union[ArrayEnumTuple, schemas.Unset]:`
`228`	`228`	`val = self.get("array_enum", schemas.unset)`
`229`	`229`	`if val is schemas.unset:`
`230`	`230`	`return val`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ def get_file(self) -> file.FileDict:`
`98`	`98`	`)`
`99`	`99`
`100`	`100`	`@property`
`101`		`- def get_files(self) -> FilesTuple:`
	`101`	`+ def get_files(self) -> typing.Union[FilesTuple, schemas.Unset]:`
`102`	`102`	`val = self.get("files", schemas.unset)`
`103`	`103`	`if val is schemas.unset:`
`104`	`104`	`return val`
Original file line number	Diff line number	Diff line change
`@@ -357,7 +357,7 @@ def get_float64(self) -> typing.Union[int, float, schemas.Unset]:`
`357`	`357`	`)`
`358`	`358`
`359`	`359`	`@property`
`360`		`- def get_array_with_unique_items(self) -> ArrayWithUniqueItemsTuple:`
	`360`	`+ def get_array_with_unique_items(self) -> typing.Union[ArrayWithUniqueItemsTuple, schemas.Unset]:`
`361`	`361`	`val = self.get("arrayWithUniqueItems", schemas.unset)`
`362`	`362`	`if val is schemas.unset:`
`363`	`363`	`return val`
Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ def get_category(self) -> category.CategoryDict:`
`266`	`266`	`)`
`267`	`267`
`268`	`268`	`@property`
`269`		`- def get_tags(self) -> TagsTuple:`
	`269`	`+ def get_tags(self) -> typing.Union[TagsTuple, schemas.Unset]:`
`270`	`270`	`val = self.get("tags", schemas.unset)`
`271`	`271`	`if val is schemas.unset:`
`272`	`272`	`return val`