Update provider integration and icon

Author: avianion

apps/sim/components/icons.tsx

@@ -5551,17 +5551,10 @@ export function FirefliesIcon(props: SVGProps<SVGSVGElement>) {
 }
 
 export const AvianIcon = (props: SVGProps<SVGSVGElement>) => (
-  <svg
-    {...props}
-    fill='currentColor'
-    height='1em'
-    viewBox='0 0 24 24'
-    width='1em'
-    xmlns='http://www.w3.org/2000/svg'
-  >
+  <svg {...props} viewBox='0 0 24 24' xmlns='http://www.w3.org/2000/svg'>
     <title>Avian</title>
     <path
-      d='M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm3.5 7.5L12 13l-3.5-3.5L12 6l3.5 3.5zM8 14.5l4 4 4-4H8z'
+      d='M21 3c-1.5 2-3.5 3.5-6 4.5C13.5 5.5 11 4.5 8 5c-2 .3-3.8 1.2-5 2.5 1.5-.3 3-.2 4.5.3-1.5 1-2.5 2.5-3 4.2 1.2-.8 2.5-1.2 4-1.2-1 1.5-1.2 3.2-.8 5 2-2.5 4.5-4 7.5-4.5.2 1.5-.2 3-1 4.2 2-.5 3.5-1.8 4.5-3.5.5 1 .5 2.2.3 3.5 1.5-1.8 2-4 1.5-6.5C22 7 22 5 21 3z'
       fill='#6366F1'
     />
   </svg>

apps/sim/providers/avian/index.ts

@@ -15,6 +15,7 @@ import {
   calculateCost,
   prepareToolExecution,
   prepareToolsWithUsageControl,
+  sumToolCosts,
   trackForcedToolUsage,
 } from '@/providers/utils'
 import { executeTool } from '@/tools'
@@ -123,28 +124,25 @@ export const avianProvider: ProviderConfig = {
         )
 
         const streamingResult = {
-          stream: createReadableStreamFromAvianStream(
-            streamResponse as any,
-            (content, usage) => {
-              streamingResult.execution.output.content = content
-              streamingResult.execution.output.tokens = {
-                input: usage.prompt_tokens,
-                output: usage.completion_tokens,
-                total: usage.total_tokens,
-              }
+          stream: createReadableStreamFromAvianStream(streamResponse as any, (content, usage) => {
+            streamingResult.execution.output.content = content
+            streamingResult.execution.output.tokens = {
+              input: usage.prompt_tokens,
+              output: usage.completion_tokens,
+              total: usage.total_tokens,
+            }
 
-              const costResult = calculateCost(
-                request.model,
-                usage.prompt_tokens,
-                usage.completion_tokens
-              )
-              streamingResult.execution.output.cost = {
-                input: costResult.input,
-                output: costResult.output,
-                total: costResult.total,
-              }
+            const costResult = calculateCost(
+              request.model,
+              usage.prompt_tokens,
+              usage.completion_tokens
+            )
+            streamingResult.execution.output.cost = {
+              input: costResult.input,
+              output: costResult.output,
+              total: costResult.total,
             }
-          ),
+          }),
           execution: {
             success: true,
             output: {
@@ -205,7 +203,7 @@ export const avianProvider: ProviderConfig = {
         total: currentResponse.usage?.total_tokens || 0,
       }
       const toolCalls = []
-      const toolResults = []
+      const toolResults: Record<string, unknown>[] = []
       const currentMessages = [...allMessages]
       let iterationCount = 0
       let hasUsedForcedTool = false
@@ -325,7 +323,7 @@ export const avianProvider: ProviderConfig = {
             })
 
             let resultContent: any
-            if (result.success) {
+            if (result.success && result.output) {
               toolResults.push(result.output)
               resultContent = result.output
             } else {
@@ -456,28 +454,27 @@ export const avianProvider: ProviderConfig = {
         const accumulatedCost = calculateCost(request.model, tokens.input, tokens.output)
 
         const streamingResult = {
-          stream: createReadableStreamFromAvianStream(
-            streamResponse as any,
-            (content, usage) => {
-              streamingResult.execution.output.content = content
-              streamingResult.execution.output.tokens = {
-                input: tokens.input + usage.prompt_tokens,
-                output: tokens.output + usage.completion_tokens,
-                total: tokens.total + usage.total_tokens,
-              }
+          stream: createReadableStreamFromAvianStream(streamResponse as any, (content, usage) => {
+            streamingResult.execution.output.content = content
+            streamingResult.execution.output.tokens = {
+              input: tokens.input + usage.prompt_tokens,
+              output: tokens.output + usage.completion_tokens,
+              total: tokens.total + usage.total_tokens,
+            }
 
-              const streamCost = calculateCost(
-                request.model,
-                usage.prompt_tokens,
-                usage.completion_tokens
-              )
-              streamingResult.execution.output.cost = {
-                input: accumulatedCost.input + streamCost.input,
-                output: accumulatedCost.output + streamCost.output,
-                total: accumulatedCost.total + streamCost.total,
-              }
+            const streamCost = calculateCost(
+              request.model,
+              usage.prompt_tokens,
+              usage.completion_tokens
+            )
+            const tc = sumToolCosts(toolResults)
+            streamingResult.execution.output.cost = {
+              input: accumulatedCost.input + streamCost.input,
+              output: accumulatedCost.output + streamCost.output,
+              toolCost: tc || undefined,
+              total: accumulatedCost.total + streamCost.total + tc,
             }
-          ),
+          }),
           execution: {
             success: true,
             output: {
@@ -508,6 +505,7 @@ export const avianProvider: ProviderConfig = {
               cost: {
                 input: accumulatedCost.input,
                 output: accumulatedCost.output,
+                toolCost: undefined as number | undefined,
                 total: accumulatedCost.total,
               },
             },