Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dedupe AssistantSettings #23190

Merged
merged 3 commits into from
Jan 15, 2025
Merged

Dedupe AssistantSettings #23190

merged 3 commits into from
Jan 15, 2025

Conversation

maxdeviant
Copy link
Member

@maxdeviant maxdeviant commented Jan 15, 2025

This PR dedupes the AssistantSettings so we can use the same settings for both Assistant1 and Assistant2.

We originally forked them so we could change the Assistant2 settings freely, but given our rollout strategy for the new Assistant, I don't think that makes sense.

This also fixes the issue where the JSON language server would show a "Matches multiple schemas when only one must validate" warning in settings.json.

Closes #23171.

Release Notes:

  • Fixed the "Matches multiple schemas when only one must validate" warning for the assistant setting.

@maxdeviant maxdeviant self-assigned this Jan 15, 2025
@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Jan 15, 2025
@maxdeviant maxdeviant enabled auto-merge (squash) January 15, 2025 18:41
@maxdeviant maxdeviant merged commit e215ca1 into main Jan 15, 2025
10 checks passed
@maxdeviant maxdeviant deleted the marshall/dedupe-assistant-settings branch January 15, 2025 18:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed The user has signed the Contributor License Agreement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Matches multiple schemas when only one must validate.
1 participant