Fix root model reuse collapse by koxudaxi · Pull Request #3089 · koxudaxi/datamodel-code-generator

koxudaxi · 2026-04-16T05:51:19Z

fixes: #3082

Summary by CodeRabbit

Bug Fixes
- Fixed preservation of field constraints when using model reuse together with root-model collapsing, preventing unintended model deduplication or constraint loss.
Tests
- Added end-to-end test and expected output fixture to verify constraint preservation across reuse and collapse-root-models options.

coderabbitai · 2026-04-16T05:51:33Z

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: b61be919-8a97-461d-8adf-3aa1922db8b5

📥 Commits

Reviewing files that changed from the base of the PR and between 6a8fe65 and ceb0561.

📒 Files selected for processing (1)

tests/main/jsonschema/test_main_jsonschema.py

🚧 Files skipped from review as they are similar to previous changes (1)

tests/main/jsonschema/test_main_jsonschema.py

📝 Walkthrough

Walkthrough

Parser now skips root models during reuse/deduplication when collapse_root_models is enabled, preventing root-model merging that could remove fields or misapply constraints. A targeted test fixture and E2E test were added to validate the behavior.

Changes

Cohort / File(s)	Summary
Core Parser Fix `src/datamodel_code_generator/parser/base.py`	Skip models that are root types from the reuse/deduplication loop when `collapse_root_models` is enabled, avoiding incorrect merging and constraint propagation.
Test Fixture `tests/data/expected/main/jsonschema/reuse_model_collapse_root_models_constraints.py`	Add Pydantic models (`Shared`, `RecordA`, `RecordB`, `ReproBugs`) demonstrating constrained field and root-model structure for the repro case.
E2E Test `tests/main/jsonschema/test_main_jsonschema.py`	Add parametrized test `test_main_reuse_model_collapse_root_models_preserves_constraints` exercising `--reuse-model` with `--collapse-root-models` and variations of `--collapse-reuse-models`, asserting generated output matches the fixture.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~12 minutes

Possibly related PRs

Fix reuse-model generating type aliases instead of class inheritance #2853: Modifies reuse-model behavior in the parser; related to deduplication/reuse changes.
Add --collapse-reuse-models option #2731: Changes Parser.__reuse_model handling for collapsing/reuse of models; closely related logic.
Fix exact imports for reused tree-scope models #3042: Updates child-reference replacement and reuse-model logic in the parser; relevant to reuse flow.

Suggested labels

breaking-change-analyzed

Poem

🐰 I hopped through models, fields in sight,
Two roots once tangled in dedup's bite.
Now roots are skipped when collapse is true,
Constraints kept safe, and logic anew.
🍃🥕

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name	Status	Explanation	Resolution
Docstring Coverage	⚠️ Warning	Docstring coverage is 66.67% which is insufficient. The required threshold is 80.00%.	Write docstrings for the functions missing them to satisfy the coverage threshold.

