## Description Hardens the Captain model override preferences API so account-level overrides follow the same feature-router contract used by runtime LLM calls. The API now permits model and feature keys from `llm.yml`, removes blank model overrides, rejects invalid saved model combinations, and returns each feature's effective model, provider, and source for UI clients. Fixes https://linear.app/chatwoot/issue/CW-7425/test-new-models ## Type of change - [ ] Bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality not to work as expected) - [ ] This change requires a documentation update ## How Has This Been Tested? Verified the account preferences API and account model validation behavior for valid overrides, invalid model values, unknown feature keys, blank override removal, and effective model/provider/source payload metadata. - `eval "$(rbenv init -)" && bundle exec rspec spec/controllers/api/v1/accounts/captain/preferences_controller_spec.rb spec/models/account_spec.rb spec/models/concerns/captain_featurable_spec.rb spec/lib/llm/feature_router_spec.rb` - `eval "$(rbenv init -)" && bundle exec rubocop app/controllers/api/v1/accounts/captain/preferences_controller.rb app/models/concerns/account_settings_schema.rb app/models/concerns/captain_featurable.rb spec/controllers/api/v1/accounts/captain/preferences_controller_spec.rb spec/models/account_spec.rb spec/models/concerns/captain_featurable_spec.rb spec/lib/llm/feature_router_spec.rb` - `git diff --check` ## Checklist: - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my code - [x] I have commented on my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [x] I have added tests that prove my fix is effective or that my feature works - [x] New and existing unit tests pass locally with my changes - [ ] Any dependent changes have been merged and published in downstream modules
78 lines
2.3 KiB
Ruby
78 lines
2.3 KiB
Ruby
class Api::V1::Accounts::Captain::PreferencesController < Api::V1::Accounts::BaseController
|
|
before_action :current_account
|
|
before_action :authorize_account_update, only: [:update]
|
|
|
|
def show
|
|
render json: preferences_payload
|
|
end
|
|
|
|
def update
|
|
params_to_update = captain_params
|
|
@current_account.captain_models = params_to_update[:captain_models] if params_to_update.key?(:captain_models)
|
|
@current_account.captain_features = params_to_update[:captain_features] if params_to_update.key?(:captain_features)
|
|
@current_account.save!
|
|
|
|
render json: preferences_payload
|
|
end
|
|
|
|
private
|
|
|
|
def preferences_payload
|
|
{
|
|
providers: Llm::Models.providers,
|
|
models: Llm::Models.models,
|
|
features: features_with_account_preferences
|
|
}
|
|
end
|
|
|
|
def authorize_account_update
|
|
authorize @current_account, :update?
|
|
end
|
|
|
|
def captain_params
|
|
permitted = {}
|
|
permitted[:captain_models] = merged_captain_models if params[:captain_models].present?
|
|
permitted[:captain_features] = merged_captain_features if params[:captain_features].present?
|
|
permitted
|
|
end
|
|
|
|
def merged_captain_models
|
|
existing_models = @current_account.captain_models || {}
|
|
existing_models.merge(permitted_captain_models).compact_blank.presence
|
|
end
|
|
|
|
def merged_captain_features
|
|
existing_features = @current_account.captain_features || {}
|
|
existing_features.merge(permitted_captain_features)
|
|
end
|
|
|
|
def permitted_captain_models
|
|
params.require(:captain_models).permit(*captain_feature_keys).to_h.stringify_keys
|
|
end
|
|
|
|
def permitted_captain_features
|
|
params.require(:captain_features).permit(*captain_feature_keys).to_h.stringify_keys
|
|
end
|
|
|
|
def captain_feature_keys
|
|
Llm::Models.feature_keys.map(&:to_sym)
|
|
end
|
|
|
|
def features_with_account_preferences
|
|
preferences = Current.account.captain_preferences
|
|
account_features = preferences[:features] || {}
|
|
|
|
Llm::Models.feature_keys.index_with do |feature_key|
|
|
config = Llm::Models.feature_config(feature_key)
|
|
route = Llm::FeatureRouter.resolve(feature: feature_key, account: Current.account)
|
|
config.merge(
|
|
enabled: account_features[feature_key] == true,
|
|
model: route[:model],
|
|
selected: route[:model],
|
|
provider: route[:provider],
|
|
source: route[:source]
|
|
)
|
|
end
|
|
end
|
|
end
|