From 1f7803400397147962334ac76f203cac2684d38b Mon Sep 17 00:00:00 2001 From: Michael Bleigh Date: Sat, 25 Jan 2025 20:16:16 -0800 Subject: [PATCH 1/2] Bump dotprompt for breaking classname change. --- js/ai/package.json | 2 +- js/core/package.json | 2 +- js/core/src/registry.ts | 4 ++-- js/plugins/evaluators/package.json | 2 +- js/pnpm-lock.yaml | 18 +++++++++--------- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/js/ai/package.json b/js/ai/package.json index 757db31df..dd1c1d953 100644 --- a/js/ai/package.json +++ b/js/ai/package.json @@ -35,7 +35,7 @@ "node-fetch": "^3.3.2", "partial-json": "^0.1.7", "uuid": "^10.0.0", - "dotprompt": "^1.0.0-dev || ^1" + "dotprompt": "^1.0.0-dev.3 || ^1" }, "devDependencies": { "npm-run-all": "^4.1.5", diff --git a/js/core/package.json b/js/core/package.json index ce78aebfd..ad6a9b791 100644 --- a/js/core/package.json +++ b/js/core/package.json @@ -43,7 +43,7 @@ "json-schema": "^0.4.0", "zod": "^3.23.8", "zod-to-json-schema": "^3.22.4", - "dotprompt": "^1.0.0-dev || ^1" + "dotprompt": "^1.0.0-dev.3 || ^1" }, "devDependencies": { "@types/express": "^4.17.21", diff --git a/js/core/src/registry.ts b/js/core/src/registry.ts index bdf5462d1..6a99052c1 100644 --- a/js/core/src/registry.ts +++ b/js/core/src/registry.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { DotpromptEnvironment } from 'dotprompt'; +import { Dotprompt } from 'dotprompt'; import { AsyncLocalStorage } from 'node:async_hooks'; import * as z from 'zod'; import { Action } from './action.js'; @@ -71,7 +71,7 @@ export class Registry { private allPluginsInitialized = false; readonly asyncStore = new AsyncStore(); - readonly dotprompt = new DotpromptEnvironment({ + readonly dotprompt = new Dotprompt({ schemaResolver: async (name) => { const resolvedSchema = await this.lookupSchema(name); if (!resolvedSchema) { diff --git a/js/plugins/evaluators/package.json b/js/plugins/evaluators/package.json index 764f99b1f..6c50d3d73 100644 --- a/js/plugins/evaluators/package.json +++ b/js/plugins/evaluators/package.json @@ -33,7 +33,7 @@ "compute-cosine-similarity": "^1.1.0", "node-fetch": "^3.3.2", "path": "^0.12.7", - "dotprompt": "^1.0.0-dev || ^1" + "dotprompt": "^1.0.0-dev.3 || ^1" }, "peerDependencies": { "genkit": "workspace:*" diff --git a/js/pnpm-lock.yaml b/js/pnpm-lock.yaml index 60faabe3b..1a13025d3 100644 --- a/js/pnpm-lock.yaml +++ b/js/pnpm-lock.yaml @@ -51,8 +51,8 @@ importers: specifier: ^2.0.20 version: 2.0.20 dotprompt: - specifier: ^1.0.0-dev || ^1 - version: 1.0.0-dev.2 + specifier: ^1.0.0-dev.3 || ^1 + version: 1.0.0-dev.3 json5: specifier: ^2.2.3 version: 2.2.3 @@ -121,8 +121,8 @@ importers: specifier: ^2.8.5 version: 2.8.5 dotprompt: - specifier: ^1.0.0-dev || ^1 - version: 1.0.0-dev.2 + specifier: ^1.0.0-dev.3 || ^1 + version: 1.0.0-dev.3 express: specifier: ^4.21.0 version: 4.21.0 @@ -337,8 +337,8 @@ importers: specifier: ^1.1.0 version: 1.1.0 dotprompt: - specifier: ^1.0.0-dev || ^1 - version: 1.0.0-dev.2 + specifier: ^1.0.0-dev.3 || ^1 + version: 1.0.0-dev.3 genkit: specifier: workspace:* version: link:../../genkit @@ -4209,8 +4209,8 @@ packages: resolution: {integrity: sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==} engines: {node: '>=12'} - dotprompt@1.0.0-dev.2: - resolution: {integrity: sha512-RcpdKpKd1XemHpb6Lti/ekLGs+9or+11n/aUSZ9e8QM1qTNFUloa9bdqg4OJDvpAlihv34uCt8yUlV2h4MglqA==} + dotprompt@1.0.0-dev.3: + resolution: {integrity: sha512-gAcIhG+vzZlrZcBN/lO8gEMUtXHKMLbs1+snJuZrPkZnNgnWrzz1hYN4vYotpng/5fHsYSPUEckECy6qUNSrsQ==} duplexify@4.1.3: resolution: {integrity: sha512-M3BmBhwJRZsSx38lZyhE53Csddgzl5R7xGJNk7CVddZD6CcmwMCH8J+7AprIrQKH7TonKxaCjcv27Qmf+sQ+oA==} @@ -9514,7 +9514,7 @@ snapshots: dotenv@16.4.5: {} - dotprompt@1.0.0-dev.2: + dotprompt@1.0.0-dev.3: dependencies: handlebars: 4.7.8 yaml: 2.6.1 From fc92fac6fa87b579ee42d9874c14256050f5303f Mon Sep 17 00:00:00 2001 From: Michael Bleigh Date: Sat, 25 Jan 2025 20:24:36 -0800 Subject: [PATCH 2/2] fix --- js/plugins/evaluators/src/metrics/helper.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/plugins/evaluators/src/metrics/helper.ts b/js/plugins/evaluators/src/metrics/helper.ts index ec59c2fc4..e5a4bcccc 100644 --- a/js/plugins/evaluators/src/metrics/helper.ts +++ b/js/plugins/evaluators/src/metrics/helper.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { dotprompt, PromptFunction } from 'dotprompt'; +import { Dotprompt, PromptFunction } from 'dotprompt'; import { readFileSync } from 'fs'; /** Helper function to get current directory, isolated in a separate file to work with ESM */ @@ -22,7 +22,7 @@ export function getDirName() { return __dirname; } -const dp = dotprompt(); +const dp = new Dotprompt(); export function loadPromptFile(path: string): Promise { return dp.compile(dp.parse(readFileSync(path, 'utf8')));