Reviewing files that changed from the base of the PR and between f59786f and 49e4303.

• tests/data/jsonschema/collapse_root_models_name_strategy_child.json is excluded by !tests/data/**/*.json and included by none
• tests/data/jsonschema/collapse_root_models_name_strategy_direct_refs.json is excluded by !tests/data/**/*.json and included by none
• tests/data/jsonschema/collapse_root_models_name_strategy_multiple_wrappers.json is excluded by !tests/data/**/*.json and included by none
• tests/data/jsonschema/collapse_root_models_name_strategy_parent.json is excluded by !tests/data/**/*.json and included by none
• tests/data/jsonschema/collapse_root_models_name_strategy_with_inheritance.json is excluded by !tests/data/**/*.json and included by none

• docs/cli-reference/index.md
• docs/cli-reference/model-customization.md
• docs/cli-reference/quick-reference.md
• src/datamodel_code_generator/__init__.py
• src/datamodel_code_generator/__main__.py
• src/datamodel_code_generator/arguments.py
• src/datamodel_code_generator/cli_options.py
• src/datamodel_code_generator/parser/base.py
• src/datamodel_code_generator/parser/graphql.py
• src/datamodel_code_generator/parser/jsonschema.py
• src/datamodel_code_generator/parser/openapi.py
• src/datamodel_code_generator/prompt_data.py
• tests/data/expected/main/jsonschema/jsonschema_collapse_root_models_name_strategy_child.py
• tests/data/expected/main/jsonschema/jsonschema_collapse_root_models_name_strategy_direct_refs.py
• tests/data/expected/main/jsonschema/jsonschema_collapse_root_models_name_strategy_multiple_wrappers.py
• tests/data/expected/main/jsonschema/jsonschema_collapse_root_models_name_strategy_parent.py
• tests/data/expected/main/jsonschema/jsonschema_collapse_root_models_name_strategy_with_inheritance.py
• tests/main/jsonschema/test_main_jsonschema.py

tests/data/expected/main/jsonschema/jsonschema_collapse_root_models_name_strategy_multiple_wrappers.py (1)

10-24: The expected output correctly preserves all three classes (SharedInner, Wrapper1, Wrapper2) without collapsing. The test function at line 4999 confirms this is intentional: when the parent strategy is applied to a schema with multiple wrappers referencing the same inner model, the code issues a UserWarning ("Cannot apply 'parent' strategy when inner model has multiple root models") and skips the collapse operation to avoid ambiguity. This design correctly prevents semantic loss—collapsing would either lose the Wrapper1/Wrapper2 distinction (child strategy) or create ambiguity about which wrapper name to preserve (parent strategy). The expected output is correct.

tests/data/expected/main/jsonschema/jsonschema_collapse_root_models_name_strategy_with_inheritance.py (1)

1-20: Expected inheritance fixture looks consistent with feature intent

The generated Wrapper/Derived/Model layout is clean, uses the modern from __future__ import annotations + | None style, and matches the intended “parent strategy with inheritance” scenario for the new option.

tests/data/expected/main/jsonschema/jsonschema_collapse_root_models_name_strategy_parent.py (1)

1-15: Parent-strategy expected output matches requested behavior

Preserving ISectionBlockMetadata as the inner model name and wiring Model.metadata to it aligns with the “keep wrapper name” requirement from the linked issue, and the style matches other expected fixtures.

src/datamodel_code_generator/parser/graphql.py (1)

16-31: New name-strategy parameter is correctly plumbed through GraphQLParser

Importing CollapseRootModelsNameStrategy, adding an optional collapse_root_models_name_strategy argument, and forwarding it into super().__init__ keeps the API backward compatible while enabling the new behavior for GraphQL inputs as well. The parameter is grouped next to collapse_root_models, which keeps the signature coherent.

Also applies to: 175-176, 285-287

docs/cli-reference/quick-reference.md (1)

80-90: Quick-reference entries for --collapse-root-models-name-strategy are accurate and consistent

The new option is correctly listed under Model Customization and in the alphabetical index, with a concise description that matches the test docstring and points to the model-customization.md#collapse-root-models-name-strategy anchor.

Also applies to: 186-202

tests/main/jsonschema/test_main_jsonschema.py (1)

4951-5031: New tests give solid coverage for --collapse-root-models-name-strategy behavior

The added tests exercise:

• Happy-path behavior for both child and parent strategies (including CLI-doc coverage for child),
• The argument validation error when the strategy is used without --collapse-root-models, and
• Warning paths where parent cannot be safely applied (multiple wrappers, direct refs), plus an inheritance case.

The use of run_main_and_assert, pytest.warns, and function-name–derived expected filenames is consistent with the rest of the suite and should keep the new option well guarded against regressions.

docs/cli-reference/index.md (1)

14-18: Category count and index entry stay consistent with new option

The Model Customization count bump to 34 and the new --collapse-root-models-name-strategy entry under C are consistent and correctly linked to the detailed docs section.

Also applies to: 48-50

src/datamodel_code_generator/prompt_data.py (1)

23-31: New prompt description matches option semantics

The OPTION_DESCRIPTIONS entry for --collapse-root-models-name-strategy is concise and aligned with the intended behavior of choosing the kept name when collapsing root models.

tests/data/expected/main/jsonschema/jsonschema_collapse_root_models_name_strategy_child.py (1)

1-15: Expected output correctly reflects child naming strategy

The generated models keep the inner FieldType2 name and reference it from Model.metadata, which matches the documented child behavior for --collapse-root-models-name-strategy.

