Merge branch 'main' into MichaelDoyle-patch-1

package.json

@@ -1,13 +1,12 @@
 {
   "name": "genkit-plugins-root",
   "private": true,
-  "version": "0.1.0",
+  "version": "0.3.0",
   "scripts": {
     "build": "yarn workspaces foreach -Rip --from 'genkitx-*' run build",
     "test": "yarn workspaces foreach -Rip --from 'genkitx-*' run test"
   },
   "devDependencies": {
-    "npm-run-all": "^4.1.5",
     "typescript": "^4.9.5"
   },
   "workspaces": [

plugins/anthropic/README.md

@@ -10,6 +10,16 @@ pnpm add genkitx-anthropic
 yarn add genkitx-anthropic
 ```
 
+The plugin depends on Genkit core packages, so make sure to have them installed as well:
+
+```bash
+npm install @genkit-ai/core @genkit-ai/ai
+# or
+pnpm add @genkit-ai/core @genkit-ai/ai
+# or
+yarn add @genkit-ai/core @genkit-ai/ai
+```
+
 ## Example Claude 3 Haiku flow
 
 ```ts

plugins/anthropic/package.json

@@ -15,7 +15,7 @@
     "genai",
     "generative-ai"
   ],
-  "version": "0.2.0",
+  "version": "0.3.0",
   "type": "commonjs",
   "repository": {
     "type": "git",
@@ -26,11 +26,15 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@anthropic-ai/sdk": "^0.20.9",
-    "@genkit-ai/ai": "0.5.0",
-    "@genkit-ai/core": "0.5.0",
     "zod": "^3.23.8"
   },
+  "peerDependencies": {
+    "@genkit-ai/ai": "^0.5.0",
+    "@genkit-ai/core": "^0.5.0"
+  },
   "devDependencies": {
+    "@genkit-ai/ai": "^0.5.0",
+    "@genkit-ai/core": "^0.5.0",
     "@types/node": "^20.12.11",
     "npm-run-all": "^4.1.5",
     "tsup": "^8.0.2",

plugins/anthropic/src/claude.ts

@@ -1,13 +1,13 @@
 import { Message } from '@genkit-ai/ai';
 import {
-  CandidateData,
   defineModel,
-  GenerateRequest,
-  MessageData,
   modelRef,
-  ModelReference,
-  Part,
-  Role,
+  type CandidateData,
+  type GenerateRequest,
+  type MessageData,
+  type ModelReference,
+  type Part,
+  type Role,
 } from '@genkit-ai/ai/model';
 import Anthropic from '@anthropic-ai/sdk';
 import z from 'zod';

plugins/anthropic/src/index.ts

@@ -1,4 +1,4 @@
-import { genkitPlugin, Plugin } from '@genkit-ai/core';
+import { genkitPlugin, type Plugin } from '@genkit-ai/core';
 import Anthropic from '@anthropic-ai/sdk';
 import {
   claude3Opus,

plugins/openai/README.md

@@ -10,6 +10,16 @@ pnpm add genkitx-openai
 yarn add genkitx-openai
 ```
 
+The plugin depends on Genkit core packages, so make sure to have them installed as well:
+
+```bash
+npm install @genkit-ai/core @genkit-ai/ai
+# or
+pnpm add @genkit-ai/core @genkit-ai/ai
+# or
+yarn add @genkit-ai/core @genkit-ai/ai
+```
+
 ## Example GPT-4 Turbo flow
 
 ```ts

plugins/openai/package.json

@@ -14,7 +14,7 @@
     "genai",
     "generative-ai"
   ],
-  "version": "0.2.0",
+  "version": "0.3.0",
   "type": "commonjs",
   "repository": {
     "type": "git",
@@ -24,12 +24,16 @@
   "author": "Dabolus",
   "license": "Apache-2.0",
   "dependencies": {
-    "@genkit-ai/ai": "0.5.0",
-    "@genkit-ai/core": "0.5.0",
     "openai": "^4.43.0",
     "zod": "^3.23.8"
   },
+  "peerDependencies": {
+    "@genkit-ai/ai": "^0.5.0",
+    "@genkit-ai/core": "^0.5.0",
+  },
   "devDependencies": {
+    "@genkit-ai/ai": "^0.5.0",
+    "@genkit-ai/core": "^0.5.0",
     "@types/node": "^20.12.11",
     "npm-run-all": "^4.1.5",
     "tsup": "^8.0.2",

plugins/openai/src/dalle.ts

@@ -1,15 +1,15 @@
 import { Message } from '@genkit-ai/ai';
 import {
   defineModel,
-  GenerateRequest,
-  GenerateResponseData,
-  ModelAction,
   modelRef,
+  type GenerateRequest,
+  type GenerateResponseData,
+  type ModelAction,
 } from '@genkit-ai/ai/model';
 import OpenAI from 'openai';
 import {
-  ImageGenerateParams,
-  ImagesResponse,
+  type ImageGenerateParams,
+  type ImagesResponse,
 } from 'openai/resources/images.mjs';
 import { z } from 'zod';
 
@@ -29,6 +29,7 @@ export const dallE3 = modelRef({
       media: false,
       output: ['media'],
       multiturn: false,
+      systemRole: false,
       tools: false,
     },
   },

plugins/openai/src/embedder.ts

@@ -1,7 +1,7 @@
 import { defineEmbedder, embedderRef } from '@genkit-ai/ai/embedder';
 import OpenAI from 'openai';
 import { z } from 'zod';
-import { PluginOptions } from '.';
+import { type PluginOptions } from './index.js';
 
 export const TextEmbeddingConfigSchema = z.object({
   dimensions: z.number().optional(),
@@ -60,7 +60,7 @@ export function openaiEmbedder(name: string, options?: PluginOptions) {
   let apiKey = options?.apiKey || process.env.OPENAI_API_KEY;
   if (!apiKey)
     throw new Error(
-      'please pass in the API key or set the OPENAI_API_KEY environment variable'
+      'please pass in the API key or set the OPENAI_API_KEY environment variable',
     );
   const model = SUPPORTED_EMBEDDING_MODELS[name];
   if (!model) throw new Error(`Unsupported model: ${name}`);
@@ -75,13 +75,13 @@ export function openaiEmbedder(name: string, options?: PluginOptions) {
     async (input, options) => {
       const embeddings = await client.embeddings.create({
         model: name,
-        input: input.map((d) => d.text()),
+        input: input.map(d => d.text()),
         dimensions: options?.dimensions,
         encoding_format: options?.encodingFormat,
       });
       return {
-        embeddings: embeddings.data.map((d) => ({ embedding: d.embedding })),
+        embeddings: embeddings.data.map(d => ({ embedding: d.embedding })),
       };
-    }
+    },
   );
 }

plugins/openai/src/gpt.ts

@@ -1,27 +1,27 @@
 import { Message } from '@genkit-ai/ai';
 import {
-  CandidateData,
   defineModel,
-  GenerateRequest,
-  MessageData,
   modelRef,
-  Part,
-  Role,
-  ToolDefinition,
-  ToolRequestPart,
+  type CandidateData,
+  type GenerateRequest,
+  type MessageData,
+  type Part,
+  type Role,
+  type ToolDefinition,
+  type ToolRequestPart,
 } from '@genkit-ai/ai/model';
 import OpenAI from 'openai';
 import {
-  ChatCompletion,
-  ChatCompletionChunk,
-  ChatCompletionContentPart,
-  ChatCompletionCreateParamsNonStreaming,
-  ChatCompletionMessageParam,
-  ChatCompletionMessageToolCall,
-  ChatCompletionRole,
-  ChatCompletionTool,
-  CompletionChoice,
-} from 'openai/resources/index';
+  type ChatCompletion,
+  type ChatCompletionChunk,
+  type ChatCompletionContentPart,
+  type ChatCompletionCreateParamsNonStreaming,
+  type ChatCompletionMessageParam,
+  type ChatCompletionMessageToolCall,
+  type ChatCompletionRole,
+  type ChatCompletionTool,
+  type CompletionChoice,
+} from 'openai/resources/index.mjs';
 import z from 'zod';
 
 const API_NAME_MAP = {
@@ -60,6 +60,7 @@ export const gpt4Turbo = modelRef({
       multiturn: true,
       tools: true,
       media: false,
+      systemRole: true,
       output: ['text', 'json'],
     },
   },
@@ -75,6 +76,7 @@ export const gpt4Vision = modelRef({
       multiturn: true,
       tools: false,
       media: true,
+      systemRole: true,
       output: ['text'],
     },
   },
@@ -90,6 +92,7 @@ export const gpt4 = modelRef({
       multiturn: true,
       tools: true,
       media: false,
+      systemRole: true,
       output: ['text'],
     },
   },
@@ -105,6 +108,7 @@ export const gpt35Turbo = modelRef({
       multiturn: true,
       tools: true,
       media: false,
+      systemRole: true,
       output: ['json', 'text'],
     },
   },

plugins/openai/src/index.ts

@@ -1,4 +1,4 @@
-import { genkitPlugin, Plugin } from '@genkit-ai/core';
+import { genkitPlugin, type Plugin } from '@genkit-ai/core';
 import OpenAI from 'openai';
 import { dallE3, dallE3Model } from './dalle.js';
 import {