Skip to content

Commit cdacb79

Browse files
waleedlatif1waleedlatif1
authored
improvement(providers): replace @ts-ignore with typed ProviderError class (#3235)
1 parent 3ce5414 commit cdacb79

File tree

13 files changed

+71
-95
lines changed

13 files changed

+71
-95
lines changed

‎apps/sim/providers/anthropic/core.ts‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import {
1414
supportsNativeStructuredOutputs,
1515
} from '@/providers/models'
1616
import type { ProviderRequest, ProviderResponse, TimeSegment } from '@/providers/types'
17+
import { ProviderError } from '@/providers/types'
1718
import {
1819
calculateCost,
1920
prepareToolExecution,
@@ -842,15 +843,11 @@ export async function executeAnthropicProviderRequest(
842843
duration: totalDuration,
843844
})
844845

845-
const enhancedError = new Error(error instanceof Error ? error.message : String(error))
846-
// @ts-ignore
847-
enhancedError.timing = {
846+
throw new ProviderError(error instanceof Error ? error.message : String(error), {
848847
startTime: providerStartTimeISO,
849848
endTime: providerEndTimeISO,
850849
duration: totalDuration,
851-
}
852-
853-
throw enhancedError
850+
})
854851
}
855852
}
856853

@@ -1299,14 +1296,10 @@ export async function executeAnthropicProviderRequest(
12991296
duration: totalDuration,
13001297
})
13011298

1302-
const enhancedError = new Error(error instanceof Error ? error.message : String(error))
1303-
// @ts-ignore
1304-
enhancedError.timing = {
1299+
throw new ProviderError(error instanceof Error ? error.message : String(error), {
13051300
startTime: providerStartTimeISO,
13061301
endTime: providerEndTimeISO,
13071302
duration: totalDuration,
1308-
}
1309-
1310-
throw enhancedError
1303+
})
13111304
}
13121305
}

‎apps/sim/providers/azure-openai/index.ts‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import type {
3030
ProviderResponse,
3131
TimeSegment,
3232
} from '@/providers/types'
33+
import { ProviderError } from '@/providers/types'
3334
import {
3435
calculateCost,
3536
prepareToolExecution,
@@ -251,7 +252,7 @@ async function executeChatCompletionsRequest(
251252
output: currentResponse.usage?.completion_tokens || 0,
252253
total: currentResponse.usage?.total_tokens || 0,
253254
}
254-
const toolCalls: (FunctionCallResponse & { success: boolean })[] = []
255+
const toolCalls: FunctionCallResponse[] = []
255256
const toolResults: Record<string, unknown>[] = []
256257
const currentMessages = [...allMessages]
257258
let iterationCount = 0
@@ -577,15 +578,11 @@ async function executeChatCompletionsRequest(
577578
duration: totalDuration,
578579
})
579580

580-
const enhancedError = new Error(error instanceof Error ? error.message : String(error))
581-
// @ts-ignore - Adding timing property to the error
582-
enhancedError.timing = {
581+
throw new ProviderError(error instanceof Error ? error.message : String(error), {
583582
startTime: providerStartTimeISO,
584583
endTime: providerEndTimeISO,
585584
duration: totalDuration,
586-
}
587-
588-
throw enhancedError
585+
})
589586
}
590587
}
591588

‎apps/sim/providers/bedrock/index.ts‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,13 @@ import {
2222
} from '@/providers/bedrock/utils'
2323
import { getProviderDefaultModel, getProviderModels } from '@/providers/models'
2424
import type {
25+
FunctionCallResponse,
2526
ProviderConfig,
2627
ProviderRequest,
2728
ProviderResponse,
2829
TimeSegment,
2930
} from '@/providers/types'
31+
import { ProviderError } from '@/providers/types'
3032
import {
3133
calculateCost,
3234
prepareToolExecution,
@@ -419,8 +421,8 @@ export const bedrockProvider: ProviderConfig = {
419421
pricing: initialCost.pricing,
420422
}
421423

422-
const toolCalls: any[] = []
423-
const toolResults: any[] = []
424+
const toolCalls: FunctionCallResponse[] = []
425+
const toolResults: Record<string, unknown>[] = []
424426
const currentMessages = [...messages]
425427
let iterationCount = 0
426428
let hasUsedForcedTool = false
@@ -561,7 +563,7 @@ export const bedrockProvider: ProviderConfig = {
561563

562564
let resultContent: any
563565
if (result.success) {
564-
toolResults.push(result.output)
566+
toolResults.push(result.output!)
565567
resultContent = result.output
566568
} else {
567569
resultContent = {
@@ -903,15 +905,11 @@ export const bedrockProvider: ProviderConfig = {
903905
duration: totalDuration,
904906
})
905907

906-
const enhancedError = new Error(error instanceof Error ? error.message : String(error))
907-
// @ts-ignore
908-
enhancedError.timing = {
908+
throw new ProviderError(error instanceof Error ? error.message : String(error), {
909909
startTime: providerStartTimeISO,
910910
endTime: providerEndTimeISO,
911911
duration: totalDuration,
912-
}
913-
914-
throw enhancedError
912+
})
915913
}
916914
},
917915
}

