@terreno/ai 57.8.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/.cursorrules +2 -2
- package/README.md +2 -1
- package/bunfig.toml +1 -1
- package/dist/aiApp.d.ts +16 -5
- package/dist/aiApp.js +17 -7
- 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 +88 -2
- 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 +20 -7
- package/dist/routes/gpt.js +179 -488
- 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 +431 -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/fileUploadsGate.d.ts +8 -0
- package/dist/service/fileUploadsGate.js +18 -0
- package/dist/service/fillActionIds.d.ts +6 -0
- package/dist/service/fillActionIds.js +79 -0
- package/dist/service/gemini.d.ts +3 -3
- package/dist/service/gemini.js +3 -3
- 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/service/vertex.d.ts +6 -6
- package/dist/service/vertex.js +5 -5
- package/dist/types/harness.d.ts +934 -0
- package/dist/types/harness.js +133 -0
- package/dist/types/index.d.ts +219 -13
- 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 +31 -8
- 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.test.ts +2 -2
- package/src/models/aiRequest.ts +2 -1
- package/src/models/gptHistory.test.ts +156 -0
- package/src/models/gptHistory.ts +106 -4
- 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 +84 -9
- package/src/routes/files.ts +23 -7
- package/src/routes/gpt.test.ts +3279 -0
- package/src/routes/gpt.ts +214 -552
- 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 +676 -5
- package/src/service/aiDatasets.test.ts +123 -0
- package/src/service/aiDatasets.ts +316 -0
- package/src/service/aiService.test.ts +614 -0
- package/src/service/aiService.ts +575 -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/fileUploadsGate.ts +23 -0
- package/src/service/fillActionIds.test.ts +65 -0
- package/src/service/fillActionIds.ts +98 -0
- package/src/service/gemini.test.ts +16 -10
- package/src/service/gemini.ts +3 -3
- 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/service/vertex.test.ts +49 -49
- package/src/service/vertex.ts +7 -8
- 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 +237 -12
- package/src/types/observability.ts +344 -0
- package/src/types/sanitize-html.d.ts +25 -0
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
import {describe, expect, it} from "bun:test";
|
|
2
|
+
import {parseBlocks, validateBlocks} from "@terreno/blocks";
|
|
3
|
+
|
|
4
|
+
import {sanitizeBlocksText, sanitizeHtmlFragment} from "./sanitizeHtml";
|
|
5
|
+
|
|
6
|
+
describe("sanitizeHtmlFragment", () => {
|
|
7
|
+
it("strips scripts, handlers, frames, forms, and links", () => {
|
|
8
|
+
const cleaned = sanitizeHtmlFragment(
|
|
9
|
+
`<h1 onclick="alert(1)">Invoice</h1><script>alert(1)</script><a href="https://evil.test">pay</a><form action="https://evil.test"><input></form><iframe src="https://evil.test"></iframe><frame src="https://evil.test"></frame><object data="https://evil.test"></object><embed src="https://evil.test"><meta charset="utf-8"><base href="https://evil.test"><link rel="stylesheet" href="https://evil.test/a.css"><img src="https://evil.test/pixel.png" alt="pixel"><img src="javascript:alert(1)" alt="x"><img src="//evil.test/x.png" alt="y"><img src="data:image/png;base64,aaaa" alt="logo" onerror="alert(1)">`
|
|
10
|
+
);
|
|
11
|
+
|
|
12
|
+
expect(cleaned).toBe(
|
|
13
|
+
'<h1>Invoice</h1><a>pay</a><img alt="pixel" /><img alt="x" /><img alt="y" /><img alt="logo" src="data:image/png;base64,aaaa" />'
|
|
14
|
+
);
|
|
15
|
+
});
|
|
16
|
+
});
|
|
17
|
+
|
|
18
|
+
describe("sanitizeBlocksText", () => {
|
|
19
|
+
it("replaces a document whose html changed and leaves a clean document", () => {
|
|
20
|
+
const block: Record<string, string> = {};
|
|
21
|
+
block.type = "html";
|
|
22
|
+
block.html = "<p>Hi</p><script>alert(1)</script>";
|
|
23
|
+
const document: Record<string, unknown> = {};
|
|
24
|
+
document.v = 1;
|
|
25
|
+
document.blocks = [block];
|
|
26
|
+
const dirty = JSON.stringify(document);
|
|
27
|
+
const sanitized = sanitizeBlocksText(dirty);
|
|
28
|
+
const parsed = parseBlocks(sanitized.text);
|
|
29
|
+
const checked = parsed.ok ? validateBlocks(parsed.value, {allowHtml: true}) : undefined;
|
|
30
|
+
|
|
31
|
+
expect(sanitized.changed).toBe(true);
|
|
32
|
+
expect(sanitized.text).not.toContain("<script");
|
|
33
|
+
expect(checked?.ok).toBe(true);
|
|
34
|
+
|
|
35
|
+
const clean = sanitizeBlocksText(`v: 1\nblocks:\n - type: text\n markdown: Hello\n`);
|
|
36
|
+
expect(clean.changed).toBe(false);
|
|
37
|
+
});
|
|
38
|
+
|
|
39
|
+
it("sanitizes html nested in a card", () => {
|
|
40
|
+
const html: Record<string, string> = {};
|
|
41
|
+
html.type = "html";
|
|
42
|
+
html.html = "<p>Hi</p><script>alert(1)</script>";
|
|
43
|
+
const card: Record<string, unknown> = {};
|
|
44
|
+
card.type = "card";
|
|
45
|
+
card.children = [html];
|
|
46
|
+
const document: Record<string, unknown> = {};
|
|
47
|
+
document.v = 1;
|
|
48
|
+
document.blocks = [card];
|
|
49
|
+
|
|
50
|
+
const sanitized = sanitizeBlocksText(JSON.stringify(document));
|
|
51
|
+
const parsed = parseBlocks(sanitized.text);
|
|
52
|
+
const checked = parsed.ok ? validateBlocks(parsed.value, {allowHtml: true}) : undefined;
|
|
53
|
+
const nested =
|
|
54
|
+
checked?.ok === true && checked.doc.blocks[0]?.type === "card"
|
|
55
|
+
? checked.doc.blocks[0].children[0]
|
|
56
|
+
: undefined;
|
|
57
|
+
|
|
58
|
+
expect(sanitized.changed).toBe(true);
|
|
59
|
+
expect(nested).toMatchObject({html: "<p>Hi</p>", type: "html"});
|
|
60
|
+
});
|
|
61
|
+
});
|
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
import {type Block, type BlocksDocument, parseBlocks, validateBlocks} from "@terreno/blocks";
|
|
2
|
+
import sanitizeHtml from "sanitize-html";
|
|
3
|
+
|
|
4
|
+
const DROPPED_TAGS = new Set([
|
|
5
|
+
"base",
|
|
6
|
+
"button",
|
|
7
|
+
"embed",
|
|
8
|
+
"form",
|
|
9
|
+
"frame",
|
|
10
|
+
"iframe",
|
|
11
|
+
"input",
|
|
12
|
+
"link",
|
|
13
|
+
"meta",
|
|
14
|
+
"object",
|
|
15
|
+
"script",
|
|
16
|
+
"select",
|
|
17
|
+
"textarea",
|
|
18
|
+
]);
|
|
19
|
+
|
|
20
|
+
const allowedTags = [
|
|
21
|
+
...sanitizeHtml.defaults.allowedTags.filter((tag) => !DROPPED_TAGS.has(tag)),
|
|
22
|
+
"img",
|
|
23
|
+
];
|
|
24
|
+
|
|
25
|
+
const allowedAttributes: Record<string, string[]> = {};
|
|
26
|
+
for (const [tag, attributes] of Object.entries(sanitizeHtml.defaults.allowedAttributes)) {
|
|
27
|
+
allowedAttributes[tag] = attributes.filter(
|
|
28
|
+
(attribute) => attribute !== "href" && !attribute.startsWith("on")
|
|
29
|
+
);
|
|
30
|
+
}
|
|
31
|
+
allowedAttributes.a = (allowedAttributes.a ?? []).filter((attribute) => attribute !== "href");
|
|
32
|
+
allowedAttributes.img = ["alt", "height", "src", "width"];
|
|
33
|
+
|
|
34
|
+
/**
|
|
35
|
+
* Display-only HTML. Scripts, frames, forms, event handlers, and links are removed.
|
|
36
|
+
* The only URL that remains is an image `data:` URL.
|
|
37
|
+
* @internal Test seam. Callers store the document from `sanitizeBlocksText`.
|
|
38
|
+
*/
|
|
39
|
+
export const sanitizeHtmlFragment = (html: string): string =>
|
|
40
|
+
sanitizeHtml(html, {
|
|
41
|
+
allowedAttributes,
|
|
42
|
+
allowedSchemes: ["data"],
|
|
43
|
+
allowedSchemesByTag: {img: ["data"]},
|
|
44
|
+
allowedTags,
|
|
45
|
+
allowProtocolRelative: false,
|
|
46
|
+
disallowedTagsMode: "discard",
|
|
47
|
+
transformTags: {
|
|
48
|
+
img: (_tagName, attribs) => {
|
|
49
|
+
const src = attribs.src ?? "";
|
|
50
|
+
const next: Record<string, string> = {};
|
|
51
|
+
if (attribs.alt !== undefined) {
|
|
52
|
+
next.alt = attribs.alt;
|
|
53
|
+
}
|
|
54
|
+
if (/^data:image\//i.test(src)) {
|
|
55
|
+
next.src = src;
|
|
56
|
+
}
|
|
57
|
+
return {attribs: next, tagName: "img"};
|
|
58
|
+
},
|
|
59
|
+
},
|
|
60
|
+
});
|
|
61
|
+
|
|
62
|
+
const sanitizeBlock = (block: Block): {block: Block; changed: boolean} => {
|
|
63
|
+
if (block.type === "html") {
|
|
64
|
+
const html = sanitizeHtmlFragment(block.html);
|
|
65
|
+
return {block: html === block.html ? block : {...block, html}, changed: html !== block.html};
|
|
66
|
+
}
|
|
67
|
+
if (block.type === "columns" || block.type === "card") {
|
|
68
|
+
let changed = false;
|
|
69
|
+
const children = block.children.map((child) => {
|
|
70
|
+
const next = sanitizeBlock(child);
|
|
71
|
+
changed = changed || next.changed;
|
|
72
|
+
return next.block;
|
|
73
|
+
});
|
|
74
|
+
return {block: changed ? {...block, children} : block, changed};
|
|
75
|
+
}
|
|
76
|
+
return {block, changed: false};
|
|
77
|
+
};
|
|
78
|
+
|
|
79
|
+
/** Rewrites `html` fields in a block document. A non-document is returned unchanged. */
|
|
80
|
+
export const sanitizeBlocksText = (text: string): {changed: boolean; text: string} => {
|
|
81
|
+
const parsed = parseBlocks(text);
|
|
82
|
+
if (!parsed.ok) {
|
|
83
|
+
return {changed: false, text};
|
|
84
|
+
}
|
|
85
|
+
const validated = validateBlocks(parsed.value, {allowHtml: true});
|
|
86
|
+
if (!validated.ok) {
|
|
87
|
+
return {changed: false, text};
|
|
88
|
+
}
|
|
89
|
+
let changed = false;
|
|
90
|
+
const blocks = validated.doc.blocks.map((block) => {
|
|
91
|
+
const next = sanitizeBlock(block);
|
|
92
|
+
changed = changed || next.changed;
|
|
93
|
+
return next.block;
|
|
94
|
+
});
|
|
95
|
+
if (!changed) {
|
|
96
|
+
return {changed: false, text};
|
|
97
|
+
}
|
|
98
|
+
const doc: BlocksDocument = {blocks, v: 1};
|
|
99
|
+
if (validated.doc.datasets !== undefined) {
|
|
100
|
+
doc.datasets = validated.doc.datasets;
|
|
101
|
+
}
|
|
102
|
+
const ordered: Record<string, unknown> = {};
|
|
103
|
+
ordered.v = doc.v;
|
|
104
|
+
if (doc.datasets !== undefined) {
|
|
105
|
+
ordered.datasets = doc.datasets;
|
|
106
|
+
}
|
|
107
|
+
ordered.blocks = doc.blocks;
|
|
108
|
+
return {changed: true, text: JSON.stringify(ordered)};
|
|
109
|
+
};
|
|
@@ -53,17 +53,17 @@ describe("vertex helpers", () => {
|
|
|
53
53
|
|
|
54
54
|
describe("normalizeVertexModelId", () => {
|
|
55
55
|
it("strips publisher resource prefixes", () => {
|
|
56
|
-
expect(normalizeVertexModelId("publishers/google/models/gemini-
|
|
57
|
-
"gemini-
|
|
56
|
+
expect(normalizeVertexModelId("publishers/google/models/gemini-3.8-flash")).toBe(
|
|
57
|
+
"gemini-3.8-flash"
|
|
58
58
|
);
|
|
59
59
|
});
|
|
60
60
|
|
|
61
61
|
it("strips version suffixes", () => {
|
|
62
|
-
expect(normalizeVertexModelId("gemini-
|
|
62
|
+
expect(normalizeVertexModelId("gemini-3.1-pro-preview@001")).toBe("gemini-3.1-pro-preview");
|
|
63
63
|
});
|
|
64
64
|
|
|
65
65
|
it("returns bare ids unchanged", () => {
|
|
66
|
-
expect(normalizeVertexModelId("gemini-
|
|
66
|
+
expect(normalizeVertexModelId("gemini-3.8-flash")).toBe("gemini-3.8-flash");
|
|
67
67
|
});
|
|
68
68
|
});
|
|
69
69
|
|
|
@@ -74,16 +74,16 @@ describe("vertex helpers", () => {
|
|
|
74
74
|
});
|
|
75
75
|
|
|
76
76
|
it("restricts to listed models when an allow-list is provided", () => {
|
|
77
|
-
expect(isVertexModelAllowed("gemini-
|
|
78
|
-
expect(isVertexModelAllowed("gemini-
|
|
77
|
+
expect(isVertexModelAllowed("gemini-3.8-flash", ["gemini-3.8-flash"])).toBe(true);
|
|
78
|
+
expect(isVertexModelAllowed("gemini-3.1-pro-preview", ["gemini-3.8-flash"])).toBe(false);
|
|
79
79
|
});
|
|
80
80
|
|
|
81
81
|
it("normalizes both the model id and allow-list entries before comparing", () => {
|
|
82
|
-
expect(isVertexModelAllowed("gemini-
|
|
82
|
+
expect(isVertexModelAllowed("gemini-3.8-flash", ["gemini-3.8-flash@001"])).toBe(true);
|
|
83
83
|
expect(
|
|
84
|
-
isVertexModelAllowed("publishers/google/models/gemini-
|
|
84
|
+
isVertexModelAllowed("publishers/google/models/gemini-3.8-flash", ["gemini-3.8-flash"])
|
|
85
85
|
).toBe(true);
|
|
86
|
-
expect(isVertexModelAllowed("gemini-
|
|
86
|
+
expect(isVertexModelAllowed("gemini-3.8-flash@001", ["gemini-3.1-pro-preview"])).toBe(false);
|
|
87
87
|
});
|
|
88
88
|
});
|
|
89
89
|
|
|
@@ -104,65 +104,65 @@ describe("vertex helpers", () => {
|
|
|
104
104
|
expect(provider?.languageModel("gemini-anything")).toBeDefined();
|
|
105
105
|
});
|
|
106
106
|
|
|
107
|
-
it("defaults location
|
|
107
|
+
it("defaults location to global", () => {
|
|
108
108
|
const withDefault = createVertexProvider({
|
|
109
109
|
project: "demo-project",
|
|
110
110
|
vertexFactory: makeVertexFactory(),
|
|
111
111
|
});
|
|
112
|
-
expect(withDefault?.location).toBe("
|
|
112
|
+
expect(withDefault?.location).toBe("global");
|
|
113
113
|
|
|
114
114
|
const withExplicit = createVertexProvider({
|
|
115
115
|
location: "europe-west1",
|
|
116
116
|
project: "demo-project",
|
|
117
117
|
vertexFactory: makeVertexFactory(),
|
|
118
118
|
});
|
|
119
|
-
expect(withExplicit?.location).toBe("
|
|
119
|
+
expect(withExplicit?.location).toBe("global");
|
|
120
120
|
});
|
|
121
121
|
|
|
122
122
|
it("enforces the allow-list when provided", () => {
|
|
123
123
|
const provider = createVertexProvider({
|
|
124
|
-
allowedModels: ["gemini-
|
|
124
|
+
allowedModels: ["gemini-3.8-flash"],
|
|
125
125
|
project: "demo-project",
|
|
126
126
|
vertexFactory: makeVertexFactory(),
|
|
127
127
|
});
|
|
128
|
-
expect(provider?.isModelAllowed("gemini-
|
|
129
|
-
expect(provider?.isModelAllowed("gemini-
|
|
130
|
-
expect(provider?.languageModel("gemini-
|
|
131
|
-
expect(() => provider?.languageModel("gemini-
|
|
128
|
+
expect(provider?.isModelAllowed("gemini-3.8-flash")).toBe(true);
|
|
129
|
+
expect(provider?.isModelAllowed("gemini-3.1-pro-preview")).toBe(false);
|
|
130
|
+
expect(provider?.languageModel("gemini-3.8-flash")).toBeDefined();
|
|
131
|
+
expect(() => provider?.languageModel("gemini-3.1-pro-preview")).toThrow();
|
|
132
132
|
expect(() => provider?.imageModel("imagen-4.0-fast-generate-001")).toThrow();
|
|
133
133
|
});
|
|
134
134
|
|
|
135
135
|
it("resolves versioned/path model ids against the allow-list", () => {
|
|
136
136
|
const provider = createVertexProvider({
|
|
137
|
-
allowedModels: ["gemini-
|
|
137
|
+
allowedModels: ["gemini-3.8-flash@001"],
|
|
138
138
|
project: "demo-project",
|
|
139
139
|
vertexFactory: makeVertexFactory(),
|
|
140
140
|
});
|
|
141
|
-
expect(provider?.isModelAllowed("gemini-
|
|
142
|
-
expect(provider?.languageModel("gemini-
|
|
141
|
+
expect(provider?.isModelAllowed("gemini-3.8-flash")).toBe(true);
|
|
142
|
+
expect(provider?.languageModel("gemini-3.8-flash")).toBeDefined();
|
|
143
143
|
});
|
|
144
144
|
});
|
|
145
145
|
|
|
146
146
|
describe("verifyVertexModelsEnabled", () => {
|
|
147
147
|
it("marks models available/unavailable based on the listing", async () => {
|
|
148
148
|
const result = await verifyVertexModelsEnabled({
|
|
149
|
-
listModelsFn: mock(async () => ["gemini-
|
|
150
|
-
models: ["gemini-
|
|
149
|
+
listModelsFn: mock(async () => ["gemini-3.8-flash", "gemini-3.5-flash-lite"]),
|
|
150
|
+
models: ["gemini-3.8-flash", "gemini-3.1-pro-preview"],
|
|
151
151
|
project: "demo-project",
|
|
152
152
|
});
|
|
153
153
|
expect(result.checked).toBe(true);
|
|
154
|
-
expect(result.available).toEqual(["gemini-
|
|
155
|
-
expect(result.unavailable).toEqual(["gemini-
|
|
154
|
+
expect(result.available).toEqual(["gemini-3.8-flash"]);
|
|
155
|
+
expect(result.unavailable).toEqual(["gemini-3.1-pro-preview"]);
|
|
156
156
|
});
|
|
157
157
|
|
|
158
158
|
it("returns checked=false when the listing is unavailable", async () => {
|
|
159
159
|
const result = await verifyVertexModelsEnabled({
|
|
160
160
|
listModelsFn: mock(async () => undefined),
|
|
161
|
-
models: ["gemini-
|
|
161
|
+
models: ["gemini-3.8-flash"],
|
|
162
162
|
project: "demo-project",
|
|
163
163
|
});
|
|
164
164
|
expect(result.checked).toBe(false);
|
|
165
|
-
expect(result.available).toEqual(["gemini-
|
|
165
|
+
expect(result.available).toEqual(["gemini-3.8-flash"]);
|
|
166
166
|
expect(result.unavailable).toEqual([]);
|
|
167
167
|
});
|
|
168
168
|
});
|
|
@@ -171,8 +171,8 @@ describe("vertex helpers", () => {
|
|
|
171
171
|
it("throws when a requested model is not enabled", async () => {
|
|
172
172
|
await expect(
|
|
173
173
|
assertVertexModelsEnabled({
|
|
174
|
-
listModelsFn: mock(async () => ["gemini-
|
|
175
|
-
models: ["gemini-
|
|
174
|
+
listModelsFn: mock(async () => ["gemini-3.8-flash"]),
|
|
175
|
+
models: ["gemini-3.1-pro-preview"],
|
|
176
176
|
project: "demo-project",
|
|
177
177
|
})
|
|
178
178
|
).rejects.toThrow();
|
|
@@ -181,7 +181,7 @@ describe("vertex helpers", () => {
|
|
|
181
181
|
it("does not throw when verification is inconclusive", async () => {
|
|
182
182
|
const result = await assertVertexModelsEnabled({
|
|
183
183
|
listModelsFn: mock(async () => undefined),
|
|
184
|
-
models: ["gemini-
|
|
184
|
+
models: ["gemini-3.1-pro-preview"],
|
|
185
185
|
project: "demo-project",
|
|
186
186
|
});
|
|
187
187
|
expect(result.checked).toBe(false);
|
|
@@ -203,10 +203,10 @@ describe("vertex helpers", () => {
|
|
|
203
203
|
const url = new URL(input.toString());
|
|
204
204
|
const isSecondPage = url.searchParams.get("pageToken") === "page-2";
|
|
205
205
|
const body = isSecondPage
|
|
206
|
-
? {publisherModels: [{name: "publishers/google/models/gemini-
|
|
206
|
+
? {publisherModels: [{name: "publishers/google/models/gemini-3.1-pro-preview"}]}
|
|
207
207
|
: {
|
|
208
208
|
nextPageToken: "page-2",
|
|
209
|
-
publisherModels: [{name: "publishers/google/models/gemini-
|
|
209
|
+
publisherModels: [{name: "publishers/google/models/gemini-3.8-flash"}],
|
|
210
210
|
};
|
|
211
211
|
return {
|
|
212
212
|
json: async () => body,
|
|
@@ -218,10 +218,10 @@ describe("vertex helpers", () => {
|
|
|
218
218
|
const models = await listEnabledVertexModels({
|
|
219
219
|
fetchImpl: fetchImpl as unknown as typeof fetch,
|
|
220
220
|
getAccessToken: async () => "fake-token",
|
|
221
|
-
location: "
|
|
221
|
+
location: "global",
|
|
222
222
|
project: "demo-project",
|
|
223
223
|
});
|
|
224
|
-
expect(models).toEqual(["gemini-
|
|
224
|
+
expect(models).toEqual(["gemini-3.8-flash", "gemini-3.1-pro-preview"]);
|
|
225
225
|
expect(fetchImpl).toHaveBeenCalledTimes(2);
|
|
226
226
|
});
|
|
227
227
|
|
|
@@ -239,7 +239,7 @@ describe("vertex helpers", () => {
|
|
|
239
239
|
return {
|
|
240
240
|
json: async () => ({
|
|
241
241
|
nextPageToken: "always-more",
|
|
242
|
-
publisherModels: [{name: "publishers/google/models/gemini-
|
|
242
|
+
publisherModels: [{name: "publishers/google/models/gemini-3.8-flash"}],
|
|
243
243
|
}),
|
|
244
244
|
ok: true,
|
|
245
245
|
status: 200,
|
|
@@ -329,10 +329,10 @@ describe("vertex helpers", () => {
|
|
|
329
329
|
const fetchImpl = mock(async () => ({
|
|
330
330
|
json: async () => ({
|
|
331
331
|
publisherModels: [
|
|
332
|
-
{name: "publishers/google/models/gemini-
|
|
332
|
+
{name: "publishers/google/models/gemini-3.8-flash"},
|
|
333
333
|
{},
|
|
334
334
|
{name: undefined},
|
|
335
|
-
{name: "publishers/google/models/gemini-
|
|
335
|
+
{name: "publishers/google/models/gemini-3.1-pro-preview"},
|
|
336
336
|
],
|
|
337
337
|
}),
|
|
338
338
|
ok: true,
|
|
@@ -343,17 +343,17 @@ describe("vertex helpers", () => {
|
|
|
343
343
|
getAccessToken: async () => "fake-token",
|
|
344
344
|
project: "demo-project",
|
|
345
345
|
});
|
|
346
|
-
expect(models).toEqual(["gemini-
|
|
346
|
+
expect(models).toEqual(["gemini-3.8-flash", "gemini-3.1-pro-preview"]);
|
|
347
347
|
});
|
|
348
348
|
|
|
349
|
-
it("uses global location
|
|
349
|
+
it("uses global location for Gemini 3 support", async () => {
|
|
350
350
|
process.env.GOOGLE_VERTEX_LOCATION = "europe-west4";
|
|
351
351
|
const fetchImpl = mock(async (input: string | URL) => {
|
|
352
352
|
const url = input.toString();
|
|
353
|
-
expect(url).toContain("
|
|
353
|
+
expect(url).toContain("aiplatform.googleapis.com");
|
|
354
354
|
return {
|
|
355
355
|
json: async () => ({
|
|
356
|
-
publisherModels: [{name: "publishers/google/models/gemini-
|
|
356
|
+
publisherModels: [{name: "publishers/google/models/gemini-3.8-flash"}],
|
|
357
357
|
}),
|
|
358
358
|
ok: true,
|
|
359
359
|
status: 200,
|
|
@@ -364,7 +364,7 @@ describe("vertex helpers", () => {
|
|
|
364
364
|
getAccessToken: async () => "fake-token",
|
|
365
365
|
project: "demo-project",
|
|
366
366
|
});
|
|
367
|
-
expect(models).toEqual(["gemini-
|
|
367
|
+
expect(models).toEqual(["gemini-3.8-flash"]);
|
|
368
368
|
});
|
|
369
369
|
});
|
|
370
370
|
|
|
@@ -378,13 +378,13 @@ describe("vertex helpers", () => {
|
|
|
378
378
|
expect(provider).toBeUndefined();
|
|
379
379
|
});
|
|
380
380
|
|
|
381
|
-
it("
|
|
381
|
+
it("forces global location for Gemini 3 support", () => {
|
|
382
382
|
process.env.GOOGLE_VERTEX_LOCATION = "asia-east1";
|
|
383
383
|
const provider = createVertexProvider({
|
|
384
384
|
project: "demo-project",
|
|
385
385
|
vertexFactory: makeVertexFactory(),
|
|
386
386
|
});
|
|
387
|
-
expect(provider?.location).toBe("
|
|
387
|
+
expect(provider?.location).toBe("global");
|
|
388
388
|
});
|
|
389
389
|
|
|
390
390
|
it("uses GOOGLE_VERTEX_PROJECT env when project option is omitted", () => {
|
|
@@ -417,12 +417,12 @@ describe("vertex helpers", () => {
|
|
|
417
417
|
describe("verifyVertexModelsEnabled", () => {
|
|
418
418
|
it("deduplicates requested models before checking", async () => {
|
|
419
419
|
const result = await verifyVertexModelsEnabled({
|
|
420
|
-
listModelsFn: mock(async () => ["gemini-
|
|
421
|
-
models: ["gemini-
|
|
420
|
+
listModelsFn: mock(async () => ["gemini-3.8-flash"]),
|
|
421
|
+
models: ["gemini-3.8-flash", "gemini-3.8-flash@001"],
|
|
422
422
|
project: "demo-project",
|
|
423
423
|
});
|
|
424
424
|
expect(result.checked).toBe(true);
|
|
425
|
-
expect(result.available).toEqual(["gemini-
|
|
425
|
+
expect(result.available).toEqual(["gemini-3.8-flash"]);
|
|
426
426
|
expect(result.unavailable).toEqual([]);
|
|
427
427
|
});
|
|
428
428
|
});
|
|
@@ -430,12 +430,12 @@ describe("vertex helpers", () => {
|
|
|
430
430
|
describe("assertVertexModelsEnabled", () => {
|
|
431
431
|
it("returns the result when all models are available", async () => {
|
|
432
432
|
const result = await assertVertexModelsEnabled({
|
|
433
|
-
listModelsFn: mock(async () => ["gemini-
|
|
434
|
-
models: ["gemini-
|
|
433
|
+
listModelsFn: mock(async () => ["gemini-3.8-flash", "gemini-3.1-pro-preview"]),
|
|
434
|
+
models: ["gemini-3.8-flash"],
|
|
435
435
|
project: "demo-project",
|
|
436
436
|
});
|
|
437
437
|
expect(result.checked).toBe(true);
|
|
438
|
-
expect(result.available).toEqual(["gemini-
|
|
438
|
+
expect(result.available).toEqual(["gemini-3.8-flash"]);
|
|
439
439
|
expect(result.unavailable).toEqual([]);
|
|
440
440
|
});
|
|
441
441
|
});
|
package/src/service/vertex.ts
CHANGED
|
@@ -15,8 +15,8 @@ import type {ImageModel, LanguageModel} from "ai";
|
|
|
15
15
|
* actually enabled/available for the project using the Google publisher-models listing API.
|
|
16
16
|
*/
|
|
17
17
|
|
|
18
|
-
/** Default Vertex / Gemini Enterprise Agent Platform region. */
|
|
19
|
-
export const DEFAULT_VERTEX_LOCATION = "
|
|
18
|
+
/** Default Vertex / Gemini Enterprise Agent Platform region. Only global is supported for Gemini 3. */
|
|
19
|
+
export const DEFAULT_VERTEX_LOCATION = "global";
|
|
20
20
|
|
|
21
21
|
const CLOUD_PLATFORM_SCOPE = "https://www.googleapis.com/auth/cloud-platform";
|
|
22
22
|
const MAX_MODEL_LIST_PAGES = 10;
|
|
@@ -38,7 +38,7 @@ export interface CreateVertexProviderOptions {
|
|
|
38
38
|
* Vertex models are permitted. When provided, only listed models may be resolved.
|
|
39
39
|
*/
|
|
40
40
|
allowedModels?: string[];
|
|
41
|
-
/** Vertex location/region.
|
|
41
|
+
/** Vertex location/region. Forced to global endpoint for Gemini 3 support. */
|
|
42
42
|
location?: string;
|
|
43
43
|
/** GCP project id. Falls back to the GOOGLE_VERTEX_PROJECT env var. */
|
|
44
44
|
project?: string;
|
|
@@ -76,7 +76,7 @@ export interface ListEnabledVertexModelsOptions {
|
|
|
76
76
|
fetchImpl?: typeof fetch;
|
|
77
77
|
/** Injectable access-token getter (defaults to Application Default Credentials). */
|
|
78
78
|
getAccessToken?: () => Promise<string | undefined>;
|
|
79
|
-
/** Vertex location/region.
|
|
79
|
+
/** Vertex location/region. Forced to global endpoint for Gemini 3 support. */
|
|
80
80
|
location?: string;
|
|
81
81
|
/** GCP project id. */
|
|
82
82
|
project: string;
|
|
@@ -99,8 +99,8 @@ export interface VerifyVertexModelsOptions extends ListEnabledVertexModelsOption
|
|
|
99
99
|
}
|
|
100
100
|
|
|
101
101
|
/**
|
|
102
|
-
* Normalize a publisher model resource name (e.g. "publishers/google/models/gemini-
|
|
103
|
-
* "gemini-
|
|
102
|
+
* Normalize a publisher model resource name (e.g. "publishers/google/models/gemini-3.8-flash" or
|
|
103
|
+
* "gemini-3.8-flash@001") down to its bare model id (e.g. "gemini-3.8-flash").
|
|
104
104
|
*/
|
|
105
105
|
export const normalizeVertexModelId = (modelName: string): string => {
|
|
106
106
|
const lastSegment = modelName.trim().split("/").pop() ?? modelName.trim();
|
|
@@ -152,8 +152,7 @@ const getDefaultAccessToken = async (): Promise<string | undefined> => {
|
|
|
152
152
|
}
|
|
153
153
|
};
|
|
154
154
|
|
|
155
|
-
const resolveLocation = (
|
|
156
|
-
location ?? process.env.GOOGLE_VERTEX_LOCATION ?? DEFAULT_VERTEX_LOCATION;
|
|
155
|
+
const resolveLocation = (_location?: string): string => "global";
|
|
157
156
|
|
|
158
157
|
const aiPlatformHost = (location: string): string =>
|
|
159
158
|
location === "global" ? "aiplatform.googleapis.com" : `${location}-aiplatform.googleapis.com`;
|
|
@@ -2,10 +2,13 @@ import {describe, expect, it} from "bun:test";
|
|
|
2
2
|
import mongoose from "mongoose";
|
|
3
3
|
|
|
4
4
|
describe("AI test preload", () => {
|
|
5
|
-
it("provides a connected MongoDB without requiring a local service", () => {
|
|
6
|
-
const hasExternalMongo = Boolean(process.env.TERRENO_TEST_MONGODB_URI?.trim());
|
|
7
|
-
|
|
8
|
-
expect(hasExternalMongo || process.env.TERRENO_TEST_USE_MEMORY_MONGO === "true").toBe(true);
|
|
5
|
+
it("provides a connected MongoDB replica set without requiring a local service", async () => {
|
|
9
6
|
expect(mongoose.connection.readyState).toBe(1);
|
|
7
|
+
const db = mongoose.connection.db;
|
|
8
|
+
if (!db) {
|
|
9
|
+
throw new Error("mongoose.connection.db is undefined");
|
|
10
|
+
}
|
|
11
|
+
const hello = await db.command({hello: 1});
|
|
12
|
+
expect(typeof hello.setName).toBe("string");
|
|
10
13
|
});
|
|
11
14
|
});
|
package/src/tests/bunSetup.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {registerBackendPreload} from "@terreno/test";
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
3
|
+
// A single-node replica set: the durable harness commits checkpoints and audit spans
|
|
4
|
+
// in Mongo transactions, which standalone servers reject. `TERRENO_TEST_MONGODB_URI`
|
|
5
|
+
// still overrides the in-memory server (it must point at a replica set).
|
|
6
|
+
registerBackendPreload({
|
|
7
|
+
connectMongoInBeforeAll: true,
|
|
8
|
+
mongo: {baseDatabaseName: "terreno-ai-test", useReplSet: true},
|
|
9
9
|
onBeforeEach: async () => {
|
|
10
10
|
const {shutdownLangfuseClient} = await import("../langfuseClient");
|
|
11
11
|
await shutdownLangfuseClient();
|