feat(groq): Migrate Groq to v2 Plugins API

lerna.json

@@ -1,9 +1,5 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "version": "0.25.0",
-  "packages": [
-    "plugins/*",
-    "docs",
-    "examples/*"
-  ]
-}
+  "packages": ["plugins/*", "docs", "examples/*"]
+}

plugins/groq/.gitignore

@@ -1,2 +1,3 @@
 lib/
-node_modules/
+node_modules/
+.env

plugins/groq/jest.config.js

@@ -0,0 +1,6 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  testPathIgnorePatterns: ['/node_modules/', '/lib/'],
+};

plugins/groq/package.json

@@ -27,14 +27,16 @@
     "groq-sdk": "^0.19.0"
   },
   "peerDependencies": {
-    "genkit": "^0.9.0 || ^1.0.0"
+    "genkit": "^1.19.3"
   },
   "devDependencies": {
     "@types/hast": "^3.0.4",
     "@types/mdast": "^4.0.4",
     "@types/node": "^20.11.16",
+    "jest": "^30.2.0",
     "npm-run-all": "^4.1.5",
     "rimraf": "^6.0.1",
+    "ts-jest": "^29.1.0",
     "tsup": "^8.0.2",
     "tsx": "^4.7.0",
     "typescript": "^4.9.5"
@@ -61,6 +63,6 @@
     "build:clean": "rimraf ./lib",
     "build": "npm-run-all build:clean check compile",
     "build:watch": "tsup-node --watch",
-    "test": "tsx \"./tests/\""
+    "test": "jest"
   }
 }

plugins/groq/src/groq_models.ts

@@ -25,7 +25,6 @@ import { ChatCompletion } from 'groq-sdk/resources/chat/index.mjs';
 import {
   GenerateRequest,
   GenerationCommonConfigSchema,
-  Genkit,
   Message,
   MessageData,
   Part,
@@ -40,6 +39,7 @@ import {
   modelRef,
   ToolDefinition,
 } from 'genkit/model';
+import { model } from 'genkit/plugin';
 
 export const GroqConfigSchema = GenerationCommonConfigSchema.extend({
   stream: z.boolean().optional(),
@@ -572,29 +572,29 @@ export function toGroqRequestBody(
 }
 
 /**
- * Defines a Groq model.
+ * Creates a Groq model action.
  *
  * @param name - The name of the model.
  * @param client - The Groq client.
- * @returns The model.
+ * @returns The model action.
  */
-export function groqModel(ai: Genkit, name: string, client: Groq) {
-  const model = SUPPORTED_GROQ_MODELS[name];
-  if (!model) throw new Error(`Unsupported model: ${name}`);
-  const modelId = `groq/${name}`;
+export function createGroqModel(name: string, client: Groq) {
+  const modelRef = SUPPORTED_GROQ_MODELS[name];
+  if (!modelRef) throw new Error(`Unsupported model: ${name}`);
+  const modelId = `${name}`;
 
-  return ai.defineModel(
+  return model(
     {
       name: modelId,
-      ...model.info,
-      configSchema: model.configSchema,
+      ...modelRef.info,
+      configSchema: modelRef.configSchema,
     },
-    async (
-      request,
-      streamingCallback?: StreamingCallback<GenerateResponseChunkData>
-    ) => {
+    async (request, options: any) => {
       let response: ChatCompletion;
       const body = toGroqRequestBody(name, request);
+      const streamingCallback:
+        | StreamingCallback<GenerateResponseChunkData>
+        | undefined = options?.streamingCallback;
       if (streamingCallback) {
         if (request.output?.format === 'json') {
           throw new Error(

plugins/groq/src/index.ts

@@ -17,7 +17,7 @@
 // Import necessary types and functions for Groq SDK integration.
 import Groq from 'groq-sdk';
 import {
-  groqModel,
+  createGroqModel,
   llama3x70b,
   llama3x8b,
   llamaGuard3x8b,
@@ -32,8 +32,7 @@ import {
   deepseekR1DistillLlamax70b,
   SUPPORTED_GROQ_MODELS,
 } from './groq_models';
-import { Genkit } from 'genkit';
-import { genkitPlugin } from 'genkit/plugin';
+import { genkitPluginV2 } from 'genkit/plugin';
 
 // Export models for direct access
 export {
@@ -92,28 +91,45 @@ export interface PluginOptions {
  * @param options - Optional configuration settings for the plugin.
  * @returns An object containing the models initialized with the Groq client.
  */
-export const groq = (options?: PluginOptions) =>
-  genkitPlugin('groq', async (ai: Genkit) => {
-    const apiKey = options?.apiKey || process.env.GROQ_API_KEY;
-    if (!apiKey) {
-      throw new Error(
-        'Please provide the API key or set the GROQ_API_KEY environment variable'
-      );
-    }
+export const groq = (options?: PluginOptions) => {
+  const apiKey = options?.apiKey || process.env.GROQ_API_KEY;
+  if (!apiKey) {
+    throw new Error(
+      'Please provide the API key or set the GROQ_API_KEY environment variable'
+    );
+  }
 
-    // Initialize Groq client
-    const client = new Groq({
-      baseURL: options?.baseURL || process.env.GROQ_BASE_URL, // Optional base URL with environment variable fallback
-      apiKey, // API key retrieved from options or environment
-      timeout: options?.timeout, // Optional timeout
-      maxRetries: options?.maxRetries, // Optional max retries
-    });
+  const client = new Groq({
+    baseURL: options?.baseURL || process.env.GROQ_BASE_URL,
+    apiKey,
+    timeout: options?.timeout,
+    maxRetries: options?.maxRetries,
+  });
 
-    // Register each model with the Genkit instance
-    for (const name of Object.keys(SUPPORTED_GROQ_MODELS)) {
-      groqModel(ai, name, client);
-    }
+  return genkitPluginV2({
+    name: 'groq',
+    init: async () => {
+      const models = Object.keys(SUPPORTED_GROQ_MODELS).map((name) =>
+        createGroqModel(name, client)
+      );
+
+      return models;
+    },
+    resolve: async (actionType, actionName) => {
+      if (actionType === 'model') {
+        return createGroqModel(actionName, client);
+      }
+      return undefined;
+    },
+    list: async () => {
+      return Object.keys(SUPPORTED_GROQ_MODELS).map((name) => ({
+        name,
+        namespace: 'groq',
+        type: 'model' as const,
+        info: SUPPORTED_GROQ_MODELS[name].info,
+      }));
+    },
   });
+};
 
-// Default export for plugin usage
 export default groq;