Skip to content

Commit 2687785

Browse files
committed
Rename all references of configurations to api-configurations for consistency across the codebase
1 parent 196c23e commit 2687785

16 files changed

Lines changed: 215 additions & 215 deletions

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ export const get_code_at_cursor_config = async (params: {
184184

185185
if (params.panel_provider) {
186186
params.panel_provider.send_message({
187-
command: 'SELECTED_CONFIGURATION_CHANGED',
187+
command: 'SELECTED_API_CONFIGURATION_CHANGED',
188188
prompt_type: 'code-at-cursor',
189189
id: selected.id
190190
})

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export const RECENTLY_USED_VOICE_INPUT_CONFIG_IDS_STATE_KEY =
7171
'recently-used-voice-input-config-ids'
7272

7373
export const PRESETS_COLLAPSED_STATE_KEY = 'presets-collapsed'
74-
export const CONFIGURATIONS_COLLAPSED_STATE_KEY = 'configurations-collapsed'
74+
export const API_CONFIGURATIONS_COLLAPSED_STATE_KEY = 'api-configurations-collapsed'
7575

7676
export const get_recently_used_presets_or_groups_key = (
7777
web_prompt_type: string

‎apps/editor/src/views/panel/backend/message-handlers/handle-get-collapsed-states.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {
22
ARE_TASKS_COLLAPSED_STATE_KEY,
3-
CONFIGURATIONS_COLLAPSED_STATE_KEY,
3+
API_CONFIGURATIONS_COLLAPSED_STATE_KEY,
44
PRESETS_COLLAPSED_STATE_KEY,
55
IS_TIMELINE_COLLAPSED_STATE_KEY
66
} from '@/constants/state-keys'
@@ -14,7 +14,7 @@ export const handle_get_collapsed_states = (panel_provider: PanelProvider) => {
1414
false
1515
),
1616
api_configurations_collapsed: panel_provider.context.globalState.get<boolean>(
17-
CONFIGURATIONS_COLLAPSED_STATE_KEY,
17+
API_CONFIGURATIONS_COLLAPSED_STATE_KEY,
1818
false
1919
),
2020
is_timeline_collapsed: panel_provider.context.workspaceState.get<boolean>(

‎apps/editor/src/views/panel/backend/message-handlers/handle-save-component-collapsed-state.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {
22
ARE_TASKS_COLLAPSED_STATE_KEY,
3-
CONFIGURATIONS_COLLAPSED_STATE_KEY,
3+
API_CONFIGURATIONS_COLLAPSED_STATE_KEY,
44
PRESETS_COLLAPSED_STATE_KEY,
55
IS_TIMELINE_COLLAPSED_STATE_KEY
66
} from '@/constants/state-keys'
@@ -18,7 +18,7 @@ export const handle_save_component_collapsed_state = async (
1818
)
1919
} else if (message.component == 'api-configurations') {
2020
await panel_provider.context.globalState.update(
21-
CONFIGURATIONS_COLLAPSED_STATE_KEY,
21+
API_CONFIGURATIONS_COLLAPSED_STATE_KEY,
2222
message.is_collapsed
2323
)
2424
} else if (message.component == 'timeline') {

apps/editor/src/views/settings/backend/message-handlers/handle-get-configurations.ts renamed to apps/editor/src/views/settings/backend/message-handlers/handle-get-api-configurations.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@ import {
44
ToolConfig,
55
get_tool_config_id
66
} from '@/services/model-providers-manager'
7-
import { ConfigurationForClient } from '@/views/settings/types/messages'
7+
import { ApiConfigurationForClient } from '@/views/settings/types/messages'
88

9-
const create_description = (config: ToolConfig): string => {
10-
const description_parts = [config.provider_name]
11-
if (config.temperature != null) {
12-
description_parts.push(`${config.temperature}`)
9+
const create_description = (api_configuration: ToolConfig): string => {
10+
const description_parts = [api_configuration.provider_name]
11+
if (api_configuration.temperature != null) {
12+
description_parts.push(`${api_configuration.temperature}`)
1313
}
14-
if (config.reasoning_effort) {
15-
description_parts.push(`${config.reasoning_effort}`)
14+
if (api_configuration.reasoning_effort) {
15+
description_parts.push(`${api_configuration.reasoning_effort}`)
1616
}
1717
return description_parts.join(' · ')
1818
}
1919

20-
export const handle_get_configurations = async (
20+
export const handle_get_api_configurations = async (
2121
provider: SettingsProvider
2222
): Promise<void> => {
2323
const providers_manager = new ModelProvidersManager(provider.context)
2424

25-
const saved_configs = await providers_manager.get_tool_configs()
25+
const saved_api_configurations = await providers_manager.get_tool_configs()
2626

2727
const def_cac = await providers_manager.get_default_code_completions_config()
2828
const def_iu = await providers_manager.get_default_intelligent_update_config()
@@ -31,19 +31,19 @@ export const handle_get_configurations = async (
3131
await providers_manager.get_default_find_relevant_files_config()
3232
const def_vi = await providers_manager.get_default_voice_input_config()
3333

34-
const configs_for_client: ConfigurationForClient[] = saved_configs.map(
35-
(config) => {
34+
const api_configurations_for_client: ApiConfigurationForClient[] = saved_api_configurations.map(
35+
(api_configuration) => {
3636
return {
37-
id: get_tool_config_id(config),
38-
model: config.model,
39-
description: create_description(config)
37+
id: get_tool_config_id(api_configuration),
38+
model: api_configuration.model,
39+
description: create_description(api_configuration)
4040
}
4141
}
4242
)
4343

4444
provider.postMessage({
45-
command: 'CONFIGURATIONS',
46-
configurations: configs_for_client,
45+
command: 'API_CONFIGURATIONS',
46+
api_configurations: api_configurations_for_client,
4747
defaults: {
4848
'code-at-cursor': def_cac ? get_tool_config_id(def_cac) : null,
4949
'intelligent-update': def_iu ? get_tool_config_id(def_iu) : null,
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
import { SettingsProvider } from '@/views/settings/backend/settings-provider'
2+
import {
3+
ModelProvidersManager,
4+
ToolConfig,
5+
get_tool_config_id
6+
} from '@/services/model-providers-manager'
7+
8+
export const handle_reorder_api_configurations = async (
9+
provider: SettingsProvider,
10+
api_configurations: { id: string }[]
11+
): Promise<void> => {
12+
const providers_manager = new ModelProvidersManager(provider.context)
13+
14+
const current_api_configurations = await providers_manager.get_tool_configs()
15+
16+
const reordered_ids = api_configurations.map((p) => p.id)
17+
18+
const reordered_api_configurations = reordered_ids
19+
.map((id) => {
20+
const found = current_api_configurations.find((p) => get_tool_config_id(p) == id)
21+
if (!found) {
22+
console.error(`API configuration with id ${id} not found during reorder.`)
23+
return null
24+
}
25+
return found
26+
})
27+
.filter((p): p is ToolConfig => p !== null)
28+
29+
if (reordered_api_configurations.length == current_api_configurations.length) {
30+
await providers_manager.save_tool_configs(reordered_api_configurations)
31+
}
32+
}

‎apps/editor/src/views/settings/backend/message-handlers/handle-reorder-configuration.ts‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

apps/editor/src/views/settings/backend/message-handlers/handle-select-default-configuration.ts renamed to apps/editor/src/views/settings/backend/message-handlers/handle-select-default-api-configuration.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@ import {
44
ModelProvidersManager,
55
get_tool_config_id
66
} from '@/services/model-providers-manager'
7-
import { SelectDefaultConfigurationMessage } from '@/views/settings/types/messages'
8-
import { handle_set_default_configuration } from './handle-set-default-configuration'
7+
import { SelectDefaultApiConfigurationMessage } from '@/views/settings/types/messages'
8+
import { handle_set_default_api_configuration } from './handle-set-default-api-configuration'
99

10-
export const handle_select_default_configuration = async (
10+
export const handle_select_default_api_configuration = async (
1111
provider: SettingsProvider,
12-
message: SelectDefaultConfigurationMessage
12+
message: SelectDefaultApiConfigurationMessage
1313
): Promise<void> => {
1414
const providers_manager = new ModelProvidersManager(provider.context)
15-
const configs = await providers_manager.get_tool_configs()
15+
const api_configurations = await providers_manager.get_tool_configs()
1616

17-
if (configs.length == 0) {
17+
if (api_configurations.length == 0) {
1818
vscode.window.showInformationMessage(
19-
'No configurations available. Please create one first.'
19+
'No API configurations available. Please create one first.'
2020
)
2121
return
2222
}
2323

24-
const items = configs.map((c) => {
24+
const items = api_configurations.map((c) => {
2525
const description_parts = [c.provider_name]
2626
if (c.temperature != null) {
2727
description_parts.push(`${c.temperature}`)
@@ -33,12 +33,12 @@ export const handle_select_default_configuration = async (
3333
return {
3434
label: c.model,
3535
description: description_parts.join(' · '),
36-
config_id: get_tool_config_id(c)
36+
api_configuration_id: get_tool_config_id(c)
3737
}
3838
})
3939

4040
const quick_pick = vscode.window.createQuickPick<
41-
vscode.QuickPickItem & { config_id: string }
41+
vscode.QuickPickItem & { api_configuration_id: string }
4242
>()
4343

4444
quick_pick.items = items
@@ -61,9 +61,9 @@ export const handle_select_default_configuration = async (
6161
quick_pick.onDidAccept(async () => {
6262
const selected = quick_pick.selectedItems[0]
6363
if (selected) {
64-
await handle_set_default_configuration(
64+
await handle_set_default_api_configuration(
6565
provider,
66-
selected.config_id,
66+
selected.api_configuration_id,
6767
message.tool_name
6868
)
6969
}

apps/editor/src/views/settings/backend/message-handlers/handle-set-default-configuration.ts renamed to apps/editor/src/views/settings/backend/message-handlers/handle-set-default-api-configuration.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,29 @@ import {
55
} from '@/services/model-providers-manager'
66
import { ToolType } from '@/views/settings/types/tools'
77

8-
export const handle_set_default_configuration = async (
8+
export const handle_set_default_api_configuration = async (
99
provider: SettingsProvider,
10-
configuration_id: string | null,
10+
api_configuration_id: string | null,
1111
type: ToolType
1212
): Promise<void> => {
1313
const providers_manager = new ModelProvidersManager(provider.context)
1414

15-
const configs = await providers_manager.get_tool_configs()
16-
const config_to_set = configuration_id
17-
? configs.find((c) => get_tool_config_id(c) == configuration_id) || null
15+
const api_configurations = await providers_manager.get_tool_configs()
16+
const api_configuration_to_set = api_configuration_id
17+
? api_configurations.find((c) => get_tool_config_id(c) == api_configuration_id) || null
1818
: null
1919

2020
if (type == 'code-at-cursor') {
21-
await providers_manager.set_default_code_completions_config(config_to_set)
21+
await providers_manager.set_default_code_completions_config(api_configuration_to_set)
2222
} else if (type == 'intelligent-update') {
23-
await providers_manager.set_default_intelligent_update_config(config_to_set)
23+
await providers_manager.set_default_intelligent_update_config(api_configuration_to_set)
2424
} else if (type == 'commit-messages') {
25-
await providers_manager.set_default_commit_messages_config(config_to_set)
25+
await providers_manager.set_default_commit_messages_config(api_configuration_to_set)
2626
} else if (type == 'find-relevant-files') {
2727
await providers_manager.set_default_find_relevant_files_config(
28-
config_to_set
28+
api_configuration_to_set
2929
)
3030
} else if (type == 'voice-input') {
31-
await providers_manager.set_default_voice_input_config(config_to_set)
31+
await providers_manager.set_default_voice_input_config(api_configuration_to_set)
3232
}
3333
}

‎apps/editor/src/views/settings/backend/message-handlers/handle-upsert-api-configuration.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import { SettingsProvider } from '@/views/settings/backend/settings-provider'
2-
import { UpsertConfigurationMessage } from '@/views/settings/types/messages'
2+
import { UpsertApiConfigurationMessage } from '@/views/settings/types/messages'
33
import { upsert_api_configuration } from '@/views/utils/upsert-api-configuration/upsert-api-configuration'
44

55
export const handle_upsert_api_configuration = async (
66
provider: SettingsProvider,
7-
message: UpsertConfigurationMessage
7+
message: UpsertApiConfigurationMessage
88
): Promise<void> => {
99
await upsert_api_configuration({
1010
context: provider.context,
1111
tool_type: 'code-at-cursor',
12-
api_configuration_id: message.configuration_id,
12+
api_configuration_id: message.api_configuration_id,
1313
insertion_index: message.insertion_index,
1414
create_on_top: message.create_on_top,
1515
duplicate_from_id: message.duplicate_from_id

0 commit comments

Comments
 (0)