✅ Passed checks (4 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title 'Fix root model reuse collapse' directly describes the main code change: skipping root model processing in the reuse deduplication loop when collapse_root_models is enabled.
Linked Issues check	✅ Passed	The PR changes skip root model processing in __reuse_model when collapse_root_models is enabled, preventing incorrect merging of constrained root models. A test fixture and E2E test validate that constraints are preserved when reusing/collapsing root models, addressing the core bugs described in issue `#3082`.
Out of Scope Changes check	✅ Passed	All changes are directly scoped to fixing the root model reuse collapse issue: the core parser logic fix, a test fixture demonstrating the fix, and an E2E test validating constraint preservation.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing Touches

📝 Generate docstrings

Create stacked PR
Commit on current branch

🧪 Generate unit tests (beta)

Create PR with unit tests
Commit unit tests in branch fix/reuse-root-collapse

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

github-actions · 2026-04-16T05:52:07Z

📚 Docs Preview: https://pr-3089.datamodel-code-generator.pages.dev

codspeed-hq · 2026-04-16T05:53:51Z

Merging this PR will not alter performance

⚠️

Unknown Walltime execution environment detected

Using the Walltime instrument on standard Hosted Runners will lead to inconsistent data.

For the most accurate results, we recommend using CodSpeed Macro Runners: bare-metal machines fine-tuned for performance measurement consistency.

✅ 11 untouched benchmarks
⏩ 98 skipped benchmarks¹

_{Comparing fix/reuse-root-collapse (ceb0561) with main (5137795)}

98 benchmarks were skipped, so the baseline results were used instead. If they were deleted from the codebase, click here and archive them to remove them from the performance reports. ↩

codecov · 2026-04-16T06:08:15Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 100.00%. Comparing base (5137795) to head (ceb0561).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff            @@
##              main     #3089   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files           87        87           
  Lines        18300     18306    +6     
  Branches      2090      2091    +1     
=========================================
+ Hits         18300     18306    +6

Flag	Coverage Δ
unittests	`100.00% <100.00%> (ø)`

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

github-actions · 2026-04-16T06:10:50Z

Breaking Change Analysis

Result: No breaking changes detected

Reasoning: This PR is a pure bug-fix release addressing issue #3082. Three code changes: (1) parser/base.py skips root-type models during deduplication when collapse_root_models is enabled, preserving field constraints that were previously dropped; (2) main.py Config.merge_args clears non-explicit input source fields when input/url/input_model is set via CLI, fixing config-vs-CLI conflicts; (3) reference.py resolve_ref correctly joins a relative root_id with base_url instead of replacing it. No CLI options, Python API signatures, default values, template contracts, Python version support, or error-handling contracts are changed. Generated output may differ only for users who were previously hitting buggy code paths (e.g., combining --reuse-model with --collapse-root-models), and in those cases the new output is the corrected output — this is a fix, not a breaking change.

This analysis was performed by Claude Code Action

github-actions · 2026-04-16T17:12:50Z

🎉 Released in 0.56.1

This PR is now available in the latest release. See the release notes for details.

Fix root model reuse collapse

6a8fe65

Adjust reuse model test target

ceb0561

koxudaxi merged commit 3e87a9a into main Apr 16, 2026
38 checks passed

koxudaxi deleted the fix/reuse-root-collapse branch April 16, 2026 06:08

github-actions Bot added the breaking-change-analyzed label Apr 16, 2026

github-actions Bot mentioned this pull request Apr 16, 2026

Bugs when combining reuse_model=True with collapse_root_models=True and use_title_as_name=True #3082

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Fix root model reuse collapse#3089

Fix root model reuse collapse#3089
koxudaxi merged 2 commits intomainfrom
fix/reuse-root-collapse

koxudaxi commented Apr 16, 2026 •

edited by coderabbitai Bot

Loading

Uh oh!

coderabbitai Bot commented Apr 16, 2026 •

edited

Loading

Walkthrough

Changes

Estimated code review effort

Possibly related PRs

Suggested labels

Poem

❌ Failed checks (1 warning)

Uh oh!

github-actions Bot commented Apr 16, 2026 •

edited

Loading

Uh oh!

codspeed-hq Bot commented Apr 16, 2026 •

edited

Loading

Uh oh!

codecov Bot commented Apr 16, 2026 •

edited

Loading

Uh oh!

Uh oh!

github-actions Bot commented Apr 16, 2026

Uh oh!

github-actions Bot commented Apr 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Uh oh!

Conversation

koxudaxi commented Apr 16, 2026 • edited by coderabbitai Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary by CodeRabbit

Uh oh!

coderabbitai Bot commented Apr 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Estimated code review effort

Possibly related PRs

Suggested labels

Poem

❌ Failed checks (1 warning)

Uh oh!

github-actions Bot commented Apr 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codspeed-hq Bot commented Apr 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Merging this PR will not alter performance

Footnotes

Uh oh!

codecov Bot commented Apr 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

github-actions Bot commented Apr 16, 2026

Breaking Change Analysis

Uh oh!

github-actions Bot commented Apr 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

koxudaxi commented Apr 16, 2026 •

edited by coderabbitai Bot

Loading

coderabbitai Bot commented Apr 16, 2026 •

edited

Loading

github-actions Bot commented Apr 16, 2026 •

edited

Loading

codspeed-hq Bot commented Apr 16, 2026 •

edited

Loading

codecov Bot commented Apr 16, 2026 •

edited

Loading