Skip to content

Commit 9582118

Browse files
committed
Rename api_providers_manager to model_providers_manager across all command handlers and utilities to ensure consistent naming
1 parent bc00cac commit 9582118

14 files changed

Lines changed: 258 additions & 189 deletions

File tree

‎apps/editor/src/commands/apply-chat-response-command/handlers/active-editor-intelligent-update-handler.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,9 @@ export const handle_active_editor_intelligent_update = async (params: {
199199
dictionary.error_message.ERROR_APPLYING_CHANGES(error.message)
200200
)
201201

202-
const api_providers_manager = new ModelProvidersManager(params.context)
202+
const model_providers_manager = new ModelProvidersManager(params.context)
203203
const api_configuration_result = await get_intelligent_update_config(
204-
api_providers_manager,
204+
model_providers_manager,
205205
true,
206206
params.context
207207
)

‎apps/editor/src/commands/apply-chat-response-command/response-processor.ts‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ import {
1313
import { create_safe_path } from '@/utils/path-sanitizer'
1414
import { dictionary } from '@shared/constants/dictionary'
1515
import { Logger } from '@shared/utils/logger'
16-
import { apply_git_patch, sanitize_patch_content } from './handlers/diff-handler'
16+
import {
17+
apply_git_patch,
18+
sanitize_patch_content
19+
} from './handlers/diff-handler'
1720
import { apply_file_relocations } from './utils/file-operations'
1821
import { ModelProvidersManager } from '@/services/model-providers-manager'
1922
import { get_intelligent_update_config } from '@/utils/intelligent-update-utils'
@@ -250,7 +253,7 @@ export const process_chat_response = async (params: {
250253
type: 'success'
251254
})
252255

253-
await params.panel_provider.switch_to_edit_context()
256+
await params.panel_provider.switch_to_edit_files()
254257
} else if ('created_at' in decision && decision.created_at) {
255258
const history = params.panel_provider.response_history
256259
const new_history = history.filter(
@@ -277,12 +280,14 @@ export const process_chat_response = async (params: {
277280
const key = `${patch.workspace_name || ''}:${patch.file_path}`
278281
rename_map.set(key, {
279282
new_path: patch.new_file_path,
280-
new_workspace: patch.new_workspace_name || patch.workspace_name
283+
new_workspace: patch.new_workspace_name || patch.workspace_name
281284
})
282285
}
283286
})
284287

285-
const set_new_paths_in_original_states = (states: OriginalFileState[]): OriginalFileState[] => {
288+
const set_new_paths_in_original_states = (
289+
states: OriginalFileState[]
290+
): OriginalFileState[] => {
286291
if (!rename_map.size) return states
287292
states.forEach((state) => {
288293
const key = `${state.workspace_name || ''}:${state.file_path}`
@@ -339,7 +344,12 @@ export const process_chat_response = async (params: {
339344
patch.content,
340345
patch.workspace_name
341346
)
342-
const result = await apply_git_patch(sanitized_patch_content, workspace_path, patch.workspace_name, patch)
347+
const result = await apply_git_patch(
348+
sanitized_patch_content,
349+
workspace_path,
350+
patch.workspace_name,
351+
patch
352+
)
343353

344354
if (result.success) {
345355
if (result.diff_application_method && result.original_states) {
@@ -375,7 +385,8 @@ export const process_chat_response = async (params: {
375385
}
376386

377387
if (all_original_states.length > 0) {
378-
all_original_states = set_new_paths_in_original_states(all_original_states)
388+
all_original_states =
389+
set_new_paths_in_original_states(all_original_states)
379390
await apply_file_relocations(all_original_states)
380391
update_undo_button_state({
381392
context: params.context,
@@ -522,11 +533,11 @@ export const process_chat_response = async (params: {
522533

523534
const fake_chat_response = `\`\`\`\n// ${file_path_for_block}\n${params.chat_response}\n\`\`\``
524535

525-
const api_providers_manager = new ModelProvidersManager(
536+
const model_providers_manager = new ModelProvidersManager(
526537
params.context
527538
)
528539
const api_configuration_result = await get_intelligent_update_config(
529-
api_providers_manager,
540+
model_providers_manager,
530541
false,
531542
params.context
532543
)
@@ -535,7 +546,10 @@ export const process_chat_response = async (params: {
535546
return null
536547
}
537548

538-
const { model_provider, api_configuration: intelligent_update_api_configuration } = api_configuration_result
549+
const {
550+
model_provider,
551+
api_configuration: intelligent_update_api_configuration
552+
} = api_configuration_result
539553
const endpoint_url = model_provider.base_url
540554

541555
const intelligent_update_states =

‎apps/editor/src/commands/code-at-cursor-command/utils/get-code-at-cursor-config.ts‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ import { dictionary } from '@shared/constants/dictionary'
1111
import { t } from '@/i18n'
1212

1313
export const get_code_at_cursor_api_configuration = async (params: {
14-
api_providers_manager: ModelProvidersManager
14+
model_providers_manager: ModelProvidersManager
1515
show_quick_pick?: boolean
1616
context: vscode.ExtensionContext
1717
api_configuration_id?: string
1818
panel_provider?: PanelProvider
1919
}): Promise<{ model_provider: any; api_configuration: any } | undefined> => {
2020
const code_at_cursor_api_configurations =
21-
await params.api_providers_manager.get_api_configurations()
21+
await params.model_providers_manager.get_api_configurations()
2222

2323
if (code_at_cursor_api_configurations.length == 0) {
2424
vscode.commands.executeCommand('codeWebChat.settings')
@@ -37,7 +37,7 @@ export const get_code_at_cursor_api_configuration = async (params: {
3737
) || null
3838
} else if (!params.show_quick_pick) {
3939
const default_api_configuration =
40-
await params.api_providers_manager.get_default_code_completions_api_configuration()
40+
await params.model_providers_manager.get_default_code_completions_api_configuration()
4141
if (default_api_configuration) {
4242
selected_api_configuration = default_api_configuration
4343
} else {
@@ -198,7 +198,7 @@ export const get_code_at_cursor_api_configuration = async (params: {
198198
}
199199

200200
const model_provider =
201-
await params.api_providers_manager.get_model_provider(
201+
await params.model_providers_manager.get_model_provider(
202202
selected.api_configuration.model_provider_name
203203
)
204204
if (!model_provider) {
@@ -224,9 +224,10 @@ export const get_code_at_cursor_api_configuration = async (params: {
224224
})
225225
}
226226

227-
const model_provider = await params.api_providers_manager.get_model_provider(
228-
selected_api_configuration.model_provider_name
229-
)
227+
const model_provider =
228+
await params.model_providers_manager.get_model_provider(
229+
selected_api_configuration.model_provider_name
230+
)
230231

231232
if (!model_provider) {
232233
vscode.window.showErrorMessage(

‎apps/editor/src/commands/code-at-cursor-command/utils/perform-code-at-cursor.ts‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export const perform_code_at_cursor = async (params: {
2525
api_configuration_id?: string
2626
panel_provider?: PanelProvider
2727
}) => {
28-
const api_providers_manager = new ModelProvidersManager(params.context)
28+
const model_providers_manager = new ModelProvidersManager(params.context)
2929

3030
let completion_instructions: string | undefined =
3131
params.completion_instructions
@@ -52,13 +52,15 @@ export const perform_code_at_cursor = async (params: {
5252
let current_api_configuration_id = params.api_configuration_id
5353

5454
while (true) {
55-
const api_configuration_result = await get_code_at_cursor_api_configuration({
56-
api_providers_manager,
57-
show_quick_pick: force_show_quick_pick,
58-
context: params.context,
59-
api_configuration_id: current_api_configuration_id,
60-
panel_provider: params.panel_provider
61-
})
55+
const api_configuration_result = await get_code_at_cursor_api_configuration(
56+
{
57+
model_providers_manager,
58+
show_quick_pick: force_show_quick_pick,
59+
context: params.context,
60+
api_configuration_id: current_api_configuration_id,
61+
panel_provider: params.panel_provider
62+
}
63+
)
6264

6365
if (!api_configuration_result) {
6466
return
@@ -67,7 +69,10 @@ export const perform_code_at_cursor = async (params: {
6769
force_show_quick_pick = false
6870
current_api_configuration_id = undefined
6971

70-
const { model_provider, api_configuration: code_at_cursor_api_configuration } = api_configuration_result
72+
const {
73+
model_provider,
74+
api_configuration: code_at_cursor_api_configuration
75+
} = api_configuration_result
7176

7277
if (!code_at_cursor_api_configuration.model_provider_name) {
7378
vscode.window.showErrorMessage(

‎apps/editor/src/commands/search-files-command/search-files-commands.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,11 @@ export const search_files_commands = (
121121
shrink_result
122122
)
123123

124-
const api_providers_manager = new ModelProvidersManager(
124+
const model_providers_manager = new ModelProvidersManager(
125125
extension_context
126126
)
127127
const api_configurations =
128-
await api_providers_manager.get_api_configurations()
128+
await model_providers_manager.get_api_configurations()
129129

130130
if (api_configurations.length == 0) {
131131
vscode.commands.executeCommand('codeWebChat.settings')
@@ -144,7 +144,7 @@ export const search_files_commands = (
144144
: analysis.full_tokens
145145
const api_configuration_result =
146146
await prompt_for_api_configuration({
147-
api_providers_manager,
147+
model_providers_manager,
148148
extension_context,
149149
api_configurations,
150150
tokens_to_process,

‎apps/editor/src/commands/search-files-command/utils/prompt-for-config.ts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { display_token_count } from '../../../utils/display-token-count'
1010
import { t } from '@/i18n'
1111

1212
export const prompt_for_api_configuration = async (params: {
13-
api_providers_manager: ModelProvidersManager
13+
model_providers_manager: ModelProvidersManager
1414
extension_context: vscode.ExtensionContext
1515
api_configurations: ApiConfiguration[]
1616
tokens_to_process: number
@@ -29,7 +29,7 @@ export const prompt_for_api_configuration = async (params: {
2929

3030
if (!params.force_prompt) {
3131
const default_api_configuration =
32-
await params.api_providers_manager.get_default_find_relevant_files_api_configuration()
32+
await params.model_providers_manager.get_default_find_relevant_files_api_configuration()
3333

3434
if (default_api_configuration) {
3535
selected_api_configuration = default_api_configuration
@@ -181,9 +181,10 @@ export const prompt_for_api_configuration = async (params: {
181181
)
182182
}
183183

184-
const model_provider = await params.api_providers_manager.get_model_provider(
185-
selected_api_configuration.model_provider_name
186-
)
184+
const model_provider =
185+
await params.model_providers_manager.get_model_provider(
186+
selected_api_configuration.model_provider_name
187+
)
187188
if (!model_provider) {
188189
vscode.window.showErrorMessage(t('command.search.error.provider-not-found'))
189190
return 'cancel'

‎apps/editor/src/constants/state-keys.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ export const HISTORY_CODE_AT_CURSOR_STATE_KEY = 'history-code-at-cursor'
5454
export const HISTORY_FIND_RELEVANT_FILES_STATE_KEY =
5555
'history-find-relevant-files'
5656
export const HISTORY_WITHOUT_FILES_STATE_KEY = 'history-without-files'
57+
5758
export const FIND_RELEVANT_FILES_SHRINK_SOURCE_CODE_STATE_KEY =
5859
'find-relevant-files-shrink-source-code'
5960

‎apps/editor/src/features/commit-messages/utils/get-commit-message-config.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,18 @@ export const get_commit_message_api_configuration = async (
3131
| 'back'
3232
| null
3333
> => {
34-
const api_providers_manager = new ModelProvidersManager(context)
34+
const model_providers_manager = new ModelProvidersManager(context)
3535
let commit_message_api_configuration:
3636
| CommitMessageApiConfiguration
3737
| null
3838
| undefined
3939
| 'back' = force_quick_pick
4040
? undefined
41-
: await api_providers_manager.get_default_commit_messages_api_configuration()
41+
: await model_providers_manager.get_default_commit_messages_api_configuration()
4242

4343
if (!commit_message_api_configuration) {
4444
const api_configurations =
45-
await api_providers_manager.get_api_configurations()
45+
await model_providers_manager.get_api_configurations()
4646

4747
if (api_configurations.length == 0) {
4848
vscode.commands.executeCommand('codeWebChat.settings')
@@ -221,7 +221,7 @@ export const get_commit_message_api_configuration = async (
221221
return null
222222
}
223223

224-
const model_provider = await api_providers_manager.get_model_provider(
224+
const model_provider = await model_providers_manager.get_model_provider(
225225
commit_message_api_configuration.model_provider_name
226226
)
227227

0 commit comments

Comments
 (0)