datamodel-code-generator 0.33.0__tar.gz → 0.34.0__tar.gz

{datamodel_code_generator-0.33.0 → datamodel_code_generator-0.34.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datamodel-code-generator
-Version: 0.33.0
+Version: 0.34.0
 Summary: Datamodel Code Generator
 Project-URL: Homepage, https://github.com/koxudaxi/datamodel-code-generator
 Project-URL: Source, https://github.com/koxudaxi/datamodel-code-generator
@@ -313,12 +313,6 @@ class Apis(BaseModel):
       <p>Astral</p>
     </a>
   </td>
-  <td valign="top" align="center">
-    <a href="https://github.com/DataDog">
-      <img src="https://avatars.githubusercontent.com/u/365230?s=200&v=4" alt="Datadog, Inc. Logo" style="width: 100px;">
-      <p>Datadog, Inc.</p>
-    </a>
-  </td>
   </tr>
 </table>
 
@@ -426,6 +420,8 @@ Options:
 Typing customization:
   --base-class BASE_CLASS
                         Base Class (default: pydantic.BaseModel)
+  --disable-future-imports
+                        Disable __future__ imports
   --enum-field-as-literal {all,one}
                         Parse enum field as literal. all: all enum field type are Literal.
                         one: field type is Literal when an enum has only one possible value

{datamodel_code_generator-0.33.0 → datamodel_code_generator-0.34.0}/README.md

@@ -263,12 +263,6 @@ class Apis(BaseModel):
       <p>Astral</p>
     </a>
   </td>
-  <td valign="top" align="center">
-    <a href="https://github.com/DataDog">
-      <img src="https://avatars.githubusercontent.com/u/365230?s=200&v=4" alt="Datadog, Inc. Logo" style="width: 100px;">
-      <p>Datadog, Inc.</p>
-    </a>
-  </td>
   </tr>
 </table>
 
@@ -376,6 +370,8 @@ Options:
 Typing customization:
   --base-class BASE_CLASS
                         Base Class (default: pydantic.BaseModel)
+  --disable-future-imports
+                        Disable __future__ imports
   --enum-field-as-literal {all,one}
                         Parse enum field as literal. all: all enum field type are Literal.
                         one: field type is Literal when an enum has only one possible value

{datamodel_code_generator-0.33.0 → datamodel_code_generator-0.34.0}/src/datamodel_code_generator/__init__.py

@@ -289,6 +289,7 @@ def generate(  # noqa: PLR0912, PLR0913, PLR0914, PLR0915
     no_alias: bool = False,
     formatters: list[Formatter] = DEFAULT_FORMATTERS,
     parent_scoped_naming: bool = False,
+    disable_future_imports: bool = False,
 ) -> None:
     remote_text_cache: DefaultPutDict[str, str] = DefaultPutDict()
     if isinstance(input_, str):
@@ -499,7 +500,7 @@ def generate(  # noqa: PLR0912, PLR0913, PLR0914, PLR0915
     )
 
     with chdir(output):
-        results = parser.parse()
+        results = parser.parse(disable_future_imports=disable_future_imports)
     if not input_filename:  # pragma: no cover
         if isinstance(input_, str):
             input_filename = "<stdin>"

{datamodel_code_generator-0.33.0 → datamodel_code_generator-0.34.0}/src/datamodel_code_generator/__main__.py

@@ -362,6 +362,7 @@ class Config(BaseModel):
     no_alias: bool = False
     formatters: list[Formatter] = DEFAULT_FORMATTERS
     parent_scoped_naming: bool = False
+    disable_future_imports: bool = False
 
     def merge_args(self, args: Namespace) -> None:
         set_args = {f: getattr(args, f) for f in self.get_fields() if getattr(args, f) is not None}
@@ -577,6 +578,7 @@ def main(args: Sequence[str] | None = None) -> Exit:  # noqa: PLR0911, PLR0912,
             no_alias=config.no_alias,
             formatters=config.formatters,
             parent_scoped_naming=config.parent_scoped_naming,
+            disable_future_imports=config.disable_future_imports,
         )
     except InvalidClassNameError as e:
         print(f"{e} You have to set `--class-name` option", file=sys.stderr)  # noqa: T201

