Skip to content

Commit 7de4c81

Browse files
committed
Refactor API request handling by introducing ApiManager class to centralize API call management and progress tracking
1 parent ef96d3e commit 7de4c81

11 files changed

Lines changed: 301 additions & 49 deletions

File tree

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
.elapsed-time {
2+
text-align: center;
3+
font-size: 20px;
4+
font-family: monospace;
5+
}
6+
7+
.tokens-per-second {
8+
text-align: center;
9+
font-family: monospace;
10+
color: var(--vscode-descriptionForeground);
11+
}
12+
13+
.progress {
14+
width: 100%;
15+
height: 3px;
16+
background-color: var(--vscode-dropdown-border);
17+
border-radius: 999px;
18+
overflow: hidden;
19+
position: relative;
20+
21+
&__fill {
22+
height: 100%;
23+
background-color: var(--vscode-focusBorder);
24+
transition: width var(--transition-duration-150)
25+
var(--transition-timing-function);
26+
27+
&--indeterminate {
28+
height: 100%;
29+
background-color: var(--vscode-focusBorder);
30+
position: absolute;
31+
animation: indeterminate-progress 1.5s infinite linear;
32+
}
33+
}
34+
}
35+
36+
.content {
37+
display: flex;
38+
flex-direction: column;
39+
gap: 8px;
40+
}
41+
42+
@keyframes indeterminate-progress {
43+
from {
44+
left: -50px;
45+
width: 10px;
46+
}
47+
50% {
48+
width: 50px;
49+
}
50+
to {
51+
left: 100%;
52+
width: 10px;
53+
}
54+
}
Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
import { useEffect, useState } from 'react'
2+
import styles from './ApiManagerModal.module.scss'
3+
import { Button } from '../../../common/Button'
4+
import { Modal } from '../Modal'
5+
import cn from 'classnames'
6+
7+
type Props = {
8+
title: string
9+
on_cancel?: () => void
10+
tokens_per_second?: number
11+
show_elapsed_time?: boolean
12+
delay_visibility?: boolean
13+
}
14+
15+
const format_tokens_per_second = (tps: number): string => {
16+
const rounded_tps = Math.round(tps)
17+
if (rounded_tps >= 1000) {
18+
return `${(rounded_tps / 1000).toFixed(1)}k`
19+
}
20+
return rounded_tps.toString()
21+
}
22+
23+
export const ApiManagerModal: React.FC<Props> = (props) => {
24+
const [is_visible, set_is_visible] = useState(!props.delay_visibility)
25+
const [elapsed_time, set_elapsed_time] = useState(0)
26+
27+
useEffect(() => {
28+
let visibility_timer: NodeJS.Timeout | undefined
29+
if (props.delay_visibility) {
30+
set_is_visible(false)
31+
visibility_timer = setTimeout(() => {
32+
set_is_visible(true)
33+
}, 1000)
34+
} else {
35+
set_is_visible(true)
36+
}
37+
38+
let elapsed_time_timer: NodeJS.Timeout | undefined
39+
if (props.show_elapsed_time !== false) {
40+
set_elapsed_time(0)
41+
const start_time = Date.now()
42+
elapsed_time_timer = setInterval(() => {
43+
set_elapsed_time((Date.now() - start_time) / 1000)
44+
}, 100)
45+
}
46+
47+
return () => {
48+
clearTimeout(visibility_timer)
49+
clearInterval(elapsed_time_timer)
50+
}
51+
}, [props.show_elapsed_time, props.delay_visibility])
52+
53+
return is_visible ? (
54+
<Modal
55+
title={props.title}
56+
content_slot={
57+
<>
58+
{props.show_elapsed_time !== false && (
59+
<div className={styles['elapsed-time']}>
60+
{elapsed_time.toFixed(1)}s
61+
</div>
62+
)}
63+
64+
<div className={styles.content}>
65+
{props.tokens_per_second !== undefined && (
66+
<div className={styles['tokens-per-second']}>
67+
{format_tokens_per_second(props.tokens_per_second)} tokens/s
68+
</div>
69+
)}
70+
<div className={styles.progress}>
71+
<div className={styles['progress__fill--indeterminate']} />
72+
</div>
73+
</div>
74+
</>
75+
}
76+
footer_slot={
77+
props.on_cancel ? (
78+
<Button on_click={props.on_cancel}>Cancel</Button>
79+
) : undefined
80+
}
81+
/>
82+
) : null
83+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from './ApiManagerModal'

‎packages/vscode/src/extension.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import * as vscode from 'vscode'
22
import { context_initialization } from './context/context-initialization'
33
import { PanelProvider } from './views/panel/backend/panel-provider'
44
import { WebSocketManager } from './services/websocket-manager'
5+
import { ApiManager } from './services/api-manager'
56
import {
67
migrate_preset_is_default_to_is_selected,
78
migrate_api_providers_to_model_providers,
@@ -73,6 +74,9 @@ export async function activate(context: vscode.ExtensionContext) {
7374
context,
7475
websocket_server_instance
7576
)
77+
78+
const api_manager = new ApiManager(panel_provider)
79+
7680
context.subscriptions.push(
7781
vscode.window.registerWebviewViewProvider(
7882
'codeWebChatView',
@@ -103,6 +107,8 @@ export async function activate(context: vscode.ExtensionContext) {
103107
})
104108
)
105109

110+
panel_provider.set_api_manager(api_manager)
111+
106112
const settings_provider = new SettingsProvider(context.extensionUri, context)
107113

108114
context.subscriptions.push(
Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
import { PanelProvider } from '@/views/panel/backend/panel-provider'
2+
import { make_api_request } from '@/utils/make-api-request'
3+
import axios, { CancelTokenSource } from 'axios'
4+
import { Logger } from '@shared/utils/logger'
5+
import { dictionary } from '@shared/constants/dictionary'
6+
7+
export class ApiManager {
8+
public api_call_cancel_token_source: CancelTokenSource | null = null
9+
10+
constructor(private panel_provider: PanelProvider) {}
11+
12+
public async get(params: {
13+
endpoint_url: string
14+
api_key?: string
15+
body: any
16+
}): Promise<{ response: string; thoughts?: string } | null> {
17+
const cancel_token_source = axios.CancelToken.source()
18+
this.api_call_cancel_token_source = cancel_token_source
19+
20+
try {
21+
this.panel_provider.send_message({
22+
command: 'SHOW_API_MANAGER_PROGRESS',
23+
title: `${dictionary.api_call.WAITING_FOR_RESPONSE}...`
24+
})
25+
26+
const result = await make_api_request({
27+
endpoint_url: params.endpoint_url,
28+
api_key: params.api_key,
29+
body: params.body,
30+
cancellation_token: cancel_token_source.token,
31+
on_thinking_chunk: () => {
32+
this.panel_provider.send_message({
33+
command: 'SHOW_API_MANAGER_PROGRESS',
34+
title: `${dictionary.api_call.THINKING}...`
35+
})
36+
},
37+
on_chunk: (tokens_per_second) => {
38+
this.panel_provider.send_message({
39+
command: 'SHOW_API_MANAGER_PROGRESS',
40+
title: 'Receiving response...',
41+
tokens_per_second
42+
})
43+
}
44+
})
45+
return result
46+
} catch (error) {
47+
if (axios.isCancel(error)) {
48+
Logger.info({
49+
function_name: 'make_api_call',
50+
message: 'API call cancelled by user'
51+
})
52+
throw error // Re-throw cancellation error to be handled by caller
53+
}
54+
55+
Logger.error({
56+
function_name: 'make_api_call',
57+
message: 'API call error',
58+
data: error
59+
})
60+
// Error messages are shown by make_api_request, so no need to show one here.
61+
return null
62+
} finally {
63+
this.panel_provider.send_message({ command: 'HIDE_API_MANAGER_PROGRESS' })
64+
this.api_call_cancel_token_source = null
65+
}
66+
}
67+
68+
public cancel_api_call() {
69+
if (this.api_call_cancel_token_source) {
70+
this.api_call_cancel_token_source.cancel('Cancelled by user.')
71+
this.api_call_cancel_token_source = null
72+
}
73+
}
74+
}

‎packages/vscode/src/utils/make-api-request.ts‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ export const make_api_request = async (params: {
8282

8383
let stream_start_time = 0
8484
let last_on_chunk_time = 0
85-
let last_total_tokens = 0
8685
let total_tokens = 0
8786

8887
const handle_chunk_metrics = (chunk: string) => {
@@ -92,27 +91,24 @@ export const make_api_request = async (params: {
9291
total_tokens += chunk_tokens
9392

9493
const current_time = Date.now()
95-
96-
if (stream_start_time === 0) {
94+
95+
if (stream_start_time == 0) {
9796
stream_start_time = current_time
9897
last_on_chunk_time = current_time
99-
last_total_tokens = total_tokens
10098
return
10199
}
102100

103101
const elapsed_since_last = current_time - last_on_chunk_time
104-
102+
105103
if (elapsed_since_last >= 1000) {
106-
const tokens_since_last = total_tokens - last_total_tokens
107-
const seconds_since_last = elapsed_since_last / 1000
104+
const total_elapsed_seconds = (current_time - stream_start_time) / 1000
108105
const tokens_per_second =
109-
seconds_since_last > 0
110-
? Math.round(tokens_since_last / seconds_since_last)
106+
total_elapsed_seconds > 0
107+
? Math.round(total_tokens / total_elapsed_seconds)
111108
: 0
112-
109+
113110
params.on_chunk(tokens_per_second, total_tokens)
114111
last_on_chunk_time = current_time
115-
last_total_tokens = total_tokens
116112
}
117113
}
118114

@@ -262,7 +258,7 @@ export const make_api_request = async (params: {
262258

263259
response.data.setEncoding('utf8')
264260

265-
return new Promise((resolve, reject) => {
261+
return await new Promise((resolve, reject) => {
266262
let stream_closed = false
267263

268264
response.data.on('data', async (chunk: string) => {

‎packages/vscode/src/views/panel/backend/message-handlers/handle-edit-context.ts‎

Lines changed: 3 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import {
55
ModelProvidersManager,
66
get_tool_config_id
77
} from '@/services/model-providers-manager'
8-
import { make_api_request } from '@/utils/make-api-request'
98
import axios from 'axios'
109
import { PROVIDERS } from '@shared/constants/providers'
1110
import {
@@ -281,7 +280,7 @@ const perform_context_editing = async (params: {
281280
processed_instructions = await replace_saved_context_placeholder({
282281
instruction: processed_instructions,
283282
context: params.context,
284-
workspace_provider: params.file_tree_provider,
283+
workspace_provider: params.file_tree_provider
285284
})
286285
}
287286

@@ -395,41 +394,11 @@ const perform_context_editing = async (params: {
395394

396395
apply_reasoning_effort(body, provider, edit_context_config.reasoning_effort)
397396

398-
const cancel_token_source = axios.CancelToken.source()
399-
400-
if (params.panel_provider) {
401-
params.panel_provider.api_call_cancel_token_source = cancel_token_source
402-
}
403-
404397
try {
405-
if (params.panel_provider) {
406-
params.panel_provider.send_message({
407-
command: 'SHOW_PROGRESS',
408-
title: `${dictionary.api_call.WAITING_FOR_RESPONSE}...`
409-
})
410-
}
411-
const result = await make_api_request({
398+
const result = await params.panel_provider.api_manager.get({
412399
endpoint_url,
413400
api_key: provider.api_key,
414-
body,
415-
cancellation_token: cancel_token_source.token,
416-
on_thinking_chunk: () => {
417-
if (params.panel_provider) {
418-
params.panel_provider.send_message({
419-
command: 'SHOW_PROGRESS',
420-
title: `${dictionary.api_call.THINKING}...`
421-
})
422-
}
423-
},
424-
on_chunk: (tokens_per_second) => {
425-
if (params.panel_provider) {
426-
params.panel_provider.send_message({
427-
command: 'SHOW_PROGRESS',
428-
title: 'Receiving response...',
429-
tokens_per_second
430-
})
431-
}
432-
}
401+
body
433402
})
434403

435404
if (result) {
@@ -454,9 +423,6 @@ const perform_context_editing = async (params: {
454423
dictionary.error_message.EDIT_CONTEXT_ERROR
455424
)
456425
return
457-
} finally {
458-
params.panel_provider.send_message({ command: 'HIDE_PROGRESS' })
459-
params.panel_provider.api_call_cancel_token_source = null
460426
}
461427
}
462428
}

0 commit comments

Comments
 (0)