fix(services): improve API error handling

VizzleTF · VizzleTF · commit 462c7cd42132 · 2025-02-09T19:36:56.000+03:00
- Added retry logic for API key issues.
- Improved error messages for better UX.
- Handle rate limits and server errors.
- Added connection error handling.
- Improved configuration error handling.
diff --git a/src/services/codestralService.ts b/src/services/codestralService.ts
@@ -2,6 +2,7 @@ import axios, { AxiosError } from 'axios';
 import { Logger } from '../utils/logger';
 import { CommitMessage, ProgressReporter } from '../models/types';
 import { ConfigService } from '../utils/configService';
+import { ConfigurationError } from '../models/errors';
 
 interface CodestralResponse {
     choices: Array<{
@@ -29,23 +30,23 @@ export class CodestralService {
         progress: ProgressReporter,
         attempt: number = 1
     ): Promise<CommitMessage> {
-        const apiKey = await ConfigService.getCodestralApiKey();
-        const model = ConfigService.getCodestralModel();
-
-        const requestConfig = {
-            headers: {
-                'content-type': 'application/json',
-                'Authorization': `Bearer ${apiKey}`
-            },
-            timeout: 30000
-        };
+        try {
+            const apiKey = await ConfigService.getCodestralApiKey();
+            const model = ConfigService.getCodestralModel();
+
+            const requestConfig = {
+                headers: {
+                    'content-type': 'application/json',
+                    'Authorization': `Bearer ${apiKey}`
+                },
+                timeout: 30000
+            };
 
-        const payload = {
-            model: model,
-            messages: [{ role: "user", content: prompt }]
-        };
+            const payload = {
+                model: model,
+                messages: [{ role: "user", content: prompt }]
+            };
 
-        try {
             void Logger.log(`Attempt ${attempt}: Sending request to Codestral API`);
             await this.updateProgressForAttempt(progress, attempt);
 
@@ -58,7 +59,39 @@ export class CodestralService {
             void Logger.log(`Commit message generated using ${model} model`);
             return { message: commitMessage, model };
         } catch (error) {
-            return await this.handleGenerationError(error as ErrorWithResponse, prompt, progress, attempt);
+            const axiosError = error as ErrorWithResponse;
+            if (axiosError.response) {
+                const { status } = axiosError.response;
+                const responseData = JSON.stringify(axiosError.response.data);
+
+                switch (status) {
+                    case 401:
+                        if (attempt === 1) {
+                            await ConfigService.removeCodestralApiKey();
+                            await ConfigService.promptForCodestralApiKey();
+                            return this.generateCommitMessage(prompt, progress, attempt + 1);
+                        }
+                        throw new Error('Invalid API key. Please check your Codestral API key.');
+                    case 429:
+                        throw new Error('Rate limit exceeded. Please try again later.');
+                    case 500:
+                        throw new Error('Server error. Please try again later.');
+                    default:
+                        throw new Error(`API returned status ${status}. ${responseData}`);
+                }
+            }
+
+            if (axiosError.message.includes('ECONNREFUSED') || axiosError.message.includes('ETIMEDOUT')) {
+                throw new Error('Could not connect to Codestral API. Please check your internet connection.');
+            }
+
+            // Если ключ не установлен и это первая попытка
+            if (error instanceof ConfigurationError && attempt === 1) {
+                await ConfigService.promptForCodestralApiKey();
+                return this.generateCommitMessage(prompt, progress, attempt + 1);
+            }
+
+            throw error;
         }
     }
 
diff --git a/src/services/geminiService.ts b/src/services/geminiService.ts
@@ -3,6 +3,7 @@ import { Logger } from '../utils/logger';
 import { ConfigService } from '../utils/configService';
 import { ProgressReporter, CommitMessage } from '../models/types';
 import { errorMessages } from '../utils/constants';
+import { ConfigurationError } from '../models/errors';
 
 interface GeminiResponse {
     candidates: Array<{
@@ -18,29 +19,30 @@ export class GeminiService {
     static async generateCommitMessage(
         prompt: string,
         progress: ProgressReporter,
+        attempt: number = 1
     ): Promise<CommitMessage> {
-        const apiKey = await ConfigService.getApiKey();
-        const model = ConfigService.getGeminiModel();
-        const apiUrl = `https://generativelanguage.googleapis.com/v1beta/models/${model}:generateContent?key=${apiKey}`;
+        try {
+            const apiKey = await ConfigService.getApiKey();
+            const model = ConfigService.getGeminiModel();
+            const apiUrl = `https://generativelanguage.googleapis.com/v1beta/models/${model}:generateContent?key=${apiKey}`;
 
-        const requestConfig = {
-            headers: {
-                'content-type': 'application/json'
-            },
-            timeout: 30000
-        };
+            const requestConfig = {
+                headers: {
+                    'content-type': 'application/json'
+                },
+                timeout: 30000
+            };
 
-        const payload = {
-            contents: [{ parts: [{ text: prompt }] }],
-            generationConfig: {
-                temperature: 0.7,
-                topK: 40,
-                topP: 0.95,
-                maxOutputTokens: 1024
-            }
-        };
+            const payload = {
+                contents: [{ parts: [{ text: prompt }] }],
+                generationConfig: {
+                    temperature: 0.7,
+                    topK: 40,
+                    topP: 0.95,
+                    maxOutputTokens: 1024
+                }
+            };
 
-        try {
             progress.report({ message: "Generating commit message...", increment: 50 });
 
             const response = await axios.post<GeminiResponse>(apiUrl, payload, requestConfig);
@@ -57,6 +59,12 @@ export class GeminiService {
 
                 switch (status) {
                     case 401:
+                        if (attempt === 1) {
+                            // Если это первая попытка и ключ неверный, запросим новый ключ и попробуем снова
+                            await ConfigService.removeApiKey();
+                            await ConfigService.promptForApiKey();
+                            return this.generateCommitMessage(prompt, progress, attempt + 1);
+                        }
                         throw new Error(errorMessages.authenticationError);
                     case 402:
                         throw new Error(errorMessages.paymentRequired);
@@ -81,6 +89,12 @@ export class GeminiService {
                 );
             }
 
+            // Если ключ не установлен и это первая попытка
+            if (error instanceof ConfigurationError && attempt === 1) {
+                await ConfigService.promptForApiKey();
+                return this.generateCommitMessage(prompt, progress, attempt + 1);
+            }
+
             throw new Error(
                 errorMessages.networkError.replace('{0}', axiosError.message)
             );
diff --git a/src/services/openaiService.ts b/src/services/openaiService.ts
@@ -3,7 +3,7 @@ import { Logger } from '../utils/logger';
 import { ConfigService } from '../utils/configService';
 import { ProgressReporter, CommitMessage } from '../models/types';
 import { errorMessages } from '../utils/constants';
-import { OpenAIError } from '../models/errors';
+import { OpenAIError, ConfigurationError } from '../models/errors';
 
 interface OpenAIResponse {
     choices: Array<{
@@ -28,25 +28,26 @@ export class OpenAIService {
 
     static async generateCommitMessage(
         prompt: string,
-        progress: ProgressReporter
+        progress: ProgressReporter,
+        attempt: number = 1
     ): Promise<CommitMessage> {
-        const apiKey = await ConfigService.getOpenAIApiKey();
-        const model = ConfigService.getOpenAIModel();
-        const baseUrl = ConfigService.getOpenAIBaseUrl();
-
-        const payload = {
-            model,
-            messages: [{ role: "user", content: prompt }],
-            temperature: 0.7,
-            maxTokens: 1024
-        };
+        try {
+            const apiKey = await ConfigService.getOpenAIApiKey();
+            const model = ConfigService.getOpenAIModel();
+            const baseUrl = ConfigService.getOpenAIBaseUrl();
+
+            const payload = {
+                model,
+                messages: [{ role: "user", content: prompt }],
+                temperature: 0.7,
+                maxTokens: 1024
+            };
 
-        const headers = {
-            'Authorization': `Bearer ${apiKey}`,
-            'content-type': 'application/json'
-        };
+            const headers = {
+                'Authorization': `Bearer ${apiKey}`,
+                'content-type': 'application/json'
+            };
 
-        try {
             progress.report({ message: "Generating commit message...", increment: 50 });
 
             const response = await axios.post<OpenAIResponse>(
@@ -66,9 +67,13 @@ export class OpenAIService {
                 const status = axiosError.response.status;
                 const data = axiosError.response.data as { error?: { message?: string } };
 
-                // Handle specific OpenAI error cases
                 switch (status) {
                     case 401:
+                        if (attempt === 1) {
+                            await ConfigService.removeOpenAIApiKey();
+                            await ConfigService.promptForOpenAIApiKey();
+                            return this.generateCommitMessage(prompt, progress, attempt + 1);
+                        }
                         throw new OpenAIError(errorMessages.authenticationError);
                     case 402:
                         throw new OpenAIError(errorMessages.paymentRequired);
@@ -93,6 +98,12 @@ export class OpenAIService {
                 );
             }
 
+            // Если ключ не установлен и это первая попытка
+            if (error instanceof ConfigurationError && attempt === 1) {
+                await ConfigService.promptForOpenAIApiKey();
+                return this.generateCommitMessage(prompt, progress, attempt + 1);
+            }
+
             throw new OpenAIError(
                 errorMessages.networkError.replace('{0}', axiosError.message)
             );