{datamodel_code_generator-0.33.0 → datamodel_code_generator-0.34.0}/src/datamodel_code_generator/arguments.py

@@ -305,6 +305,12 @@ typing_options.add_argument(
     action="store_true",
     default=None,
 )
+typing_options.add_argument(
+    "--disable-future-imports",
+    help="Disable __future__ imports",
+    action="store_true",
+    default=None,
+)
 
 # ======================================================================================
 # Customization options for generated model fields

{datamodel_code_generator-0.33.0 → datamodel_code_generator-0.34.0}/src/datamodel_code_generator/format.py

@@ -178,7 +178,7 @@ class CodeFormatter:
         import_ = import_module(custom_formatter_import)
 
         if not hasattr(import_, "CodeFormatter"):
-            msg = f"Custom formatter module `{import_.__name__}` must contains object with name Formatter"
+            msg = f"Custom formatter module `{import_.__name__}` must contains object with name CodeFormatter"
             raise NameError(msg)
 
         formatter_class = import_.__getattribute__("CodeFormatter")  # noqa: PLC2801

{datamodel_code_generator-0.33.0 → datamodel_code_generator-0.34.0}/src/datamodel_code_generator/model/dataclass.py

@@ -87,6 +87,16 @@ class DataModelField(DataModelFieldBase):
     }
     constraints: Optional[Constraints] = None  # noqa: UP045
 
+    def process_const(self) -> None:
+        if "const" not in self.extras:
+            return
+        self.const = True
+        self.nullable = False
+        const = self.extras["const"]
+        self.data_type = self.data_type.__class__(literals=[const])
+        if not self.default:
+            self.default = const
+
     @property
     def imports(self) -> tuple[Import, ...]:
         field = self.field

{datamodel_code_generator-0.33.0 → datamodel_code_generator-0.34.0}/src/datamodel_code_generator/model/typed_dict.py

@@ -114,6 +114,16 @@ class TypedDict(DataModel):
 class DataModelField(DataModelFieldBase):
     DEFAULT_IMPORTS: ClassVar[tuple[Import, ...]] = (IMPORT_NOT_REQUIRED,)
 
+    def process_const(self) -> None:
+        if "const" not in self.extras:
+            return
+        self.const = True
+        self.nullable = False
+        const = self.extras["const"]
+        self.data_type = self.data_type.__class__(literals=[const])
+        if not self.default:
+            self.default = const
+
     @property
     def key(self) -> str:
         return (self.original_name or self.name or "").translate(  # pragma: no cover

{datamodel_code_generator-0.33.0 → datamodel_code_generator-0.34.0}/src/datamodel_code_generator/parser/base.py

@@ -1246,10 +1246,11 @@ class Parser(ABC):
         with_import: bool | None = True,  # noqa: FBT001, FBT002
         format_: bool | None = True,  # noqa: FBT001, FBT002
         settings_path: Path | None = None,
+        disable_future_imports: bool = False,  # noqa: FBT001, FBT002
     ) -> str | dict[tuple[str, ...], Result]:
         self.parse_raw()
 
-        if with_import:
+        if with_import and not disable_future_imports:
             self.imports.append(IMPORT_ANNOTATIONS)
 
         if format_:

{datamodel_code_generator-0.33.0 → datamodel_code_generator-0.34.0}/src/datamodel_code_generator/parser/jsonschema.py

