datamodel-code-generator 0.25.2__tar.gz → 0.25.4__tar.gz

{datamodel_code_generator-0.25.2 → datamodel_code_generator-0.25.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datamodel-code-generator
-Version: 0.25.2
+Version: 0.25.4
 Summary: Datamodel Code Generator
 Home-page: https://github.com/koxudaxi/datamodel-code-generator
 License: MIT
@@ -377,7 +377,7 @@ Options:
   --http-ignore-tls     Disable verification of the remote host's TLS
                         certificate
   --input INPUT         Input file/directory (default: stdin)
-  --input-file-type {auto,openapi,jsonschema,json,yaml,dict,csv}
+  --input-file-type {auto,openapi,graphql,jsonschema,json,yaml,dict,csv}
                         Input file type (default: auto)
   --output OUTPUT       Output file (default: stdout)
   --output-model-type {pydantic.BaseModel,pydantic_v2.BaseModel,dataclasses.dataclass,typing.TypedDict,msgspec.Struct}
@@ -467,7 +467,7 @@ Model customization:
   --enable-version-header
                         Enable package version on file headers
   --keep-model-order    Keep generated models' order
-  --reuse-model         Re-use models on the field when a module has the model
+  --reuse-model         Reuse models on the field when a module has the model
                         with the same content
   --target-python-version {3.6,3.7,3.8,3.9,3.10,3.11}
                         target python version (default: 3.7)

{datamodel_code_generator-0.25.2 → datamodel_code_generator-0.25.4}/README.md

@@ -332,7 +332,7 @@ Options:
   --http-ignore-tls     Disable verification of the remote host's TLS
                         certificate
   --input INPUT         Input file/directory (default: stdin)
-  --input-file-type {auto,openapi,jsonschema,json,yaml,dict,csv}
+  --input-file-type {auto,openapi,graphql,jsonschema,json,yaml,dict,csv}
                         Input file type (default: auto)
   --output OUTPUT       Output file (default: stdout)
   --output-model-type {pydantic.BaseModel,pydantic_v2.BaseModel,dataclasses.dataclass,typing.TypedDict,msgspec.Struct}
@@ -422,7 +422,7 @@ Model customization:
   --enable-version-header
                         Enable package version on file headers
   --keep-model-order    Keep generated models' order
-  --reuse-model         Re-use models on the field when a module has the model
+  --reuse-model         Reuse models on the field when a module has the model
                         with the same content
   --target-python-version {3.6,3.7,3.8,3.9,3.10,3.11}
                         target python version (default: 3.7)

{datamodel_code_generator-0.25.2 → datamodel_code_generator-0.25.4}/datamodel_code_generator/__init__.py

@@ -525,7 +525,7 @@ def infer_input_type(text: str) -> InputFileType:
 
 
 inferred_message = (
-    'The input file type was determined to be: {}\nThis can be specificied explicitly with the '
+    'The input file type was determined to be: {}\nThis can be specified explicitly with the '
     '`--input-file-type` option.'
 )
 

{datamodel_code_generator-0.25.2 → datamodel_code_generator-0.25.4}/datamodel_code_generator/format.py

@@ -11,6 +11,11 @@ import isort
 
 from datamodel_code_generator.util import cached_property, load_toml
 
+try:
+    import black.mode
+except ImportError:  # pragma: no cover
+    black.mode = None
+
 
 class PythonVersion(Enum):
     PY_36 = '3.6'
@@ -131,9 +136,15 @@ class CodeFormatter:
         if wrap_string_literal is not None:
             experimental_string_processing = wrap_string_literal
         else:
-            experimental_string_processing = config.get(
-                'experimental-string-processing'
-            )
+            if black.__version__ < '24.1.0':  # type: ignore
+                experimental_string_processing = config.get(
+                    'experimental-string-processing'
+                )
+            else:
+                experimental_string_processing = config.get('preview', False) and (
+                    config.get('unstable', False)
+                    or 'string_processing' in config.get('enable-unstable-feature', [])
+                )
 
         if experimental_string_processing is not None:  # pragma: no cover
             if black.__version__.startswith('19.'):  # type: ignore
@@ -141,10 +152,16 @@ class CodeFormatter:
                     f"black doesn't support `experimental-string-processing` option"  # type: ignore
                     f' for wrapping string literal in {black.__version__}'
                 )