‎apps/sim/providers/cerebras/index.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import type {
1111
ProviderResponse,
1212
TimeSegment,
1313
} from '@/providers/types'
14+
import { ProviderError } from '@/providers/types'
1415
import {
1516
calculateCost,
1617
prepareToolExecution,
@@ -539,15 +540,11 @@ export const cerebrasProvider: ProviderConfig = {
539540
duration: totalDuration,
540541
})
541542

542-
const enhancedError = new Error(error instanceof Error ? error.message : String(error))
543-
// @ts-ignore - Adding timing property to error for debugging
544-
enhancedError.timing = {
543+
throw new ProviderError(error instanceof Error ? error.message : String(error), {
545544
startTime: providerStartTimeISO,
546545
endTime: providerEndTimeISO,
547546
duration: totalDuration,
548-
}
549-
550-
throw enhancedError
547+
})
551548
}
552549
},
553550
}

‎apps/sim/providers/deepseek/index.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import type {
1010
ProviderResponse,
1111
TimeSegment,
1212
} from '@/providers/types'
13+
import { ProviderError } from '@/providers/types'
1314
import {
1415
calculateCost,
1516
prepareToolExecution,
@@ -538,15 +539,11 @@ export const deepseekProvider: ProviderConfig = {
538539
duration: totalDuration,
539540
})
540541

541-
const enhancedError = new Error(error instanceof Error ? error.message : String(error))
542-
// @ts-ignore
543-
enhancedError.timing = {
542+
throw new ProviderError(error instanceof Error ? error.message : String(error), {
544543
startTime: providerStartTimeISO,
545544
endTime: providerEndTimeISO,
546545
duration: totalDuration,
547-
}
548-
549-
throw enhancedError
546+
})
550547
}
551548
},
552549
}

‎apps/sim/providers/groq/index.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import type {
1010
ProviderResponse,
1111
TimeSegment,
1212
} from '@/providers/types'
13+
import { ProviderError } from '@/providers/types'
1314
import {
1415
calculateCost,
1516
prepareToolExecution,
@@ -496,15 +497,11 @@ export const groqProvider: ProviderConfig = {
496497
duration: totalDuration,
497498
})
498499

499-
const enhancedError = new Error(error instanceof Error ? error.message : String(error))
500-
// @ts-ignore
501-
enhancedError.timing = {
500+
throw new ProviderError(error instanceof Error ? error.message : String(error), {
502501
startTime: providerStartTimeISO,
503502
endTime: providerEndTimeISO,
504503
duration: totalDuration,
505-
}
506-
507-
throw enhancedError
504+
})
508505
}
509506
},
510507
}

‎apps/sim/providers/mistral/index.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import type {
1111
ProviderResponse,
1212
TimeSegment,
1313
} from '@/providers/types'
14+
import { ProviderError } from '@/providers/types'
1415
import {
1516
calculateCost,
1617
prepareToolExecution,
@@ -551,15 +552,11 @@ export const mistralProvider: ProviderConfig = {
551552
duration: totalDuration,
552553
})
553554

554-
const enhancedError = new Error(error instanceof Error ? error.message : String(error))
555-
// @ts-ignore - Adding timing property to error for debugging
556-
enhancedError.timing = {
555+
throw new ProviderError(error instanceof Error ? error.message : String(error), {
557556
startTime: providerStartTimeISO,
558557
endTime: providerEndTimeISO,
559558
duration: totalDuration,
560-
}
561-
562-
throw enhancedError
559+
})
563560
}
564561
},
565562
}

