Merge branch 'main' into required-nullable-annotated

Author: koxudaxi

.github/workflows/test.yaml

@@ -25,20 +25,20 @@ jobs:
         os: [ubuntu-24.04, windows-latest, macos-latest]
         tox_env: ['']
         include:
-          - tox_env: py3.12-black24-parallel
-            name: py3.12-black24
-          - tox_env: py3.12-black23-parallel
-            name: py3.12-black23
-          - tox_env: py3.12-black22-parallel
-            name: py3.12-black22
-          - tox_env: py3.12-isort7-parallel
-            name: py3.12-isort7
-          - tox_env: py3.12-isort6-parallel
-            name: py3.12-isort6
-          - tox_env: py3.12-isort5-parallel
-            name: py3.12-isort5
-          - tox_env: py3.12-pydantic1-parallel
-            name: py3.12-pydantic1
+          - tox_env: py312-black24-parallel
+            name: py312-black24
+          - tox_env: py312-black23-parallel
+            name: py312-black23
+          - tox_env: py312-black22-parallel
+            name: py312-black22
+          - tox_env: py312-isort7-parallel
+            name: py312-isort7
+          - tox_env: py312-isort6-parallel
+            name: py312-isort6
+          - tox_env: py312-isort5-parallel
+            name: py312-isort5
+          - tox_env: py312-pydantic1-parallel
+            name: py312-pydantic1
     runs-on: ${{ matrix.os == '' && 'ubuntu-24.04' || matrix.os }}
     env:
       OS: ${{ matrix.os == '' && 'ubuntu-24.04' || matrix.os}}
@@ -54,18 +54,39 @@ jobs:
     - name: Install tox
       run: uv tool install --python-preference only-managed --python 3.13 tox --with tox-uv
     - name: Setup Python test environment
-      run: tox run -vv --notest --skip-missing-interpreters false -e ${{ matrix.py && format('{0}-parallel', matrix.py) || matrix.tox_env }}
+      run: |
+        if [ -n "${{ matrix.py }}" ]; then
+          TOX_ENV="py${{ matrix.py }}-parallel"
+          TOX_ENV="${TOX_ENV//.}"
+        else
+          TOX_ENV="${{ matrix.tox_env }}"
+        fi
+        tox run -vv --notest --skip-missing-interpreters false -e $TOX_ENV
+      shell: bash
       env:
         UV_PYTHON_PREFERENCE: "only-managed"
     - name: Run test suite
-      run: tox run --skip-uv-sync --skip-pkg-install -e ${{ matrix.py && format('{0}-parallel', matrix.py) || matrix.tox_env }}
+      run: |
+        if [ -n "${{ matrix.py }}" ]; then
+          TOX_ENV="py${{ matrix.py }}-parallel"
+          TOX_ENV="${TOX_ENV//.}"
+        else
+          TOX_ENV="${{ matrix.tox_env }}"
+        fi
+        tox run --skip-uv-sync --skip-pkg-install -e $TOX_ENV
+      shell: bash
       env:
         UV_PYTHON_PREFERENCE: "only-managed"
     - name: Rename coverage report file
       run: |
         import os; import sys
-        env_name = "${{ matrix.py && format('{0}-parallel', matrix.py) || matrix.tox_env }}"
-        base_name = "${{ matrix.py || matrix.tox_env }}"
+        py = "${{ matrix.py }}"
+        if py:
+            env_name = f"py{py.replace('.', '')}-parallel"
+            base_name = py
+        else:
+            env_name = "${{ matrix.tox_env }}"
+            base_name = "${{ matrix.tox_env }}"
         os.rename(f".tox/.coverage.{env_name}", f".tox/.coverage.{base_name}-${{ matrix.os }}")
       shell: python
     - name: Upload coverage data

.pre-commit-config.yaml

@@ -18,7 +18,7 @@ repos:
     - id: pyproject-fmt
       args: ["--max-supported-python=3.14"]
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: 'v0.14.7'
+  rev: 'v0.14.8'
   hooks:
   - id: ruff-format
     exclude: "^tests/data"

README.md

@@ -393,9 +393,12 @@ Typing customization:
                         corresponding con* constrained types.
   --use-one-literal-as-default
                         Use one literal as default value for one literal field
+  --use-serialize-as-any
+                        Use pydantic.SerializeAsAny for fields with types that have subtypes
+                        (Pydantic v2 only)
   --use-specialized-enum, --no-use-specialized-enum
-                        Don''t use specialized Enum class (StrEnum, IntEnum) even if the
-                        target Python version supports it
+                        Use specialized Enum class (StrEnum, IntEnum). Requires --target-
+                        python-version 3.11+
   --use-standard-collections
                         Use standard collections for type hinting (list, dict)
   --use-subclass-enum   Define generic Enum class as subclass with field type when enum has