src/datamodel_code_generator/cli_options.py (1)

83-88: CLI metadata wiring for new option is correct

CLI_OPTION_META now includes --collapse-root-models-name-strategy in the Model category, matching the argparse option and keeping docs sync infrastructure intact.

src/datamodel_code_generator/parser/openapi.py (1)

20-36: OpenAPI parser correctly threads the new naming strategy to the base parser

The added import, constructor parameter, and super().__init__ forwarding for collapse_root_models_name_strategy are consistent with existing configuration plumbing and ensure OpenAPI benefits from the same collapse-root-models naming behavior as JSON Schema.

Also applies to: 259-262, 299-372

src/datamodel_code_generator/parser/jsonschema.py (1)

27-27: LGTM! Parameter threading is clean and consistent.

The new collapse_root_models_name_strategy parameter is properly imported, typed, and forwarded to the parent Parser class, following the same pattern as the existing collapse_root_models parameter.

Also applies to: 601-601, 711-711

src/datamodel_code_generator/__init__.py (2)

302-310: Excellent enum documentation.

The CollapseRootModelsNameStrategy enum is well-documented with clear explanations of both the Child and Parent strategies, making it easy for users to understand the behavior.

---

529-529: Parameter correctly integrated into generate() API.

The new parameter is properly added to the function signature and forwarded to the parser initialization.

Also applies to: 803-803

src/datamodel_code_generator/__main__.py (3)

28-28: Configuration field properly integrated.

The new collapse_root_models_name_strategy field is correctly added to the Config model with appropriate typing.

Note: The static analysis hint about line 491's noqa: UP045 directive is a false positive—the directive is necessary to maintain consistency with other Optional type annotations in the Config class.

Also applies to: 491-491

---

959-964: Validation logic is correct.

The validation appropriately enforces that --collapse-root-models-name-strategy can only be used when --collapse-root-models is enabled, with a clear error message.

---

808-808: Parameter correctly forwarded to generate function.

The collapse_root_models_name_strategy is properly passed through from the config to the generate() call.

tests/data/expected/main/jsonschema/jsonschema_collapse_root_models_name_strategy_direct_refs.py (1)

1-24: Test data file for direct-refs scenario.

This is an expected output file used for test validation. No review needed as it represents generated output that will be compared against actual generation results during testing.

src/datamodel_code_generator/parser/base.py (2)

30-30: LGTM! Proper parameter threading for the new strategy.

The new collapse_root_models_name_strategy parameter is correctly imported, added to __init__, and stored as an instance variable. The None default ensures backward compatibility.

Also applies to: 754-754, 944-944

---

1714-1784: Excellent implementation with thorough conflict detection.

The strategy implementation is well-designed:

• Backward compatibility: The None check (lines 1716-1718) preserves existing behavior when no strategy is specified.
• Defensive checks: Proper validation prevents edge cases:
  • Multiple wrappers referencing the same inner model (lines 1735-1742)
  • Direct non-wrapper references to the inner model (lines 1754-1760)
• Clear warnings: Users are informed when the strategy cannot be applied, helping them understand why their configuration isn't taking effect.
• Correct reference management: The code properly rewires references (lines 1770-1778) and cleans up unused wrappers (lines 1781-1783).

The Parent strategy implementation (line 1763) correctly renames the inner model to adopt the wrapper's name, addressing the issue described in #1418.

Reviewing files that changed from the base of the PR and between 49e4303 and 572afef.

• src/datamodel_code_generator/parser/base.py

src/datamodel_code_generator/parser/base.py (4)

30-30: LGTM!

Import addition is correct and properly placed.

---

754-754: LGTM!

Parameter addition maintains backward compatibility with None default.

---

944-944: LGTM!

Instance variable assignment follows existing patterns.

---

1683-1683: Remove unused noqa directive.

The complexity checks (PLR0912, PLR0914, PLR0915) are not triggered for this method, so the noqa directive is unnecessary.

🔎 Proposed fix

