Skip to content

Merge pipeline config overlays by model ID#2290

Open
hogeheer499-commits wants to merge 1 commit into
microsoft:mainfrom
hogeheer499-commits:fix/config-overlay-pipeline-model-id
Open

Merge pipeline config overlays by model ID#2290
hogeheer499-commits wants to merge 1 commit into
microsoft:mainfrom
hogeheer499-commits:fix/config-overlay-pipeline-model-id

Conversation

@hogeheer499-commits

Copy link
Copy Markdown

Description

Fixes #2004.

Config::overlay() currently appends decoder and vision pipeline entries even when an entry with the same model_id already exists. A partial component overlay can therefore create a duplicate entry with an empty filename, causing model loading to fail.

This change:

  • reuses the matching pipeline entry and only appends unknown model IDs;
  • preserves existing component filenames and session_options while applying a partial overlay;
  • resets the active parser element before an append can reallocate the pipeline vector;
  • applies the same semantics to decoder and vision pipelines.

The existing replacement behavior for run_options is unchanged.

Testing

  • Added ConfigTests.PipelineOverlayMergesByModelId, covering:
    • two existing IDs, with only the second targeted;
    • preservation of the untouched entry, filename, log ID, and provider options;
    • addition of a new ID;
    • decoder and vision pipelines.
  • Confirmed the regression test fails against current main (four entries instead of three) and passes with this change.
  • Built the CPU RelWithDebInfo targets and ran the full CTest suite: 100% passed.
  • Verified end to end with the Python binding: the existing ID now creates one profiled session, while a new ID still adds a second session.
  • clang-format, lintrunner, and git diff --check pass.

AI assistance

OpenAI Codex (GPT-5) was used to assist with investigation, implementation, review, and testing. The resulting behavior was validated against current main with both unit and end-to-end tests.

@hogeheer499-commits hogeheer499-commits requested a review from a team as a code owner July 11, 2026 12:04
Copilot AI review requested due to automatic review settings July 11, 2026 12:04
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
There may be pipelines that require an authorized user to comment /azp run to run.

@microsoft-github-policy-service

Copy link
Copy Markdown
Contributor

@hogeheer499-commits please read the following Contributor License Agreement(CLA). If you agree with the CLA, please reply with the following information.

@microsoft-github-policy-service agree [company="{your company}"]

Options:

  • (default - no company specified) I have sole ownership of intellectual property rights to my Submissions and I am not making Submissions in the course of work for my employer.
@microsoft-github-policy-service agree
  • (when company given) I am making Submissions in the course of work for my employer (or my employer has intellectual property rights in my Submissions by contract or applicable law). I have permission from my employer to make Submissions and enter into this Agreement on behalf of my employer. By signing below, the defined term “You” includes me and my employer.
@microsoft-github-policy-service agree company="Microsoft"
Contributor License Agreement

Contribution License Agreement