@@ -441,6 +444,8 @@ Field customization:
                         default values.
   --use-field-description
                         Use schema description to populate field docstring
+  --use-frozen-field    Use Field(frozen=True) for readOnly fields (Pydantic v2) or
+                        Field(allow_mutation=False) (Pydantic v1)
   --use-inline-field-description
                         Use schema description to populate field docstring as inline
                         docstring
@@ -566,7 +571,10 @@ General options:
   --generate-pyproject-config
                         Generate pyproject.toml configuration from the provided CLI
                         arguments and exit
+  --ignore-pyproject    Ignore pyproject.toml configuration
   --no-color            disable colorized output
+  --profile PROFILE     Use a named profile from pyproject.toml [tool.datamodel-
+                        codegen.profiles.<name>]
   --version             show version
   -h, --help            show this help message and exit
 ```

docs/index.md

@@ -385,9 +385,12 @@ Typing customization:
                         corresponding con* constrained types.
   --use-one-literal-as-default
                         Use one literal as default value for one literal field
+  --use-serialize-as-any
+                        Use pydantic.SerializeAsAny for fields with types that have subtypes
+                        (Pydantic v2 only)
   --use-specialized-enum, --no-use-specialized-enum
-                        Don''t use specialized Enum class (StrEnum, IntEnum) even if the
-                        target Python version supports it
+                        Use specialized Enum class (StrEnum, IntEnum). Requires --target-
+                        python-version 3.11+
   --use-standard-collections
                         Use standard collections for type hinting (list, dict)
   --use-subclass-enum   Define generic Enum class as subclass with field type when enum has
@@ -433,6 +436,8 @@ Field customization:
                         default values.
   --use-field-description
                         Use schema description to populate field docstring
+  --use-frozen-field    Use Field(frozen=True) for readOnly fields (Pydantic v2) or
+                        Field(allow_mutation=False) (Pydantic v1)
   --use-inline-field-description
                         Use schema description to populate field docstring as inline
                         docstring
@@ -558,7 +563,10 @@ General options:
   --generate-pyproject-config
                         Generate pyproject.toml configuration from the provided CLI
                         arguments and exit
+  --ignore-pyproject    Ignore pyproject.toml configuration
   --no-color            disable colorized output
+  --profile PROFILE     Use a named profile from pyproject.toml [tool.datamodel-
+                        codegen.profiles.<name>]
   --version             show version
   -h, --help            show this help message and exit
 ```

docs/pyproject_toml.md

@@ -1,12 +1,115 @@
-datamodel-code-generator has a lot of command-line options.
+# pyproject.toml Configuration
 
-The options are supported on `pyproject.toml`.
+datamodel-code-generator can be configured using `pyproject.toml`. The tool automatically searches for `pyproject.toml` in the current directory and parent directories (stopping at the git repository root).
 
-Example `pyproject.toml`:
-```toml 
+## Basic Usage
+
+```toml
 [tool.datamodel-codegen]
+input = "schema.yaml"
+output = "models.py"
+target-python-version = "3.11"
+snake-case-field = true
 field-constraints = true
+```
+
+All CLI options can be used in `pyproject.toml` by converting them to kebab-case (e.g., `--snake-case-field` becomes `snake-case-field`).
+
+## Named Profiles
+
+You can define multiple named profiles for different use cases within a single project:
+
+```toml
+[tool.datamodel-codegen]
+target-python-version = "3.9"
+snake-case-field = true
+
+[tool.datamodel-codegen.profiles.api]
+input = "schemas/api.yaml"
+output = "src/models/api.py"
+target-python-version = "3.11"
+
+[tool.datamodel-codegen.profiles.database]
+input = "schemas/db.json"
+output = "src/models/db.py"
+input-file-type = "jsonschema"
+```
+
+Base settings in `[tool.datamodel-codegen]` are used when no profile is specified, and also serve as defaults for profiles.
+
+Use a profile with the `--profile` option:
+
+```bash
+datamodel-codegen --profile api
+datamodel-codegen --profile database
+```
+
+## Configuration Priority
+
+Settings are applied in the following priority order (highest to lowest):
+
+1. **CLI arguments** - Always take precedence
+2. **Profile settings** - From `[tool.datamodel-codegen.profiles.<name>]`
+3. **Base settings** - From `[tool.datamodel-codegen]`
+4. **Default values** - Built-in defaults
+
+## Merge Rules
+
+When using profiles, settings are merged using **shallow merge**:
+
+- Profile values **completely replace** base values (no deep merging)
+- Settings not specified in the profile are inherited from the base configuration
+- Lists and dictionaries are replaced entirely, not merged
+
+### Example
+
+```toml
+[tool.datamodel-codegen]
+strict-types = ["str", "int"]
+http-headers = ["Authorization: Bearer token"]
+
+[tool.datamodel-codegen.profiles.api]
+strict-types = ["bytes"]
+```
+
+When using `--profile api`:
+
+- `strict-types` becomes `["bytes"]` (completely replaces base, not merged)
+- `http-headers` is inherited from base as `["Authorization: Bearer token"]`
+
+## Ignoring pyproject.toml
+
+To ignore all `pyproject.toml` configuration and use only CLI arguments:
+
+```bash
+datamodel-codegen --ignore-pyproject --input schema.yaml --output models.py
+```
+
+## Generating Configuration
+
+Generate a `pyproject.toml` configuration section from CLI arguments:
+
+```bash
+datamodel-codegen --input schema.yaml --output models.py --snake-case-field --generate-pyproject-config
+```
+
+Output:
+
+```toml
+[tool.datamodel-codegen]
+input = "schema.yaml"
+output = "models.py"
 snake-case-field = true
