6bf8bebf51
CI / Test and Build (push) Failing after 1s
CI / Migrate Dev DB (push) Has been skipped
CI / Migrate DB (push) Has been skipped
CodeQL / Analyze actions (push) Has been cancelled
CodeQL / Analyze javascript-typescript (push) Has been cancelled
CI / Detect Version (push) Has been cancelled
CI / Detect Desktop Changes (push) Has been cancelled
CI / Build AMD64 (blacksmith-2vcpu-ubuntu-2404, ./docker/cron.Dockerfile, ubuntu-latest, ghcr.io/simstudioai/cron) (push) Has been cancelled
CI / Build AMD64 (blacksmith-2vcpu-ubuntu-2404, ./docker/db.Dockerfile, ECR_MIGRATIONS, ubuntu-latest, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build AMD64 (blacksmith-4vcpu-ubuntu-2404, ./docker/pii.Dockerfile, ECR_PII, ubuntu-latest, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build AMD64 (blacksmith-4vcpu-ubuntu-2404, ./docker/realtime.Dockerfile, ECR_REALTIME, ubuntu-latest, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Build AMD64 (blacksmith-8vcpu-ubuntu-2404, ./docker/app.Dockerfile, ECR_APP, linux-x64-8-core, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (blacksmith-4vcpu-ubuntu-2404-arm, ./docker/cron.Dockerfile, ubuntu-24.04-arm, ghcr.io/simstudioai/cron) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (blacksmith-4vcpu-ubuntu-2404-arm, ./docker/db.Dockerfile, ubuntu-24.04-arm, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (blacksmith-4vcpu-ubuntu-2404-arm, ./docker/pii.Dockerfile, ubuntu-24.04-arm, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (blacksmith-4vcpu-ubuntu-2404-arm, ./docker/realtime.Dockerfile, ubuntu-24.04-arm, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (blacksmith-8vcpu-ubuntu-2404-arm, ./docker/app.Dockerfile, linux-arm64-8-core, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Check Docs Changes (push) Has been cancelled
Publish CLI Package / publish-npm (push) Has been cancelled
Publish Python SDK / publish-pypi (push) Has been cancelled
CI / Deploy Trigger.dev (Dev) (push) Has been cancelled
Helm Chart / Lint, test, and validate chart (push) Has been cancelled
Helm Chart / Chart version bumped (push) Has been cancelled
Publish TypeScript SDK / publish-npm (push) Has been cancelled
CI / Build Dev ECR (blacksmith-8vcpu-ubuntu-2404, ./docker/app.Dockerfile, ECR_APP, linux-x64-8-core) (push) Has been cancelled
CI / Promote Images (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/cron) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Build Dev ECR (blacksmith-2vcpu-ubuntu-2404, ./docker/db.Dockerfile, ECR_MIGRATIONS, ubuntu-latest) (push) Has been cancelled
CI / Build Dev ECR (blacksmith-4vcpu-ubuntu-2404, ./docker/pii.Dockerfile, ECR_PII, ubuntu-latest) (push) Has been cancelled
CI / Build Dev ECR (blacksmith-4vcpu-ubuntu-2404, ./docker/realtime.Dockerfile, ECR_REALTIME, ubuntu-latest) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Process Docs (push) Has been cancelled
CI / Create GitHub Release (push) Has been cancelled
CI / Check Desktop Signing Secrets (push) Has been cancelled
CI / Desktop Release (push) Has been cancelled
CI / Create Desktop Prerelease (push) Has been cancelled
CI / Desktop Prerelease Build (push) Has been cancelled
CI / Publish Desktop Prerelease (push) Has been cancelled
CI / Prune Desktop Prereleases (push) Has been cancelled
Helm Chart / Install on kind and run helm test (push) Has been cancelled
124 lines
4.5 KiB
TypeScript
124 lines
4.5 KiB
TypeScript
import { isRecordLike } from '@sim/utils/object'
|
|
import { isEmptyTagValue } from '@/tools/shared/tags'
|
|
|
|
/**
|
|
* Merging of user-provided and LLM-generated tool parameters.
|
|
*
|
|
* Deliberately kept in its own leaf module rather than in `@/tools/params`.
|
|
* `params.ts` imports `getTool` from `@/tools/utils`, which statically imports
|
|
* the 4,300-entry `@/tools/registry` barrel — so importing anything from
|
|
* `params.ts` drags the whole tool registry into the caller's module graph
|
|
* (4,926 modules, versus 17 without that edge).
|
|
*
|
|
* `providers/utils.ts` needs only `mergeToolParameters`, and this function needs
|
|
* no tool lookup at all, so it lives here and that import edge stays cheap.
|
|
* Nothing in this file may import `@/tools/utils`, `@/tools/registry`, or
|
|
* `@/tools/params`.
|
|
*/
|
|
|
|
/** Checks if a value is non-empty (not undefined, null, or empty string). */
|
|
export function isNonEmpty(value: unknown): boolean {
|
|
return value !== undefined && value !== null && value !== ''
|
|
}
|
|
|
|
/**
|
|
* Deep merges inputMapping objects, where LLM values fill in empty/missing user values.
|
|
* User-provided non-empty values take precedence.
|
|
*
|
|
* Module-private: only {@link mergeToolParameters} needs it. It was exported from
|
|
* `@/tools/params` but never imported anywhere.
|
|
*/
|
|
function deepMergeInputMapping(
|
|
llmInputMapping: Record<string, unknown> | undefined,
|
|
userInputMapping: Record<string, unknown> | string | undefined
|
|
): Record<string, unknown> {
|
|
// Parse user inputMapping if it's a JSON string
|
|
let parsedUserMapping: Record<string, unknown> = {}
|
|
if (typeof userInputMapping === 'string') {
|
|
try {
|
|
const parsed = JSON.parse(userInputMapping)
|
|
if (isRecordLike(parsed)) {
|
|
parsedUserMapping = parsed
|
|
}
|
|
} catch {
|
|
// Invalid JSON, treat as empty
|
|
}
|
|
} else if (
|
|
typeof userInputMapping === 'object' &&
|
|
userInputMapping !== null &&
|
|
!Array.isArray(userInputMapping)
|
|
) {
|
|
parsedUserMapping = userInputMapping
|
|
}
|
|
|
|
// If no LLM mapping, return user mapping (or empty)
|
|
if (!llmInputMapping || typeof llmInputMapping !== 'object') {
|
|
return parsedUserMapping
|
|
}
|
|
|
|
// Deep merge: LLM values as base, user non-empty values override
|
|
// If user provides empty object {}, LLM values fill all fields (intentional)
|
|
const merged: Record<string, unknown> = { ...llmInputMapping }
|
|
|
|
for (const [key, userValue] of Object.entries(parsedUserMapping)) {
|
|
// Only override LLM value if user provided a non-empty value
|
|
if (isNonEmpty(userValue)) {
|
|
merged[key] = userValue
|
|
}
|
|
}
|
|
|
|
return merged
|
|
}
|
|
|
|
/**
|
|
* Merges user-provided parameters with LLM-generated parameters.
|
|
* User-provided parameters take precedence, but empty strings are skipped
|
|
* so that LLM-generated values are used when user clears a field.
|
|
*
|
|
* Special handling for inputMapping: deep merges so LLM can fill in
|
|
* fields that user left empty in the UI.
|
|
*/
|
|
export function mergeToolParameters(
|
|
userProvidedParams: Record<string, unknown>,
|
|
llmGeneratedParams: Record<string, unknown>
|
|
): Record<string, unknown> {
|
|
// Filter out empty and effectively-empty values from user-provided params
|
|
// so that cleared fields don't override LLM values
|
|
const filteredUserParams: Record<string, unknown> = {}
|
|
for (const [key, value] of Object.entries(userProvidedParams)) {
|
|
if (isNonEmpty(value)) {
|
|
// Skip tag-based params if they're effectively empty (only default/unfilled entries)
|
|
if ((key === 'documentTags' || key === 'tagFilters') && isEmptyTagValue(value)) {
|
|
continue
|
|
}
|
|
filteredUserParams[key] = value
|
|
}
|
|
}
|
|
|
|
// Start with LLM params as base
|
|
const result: Record<string, unknown> = { ...llmGeneratedParams }
|
|
|
|
// Apply user params, with special handling for inputMapping
|
|
for (const [key, userValue] of Object.entries(filteredUserParams)) {
|
|
if (key === 'inputMapping') {
|
|
// Deep merge inputMapping so LLM values fill in empty user fields
|
|
const llmInputMapping = llmGeneratedParams.inputMapping as Record<string, unknown> | undefined
|
|
const mergedInputMapping = deepMergeInputMapping(
|
|
llmInputMapping,
|
|
userValue as Record<string, unknown> | string | undefined
|
|
)
|
|
result.inputMapping = mergedInputMapping
|
|
} else {
|
|
// Normal override for other params
|
|
result[key] = userValue
|
|
}
|
|
}
|
|
|
|
// If LLM provided inputMapping but user didn't, ensure it's included
|
|
if (llmGeneratedParams.inputMapping && !filteredUserParams.inputMapping) {
|
|
result.inputMapping = llmGeneratedParams.inputMapping
|
|
}
|
|
|
|
return result
|
|
}
|