‎apps/sim/providers/ollama/index.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import type {
1212
ProviderResponse,
1313
TimeSegment,
1414
} from '@/providers/types'
15+
import { ProviderError } from '@/providers/types'
1516
import { calculateCost, prepareToolExecution } from '@/providers/utils'
1617
import { useProvidersStore } from '@/stores/providers'
1718
import { executeTool } from '@/tools'
@@ -554,15 +555,11 @@ export const ollamaProvider: ProviderConfig = {
554555
duration: totalDuration,
555556
})
556557

557-
const enhancedError = new Error(error instanceof Error ? error.message : String(error))
558-
// @ts-ignore
559-
enhancedError.timing = {
558+
throw new ProviderError(error instanceof Error ? error.message : String(error), {
560559
startTime: providerStartTimeISO,
561560
endTime: providerEndTimeISO,
562561
duration: totalDuration,
563-
}
564-
565-
throw enhancedError
562+
})
566563
}
567564
},
568565
}

‎apps/sim/providers/openai/core.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import type OpenAI from 'openai'
33
import type { StreamingExecution } from '@/executor/types'
44
import { MAX_TOOL_ITERATIONS } from '@/providers'
55
import type { Message, ProviderRequest, ProviderResponse, TimeSegment } from '@/providers/types'
6+
import { ProviderError } from '@/providers/types'
67
import {
78
calculateCost,
89
prepareToolExecution,
@@ -806,14 +807,10 @@ export async function executeResponsesProviderRequest(
806807
duration: totalDuration,
807808
})
808809

809-
const enhancedError = new Error(error instanceof Error ? error.message : String(error))
810-
// @ts-ignore - Adding timing property to the error
811-
enhancedError.timing = {
810+
throw new ProviderError(error instanceof Error ? error.message : String(error), {
812811
startTime: providerStartTimeISO,
813812
endTime: providerEndTimeISO,
814813
duration: totalDuration,
815-
}
816-
817-
throw enhancedError
814+
})
818815
}
819816
}

‎apps/sim/providers/openrouter/index.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,14 @@ import {
1010
supportsNativeStructuredOutputs,
1111
} from '@/providers/openrouter/utils'
1212
import type {
13+
FunctionCallResponse,
14+
Message,
1315
ProviderConfig,
1416
ProviderRequest,
1517
ProviderResponse,
1618
TimeSegment,
1719
} from '@/providers/types'
20+
import { ProviderError } from '@/providers/types'
1821
import {
1922
calculateCost,
2023
generateSchemaInstructions,
@@ -90,7 +93,7 @@ export const openRouterProvider: ProviderConfig = {
9093
stream: !!request.stream,
9194
})
9295

93-
const allMessages = [] as any[]
96+
const allMessages: Message[] = []
9497

9598
if (request.systemPrompt) {
9699
allMessages.push({ role: 'system', content: request.systemPrompt })
@@ -237,8 +240,8 @@ export const openRouterProvider: ProviderConfig = {
237240
output: currentResponse.usage?.completion_tokens || 0,
238241
total: currentResponse.usage?.total_tokens || 0,
239242
}
240-
const toolCalls = [] as any[]
241-
const toolResults = [] as any[]
243+
const toolCalls: FunctionCallResponse[] = []
244+
const toolResults: Record<string, unknown>[] = []
242245
const currentMessages = [...allMessages]
243246
let iterationCount = 0
244247
let modelTime = firstResponseTime
@@ -352,7 +355,7 @@ export const openRouterProvider: ProviderConfig = {
352355

353356
let resultContent: any
354357
if (result.success) {
355-
toolResults.push(result.output)
358+
toolResults.push(result.output!)
356359
resultContent = result.output
357360
} else {
358361
resultContent = {
@@ -593,14 +596,11 @@ export const openRouterProvider: ProviderConfig = {
593596
}
594597

595598
logger.error('Error in OpenRouter request:', errorDetails)
596-
const enhancedError = new Error(error instanceof Error ? error.message : String(error))
597-
// @ts-ignore
598-
enhancedError.timing = {
599+
throw new ProviderError(error instanceof Error ? error.message : String(error), {
599600
startTime: providerStartTimeISO,
600601
endTime: providerEndTimeISO,
601602
duration: totalDuration,
602-
}
603-
throw enhancedError
603+
})
604604
}
605605
},
606606
}

0 commit comments

Comments
 (0)