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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datamodel-code-generator
-Version: 0.25.6
+Version: 0.25.7
 Summary: Datamodel Code Generator
 Home-page: https://github.com/koxudaxi/datamodel-code-generator
 License: MIT

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

@@ -33,7 +33,7 @@ from datamodel_code_generator.types import chain_as_tuple, get_optional_type
 
 
 def _has_field_assignment(field: DataModelFieldBase) -> bool:
-    return bool(field.field) or not (
+    return not (
         field.required
         or (field.represented_default == 'None' and field.strip_default_none)
     )
@@ -48,7 +48,9 @@ def import_extender(cls: Type[DataModelFieldBaseT]) -> Type[DataModelFieldBaseT]
     @wraps(original_imports.fget)  # type: ignore
     def new_imports(self: DataModelFieldBaseT) -> Tuple[Import, ...]:
         extra_imports = []
-        if self.field:
+        field = self.field
+        # TODO: Improve field detection
+        if field and field.startswith('field('):
             extra_imports.append(IMPORT_MSGSPEC_FIELD)
         if self.field and 'lambda: convert' in self.field:
             extra_imports.append(IMPORT_MSGSPEC_CONVERT)
@@ -177,6 +179,8 @@ class DataModelField(DataModelFieldBase):
 
         if self.default != UNDEFINED and self.default is not None:
             data['default'] = self.default
+        elif not self.required:
+            data['default'] = None
 
         if self.required:
             data = {

{datamodel_code_generator-0.25.6 → datamodel_code_generator-0.25.7}/datamodel_code_generator/model/pydantic_v2/__init__.py

@@ -18,9 +18,11 @@ class ConfigDict(_BaseModel):
     title: Optional[str] = None
     populate_by_name: Optional[bool] = None
     allow_extra_fields: Optional[bool] = None
+    from_attributes: Optional[bool] = None
     frozen: Optional[bool] = None
     arbitrary_types_allowed: Optional[bool] = None
     protected_namespaces: Optional[Tuple[str, ...]] = None
+    regex_engine: Optional[str] = None
 
 
 __all__ = [

{datamodel_code_generator-0.25.6 → datamodel_code_generator-0.25.7}/datamodel_code_generator/model/pydantic_v2/base_model.py

@@ -1,3 +1,4 @@
+import re
 from pathlib import Path
 from typing import (
     TYPE_CHECKING,
@@ -218,6 +219,16 @@ class BaseModel(BaseModelBase):
                 config_parameters['arbitrary_types_allowed'] = True
                 break
 
+        for field in self.fields:
+            # Check if a regex pattern uses lookarounds.
+            # Depending on the generation configuration, the pattern may end up in two different places.
+            pattern = (
+                isinstance(field.constraints, Constraints) and field.constraints.pattern
+            ) or (field.data_type.kwargs or {}).get('pattern')
+            if pattern and re.search(r'\(\?<?[=!]', pattern):
+                config_parameters['regex_engine'] = '"python-re"'
+                break
+
         if isinstance(self.extra_template_data.get('config'), dict):
             for key, value in self.extra_template_data['config'].items():
                 config_parameters[key] = value

{datamodel_code_generator-0.25.6 → datamodel_code_generator-0.25.7}/datamodel_code_generator/model/template/msgspec.jinja2

@@ -18,12 +18,14 @@ class {{ class_name }}:
     {%- if not field.annotated and field.field %}
     {{ field.name }}: {{ field.type_hint }} = {{ field.field }}
     {%- else %}
-    {%- if field.annotated %}
+    {%- if field.annotated and not field.field %}
     {{ field.name }}: {{ field.annotated }}
+    {%- elif field.annotated and field.field %}
+    {{ field.name }}: {{ field.annotated }} = {{ field.field }}
     {%- else %}
     {{ field.name }}: {{ field.type_hint }}
     {%- endif %}
-    {%- if not field.required or field.data_type.is_optional or field.nullable
+    {%- if not field.field and (not field.required or field.data_type.is_optional or field.nullable)
             %} = {{ field.represented_default }}
     {%- endif -%}
     {%- endif %}

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

@@ -700,6 +700,7 @@ class Parser(ABC):
                     from_, import_ = full_path = relative(
                         model.module_name, data_type.full_name
                     )
+                    import_ = import_.replace('-', '_')
 
                 alias = scoped_model_resolver.add(full_path, import_).name
 
@@ -707,7 +708,7 @@ class Parser(ABC):
                 if from_ and import_ and alias != name:
                     data_type.alias = (
                         alias
-                        if from_ == '.' and data_type.full_name == import_
+                        if data_type.reference.short_name == import_
                         else f'{alias}.{name}'
                     )
 
@@ -778,8 +779,18 @@ class Parser(ABC):
                                 discriminator_model.path.split('#/')[-1]
                                 != path.split('#/')[-1]
                             ):
-                                # TODO: support external reference
-                                continue
+                                if (
+                                    path.startswith('#/')
+                                    or discriminator_model.path[:-1]
+                                    != path.split('/')[-1]
+                                ):
+                                    t_path = path[str(path).find('/') + 1 :]
+                                    t_disc = discriminator_model.path[
+                                        : str(discriminator_model.path).find('#')
+                                    ].lstrip('../')
+                                    t_disc_2 = '/'.join(t_disc.split('/')[1:])
+                                    if t_path != t_disc and t_path != t_disc_2:
+                                        continue
                             type_names.append(name)
                     else:
                         type_names = [discriminator_model.path.split('/')[-1]]
@@ -906,6 +917,7 @@ class Parser(ABC):
                             name=model.name,
                             path=model.reference.path + '/reuse',
                         ),
+                        custom_template_dir=model._custom_template_dir,
                     )
                     if cached_model_reference.path in require_update_action_models:
                         require_update_action_models.append(inherited_model.path)
@@ -1249,6 +1261,7 @@ class Parser(ABC):
                     init = True
                 else:
                     module = (*module[:-1], f'{module[-1]}.py')
+                    module = tuple(part.replace('-', '_') for part in module)
             else:
                 module = ('__init__.py',)
 

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

@@ -1311,6 +1311,10 @@ class JsonSchemaParser(Parser):
             data_type = self.data_type_manager.get_data_type_from_full_path(
                 obj.custom_type_path, is_custom_type=True
             )
+        elif obj.is_array:
+            data_type = self.parse_array_fields(
+                name, obj, get_special_path('array', path)
+            ).data_type
         elif obj.anyOf or obj.oneOf:
             reference = self.model_resolver.add(
                 path, name, loaded=True, class_name=True

datamodel_code_generator-0.25.7/datamodel_code_generator/version.py

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

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

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

datamodel_code_generator-0.25.6/datamodel_code_generator/version.py

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