datamodel-code-generator 0.25.3__py3-none-any.whl → 0.25.4__py3-none-any.whl

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/format.py

@@ -7,11 +7,15 @@ from typing import TYPE_CHECKING, Any, Dict, List, Optional, Sequence
 from warnings import warn
 
 import black
-import black.mode
 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'

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/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/version.py

@@ -1 +1 @@
-version: str = '0.25.3'
+version: str = '0.25.4'

{datamodel_code_generator-0.25.3.dist-info → datamodel_code_generator-0.25.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datamodel-code-generator
-Version: 0.25.3
+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.3.dist-info → datamodel_code_generator-0.25.4.dist-info}/RECORD

@@ -1,17 +1,17 @@
-datamodel_code_generator/__init__.py,sha256=1UiLHVPtIICwmqJzdzKhjWCABncOeeVLd5WmrKiQLw8,17717
+datamodel_code_generator/__init__.py,sha256=cCmyB7qRG9GE6wNQmTcY7MC_rY43yryxyhxLlVav1EA,17715
 datamodel_code_generator/__main__.py,sha256=7yvaMVa8KXwFUzBwiuKVzD-bs-tO66oGcIzWW3ZAOSI,18496
 datamodel_code_generator/arguments.py,sha256=N5dOWb_cR5orktDK1FeGy7txVN566mxRlGkvyGeTVaY,14594
-datamodel_code_generator/format.py,sha256=61b_zlMElVNvyMdN3VZfkQ4JVy0TnUfirJrVuD1MWF0,8553
+datamodel_code_generator/format.py,sha256=eC_TTYICLDtM4Y_mbdT9PNjxzwuWSirwaOc5pyTt0to,8625
 datamodel_code_generator/http.py,sha256=WYScR7rqz8GjgdVPPhFp4PJzgON5DPpO1vmHQLDxYxE,590
 datamodel_code_generator/imports.py,sha256=SJmkUIxHPCH3rDLMdXsUcT5pPfT9rjc-nmREOLx4Kxw,5283
 datamodel_code_generator/model/__init__.py,sha256=A0CqnL87-lY_Te-n-99ya5v7h6l4jE6hOPP_itvcWOc,3091
-datamodel_code_generator/model/base.py,sha256=skBjppN-7-QGYkq_X4KI2YzAzXHnj8j-fn_rGL4T-Xk,14028
+datamodel_code_generator/model/base.py,sha256=WshtblvxQ9fiRE2G7bdFiDRu6aDGSPhcIiiGIIBp1hg,14023
 datamodel_code_generator/model/dataclass.py,sha256=9meJNWb-XPYYO8kDMSLhSfO6fulGWV7r3_XIM5kA71M,3965
 datamodel_code_generator/model/enum.py,sha256=Giehhtij2DZs2LssSJnG_CIIHsSA7Mkz471GU-Cb5kI,3338
 datamodel_code_generator/model/imports.py,sha256=9-0bd-DvZRjZkWMsmw-gykL8fzTd6M-vQEqS7Rm_ty4,725
 datamodel_code_generator/model/msgspec.py,sha256=_568E91e07NX-A1bOeITOqr3h1Cr9ykecoSYeIZ5PwI,8934
 datamodel_code_generator/model/pydantic/__init__.py,sha256=AYMjDCtnV4vweYqe1asTRCYdOo8IGLBhd8pEdxyY8ok,1372
-datamodel_code_generator/model/pydantic/base_model.py,sha256=8IIAKHflAqw7M7E86tZGejTVZcIRUhgSGv6ai_6eTVo,11936
+datamodel_code_generator/model/pydantic/base_model.py,sha256=Y2GSlcLBvQh8hrlwGE3rGLTsQLKxERBts0so5BcUP6Y,11970
 datamodel_code_generator/model/pydantic/custom_root_type.py,sha256=XOeJqzUEAYE21C3hPAnRIz9iDWIjZvUOWDc9MCrpdvw,299
 datamodel_code_generator/model/pydantic/dataclass.py,sha256=sbqTmutl8Fjf1pYngfdv0NMXt904QcTRpHqmZy6GUiQ,424
 datamodel_code_generator/model/pydantic/imports.py,sha256=2nSLYwphBUMQEa0PTSNwoLjEBslu02EQb6BdZ-S51yk,2189
@@ -51,9 +51,9 @@ datamodel_code_generator/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 datamodel_code_generator/reference.py,sha256=EoalUNUP5us31bfMrHDa1iiKqxL8gHrpZKY_IxgZrOg,26347
 datamodel_code_generator/types.py,sha256=nGUJRwli267SBEhbsAfWIWSf1kDtqGM74Ha-Y05Xvzg,19551
 datamodel_code_generator/util.py,sha256=LCEqSCPsVJkn-aiXltZBcw5G7cQqte9IQnyd0Z8LGrE,3700
-datamodel_code_generator/version.py,sha256=mTqeZ78dbh-59OFkWYOFtpRO5QGjCQtud3ijsmfjfyk,24
-datamodel_code_generator-0.25.3.dist-info/LICENSE,sha256=K54Lwc6_jduycsy8oFFjQEeSSuEiqvVIjCGIXOMnuTQ,1068
-datamodel_code_generator-0.25.3.dist-info/METADATA,sha256=8pcIMiS1YKAWnXgVeRSLqIzDGVhIWJ_ZR_n-rt_h72g,22991
-datamodel_code_generator-0.25.3.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-datamodel_code_generator-0.25.3.dist-info/entry_points.txt,sha256=bykbUWqOCiKfxJPGe8jpNqTqD1NG7uyRmozdnwzu7rk,76
-datamodel_code_generator-0.25.3.dist-info/RECORD,,
+datamodel_code_generator/version.py,sha256=CqzzGug_BFVu7hwUZejterHsBy7pNwfFPjYBYXKyO8g,24
+datamodel_code_generator-0.25.4.dist-info/LICENSE,sha256=K54Lwc6_jduycsy8oFFjQEeSSuEiqvVIjCGIXOMnuTQ,1068
+datamodel_code_generator-0.25.4.dist-info/METADATA,sha256=ukdujdmWa09n01AAkzibHYZ-hffMFPT9F1jdodyCzzQ,22998
+datamodel_code_generator-0.25.4.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+datamodel_code_generator-0.25.4.dist-info/entry_points.txt,sha256=bykbUWqOCiKfxJPGe8jpNqTqD1NG7uyRmozdnwzu7rk,76
+datamodel_code_generator-0.25.4.dist-info/RECORD,,