Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/handlers/services/hooksService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export class HooksService {
afterRequestHooks,
endpoint,
requestHeaders,
providerOption,
} = this.requestContext;
const hookSpan = this.hooksManager.createSpan(
params,
Expand All @@ -32,7 +33,8 @@ export class HooksService {
afterRequestHooks,
null,
endpoint,
requestHeaders
requestHeaders,
providerOption.includeHookTransformedData ?? false
);
return hookSpan;
}
Expand Down
23 changes: 17 additions & 6 deletions src/middlewares/hooks/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export class HookSpan {
afterRequestHooksResult: HookResult[];
};
private parentHookSpanId: string | null;
public readonly includeHookTransformedData: boolean;
public readonly id: string;

constructor(
Expand All @@ -35,7 +36,8 @@ export class HookSpan {
afterRequestHooks: HookObject[],
parentHookSpanId: string | null,
requestType: string,
requestHeaders: Record<string, string>
requestHeaders: Record<string, string>,
includeHookTransformedData: boolean = false
) {
this.context = this.createContext(
requestParams,
Expand All @@ -54,6 +56,7 @@ export class HookSpan {
'afterRequestHook'
);
this.parentHookSpanId = parentHookSpanId;
this.includeHookTransformedData = includeHookTransformedData;
this.hooksResult = {
beforeRequestHooksResult: [],
afterRequestHooksResult: [],
Expand Down Expand Up @@ -216,7 +219,8 @@ export class HooksManager {
afterRequestHooks: HookObject[],
parentHookSpanId: string | null,
requestType: string,
requestHeaders: Record<string, string>
requestHeaders: Record<string, string>,
includeHookTransformedData: boolean = false
): HookSpan {
const span = new HookSpan(
requestParams,
Expand All @@ -227,7 +231,8 @@ export class HooksManager {
afterRequestHooks,
parentHookSpanId,
requestType,
requestHeaders
requestHeaders,
includeHookTransformedData
);

this.spans[span.id] = span;
Expand Down Expand Up @@ -357,7 +362,9 @@ export class HooksManager {
result.transformedData.request.json
);
}
delete result.transformedData;
if (!span.includeHookTransformedData) {
delete result.transformedData;
}
checkResults.push(result);
}
}
Expand All @@ -384,7 +391,9 @@ export class HooksManager {
result.transformedData.request.json
);
}
delete result.transformedData;
if (!span.includeHookTransformedData) {
delete result.transformedData;
}
checkResults.push(result);
}
} else {
Expand Down Expand Up @@ -412,7 +421,9 @@ export class HooksManager {
checkResult.transformedData.request.json
);
}
delete checkResult.transformedData;
if (!span.includeHookTransformedData) {
delete checkResult.transformedData;
}
});
}
}
Expand Down
1 change: 1 addition & 0 deletions src/middlewares/requestValidator/schema/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ export const configSchema: any = z
before_request_hooks: z
.array(z.object({}).catchall(z.any())) // Allows any object structure
.optional(),
include_hook_transformed_data: z.boolean().optional(),
input_guardrails: z
.union([
z.array(z.string()),
Expand Down
2 changes: 2 additions & 0 deletions src/types/requestBody.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,8 @@ export interface Options {
beforeRequestHooks?: HookObject[];
defaultInputGuardrails?: HookObject[];
defaultOutputGuardrails?: HookObject[];
/** Include hook transformedData in hook_results for debugging/testing */
includeHookTransformedData?: boolean;
/** OpenAI specific */
openaiProject?: string;
openaiOrganization?: string;
Expand Down
6 changes: 4 additions & 2 deletions tests/unit/src/handlers/services/hooksService.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
} from '../../../../../src/middlewares/hooks/types';

// Mock the HooksManager and HookSpan
jest.mock('../../../middlewares/hooks');
jest.mock('../../../../../src/middlewares/hooks');

describe('HooksService', () => {
let mockRequestContext: RequestContext;
Expand Down Expand Up @@ -37,6 +37,7 @@ describe('HooksService', () => {
afterRequestHooks: [],
endpoint: 'chatComplete',
requestHeaders: {},
providerOption: {},
hooksManager: mockHooksManager,
} as unknown as RequestContext;

Expand All @@ -54,7 +55,8 @@ describe('HooksService', () => {
mockRequestContext.afterRequestHooks,
null,
mockRequestContext.endpoint,
mockRequestContext.requestHeaders
mockRequestContext.requestHeaders,
false
);
});
});
Expand Down
92 changes: 92 additions & 0 deletions tests/unit/src/middlewares/hooks/index.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
import { HOOKS_EVENT_TYPE_PRESETS } from '../../../../../src/middlewares/hooks/globals';
import { HooksManager } from '../../../../../src/middlewares/hooks';
import {
HookObject,
HookType,
} from '../../../../../src/middlewares/hooks/types';

jest.mock('../../../../../plugins', () => ({
plugins: {
test: {
transform: jest.fn(async () => ({
verdict: true,
data: null,
transformed: true,
transformedData: {
request: {
json: {
messages: [{ role: 'user', content: 'transformed message' }],
},
},
response: { json: null },
},
})),
},
},
}));

describe('HooksManager transformedData results', () => {
const createManagerWithTransformHook = (
includeHookTransformedData = false
) => {
const hooksManager = new HooksManager();
const hook: HookObject = {
id: 'test-hook',
type: HookType.MUTATOR,
checks: [{ id: 'test.transform', parameters: {} }],
} as HookObject;

const span = hooksManager.createSpan(
{ messages: [{ role: 'user', content: 'original message' }] },
{},
'openai',
false,
[hook],
[],
null,
'chatComplete',
{},
includeHookTransformedData
);

return { hooksManager, span };
};

it('omits transformedData from hook results by default', async () => {
const { hooksManager, span } = createManagerWithTransformHook();

await hooksManager.executeHooks(
span.id,
[HOOKS_EVENT_TYPE_PRESETS.SYNC_BEFORE_REQUEST_HOOK],
{ env: {} }
);

const checkResult =
span.getHooksResult().beforeRequestHooksResult[0].checks[0];

expect(checkResult.transformed).toBe(true);
expect(checkResult.transformedData).toBeUndefined();
});

it('includes transformedData in hook results when enabled', async () => {
const { hooksManager, span } = createManagerWithTransformHook(true);

await hooksManager.executeHooks(
span.id,
[HOOKS_EVENT_TYPE_PRESETS.SYNC_BEFORE_REQUEST_HOOK],
{ env: {} }
);

const checkResult =
span.getHooksResult().beforeRequestHooksResult[0].checks[0];

expect(checkResult.transformedData).toEqual({
request: {
json: {
messages: [{ role: 'user', content: 'transformed message' }],
},
},
response: { json: null },
});
});
});