breaking(js/ai): refactored prompts API, migrated to standalone dotpr… (

#1651)
firebase · Jan 25, 2025 · a828083 · a828083
1 parent 378fc08
commit a828083
Show file tree

Hide file tree

Showing 59 changed files with 2,242 additions and 4,047 deletions.
diff --git a/.github/workflows/bump-js-version.yml b/.github/workflows/bump-js-version.yml
@@ -107,17 +107,6 @@ jobs:
           preid: ${{ inputs.preid }}
           commit-message: 'chore: bump @genkit-ai/dev-local-vectorstore version to {{version}}'
           tag-prefix:  '@genkit-ai/dev-local-vectorstore@'
-      - name: 'js/plugins/dotprompt version bump'
-        uses: 'phips28/gh-action-bump-version@master'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GENKIT_RELEASER_GITHUB_TOKEN }}
-          PACKAGEJSON_DIR: js/plugins/dotprompt
-        with:
-          default: ${{ inputs.releaseType }}
-          version-type: ${{ inputs.releaseType }}
-          preid: ${{ inputs.preid }}
-          commit-message: 'chore: bump @genkit-ai/dotprompt version to {{version}}'
-          tag-prefix:  '@genkit-ai/dotprompt@'
       - name: 'js/plugins/evaluators version bump'
         uses: 'phips28/gh-action-bump-version@master'
         env:

diff --git a/js/ai/package.json b/js/ai/package.json
@@ -16,6 +16,7 @@
     "build": "npm-run-all build:clean check compile",
     "build:watch": "tsup-node --watch",
     "test": "node --import tsx --test ./tests/**/*_test.ts ./tests/*_test.ts",
+    "test:watch": "node --watch --import tsx --test ./tests/**/*_test.ts ./tests/*_test.ts",
     "test:single": "node --import tsx --test"
   },
   "repository": {
@@ -33,7 +34,8 @@
     "json5": "^2.2.3",
     "node-fetch": "^3.3.2",
     "partial-json": "^0.1.7",
-    "uuid": "^10.0.0"
+    "uuid": "^10.0.0",
+    "dotprompt": "^1.0.0-dev || ^1"
   },
   "devDependencies": {
     "npm-run-all": "^4.1.5",

diff --git a/js/ai/src/generate.ts b/js/ai/src/generate.ts
@@ -346,6 +346,8 @@ async function resolveFullToolName(
     return `/tool/${name}`;
   } else if (await registry.lookupAction(`/prompt/${name}`)) {
     return `/prompt/${name}`;
+  } else if (await registry.lookupAction(`/prompt/dotprompt/${name}`)) {
+    return `/prompt/dotprompt/${name}`;
   } else {
     throw new Error(`Unable to determine type of of tool: ${name}`);
   }
@@ -372,10 +374,12 @@ export function generateStream<
 ): GenerateStreamResponse<O> {
   let channel = new Channel<GenerateResponseChunk>();
 
-  const generated = generate<O, CustomOptions>(registry, {
-    ...options,
-    onChunk: (chunk) => channel.send(chunk),
-  });
+  const generated = Promise.resolve(options).then((resolvedOptions) =>
+    generate<O, CustomOptions>(registry, {
+      ...resolvedOptions,
+      onChunk: (chunk) => channel.send(chunk),
+    })
+  );
   generated.then(
     () => channel.close(),
     (err) => channel.error(err)

diff --git a/js/ai/src/index.ts b/js/ai/src/index.ts
@@ -72,13 +72,15 @@ export {
   type ToolResponsePart,
 } from './model.js';
 export {
+  defineHelper,
+  definePartial,
   definePrompt,
   isExecutablePrompt,
-  renderPrompt,
+  loadPromptFolder,
+  prompt,
   type ExecutablePrompt,
   type PromptAction,
   type PromptConfig,
-  type PromptFn,
   type PromptGenerateOptions,
 } from './prompt.js';
 export {