Merge pull request #1316 from indranil786/main

Fix : Walled Ai Guardrail changed to walledprotect

Author: VisargD

plugins/index.ts

@@ -62,7 +62,7 @@ import { handler as promptSecurityProtectResponse } from './promptsecurity/prote
 import { handler as panwPrismaAirsintercept } from './panw-prisma-airs/intercept';
 import { handler as defaultjwt } from './default/jwt';
 import { handler as defaultrequiredMetadataKeys } from './default/requiredMetadataKeys';
-import { handler as walledaiguardrails } from './walledai/guardrails';
+import { handler as walledaiguardrails } from './walledai/walledprotect';
 import { handler as defaultregexReplace } from './default/regexReplace';
 import { handler as defaultallowedRequestTypes } from './default/allowedRequestTypes';
 import { handler as javelinguardrails } from './javelin/guardrails';
@@ -169,7 +169,7 @@ export const plugins = {
     intercept: panwPrismaAirsintercept,
   },
   walledai: {
-    guardrails: walledaiguardrails,
+    walledprotect: walledaiguardrails,
   },
   javelin: {
     guardrails: javelinguardrails,

plugins/walledai/manifest.json

@@ -16,7 +16,7 @@
   "functions": [
     {
       "name": "Walled AI Guardrail for checking safety of LLM inputs",
-      "id": "guardrails",
+      "id": "walledprotect",
       "supportedHooks": ["beforeRequestHook", "afterRequestHook"],
       "type": "guardrail",
       "description": [
@@ -28,51 +28,26 @@
       "parameters": {
         "type": "object",
         "properties": {
-          "text_type": {
-            "type": "string",
-            "label": "Text Type",
-            "description": [
-              {
-                "type": "subHeading",
-                "text": "Type of Text , defaults to 'prompt'"
-              }
-            ],
-            "default": "prompt"
-          },
           "generic_safety_check": {
             "type": "string",
             "label": "Generic Safety Check",
-            "description": [
-              {
-                "type": "subHeading",
-                "text": "Boolean value to enable generic safety checks on the text input. Defaults to 'true'."
-              }
-            ],
+            "description": "Boolean value to enable generic safety checks on the text input. Defaults to 'true'.",
             "default": true
           },
           "greetings_list": {
             "type": "array",
             "label": "Greetings List",
-            "description": [
-              {
-                "type": "subHeading",
-                "text": "List of greetings to be used in the guardrail check. This can help in identifying and handling greetings appropriately."
-              }
-            ],
+            "description": "List of greetings to be used in the guardrail check.",
             "items": {
-              "type": "string"
+              "type": "string",
+              "enum": ["Casual & Friendly", "Professional & Polite"]
             },
-            "default": ["Casual & Friendly", "Professional & Polite"]
+            "default": ["Casual & Friendly"]
           },
           "pii_list": {
             "type": "array",
             "label": "PII LIST",
-            "description": [
-              {
-                "type": "subHeading",
-                "text": "Identify all the PII for only the following types of PII will be checked in the text input. Defaults to empty list"
-              }
-            ],
+            "description": "PII types that should be checked in the input text.",
             "items": {
               "type": "string",
               "enum": [
@@ -98,15 +73,8 @@
           "compliance_list": {
             "type": "array",
             "label": "List of Compliance Checks",
-            "description": [
-              {
-                "type": "subHeading",
-                "text": "List of compliance checks to be performed on the text input. This can help in ensuring that the text adheres to specific compliance standards. Defaults to empty"
-              }
-            ],
-            "items": {
-              "type": "string"
-            },
+            "description": "Compliance checks to be performed on the text input.",
+            "items": { "type": "string" },
             "default": []
           }
         }

plugins/walledai/walledai.test.ts

@@ -1,4 +1,4 @@
-import { handler } from './guardrails';
+import { handler } from './walledprotect';
 import testCredsFile from './creds.json';
 import { HookEventType, PluginContext, PluginParameters } from '../types';
 
@@ -99,4 +99,34 @@ describe('WalledAI Guardrail Plugin Handler (integration)', () => {
     expect(result.data).toBeDefined();
     // Optionally, check if compliance_list was respected in the response if API supports it
   });
+
+  it('should handle conversational text format', async () => {
+    const context = {
+      requestType: 'chatComplete',
+      request: {
+        json: {
+          messages: [
+            { role: 'user', content: 'Hi' },
+            { role: 'assistant', content: 'Hello, how can I help you?' },
+          ],
+        },
+      },
+      response: {},
+    };
+
+    const parameters = {
+      credentials: testCreds,
+      text_type: 'prompt',
+      generic_safety_check: true,
+      greetings_list: ['Casual & Friendly', 'Professional & Polite'],
+      pii_list: ["Person's Name", 'Address'],
+      compliance_list: ['questions on medicine'],
+    };
+
+    const eventType = 'beforeRequestHook';
+
+    const result = await handler(context as any, parameters, eventType);
+    expect(result).toHaveProperty('verdict');
+    expect(result).toHaveProperty('data');
+  });
 });

plugins/walledai/guardrails.ts renamed to plugins/walledai/walledprotect.ts

@@ -6,7 +6,7 @@ import {
 } from '../types';
 import { post, getText, getCurrentContentPart } from '../utils';
 
-const API_URL = 'https://services.walled.ai/v1/guardrail/moderate';
+const API_URL = 'https://services.walled.ai/v1/walled-protect';
 
 const DEFAULT_PII_LIST = [
   "Person's Name",
@@ -18,7 +18,7 @@ const DEFAULT_PII_LIST = [
   'Financial Data',
 ];
 
-const DEFAULT_GREETINGS_LIST = ['Casual & Friendly', 'Professional & Polite'];
+const DEFAULT_GREETINGS_LIST = ['Casual & Friendly'];
 
 export const handler: PluginHandler = async (
   context: PluginContext,
@@ -45,12 +45,14 @@ export const handler: PluginHandler = async (
       data: null,
     };
   }
-  let text = textArray.filter((text) => text).join('\n');
+  let text = textArray
+    .filter((text) => text)
+    .join('\n')
+    .trim();
 
   // Prepare request body
   const requestBody = {
     text: text,
-    text_type: parameters.text_type || 'prompt',
     generic_safety_check: parameters.generic_safety_check ?? true,
     greetings_list: parameters.greetings_list || DEFAULT_GREETINGS_LIST,
     pii_list: parameters.pii_list || DEFAULT_PII_LIST,
@@ -60,7 +62,7 @@ export const handler: PluginHandler = async (
   const requestOptions = {
     headers: {
       'Content-Type': 'application/json',
-      Authorization: `Bearer ${parameters.credentials.apiKey}`,
+      'x-api-key': parameters.credentials.apiKey,
     },
   };