feat(groq): Migrate Groq to v2 Plugins API

plugins/groq/package.json

@@ -27,7 +27,7 @@
     "groq-sdk": "^0.19.0"
   },
   "peerDependencies": {
-    "genkit": "^0.9.0 || ^1.0.0"
+    "genkit": "^1.19.3"
   },
   "devDependencies": {
     "@types/hast": "^3.0.4",

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}`);
+export function createGroqModel(name: string, client: Groq) {
+  const modelRef = SUPPORTED_GROQ_MODELS[name];
+  if (!modelRef) throw new Error(`Unsupported model: ${name}`);
   const modelId = `groq/${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 {
@@ -93,26 +92,39 @@ export interface PluginOptions {
  * @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'
-      );
-    }
+  genkitPluginV2({
+    name: 'groq',
+    init: async () => {
+      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
-    });
+      // 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
+      });
 
-    // Register each model with the Genkit instance
-    for (const name of Object.keys(SUPPORTED_GROQ_MODELS)) {
-      groqModel(ai, name, client);
-    }
+      // Create model actions for each supported model
+      const models: any[] = [];
+      for (const name of Object.keys(SUPPORTED_GROQ_MODELS)) {
+        models.push(createGroqModel(name, client));
+      }
+
+      return models;
+    },
+    list: async () => {
+      return Object.keys(SUPPORTED_GROQ_MODELS).map((name) => ({
+        name: `groq/${name}`,
+        type: 'model' as const,
+        info: SUPPORTED_GROQ_MODELS[name].info,
+      }));
+    },
   });
 
 // Default export for plugin usage

plugins/groq/tests/groq_test.ts

@@ -7,6 +7,7 @@ import {
   toGroqMessages,
 } from '../src/groq_models';
 import { ChatCompletionCreateParamsBase } from 'groq-sdk/resources/chat/completions.mjs';
+import { groq } from '../src/index';
 
 describe('toGroqRole', () => {
   it('should convert user role correctly', () => {
@@ -97,3 +98,45 @@ describe('toGroqRequestBody', () => {
     });
   });
 });
+
+describe('Groq Plugin', () => {
+  it('should create plugin with v2 API', () => {
+    const plugin = groq({ apiKey: 'test-key' });
+
+    // Check that the plugin has the expected structure
+    assert.strictEqual(plugin.name, 'groq');
+    assert(typeof plugin.init === 'function');
+    assert(typeof plugin.list === 'function');
+  });
+
+  it('should list available models', async () => {
+    const plugin = groq({ apiKey: 'test-key' });
+    const models = await plugin.list?.();
+
+    // Check that we get a list of models
+    assert(Array.isArray(models));
+    assert(models.length > 0);
+
+    // Check that each model has the expected structure
+    for (const model of models) {
+      assert.strictEqual((model as any).type, 'model');
+      assert(typeof model.name === 'string');
+      assert(model.name.startsWith('groq/'));
+      assert(typeof (model as any).info === 'object');
+    }
+  });
+
+  it('should initialize models', async () => {
+    const plugin = groq({ apiKey: 'test-key' });
+    const models = await plugin.init?.();
+
+    // Check that we get an array of model actions
+    assert(Array.isArray(models));
+    assert(models.length > 0);
+
+    // Check that each model is a function (action)
+    for (const model of models) {
+      assert(typeof model === 'function');
+    }
+  });
+});