- Move nullable logic to openapi parser

- Add unittest

datamodel_code_generator/parser/jsonschema.py

@@ -590,12 +590,6 @@ def _get_data_type(type_: str, format__: str) -> DataType:
                 **obj.dict() if not self.field_constraints else {},
             )
 
-        if obj.nullable and self.strict_nullable:
-            if isinstance(obj.type, list) and 'null' not in obj.type:
-                obj.type.append('null')
-            elif isinstance(obj.type, str) and obj.type != 'null':
-                obj.type = [obj.type, 'null']
-
         if isinstance(obj.type, list):
             return self.data_type(
                 data_types=[

datamodel_code_generator/parser/openapi.py

@@ -293,6 +293,20 @@ def get_ref_model(self, ref: str) -> Dict[str, Any]:
             ref_body = self.raw_obj
         return get_model_by_path(ref_body, ref_path.split('/')[1:])
 
+    def get_data_type(self, obj: JsonSchemaObject) -> DataType:
+        if obj.nullable and self.strict_nullable and isinstance(obj.type, str):
+            obj.type = [obj.type, 'null']
+
+        return super().get_data_type(obj)
+
+    def parse_one_of(
+        self, name: str, obj: JsonSchemaObject, path: List[str]
+    ) -> List[DataType]:
+        data_types = super().parse_one_of(name, obj, path)
+        if obj.nullable and self.strict_nullable:
+            data_types.append(DataType(type='None'))
+        return data_types
+
     def resolve_object(
         self, obj: Union[ReferenceObject, BaseModelT], object_type: Type[BaseModelT]
     ) -> BaseModelT:

tests/data/expected/main/main_openapi_nullable/output.py

@@ -4,7 +4,7 @@
 
 from __future__ import annotations
 
-from typing import List, Optional
+from typing import List, Optional, Union
 
 from pydantic import AnyUrl, BaseModel, Field
 
@@ -76,3 +76,8 @@ class Tag(BaseModel):
 
 class Notes(BaseModel):
     comments: List[str] = Field(default_factory=list)
+
+
+class Options(BaseModel):
+    comments: List[str]
+    oneOfComments: List[Union[str, float]]

tests/data/expected/main/main_openapi_nullable_strict_nullable/output.py

@@ -4,7 +4,7 @@
 
 from __future__ import annotations
 
-from typing import List, Optional
+from typing import List, Optional, Union
 
 from pydantic import AnyUrl, BaseModel, Field
 
@@ -76,3 +76,8 @@ class Tag(BaseModel):
 
 class Notes(BaseModel):
     comments: List[str] = Field(default_factory=list)
+
+
+class Options(BaseModel):
+    comments: List[Optional[str]]
+    oneOfComments: List[Optional[Union[str, float]]]

tests/data/expected/main/main_openapi_nullable_strict_nullable_use_union_operator/output.py

@@ -76,3 +76,8 @@ class Tag(BaseModel):
 
 class Notes(BaseModel):
     comments: List[str] = Field(default_factory=list)
+
+
+class Options(BaseModel):
+    comments: List[str | None]
+    oneOfComments: List[str | float | None]

tests/data/expected/main/main_typed_dict_nullable/output.py

@@ -4,7 +4,7 @@
 
 from __future__ import annotations
 
-from typing import List, NotRequired, Optional, TypedDict
+from typing import List, NotRequired, Optional, TypedDict, Union
 
 
 class Cursors(TypedDict):
@@ -60,3 +60,8 @@ class EmailItem(TypedDict):
 
 class Notes(TypedDict):
     comments: NotRequired[List[str]]
+
+
+class Options(TypedDict):
+    comments: List[str]
+    oneOfComments: List[Union[str, float]]

tests/data/expected/main/main_typed_dict_nullable_strict_nullable/output.py

@@ -4,7 +4,7 @@
 
 from __future__ import annotations
 
-from typing import List, NotRequired, Optional, TypedDict
+from typing import List, NotRequired, Optional, TypedDict, Union
 
 
 class Cursors(TypedDict):
@@ -60,3 +60,8 @@ class EmailItem(TypedDict):
 
 class Notes(TypedDict):
     comments: NotRequired[List[str]]
+
+
+class Options(TypedDict):
+    comments: List[Optional[str]]
+    oneOfComments: List[Optional[Union[str, float]]]

tests/data/expected/main/main_use_default_kwarg/output.py

@@ -4,7 +4,7 @@
 
 from __future__ import annotations
 
-from typing import List, Optional
+from typing import List, Optional, Union
 
 from pydantic import AnyUrl, BaseModel, Field
 
@@ -76,3 +76,8 @@ class Tag(BaseModel):
 
 class Notes(BaseModel):
     comments: List[str] = Field(default_factory=list)
+
+
+class Options(BaseModel):
+    comments: List[str]
+    oneOfComments: List[Union[str, float]]

tests/data/openapi/nullable.yaml

@@ -102,3 +102,21 @@ components:
               type: string
           default_factory: list
           nullable: false
+    options:
+      type: object
+      properties:
+        comments:
+          type: array
+          items:
+              type: string
+              nullable: true
+        oneOfComments:
+           type: array
+           items:
+               oneOf:
+                - type: string
+                - type: number
+               nullable: true
+      required:
+        - comments
+        - oneOfComments