Skip to content

refactor: extract apply_pending_provider_change helper #17

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.

Sign up for GitHub

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

Merged
rbcorrales merged 1 commit into from
May 27, 2026
Merged

refactor: extract apply_pending_provider_change helper #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 33 additions & 24 deletions includes/class-wpvdb-admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1168,6 +1168,37 @@ public function ajax_validate_provider_change() {
}
}

/**
* Apply a pending provider/model change to a settings array.
*
* Sets the active provider/model, mirrors the model into the matching
* per-provider default_model, and clears the pending fields. Returns the
* mutated settings so the caller can persist them; persistence (update_option
* plus cache busting) is intentionally left to the caller because those steps
* differ between the AJAX and admin-post paths.
*
* @param array $settings Current settings array.
* @param string $new_provider Provider to activate.
* @param string $new_model Model to activate.
* @return array Mutated settings array.
*/
private function apply_pending_provider_change( $settings, $new_provider, $new_model ) {
$settings['active_provider'] = $new_provider;
$settings['active_model'] = $new_model;
$settings['provider'] = $new_provider;

if ( 'openai' === $new_provider && isset( $settings['openai'] ) ) {
$settings['openai']['default_model'] = $new_model;
} elseif ( 'automattic' === $new_provider && isset( $settings['automattic'] ) ) {
$settings['automattic']['default_model'] = $new_model;
}

$settings['pending_provider'] = '';
$settings['pending_model'] = '';

return $settings;
}

/**
* Ajax handler for confirming provider/model changes
*/
Expand Down Expand Up @@ -1316,18 +1347,7 @@ public function ajax_confirm_provider_change() {

$job_id = isset( $job['job_id'] ) ? (int) $job['job_id'] : 0;

$settings['active_provider'] = $new_provider;
$settings['active_model'] = $new_model;
$settings['provider'] = $new_provider;

if ( 'openai' === $new_provider && isset( $settings['openai'] ) ) {
$settings['openai']['default_model'] = $new_model;
} elseif ( 'automattic' === $new_provider && isset( $settings['automattic'] ) ) {
$settings['automattic']['default_model'] = $new_model;
}

$settings['pending_provider'] = '';
$settings['pending_model'] = '';
$settings = $this->apply_pending_provider_change( $settings, $new_provider, $new_model );

update_option( 'wpvdb_settings', Settings::normalize_settings_for_storage( $settings ) );
Cache::invalidate_query_cache();
Expand Down Expand Up @@ -2670,18 +2690,7 @@ public function handle_apply_provider_change() {

$job_id = isset( $job['job_id'] ) ? (int) $job['job_id'] : 0;

$settings['active_provider'] = $new_provider;
$settings['active_model'] = $new_model;
$settings['provider'] = $new_provider;

if ( 'openai' === $new_provider && isset( $settings['openai'] ) ) {
$settings['openai']['default_model'] = $new_model;
} elseif ( 'automattic' === $new_provider && isset( $settings['automattic'] ) ) {
$settings['automattic']['default_model'] = $new_model;
}

$settings['pending_provider'] = '';
$settings['pending_model'] = '';
$settings = $this->apply_pending_provider_change( $settings, $new_provider, $new_model );

update_option( 'wpvdb_settings', Settings::normalize_settings_for_storage( $settings ), true );
delete_transient( 'wpvdb_settings' );
Expand Down