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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datamodel-code-generator
-Version: 0.25.4
+Version: 0.25.6
 Summary: Datamodel Code Generator
 Home-page: https://github.com/koxudaxi/datamodel-code-generator
 License: MIT
@@ -376,6 +376,9 @@ Options:
                         (example: "Authorization: Basic dXNlcjpwYXNz")
   --http-ignore-tls     Disable verification of the remote host's TLS
                         certificate
+  --http-query-parameters QUERY_PARAMETER [QUERY_PARAMETER ...]
+                        Set query parameters in HTTP requests to the remote host.
+                        (example: "ref=branch")
   --input INPUT         Input file/directory (default: stdin)
   --input-file-type {auto,openapi,graphql,jsonschema,json,yaml,dict,csv}
                         Input file type (default: auto)
@@ -447,6 +450,9 @@ Field customization:
                         Fields that have default values.
   --use-field-description
                         Use schema description to populate field docstring
+  --use-pendulum
+                        Use pendulum instead of `datetime` for `date`, 
+                        `datetime`, and `time` data types
 
 Model customization:
   --allow-extra-fields  Allow to pass extra fields, if this flag is not

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

@@ -331,6 +331,9 @@ Options:
                         (example: "Authorization: Basic dXNlcjpwYXNz")
   --http-ignore-tls     Disable verification of the remote host's TLS
                         certificate
+  --http-query-parameters QUERY_PARAMETER [QUERY_PARAMETER ...]
+                        Set query parameters in HTTP requests to the remote host.
+                        (example: "ref=branch")
   --input INPUT         Input file/directory (default: stdin)
   --input-file-type {auto,openapi,graphql,jsonschema,json,yaml,dict,csv}
                         Input file type (default: auto)
@@ -402,6 +405,9 @@ Field customization:
                         Fields that have default values.
   --use-field-description
                         Use schema description to populate field docstring
+  --use-pendulum
+                        Use pendulum instead of `datetime` for `date`, 
+                        `datetime`, and `time` data types
 
 Model customization:
   --allow-extra-fields  Allow to pass extra fields, if this flag is not

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

@@ -58,8 +58,7 @@ def load_yaml_from_path(path: Path, encoding: str) -> Any:
 
 if TYPE_CHECKING:
 
-    def get_version() -> str:
-        ...
+    def get_version() -> str: ...
 
 else:
 
@@ -300,6 +299,8 @@ def generate(
     custom_file_header_path: Optional[Path] = None,
     custom_formatters: Optional[List[str]] = None,
     custom_formatters_kwargs: Optional[Dict[str, Any]] = None,
+    use_pendulum: bool = False,
+    http_query_parameters: Optional[Sequence[Tuple[str, str]]] = None,
 ) -> None:
     remote_text_cache: DefaultPutDict[str, str] = DefaultPutDict()
     if isinstance(input_, str):
