mirror of
https://github.com/simstudioai/sim.git
synced 2026-02-14 00:15:09 -05:00
Compare commits
2 Commits
fix/cancel
...
cursor/cop
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ccb15dae09 | ||
|
|
3ef6b05035 |
@@ -7,7 +7,7 @@ import { BlockInfoCard } from "@/components/ui/block-info-card"
|
||||
|
||||
<BlockInfoCard
|
||||
type="google_books"
|
||||
color="#E0E0E0"
|
||||
color="#FFFFFF"
|
||||
/>
|
||||
|
||||
## Usage Instructions
|
||||
|
||||
@@ -71,7 +71,6 @@ Retrieve an object from an AWS S3 bucket
|
||||
| --------- | ---- | -------- | ----------- |
|
||||
| `accessKeyId` | string | Yes | Your AWS Access Key ID |
|
||||
| `secretAccessKey` | string | Yes | Your AWS Secret Access Key |
|
||||
| `region` | string | No | Optional region override when URL does not include region \(e.g., us-east-1, eu-west-1\) |
|
||||
| `s3Uri` | string | Yes | S3 Object URL \(e.g., https://bucket.s3.region.amazonaws.com/path/to/file\) |
|
||||
|
||||
#### Output
|
||||
|
||||
@@ -79,7 +79,7 @@ Send messages to Slack channels or direct messages. Supports Slack mrkdwn format
|
||||
| `channel` | string | No | Slack channel ID \(e.g., C1234567890\) |
|
||||
| `dmUserId` | string | No | Slack user ID for direct messages \(e.g., U1234567890\) |
|
||||
| `text` | string | Yes | Message text to send \(supports Slack mrkdwn formatting\) |
|
||||
| `threadTs` | string | No | Thread timestamp to reply to \(creates thread reply\) |
|
||||
| `thread_ts` | string | No | Thread timestamp to reply to \(creates thread reply\) |
|
||||
| `files` | file[] | No | Files to attach to the message |
|
||||
|
||||
#### Output
|
||||
|
||||
@@ -238,11 +238,6 @@ Use this context to calculate relative dates like "yesterday", "last week", "beg
|
||||
finalSystemPrompt += currentTimeContext
|
||||
}
|
||||
|
||||
if (generationType === 'cron-expression') {
|
||||
finalSystemPrompt +=
|
||||
'\n\nIMPORTANT: Return ONLY the raw cron expression (e.g., "0 9 * * 1-5"). Do NOT wrap it in markdown code blocks, backticks, or quotes. Do NOT include any explanation or text before or after the expression.'
|
||||
}
|
||||
|
||||
if (generationType === 'json-object') {
|
||||
finalSystemPrompt +=
|
||||
'\n\nIMPORTANT: Return ONLY the raw JSON object. Do NOT wrap it in markdown code blocks (no ```json or ```). Do NOT include any explanation or text before or after the JSON. The response must start with { and end with }.'
|
||||
|
||||
@@ -131,10 +131,8 @@ export const Copilot = forwardRef<CopilotRef, CopilotProps>(({ panelWidth }, ref
|
||||
resumeActiveStream,
|
||||
})
|
||||
|
||||
// Handle scroll management (80px stickiness for copilot)
|
||||
const { scrollAreaRef, scrollToBottom } = useScrollManagement(messages, isSendingMessage, {
|
||||
stickinessThreshold: 40,
|
||||
})
|
||||
// Handle scroll management
|
||||
const { scrollAreaRef, scrollToBottom } = useScrollManagement(messages, isSendingMessage)
|
||||
|
||||
// Handle chat history grouping
|
||||
const { groupedChats, handleHistoryDropdownOpen: handleHistoryDropdownOpenHook } = useChatHistory(
|
||||
|
||||
@@ -239,7 +239,12 @@ export const ComboBox = memo(function ComboBox({
|
||||
*/
|
||||
const defaultOptionValue = useMemo(() => {
|
||||
if (defaultValue !== undefined) {
|
||||
return defaultValue
|
||||
// Validate that the default value exists in the available (filtered) options
|
||||
const defaultInOptions = evaluatedOptions.find((opt) => getOptionValue(opt) === defaultValue)
|
||||
if (defaultInOptions) {
|
||||
return defaultValue
|
||||
}
|
||||
// Default not available (e.g. provider disabled) — fall through to other fallbacks
|
||||
}
|
||||
|
||||
// For model field, default to claude-sonnet-4-5 if available
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
'use client'
|
||||
|
||||
import { useEffect, useRef } from 'react'
|
||||
import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
|
||||
import { SubBlock } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/sub-block'
|
||||
import type { SubBlockConfig as BlockSubBlockConfig } from '@/blocks/types'
|
||||
import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
|
||||
import { useSubBlockStore } from '@/stores/workflows/subblock/store'
|
||||
|
||||
interface ToolSubBlockRendererProps {
|
||||
blockId: string
|
||||
@@ -45,43 +44,53 @@ export function ToolSubBlockRenderer({
|
||||
canonicalToggle,
|
||||
}: ToolSubBlockRendererProps) {
|
||||
const syntheticId = `${subBlockId}-tool-${toolIndex}-${effectiveParamId}`
|
||||
const [storeValue, setStoreValue] = useSubBlockValue(blockId, syntheticId)
|
||||
|
||||
const toolParamValue = toolParams?.[effectiveParamId] ?? ''
|
||||
const isObjectType = OBJECT_SUBBLOCK_TYPES.has(subBlock.type)
|
||||
|
||||
const syncedRef = useRef<string | null>(null)
|
||||
const onParamChangeRef = useRef(onParamChange)
|
||||
onParamChangeRef.current = onParamChange
|
||||
const lastPushedToStoreRef = useRef<string | null>(null)
|
||||
const lastPushedToParamsRef = useRef<string | null>(null)
|
||||
|
||||
useEffect(() => {
|
||||
const unsub = useSubBlockStore.subscribe((state, prevState) => {
|
||||
const wfId = useWorkflowRegistry.getState().activeWorkflowId
|
||||
if (!wfId) return
|
||||
const newVal = state.workflowValues[wfId]?.[blockId]?.[syntheticId]
|
||||
const oldVal = prevState.workflowValues[wfId]?.[blockId]?.[syntheticId]
|
||||
if (newVal === oldVal) return
|
||||
const stringified =
|
||||
newVal == null ? '' : typeof newVal === 'string' ? newVal : JSON.stringify(newVal)
|
||||
if (stringified === syncedRef.current) return
|
||||
syncedRef.current = stringified
|
||||
onParamChangeRef.current(toolIndex, effectiveParamId, stringified)
|
||||
})
|
||||
return unsub
|
||||
}, [blockId, syntheticId, toolIndex, effectiveParamId])
|
||||
|
||||
useEffect(() => {
|
||||
if (toolParamValue === syncedRef.current) return
|
||||
syncedRef.current = toolParamValue
|
||||
if (isObjectType && toolParamValue) {
|
||||
try {
|
||||
const parsed = JSON.parse(toolParamValue)
|
||||
if (typeof parsed === 'object' && parsed !== null) {
|
||||
useSubBlockStore.getState().setValue(blockId, syntheticId, parsed)
|
||||
return
|
||||
}
|
||||
} catch {}
|
||||
if (!toolParamValue && lastPushedToStoreRef.current === null) {
|
||||
lastPushedToStoreRef.current = toolParamValue
|
||||
lastPushedToParamsRef.current = toolParamValue
|
||||
return
|
||||
}
|
||||
useSubBlockStore.getState().setValue(blockId, syntheticId, toolParamValue)
|
||||
}, [toolParamValue, blockId, syntheticId, isObjectType])
|
||||
if (toolParamValue !== lastPushedToStoreRef.current) {
|
||||
lastPushedToStoreRef.current = toolParamValue
|
||||
lastPushedToParamsRef.current = toolParamValue
|
||||
|
||||
if (isObjectType && typeof toolParamValue === 'string' && toolParamValue) {
|
||||
try {
|
||||
const parsed = JSON.parse(toolParamValue)
|
||||
if (typeof parsed === 'object' && parsed !== null) {
|
||||
setStoreValue(parsed)
|
||||
return
|
||||
}
|
||||
} catch {
|
||||
// Not valid JSON — fall through to set as string
|
||||
}
|
||||
}
|
||||
setStoreValue(toolParamValue)
|
||||
}
|
||||
}, [toolParamValue, setStoreValue, isObjectType])
|
||||
|
||||
useEffect(() => {
|
||||
if (storeValue == null && lastPushedToParamsRef.current === null) return
|
||||
const stringValue =
|
||||
storeValue == null
|
||||
? ''
|
||||
: typeof storeValue === 'string'
|
||||
? storeValue
|
||||
: JSON.stringify(storeValue)
|
||||
if (stringValue !== lastPushedToParamsRef.current) {
|
||||
lastPushedToParamsRef.current = stringValue
|
||||
lastPushedToStoreRef.current = stringValue
|
||||
onParamChange(toolIndex, effectiveParamId, stringValue)
|
||||
}
|
||||
}, [storeValue, toolIndex, effectiveParamId, onParamChange])
|
||||
|
||||
const visibility = subBlock.paramVisibility ?? 'user-or-llm'
|
||||
const isOptionalForUser = visibility !== 'user-only'
|
||||
|
||||
@@ -1741,97 +1741,36 @@ export const ToolInput = memo(function ToolInput({
|
||||
) : null
|
||||
})()}
|
||||
|
||||
{requiresOAuth && oauthConfig && (
|
||||
<div className='relative min-w-0 space-y-[6px]'>
|
||||
<div className='font-medium text-[13px] text-[var(--text-primary)]'>
|
||||
Account <span className='ml-0.5'>*</span>
|
||||
</div>
|
||||
<div className='w-full min-w-0'>
|
||||
<ToolCredentialSelector
|
||||
value={tool.params?.credential || ''}
|
||||
onChange={(value: string) =>
|
||||
handleParamChange(toolIndex, 'credential', value)
|
||||
}
|
||||
provider={oauthConfig.provider as OAuthProvider}
|
||||
requiredScopes={
|
||||
toolBlock?.subBlocks?.find((sb) => sb.id === 'credential')
|
||||
?.requiredScopes ||
|
||||
getCanonicalScopesForProvider(oauthConfig.provider)
|
||||
}
|
||||
serviceId={oauthConfig.provider}
|
||||
disabled={disabled}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{(() => {
|
||||
const renderedElements: React.ReactNode[] = []
|
||||
|
||||
const showOAuth =
|
||||
requiresOAuth && oauthConfig && tool.params?.authMethod !== 'bot_token'
|
||||
|
||||
const renderOAuthAccount = (): React.ReactNode => {
|
||||
if (!showOAuth || !oauthConfig) return null
|
||||
const credentialSubBlock = toolBlock?.subBlocks?.find(
|
||||
(s) => s.type === 'oauth-input'
|
||||
)
|
||||
return (
|
||||
<div key='oauth-account' className='relative min-w-0 space-y-[6px]'>
|
||||
<div className='font-medium text-[13px] text-[var(--text-primary)]'>
|
||||
{credentialSubBlock?.title || 'Account'}{' '}
|
||||
<span className='ml-0.5'>*</span>
|
||||
</div>
|
||||
<div className='w-full min-w-0'>
|
||||
<ToolCredentialSelector
|
||||
value={tool.params?.credential || ''}
|
||||
onChange={(value: string) =>
|
||||
handleParamChange(toolIndex, 'credential', value)
|
||||
}
|
||||
provider={oauthConfig.provider as OAuthProvider}
|
||||
requiredScopes={
|
||||
credentialSubBlock?.requiredScopes ||
|
||||
getCanonicalScopesForProvider(oauthConfig.provider)
|
||||
}
|
||||
serviceId={oauthConfig.provider}
|
||||
disabled={disabled}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
const renderSubBlock = (sb: BlockSubBlockConfig): React.ReactNode => {
|
||||
const effectiveParamId = sb.id
|
||||
const canonicalId = toolCanonicalIndex?.canonicalIdBySubBlockId[sb.id]
|
||||
const canonicalGroup = canonicalId
|
||||
? toolCanonicalIndex?.groupsById[canonicalId]
|
||||
: undefined
|
||||
const hasCanonicalPair = isCanonicalPair(canonicalGroup)
|
||||
const canonicalMode =
|
||||
canonicalGroup && hasCanonicalPair
|
||||
? resolveCanonicalMode(
|
||||
canonicalGroup,
|
||||
{ operation: tool.operation, ...tool.params },
|
||||
toolScopedOverrides
|
||||
)
|
||||
: undefined
|
||||
|
||||
const canonicalToggleProp =
|
||||
hasCanonicalPair && canonicalMode && canonicalId
|
||||
? {
|
||||
mode: canonicalMode,
|
||||
onToggle: () => {
|
||||
const nextMode = canonicalMode === 'advanced' ? 'basic' : 'advanced'
|
||||
collaborativeSetBlockCanonicalMode(
|
||||
blockId,
|
||||
`${tool.type}:${canonicalId}`,
|
||||
nextMode
|
||||
)
|
||||
},
|
||||
}
|
||||
: undefined
|
||||
|
||||
const sbWithTitle = sb.title
|
||||
? sb
|
||||
: { ...sb, title: formatParameterLabel(effectiveParamId) }
|
||||
|
||||
return (
|
||||
<ToolSubBlockRenderer
|
||||
key={sb.id}
|
||||
blockId={blockId}
|
||||
subBlockId={subBlockId}
|
||||
toolIndex={toolIndex}
|
||||
subBlock={sbWithTitle}
|
||||
effectiveParamId={effectiveParamId}
|
||||
toolParams={tool.params}
|
||||
onParamChange={handleParamChange}
|
||||
disabled={disabled}
|
||||
canonicalToggle={canonicalToggleProp}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
if (useSubBlocks && displaySubBlocks.length > 0) {
|
||||
const allBlockSubBlocks = toolBlock?.subBlocks || []
|
||||
const coveredParamIds = new Set(
|
||||
allBlockSubBlocks.flatMap((sb) => {
|
||||
displaySubBlocks.flatMap((sb) => {
|
||||
const ids = [sb.id]
|
||||
if (sb.canonicalParamId) ids.push(sb.canonicalParamId)
|
||||
const cId = toolCanonicalIndex?.canonicalIdBySubBlockId[sb.id]
|
||||
@@ -1846,45 +1785,57 @@ export const ToolInput = memo(function ToolInput({
|
||||
})
|
||||
)
|
||||
|
||||
type RenderItem =
|
||||
| { kind: 'subblock'; sb: BlockSubBlockConfig }
|
||||
| { kind: 'oauth' }
|
||||
displaySubBlocks.forEach((sb) => {
|
||||
const effectiveParamId = sb.id
|
||||
const canonicalId = toolCanonicalIndex?.canonicalIdBySubBlockId[sb.id]
|
||||
const canonicalGroup = canonicalId
|
||||
? toolCanonicalIndex?.groupsById[canonicalId]
|
||||
: undefined
|
||||
const hasCanonicalPair = isCanonicalPair(canonicalGroup)
|
||||
const canonicalMode =
|
||||
canonicalGroup && hasCanonicalPair
|
||||
? resolveCanonicalMode(
|
||||
canonicalGroup,
|
||||
{ operation: tool.operation, ...tool.params },
|
||||
toolScopedOverrides
|
||||
)
|
||||
: undefined
|
||||
|
||||
const renderOrder: RenderItem[] = displaySubBlocks.map((sb) => ({
|
||||
kind: 'subblock' as const,
|
||||
sb,
|
||||
}))
|
||||
const canonicalToggleProp =
|
||||
hasCanonicalPair && canonicalMode && canonicalId
|
||||
? {
|
||||
mode: canonicalMode,
|
||||
onToggle: () => {
|
||||
const nextMode =
|
||||
canonicalMode === 'advanced' ? 'basic' : 'advanced'
|
||||
collaborativeSetBlockCanonicalMode(
|
||||
blockId,
|
||||
`${tool.type}:${canonicalId}`,
|
||||
nextMode
|
||||
)
|
||||
},
|
||||
}
|
||||
: undefined
|
||||
|
||||
if (showOAuth) {
|
||||
const credentialIdx = allBlockSubBlocks.findIndex(
|
||||
(sb) => sb.type === 'oauth-input'
|
||||
const sbWithTitle = sb.title
|
||||
? sb
|
||||
: { ...sb, title: formatParameterLabel(effectiveParamId) }
|
||||
|
||||
renderedElements.push(
|
||||
<ToolSubBlockRenderer
|
||||
key={sb.id}
|
||||
blockId={blockId}
|
||||
subBlockId={subBlockId}
|
||||
toolIndex={toolIndex}
|
||||
subBlock={sbWithTitle}
|
||||
effectiveParamId={effectiveParamId}
|
||||
toolParams={tool.params}
|
||||
onParamChange={handleParamChange}
|
||||
disabled={disabled}
|
||||
canonicalToggle={canonicalToggleProp}
|
||||
/>
|
||||
)
|
||||
if (credentialIdx >= 0) {
|
||||
const sbPositions = new Map(allBlockSubBlocks.map((sb, i) => [sb.id, i]))
|
||||
const insertAt = renderOrder.findIndex(
|
||||
(item) =>
|
||||
item.kind === 'subblock' &&
|
||||
(sbPositions.get(item.sb.id) ?? Number.POSITIVE_INFINITY) >
|
||||
credentialIdx
|
||||
)
|
||||
if (insertAt === -1) {
|
||||
renderOrder.push({ kind: 'oauth' })
|
||||
} else {
|
||||
renderOrder.splice(insertAt, 0, { kind: 'oauth' })
|
||||
}
|
||||
} else {
|
||||
renderOrder.unshift({ kind: 'oauth' })
|
||||
}
|
||||
}
|
||||
|
||||
for (const item of renderOrder) {
|
||||
if (item.kind === 'oauth') {
|
||||
const el = renderOAuthAccount()
|
||||
if (el) renderedElements.push(el)
|
||||
} else {
|
||||
renderedElements.push(renderSubBlock(item.sb))
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
const uncoveredParams = displayParams.filter(
|
||||
(param) =>
|
||||
@@ -1922,11 +1873,6 @@ export const ToolInput = memo(function ToolInput({
|
||||
)
|
||||
}
|
||||
|
||||
{
|
||||
const el = renderOAuthAccount()
|
||||
if (el) renderedElements.push(el)
|
||||
}
|
||||
|
||||
const filteredParams = displayParams.filter((param) =>
|
||||
evaluateParameterCondition(param, tool)
|
||||
)
|
||||
|
||||
@@ -16,7 +16,7 @@ interface UseScrollManagementOptions {
|
||||
/**
|
||||
* Distance from bottom (in pixels) within which auto-scroll stays active
|
||||
* @remarks Lower values = less sticky (user can scroll away easier)
|
||||
* @defaultValue 100
|
||||
* @defaultValue 30
|
||||
*/
|
||||
stickinessThreshold?: number
|
||||
}
|
||||
@@ -41,7 +41,7 @@ export function useScrollManagement(
|
||||
const lastScrollTopRef = useRef(0)
|
||||
|
||||
const scrollBehavior = options?.behavior ?? 'smooth'
|
||||
const stickinessThreshold = options?.stickinessThreshold ?? 100
|
||||
const stickinessThreshold = options?.stickinessThreshold ?? 30
|
||||
|
||||
/** Scrolls the container to the bottom */
|
||||
const scrollToBottom = useCallback(() => {
|
||||
|
||||
@@ -2,11 +2,10 @@ import { createLogger } from '@sim/logger'
|
||||
import { AgentIcon } from '@/components/icons'
|
||||
import type { BlockConfig } from '@/blocks/types'
|
||||
import { AuthMode } from '@/blocks/types'
|
||||
import { getApiKeyCondition } from '@/blocks/utils'
|
||||
import { getApiKeyCondition, getModelOptions } from '@/blocks/utils'
|
||||
import {
|
||||
getBaseModelProviders,
|
||||
getMaxTemperature,
|
||||
getProviderIcon,
|
||||
getReasoningEffortValuesForModel,
|
||||
getThinkingLevelsForModel,
|
||||
getVerbosityValuesForModel,
|
||||
@@ -18,7 +17,6 @@ import {
|
||||
providers,
|
||||
supportsTemperature,
|
||||
} from '@/providers/utils'
|
||||
import { useProvidersStore } from '@/stores/providers'
|
||||
import type { ToolResponse } from '@/tools/types'
|
||||
|
||||
const logger = createLogger('AgentBlock')
|
||||
@@ -121,21 +119,7 @@ Return ONLY the JSON array.`,
|
||||
placeholder: 'Type or select a model...',
|
||||
required: true,
|
||||
defaultValue: 'claude-sonnet-4-5',
|
||||
options: () => {
|
||||
const providersState = useProvidersStore.getState()
|
||||
const baseModels = providersState.providers.base.models
|
||||
const ollamaModels = providersState.providers.ollama.models
|
||||
const vllmModels = providersState.providers.vllm.models
|
||||
const openrouterModels = providersState.providers.openrouter.models
|
||||
const allModels = Array.from(
|
||||
new Set([...baseModels, ...ollamaModels, ...vllmModels, ...openrouterModels])
|
||||
)
|
||||
|
||||
return allModels.map((model) => {
|
||||
const icon = getProviderIcon(model)
|
||||
return { label: model, id: model, ...(icon && { icon }) }
|
||||
})
|
||||
},
|
||||
options: getModelOptions,
|
||||
},
|
||||
{
|
||||
id: 'vertexCredential',
|
||||
|
||||
@@ -1,10 +1,13 @@
|
||||
import { createLogger } from '@sim/logger'
|
||||
import { ChartBarIcon } from '@/components/icons'
|
||||
import type { BlockConfig, ParamType } from '@/blocks/types'
|
||||
import { getProviderCredentialSubBlocks, PROVIDER_CREDENTIAL_INPUTS } from '@/blocks/utils'
|
||||
import {
|
||||
getModelOptions,
|
||||
getProviderCredentialSubBlocks,
|
||||
PROVIDER_CREDENTIAL_INPUTS,
|
||||
} from '@/blocks/utils'
|
||||
import type { ProviderId } from '@/providers/types'
|
||||
import { getBaseModelProviders, getProviderIcon } from '@/providers/utils'
|
||||
import { useProvidersStore } from '@/stores/providers/store'
|
||||
import { getBaseModelProviders } from '@/providers/utils'
|
||||
import type { ToolResponse } from '@/tools/types'
|
||||
|
||||
const logger = createLogger('EvaluatorBlock')
|
||||
@@ -175,21 +178,7 @@ export const EvaluatorBlock: BlockConfig<EvaluatorResponse> = {
|
||||
placeholder: 'Type or select a model...',
|
||||
required: true,
|
||||
defaultValue: 'claude-sonnet-4-5',
|
||||
options: () => {
|
||||
const providersState = useProvidersStore.getState()
|
||||
const baseModels = providersState.providers.base.models
|
||||
const ollamaModels = providersState.providers.ollama.models
|
||||
const vllmModels = providersState.providers.vllm.models
|
||||
const openrouterModels = providersState.providers.openrouter.models
|
||||
const allModels = Array.from(
|
||||
new Set([...baseModels, ...ollamaModels, ...vllmModels, ...openrouterModels])
|
||||
)
|
||||
|
||||
return allModels.map((model) => {
|
||||
const icon = getProviderIcon(model)
|
||||
return { label: model, id: model, ...(icon && { icon }) }
|
||||
})
|
||||
},
|
||||
options: getModelOptions,
|
||||
},
|
||||
...getProviderCredentialSubBlocks(),
|
||||
{
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
import { ShieldCheckIcon } from '@/components/icons'
|
||||
import type { BlockConfig } from '@/blocks/types'
|
||||
import { getProviderCredentialSubBlocks, PROVIDER_CREDENTIAL_INPUTS } from '@/blocks/utils'
|
||||
import { getProviderIcon } from '@/providers/utils'
|
||||
import { useProvidersStore } from '@/stores/providers/store'
|
||||
import {
|
||||
getModelOptions,
|
||||
getProviderCredentialSubBlocks,
|
||||
PROVIDER_CREDENTIAL_INPUTS,
|
||||
} from '@/blocks/utils'
|
||||
import type { ToolResponse } from '@/tools/types'
|
||||
|
||||
export interface GuardrailsResponse extends ToolResponse {
|
||||
@@ -111,21 +113,7 @@ Return ONLY the regex pattern - no explanations, no quotes, no forward slashes,
|
||||
type: 'combobox',
|
||||
placeholder: 'Type or select a model...',
|
||||
required: true,
|
||||
options: () => {
|
||||
const providersState = useProvidersStore.getState()
|
||||
const baseModels = providersState.providers.base.models
|
||||
const ollamaModels = providersState.providers.ollama.models
|
||||
const vllmModels = providersState.providers.vllm.models
|
||||
const openrouterModels = providersState.providers.openrouter.models
|
||||
const allModels = Array.from(
|
||||
new Set([...baseModels, ...ollamaModels, ...vllmModels, ...openrouterModels])
|
||||
)
|
||||
|
||||
return allModels.map((model) => {
|
||||
const icon = getProviderIcon(model)
|
||||
return { label: model, id: model, ...(icon && { icon }) }
|
||||
})
|
||||
},
|
||||
options: getModelOptions,
|
||||
condition: {
|
||||
field: 'validationType',
|
||||
value: ['hallucination'],
|
||||
|
||||
@@ -1,9 +1,12 @@
|
||||
import { ConnectIcon } from '@/components/icons'
|
||||
import { AuthMode, type BlockConfig } from '@/blocks/types'
|
||||
import { getProviderCredentialSubBlocks, PROVIDER_CREDENTIAL_INPUTS } from '@/blocks/utils'
|
||||
import {
|
||||
getModelOptions,
|
||||
getProviderCredentialSubBlocks,
|
||||
PROVIDER_CREDENTIAL_INPUTS,
|
||||
} from '@/blocks/utils'
|
||||
import type { ProviderId } from '@/providers/types'
|
||||
import { getBaseModelProviders, getProviderIcon } from '@/providers/utils'
|
||||
import { useProvidersStore } from '@/stores/providers'
|
||||
import { getBaseModelProviders } from '@/providers/utils'
|
||||
import type { ToolResponse } from '@/tools/types'
|
||||
|
||||
interface RouterResponse extends ToolResponse {
|
||||
@@ -134,25 +137,6 @@ Respond with a JSON object containing:
|
||||
- reasoning: A brief explanation (1-2 sentences) of why you chose this route`
|
||||
}
|
||||
|
||||
/**
|
||||
* Helper to get model options for both router versions.
|
||||
*/
|
||||
const getModelOptions = () => {
|
||||
const providersState = useProvidersStore.getState()
|
||||
const baseModels = providersState.providers.base.models
|
||||
const ollamaModels = providersState.providers.ollama.models
|
||||
const vllmModels = providersState.providers.vllm.models
|
||||
const openrouterModels = providersState.providers.openrouter.models
|
||||
const allModels = Array.from(
|
||||
new Set([...baseModels, ...ollamaModels, ...vllmModels, ...openrouterModels])
|
||||
)
|
||||
|
||||
return allModels.map((model) => {
|
||||
const icon = getProviderIcon(model)
|
||||
return { label: model, id: model, ...(icon && { icon }) }
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* Legacy Router Block (block-based routing).
|
||||
* Hidden from toolbar but still supported for existing workflows.
|
||||
|
||||
@@ -122,25 +122,6 @@ export const ScheduleBlock: BlockConfig = {
|
||||
required: true,
|
||||
mode: 'trigger',
|
||||
condition: { field: 'scheduleType', value: 'custom' },
|
||||
wandConfig: {
|
||||
enabled: true,
|
||||
prompt: `You are an expert at writing cron expressions. Generate a valid cron expression based on the user's description.
|
||||
|
||||
Cron format: minute hour day-of-month month day-of-week
|
||||
- minute: 0-59
|
||||
- hour: 0-23
|
||||
- day-of-month: 1-31
|
||||
- month: 1-12
|
||||
- day-of-week: 0-7 (0 and 7 are Sunday)
|
||||
|
||||
Special characters: * (any), , (list), - (range), / (step)
|
||||
|
||||
{context}
|
||||
|
||||
Return ONLY the cron expression, nothing else. No explanation, no backticks, no quotes.`,
|
||||
placeholder: 'Describe your schedule (e.g., "every weekday at 9am")',
|
||||
generationType: 'cron-expression',
|
||||
},
|
||||
},
|
||||
|
||||
{
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
import { TranslateIcon } from '@/components/icons'
|
||||
import { AuthMode, type BlockConfig } from '@/blocks/types'
|
||||
import { getProviderCredentialSubBlocks, PROVIDER_CREDENTIAL_INPUTS } from '@/blocks/utils'
|
||||
import { getProviderIcon } from '@/providers/utils'
|
||||
import { useProvidersStore } from '@/stores/providers/store'
|
||||
import {
|
||||
getModelOptions,
|
||||
getProviderCredentialSubBlocks,
|
||||
PROVIDER_CREDENTIAL_INPUTS,
|
||||
} from '@/blocks/utils'
|
||||
|
||||
const getTranslationPrompt = (targetLanguage: string) =>
|
||||
`Translate the following text into ${targetLanguage || 'English'}. Output ONLY the translated text with no additional commentary, explanations, or notes.`
|
||||
@@ -38,18 +40,7 @@ export const TranslateBlock: BlockConfig = {
|
||||
type: 'combobox',
|
||||
placeholder: 'Type or select a model...',
|
||||
required: true,
|
||||
options: () => {
|
||||
const providersState = useProvidersStore.getState()
|
||||
const baseModels = providersState.providers.base.models
|
||||
const ollamaModels = providersState.providers.ollama.models
|
||||
const openrouterModels = providersState.providers.openrouter.models
|
||||
const allModels = Array.from(new Set([...baseModels, ...ollamaModels, ...openrouterModels]))
|
||||
|
||||
return allModels.map((model) => {
|
||||
const icon = getProviderIcon(model)
|
||||
return { label: model, id: model, ...(icon && { icon }) }
|
||||
})
|
||||
},
|
||||
options: getModelOptions,
|
||||
},
|
||||
...getProviderCredentialSubBlocks(),
|
||||
{
|
||||
|
||||
@@ -40,7 +40,6 @@ export type GenerationType =
|
||||
| 'neo4j-parameters'
|
||||
| 'timestamp'
|
||||
| 'timezone'
|
||||
| 'cron-expression'
|
||||
|
||||
export type SubBlockType =
|
||||
| 'short-input' // Single line input
|
||||
|
||||
@@ -1,8 +1,32 @@
|
||||
import { isHosted } from '@/lib/core/config/feature-flags'
|
||||
import type { BlockOutput, OutputFieldDefinition, SubBlockConfig } from '@/blocks/types'
|
||||
import { getHostedModels, getProviderFromModel, providers } from '@/providers/utils'
|
||||
import {
|
||||
getHostedModels,
|
||||
getProviderFromModel,
|
||||
getProviderIcon,
|
||||
providers,
|
||||
} from '@/providers/utils'
|
||||
import { useProvidersStore } from '@/stores/providers/store'
|
||||
|
||||
/**
|
||||
* Returns model options for combobox subblocks, combining all provider sources.
|
||||
*/
|
||||
export function getModelOptions() {
|
||||
const providersState = useProvidersStore.getState()
|
||||
const baseModels = providersState.providers.base.models
|
||||
const ollamaModels = providersState.providers.ollama.models
|
||||
const vllmModels = providersState.providers.vllm.models
|
||||
const openrouterModels = providersState.providers.openrouter.models
|
||||
const allModels = Array.from(
|
||||
new Set([...baseModels, ...ollamaModels, ...vllmModels, ...openrouterModels])
|
||||
)
|
||||
|
||||
return allModels.map((model) => {
|
||||
const icon = getProviderIcon(model)
|
||||
return { label: model, id: model, ...(icon && { icon }) }
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if a field is included in the dependsOn config.
|
||||
* Handles both simple array format and object format with all/any fields.
|
||||
|
||||
@@ -30,8 +30,8 @@ export const vertexProvider: ProviderConfig = {
|
||||
executeRequest: async (
|
||||
request: ProviderRequest
|
||||
): Promise<ProviderResponse | StreamingExecution> => {
|
||||
const vertexProject = env.VERTEX_PROJECT || request.vertexProject
|
||||
const vertexLocation = env.VERTEX_LOCATION || request.vertexLocation || 'us-central1'
|
||||
const vertexProject = request.vertexProject || env.VERTEX_PROJECT
|
||||
const vertexLocation = request.vertexLocation || env.VERTEX_LOCATION || 'us-central1'
|
||||
|
||||
if (!vertexProject) {
|
||||
throw new Error(
|
||||
|
||||
@@ -827,10 +827,11 @@ export function formatParameterLabel(paramId: string): string {
|
||||
}
|
||||
|
||||
/**
|
||||
* SubBlock IDs that control tool routing, not user-facing parameters.
|
||||
* Excluded from tool-input rendering unless they have an explicit paramVisibility set.
|
||||
* SubBlock IDs that are "structural" — they control tool routing or auth,
|
||||
* not user-facing parameters. These are excluded from tool-input rendering
|
||||
* unless they have an explicit paramVisibility set.
|
||||
*/
|
||||
const STRUCTURAL_SUBBLOCK_IDS = new Set(['operation'])
|
||||
const STRUCTURAL_SUBBLOCK_IDS = new Set(['operation', 'authMethod', 'destinationType'])
|
||||
|
||||
/**
|
||||
* SubBlock types that represent auth/credential inputs handled separately
|
||||
@@ -954,8 +955,12 @@ export function getSubBlocksForToolInput(
|
||||
} else if (sb.id in toolParamVisibility) {
|
||||
visibility = toolParamVisibility[sb.id]
|
||||
} else if (sb.canonicalParamId) {
|
||||
// SubBlock has a canonicalParamId that doesn't directly match a tool param.
|
||||
// This means the block's params() function transforms it before sending to the tool
|
||||
// (e.g. listFolderId → folderId). These are user-facing inputs, default to user-or-llm.
|
||||
visibility = 'user-or-llm'
|
||||
} else {
|
||||
// SubBlock has no corresponding tool param — skip it
|
||||
continue
|
||||
}
|
||||
}
|
||||
|
||||
@@ -57,7 +57,7 @@ export const slackMessageTool: ToolConfig<SlackMessageParams, SlackMessageRespon
|
||||
visibility: 'user-or-llm',
|
||||
description: 'Message text to send (supports Slack mrkdwn formatting)',
|
||||
},
|
||||
threadTs: {
|
||||
thread_ts: {
|
||||
type: 'string',
|
||||
required: false,
|
||||
visibility: 'user-or-llm',
|
||||
@@ -84,7 +84,7 @@ export const slackMessageTool: ToolConfig<SlackMessageParams, SlackMessageRespon
|
||||
channel: isDM ? undefined : params.channel,
|
||||
userId: isDM ? params.dmUserId : params.userId,
|
||||
text: params.text,
|
||||
thread_ts: params.threadTs || undefined,
|
||||
thread_ts: params.thread_ts || undefined,
|
||||
files: params.files || null,
|
||||
}
|
||||
},
|
||||
|
||||
@@ -516,7 +516,7 @@ export interface SlackMessageParams extends SlackBaseParams {
|
||||
dmUserId?: string
|
||||
userId?: string
|
||||
text: string
|
||||
threadTs?: string
|
||||
thread_ts?: string
|
||||
files?: UserFile[]
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user