This Contribution License Agreement (“Agreement”) is agreed to by the party signing below (“You”),
and conveys certain license rights to Microsoft Corporation and its affiliates (“Microsoft”) for Your
contributions to Microsoft open source projects. This Agreement is effective as of the latest signature
date below.

  1. Definitions.
    “Code” means the computer software code, whether in human-readable or machine-executable form,
    that is delivered by You to Microsoft under this Agreement.
    “Project” means any of the projects owned or managed by Microsoft and offered under a license
    approved by the Open Source Initiative (www.opensource.org).
    “Submit” is the act of uploading, submitting, transmitting, or distributing code or other content to any
    Project, including but not limited to communication on electronic mailing lists, source code control
    systems, and issue tracking systems that are managed by, or on behalf of, the Project for the purpose of
    discussing and improving that Project, but excluding communication that is conspicuously marked or
    otherwise designated in writing by You as “Not a Submission.”
    “Submission” means the Code and any other copyrightable material Submitted by You, including any
    associated comments and documentation.
  2. Your Submission. You must agree to the terms of this Agreement before making a Submission to any
    Project. This Agreement covers any and all Submissions that You, now or in the future (except as
    described in Section 4 below), Submit to any Project.
  3. Originality of Work. You represent that each of Your Submissions is entirely Your original work.
    Should You wish to Submit materials that are not Your original work, You may Submit them separately
    to the Project if You (a) retain all copyright and license information that was in the materials as You
    received them, (b) in the description accompanying Your Submission, include the phrase “Submission
    containing materials of a third party:” followed by the names of the third party and any licenses or other
    restrictions of which You are aware, and (c) follow any other instructions in the Project’s written
    guidelines concerning Submissions.
  4. Your Employer. References to “employer” in this Agreement include Your employer or anyone else
    for whom You are acting in making Your Submission, e.g. as a contractor, vendor, or agent. If Your
    Submission is made in the course of Your work for an employer or Your employer has intellectual
    property rights in Your Submission by contract or applicable law, You must secure permission from Your
    employer to make the Submission before signing this Agreement. In that case, the term “You” in this
    Agreement will refer to You and the employer collectively. If You change employers in the future and
    desire to Submit additional Submissions for the new employer, then You agree to sign a new Agreement
    and secure permission from the new employer before Submitting those Submissions.
  5. Licenses.
  • Copyright License. You grant Microsoft, and those who receive the Submission directly or
    indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license in the
    Submission to reproduce, prepare derivative works of, publicly display, publicly perform, and distribute
    the Submission and such derivative works, and to sublicense any or all of the foregoing rights to third
    parties.
  • Patent License. You grant Microsoft, and those who receive the Submission directly or
    indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license under
    Your patent claims that are necessarily infringed by the Submission or the combination of the
    Submission with the Project to which it was Submitted to make, have made, use, offer to sell, sell and
    import or otherwise dispose of the Submission alone or with the Project.
  • Other Rights Reserved. Each party reserves all rights not expressly granted in this Agreement.
    No additional licenses or rights whatsoever (including, without limitation, any implied licenses) are
    granted by implication, exhaustion, estoppel or otherwise.
  1. Representations and Warranties. You represent that You are legally entitled to grant the above
    licenses. You represent that each of Your Submissions is entirely Your original work (except as You may
    have disclosed under Section 3). You represent that You have secured permission from Your employer to
    make the Submission in cases where Your Submission is made in the course of Your work for Your
    employer or Your employer has intellectual property rights in Your Submission by contract or applicable
    law. If You are signing this Agreement on behalf of Your employer, You represent and warrant that You
    have the necessary authority to bind the listed employer to the obligations contained in this Agreement.
    You are not expected to provide support for Your Submission, unless You choose to do so. UNLESS
    REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, AND EXCEPT FOR THE WARRANTIES
    EXPRESSLY STATED IN SECTIONS 3, 4, AND 6, THE SUBMISSION PROVIDED UNDER THIS AGREEMENT IS
    PROVIDED WITHOUT WARRANTY OF ANY KIND, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY OF
    NONINFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.
  2. Notice to Microsoft. You agree to notify Microsoft in writing of any facts or circumstances of which
    You later become aware that would make Your representations in this Agreement inaccurate in any
    respect.
  3. Information about Submissions. You agree that contributions to Projects and information about
    contributions may be maintained indefinitely and disclosed publicly, including Your name and other
    information that You submit with Your Submission.
  4. Governing Law/Jurisdiction. This Agreement is governed by the laws of the State of Washington, and
    the parties consent to exclusive jurisdiction and venue in the federal courts sitting in King County,
    Washington, unless no federal subject matter jurisdiction exists, in which case the parties consent to
    exclusive jurisdiction and venue in the Superior Court of King County, Washington. The parties waive all
    defenses of lack of personal jurisdiction and forum non-conveniens.
  5. Entire Agreement/Assignment. This Agreement is the entire agreement between the parties, and
    supersedes any and all prior agreements, understandings or communications, written or oral, between
    the parties relating to the subject matter hereof. This Agreement may be assigned by Microsoft.

Reuse matching decoder and vision pipeline entries when applying config overlays, preserving filenames and existing session options. Unknown IDs continue to append in order.

Reset active parser wrappers before vector growth and add a model-free regression test covering targeted updates and new IDs.

Fixes microsoft#2004
@hogeheer499-commits hogeheer499-commits force-pushed the fix/config-overlay-pipeline-model-id branch from 47d288a to 95da9e4 Compare July 11, 2026 12:05

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR fixes Config::overlay() pipeline overlay semantics so decoder/vision pipeline entries are merged by model_id instead of always appended, preventing duplicate entries with empty filename that can break model loading (Issue #2004).

Changes:

  • Merge pipeline overlays by reusing an existing pipeline entry when model_id matches; only append for new IDs.
  • Preserve existing pipeline component filename and session_options on partial overlays (while keeping run_options replacement behavior unchanged).
  • Avoid potential invalidation by resetting the active per-entry JSON parser element before appending to the pipeline vector.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File Description
src/config.cpp Updates JSON overlay parsing to merge decoder/vision pipeline models by model_id and preserve existing per-model session_options on partial overlays.
test/config_tests.cpp Adds a regression test asserting correct merge-by-model_id behavior for both decoder and vision pipelines.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Config::overlay() on pipeline session_options causes "File doesn't exist" on Model load

2 participants