@@ -1004,7 +1004,7 @@ class JsonSchemaParser(Parser):
                 self.get_object_field(
                     field_name=None,
                     field=obj.additionalProperties,
-                    required=False,
+                    required=True,
                     original_field_name=None,
                     field_type=self.data_type(
                         data_types=[

{datamodel_code_generator-0.33.0 → datamodel_code_generator-0.34.0}/tests/data/expected/main/jsonschema/array_in_additional_properties.py

@@ -4,10 +4,10 @@
 
 from __future__ import annotations
 
-from typing import Dict, List, Optional
+from typing import Dict, List
 
 from pydantic import BaseModel
 
 
 class MyJsonOfListOfString(BaseModel):
-    __root__: Optional[Dict[str, List[str]]] = None
+    __root__: Dict[str, List[str]]

datamodel_code_generator-0.34.0/tests/data/expected/main/jsonschema/dataclass_const.py

@@ -0,0 +1,13 @@
+# generated by datamodel-codegen:
+#   filename:  const.json
+#   timestamp: 2019-07-26T00:00:00+00:00
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import Literal
+
+
+@dataclass
+class Const:
+    foo: Literal['foo']

datamodel_code_generator-0.34.0/tests/data/expected/main/jsonschema/string_dict.py

@@ -0,0 +1,13 @@
+# generated by datamodel-codegen:
+#   filename:  string_dict.json
+#   timestamp: 2019-07-26T00:00:00+00:00
+
+from __future__ import annotations
+
+from typing import Dict
+
+from pydantic import BaseModel
+
+
+class MyStringDict(BaseModel):
+    __root__: Dict[str, str]

datamodel_code_generator-0.34.0/tests/data/expected/main/jsonschema/typed_dict_const.py

@@ -0,0 +1,11 @@
+# generated by datamodel-codegen:
+#   filename:  const.json
+#   timestamp: 2019-07-26T00:00:00+00:00
+
+from __future__ import annotations
+
+from typing import Literal, TypedDict
+
+
+class Const(TypedDict):
+    foo: Literal['foo']

datamodel_code_generator-0.34.0/tests/data/expected/main/jsonschema/typed_dict_with_only_additional_properties.py

@@ -0,0 +1,9 @@
+# generated by datamodel-codegen:
+#   filename:  string_dict.json
+#   timestamp: 2019-07-26T00:00:00+00:00
+
+from __future__ import annotations
+
+from typing import Dict
+
+MyStringDict = Dict[str, str]

datamodel_code_generator-0.34.0/tests/data/expected/main/openapi/const_field_dataclass.py

@@ -0,0 +1,13 @@
+# generated by datamodel-codegen:
+#   filename:  const.yaml
+#   timestamp: 2019-07-26T00:00:00+00:00
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import Literal
+
+
+@dataclass
+class Api:
+    version: Literal['v1']

datamodel_code_generator-0.34.0/tests/data/expected/main/openapi/const_field_typed_dict.py

@@ -0,0 +1,11 @@
+# generated by datamodel-codegen:
+#   filename:  const.yaml
+#   timestamp: 2019-07-26T00:00:00+00:00
+
+from __future__ import annotations
+
+from typing import Literal, TypedDict
+
+
+class Api(TypedDict):
+    version: Literal['v1']

datamodel_code_generator-0.34.0/tests/data/jsonschema/const.json

@@ -0,0 +1,11 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "title": "Const",
+  "properties": {
+    "foo": {
+      "const": "foo"
+    }
+  },
+  "required": ["foo"]
+}

datamodel_code_generator-0.34.0/tests/data/jsonschema/string_dict.json

@@ -0,0 +1,11 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "type": "object",
+  "propertyNames": {
+    "type": "string"
+  },
+  "additionalProperties": {
+    "type": "string"
+  },
+  "title": "MyStringDict"
+}

{datamodel_code_generator-0.33.0 → datamodel_code_generator-0.34.0}/tests/main/graphql/test_annotated.py

@@ -38,7 +38,7 @@ def test_annotated(tmp_path: Path) -> None:
         "--use-annotated",
     ])
     assert return_code == Exit.OK
-    assert output_file.read_text() == (EXPECTED_GRAPHQL_PATH / "annotated.py").read_text()
+    assert output_file.read_text(encoding="utf-8") == (EXPECTED_GRAPHQL_PATH / "annotated.py").read_text()
 
 
 @freeze_time("2019-07-26")
@@ -57,7 +57,10 @@ def test_annotated_use_standard_collections(tmp_path: Path) -> None:
         "--use-standard-collections",
     ])
     assert return_code == Exit.OK
-    assert output_file.read_text() == (EXPECTED_GRAPHQL_PATH / "annotated_use_standard_collections.py").read_text()
+    assert (
+        output_file.read_text(encoding="utf-8")
+        == (EXPECTED_GRAPHQL_PATH / "annotated_use_standard_collections.py").read_text()
+    )
 
 
 @freeze_time("2019-07-26")
