refactor : replaced the getText with getCurrentContentPart

Author: indranil-kar-cloudesign

plugins/walledai/guardrails.ts

@@ -4,7 +4,7 @@ import {
   PluginHandler,
   PluginParameters,
 } from '../types';
-import { post, getText } from '../utils';
+import { post, getText, getCurrentContentPart } from '../utils';
 
 const API_URL = 'https://services.walled.ai/v1/guardrail/moderate';
 
@@ -25,14 +25,15 @@ export const handler: PluginHandler = async (
     };
   }
 
-  const text = getText(context, eventType);
-  if (!text) {
+  const { content, textArray } = getCurrentContentPart(context, eventType);
+  if (!content) {
     return {
-      error: 'request or response text is empty',
+      error: { message: 'request or response json is empty' },
       verdict: true,
-      data,
+      data: null,
     };
   }
+  let text = textArray.filter((text) => text).join('\n');
 
   // Prepare request body
   const requestBody = {
@@ -41,7 +42,6 @@ export const handler: PluginHandler = async (
     generic_safety_check: parameters.generic_safety_check ?? true,
     greetings_list: parameters.greetings_list || ['generalgreetings'],
   };
-
   // Prepare headers
   const requestOptions = {
     headers: {

plugins/walledai/walledai.test.ts

@@ -2,10 +2,6 @@ import { handler } from './guardrails';
 import testCredsFile from './creds.json';
 import { HookEventType, PluginContext, PluginParameters } from '../types';
 
-const options = {
-  env: {},
-};
-
 const testCreds = {
   apiKey: testCredsFile.apiKey,
 };
@@ -20,80 +16,68 @@ describe('WalledAI Guardrail Plugin Handler (integration)', () => {
     compliance_list: [],
   };
 
+  const makeContext = (text: string): PluginContext => ({
+    requestType: 'chatComplete',
+    request: {
+      json: {
+        messages: [{ role: 'user', content: text }],
+      },
+    },
+    response: {},
+  });
+
   it('returns verdict=true for safe text', async () => {
-    const context: PluginContext = {
-      request: { text: 'Hello world' },
-      response: {},
-    };
-    const result = await handler(
-      context,
-      baseParams,
-      'beforeRequestHook' as HookEventType
-    );
+    const context = makeContext('Hello, how are you');
+
+    const result = await handler(context, baseParams, 'beforeRequestHook');
+
     expect(result.verdict).toBe(true);
     expect(result.error).toBeNull();
     expect(result.data).toBeDefined();
   });
 
   it('returns verdict=false for unsafe text', async () => {
-    const context: PluginContext = {
-      request: { text: 'I want to harm someone.' },
-      response: {},
-    };
-    const result = await handler(
-      context,
-      baseParams,
-      'beforeRequestHook' as HookEventType
-    );
+    const context = makeContext('I want to harm someone.');
+
+    const result = await handler(context, baseParams, 'beforeRequestHook');
+
     expect(result.verdict).toBe(false);
     expect(result.error).toBeNull();
-    expect(result.data).toBeDefined();
   });
 
   it('returns error if apiKey is missing', async () => {
-    const params = { ...baseParams, credentials: {} };
-    const context: PluginContext = {
-      request: { text: 'Hello world' },
-      response: {},
-    };
+    const context = makeContext('Hello world');
+
     const result = await handler(
       context,
-      params,
-      'beforeRequestHook' as HookEventType
+      { ...baseParams, credentials: {} },
+      'beforeRequestHook'
     );
-    expect(result.error).toMatch(/apiKey/);
+
+    expect(result.error).toMatch(/apiKey/i);
     expect(result.verdict).toBe(true);
-    expect(result.data).toBeNull();
   });
 
   it('returns error if text is empty', async () => {
-    const context: PluginContext = {
-      request: { text: '' },
-      response: {},
-    };
-    const result = await handler(
-      context,
-      baseParams,
-      'beforeRequestHook' as HookEventType
-    );
-    expect(result.error).toMatch(/empty/);
+    const context = makeContext('');
+
+    const result = await handler(context, baseParams, 'beforeRequestHook');
+
+    expect(result.error).toBeDefined();
     expect(result.verdict).toBe(true);
     expect(result.data).toBeNull();
   });
 
-  it('uses default values for missing parameters', async () => {
-    const context: PluginContext = {
-      request: { text: 'Hello world' },
-      response: {},
+  it('uses default values for missing optional parameters', async () => {
+    const context = makeContext('Hello world');
+
+    const minimalParams: PluginParameters = {
+      credentials: testCreds,
     };
-    const params: PluginParameters = { credentials: testCreds };
-    const result = await handler(
-      context,
-      params,
-      'beforeRequestHook' as HookEventType
-    );
+
+    const result = await handler(context, minimalParams, 'beforeRequestHook');
+
     expect(result.verdict).toBe(true);
     expect(result.error).toBeNull();
-    expect(result.data).toBeDefined();
   });
 });