Sojan JoseandGitHub
eae9841eb4
Token-authenticated requests to Agent Bots, Labels, and affected Captain endpoints return normal responses again. The regression was caused by duplicate `current_account` callbacks in subclasses moving account resolution behind the API entitlement check, leaving `Current.account` unset. ## Closes - https://linear.app/chatwoot/issue/CW-7641/5xx-errors-in-agent-bot-apis ## How to reproduce 1. Send `GET /api/v1/accounts/:account_id/agent_bots` with a valid administrator API access token. 2. Observe a `500` from `validate_token_api_access` because `Current.account` is `nil`. 3. With this change, account resolution runs in the base-controller order and the request succeeds. ## What changed - Removed redundant `current_account` callbacks from account-scoped controllers that already inherit the callback from `Api::V1::Accounts::BaseController`. - Kept the standalone direct-upload controller callback unchanged. - Added regression coverage for administrator API-token access to Agent Bots.
84 lines
2.5 KiB
Ruby
84 lines
2.5 KiB
Ruby
class Api::V1::Accounts::Captain::PreferencesController < Api::V1::Accounts::BaseController
|
|
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(
|
|
default: default_model_for(feature_key),
|
|
enabled: account_features[feature_key] == true,
|
|
model: route[:model],
|
|
selected: route[:model],
|
|
provider: route[:provider],
|
|
source: route[:source]
|
|
)
|
|
end
|
|
end
|
|
|
|
def default_model_for(feature_key)
|
|
return Llm::FeatureRouter::CAPTAIN_V2_ASSISTANT_MODEL if feature_key == 'assistant' && Current.account.feature_enabled?('captain_integration_v2')
|
|
|
|
Llm::Models.default_model_for(feature_key)
|
|
end
|
|
end
|