Skip to content

Commit 66766a9

Browse files
icecrasher321icecrasher321
authored
improvement(byok): remove web search block exa (#2579)
* remove exa from byok * improvement(byok): remove web search block exa * fix autolayout * fix type
1 parent 47a259b commit 66766a9

10 files changed

Lines changed: 28 additions & 48 deletions

File tree

‎apps/sim/app/api/tools/search/route.ts‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { type NextRequest, NextResponse } from 'next/server'
22
import { z } from 'zod'
3-
import { getBYOKKey } from '@/lib/api-key/byok'
43
import { checkHybridAuth } from '@/lib/auth/hybrid'
54
import { SEARCH_TOOL_COST } from '@/lib/billing/constants'
65
import { env } from '@/lib/core/config/env'
@@ -11,7 +10,6 @@ const logger = createLogger('search')
1110

1211
const SearchRequestSchema = z.object({
1312
query: z.string().min(1),
14-
workspaceId: z.string().optional(),
1513
})
1614

1715
export const maxDuration = 60
@@ -41,17 +39,7 @@ export async function POST(request: NextRequest) {
4139
const body = await request.json()
4240
const validated = SearchRequestSchema.parse(body)
4341

44-
let exaApiKey = env.EXA_API_KEY
45-
let isBYOK = false
46-
47-
if (validated.workspaceId) {
48-
const byokResult = await getBYOKKey(validated.workspaceId, 'exa')
49-
if (byokResult) {
50-
exaApiKey = byokResult.apiKey
51-
isBYOK = true
52-
logger.info(`[${requestId}] Using workspace BYOK key for Exa search`)
53-
}
54-
}
42+
const exaApiKey = env.EXA_API_KEY
5543

5644
if (!exaApiKey) {
5745
logger.error(`[${requestId}] No Exa API key available`)
@@ -64,7 +52,6 @@ export async function POST(request: NextRequest) {
6452
logger.info(`[${requestId}] Executing search`, {
6553
userId,
6654
query: validated.query,
67-
isBYOK,
6855
})
6956

7057
const result = await executeTool('exa_search', {
@@ -100,7 +87,7 @@ export async function POST(request: NextRequest) {
10087
const cost = {
10188
input: 0,
10289
output: 0,
103-
total: isBYOK ? 0 : SEARCH_TOOL_COST,
90+
total: SEARCH_TOOL_COST,
10491
tokens: {
10592
input: 0,
10693
output: 0,
@@ -119,7 +106,6 @@ export async function POST(request: NextRequest) {
119106
userId,
120107
resultCount: results.length,
121108
cost: cost.total,
122-
isBYOK,
123109
})
124110

125111
return NextResponse.json({

‎apps/sim/app/api/workspaces/[id]/byok-keys/route.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
1212

1313
const logger = createLogger('WorkspaceBYOKKeysAPI')
1414

15-
const VALID_PROVIDERS = ['openai', 'anthropic', 'google', 'mistral', 'exa'] as const
15+
const VALID_PROVIDERS = ['openai', 'anthropic', 'google', 'mistral'] as const
1616

1717
const UpsertKeySchema = z.object({
1818
providerId: z.enum(VALID_PROVIDERS),

‎apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/error/index.tsx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
'use client'
22

33
import { Component, type ReactNode, useEffect } from 'react'
4+
import { ReactFlowProvider } from 'reactflow'
45
import { createLogger } from '@/lib/logs/console/logger'
56
import { Panel } from '@/app/workspace/[workspaceId]/w/[workflowId]/components'
67
import { Sidebar } from '@/app/workspace/[workspaceId]/w/components/sidebar/sidebar'
@@ -47,8 +48,9 @@ export function ErrorUI({
4748
</div>
4849
</div>
4950

50-
{/* Panel */}
51-
<Panel />
51+
<ReactFlowProvider>
52+
<Panel />
53+
</ReactFlowProvider>
5254
</div>
5355
</div>
5456
)

‎apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-auto-layout.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ export type { AutoLayoutOptions }
99
const logger = createLogger('useAutoLayout')
1010

1111
/**
12-
* Hook providing auto-layout functionality for workflows
13-
* Binds workflowId context and provides memoized callback for React components
14-
* Includes automatic fitView animation after successful layout
12+
* Hook providing auto-layout functionality for workflows.
13+
* Binds workflowId context and provides memoized callback for React components.
14+
* Includes automatic fitView animation after successful layout.
15+
*
16+
* Note: This hook requires a ReactFlowProvider ancestor.
1517
*/
1618
export function useAutoLayout(workflowId: string | null) {
1719
const { fitView } = useReactFlow()

‎apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/byok/byok.tsx‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
ModalHeader,
1414
Trash,
1515
} from '@/components/emcn'
16-
import { AnthropicIcon, ExaAIIcon, GeminiIcon, MistralIcon, OpenAIIcon } from '@/components/icons'
16+
import { AnthropicIcon, GeminiIcon, MistralIcon, OpenAIIcon } from '@/components/icons'
1717
import { Skeleton } from '@/components/ui'
1818
import { createLogger } from '@/lib/logs/console/logger'
1919
import {
@@ -61,26 +61,19 @@ const PROVIDERS: {
6161
description: 'LLM calls and Knowledge Base OCR',
6262
placeholder: 'Enter your API key',
6363
},
64-
{
65-
id: 'exa',
66-
name: 'Exa',
67-
icon: ExaAIIcon,
68-
description: 'Web Search block',
69-
placeholder: 'Enter your API key',
70-
},
7164
]
7265

7366
function BYOKKeySkeleton() {
7467
return (
75-
<div className='flex items-center justify-between gap-[12px] rounded-[8px] border p-[12px]'>
68+
<div className='flex items-center justify-between gap-[12px] rounded-[8px] p-[12px]'>
7669
<div className='flex items-center gap-[12px]'>
77-
<Skeleton className='h-[32px] w-[32px] rounded-[6px]' />
78-
<div className='flex flex-col gap-[4px]'>
79-
<Skeleton className='h-[16px] w-[80px]' />
80-
<Skeleton className='h-[14px] w-[160px]' />
70+
<Skeleton className='h-9 w-9 flex-shrink-0 rounded-[6px]' />
71+
<div className='flex flex-col justify-center gap-[1px]'>
72+
<Skeleton className='h-[14px] w-[100px]' />
73+
<Skeleton className='h-[13px] w-[200px]' />
8174
</div>
8275
</div>
83-
<Skeleton className='h-[32px] w-[80px] rounded-[6px]' />
76+
<Skeleton className='h-[32px] w-[72px] rounded-[6px]' />
8477
</div>
8578
)
8679
}
@@ -168,11 +161,11 @@ export function BYOK() {
168161
return (
169162
<div
170163
key={provider.id}
171-
className='flex items-center justify-between gap-[12px] rounded-[8px] border p-[12px]'
164+
className='flex items-center justify-between gap-[12px] rounded-[8px] p-[12px]'
172165
>
173166
<div className='flex items-center gap-[12px]'>
174-
<div className='flex h-[32px] w-[32px] items-center justify-center rounded-[6px] bg-[var(--surface-3)]'>
175-
<Icon className='h-[18px] w-[18px]' />
167+
<div className='flex h-9 w-9 flex-shrink-0 items-center justify-center overflow-hidden rounded-[6px] bg-[var(--surface-6)]'>
168+
<Icon className='h-4 w-4' />
176169
</div>
177170
<div className='flex flex-col gap-[2px]'>
178171
<span className='font-medium text-[14px]'>{provider.name}</span>

‎apps/sim/app/workspace/[workspaceId]/w/page.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import { useEffect, useState } from 'react'
44
import { useParams, useRouter } from 'next/navigation'
5+
import { ReactFlowProvider } from 'reactflow'
56
import { createLogger } from '@/lib/logs/console/logger'
67
import { Panel, Terminal } from '@/app/workspace/[workspaceId]/w/[workflowId]/components'
78
import { useWorkflows } from '@/hooks/queries/workflows'
@@ -69,7 +70,9 @@ export default function WorkflowsPage() {
6970
}}
7071
/>
7172
</div>
72-
<Panel />
73+
<ReactFlowProvider>
74+
<Panel />
75+
</ReactFlowProvider>
7376
</div>
7477
<Terminal />
7578
</div>

‎apps/sim/hooks/queries/byok-keys.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { API_ENDPOINTS } from '@/stores/constants'
44

55
const logger = createLogger('BYOKKeysQueries')
66

7-
export type BYOKProviderId = 'openai' | 'anthropic' | 'google' | 'mistral' | 'exa'
7+
export type BYOKProviderId = 'openai' | 'anthropic' | 'google' | 'mistral'
88

99
export interface BYOKKey {
1010
id: string

‎apps/sim/lib/api-key/byok.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { createLogger } from '@/lib/logs/console/logger'
66

77
const logger = createLogger('BYOKKeys')
88

9-
export type BYOKProviderId = 'openai' | 'anthropic' | 'google' | 'mistral' | 'exa'
9+
export type BYOKProviderId = 'openai' | 'anthropic' | 'google' | 'mistral'
1010

1111
export interface BYOKKeyResult {
1212
apiKey: string

‎apps/sim/tools/search/tool.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ export const searchTool: ToolConfig<SearchParams, SearchResponse> = {
2525
}),
2626
body: (params) => ({
2727
query: params.query,
28-
workspaceId: params._context?.workspaceId,
2928
}),
3029
},
3130

‎apps/sim/tools/search/types.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@ import type { ToolResponse } from '@/tools/types'
22

33
export interface SearchParams {
44
query: string
5-
_context?: {
6-
workflowId?: string
7-
workspaceId?: string
8-
executionId?: string
9-
}
105
}
116

127
export interface SearchResponse extends ToolResponse {

0 commit comments

Comments
 (0)