@@ -309,7 +310,9 @@ def generate(
 
         input_text = remote_text_cache.get_or_put(
             input_.geturl(),
-            default_factory=lambda url: get_body(url, http_headers, http_ignore_tls),
+            default_factory=lambda url: get_body(
+                url, http_headers, http_ignore_tls, http_query_parameters
+            ),
         )
     else:
         input_text = None
@@ -456,6 +459,8 @@ def generate(
         known_third_party=data_model_types.known_third_party,
         custom_formatters=custom_formatters,
         custom_formatters_kwargs=custom_formatters_kwargs,
+        use_pendulum=use_pendulum,
+        http_query_parameters=http_query_parameters,
         **kwargs,
     )
 

{datamodel_code_generator-0.25.4 → datamodel_code_generator-0.25.6}/datamodel_code_generator/__main__.py

@@ -94,8 +94,7 @@ class Config(BaseModel):
         if TYPE_CHECKING:
 
             @classmethod
-            def get_fields(cls) -> Dict[str, Any]:
-                ...
+            def get_fields(cls) -> Dict[str, Any]: ...
 
         else:
 
@@ -198,6 +197,23 @@ class Config(BaseModel):
             return [validate_each_item(each_item) for each_item in value]
         return value  # pragma: no cover
 
+    @field_validator('http_query_parameters', mode='before')
+    def validate_http_query_parameters(
+        cls, value: Any
+    ) -> Optional[List[Tuple[str, str]]]:
+        def validate_each_item(each_item: Any) -> Tuple[str, str]:
+            if isinstance(each_item, str):  # pragma: no cover
+                try:
+                    field_name, field_value = each_item.split('=', maxsplit=1)  # type: str, str
+                    return field_name, field_value.lstrip()
+                except ValueError:
+                    raise Error(f'Invalid http query parameter: {each_item!r}')
+            return each_item  # pragma: no cover
+
+        if isinstance(value, list):
+            return [validate_each_item(each_item) for each_item in value]
+        return value  # pragma: no cover
+
     @model_validator(mode='before')
     def validate_additional_imports(cls, values: Dict[str, Any]) -> Dict[str, Any]:
         if values.get('additional_imports') is not None:
@@ -294,6 +310,8 @@ class Config(BaseModel):
     custom_file_header_path: Optional[Path] = None
     custom_formatters: Optional[List[str]] = None
     custom_formatters_kwargs: Optional[TextIOBase] = None
+    use_pendulum: bool = False
+    http_query_parameters: Optional[Sequence[Tuple[str, str]]] = None
 
     def merge_args(self, args: Namespace) -> None:
         set_args = {
@@ -488,6 +506,8 @@ def main(args: Optional[Sequence[str]] = None) -> Exit:
             custom_file_header_path=config.custom_file_header_path,
             custom_formatters=config.custom_formatters,
             custom_formatters_kwargs=custom_formatters_kwargs,
+            use_pendulum=config.use_pendulum,
+            http_query_parameters=config.http_query_parameters,
         )
         return Exit.OK
     except InvalidClassNameError as e:

{datamodel_code_generator-0.25.4 → datamodel_code_generator-0.25.6}/datamodel_code_generator/arguments.py

@@ -57,6 +57,12 @@ base_options.add_argument(
     metavar='HTTP_HEADER',
     help='Set headers in HTTP requests to the remote host. (example: "Authorization: Basic dXNlcjpwYXNz")',
 )
+base_options.add_argument(
+    '--http-query-parameters',
+    nargs='+',
+    metavar='HTTP_QUERY_PARAMETERS',
+    help='Set query parameters in HTTP requests to the remote host. (example: "ref=branch")',
+)
 base_options.add_argument(
     '--http-ignore-tls',
     help="Disable verification of the remote host's TLS certificate",
@@ -166,6 +172,12 @@ model_options.add_argument(
     action='store_true',
     default=None,
 )
+model_options.add_argument(
+    '--use-pendulum',
+    help='use pendulum instead of datetime',
+    action='store_true',
+    default=False,
+)
 
 # ======================================================================================
 # Typing options for generated models

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

@@ -76,8 +76,7 @@ class PythonVersion(Enum):
 
 if TYPE_CHECKING:
 
-    class _TargetVersion(Enum):
-        ...
+    class _TargetVersion(Enum): ...
 
     BLACK_PYTHON_VERSION: Dict[PythonVersion, _TargetVersion]
 else:
@@ -98,8 +97,7 @@ def black_find_project_root(sources: Sequence[Path]) -> Path:
 
         def _find_project_root(
             srcs: Union[Sequence[str], Iterable[str]],
-        ) -> Union[Tuple[Path, str], Path]:
-            ...
+        ) -> Union[Tuple[Path, str], Path]: ...
 
     else:
         from black import find_project_root as _find_project_root
@@ -153,9 +151,9 @@ class CodeFormatter:
                     f' for wrapping string literal in {black.__version__}'
                 )
             elif black.__version__ < '24.1.0':  # type: ignore
-                black_kwargs[
-                    'experimental_string_processing'
-                ] = experimental_string_processing
+                black_kwargs['experimental_string_processing'] = (
+                    experimental_string_processing
+                )
             elif experimental_string_processing:
                 black_kwargs['preview'] = True
                 black_kwargs['unstable'] = config.get('unstable', False)
@@ -240,8 +238,7 @@ class CodeFormatter:
 
     if TYPE_CHECKING:
 