@@ -78,7 +81,7 @@ def test_annotated_use_standard_collections_use_union_operator(tmp_path: Path) -
     ])
     assert return_code == Exit.OK
     assert (
-        output_file.read_text()
+        output_file.read_text(encoding="utf-8")
         == (EXPECTED_GRAPHQL_PATH / "annotated_use_standard_collections_use_union_operator.py").read_text()
     )
 
@@ -99,7 +102,10 @@ def test_annotated_use_union_operator(tmp_path: Path) -> None:
         "--use-union-operator",
     ])
     assert return_code == Exit.OK
-    assert output_file.read_text() == (EXPECTED_GRAPHQL_PATH / "annotated_use_union_operator.py").read_text()
+    assert (
+        output_file.read_text(encoding="utf-8")
+        == (EXPECTED_GRAPHQL_PATH / "annotated_use_union_operator.py").read_text()
+    )
 
 
 @freeze_time("2019-07-26")
@@ -119,4 +125,4 @@ def test_annotated_field_aliases(tmp_path: Path) -> None:
         str(GRAPHQL_DATA_PATH / "field-aliases.json"),
     ])
     assert return_code == Exit.OK
-    assert output_file.read_text() == (EXPECTED_GRAPHQL_PATH / "annotated_field_aliases.py").read_text()
+    assert output_file.read_text(encoding="utf-8") == (EXPECTED_GRAPHQL_PATH / "annotated_field_aliases.py").read_text()

{datamodel_code_generator-0.33.0 → datamodel_code_generator-0.34.0}/tests/main/graphql/test_main_graphql.py

@@ -56,7 +56,7 @@ def test_main_graphql_simple_star_wars(output_model: str, expected_output: str,
         output_model,
     ])
     assert return_code == Exit.OK
-    assert output_file.read_text() == (EXPECTED_GRAPHQL_PATH / expected_output).read_text()
+    assert output_file.read_text(encoding="utf-8") == (EXPECTED_GRAPHQL_PATH / expected_output).read_text()
 
 
 @freeze_time("2019-07-26")
@@ -75,7 +75,9 @@ def test_main_graphql_different_types_of_fields(tmp_path: Path) -> None:
         "graphql",
     ])
     assert return_code == Exit.OK
-    assert output_file.read_text() == (EXPECTED_GRAPHQL_PATH / "different_types_of_fields.py").read_text()
+    assert (
+        output_file.read_text(encoding="utf-8") == (EXPECTED_GRAPHQL_PATH / "different_types_of_fields.py").read_text()
+    )
 
 
 @freeze_time("2019-07-26")
@@ -91,7 +93,10 @@ def test_main_use_default_kwarg(tmp_path: Path) -> None:
         "--use-default-kwarg",
     ])
     assert return_code == Exit.OK
-    assert output_file.read_text() == (EXPECTED_GRAPHQL_PATH / "annotated_use_default_kwarg.py").read_text()
+    assert (
+        output_file.read_text(encoding="utf-8")
+        == (EXPECTED_GRAPHQL_PATH / "annotated_use_default_kwarg.py").read_text()
+    )
 
 
 @freeze_time("2019-07-26")
@@ -112,7 +117,7 @@ def test_main_graphql_custom_scalar_types(tmp_path: Path) -> None:
         str(GRAPHQL_DATA_PATH / "custom-scalar-types.json"),
     ])
     assert return_code == Exit.OK
-    assert output_file.read_text() == (EXPECTED_GRAPHQL_PATH / "custom_scalar_types.py").read_text()
+    assert output_file.read_text(encoding="utf-8") == (EXPECTED_GRAPHQL_PATH / "custom_scalar_types.py").read_text()
 
 
 @freeze_time("2019-07-26")
@@ -133,7 +138,7 @@ def test_main_graphql_field_aliases(tmp_path: Path) -> None:
         str(GRAPHQL_DATA_PATH / "field-aliases.json"),
     ])
     assert return_code == Exit.OK
-    assert output_file.read_text() == (EXPECTED_GRAPHQL_PATH / "field_aliases.py").read_text()
+    assert output_file.read_text(encoding="utf-8") == (EXPECTED_GRAPHQL_PATH / "field_aliases.py").read_text()
 
 
 @freeze_time("2019-07-26")