-strip-default-none = false
-target-python-version = "3.7"
+```
+
+Generate CLI command from existing `pyproject.toml`:
+
+```bash
+datamodel-codegen --generate-cli-command
+```
+
+With a specific profile:
+
+```bash
+datamodel-codegen --profile api --generate-cli-command
 ```

pyproject.toml

@@ -208,6 +208,7 @@ filterwarnings = [
   "ignore:^.*black doesn't support `experimental-string-processing` option for wrapping string literal in .*",
   "ignore:^.*jsonschema.exceptions.RefResolutionError is deprecated as of version 4.18.0. If you wish to catch potential reference resolution errors, directly catch referencing.exceptions.Unresolvable..*",
   "ignore:^.*`experimental string processing` has been included in `preview` and deprecated. Use `preview` instead..*",
+  "ignore:^.*No schemas found in components/schemas.*",
 ]
 norecursedirs = "tests/data/*"
 verbosity_assertions = 2

src/datamodel_code_generator/__init__.py

@@ -418,6 +418,7 @@ def generate(  # noqa: PLR0912, PLR0913, PLR0914, PLR0915
     http_headers: Sequence[tuple[str, str]] | None = None,
     http_ignore_tls: bool = False,
     use_annotated: bool = False,
+    use_serialize_as_any: bool = False,
     use_non_positive_negative_number_constrained_types: bool = False,
     original_field_name_delimiter: str | None = None,
     use_double_quotes: bool = False,
@@ -442,7 +443,9 @@ def generate(  # noqa: PLR0912, PLR0913, PLR0914, PLR0915
     keyword_only: bool = False,
     frozen_dataclasses: bool = False,
     no_alias: bool = False,
+    use_frozen_field: bool = False,
     formatters: list[Formatter] = DEFAULT_FORMATTERS,
+    settings_path: Path | None = None,
     parent_scoped_naming: bool = False,
     dataclass_arguments: DataclassArguments | None = None,
     disable_future_imports: bool = False,
@@ -656,6 +659,7 @@ def get_header_and_first_line(csv_file: IO[str]) -> dict[str, Any]:
         http_headers=http_headers,
         http_ignore_tls=http_ignore_tls,
         use_annotated=use_annotated,
+        use_serialize_as_any=use_serialize_as_any,
         use_non_positive_negative_number_constrained_types=use_non_positive_negative_number_constrained_types,
         original_field_name_delimiter=original_field_name_delimiter,
         use_double_quotes=use_double_quotes,
@@ -679,6 +683,7 @@ def get_header_and_first_line(csv_file: IO[str]) -> dict[str, Any]:
         keyword_only=keyword_only,
         frozen_dataclasses=frozen_dataclasses,
         no_alias=no_alias,
+        use_frozen_field=use_frozen_field,
         formatters=formatters,
         encoding=encoding,
         parent_scoped_naming=parent_scoped_naming,
@@ -690,6 +695,7 @@ def get_header_and_first_line(csv_file: IO[str]) -> dict[str, Any]:
 
     with chdir(output):
         results = parser.parse(
+            settings_path=settings_path,
             disable_future_imports=disable_future_imports,
             all_exports_scope=all_exports_scope,
             all_exports_collision_strategy=all_exports_collision_strategy,
@@ -775,7 +781,7 @@ def get_header_and_first_line(csv_file: IO[str]) -> dict[str, Any]:
                 if header_after:
                     content = header_before + "\n" + extracted_future + "\n\n" + header_after
                 else:
-                    content = header_before + "\n\n\n" + extracted_future
+                    content = header_before + "\n\n" + extracted_future
                 print(content, file=file)
                 print(file=file)
                 print(body_without_future.rstrip(), file=file)