-            else:
+            elif black.__version__ < '24.1.0':  # type: ignore
                 black_kwargs[
                     'experimental_string_processing'
                 ] = experimental_string_processing
+            elif experimental_string_processing:
+                black_kwargs['preview'] = True
+                black_kwargs['unstable'] = config.get('unstable', False)
+                black_kwargs['enabled_features'] = {
+                    black.mode.Preview.string_processing
+                }
 
         if TYPE_CHECKING:
             self.black_mode: black.FileMode

{datamodel_code_generator-0.25.2 → datamodel_code_generator-0.25.4}/datamodel_code_generator/model/base.py

@@ -63,7 +63,7 @@ class ConstraintsBase(_BaseModel):
 
     @cached_property
     def has_constraints(self) -> bool:
-        return any(v for v in self.dict().values() if v is not None)
+        return any(v is not None for v in self.dict().values())
 
     @staticmethod
     def merge_constraints(

{datamodel_code_generator-0.25.2 → datamodel_code_generator-0.25.4}/datamodel_code_generator/model/pydantic/base_model.py

@@ -87,7 +87,9 @@ class DataModelField(DataModelFieldBase):
         return result
 
     def self_reference(self) -> bool:
-        return isinstance(self.parent, BaseModel) and self.parent.reference.path in {
+        return isinstance(
+            self.parent, BaseModelBase
+        ) and self.parent.reference.path in {
             d.reference.path for d in self.data_type.all_data_types if d.reference
         }
 
@@ -111,12 +113,12 @@ class DataModelField(DataModelFieldBase):
                 data_type = data_type.data_types[0]
                 if (
                     data_type.reference
-                    and isinstance(data_type.reference.source, BaseModel)
+                    and isinstance(data_type.reference.source, BaseModelBase)
                     and isinstance(self.default, list)
                 ):  # pragma: no cover
                     return f'lambda :[{data_type.alias or data_type.reference.source.class_name}.{self._PARSE_METHOD}(v) for v in {repr(self.default)}]'
             elif data_type.reference and isinstance(
-                data_type.reference.source, BaseModel
+                data_type.reference.source, BaseModelBase
             ):  # pragma: no cover
                 return f'lambda :{data_type.alias or data_type.reference.source.class_name}.{self._PARSE_METHOD}({repr(self.default)})'
         return None

{datamodel_code_generator-0.25.2 → datamodel_code_generator-0.25.4}/datamodel_code_generator/parser/jsonschema.py

@@ -270,6 +270,8 @@ class JsonSchemaObject(BaseModel):
         def __init__(self, **data: Any) -> None:
             super().__init__(**data)
             self.extras = {k: v for k, v in data.items() if k not in EXCLUDE_FIELD_KEYS}
+            if 'const' in data.get(self.__extra_key__, {}):
+                self.extras['const'] = data[self.__extra_key__]['const']
 
     @cached_property
     def is_object(self) -> bool:
@@ -367,6 +369,7 @@ EXCLUDE_FIELD_KEYS = (
 @snooper_to_methods(max_variable_length=None)
 class JsonSchemaParser(Parser):
     SCHEMA_PATHS: ClassVar[List[str]] = ['#/definitions', '#/$defs']
+    SCHEMA_OBJECT_TYPE: ClassVar[Type[JsonSchemaObject]] = JsonSchemaObject
 
     def __init__(
         self,
@@ -686,7 +689,7 @@ class JsonSchemaParser(Parser):
                 # }
             else:
                 combined_schemas.append(
-                    JsonSchemaObject.parse_obj(
+                    self.SCHEMA_OBJECT_TYPE.parse_obj(
                         self._deep_merge(
                             base_object,
                             target_attribute.dict(exclude_unset=True, by_alias=True),
@@ -1632,7 +1635,7 @@ class JsonSchemaParser(Parser):
         raw: Dict[str, Any],
         path: List[str],
     ) -> None:
-        self.parse_obj(name, JsonSchemaObject.parse_obj(raw), path)
+        self.parse_obj(name, self.SCHEMA_OBJECT_TYPE.parse_obj(raw), path)
 
     def parse_obj(
         self,
@@ -1759,7 +1762,7 @@ class JsonSchemaParser(Parser):
                 # Some jsonschema docs include attribute self to have include version details
                 raw.pop('self', None)
                 # parse $id before parsing $ref
-                root_obj = JsonSchemaObject.parse_obj(raw)
+                root_obj = self.SCHEMA_OBJECT_TYPE.parse_obj(raw)
                 self.parse_id(root_obj, path_parts)
                 definitions: Optional[Dict[Any, Any]] = None
                 for schema_path, split_schema_path in self.schema_paths:
@@ -1773,13 +1776,15 @@ class JsonSchemaParser(Parser):
                     definitions = {}
 
                 for key, model in definitions.items():
-                    obj = JsonSchemaObject.parse_obj(model)
+                    obj = self.SCHEMA_OBJECT_TYPE.parse_obj(model)
                     self.parse_id(obj, [*path_parts, schema_path, key])
 
                 if object_paths:
                     models = get_model_by_path(raw, object_paths)
                     model_name = object_paths[-1]
-                    self.parse_obj(model_name, JsonSchemaObject.parse_obj(models), path)
+                    self.parse_obj(
+                        model_name, self.SCHEMA_OBJECT_TYPE.parse_obj(models), path
+                    )
                 else:
                     self.parse_obj(obj_name, root_obj, path_parts or ['#'])
                 for key, model in definitions.items():
@@ -1800,7 +1805,7 @@ class JsonSchemaParser(Parser):
                         models = get_model_by_path(raw, object_paths)
                         model_name = object_paths[-1]
                         self.parse_obj(
-                            model_name, JsonSchemaObject.parse_obj(models), path
+                            model_name, self.SCHEMA_OBJECT_TYPE.parse_obj(models), path
                         )
                     previous_reserved_refs = reserved_refs
                     reserved_refs = set(self.reserved_refs.get(key) or [])

{datamodel_code_generator-0.25.2 → datamodel_code_generator-0.25.4}/datamodel_code_generator/util.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import copy
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Callable, Dict, TypeVar
 
@@ -69,9 +70,13 @@ else:
             return toml.load(path)
 
 
-SafeLoader.yaml_constructors[
-    'tag:yaml.org,2002:timestamp'
-] = SafeLoader.yaml_constructors['tag:yaml.org,2002:str']
+SafeLoaderTemp = copy.deepcopy(SafeLoader)
+SafeLoaderTemp.yaml_constructors = copy.deepcopy(SafeLoader.yaml_constructors)
+SafeLoaderTemp.add_constructor(
+    'tag:yaml.org,2002:timestamp',
+    SafeLoaderTemp.yaml_constructors['tag:yaml.org,2002:str'],
+)
+SafeLoader = SafeLoaderTemp
 
 Model = TypeVar('Model', bound=_BaseModel)
 

datamodel_code_generator-0.25.4/datamodel_code_generator/version.py

@@ -0,0 +1 @@
+version: str = '0.25.4'

{datamodel_code_generator-0.25.2 → datamodel_code_generator-0.25.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "datamodel-code-generator"
-version = "0.25.2"
+version = "0.25.4"
 description = "Datamodel Code Generator"
 authors = ["Koudai Aono <koxudaxi@gmail.com>"]
 readme = "README.md"
@@ -78,7 +78,7 @@ types-setuptools = ">=67.6.0.5,<70.0.0.0"
 pydantic = "*"
 httpx = ">=0.24.1"
 PySnooper = "*"
-ruff = ">=0.0.290,<0.1.9"
+ruff = ">=0.0.290,<0.2.1"
 ruff-lsp = ">=0.0.39,<0.0.41"
 pre-commit = "*"
 pytest-xdist = "^3.3.1"
@@ -153,3 +153,10 @@ ignore-init-method-arguments = true
 [tool.pydantic-pycharm-plugin.parsable-types]
 # str field may parse int and float
 str = ["int", "float"]
+
+[tool.codespell]
+# Ref: https://github.com/codespell-project/codespell#using-a-config-file
+skip = '.git,*.lock,tests'
+# check-hidden = true
+# ignore-regex = ''
+# ignore-words-list = ''

datamodel_code_generator-0.25.2/datamodel_code_generator/version.py

@@ -1 +0,0 @@
-version: str = '0.25.2'