@@ -152,7 +157,7 @@ def test_main_graphql_enums(tmp_path: Path) -> None:
         "graphql",
     ])
     assert return_code == Exit.OK
-    assert output_file.read_text() == (EXPECTED_GRAPHQL_PATH / "enums.py").read_text()
+    assert output_file.read_text(encoding="utf-8") == (EXPECTED_GRAPHQL_PATH / "enums.py").read_text()
 
 
 @freeze_time("2019-07-26")
@@ -171,7 +176,7 @@ def test_main_graphql_union(tmp_path: Path) -> None:
         "graphql",
     ])
     assert return_code == Exit.OK
-    assert output_file.read_text() == (EXPECTED_GRAPHQL_PATH / "union.py").read_text()
+    assert output_file.read_text(encoding="utf-8") == (EXPECTED_GRAPHQL_PATH / "union.py").read_text()
 
 
 @pytest.mark.skipif(
@@ -194,7 +199,9 @@ def test_main_graphql_additional_imports_isort_4(tmp_path: Path) -> None:
         "datetime.datetime,datetime.date,mymodule.myclass.MyCustomPythonClass",
     ])
     assert return_code == Exit.OK
-    assert output_file.read_text() == (EXPECTED_GRAPHQL_PATH / "additional_imports_isort4.py").read_text()
+    assert (
+        output_file.read_text(encoding="utf-8") == (EXPECTED_GRAPHQL_PATH / "additional_imports_isort4.py").read_text()
+    )
 
 
 @pytest.mark.skipif(
@@ -221,7 +228,9 @@ def test_main_graphql_additional_imports_isort_5_or_6(tmp_path: Path) -> None:
         "datetime.datetime,datetime.date,mymodule.myclass.MyCustomPythonClass",
     ])
     assert return_code == Exit.OK
-    assert output_file.read_text() == (EXPECTED_GRAPHQL_PATH / "additional_imports_isort5.py").read_text()
+    assert (
+        output_file.read_text(encoding="utf-8") == (EXPECTED_GRAPHQL_PATH / "additional_imports_isort5.py").read_text()
+    )
 
 
 @freeze_time("2019-07-26")
@@ -242,7 +251,7 @@ def test_main_graphql_custom_formatters(tmp_path: Path) -> None:
         "tests.data.python.custom_formatters.add_comment",
     ])
     assert return_code == Exit.OK
-    assert output_file.read_text() == (EXPECTED_GRAPHQL_PATH / "custom_formatters.py").read_text()
+    assert output_file.read_text(encoding="utf-8") == (EXPECTED_GRAPHQL_PATH / "custom_formatters.py").read_text()
 
 
 @freeze_time("2019-07-26")
@@ -262,7 +271,9 @@ def test_main_graphql_use_standard_collections(tmp_path: Path) -> None:
         "--use-standard-collections",
     ])
     assert return_code == Exit.OK
-    assert output_file.read_text() == (EXPECTED_GRAPHQL_PATH / "use_standard_collections.py").read_text()
+    assert (
+        output_file.read_text(encoding="utf-8") == (EXPECTED_GRAPHQL_PATH / "use_standard_collections.py").read_text()
+    )
 
 
 @freeze_time("2019-07-26")
@@ -282,7 +293,7 @@ def test_main_graphql_use_union_operator(tmp_path: Path) -> None:
         "--use-union-operator",
     ])
     assert return_code == Exit.OK
-    assert output_file.read_text() == (EXPECTED_GRAPHQL_PATH / "use_union_operator.py").read_text()
+    assert output_file.read_text(encoding="utf-8") == (EXPECTED_GRAPHQL_PATH / "use_union_operator.py").read_text()
 
 
 @freeze_time("2019-07-26")
@@ -299,4 +310,7 @@ def test_main_graphql_extra_fields_allow(tmp_path: Path) -> None:
         "allow",
     ])
     assert return_code == Exit.OK
-    assert output_file.read_text() == (EXPECTED_GRAPHQL_PATH / "simple_star_wars_extra_fields_allow.py").read_text()
+    assert (
+        output_file.read_text(encoding="utf-8")
+        == (EXPECTED_GRAPHQL_PATH / "simple_star_wars_extra_fields_allow.py").read_text()
+    )