-        def apply_isort(self, code: str) -> str:
-            ...
+        def apply_isort(self, code: str) -> str: ...
 
     else:
         if isort.__version__.startswith('4.'):

{datamodel_code_generator-0.25.4 → datamodel_code_generator-0.25.6}/datamodel_code_generator/http.py

@@ -14,9 +14,14 @@ def get_body(
     url: str,
     headers: Optional[Sequence[Tuple[str, str]]] = None,
     ignore_tls: bool = False,
+    query_parameters: Optional[Sequence[Tuple[str, str]]] = None,
 ) -> str:
     return httpx.get(
-        url, headers=headers, verify=not ignore_tls, follow_redirects=True
+        url,
+        headers=headers,
+        verify=not ignore_tls,
+        follow_redirects=True,
+        params=query_parameters,
     ).text
 
 

{datamodel_code_generator-0.25.4 → datamodel_code_generator-0.25.6}/datamodel_code_generator/imports.py

@@ -116,5 +116,9 @@ IMPORT_DICT = Import.from_full_path('typing.Dict')
 IMPORT_DECIMAL = Import.from_full_path('decimal.Decimal')
 IMPORT_DATE = Import.from_full_path('datetime.date')
 IMPORT_DATETIME = Import.from_full_path('datetime.datetime')
+IMPORT_PATH = Import.from_full_path('pathlib.Path')
 IMPORT_TIME = Import.from_full_path('datetime.time')
 IMPORT_UUID = Import.from_full_path('uuid.UUID')
+IMPORT_PENDULUM_DATE = Import.from_full_path('pendulum.Date')
+IMPORT_PENDULUM_DATETIME = Import.from_full_path('pendulum.DateTime')
+IMPORT_PENDULUM_TIME = Import.from_full_path('pendulum.Time')

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

@@ -267,8 +267,7 @@ class TemplateBase(ABC):
         return self.render()
 
 
-class BaseClassDataType(DataType):
-    ...
+class BaseClassDataType(DataType): ...
 
 
 UNDEFINED: Any = object()

{datamodel_code_generator-0.25.4 → datamodel_code_generator-0.25.6}/datamodel_code_generator/model/msgspec.py

@@ -126,6 +126,7 @@ class DataModelField(DataModelFieldBase):
         'min_length',
         'max_length',
         'pattern',
+        'examples',
         # 'unique_items', # not supported by msgspec
     }
     _PARSE_METHOD = 'convert'

{datamodel_code_generator-0.25.4 → datamodel_code_generator-0.25.6}/datamodel_code_generator/model/pydantic/types.py

@@ -9,6 +9,10 @@ from datamodel_code_generator.imports import (
     IMPORT_DATE,
     IMPORT_DATETIME,
     IMPORT_DECIMAL,
+    IMPORT_PATH,
+    IMPORT_PENDULUM_DATE,
+    IMPORT_PENDULUM_DATETIME,
+    IMPORT_PENDULUM_TIME,
     IMPORT_TIME,
     IMPORT_UUID,
 )
@@ -52,11 +56,12 @@ def type_map_factory(
     data_type: Type[DataType],
     strict_types: Sequence[StrictTypes],
     pattern_key: str,
+    use_pendulum: bool,
 ) -> Dict[Types, DataType]:
     data_type_int = data_type(type='int')
     data_type_float = data_type(type='float')
     data_type_str = data_type(type='str')
