Skip to content

Commit d571556

Browse files
committed
Add error messages and improve cancellation handling for API commit message generation
- when received empty response or failing, we're showing configurations again - that's correct but there are missing a notifications informing the user about empty/failed response. Use 2 distinct messages for each. └── apps └── editor └── src ├── commands │ └── generate-commit-message-commands │ ├── actions │ │ ├── get-prompt-data.ts │ │ └── run-generate-action.ts │ ├── generate-commit-message-commands.ts │ ├── index.ts │ └── utils │ ├── build-commit-message-prompt.ts │ ├── generate-commit-message-with-api.ts │ ├── get-commit-message-config.ts │ └── strip-wrapping-quotes.ts ├── i18n │ └── translations │ └── commands │ └── generate-commit-message.ts └── utils └── git-repository-utils.ts
1 parent 407655e commit d571556

2 files changed

Lines changed: 51 additions & 2 deletions

File tree

‎apps/editor/src/commands/generate-commit-message-commands/actions/run-generate-action.ts‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,11 +363,23 @@ export const run_generate_action = async (params: {
363363
api_configuration: api_configuration_data.api_configuration,
364364
message: api_prompt
365365
})
366-
} catch (error) {
367-
if (axios.isCancel(error)) {
366+
} catch (error: any) {
367+
if (
368+
axios.isCancel(error) ||
369+
error?.message == 'Operation cancelled by user'
370+
) {
368371
force_quick_pick = true
369372
continue
370373
} else {
374+
if (error?.message == 'API request returned an empty response') {
375+
vscode.window.showErrorMessage(
376+
t('command.generate-commit-message.error.empty-response')
377+
)
378+
} else {
379+
vscode.window.showErrorMessage(
380+
t('command.generate-commit-message.error.request-failed')
381+
)
382+
}
371383
force_quick_pick = true
372384
continue
373385
}

‎apps/editor/src/i18n/translations/commands/generate-commit-message.ts‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,5 +361,42 @@ export const translations = {
361361
cs: 'Generování zprávy commitu je během náhledu odpovědi zakázáno.',
362362
hu: 'A commit üzenet generálása a válasz előnézete alatt le van tiltva.',
363363
bg: 'Генерирането на commit съобщение е деактивирано по време на преглед на отговора.'
364+
},
365+
'command.generate-commit-message.error.empty-response': {
366+
en: 'API request returned an empty response.',
367+
pl: 'Żądanie API zwróciło pustą odpowiedź.',
368+
'zh-cn': 'API 请求返回了空响应。',
369+
ja: 'API リクエストが空のレスポンスを返しました。',
370+
'zh-tw': 'API 請求回傳了空回應。',
371+
de: 'API-Anfrage gab eine leere Antwort zurück.',
372+
es: 'La solicitud API devolvió una respuesta vacía.',
373+
fr: 'La requête API a renvoyé une réponse vide.',
374+
'pt-br': 'A solicitação de API retornou uma resposta vazia.',
375+
ru: 'API-запрос вернул пустой ответ.',
376+
ko: 'API 요청이 빈 응답을 반환했습니다.',
377+
it: 'La richiesta API ha restituito una risposta vuota.',
378+
tr: 'API isteği boş bir yanıt döndürdü.',
379+
cs: 'Požadavek API vrátil prázdnou odpověď.',
380+
hu: 'Az API kérés üres választ adott vissza.',
381+
bg: 'API заявката върна празен отговор.'
382+
},
383+
'command.generate-commit-message.error.request-failed': {
384+
en: 'API request failed. Check the logs for more details.',
385+
pl: 'Żądanie API nie powiodło się. Sprawdź logi, aby uzyskać więcej informacji.',
386+
'zh-cn': 'API 请求失败。请检查日志了解更多详细信息。',
387+
ja: 'API リクエストが失敗しました。詳細についてはログを確認してください。',
388+
'zh-tw': 'API 請求失敗。請檢查日誌以獲取更多詳細資訊。',
389+
de: 'API-Anfrage fehlgeschlagen. Überprüfen Sie die Protokolle auf weitere Details.',
390+
es: 'La solicitud API falló. Consulta los registros para más detalles.',
391+
fr: 'La requête API a échoué. Consultez les journaux pour plus de détails.',
392+
'pt-br':
393+
'Falha na solicitação de API. Verifique os logs para mais detalhes.',
394+
ru: 'Сбой API-запроса. Проверьте журналы для получения дополнительных сведений.',
395+
ko: 'API 요청에 실패했습니다. 자세한 내용은 로그를 확인하세요.',
396+
it: 'Richiesta API non riuscita. Controlla i log per ulteriori dettagli.',
397+
tr: 'API isteği başarısız oldu. Daha fazla detay için günlükleri (log) kontrol edin.',
398+
cs: 'Požadavek API selhal. Zkontrolujte protokoly pro více podrobností.',
399+
hu: 'Az API kérés sikertelen volt. További részletekért ellenőrizze a naplókat.',
400+
bg: 'API заявката беше неуспешна. Проверете регистрационните файлове за повече подробности.'
364401
}
365402
} as const

0 commit comments

Comments
 (0)