-    def __collapse_root_models(  # noqa: PLR0912, PLR0914, PLR0915
+    def __collapse_root_models(

⛔ Skipped due to learnings

Learnt from: koxudaxi
Repo: koxudaxi/datamodel-code-generator PR: 2681
File: tests/cli_doc/test_cli_doc_coverage.py:82-82
Timestamp: 2025-12-18T13:43:16.235Z
Learning: In datamodel-code-generator project, Ruff preview mode is enabled via `lint.preview = true` in pyproject.toml. This enables preview rules like PLR6301 (no-self-use), so `noqa: PLR6301` directives are necessary and should not be removed even if RUF100 suggests they are unused.

Reviewing files that changed from the base of the PR and between 572afef and a23b4e0.

• tests/data/jsonschema/collapse_root_models_name_strategy_complex.json is excluded by !tests/data/**/*.json and included by none
• tests/data/jsonschema/collapse_root_models_name_strategy_nested_wrappers.json is excluded by !tests/data/**/*.json and included by none

• src/datamodel_code_generator/parser/base.py
• tests/data/expected/main/jsonschema/jsonschema_collapse_root_models_name_strategy_complex_child.py
• tests/data/expected/main/jsonschema/jsonschema_collapse_root_models_name_strategy_complex_child_v2.py
• tests/data/expected/main/jsonschema/jsonschema_collapse_root_models_name_strategy_complex_parent.py
• tests/data/expected/main/jsonschema/jsonschema_collapse_root_models_name_strategy_complex_parent_v2.py
• tests/data/expected/main/jsonschema/jsonschema_collapse_root_models_name_strategy_nested_wrappers_child.py
• tests/data/expected/main/jsonschema/jsonschema_collapse_root_models_name_strategy_nested_wrappers_parent.py
• tests/data/expected/main/jsonschema/jsonschema_collapse_root_models_name_strategy_nested_wrappers_parent_v2.py
• tests/main/jsonschema/test_main_jsonschema.py

tests/data/expected/main/jsonschema/jsonschema_collapse_root_models_name_strategy_nested_wrappers_child.py (1)

1-15: LGTM! Test fixture correctly demonstrates the "child" naming strategy.

The generated output appropriately shows the inner model name (Inner) being preserved when using the "child" collapse strategy, which aligns with the PR objectives.

tests/data/expected/main/jsonschema/jsonschema_collapse_root_models_name_strategy_nested_wrappers_parent.py (1)

1-19: LGTM! Test fixture correctly demonstrates the "parent" naming strategy for Pydantic v1.

The generated output appropriately shows wrapper names (MiddleWrapper, OuterWrapper) being preserved when using the "parent" collapse strategy with Pydantic v1's __root__ pattern.

tests/data/expected/main/jsonschema/jsonschema_collapse_root_models_name_strategy_nested_wrappers_parent_v2.py (1)

1-19: LGTM! Test fixture correctly demonstrates the "parent" naming strategy for Pydantic v2.

The generated output appropriately shows wrapper names being preserved when using the "parent" collapse strategy with Pydantic v2's RootModel pattern.

tests/data/expected/main/jsonschema/jsonschema_collapse_root_models_name_strategy_complex_parent.py (1)

1-27: LGTM! Test fixture correctly demonstrates the "parent" naming strategy with inheritance.

The generated output appropriately shows wrapper names (UserWrapper, AdminWrapper, SettingsWrapper) being preserved, including proper inheritance (AdminWrapper(UserWrapper)), when using the "parent" collapse strategy in complex scenarios.

src/datamodel_code_generator/parser/base.py (3)

30-30: LGTM! Import addition is correct.

The CollapseRootModelsNameStrategy enum import is properly placed alongside other strategy/enum imports.

---

754-754: LGTM! Parameter properly threaded through Parser initialization.

The collapse_root_models_name_strategy parameter is correctly typed with CollapseRootModelsNameStrategy | None, has an appropriate default of None, and is properly stored as an instance variable.

Also applies to: 944-944

---

1714-1774: LGTM! Parent strategy implementation is well-designed and addresses previous feedback.

The collapse logic for the new CollapseRootModelsNameStrategy.Parent strategy is robust:

1. Validation checks prevent incorrect collapsing:

   • Lines 1722-1737: Warns and skips when multiple wrappers reference the same inner model
   • Lines 1739-1754: Warns and skips when the inner model is directly referenced by non-wrapper models

2. Proper metadata synchronization (lines 1756-1758):

   • Updates inner_model.class_name
   • Updates inner_model.reference.name
   • Calls inner_model.set_reference_path()

   This addresses the past review comment about keeping reference metadata consistent after renaming.

3. Clean reference management (lines 1762-1774):

   • Correctly updates reference children
   • Removes unused imports
   • Marks wrapper for removal when no longer referenced

tests/main/jsonschema/test_main_jsonschema.py (1)

4951-5076: Comprehensive test coverage for the new feature.

The test suite thoroughly covers the new --collapse-root-models-name-strategy option with tests for:

• Both child and parent strategies
• Error validation when --collapse-root-models is missing
• Warning scenarios (multiple wrappers, direct references)
• Edge cases (inheritance, nested wrappers, complex schemas)

The tests follow existing patterns and properly use pytest.warns for warning validation.

tests/data/expected/main/jsonschema/jsonschema_collapse_root_models_name_strategy_complex_parent_v2.py (1)

1-27: Expected output correctly demonstrates parent naming strategy.

The file shows wrapper names (UserWrapper, AdminWrapper, SettingsWrapper) are preserved in the parent strategy, as opposed to the child strategy which uses inner names (Person, Admin, Config). This correctly validates the intended behavior of the --collapse-root-models-name-strategy parent option.

Reviewing files that changed from the base of the PR and between a23b4e0 and ffd73c9.

• tests/main/jsonschema/test_main_jsonschema.py

Reviewing files that changed from the base of the PR and between ffd73c9 and f4283e2.

• tests/data/graphql/additional-imports-in-extra-template-data.json is excluded by !tests/data/**/*.json and included by none
• tests/data/graphql/additional-imports-list-format.json is excluded by !tests/data/**/*.json and included by none
• tests/data/graphql/additional-imports-partial.json is excluded by !tests/data/**/*.json and included by none
• tests/data/jsonschema/extras.json is excluded by !tests/data/**/*.json and included by none
• tests/data/jsonschema/multiline_description_with_example.json is excluded by !tests/data/**/*.json and included by none
• tests/data/jsonschema/multiple_examples.json is excluded by !tests/data/**/*.json and included by none
• tests/data/jsonschema/property_names_allof_ref.json is excluded by !tests/data/**/*.json and included by none
• tests/data/jsonschema/property_names_enum.json is excluded by !tests/data/**/*.json and included by none
• tests/data/jsonschema/property_names_enum_integers.json is excluded by !tests/data/**/*.json and included by none
• tests/data/jsonschema/property_names_min_max_length.json is excluded by !tests/data/**/*.json and included by none
• tests/data/jsonschema/property_names_nested.json is excluded by !tests/data/**/*.json and included by none
• tests/data/jsonschema/property_names_no_additional.json is excluded by !tests/data/**/*.json and included by none
• tests/data/jsonschema/property_names_pattern.json is excluded by !tests/data/**/*.json and included by none
• tests/data/jsonschema/single_line_description_with_example.json is excluded by !tests/data/**/*.json and included by none
• tests/data/openapi/schema_extensions.yaml is excluded by !tests/data/**/*.yaml and included by none
• tests/data/openapi/x_property_names.yaml is excluded by !tests/data/**/*.yaml and included by none
• tests/data/openapi/x_property_names_non_dict.yaml is excluded by !tests/data/**/*.yaml and included by none
• tests/data/templates_extensions/pydantic_v2/BaseModel.jinja2 is excluded by none and included by none
• uv.lock is excluded by !**/*.lock, !**/*.lock and included by none

• docs/cli-reference/field-customization.md
• docs/cli-reference/general-options.md
• docs/cli-reference/index.md
• docs/cli-reference/quick-reference.md
• docs/custom_template.md
• docs/using_as_module.md
• pyproject.toml
• src/datamodel_code_generator/__init__.py
• src/datamodel_code_generator/__main__.py
• src/datamodel_code_generator/arguments.py
• src/datamodel_code_generator/cli_options.py
• src/datamodel_code_generator/http.py
• src/datamodel_code_generator/model/base.py
• src/datamodel_code_generator/parser/base.py
• src/datamodel_code_generator/parser/graphql.py
• src/datamodel_code_generator/parser/jsonschema.py
• src/datamodel_code_generator/parser/openapi.py
• src/datamodel_code_generator/prompt_data.py
• tests/data/expected/main/jsonschema/field_extras.py
• tests/data/expected/main/jsonschema/field_extras_field_extra_keys.py
• tests/data/expected/main/jsonschema/field_extras_field_extra_keys_v2.py
• tests/data/expected/main/jsonschema/field_extras_field_include_all_keys.py
• tests/data/expected/main/jsonschema/field_extras_field_include_all_keys_v2.py
• tests/data/expected/main/jsonschema/field_extras_v2.py
• tests/data/expected/main/jsonschema/jsonschema_collapse_root_models_name_strategy_nested_wrappers_parent_v2.py
• tests/data/expected/main/jsonschema/property_names_allof_ref.py
• tests/data/expected/main/jsonschema/property_names_enum.py
• tests/data/expected/main/jsonschema/property_names_enum_integers.py
• tests/data/expected/main/jsonschema/property_names_min_max_length.py
• tests/data/expected/main/jsonschema/property_names_nested.py
• tests/data/expected/main/jsonschema/property_names_no_additional.py
• tests/data/expected/main/jsonschema/property_names_pattern.py
• tests/data/expected/main/jsonschema/string_dict.py
• tests/data/expected/main/openapi/schema_extensions.py
• tests/data/expected/main/openapi/x_property_names.py
• tests/data/expected/main/openapi/x_property_names_non_dict.py
• tests/data/expected/main_kr/main_use_field_description_example/output.py
• tests/data/expected/main_kr/main_use_field_description_example_multiple/output.py
• tests/data/expected/main_kr/main_use_field_description_with_example/output.py
• tests/data/expected/main_kr/main_use_inline_field_description_example_only/output.py
• tests/data/expected/main_kr/main_use_inline_field_description_with_example/output.py
• tests/main/graphql/test_main_graphql.py
• tests/main/jsonschema/test_main_jsonschema.py
• tests/main/openapi/test_main_openapi.py
• tests/main/test_main_general.py
• tests/main/test_main_json.py
• tests/parser/test_jsonschema.py
• tests/test_main_kr.py

• tests/data/expected/main_kr/main_use_field_description_example/output.py

• src/datamodel_code_generator/arguments.py
• src/datamodel_code_generator/prompt_data.py
• docs/cli-reference/index.md
• src/datamodel_code_generator/parser/graphql.py

tests/data/expected/main/jsonschema/field_extras_field_extra_keys_v2.py (1)

19-19: Code is technically correct; verify relevance to PR scope.

The addition of the status field is syntactically correct and follows standard Pydantic patterns. However, this test file appears to validate field extras functionality, while the PR objectives focus on adding --collapse-root-models-name-strategy.

Please confirm this change is intentional and related to the PR scope, or if it's a side effect of test fixture regeneration.

tests/data/expected/main/jsonschema/string_dict.py (2)

7-7: LGTM!

The Field import is correctly added to support the title parameter on the __root__ field below.

---

11-11: LGTM! Consider verifying alignment with the new naming strategy.

The addition of Field(..., title='MyStringDict') correctly preserves the model name as a title on the root field. This aligns with the PR's objective to add a naming strategy for collapsed root models.

Since this is a test expectation file, please verify that this output correctly demonstrates the intended behavior of the new --collapse-root-models-name-strategy option when preserving parent/root model names.

tests/data/expected/main_kr/main_use_inline_field_description_with_example/output.py (1)

1-21: LGTM - Valid test fixture for inline field description with example.

This test fixture correctly demonstrates the expected output when using the --use-field-description-example option with multiline descriptions. The attribute docstring pattern following the field definition is a recognized convention for documentation tools.

tests/data/expected/main_kr/main_use_inline_field_description_example_only/output.py (1)

1-14: LGTM - Valid test fixture for example-only inline documentation.

The fixture correctly shows the expected output when a field has a single-line description with an example, where the attribute docstring displays only the example value.

tests/data/expected/main_kr/main_use_field_description_example_multiple/output.py (1)

1-18: LGTM - Valid test fixture for multiple examples.

The fixture correctly demonstrates the expected output when a field has multiple examples, using the examples (plural) parameter in Field() and formatting them as a bullet list in the attribute docstring.

tests/data/expected/main_kr/main_use_field_description_with_example/output.py (1)

1-26: LGTM - Valid test fixture demonstrating various example patterns.

The fixture correctly demonstrates multiple field example scenarios:

• Single example with description
• Both example and examples parameters (line 17 shows the expected behavior when both are present)
• examples only with array value

The attribute docstrings are consistently formatted for each pattern.

pyproject.toml (1)

107-107: Version 0.0.15 is the latest available version and is safe to use.

The zensical version is current and valid. There are no newer releases available, and the bump from 0.0.13 to 0.0.15 aligns with recent development activity in the library.

tests/main/graphql/test_main_graphql.py (4)

368-384: LGTM! Test follows established patterns.

The test correctly verifies that additional_imports can be specified via the --extra-template-data JSON file in string format. The structure, skip condition, and assertion approach are consistent with existing tests in this file.

---

387-403: LGTM! List format test is well-structured.

This test properly verifies that additional_imports can be specified in list format within the extra-template-data JSON, complementing the string format test above.

---

406-424: LGTM! Merge test covers an important scenario.

This test correctly verifies that additional_imports from both CLI (--additional-imports) and extra-template-data are properly merged, which is essential functionality.

---

368-424: Clarify relationship to PR objectives.

The PR title is "Add --collapse-root-models-name-strategy" and references issue #1418 about preserving root model names during collapse operations. However, these tests are for additional_imports functionality in GraphQL code generation, which appears unrelated to the stated PR objectives.

Please clarify:

• Are these tests part of a separate feature that was bundled into this PR?
• Is the AI summary incomplete and missing context about additional_imports changes?
• Should these tests be in a different PR?

tests/data/expected/main/jsonschema/property_names_min_max_length.py (1)

7-13: No changes needed. This is a test fixture showing the expected generator output when --field-constraints is not specified. The generator deliberately produces constr by default and supports modern Annotated[str, StringConstraints(...)] patterns via the --field-constraints flag. The test explicitly validates that constr is generated for this scenario.

Likely an incorrect or invalid review comment.

tests/main/test_main_json.py (1)

182-182: LGTM! HTTP timeout assertion updated correctly.

The test now correctly asserts that timeout=30.0 is passed to httpx.get, aligning with the new HTTP timeout functionality introduced in this PR.

tests/parser/test_jsonschema.py (1)

90-90: LGTM! HTTP timeout assertions updated consistently.

All test assertions now correctly verify that timeout=30.0 is passed to httpx.get calls, ensuring the new HTTP timeout functionality is properly tested across JSON Schema parser scenarios.

Also applies to: 120-120, 158-158, 193-193

tests/data/expected/main/jsonschema/field_extras_field_include_all_keys_v2.py (1)

32-32: LGTM! Expected test output updated correctly.

The addition of the status field with an example demonstrates correct handling of field examples in the generated code.

tests/data/expected/main/openapi/x_property_names_non_dict.py (1)

1-11: LGTM! Expected output for x-propertyNames test case.

The generated code correctly uses RootModel[dict[str, str]] to represent a non-dict property names scenario for OpenAPI schema extensions.

tests/data/expected/main/jsonschema/property_names_no_additional.py (1)

1-13: LGTM! Expected output for propertyNames constraint.

The generated code correctly applies the pattern constraint ^[a-z]+$ to dictionary keys using constr, demonstrating proper handling of JSON Schema propertyNames validation.

tests/data/expected/main/jsonschema/property_names_enum.py (1)

1-13: LGTM! Expected output for propertyNames enum constraint.

The generated code correctly uses Literal['name', 'age', 'email'] to constrain dictionary keys to specific values, demonstrating proper handling of JSON Schema propertyNames with enum validation.

tests/data/expected/main/jsonschema/property_names_enum_integers.py (1)

1-11: LGTM! Expected output for integer enum propertyNames.

The generated code correctly falls back to dict[str, str] for integer enum constraints on property names, which is appropriate since JSON object keys must be strings.

tests/data/expected/main/openapi/x_property_names.py (1)

1-11: LGTM! Expected output for OpenAPI x-propertyNames extension.

The generated code correctly handles the x-propertyNames extension by applying pattern constraints to dictionary keys using constr(pattern=r'^[a-z]+$'), consistent with JSON Schema propertyNames handling.

tests/data/expected/main/jsonschema/property_names_pattern.py (1)

1-11: LGTM!

The generated test file correctly demonstrates the new propertyNames pattern constraint support. The RootModel with dict[constr(pattern=...), str] is the appropriate pattern for constraining dictionary keys, and the structure aligns with the similar file in tests/data/expected/main/openapi/x_property_names.py.

src/datamodel_code_generator/model/base.py (3)

322-332: Edge case: empty examples list may cause unexpected behavior.

The condition on line 326 if examples and isinstance(examples, list) and len(examples) > 1 correctly guards against empty lists for the multi-example case. However, line 331 elif examples and isinstance(examples, list) and len(examples) == 1 handles single-item lists.

If examples is an empty list [], both conditions are false, so no example is added—which is correct. The logic handles this edge case properly.

---

317-320: Verify the interaction between use_inline_field_description and use_field_description_example.

This block only adds the description to parts when using inline field description with examples AND the description contains a newline. This seems intentional to prevent duplicating single-line descriptions (which would appear both inline and in docstring).

However, the condition elif self.use_inline_field_description and self.use_field_description_example means this block is only reached when use_field_description is False (due to the preceding if). Ensure this interaction is the intended behavior for the combined flags.

---

152-152: LGTM!

The new use_field_description_example field follows the established pattern for boolean configuration flags in DataModelFieldBase.

tests/data/expected/main/openapi/schema_extensions.py (1)

1-19: LGTM!

The generated test file correctly demonstrates the new schema extensions (x-*) support, with the __collection__ class attribute being populated from OpenAPI schema extensions. This validates that extensions are properly passed through to custom templates.

tests/data/expected/main/jsonschema/property_names_nested.py (1)

1-11: LGTM!

The generated test file correctly demonstrates propertyNames constraints on nested dictionary properties. The Parent model with an optional child field of type dict[constr(pattern=...), str] properly shows how key constraints propagate to nested object properties.

tests/data/expected/main/jsonschema/jsonschema_collapse_root_models_name_strategy_nested_wrappers_parent_v2.py (1)

1-19: LGTM!

The generated test file correctly demonstrates the "Parent" naming strategy for --collapse-root-models-name-strategy. With the parent strategy, OuterWrapper retains its name (the outer/root model's name) rather than being replaced by the inner model's name. This aligns with the PR objective from issue #1418.

src/datamodel_code_generator/http.py (2)

26-27: LGTM!

The DEFAULT_HTTP_TIMEOUT = 30.0 constant is a sensible default and is properly used as the parameter default value.

---

34-45: LGTM!

The timeout parameter is correctly added and properly passed through to httpx.get(). The implementation follows the existing pattern for other HTTP configuration parameters.

tests/test_main_kr.py (5)

334-356: LGTM!

Good test coverage for the new --use-field-description-example flag. The test is properly decorated with @pytest.mark.cli_doc for documentation generation and uses the established run_main_and_assert pattern.

---

359-404: Good coverage of combined flag scenarios.

These tests cover important combinations:

• --use-field-description + --use-field-description-example
• --use-inline-field-description + --use-field-description-example

This ensures the interaction between description-related flags works correctly.

---

407-437: Good edge case coverage.

Tests for:

• Single-line description with inline + example flags (only example in docstring)
• Multiple examples formatting as bulleted list

These align with the logic implemented in DataModelFieldBase.docstring.

---

1538-1570: LGTM!

The HTTP timeout test properly:

1. Mocks httpx.get to avoid actual network calls
2. Passes --http-timeout 60 via CLI
3. Asserts the timeout value is correctly passed to httpx.get as 60.0

---

104-109: Behavior is correct and intentional.

When no --output file is specified, the tool correctly outputs generated code to stdout. The test properly verifies that running with modular input and no output file produces the expected classes in stdout.

tests/data/expected/main/jsonschema/field_extras_field_include_all_keys.py (1)

27-28: LGTM!

The new status field follows the established pattern for field extras, using Field(None, examples=['active']) which aligns with the existing age field's use of the examples parameter.

tests/data/expected/main/jsonschema/field_extras_field_extra_keys.py (1)

20-20: LGTM!

The new status field follows the same pattern as existing fields and correctly uses the examples parameter.

tests/data/expected/main/jsonschema/field_extras.py (1)

13-13: LGTM!

The status field addition is consistent with the test expectations for field examples support.

tests/data/expected/main/jsonschema/field_extras_v2.py (1)

13-13: LGTM!

Consistent addition of the status field with examples support.

docs/custom_template.md (1)

78-159: LGTM! Well-documented feature addition.

The Schema Extensions documentation is clear and includes helpful examples showing how to use x- prefixed fields in custom templates. The static analysis warnings about "emphasis as heading" (MD036) are false positives—the bold text labels are appropriate for code example annotations, not misused headings.

docs/cli-reference/quick-reference.md (1)

74-74: LGTM! Clean documentation additions.

The three new CLI options are properly documented in both the categorized tables and alphabetical index with correct links and descriptions.

Also applies to: 90-90, 164-164, 203-203, 239-239, 291-291

src/datamodel_code_generator/cli_options.py (1)

84-86: LGTM! Properly categorized CLI option metadata.

The three new CLI options are correctly registered with appropriate categories (MODEL, FIELD, GENERAL) and follow the established pattern.

Also applies to: 137-139, 239-239

docs/cli-reference/general-options.md (1)

1605-1662: The --http-timeout documentation is well-structured with no duplication issues.

The search confirms only one --http-timeout section exists in the file (line 1605). No duplication was found. The documentation includes clear descriptions, usage examples, and concrete JSON/Python code samples.

tests/data/expected/main/jsonschema/property_names_allof_ref.py (1)

14-15: Input schema file not found; unable to verify expected output.

The expected output file references property_names_allof_ref.json as input, but this file could not be located in the repository despite thorough searching. Without access to the input schema, the correctness of the empty Model class cannot be verified.

docs/cli-reference/field-customization.md (1)

25-26: New field-description example option and examples look coherent

The added --use-field-description-example row, updated extras/status examples, and the new sections for both --use-field-description-example and --use-inline-field-description are internally consistent: inputs and outputs line up, anchors match option names, and behavior is described clearly (single vs multiple examples, interaction with descriptions). I don’t see any issues here.

Also applies to: 1556-1566, 1575-1596, 1600-1620, 1670-1720, 2879-2970, 2974-3306

tests/main/openapi/test_main_openapi.py (2)

1681-1697: HTTP timeout assertions correctly cover new default behavior

The updated httpx_get_mock.assert_has_calls expectations now include timeout=30.0 for both the primary OpenAPI fetch and nested refs, and similarly for the body/parameters remote ref test. This accurately pins the new default timeout wiring without over-specifying other parameters. Looks good.

Also applies to: 1758-1765

---

4466-4487: x-propertyNames tests nicely cover both happy path and invalid-input behavior

The new tests for x-propertyNames verify both correct translation to propertyNames and the non-dict case being ignored, following the existing OpenAPI test patterns (input path, expected file, pydantic_v2 output). This gives solid coverage for the extension handling with clear, focused assertions.

docs/using_as_module.md (1)

7-8: Updated generate() usage and return-value docs are clear and consistent

The new sections for getting generated code as a string, handling multi-module output via GeneratedModules, and the return-value summary table accurately describe the different behaviors based on output. The examples are coherent and the note about raising datamodel_code_generator.Error when multiple modules target a single file path sets expectations well.

Also applies to: 15-62, 190-199

src/datamodel_code_generator/parser/openapi.py (4)

20-38: LGTM!

The CollapseRootModelsNameStrategy import is correctly added alongside related imports from datamodel_code_generator.

---

184-298: LGTM!

The three new parameters (use_field_description_example, http_timeout, collapse_root_models_name_strategy) are properly added to the __init__ signature with correct type annotations and default values that match their usage patterns.

---

301-410: LGTM!

All three new parameters are correctly propagated to the super().__init__() call, maintaining consistency with the parameter order in the parent JsonSchemaParser class.

---

748-779: LGTM!

The use_field_description_example parameter is correctly propagated to the data_model_field_type constructor call within parse_all_parameters, enabling field description examples to be included when parsing operation parameters.

tests/main/test_main_general.py (6)

10-22: LGTM!

New imports for inline_snapshot, GeneratedModules, and SchemaParseError are correctly added to support the new test cases.

---

479-554: LGTM!

Comprehensive test coverage for SchemaParseError:

• test_schema_parse_error_includes_path: Validates error message contains schema path context
• test_schema_parse_error_includes_nested_path: Validates nested path references (e.g., $defs/MyModel)
• test_schema_parse_error_original_error: Verifies original_error and path attributes are preserved
• test_schema_parse_error_without_path: Tests error formatting when no path is provided

---

1517-1591: LGTM!

Good test coverage for the generate() return value behavior:

• Returns str when output=None for single file
• Returns str for Pydantic v2 and dataclass model types
• Returns None when an output path is provided

---

1593-1630: LGTM!

test_generate_file_content_matches_return_value properly validates that the string returned by generate() with output=None matches the content written to a file when output is provided. This is important for API consistency.

---

1632-1723: Consider adding cleanup for temporary files.

The test creates two schema files in tmp_path but relies solely on pytest's tmp_path fixture for cleanup. While this works, the test could be more robust by verifying the returned dict structure more explicitly.

Also, the snapshot at line 1673-1676 shows test_generate_returns_dict_for0 which appears truncated - this is expected behavior from the temp directory name, but the assertion validates the structure correctly.

---

1725-1792: LGTM!

Good coverage of custom_file_header behavior with generate():

• Basic custom header
• Header containing code after docstring (validates future import extraction)
• Header with disable_future_imports=True

src/datamodel_code_generator/__main__.py (7)

23-43: LGTM!

The CollapseRootModelsNameStrategy import is correctly added to the imports from datamodel_code_generator.

---

449-449: LGTM!

New use_field_description_example config field correctly added with bool type and False default.

---

485-493: LGTM!

New config fields http_timeout and collapse_root_models_name_strategy are correctly added with appropriate types and defaults.

---

551-563: LGTM!

The _extract_additional_imports helper function cleanly extracts additional_imports from extra_template_data entries, handling both string and list formats. The use of pop() ensures imports aren't duplicated in the template data.

---

741-876: LGTM!

run_generate_from_config properly:

1. Passes through the three new parameters (use_field_description_example, http_timeout, collapse_root_models_name_strategy)
2. Captures the return value from generate()
3. Handles both str and dict return types when output is None, writing to stdout appropriately

---

984-990: LGTM!

Proper validation that --collapse-root-models-name-strategy requires --collapse-root-models to be set. This prevents user confusion from setting a naming strategy without enabling the collapse feature.

---

1016-1024: LGTM!

The logic to extract and merge additional_imports from extra_template_data into config.additional_imports is correct. The assert on line 1017 is safe since we're inside the else branch where extra_template_data is assigned from json.load().

src/datamodel_code_generator/__init__.py (9)

85-91: LGTM!

The GeneratedModules type alias is well-defined and documented. Using tuple[str, ...] as the key type allows for flexible module path representation (e.g., ("models", "user.py")).

---

309-318: LGTM!

The CollapseRootModelsNameStrategy enum is correctly defined with clear documentation explaining the Child and Parent strategies for naming when collapsing root models.

---

411-432: LGTM!

The SchemaParseError exception class properly:

• Extends the base Error class
• Stores path and original_error for debugging
• Formats the message with path context when available
• Falls back to plain message when no path is provided

---

482-521: LGTM!

The _build_module_content helper function correctly handles:

• Future import extraction and repositioning after custom headers
• Header insertion point calculation via _find_future_import_insertion_point
• Edge cases when body is empty or no custom header is provided

---

523-654: LGTM!

The generate() function signature is properly updated with:

• New parameters: use_field_description_example, http_timeout, collapse_root_models_name_strategy
• Updated return type annotation: str | GeneratedModules | None
• Updated docstring documenting the three return scenarios

---

656-668: LGTM!

The HTTP timeout handling correctly:

• Imports DEFAULT_HTTP_TIMEOUT from the http module
• Uses user-provided http_timeout if not None, otherwise falls back to default
• Passes the timeout to get_body() call

---

841-888: LGTM!

All three new parameters are correctly passed to the parser constructor:

• use_field_description_example (line 841)
• http_timeout (line 878)
• collapse_root_models_name_strategy (line 887)

---

948-979: LGTM!

The new return value handling for output=None case properly:

• Returns str for single-module output (using _build_module_content)
• Returns GeneratedModules dict for multi-module output
• Correctly sanitizes filenames and applies custom headers

---

1086-1107: LGTM!

The __all__ list is correctly updated to export GeneratedModules and SchemaParseError.

src/datamodel_code_generator/parser/base.py (2)

25-38: New CollapseRootModelsNameStrategy import is consistent with downstream usage

The enum import is correctly added and matches the new collapse_root_models_name_strategy type annotations below. No issues here.

---

2911-2923: Updated __collapse_root_models call signature is consistent

Passing imports and scoped_model_resolver into __collapse_root_models matches the updated method signature and enables it to manage imports when collapsing/root‑model rewrites are performed. No functional concerns here.

src/datamodel_code_generator/parser/jsonschema.py (8)

24-41: New imports (CollapseRootModelsNameStrategy, SchemaParseError) are appropriate

Both CollapseRootModelsNameStrategy and SchemaParseError are used meaningfully later (JsonSchemaParser.__init__ and _validate_schema_object respectively). The import block remains tidy and consistent with existing style.

---

534-757: JsonSchemaParser.init: new options are correctly threaded to the base Parser

• The new parameters use_field_description_example, http_timeout, and collapse_root_models_name_strategy are added to JsonSchemaParser.__init__ and passed straight through to super().__init__, matching the base Parser signature.
• This keeps the JSON Schema parser aligned with the core configuration surface. Just ensure the CLI/options layer is updated to map the new flags correctly (especially defaulting the collapse name strategy as intended).

---

1105-1107: use_field_description_example is consistently passed to DataModelField construction

The new use_field_description_example flag is threaded through all relevant data_model_field_type call sites (object fields, bool properties, arrays, root types, enums, etc.), matching the parser’s self.use_field_description_example attribute. This wiring looks internally consistent; behavior will be driven by the DataModelField implementation.

Also applies to: 2197-2212, 2629-2633, 2667-2669, 2770-2772, 2833-2837, 2923-2926, 2955-2958, 3017-3018, 3040-3041

---

1165-1171: Schema extensions (x-*) are now exposed to templates in a uniform way

• set_schema_extensions correctly filters obj.extras for keys starting with "x-" and attaches them under extra_template_data[path]["extensions"].
• Call sites cover object models, root models (arrays, primitives, combined allOf), and enum root wrappers, so templates can consistently access schema extensions regardless of construct.
• No functional issues spotted; this is a straightforward, useful addition.

Also applies to: 1172-1177, 1920-1921, 2072-2073, 2126-2127, 2297-2299, 2647-2649, 2751-2753, 2817-2819, 2943-2944, 3017-3018

---

2330-2377: Traversal and patternProperties integration remain consistent after adding propertyNames

• parse_pattern_properties is unchanged and still aggregates patterns by value type, which is fine.
• _traverse_schema_objects and _add_id_callback are extended to descend into propertyNames, ensuring $id and $ref resolution covers constraints defined there as well.
• No functional regressions apparent; recursion remains well‑bounded (no new cycles introduced).

Also applies to: 3153-3158

---

2589-2637: Array parsing + extensions/description-example integration look consistent

• parse_array_fields and parse_array now:
  • Preserve the previous constraints/nullable/required logic,
  • Attach schema extensions via set_schema_extensions,
  • And pass use_field_description_example through to the constructed field(s).
• The self‑reference handling in parse_array is unchanged aside from threading the new flag.
• Overall, array behavior should stay backward compatible while enabling the new features.

Also applies to: 2647-2669

---

2923-3041: Enum parsing: extensions and description-example flag are wired consistently

• For both nullable and non‑nullable enum schemas, the code now:
  • Attaches schema extensions to the appropriate reference path before building root wrappers.
  • Passes use_field_description_example into the enum field(s), ensuring this feature applies uniformly.
• Control flow and nullability handling are otherwise unchanged, so existing behavior should be preserved.

---

3132-3213: Traversal and id-resolution updates for propertyNames are correct

• _traverse_schema_objects and _add_id_callback now also walk propertyNames, ensuring both $ref resolution and $id registration work for property‑name constraint schemas.
• This mirrors existing handling for patternProperties and additionalProperties, keeping traversal semantics coherent.

tests/main/jsonschema/test_main_jsonschema.py (1)

3117-3220: PropertyNames test matrix looks solid and idiomatic.

The new property_names_* tests cleanly exercise the key propertyNames behaviors (pattern, enum, length, no additionalProperties, nesting, allOf+$ref) against pydantic_v2.BaseModel and integrate correctly with run_main_and_assert/golden files. No issues from the test harness side.