-    return {
+    result = {
         Types.integer: data_type_int,
         Types.int32: data_type_int,
         Types.int64: data_type_int,
@@ -70,6 +75,7 @@ def type_map_factory(
         Types.binary: data_type(type='bytes'),
         Types.date: data_type.from_import(IMPORT_DATE),
         Types.date_time: data_type.from_import(IMPORT_DATETIME),
+        Types.path: data_type.from_import(IMPORT_PATH),
         Types.password: data_type.from_import(IMPORT_SECRET_STR),
         Types.email: data_type.from_import(IMPORT_EMAIL_STR),
         Types.uuid: data_type.from_import(IMPORT_UUID),
@@ -98,6 +104,12 @@ def type_map_factory(
         Types.array: data_type.from_import(IMPORT_ANY, is_list=True),
         Types.any: data_type.from_import(IMPORT_ANY),
     }
+    if use_pendulum:
+        result[Types.date] = data_type.from_import(IMPORT_PENDULUM_DATE)
+        result[Types.date_time] = data_type.from_import(IMPORT_PENDULUM_DATETIME)
+        result[Types.time] = data_type.from_import(IMPORT_PENDULUM_TIME)
+
+    return result
 
 
 def strict_type_map_factory(data_type: Type[DataType]) -> Dict[StrictTypes, DataType]:
@@ -145,6 +157,7 @@ class DataTypeManager(_DataTypeManager):
         strict_types: Optional[Sequence[StrictTypes]] = None,
         use_non_positive_negative_number_constrained_types: bool = False,
         use_union_operator: bool = False,
+        use_pendulum: bool = False,
     ):
         super().__init__(
             python_version,
@@ -153,6 +166,7 @@ class DataTypeManager(_DataTypeManager):
             strict_types,
             use_non_positive_negative_number_constrained_types,
             use_union_operator,
+            use_pendulum,
         )
 
         self.type_map: Dict[Types, DataType] = self.type_map_factory(
@@ -183,7 +197,7 @@ class DataTypeManager(_DataTypeManager):
         strict_types: Sequence[StrictTypes],
         pattern_key: str,
     ) -> Dict[Types, DataType]:
-        return type_map_factory(data_type, strict_types, pattern_key)
+        return type_map_factory(data_type, strict_types, pattern_key, self.use_pendulum)
 
     def transform_kwargs(
         self, kwargs: Dict[str, Any], filter_: Set[str]

{datamodel_code_generator-0.25.4 → datamodel_code_generator-0.25.6}/datamodel_code_generator/model/template/pydantic_v2/RootModel.jinja2

@@ -10,7 +10,7 @@
 {{ decorator }}
 {% endfor -%}
 
-class {{ class_name }}({{ base_class }}[{{get_type_hint(fields)}}]):{% if comment is defined %}  # {{ comment }}{% endif %}
+class {{ class_name }}({{ base_class }}{%- if fields -%}[{{get_type_hint(fields)}}]{%- endif -%}):{% if comment is defined %}  # {{ comment }}{% endif %}
 {%- if description %}
     """
     {{ description | indent(4) }}

{datamodel_code_generator-0.25.4 → datamodel_code_generator-0.25.6}/datamodel_code_generator/model/types.py

@@ -58,6 +58,7 @@ class DataTypeManager(_DataTypeManager):
         strict_types: Optional[Sequence[StrictTypes]] = None,
         use_non_positive_negative_number_constrained_types: bool = False,
         use_union_operator: bool = False,
+        use_pendulum: bool = False,
     ):
         super().__init__(
             python_version,
@@ -66,6 +67,7 @@ class DataTypeManager(_DataTypeManager):
             strict_types,
             use_non_positive_negative_number_constrained_types,
             use_union_operator,
+            use_pendulum,
         )
 
         self.type_map: Dict[Types, DataType] = type_map_factory(

{datamodel_code_generator-0.25.4 → datamodel_code_generator-0.25.6}/datamodel_code_generator/parser/base.py

@@ -390,6 +390,8 @@ class Parser(ABC):
         known_third_party: Optional[List[str]] = None,
         custom_formatters: Optional[List[str]] = None,
         custom_formatters_kwargs: Optional[Dict[str, Any]] = None,
+        use_pendulum: bool = False,
+        http_query_parameters: Optional[Sequence[Tuple[str, str]]] = None,
     ) -> None:
         self.data_type_manager: DataTypeManager = data_type_manager_type(
             python_version=target_python_version,
@@ -397,6 +399,7 @@ class Parser(ABC):
             use_generic_container_types=use_generic_container_types,
             strict_types=strict_types,
             use_union_operator=use_union_operator,
+            use_pendulum=use_pendulum,
         )
         self.data_model_type: Type[DataModel] = data_model_type
         self.data_model_root_type: Type[DataModel] = data_model_root_type
@@ -408,19 +411,19 @@ class Parser(ABC):
         self.base_class: Optional[str] = base_class
         self.target_python_version: PythonVersion = target_python_version
         self.results: List[DataModel] = []
-        self.dump_resolve_reference_action: Optional[
-            Callable[[Iterable[str]], str]
-        ] = dump_resolve_reference_action
+        self.dump_resolve_reference_action: Optional[Callable[[Iterable[str]], str]] = (
+            dump_resolve_reference_action
+        )
         self.validation: bool = validation
         self.field_constraints: bool = field_constraints
         self.snake_case_field: bool = snake_case_field
         self.strip_default_none: bool = strip_default_none
-        self.apply_default_values_for_required_fields: (
-            bool
-        ) = apply_default_values_for_required_fields
-        self.force_optional_for_required_fields: (
-            bool
-        ) = force_optional_for_required_fields
+        self.apply_default_values_for_required_fields: bool = (
+            apply_default_values_for_required_fields
+        )
+        self.force_optional_for_required_fields: bool = (
+            force_optional_for_required_fields
+        )
         self.use_schema_description: bool = use_schema_description
         self.use_field_description: bool = use_field_description
         self.use_default_kwarg: bool = use_default_kwarg
@@ -433,9 +436,9 @@ class Parser(ABC):
         self.use_generic_container_types: bool = use_generic_container_types
         self.use_union_operator: bool = use_union_operator
         self.enable_faux_immutability: bool = enable_faux_immutability
-        self.custom_class_name_generator: Optional[
-            Callable[[str], str]
-        ] = custom_class_name_generator
+        self.custom_class_name_generator: Optional[Callable[[str], str]] = (
+            custom_class_name_generator
+        )
         self.field_extra_keys: Set[str] = field_extra_keys or set()
         self.field_extra_keys_without_x_prefix: Set[str] = (
             field_extra_keys_without_x_prefix or set()
@@ -490,6 +493,9 @@ class Parser(ABC):
         self.class_name: Optional[str] = class_name
         self.wrap_string_literal: Optional[bool] = wrap_string_literal
         self.http_headers: Optional[Sequence[Tuple[str, str]]] = http_headers
+        self.http_query_parameters: Optional[Sequence[Tuple[str, str]]] = (
+            http_query_parameters
+        )
         self.http_ignore_tls: bool = http_ignore_tls
         self.use_annotated: bool = use_annotated
         if self.use_annotated and not self.field_constraints:  # pragma: no cover
@@ -547,7 +553,7 @@ class Parser(ABC):
         return self.remote_text_cache.get_or_put(
             url,
             default_factory=lambda url_: get_body(
-                url, self.http_headers, self.http_ignore_tls
+                url, self.http_headers, self.http_ignore_tls, self.http_query_parameters
             ),
         )
 
@@ -568,9 +574,9 @@ class Parser(ABC):
 
     def __delete_duplicate_models(self, models: List[DataModel]) -> None:
         model_class_names: Dict[str, DataModel] = {}
-        model_to_duplicate_models: DefaultDict[
-            DataModel, List[DataModel]
-        ] = defaultdict(list)
+        model_to_duplicate_models: DefaultDict[DataModel, List[DataModel]] = (
+            defaultdict(list)
+        )
         for model in models[:]:
             if isinstance(model, self.data_model_root_type):
                 root_data_type = model.fields[0].data_type
@@ -671,7 +677,8 @@ class Parser(ABC):
         for model in models:
             scoped_model_resolver.add(model.path, model.class_name)
         for model in models:
-            imports.append(model.imports)
+            before_import = model.imports
+            imports.append(before_import)
             for data_type in model.all_data_types:
                 # To change from/import
 
@@ -681,7 +688,12 @@ class Parser(ABC):
                     continue
 
                 if isinstance(data_type, BaseClassDataType):
-                    from_ = ''.join(relative(model.module_name, data_type.full_name))
+                    left, right = relative(model.module_name, data_type.full_name)
+                    from_ = (
+                        ''.join([left, right])
+                        if left.endswith('.')
+                        else '.'.join([left, right])
+                    )
                     import_ = data_type.reference.short_name
                     full_path = from_, import_
                 else:
@@ -709,6 +721,9 @@ class Parser(ABC):
                         reference_path=data_type.reference.path,
                     ),
                 )
+            after_import = model.imports
+            if before_import != after_import:
+                imports.append(after_import)
 
     @classmethod
     def __extract_inherited_enum(cls, models: List[DataModel]) -> None:
@@ -756,7 +771,7 @@ class Parser(ABC):
                         (pydantic_model.BaseModel, pydantic_model_v2.BaseModel),
                     ):
                         continue  # pragma: no cover
-                    type_name = None
+                    type_names = []
                     if mapping:
                         for name, path in mapping.items():
                             if (
@@ -765,10 +780,10 @@ class Parser(ABC):
                             ):
                                 # TODO: support external reference
                                 continue
-                            type_name = name
+                            type_names.append(name)
                     else:
-                        type_name = discriminator_model.path.split('/')[-1]
-                    if not type_name:  # pragma: no cover
+                        type_names = [discriminator_model.path.split('/')[-1]]
+                    if not type_names:  # pragma: no cover
                         raise RuntimeError(
                             f'Discriminator type is not found. {data_type.reference.path}'
                         )
@@ -780,7 +795,11 @@ class Parser(ABC):
                         ) != property_name:
                             continue
                         literals = discriminator_field.data_type.literals
-                        if len(literals) == 1 and literals[0] == type_name:
+                        if (
+                            len(literals) == 1 and literals[0] == type_names[0]
+                            if type_names
+                            else None
+                        ):
                             has_one_literal = True
                             continue
                         for (
@@ -789,7 +808,7 @@ class Parser(ABC):
                             if field_data_type.reference:  # pragma: no cover
                                 field_data_type.remove_reference()
                         discriminator_field.data_type = self.data_type(
-                            literals=[type_name]
+                            literals=type_names
                         )
                         discriminator_field.data_type.parent = discriminator_field
                         discriminator_field.required = True
@@ -799,7 +818,7 @@ class Parser(ABC):
                         discriminator_model.fields.append(
                             self.data_model_field_type(
                                 name=property_name,
-                                data_type=self.data_type(literals=[type_name]),
+                                data_type=self.data_type(literals=type_names),
                                 required=True,
                             )
                         )
@@ -1235,6 +1254,7 @@ class Parser(ABC):
 
             scoped_model_resolver = ModelResolver()
 
+            self.__override_required_field(models)
             self.__replace_unique_list_to_set(models)
             self.__change_from_import(models, imports, scoped_model_resolver, init)
             self.__extract_inherited_enum(models)
@@ -1242,7 +1262,6 @@ class Parser(ABC):
             self.__reuse_model(models, require_update_action_models)
             self.__collapse_root_models(models, unused_models, imports)
             self.__set_default_enum_member(models)
-            self.__override_required_field(models)
             self.__sort_models(models, imports)
             self.__set_one_literal_on_default(models)
             self.__apply_discriminator_type(models, imports)

{datamodel_code_generator-0.25.4 → datamodel_code_generator-0.25.6}/datamodel_code_generator/parser/graphql.py

@@ -156,6 +156,8 @@ class GraphQLParser(Parser):
         known_third_party: Optional[List[str]] = None,
         custom_formatters: Optional[List[str]] = None,
         custom_formatters_kwargs: Optional[Dict[str, Any]] = None,
+        use_pendulum: bool = False,
+        http_query_parameters: Optional[Sequence[Tuple[str, str]]] = None,
     ) -> None:
         super().__init__(
             source=source,
@@ -221,6 +223,8 @@ class GraphQLParser(Parser):
             known_third_party=known_third_party,
             custom_formatters=custom_formatters,
             custom_formatters_kwargs=custom_formatters_kwargs,
+            use_pendulum=use_pendulum,
+            http_query_parameters=http_query_parameters,
         )
 
         self.data_model_scalar_type = data_model_scalar_type

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

@@ -118,6 +118,7 @@ json_schema_data_formats: Dict[str, Dict[str, Types]] = {
         'date-time': Types.date_time,
         'time': Types.time,
         'password': Types.password,
+        'path': Types.path,
         'email': Types.email,
         'idn-email': Types.email,
         'uuid': Types.uuid,
@@ -437,6 +438,8 @@ class JsonSchemaParser(Parser):
         known_third_party: Optional[List[str]] = None,
         custom_formatters: Optional[List[str]] = None,
         custom_formatters_kwargs: Optional[Dict[str, Any]] = None,
+        use_pendulum: bool = False,
+        http_query_parameters: Optional[Sequence[Tuple[str, str]]] = None,
     ) -> None:
         super().__init__(
             source=source,
@@ -502,6 +505,8 @@ class JsonSchemaParser(Parser):
             known_third_party=known_third_party,
             custom_formatters=custom_formatters,
             custom_formatters_kwargs=custom_formatters_kwargs,
+            use_pendulum=use_pendulum,
+            http_query_parameters=http_query_parameters,
         )
 
         self.remote_object_cache: DefaultPutDict[str, Dict[str, Any]] = DefaultPutDict()
@@ -632,9 +637,9 @@ class JsonSchemaParser(Parser):
 
     def set_additional_properties(self, name: str, obj: JsonSchemaObject) -> None:
         if isinstance(obj.additionalProperties, bool):
-            self.extra_template_data[name][
-                'additionalProperties'
-            ] = obj.additionalProperties
+            self.extra_template_data[name]['additionalProperties'] = (
+                obj.additionalProperties
+            )
 
     def set_title(self, name: str, obj: JsonSchemaObject) -> None:
         if obj.title:

{datamodel_code_generator-0.25.4 → datamodel_code_generator-0.25.6}/datamodel_code_generator/parser/openapi.py

@@ -220,6 +220,8 @@ class OpenAPIParser(JsonSchemaParser):
         known_third_party: Optional[List[str]] = None,
         custom_formatters: Optional[List[str]] = None,
         custom_formatters_kwargs: Optional[Dict[str, Any]] = None,
+        use_pendulum: bool = False,
+        http_query_parameters: Optional[Sequence[Tuple[str, str]]] = None,
     ):
         super().__init__(
             source=source,
@@ -285,6 +287,8 @@ class OpenAPIParser(JsonSchemaParser):
             known_third_party=known_third_party,
             custom_formatters=custom_formatters,
             custom_formatters_kwargs=custom_formatters_kwargs,
+            use_pendulum=use_pendulum,
+            http_query_parameters=http_query_parameters,
         )
         self.open_api_scopes: List[OpenAPIScope] = openapi_scopes or [
             OpenAPIScope.Schemas

{datamodel_code_generator-0.25.4 → datamodel_code_generator-0.25.6}/datamodel_code_generator/types.py

@@ -548,6 +548,7 @@ class Types(Enum):
     date = auto()
     date_time = auto()
     password = auto()
+    path = auto()
     email = auto()
     uuid = auto()
     uuid1 = auto()
@@ -577,6 +578,7 @@ class DataTypeManager(ABC):
         strict_types: Optional[Sequence[StrictTypes]] = None,
         use_non_positive_negative_number_constrained_types: bool = False,
         use_union_operator: bool = False,
+        use_pendulum: bool = False,
     ) -> None:
         self.python_version = python_version
         self.use_standard_collections: bool = use_standard_collections
@@ -586,6 +588,7 @@ class DataTypeManager(ABC):
             use_non_positive_negative_number_constrained_types
         )
         self.use_union_operator: bool = use_union_operator
+        self.use_pendulum: bool = use_pendulum
 
         if (
             use_generic_container_types and python_version == PythonVersion.PY_36

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

@@ -23,8 +23,7 @@ if TYPE_CHECKING:
 
     from typing_extensions import Literal
 
-    def load_toml(path: Path) -> Dict[str, Any]:
-        ...
+    def load_toml(path: Path) -> Dict[str, Any]: ...
 
 else:
     try:

datamodel_code_generator-0.25.6/datamodel_code_generator/version.py

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

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "datamodel-code-generator"
-version = "0.25.4"
+version = "0.25.6"
 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.2.1"
+ruff = ">=0.0.290,<0.4.2"
 ruff-lsp = ">=0.0.39,<0.0.41"
 pre-commit = "*"
 pytest-xdist = "^3.3.1"

datamodel_code_generator-0.25.4/datamodel_code_generator/version.py

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