Skip to content

Commit

Permalink
fix(OpenAI Node, Basic LLM Chain Node, Tool Agent Node): Better OpenA…
Browse files Browse the repository at this point in the history
…I API rate limit errors (#10797)
  • Loading branch information
burivuhster authored and riascho committed Sep 23, 2024
1 parent 0126c42 commit 59e17b5
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
import { ApplicationError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
import {
ApplicationError,
NodeApiError,
NodeConnectionType,
NodeOperationError,
} from 'n8n-workflow';
import type {
IBinaryData,
IDataObject,
Expand Down Expand Up @@ -30,6 +35,10 @@ import {
isChatInstance,
} from '../../../utils/helpers';
import { getTracingConfig } from '../../../utils/tracing';
import {
getCustomErrorMessage as getCustomOpenAiErrorMessage,
isOpenAiError,
} from '../../vendors/OpenAi/helpers/error-handling';

interface MessagesTemplate {
type: string;
Expand Down Expand Up @@ -580,6 +589,18 @@ export class ChainLlm implements INodeType {
});
});
} catch (error) {
// If the error is an OpenAI's rate limit error, we want to handle it differently
// because OpenAI has multiple different rate limit errors
if (error instanceof NodeApiError && isOpenAiError(error.cause)) {
const openAiErrorCode: string | undefined = (error.cause as any).error?.code;
if (openAiErrorCode) {
const customMessage = getCustomOpenAiErrorMessage(openAiErrorCode);
if (customMessage) {
error.message = customMessage;
}
}
}

if (this.continueOnFail()) {
returnData.push({ json: { error: error.message }, pairedItem: { item: itemIndex } });
continue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@ import {
type INodeType,
type INodeTypeDescription,
type SupplyData,
type JsonObject,
NodeApiError,
} from 'n8n-workflow';

import { ChatOpenAI, type ClientOptions } from '@langchain/openai';
import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
import { N8nLlmTracing } from '../N8nLlmTracing';
import { RateLimitError } from 'openai';
import { getCustomErrorMessage } from '../../vendors/OpenAi/helpers/error-handling';

export class LmChatOpenAi implements INodeType {
description: INodeTypeDescription = {
Expand Down Expand Up @@ -272,6 +276,25 @@ export class LmChatOpenAi implements INodeType {
response_format: { type: options.responseFormat },
}
: undefined,
onFailedAttempt: (error: any) => {
// If the error is a rate limit error, we want to handle it differently
// because OpenAI has multiple different rate limit errors
if (error instanceof RateLimitError) {
const errorCode = error?.code;
if (errorCode) {
const customErrorMessage = getCustomErrorMessage(errorCode);

const apiError = new NodeApiError(this.getNode(), error as unknown as JsonObject);
if (customErrorMessage) {
apiError.message = customErrorMessage;
}

throw apiError;
}
}

throw error;
},
});

return {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import * as image from './image';
import * as text from './text';

import type { OpenAiType } from './node.type';
import { getCustomErrorMessage } from '../helpers/error-handling';

export async function router(this: IExecuteFunctions) {
const returnData: INodeExecutionData[] = [];
Expand Down Expand Up @@ -61,6 +62,15 @@ export async function router(this: IExecuteFunctions) {
}

if (error instanceof NodeApiError) {
// If the error is a rate limit error, we want to handle it differently
const errorCode: string | undefined = (error.cause as any).error?.error?.code;
if (errorCode) {
const customErrorMessage = getCustomErrorMessage(errorCode);
if (customErrorMessage) {
error.message = customErrorMessage;
}
}

error.context = {
itemIndex: i,
};
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { OpenAIError } from 'openai/error';

const errorMap: Record<string, string> = {
insufficient_quota: 'OpenAI: Insufficient quota',
rate_limit_exceeded: 'OpenAI: Rate limit reached',
};

export function getCustomErrorMessage(errorCode: string): string | undefined {
return errorMap[errorCode];
}

export function isOpenAiError(error: any): error is OpenAIError {
return error instanceof OpenAIError;
}

0 comments on commit 59e17b5

Please sign in to comment.