Merge branch 'main' into recraft-ai

Portkey-AI · Dec 24, 2024 · 83f3bd7 · 83f3bd7
2 parents f80d22e + 0041ff2
commit 83f3bd7
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 29 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@portkey-ai/gateway",
-  "version": "1.8.5",
+  "version": "1.8.6",
   "description": "A fast AI gateway by Portkey",
   "repository": {
     "type": "git",

diff --git a/plugins/patronus/custom.ts b/plugins/patronus/custom.ts
@@ -15,8 +15,8 @@ export const handler: PluginHandler = async (
   let verdict = false;
   let data = null;
 
-  const evaluator = 'custom';
-  const profile = parameters.profile;
+  const evaluator = 'judge';
+  const criteria = parameters.criteria;
 
   if (eventType !== 'afterRequestHook') {
     return {
@@ -39,7 +39,7 @@ export const handler: PluginHandler = async (
       evaluator,
       parameters.credentials,
       evaluationBody,
-      profile
+      criteria
     );
 
     const evalResult = result.results[0];

diff --git a/plugins/patronus/globals.ts b/plugins/patronus/globals.ts
@@ -6,7 +6,7 @@ export const postPatronus = async (
   evaluator: string,
   credentials: any,
   data: any,
-  profile: string | null = null
+  criteria: string | null = null
 ) => {
   const options = {
     headers: {
@@ -19,7 +19,7 @@ export const postPatronus = async (
       {
         evaluator: evaluator,
         explain_strategy: 'always',
-        ...(profile && { profile_name: profile }),
+        ...(criteria && { criteria: criteria }),
       },
     ],
     evaluated_model_input: data.input,

diff --git a/plugins/patronus/isConcise.ts b/plugins/patronus/isConcise.ts
@@ -15,8 +15,8 @@ export const handler: PluginHandler = async (
   let verdict = false;
   let data = null;
 
-  const evaluator = 'custom';
-  const profile = 'system:is-concise';
+  const evaluator = 'judge';
+  const criteria = 'patronus:is-concise';
 
   if (eventType !== 'afterRequestHook') {
     return {
@@ -39,7 +39,7 @@ export const handler: PluginHandler = async (
       evaluator,
       parameters.credentials,
       evaluationBody,
-      profile
+      criteria
     );
 
     const evalResult = result.results[0];

diff --git a/plugins/patronus/isHelpful.ts b/plugins/patronus/isHelpful.ts
@@ -15,8 +15,8 @@ export const handler: PluginHandler = async (
   let verdict = false;
   let data = null;
 
-  const evaluator = 'custom';
-  const profile = 'system:is-helpful';
+  const evaluator = 'judge';
+  const criteria = 'patronus:is-helpful';
 
   if (eventType !== 'afterRequestHook') {
     return {
@@ -39,7 +39,7 @@ export const handler: PluginHandler = async (
       evaluator,
       parameters.credentials,
       evaluationBody,
-      profile
+      criteria
     );
 
     const evalResult = result.results[0];

diff --git a/plugins/patronus/isPolite.ts b/plugins/patronus/isPolite.ts
@@ -15,8 +15,8 @@ export const handler: PluginHandler = async (
   let verdict = false;
   let data = null;
 
-  const evaluator = 'custom';
-  const profile = 'system:is-polite';
+  const evaluator = 'judge';
+  const criteria = 'patronus:is-polite';
 
   if (eventType !== 'afterRequestHook') {
     return {
@@ -39,7 +39,7 @@ export const handler: PluginHandler = async (
       evaluator,
       parameters.credentials,
       evaluationBody,
-      profile
+      criteria
     );
 
     const evalResult = result.results[0];

diff --git a/plugins/patronus/noApologies.ts b/plugins/patronus/noApologies.ts
@@ -15,8 +15,8 @@ export const handler: PluginHandler = async (
   let verdict = false;
   let data = null;
 
-  const evaluator = 'custom';
-  const profile = 'system:no-apologies';
+  const evaluator = 'judge';
+  const criteria = 'patronus:no-apologies';
 
   if (eventType !== 'afterRequestHook') {
     return {
@@ -39,7 +39,7 @@ export const handler: PluginHandler = async (
       evaluator,
       parameters.credentials,
       evaluationBody,
-      profile
+      criteria
     );
 
     const evalResult = result.results[0];

diff --git a/plugins/patronus/noGenderBias.ts b/plugins/patronus/noGenderBias.ts
@@ -15,8 +15,8 @@ export const handler: PluginHandler = async (
   let verdict = false;
   let data = null;
 
-  const evaluator = 'custom';
-  const profile = 'system:no-gender-bias';
+  const evaluator = 'judge';
+  const criteria = 'patronus:no-gender-bias';
 
   if (eventType !== 'afterRequestHook') {
     return {
@@ -39,7 +39,7 @@ export const handler: PluginHandler = async (
       evaluator,
       parameters.credentials,
       evaluationBody,
-      profile
+      criteria
     );
 
     const evalResult = result.results[0];

diff --git a/plugins/patronus/noRacialBias.ts b/plugins/patronus/noRacialBias.ts
@@ -15,8 +15,8 @@ export const handler: PluginHandler = async (
   let verdict = false;
   let data = null;
 
-  const evaluator = 'custom';
-  const profile = 'system:no-racial-bias';
+  const evaluator = 'judge';
+  const criteria = 'patronus:no-racial-bias';
 
   if (eventType !== 'afterRequestHook') {
     return {
@@ -39,7 +39,7 @@ export const handler: PluginHandler = async (
       evaluator,
       parameters.credentials,
       evaluationBody,
-      profile
+      criteria
     );
 
     const evalResult = result.results[0];

diff --git a/plugins/patronus/patronus.test.ts b/plugins/patronus/patronus.test.ts
@@ -237,7 +237,10 @@ describe('custom handler (is-concise)', () => {
       },
     };
 
-    const parameters = { credentials: testCreds, profile: 'system:is-concise' };
+    const parameters = {
+      credentials: testCreds,
+      criteria: 'patronus:is-concise',
+    };
 
     const result = await customHandler(context, parameters, eventType);
     console.log(result);
@@ -256,7 +259,10 @@ describe('custom handler (is-concise)', () => {
       },
     };
 
-    const parameters = { credentials: testCreds, profile: 'system:is-concise' };
+    const parameters = {
+      credentials: testCreds,
+      criteria: 'patronus:is-concise',
+    };
 
     const result = await customHandler(context, parameters, eventType);
     console.log(result);

diff --git a/plugins/patronus/retrievalAnswerRelevance.ts b/plugins/patronus/retrievalAnswerRelevance.ts
@@ -15,7 +15,7 @@ export const handler: PluginHandler = async (
   let verdict = false;
   let data = null;
 
-  const evaluator = 'retrieval-answer-relevance';
+  const evaluator = 'answer-relevance';
 
   if (eventType !== 'afterRequestHook') {
     return {