@terreno/ai 57.9.0 → 57.10.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -0
- package/bunfig.toml +1 -1
- package/dist/aiApp.d.ts +8 -2
- package/dist/aiApp.js +12 -6
- package/dist/harness/adminScreens.d.ts +6 -0
- package/dist/harness/adminScreens.js +11 -0
- package/dist/harness/agentLoop.d.ts +61 -0
- package/dist/harness/agentLoop.js +798 -0
- package/dist/harness/agentTaskNames.d.ts +4 -0
- package/dist/harness/agentTaskNames.js +7 -0
- package/dist/harness/approvalPolicy.d.ts +3 -0
- package/dist/harness/approvalPolicy.js +23 -0
- package/dist/harness/approvals.d.ts +101 -0
- package/dist/harness/approvals.js +468 -0
- package/dist/harness/commit.d.ts +238 -0
- package/dist/harness/commit.js +678 -0
- package/dist/harness/conversation.d.ts +75 -0
- package/dist/harness/conversation.js +397 -0
- package/dist/harness/defineAgent.d.ts +9 -0
- package/dist/harness/defineAgent.js +65 -0
- package/dist/harness/defineTask.d.ts +11 -0
- package/dist/harness/defineTask.js +59 -0
- package/dist/harness/defineTool.d.ts +7 -0
- package/dist/harness/defineTool.js +36 -0
- package/dist/harness/definitionError.d.ts +8 -0
- package/dist/harness/definitionError.js +15 -0
- package/dist/harness/errors.d.ts +127 -0
- package/dist/harness/errors.js +101 -0
- package/dist/harness/eventHub.d.ts +45 -0
- package/dist/harness/eventHub.js +135 -0
- package/dist/harness/events.d.ts +95 -0
- package/dist/harness/events.js +267 -0
- package/dist/harness/executionEnv.d.ts +31 -0
- package/dist/harness/executionEnv.js +2 -0
- package/dist/harness/extensions.d.ts +82 -0
- package/dist/harness/extensions.js +274 -0
- package/dist/harness/harness.d.ts +163 -0
- package/dist/harness/harness.js +520 -0
- package/dist/harness/harnessApp.d.ts +44 -0
- package/dist/harness/harnessApp.js +62 -0
- package/dist/harness/internalRuntime.d.ts +16 -0
- package/dist/harness/internalRuntime.js +18 -0
- package/dist/harness/leases.d.ts +35 -0
- package/dist/harness/leases.js +86 -0
- package/dist/harness/memo.d.ts +24 -0
- package/dist/harness/memo.js +78 -0
- package/dist/harness/modelCall.d.ts +45 -0
- package/dist/harness/modelCall.js +147 -0
- package/dist/harness/models/harnessApproval.d.ts +2 -0
- package/dist/harness/models/harnessApproval.js +100 -0
- package/dist/harness/models/harnessConversation.d.ts +2 -0
- package/dist/harness/models/harnessConversation.js +117 -0
- package/dist/harness/models/harnessEvent.d.ts +3 -0
- package/dist/harness/models/harnessEvent.js +73 -0
- package/dist/harness/models/harnessInboxEvent.d.ts +2 -0
- package/dist/harness/models/harnessInboxEvent.js +58 -0
- package/dist/harness/models/harnessMemo.d.ts +2 -0
- package/dist/harness/models/harnessMemo.js +42 -0
- package/dist/harness/models/harnessMessage.d.ts +2 -0
- package/dist/harness/models/harnessMessage.js +73 -0
- package/dist/harness/models/harnessOwner.d.ts +2 -0
- package/dist/harness/models/harnessOwner.js +36 -0
- package/dist/harness/models/harnessTask.d.ts +2 -0
- package/dist/harness/models/harnessTask.js +186 -0
- package/dist/harness/ownership.d.ts +89 -0
- package/dist/harness/ownership.js +438 -0
- package/dist/harness/registry.d.ts +29 -0
- package/dist/harness/registry.js +93 -0
- package/dist/harness/retryBackoff.d.ts +31 -0
- package/dist/harness/retryBackoff.js +50 -0
- package/dist/harness/routes/approvals.d.ts +13 -0
- package/dist/harness/routes/approvals.js +93 -0
- package/dist/harness/routes/conversations.d.ts +11 -0
- package/dist/harness/routes/conversations.js +66 -0
- package/dist/harness/routes/events.d.ts +19 -0
- package/dist/harness/routes/events.js +215 -0
- package/dist/harness/routes/tasks.d.ts +11 -0
- package/dist/harness/routes/tasks.js +108 -0
- package/dist/harness/runners/inProcessRunner.d.ts +57 -0
- package/dist/harness/runners/inProcessRunner.js +196 -0
- package/dist/harness/runtime.d.ts +34 -0
- package/dist/harness/runtime.js +551 -0
- package/dist/harness/subagent.d.ts +53 -0
- package/dist/harness/subagent.js +134 -0
- package/dist/harness/suspend.d.ts +8 -0
- package/dist/harness/suspend.js +16 -0
- package/dist/harness/transaction.d.ts +3 -0
- package/dist/harness/transaction.js +22 -0
- package/dist/harness/waits.d.ts +100 -0
- package/dist/harness/waits.js +214 -0
- package/dist/index.d.ts +19 -1
- package/dist/index.js +45 -2
- package/dist/models/aiDataset.d.ts +2 -0
- package/dist/models/aiDataset.js +67 -0
- package/dist/models/aiRequest.js +1 -1
- package/dist/models/gptHistory.js +73 -0
- package/dist/observability/adminScreens.d.ts +5 -0
- package/dist/observability/adminScreens.js +32 -0
- package/dist/observability/compileTemplate.d.ts +1 -0
- package/dist/observability/compileTemplate.js +13 -0
- package/dist/observability/datasetImport.d.ts +11 -0
- package/dist/observability/datasetImport.js +185 -0
- package/dist/observability/evaluate.d.ts +31 -0
- package/dist/observability/evaluate.js +200 -0
- package/dist/observability/evaluatorTemplates.d.ts +17 -0
- package/dist/observability/evaluatorTemplates.js +111 -0
- package/dist/observability/jsonPath.d.ts +2 -0
- package/dist/observability/jsonPath.js +57 -0
- package/dist/observability/local/datasetStore.d.ts +87 -0
- package/dist/observability/local/datasetStore.js +326 -0
- package/dist/observability/local/evaluatorStore.d.ts +44 -0
- package/dist/observability/local/evaluatorStore.js +182 -0
- package/dist/observability/local/experimentRunner.d.ts +96 -0
- package/dist/observability/local/experimentRunner.js +419 -0
- package/dist/observability/local/localPlugin.d.ts +22 -0
- package/dist/observability/local/localPlugin.js +76 -0
- package/dist/observability/local/models/obsDataset.d.ts +2 -0
- package/dist/observability/local/models/obsDataset.js +37 -0
- package/dist/observability/local/models/obsDatasetItem.d.ts +2 -0
- package/dist/observability/local/models/obsDatasetItem.js +76 -0
- package/dist/observability/local/models/obsEvaluator.d.ts +2 -0
- package/dist/observability/local/models/obsEvaluator.js +98 -0
- package/dist/observability/local/models/obsExperiment.d.ts +2 -0
- package/dist/observability/local/models/obsExperiment.js +87 -0
- package/dist/observability/local/models/obsExperimentItem.d.ts +2 -0
- package/dist/observability/local/models/obsExperimentItem.js +45 -0
- package/dist/observability/local/models/obsPrompt.d.ts +2 -0
- package/dist/observability/local/models/obsPrompt.js +42 -0
- package/dist/observability/local/models/obsPromptLabel.d.ts +2 -0
- package/dist/observability/local/models/obsPromptLabel.js +39 -0
- package/dist/observability/local/models/obsPromptVersion.d.ts +2 -0
- package/dist/observability/local/models/obsPromptVersion.js +96 -0
- package/dist/observability/local/models/obsReviewItem.d.ts +2 -0
- package/dist/observability/local/models/obsReviewItem.js +75 -0
- package/dist/observability/local/models/obsScore.d.ts +2 -0
- package/dist/observability/local/models/obsScore.js +58 -0
- package/dist/observability/local/models/obsSpan.d.ts +2 -0
- package/dist/observability/local/models/obsSpan.js +64 -0
- package/dist/observability/local/models/obsTrace.d.ts +2 -0
- package/dist/observability/local/models/obsTrace.js +93 -0
- package/dist/observability/local/promptStore.d.ts +180 -0
- package/dist/observability/local/promptStore.js +444 -0
- package/dist/observability/local/reviewStore.d.ts +50 -0
- package/dist/observability/local/reviewStore.js +203 -0
- package/dist/observability/local/traceStore.d.ts +103 -0
- package/dist/observability/local/traceStore.js +325 -0
- package/dist/observability/observabilityApp.d.ts +24 -0
- package/dist/observability/observabilityApp.js +157 -0
- package/dist/observability/observabilityAppRegistry.d.ts +14 -0
- package/dist/observability/observabilityAppRegistry.js +16 -0
- package/dist/observability/permissions.d.ts +7 -0
- package/dist/observability/permissions.js +60 -0
- package/dist/observability/reviewPanels.d.ts +18 -0
- package/dist/observability/reviewPanels.js +46 -0
- package/dist/observability/routes/datasets.d.ts +7 -0
- package/dist/observability/routes/datasets.js +149 -0
- package/dist/observability/routes/evaluators.d.ts +7 -0
- package/dist/observability/routes/evaluators.js +123 -0
- package/dist/observability/routes/experiments.d.ts +7 -0
- package/dist/observability/routes/experiments.js +95 -0
- package/dist/observability/routes/observabilityRouteAccess.d.ts +13 -0
- package/dist/observability/routes/observabilityRouteAccess.js +67 -0
- package/dist/observability/routes/prompts.d.ts +12 -0
- package/dist/observability/routes/prompts.js +172 -0
- package/dist/observability/routes/requestAiService.d.ts +13 -0
- package/dist/observability/routes/requestAiService.js +21 -0
- package/dist/observability/routes/review.d.ts +7 -0
- package/dist/observability/routes/review.js +79 -0
- package/dist/observability/routes/status.d.ts +5 -0
- package/dist/observability/routes/status.js +31 -0
- package/dist/observability/routes/testMultiStage.d.ts +9 -0
- package/dist/observability/routes/testMultiStage.js +67 -0
- package/dist/observability/routes/traces.d.ts +7 -0
- package/dist/observability/routes/traces.js +129 -0
- package/dist/observability/schemaValidation.d.ts +5 -0
- package/dist/observability/schemaValidation.js +26 -0
- package/dist/observability/sopThresholds.d.ts +2 -0
- package/dist/observability/sopThresholds.js +21 -0
- package/dist/observability/status.d.ts +23 -0
- package/dist/observability/status.js +34 -0
- package/dist/observability/testMultiStageSchemas.d.ts +10 -0
- package/dist/observability/testMultiStageSchemas.js +79 -0
- package/dist/observability/testMultiStageWorkflow.d.ts +20 -0
- package/dist/observability/testMultiStageWorkflow.js +218 -0
- package/dist/observability/types.d.ts +159 -0
- package/dist/observability/types.js +67 -0
- package/dist/routes/files.js +18 -7
- package/dist/routes/gpt.js +79 -689
- package/dist/routes/gptActions.d.ts +9 -0
- package/dist/routes/gptActions.js +212 -0
- package/dist/routes/gptDatasets.d.ts +5 -0
- package/dist/routes/gptDatasets.js +94 -0
- package/dist/routes/gptHistories.d.ts +3 -1
- package/dist/routes/gptHistories.js +188 -2
- package/dist/service/aiDatasets.d.ts +57 -0
- package/dist/service/aiDatasets.js +253 -0
- package/dist/service/aiService.d.ts +50 -1
- package/dist/service/aiService.js +426 -77
- package/dist/service/askFiles.d.ts +49 -0
- package/dist/service/askFiles.js +162 -0
- package/dist/service/asks.d.ts +76 -0
- package/dist/service/asks.js +284 -0
- package/dist/service/chatTurn.d.ts +128 -0
- package/dist/service/chatTurn.js +1674 -0
- package/dist/service/fileStorage.d.ts +4 -0
- package/dist/service/fileStorage.js +7 -2
- package/dist/service/fillActionIds.d.ts +6 -0
- package/dist/service/fillActionIds.js +79 -0
- package/dist/service/jsonFenceModel.d.ts +7 -0
- package/dist/service/jsonFenceModel.js +45 -0
- package/dist/service/prompts.d.ts +52 -0
- package/dist/service/prompts.js +96 -1
- package/dist/service/sanitizeHtml.d.ts +11 -0
- package/dist/service/sanitizeHtml.js +108 -0
- package/dist/types/harness.d.ts +934 -0
- package/dist/types/harness.js +133 -0
- package/dist/types/index.d.ts +192 -14
- package/dist/types/index.js +2 -0
- package/dist/types/observability.d.ts +288 -0
- package/dist/types/observability.js +2 -0
- package/package.json +17 -5
- package/src/aiApp.test.ts +207 -1
- package/src/aiApp.ts +19 -6
- package/src/harness/adminScreens.test.ts +34 -0
- package/src/harness/adminScreens.ts +11 -0
- package/src/harness/agentLoop.test.ts +1034 -0
- package/src/harness/agentLoop.ts +1082 -0
- package/src/harness/agentRecovery.test.ts +380 -0
- package/src/harness/agentTaskNames.ts +4 -0
- package/src/harness/approvalPolicy.ts +28 -0
- package/src/harness/approvals.test.ts +1094 -0
- package/src/harness/approvals.ts +644 -0
- package/src/harness/commit.ts +1049 -0
- package/src/harness/conversation.ts +503 -0
- package/src/harness/defineAgent.test.ts +92 -0
- package/src/harness/defineAgent.ts +82 -0
- package/src/harness/defineTask.test.ts +59 -0
- package/src/harness/defineTask.ts +76 -0
- package/src/harness/defineTool.ts +45 -0
- package/src/harness/definitionError.ts +13 -0
- package/src/harness/errors.test.ts +90 -0
- package/src/harness/errors.ts +119 -0
- package/src/harness/eventHub.test.ts +124 -0
- package/src/harness/eventHub.ts +159 -0
- package/src/harness/events.test.ts +757 -0
- package/src/harness/events.ts +384 -0
- package/src/harness/executionEnv.ts +34 -0
- package/src/harness/extensions.test.ts +1218 -0
- package/src/harness/extensions.ts +382 -0
- package/src/harness/harness.test.ts +693 -0
- package/src/harness/harness.ts +767 -0
- package/src/harness/harnessApp.ts +76 -0
- package/src/harness/internalRuntime.ts +44 -0
- package/src/harness/leases.ts +132 -0
- package/src/harness/memo.ts +107 -0
- package/src/harness/modelCall.test.ts +134 -0
- package/src/harness/modelCall.ts +200 -0
- package/src/harness/models/harnessApproval.ts +109 -0
- package/src/harness/models/harnessConversation.ts +142 -0
- package/src/harness/models/harnessEvent.ts +92 -0
- package/src/harness/models/harnessInboxEvent.ts +73 -0
- package/src/harness/models/harnessMemo.ts +43 -0
- package/src/harness/models/harnessMessage.ts +85 -0
- package/src/harness/models/harnessModels.test.ts +60 -0
- package/src/harness/models/harnessOwner.ts +40 -0
- package/src/harness/models/harnessTask.ts +201 -0
- package/src/harness/ownership.test.ts +1087 -0
- package/src/harness/ownership.ts +618 -0
- package/src/harness/recovery.test.ts +912 -0
- package/src/harness/registry.ts +124 -0
- package/src/harness/retries.test.ts +292 -0
- package/src/harness/retryBackoff.test.ts +100 -0
- package/src/harness/retryBackoff.ts +77 -0
- package/src/harness/routes/approvals.ts +123 -0
- package/src/harness/routes/conversations.test.ts +518 -0
- package/src/harness/routes/conversations.ts +102 -0
- package/src/harness/routes/events.ts +280 -0
- package/src/harness/routes/tasks.test.ts +198 -0
- package/src/harness/routes/tasks.ts +146 -0
- package/src/harness/runners/inProcessRunner.test.ts +402 -0
- package/src/harness/runners/inProcessRunner.ts +220 -0
- package/src/harness/runtime.ts +714 -0
- package/src/harness/subagent.test.ts +696 -0
- package/src/harness/subagent.ts +192 -0
- package/src/harness/suspend.ts +13 -0
- package/src/harness/transaction.ts +17 -0
- package/src/harness/versioning.test.ts +288 -0
- package/src/harness/waits.test.ts +693 -0
- package/src/harness/waits.ts +356 -0
- package/src/index.test.ts +13 -0
- package/src/index.ts +70 -0
- package/src/isolated/adminScreensConfig.isolated.ts +143 -0
- package/src/models/aiDataset.test.ts +34 -0
- package/src/models/aiDataset.ts +78 -0
- package/src/models/aiRequest.ts +2 -1
- package/src/models/gptHistory.test.ts +156 -0
- package/src/models/gptHistory.ts +89 -1
- package/src/observability/adminScreens.test.ts +71 -0
- package/src/observability/adminScreens.ts +42 -0
- package/src/observability/compileTemplate.test.ts +14 -0
- package/src/observability/compileTemplate.ts +10 -0
- package/src/observability/datasetImport.test.ts +95 -0
- package/src/observability/datasetImport.ts +220 -0
- package/src/observability/evaluate.test.ts +549 -0
- package/src/observability/evaluate.ts +254 -0
- package/src/observability/evaluatorTemplates.ts +124 -0
- package/src/observability/jsonPath.test.ts +52 -0
- package/src/observability/jsonPath.ts +60 -0
- package/src/observability/local/datasetStore.test.ts +230 -0
- package/src/observability/local/datasetStore.ts +452 -0
- package/src/observability/local/evaluatorStore.test.ts +138 -0
- package/src/observability/local/evaluatorStore.ts +224 -0
- package/src/observability/local/experimentRunner.test.ts +489 -0
- package/src/observability/local/experimentRunner.ts +548 -0
- package/src/observability/local/localPlugin.ts +88 -0
- package/src/observability/local/models/obsDataset.ts +38 -0
- package/src/observability/local/models/obsDatasetItem.ts +80 -0
- package/src/observability/local/models/obsEvaluator.ts +102 -0
- package/src/observability/local/models/obsExperiment.ts +91 -0
- package/src/observability/local/models/obsExperimentItem.ts +52 -0
- package/src/observability/local/models/obsPrompt.ts +43 -0
- package/src/observability/local/models/obsPromptLabel.ts +43 -0
- package/src/observability/local/models/obsPromptVersion.ts +107 -0
- package/src/observability/local/models/obsReviewItem.ts +79 -0
- package/src/observability/local/models/obsScore.ts +59 -0
- package/src/observability/local/models/obsSpan.ts +65 -0
- package/src/observability/local/models/obsTrace.ts +94 -0
- package/src/observability/local/obsModels.test.ts +119 -0
- package/src/observability/local/promptStore.test.ts +351 -0
- package/src/observability/local/promptStore.ts +665 -0
- package/src/observability/local/reviewStore.test.ts +164 -0
- package/src/observability/local/reviewStore.ts +264 -0
- package/src/observability/local/traceStore.test.ts +264 -0
- package/src/observability/local/traceStore.ts +440 -0
- package/src/observability/observabilityApp.test.ts +92 -0
- package/src/observability/observabilityApp.ts +185 -0
- package/src/observability/observabilityAppRegistry.test.ts +30 -0
- package/src/observability/observabilityAppRegistry.ts +35 -0
- package/src/observability/permissions.test.ts +96 -0
- package/src/observability/permissions.ts +78 -0
- package/src/observability/reviewPanels.test.ts +35 -0
- package/src/observability/reviewPanels.ts +64 -0
- package/src/observability/routes/datasets.test.ts +176 -0
- package/src/observability/routes/datasets.ts +252 -0
- package/src/observability/routes/evaluators.test.ts +119 -0
- package/src/observability/routes/evaluators.ts +207 -0
- package/src/observability/routes/experiments.test.ts +282 -0
- package/src/observability/routes/experiments.ts +152 -0
- package/src/observability/routes/observabilityRbac.test.ts +767 -0
- package/src/observability/routes/observabilityRouteAccess.ts +106 -0
- package/src/observability/routes/prompts.test.ts +320 -0
- package/src/observability/routes/prompts.ts +263 -0
- package/src/observability/routes/requestAiService.ts +36 -0
- package/src/observability/routes/review.test.ts +120 -0
- package/src/observability/routes/review.ts +125 -0
- package/src/observability/routes/status.test.ts +116 -0
- package/src/observability/routes/status.ts +47 -0
- package/src/observability/routes/testMultiStage.test.ts +214 -0
- package/src/observability/routes/testMultiStage.ts +96 -0
- package/src/observability/routes/traces.test.ts +167 -0
- package/src/observability/routes/traces.ts +172 -0
- package/src/observability/schemaValidation.ts +29 -0
- package/src/observability/sopThresholds.ts +20 -0
- package/src/observability/status.test.ts +38 -0
- package/src/observability/status.ts +56 -0
- package/src/observability/testMultiStageSchemas.ts +95 -0
- package/src/observability/testMultiStageWorkflow.test.ts +114 -0
- package/src/observability/testMultiStageWorkflow.ts +307 -0
- package/src/observability/types.ts +262 -0
- package/src/routes/files.test.ts +63 -9
- package/src/routes/files.ts +21 -7
- package/src/routes/gpt.test.ts +3279 -0
- package/src/routes/gpt.ts +91 -816
- package/src/routes/gptActions.test.ts +241 -0
- package/src/routes/gptActions.ts +255 -0
- package/src/routes/gptApprovals.test.ts +762 -0
- package/src/routes/gptDatasets.test.ts +86 -0
- package/src/routes/gptDatasets.ts +104 -0
- package/src/routes/gptFiles.test.ts +589 -0
- package/src/routes/gptHistories.test.ts +933 -0
- package/src/routes/gptHistories.ts +266 -5
- package/src/routes/routes.test.ts +222 -2
- package/src/service/aiDatasets.test.ts +123 -0
- package/src/service/aiDatasets.ts +316 -0
- package/src/service/aiService.test.ts +593 -0
- package/src/service/aiService.ts +568 -111
- package/src/service/askFiles.test.ts +96 -0
- package/src/service/askFiles.ts +222 -0
- package/src/service/asks.test.ts +946 -0
- package/src/service/asks.ts +423 -0
- package/src/service/chatTurn.ts +2287 -0
- package/src/service/fileStorage.test.ts +11 -0
- package/src/service/fileStorage.ts +10 -2
- package/src/service/fillActionIds.test.ts +65 -0
- package/src/service/fillActionIds.ts +98 -0
- package/src/service/jsonFenceModel.test.ts +47 -0
- package/src/service/jsonFenceModel.ts +53 -0
- package/src/service/prompts.test.ts +21 -0
- package/src/service/prompts.ts +147 -0
- package/src/service/sanitizeHtml.test.ts +61 -0
- package/src/service/sanitizeHtml.ts +109 -0
- package/src/tests/bunSetup.test.ts +7 -4
- package/src/tests/bunSetup.ts +7 -7
- package/src/tests/chatHarness.ts +478 -0
- package/src/tests/generateStream.ts +49 -0
- package/src/tests/harnessErrors.ts +22 -0
- package/src/tests/harnessStreaming.ts +227 -0
- package/src/tests/helpers.ts +9 -2
- package/src/types/harness.ts +1095 -0
- package/src/types/index.ts +209 -13
- package/src/types/observability.ts +344 -0
- package/src/types/sanitize-html.d.ts +25 -0
|
@@ -1,16 +1,256 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
APIError,
|
|
3
|
+
defaultResponseHandler,
|
|
4
|
+
getOpenApiSpecForModel,
|
|
5
|
+
type JSONValue,
|
|
6
|
+
type ModelRouterOptions,
|
|
7
|
+
modelRouter,
|
|
8
|
+
Permissions,
|
|
9
|
+
} from "@terreno/api";
|
|
10
|
+
import {
|
|
11
|
+
type PendingAskListItem,
|
|
12
|
+
pendingAskListSchema,
|
|
13
|
+
resolveButtonAnswer,
|
|
14
|
+
type TurnRequest,
|
|
15
|
+
type TurnResult,
|
|
16
|
+
turnRequestSchema,
|
|
17
|
+
turnResultSchema,
|
|
18
|
+
} from "@terreno/blocks";
|
|
2
19
|
import type express from "express";
|
|
20
|
+
import {DateTime} from "luxon";
|
|
21
|
+
import type mongoose from "mongoose";
|
|
22
|
+
|
|
3
23
|
import {GptHistory} from "../models/gptHistory";
|
|
4
|
-
import
|
|
24
|
+
import {assertNoReservedToolNames, resolveAskKinds} from "../service/asks";
|
|
25
|
+
import {runBufferedChatTurn, staleAskError} from "../service/chatTurn";
|
|
26
|
+
import type {GptHistoryDocument, GptHistoryRouteOptions, GptRouteOptions} from "../types";
|
|
27
|
+
|
|
28
|
+
type HistoryRouterOptions = Partial<ModelRouterOptions<GptHistoryDocument>>;
|
|
29
|
+
|
|
30
|
+
/**
|
|
31
|
+
* Only the chat turn writes `pendingAsk`: it holds messages replayed verbatim to the model, so a
|
|
32
|
+
* client must not be able to plant or edit one, including through dotted paths.
|
|
33
|
+
*/
|
|
34
|
+
const withoutPendingAsk = (body: unknown): Partial<GptHistoryDocument> =>
|
|
35
|
+
Object.fromEntries(
|
|
36
|
+
Object.entries(body ?? {}).filter(
|
|
37
|
+
([key]) => key !== "pendingAsk" && !key.startsWith("pendingAsk.")
|
|
38
|
+
)
|
|
39
|
+
);
|
|
40
|
+
|
|
41
|
+
type OpenApiFragment = Record<string, unknown>;
|
|
42
|
+
|
|
43
|
+
/** Generated SDKs leave `readOnly` properties out of request types, so clients never send it. */
|
|
44
|
+
const READ_ONLY_PENDING_ASK: OpenApiFragment = {
|
|
45
|
+
requestBody: {
|
|
46
|
+
content: {"application/json": {schema: {properties: {pendingAsk: {readOnly: true}}}}},
|
|
47
|
+
},
|
|
48
|
+
};
|
|
49
|
+
|
|
50
|
+
const isFragment = (value: unknown): value is OpenApiFragment =>
|
|
51
|
+
typeof value === "object" && value !== null && !Array.isArray(value);
|
|
52
|
+
|
|
53
|
+
/** Server-only fields of `pendingAsk`: the paused turn's messages, replayed only to the model. */
|
|
54
|
+
const SERVER_ONLY_PENDING_ASK_FIELDS = ["promptIndex", "responseMessages"];
|
|
55
|
+
|
|
56
|
+
const withoutServerOnlyFields = (pendingAsk: OpenApiFragment): OpenApiFragment =>
|
|
57
|
+
Object.fromEntries(
|
|
58
|
+
Object.entries(pendingAsk).filter(([key]) => !SERVER_ONLY_PENDING_ASK_FIELDS.includes(key))
|
|
59
|
+
);
|
|
60
|
+
|
|
61
|
+
/** A serialized history as clients receive it: its pending ask without the server-only fields. */
|
|
62
|
+
const withClientPendingAsk = (history: unknown): unknown => {
|
|
63
|
+
if (!isFragment(history) || !isFragment(history.pendingAsk)) {
|
|
64
|
+
return history;
|
|
65
|
+
}
|
|
66
|
+
return {...history, pendingAsk: withoutServerOnlyFields(history.pendingAsk)};
|
|
67
|
+
};
|
|
68
|
+
|
|
69
|
+
/** The model's `pendingAsk` schema without the server-only fields, for the OpenAPI spec. */
|
|
70
|
+
const clientPendingAskSchema = (): OpenApiFragment => {
|
|
71
|
+
const {properties} = getOpenApiSpecForModel(GptHistory);
|
|
72
|
+
const schema = isFragment(properties.pendingAsk) ? properties.pendingAsk : {};
|
|
73
|
+
const {properties: fields, required, ...rest} = schema;
|
|
74
|
+
return {
|
|
75
|
+
...rest,
|
|
76
|
+
...(isFragment(fields) ? {properties: withoutServerOnlyFields(fields)} : {}),
|
|
77
|
+
...(Array.isArray(required)
|
|
78
|
+
? {required: required.filter((field) => !SERVER_ONLY_PENDING_ASK_FIELDS.includes(field))}
|
|
79
|
+
: {}),
|
|
80
|
+
};
|
|
81
|
+
};
|
|
82
|
+
|
|
83
|
+
const mergeFragments = (base: OpenApiFragment, extra: OpenApiFragment = {}): OpenApiFragment => {
|
|
84
|
+
const merged = {...base};
|
|
85
|
+
for (const [key, value] of Object.entries(extra)) {
|
|
86
|
+
const current = merged[key];
|
|
87
|
+
merged[key] = isFragment(current) && isFragment(value) ? mergeFragments(current, value) : value;
|
|
88
|
+
}
|
|
89
|
+
return merged;
|
|
90
|
+
};
|
|
91
|
+
|
|
92
|
+
/**
|
|
93
|
+
* preCreate sets `userId` to the caller, so a client such as a watch creates a history with `{}`
|
|
94
|
+
* even when the host validates request bodies against the model. A host's `validation: false`
|
|
95
|
+
* stays off.
|
|
96
|
+
*/
|
|
97
|
+
const withCallerUserId = (
|
|
98
|
+
validation: HistoryRouterOptions["validation"]
|
|
99
|
+
): HistoryRouterOptions["validation"] => {
|
|
100
|
+
if (validation === false) {
|
|
101
|
+
return false;
|
|
102
|
+
}
|
|
103
|
+
const hostValidation = typeof validation === "object" ? validation : {};
|
|
104
|
+
return {
|
|
105
|
+
...hostValidation,
|
|
106
|
+
excludeFromCreate: [...(hostValidation.excludeFromCreate ?? []), "userId"],
|
|
107
|
+
};
|
|
108
|
+
};
|
|
109
|
+
|
|
110
|
+
const userIdOf = (req: express.Request): mongoose.Types.ObjectId | undefined =>
|
|
111
|
+
(req.user as {_id?: mongoose.Types.ObjectId} | undefined)?._id;
|
|
112
|
+
|
|
113
|
+
/** The caller's pending asks, newest first, without the stored messages of the paused turns. */
|
|
114
|
+
const listPendingAsks = async (req: express.Request): Promise<PendingAskListItem[]> => {
|
|
115
|
+
const userId = userIdOf(req);
|
|
116
|
+
if (!userId) {
|
|
117
|
+
throw new APIError({status: 401, title: "Authentication required"});
|
|
118
|
+
}
|
|
119
|
+
const histories = await GptHistory.find({pendingAsk: {$ne: null}, userId})
|
|
120
|
+
.select({
|
|
121
|
+
"pendingAsk.created": 1,
|
|
122
|
+
"pendingAsk.kind": 1,
|
|
123
|
+
"pendingAsk.simple": 1,
|
|
124
|
+
"pendingAsk.toolCallId": 1,
|
|
125
|
+
title: 1,
|
|
126
|
+
})
|
|
127
|
+
.sort({"pendingAsk.created": -1})
|
|
128
|
+
.lean();
|
|
129
|
+
return histories.flatMap(({_id, pendingAsk, title}) =>
|
|
130
|
+
pendingAsk
|
|
131
|
+
? [
|
|
132
|
+
{
|
|
133
|
+
created: DateTime.fromJSDate(pendingAsk.created).toUTC().toISO() ?? "",
|
|
134
|
+
historyId: _id.toString(),
|
|
135
|
+
kind: pendingAsk.kind,
|
|
136
|
+
simple: pendingAsk.simple,
|
|
137
|
+
...(title ? {title} : {}),
|
|
138
|
+
toolCallId: pendingAsk.toolCallId,
|
|
139
|
+
},
|
|
140
|
+
]
|
|
141
|
+
: []
|
|
142
|
+
);
|
|
143
|
+
};
|
|
144
|
+
|
|
145
|
+
/**
|
|
146
|
+
* Runs one turn of the history. A `buttonId` sends the answer stored on that button of the
|
|
147
|
+
* pending ask's simple card, so a small client never builds an answer itself.
|
|
148
|
+
*/
|
|
149
|
+
const runHeadlessTurn = async ({
|
|
150
|
+
body,
|
|
151
|
+
chat,
|
|
152
|
+
history,
|
|
153
|
+
req,
|
|
154
|
+
}: {
|
|
155
|
+
body: TurnRequest;
|
|
156
|
+
chat: GptRouteOptions;
|
|
157
|
+
history: GptHistoryDocument;
|
|
158
|
+
req: express.Request;
|
|
159
|
+
}): Promise<TurnResult> => {
|
|
160
|
+
// Admins pass IsOwner, but a turn speaks as the conversation's owner.
|
|
161
|
+
if (history.userId.toString() !== userIdOf(req)?.toString()) {
|
|
162
|
+
throw new APIError({status: 403, title: "Not authorized to access this history"});
|
|
163
|
+
}
|
|
164
|
+
const {askResponse, buttonId, prompt, surface, toolCallId} = body;
|
|
165
|
+
const historyId = history._id.toString();
|
|
166
|
+
if (buttonId === undefined || toolCallId === undefined) {
|
|
167
|
+
return runBufferedChatTurn({
|
|
168
|
+
body: {askResponse, historyId, prompt, surface},
|
|
169
|
+
options: chat,
|
|
170
|
+
req,
|
|
171
|
+
});
|
|
172
|
+
}
|
|
173
|
+
const {pendingAsk} = history;
|
|
174
|
+
if (pendingAsk?.toolCallId !== toolCallId) {
|
|
175
|
+
throw staleAskError(toolCallId);
|
|
176
|
+
}
|
|
177
|
+
const {errors, response} = resolveButtonAnswer({buttonId, card: pendingAsk.simple});
|
|
178
|
+
if (!response) {
|
|
179
|
+
throw new APIError({
|
|
180
|
+
code: "UNKNOWN_BUTTON",
|
|
181
|
+
detail: "The button is not on the pending ask's simple card. See fields.",
|
|
182
|
+
meta: {fields: errors},
|
|
183
|
+
status: 400,
|
|
184
|
+
title: "Unknown buttonId",
|
|
185
|
+
});
|
|
186
|
+
}
|
|
187
|
+
return runBufferedChatTurn({
|
|
188
|
+
body: {askResponse: {...response, toolCallId}, historyId, surface},
|
|
189
|
+
options: chat,
|
|
190
|
+
req,
|
|
191
|
+
});
|
|
192
|
+
};
|
|
193
|
+
|
|
194
|
+
/** The headless actions, next to any actions the host adds to `/gpt/histories`. */
|
|
195
|
+
const headlessActions = ({
|
|
196
|
+
chat,
|
|
197
|
+
routerOptions,
|
|
198
|
+
}: {
|
|
199
|
+
chat: GptRouteOptions;
|
|
200
|
+
routerOptions: HistoryRouterOptions;
|
|
201
|
+
}): Pick<HistoryRouterOptions, "collectionActions" | "instanceActions"> => ({
|
|
202
|
+
collectionActions: {
|
|
203
|
+
...routerOptions.collectionActions,
|
|
204
|
+
pendingAsks: {
|
|
205
|
+
description:
|
|
206
|
+
"The asks the caller's conversations are waiting on, newest first, each with its simple card. Answer one with POST /gpt/histories/{id}/turn.",
|
|
207
|
+
handler: ({req}) => listPendingAsks(req),
|
|
208
|
+
method: "GET",
|
|
209
|
+
permissions: [Permissions.IsAuthenticated],
|
|
210
|
+
response: pendingAskListSchema,
|
|
211
|
+
summary: "List the caller's pending asks",
|
|
212
|
+
},
|
|
213
|
+
},
|
|
214
|
+
instanceActions: {
|
|
215
|
+
...routerOptions.instanceActions,
|
|
216
|
+
turn: {
|
|
217
|
+
body: turnRequestSchema,
|
|
218
|
+
description:
|
|
219
|
+
"Runs one chat turn to completion and returns the reply as JSON, for clients that do not read server-sent events. The turn finishes and is saved even if the client disconnects.",
|
|
220
|
+
handler: ({body, doc, req}) =>
|
|
221
|
+
runHeadlessTurn({body: body as TurnRequest, chat, history: doc, req}),
|
|
222
|
+
method: "POST",
|
|
223
|
+
permissions: [Permissions.IsOwner],
|
|
224
|
+
response: turnResultSchema,
|
|
225
|
+
summary: "Run a chat turn and return the reply as JSON",
|
|
226
|
+
},
|
|
227
|
+
},
|
|
228
|
+
});
|
|
5
229
|
|
|
6
230
|
export const addGptHistoryRoutes = (
|
|
7
231
|
router: express.Router,
|
|
8
|
-
options?:
|
|
232
|
+
options?: HistoryRouterOptions & GptHistoryRouteOptions
|
|
9
233
|
): void => {
|
|
234
|
+
const {chat, openApiOptions, ...routerOptions} = options ?? {};
|
|
235
|
+
const headlessChat = resolveAskKinds(chat?.asks).length > 0 ? chat : undefined;
|
|
236
|
+
if (headlessChat) {
|
|
237
|
+
assertNoReservedToolNames(headlessChat.tools);
|
|
238
|
+
}
|
|
10
239
|
router.use(
|
|
11
240
|
"/gpt/histories",
|
|
12
241
|
modelRouter(GptHistory, {
|
|
13
|
-
...
|
|
242
|
+
...openApiOptions,
|
|
243
|
+
...routerOptions,
|
|
244
|
+
...(headlessChat ? headlessActions({chat: headlessChat, routerOptions}) : {}),
|
|
245
|
+
openApiExtraModelProperties: {
|
|
246
|
+
...routerOptions.openApiExtraModelProperties,
|
|
247
|
+
pendingAsk: clientPendingAskSchema(),
|
|
248
|
+
},
|
|
249
|
+
openApiOverwrite: {
|
|
250
|
+
...routerOptions.openApiOverwrite,
|
|
251
|
+
create: mergeFragments(READ_ONLY_PENDING_ASK, routerOptions.openApiOverwrite?.create),
|
|
252
|
+
update: mergeFragments(READ_ONLY_PENDING_ASK, routerOptions.openApiOverwrite?.update),
|
|
253
|
+
},
|
|
14
254
|
permissions: {
|
|
15
255
|
create: [Permissions.IsAuthenticated],
|
|
16
256
|
delete: [Permissions.IsOwner],
|
|
@@ -20,13 +260,34 @@ export const addGptHistoryRoutes = (
|
|
|
20
260
|
},
|
|
21
261
|
preCreate: (body, req) => {
|
|
22
262
|
return {
|
|
23
|
-
...body,
|
|
263
|
+
...withoutPendingAsk(body),
|
|
24
264
|
userId: (req.user as {_id: unknown})?._id,
|
|
25
265
|
} as GptHistoryDocument;
|
|
26
266
|
},
|
|
267
|
+
preUpdate: (body, req) => {
|
|
268
|
+
const update = withoutPendingAsk(body);
|
|
269
|
+
return routerOptions.preUpdate
|
|
270
|
+
? routerOptions.preUpdate(update, req)
|
|
271
|
+
: (update as GptHistoryDocument);
|
|
272
|
+
},
|
|
27
273
|
queryFields: ["userId", "projectId"],
|
|
28
274
|
queryFilter: (user) => ({userId: user?.id}),
|
|
275
|
+
responseHandler: async (value, method, req, handlerOptions) => {
|
|
276
|
+
const hostHandler = routerOptions.responseHandler ?? defaultResponseHandler;
|
|
277
|
+
const serialized = await hostHandler(
|
|
278
|
+
value,
|
|
279
|
+
method as Parameters<typeof defaultResponseHandler>[1],
|
|
280
|
+
req,
|
|
281
|
+
handlerOptions
|
|
282
|
+
);
|
|
283
|
+
return (
|
|
284
|
+
Array.isArray(serialized)
|
|
285
|
+
? serialized.map(withClientPendingAsk)
|
|
286
|
+
: withClientPendingAsk(serialized)
|
|
287
|
+
) as JSONValue;
|
|
288
|
+
},
|
|
29
289
|
sort: "-updated",
|
|
290
|
+
validation: withCallerUserId(routerOptions.validation),
|
|
30
291
|
})
|
|
31
292
|
);
|
|
32
293
|
};
|
|
@@ -10,6 +10,9 @@ import type supertest from "supertest";
|
|
|
10
10
|
import {AIRequest} from "../models/aiRequest";
|
|
11
11
|
import {GptHistory} from "../models/gptHistory";
|
|
12
12
|
import {Project} from "../models/project";
|
|
13
|
+
import {MemoryTraceSink} from "../observability/local/traceStore";
|
|
14
|
+
import {ObservabilityApp, resetObservabilityApp} from "../observability/observabilityApp";
|
|
15
|
+
import type {ObservabilityPlugin} from "../observability/types";
|
|
13
16
|
import {AIService} from "../service/aiService";
|
|
14
17
|
import type {FileStorageService} from "../service/fileStorage";
|
|
15
18
|
import type {MCPService} from "../service/mcpService";
|
|
@@ -200,6 +203,7 @@ describe("AI Routes", () => {
|
|
|
200
203
|
|
|
201
204
|
afterEach(async () => {
|
|
202
205
|
streamTextOverride = undefined;
|
|
206
|
+
resetObservabilityApp();
|
|
203
207
|
await AIRequest.deleteMany({});
|
|
204
208
|
await GptHistory.deleteMany({});
|
|
205
209
|
});
|
|
@@ -241,6 +245,15 @@ describe("AI Routes", () => {
|
|
|
241
245
|
expect(res.status).toBe(400);
|
|
242
246
|
});
|
|
243
247
|
|
|
248
|
+
it("forbids non-admin prompt registry selection", async () => {
|
|
249
|
+
const agent = await authAsUser(app, "notAdmin");
|
|
250
|
+
const res = await agent
|
|
251
|
+
.post("/gpt/remix")
|
|
252
|
+
.send({promptLabel: "latest", promptName: "private-prompt", text: "Hello"});
|
|
253
|
+
|
|
254
|
+
assert.equal(res.status, 403);
|
|
255
|
+
});
|
|
256
|
+
|
|
244
257
|
it("returns demo response when no aiService configured", async () => {
|
|
245
258
|
const demoApp = new TerrenoApp({
|
|
246
259
|
configureApp: (router, options) => {
|
|
@@ -292,6 +305,90 @@ describe("AI Routes", () => {
|
|
|
292
305
|
expect(histories.length).toBeGreaterThanOrEqual(1);
|
|
293
306
|
});
|
|
294
307
|
|
|
308
|
+
it("forbids non-admin prompt registry selection", async () => {
|
|
309
|
+
const agent = await authAsUser(app, "notAdmin");
|
|
310
|
+
const res = await agent
|
|
311
|
+
.post("/gpt/prompt")
|
|
312
|
+
.send({prompt: "Hi", promptLabel: "latest", promptName: "private-prompt"});
|
|
313
|
+
|
|
314
|
+
assert.equal(res.status, 403);
|
|
315
|
+
});
|
|
316
|
+
|
|
317
|
+
it("does not let client sensitive false downgrade a sensitive prompt", async () => {
|
|
318
|
+
const sink = new MemoryTraceSink();
|
|
319
|
+
const plugin: ObservabilityPlugin = {
|
|
320
|
+
capabilities: new Set([
|
|
321
|
+
"datasets",
|
|
322
|
+
"experiments",
|
|
323
|
+
"prompts",
|
|
324
|
+
"reviewQueue",
|
|
325
|
+
"scores",
|
|
326
|
+
"traces",
|
|
327
|
+
]),
|
|
328
|
+
datasetStore: {},
|
|
329
|
+
experimentRunner: {},
|
|
330
|
+
id: "local",
|
|
331
|
+
promptRegistry: {
|
|
332
|
+
get: async () => ({
|
|
333
|
+
body: "Sensitive system prompt",
|
|
334
|
+
label: "production",
|
|
335
|
+
name: "sensitive-prompt",
|
|
336
|
+
sensitive: true,
|
|
337
|
+
version: 1,
|
|
338
|
+
}),
|
|
339
|
+
},
|
|
340
|
+
reviewQueue: {},
|
|
341
|
+
traceSink: sink,
|
|
342
|
+
};
|
|
343
|
+
new ObservabilityApp({plugins: [plugin]});
|
|
344
|
+
|
|
345
|
+
const agent = await authAsUser(app, "admin");
|
|
346
|
+
const res = await agent
|
|
347
|
+
.post("/gpt/prompt")
|
|
348
|
+
.send({prompt: "Hi", promptName: "sensitive-prompt", sensitive: false})
|
|
349
|
+
.buffer(true)
|
|
350
|
+
.parse(sseCollect);
|
|
351
|
+
|
|
352
|
+
assert.equal(res.status, 200);
|
|
353
|
+
assert.equal(sink.traces.length, 1);
|
|
354
|
+
assert.isTrue(sink.traces[0]?.sensitive);
|
|
355
|
+
});
|
|
356
|
+
|
|
357
|
+
it("emits a memory-sink trace with userId and sessionId", async () => {
|
|
358
|
+
const sink = new MemoryTraceSink();
|
|
359
|
+
const plugin: ObservabilityPlugin = {
|
|
360
|
+
capabilities: new Set([
|
|
361
|
+
"datasets",
|
|
362
|
+
"experiments",
|
|
363
|
+
"prompts",
|
|
364
|
+
"reviewQueue",
|
|
365
|
+
"scores",
|
|
366
|
+
"traces",
|
|
367
|
+
]),
|
|
368
|
+
datasetStore: {},
|
|
369
|
+
experimentRunner: {},
|
|
370
|
+
id: "local",
|
|
371
|
+
promptRegistry: {get: async () => undefined},
|
|
372
|
+
reviewQueue: {},
|
|
373
|
+
traceSink: sink,
|
|
374
|
+
};
|
|
375
|
+
new ObservabilityApp({plugins: [plugin]});
|
|
376
|
+
|
|
377
|
+
const agent = await authAsUser(app, "notAdmin");
|
|
378
|
+
const user = await UserModel.findOne({email: "notAdmin@example.com"});
|
|
379
|
+
const res = await agent
|
|
380
|
+
.post("/gpt/prompt")
|
|
381
|
+
.set("x-ai-session-id", "sess-gpt-1")
|
|
382
|
+
.send({prompt: "Hi"})
|
|
383
|
+
.buffer(true)
|
|
384
|
+
.parse(sseCollect);
|
|
385
|
+
|
|
386
|
+
expect(res.status).toBe(200);
|
|
387
|
+
expect(sink.traces.length).toBe(1);
|
|
388
|
+
expect(sink.traces[0].sessionId).toBe("sess-gpt-1");
|
|
389
|
+
expect(sink.traces[0].userId).toBe(user?._id.toString());
|
|
390
|
+
});
|
|
391
|
+
|
|
295
392
|
it("sends demo response when no ai service configured", async () => {
|
|
296
393
|
const demoApp = new TerrenoApp({
|
|
297
394
|
configureApp: (router, options) => {
|
|
@@ -719,6 +816,25 @@ describe("AI Routes", () => {
|
|
|
719
816
|
});
|
|
720
817
|
|
|
721
818
|
it("forwards model tool-call and tool-result stream events via SSE", async () => {
|
|
819
|
+
const sink = new MemoryTraceSink();
|
|
820
|
+
const plugin: ObservabilityPlugin = {
|
|
821
|
+
capabilities: new Set([
|
|
822
|
+
"datasets",
|
|
823
|
+
"experiments",
|
|
824
|
+
"prompts",
|
|
825
|
+
"reviewQueue",
|
|
826
|
+
"scores",
|
|
827
|
+
"traces",
|
|
828
|
+
]),
|
|
829
|
+
datasetStore: {},
|
|
830
|
+
experimentRunner: {},
|
|
831
|
+
id: "local",
|
|
832
|
+
promptRegistry: {get: async () => undefined},
|
|
833
|
+
reviewQueue: {},
|
|
834
|
+
traceSink: sink,
|
|
835
|
+
};
|
|
836
|
+
new ObservabilityApp({plugins: [plugin]});
|
|
837
|
+
|
|
722
838
|
const toolModel = {
|
|
723
839
|
doGenerate: mock(async () => ({
|
|
724
840
|
content: [{text: "ok", type: "text" as const}],
|
|
@@ -743,17 +859,31 @@ describe("AI Routes", () => {
|
|
|
743
859
|
type: "tool-call" as const,
|
|
744
860
|
});
|
|
745
861
|
controller.enqueue({
|
|
746
|
-
|
|
862
|
+
providerExecuted: true,
|
|
863
|
+
result: {
|
|
747
864
|
fileData: "data:application/pdf;base64,AAAA",
|
|
748
865
|
filename: "result.pdf",
|
|
749
866
|
mimeType: "application/pdf",
|
|
750
867
|
results: ["item1"],
|
|
751
868
|
},
|
|
752
|
-
providerExecuted: true,
|
|
753
869
|
toolCallId: "tc1",
|
|
754
870
|
toolName: "search",
|
|
755
871
|
type: "tool-result" as const,
|
|
756
872
|
});
|
|
873
|
+
controller.enqueue({
|
|
874
|
+
input: {id: "second"},
|
|
875
|
+
providerExecuted: true,
|
|
876
|
+
toolCallId: "tc2",
|
|
877
|
+
toolName: "lookup",
|
|
878
|
+
type: "tool-call" as const,
|
|
879
|
+
});
|
|
880
|
+
controller.enqueue({
|
|
881
|
+
providerExecuted: true,
|
|
882
|
+
result: {value: "second-result"},
|
|
883
|
+
toolCallId: "tc2",
|
|
884
|
+
toolName: "lookup",
|
|
885
|
+
type: "tool-result" as const,
|
|
886
|
+
});
|
|
757
887
|
controller.enqueue({
|
|
758
888
|
finishReason: "stop" as const,
|
|
759
889
|
type: "finish" as const,
|
|
@@ -774,6 +904,7 @@ describe("AI Routes", () => {
|
|
|
774
904
|
aiService: new AIService({model: toolModel as unknown as LanguageModel}),
|
|
775
905
|
openApiOptions: options,
|
|
776
906
|
tools: {
|
|
907
|
+
lookup: {description: "Lookup item"} as unknown as Tool,
|
|
777
908
|
search: {description: "Web search"} as unknown as Tool,
|
|
778
909
|
},
|
|
779
910
|
});
|
|
@@ -791,6 +922,29 @@ describe("AI Routes", () => {
|
|
|
791
922
|
const body = (res as SseResponse).body;
|
|
792
923
|
expect(body).toContain("toolCall");
|
|
793
924
|
expect(body).toContain("toolResult");
|
|
925
|
+
assert.equal(sink.traces.length, 1);
|
|
926
|
+
const trace = sink.traces[0];
|
|
927
|
+
assert.equal(trace.spans[0]?.kind, "CHAIN");
|
|
928
|
+
assert.equal(trace.spans.length, 3);
|
|
929
|
+
const toolSpans = trace.spans.filter((span) => span.kind === "TOOL");
|
|
930
|
+
assert.sameMembers(
|
|
931
|
+
toolSpans.map((span) => span.name),
|
|
932
|
+
["search", "lookup"]
|
|
933
|
+
);
|
|
934
|
+
const toolSpan = toolSpans.find((span) => span.name === "search");
|
|
935
|
+
assert.isDefined(toolSpan);
|
|
936
|
+
assert.equal(toolSpan?.name, "search");
|
|
937
|
+
assert.deepEqual(toolSpan?.input, {q: "hello"});
|
|
938
|
+
assert.deepEqual(toolSpan?.output, {
|
|
939
|
+
filename: "result.pdf",
|
|
940
|
+
mimeType: "application/pdf",
|
|
941
|
+
results: ["item1"],
|
|
942
|
+
});
|
|
943
|
+
assert.equal(toolSpan?.parentSpanId, trace.spans[0]?.id);
|
|
944
|
+
assert.equal(
|
|
945
|
+
toolSpans.find((span) => span.name === "lookup")?.parentSpanId,
|
|
946
|
+
trace.spans[0]?.id
|
|
947
|
+
);
|
|
794
948
|
});
|
|
795
949
|
|
|
796
950
|
it("emits a file SSE event when a tool execution returns fileData", async () => {
|
|
@@ -1694,6 +1848,72 @@ describe("AI Routes", () => {
|
|
|
1694
1848
|
});
|
|
1695
1849
|
|
|
1696
1850
|
describe("GPT Prompt error handling", () => {
|
|
1851
|
+
it("preserves completed tool spans when the stream later fails", async () => {
|
|
1852
|
+
const sink = new MemoryTraceSink();
|
|
1853
|
+
const plugin: ObservabilityPlugin = {
|
|
1854
|
+
capabilities: new Set([
|
|
1855
|
+
"datasets",
|
|
1856
|
+
"experiments",
|
|
1857
|
+
"prompts",
|
|
1858
|
+
"reviewQueue",
|
|
1859
|
+
"scores",
|
|
1860
|
+
"traces",
|
|
1861
|
+
]),
|
|
1862
|
+
datasetStore: {},
|
|
1863
|
+
experimentRunner: {},
|
|
1864
|
+
id: "local",
|
|
1865
|
+
promptRegistry: {get: async () => undefined},
|
|
1866
|
+
reviewQueue: {},
|
|
1867
|
+
traceSink: sink,
|
|
1868
|
+
};
|
|
1869
|
+
new ObservabilityApp({plugins: [plugin]});
|
|
1870
|
+
streamTextOverride = () =>
|
|
1871
|
+
({
|
|
1872
|
+
files: Promise.resolve([]),
|
|
1873
|
+
fullStream: (async function* () {
|
|
1874
|
+
yield {type: "start-step"};
|
|
1875
|
+
yield {
|
|
1876
|
+
input: {query: "before failure"},
|
|
1877
|
+
toolCallId: "tc-error",
|
|
1878
|
+
toolName: "search",
|
|
1879
|
+
type: "tool-call",
|
|
1880
|
+
};
|
|
1881
|
+
yield {
|
|
1882
|
+
output: {items: ["one"]},
|
|
1883
|
+
toolCallId: "tc-error",
|
|
1884
|
+
toolName: "search",
|
|
1885
|
+
type: "tool-result",
|
|
1886
|
+
};
|
|
1887
|
+
throw new Error("stream failed after tool");
|
|
1888
|
+
})(),
|
|
1889
|
+
}) as unknown as StreamTextResult;
|
|
1890
|
+
const errApp = new TerrenoApp({
|
|
1891
|
+
configureApp: (router, options) => {
|
|
1892
|
+
addGptRoutes(router, {
|
|
1893
|
+
aiService,
|
|
1894
|
+
openApiOptions: options,
|
|
1895
|
+
tools: {search: {description: "Search"} as unknown as Tool},
|
|
1896
|
+
});
|
|
1897
|
+
},
|
|
1898
|
+
skipListen: true,
|
|
1899
|
+
userModel: UserModel,
|
|
1900
|
+
}).build();
|
|
1901
|
+
const agent = await authAsUser(errApp, "notAdmin");
|
|
1902
|
+
|
|
1903
|
+
const res = await agent
|
|
1904
|
+
.post("/gpt/prompt")
|
|
1905
|
+
.send({prompt: "Search, then fail"})
|
|
1906
|
+
.buffer(true)
|
|
1907
|
+
.parse(sseCollect);
|
|
1908
|
+
|
|
1909
|
+
assert.equal(res.status, 200);
|
|
1910
|
+
assert.equal(sink.traces.length, 1);
|
|
1911
|
+
assert.equal(sink.traces[0]?.status, "error");
|
|
1912
|
+
const toolSpan = sink.traces[0]?.spans.find((span) => span.kind === "TOOL");
|
|
1913
|
+
assert.deepEqual(toolSpan?.input, {query: "before failure"});
|
|
1914
|
+
assert.deepEqual(toolSpan?.output, {items: ["one"]});
|
|
1915
|
+
});
|
|
1916
|
+
|
|
1697
1917
|
it("sends an outer SSE error when error handling itself fails after streaming starts", async () => {
|
|
1698
1918
|
streamTextOverride = () =>
|
|
1699
1919
|
({
|