mirror of
https://github.com/getcompanion-ai/co-mono.git
synced 2026-04-17 02:04:05 +00:00
Replace Zod with TypeBox for schema validation
- Switch from Zod to TypeBox for tool parameter schemas - TypeBox schemas can be serialized/deserialized as JSON - Use AJV for runtime validation instead of Zod's parse - Add StringEnum helper for Google API compatibility (avoids anyOf/const patterns) - Export Type and Static from main package for convenience - Update all tests and documentation to reflect TypeBox usage
This commit is contained in:
parent
f5ac1ef521
commit
e8370436d7
16 changed files with 196 additions and 121 deletions
17
packages/ai/test/enum-test.ts
Normal file
17
packages/ai/test/enum-test.ts
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
import { Type } from "@sinclair/typebox";
|
||||
import { z } from "zod";
|
||||
import { zodToJsonSchema } from "zod-to-json-schema";
|
||||
import { StringEnum } from "../src/typebox-helpers.js";
|
||||
|
||||
// Zod version
|
||||
const zodSchema = z.object({
|
||||
operation: z.enum(["add", "subtract", "multiply", "divide"]),
|
||||
});
|
||||
|
||||
// TypeBox with our StringEnum helper
|
||||
const typeboxHelper = Type.Object({
|
||||
operation: StringEnum(["add", "subtract", "multiply", "divide"]),
|
||||
});
|
||||
|
||||
console.log("Zod:", JSON.stringify(zodToJsonSchema(zodSchema), null, 2));
|
||||
console.log("\nTypeBox.StringEnum:", JSON.stringify(typeboxHelper, null, 2));
|
||||
|
|
@ -1,27 +1,32 @@
|
|||
import { Type } from "@sinclair/typebox";
|
||||
import { type ChildProcess, execSync, spawn } from "child_process";
|
||||
import { readFileSync } from "fs";
|
||||
import { dirname, join } from "path";
|
||||
import { fileURLToPath } from "url";
|
||||
import { afterAll, beforeAll, describe, expect, it } from "vitest";
|
||||
import { z } from "zod";
|
||||
import { getModel } from "../src/models.js";
|
||||
import { complete, stream } from "../src/stream.js";
|
||||
import { StringEnum } from "../src/typebox-helpers.js";
|
||||
import type { Api, Context, ImageContent, Model, OptionsForApi, Tool, ToolResultMessage } from "../src/types.js";
|
||||
|
||||
const __filename = fileURLToPath(import.meta.url);
|
||||
const __dirname = dirname(__filename);
|
||||
|
||||
// Calculator tool definition (same as examples)
|
||||
const calculatorTool: Tool = {
|
||||
// Note: Using StringEnum helper because Google's API doesn't support anyOf/const patterns
|
||||
// that Type.Enum generates. Google requires { type: "string", enum: [...] } format.
|
||||
const calculatorSchema = Type.Object({
|
||||
a: Type.Number({ description: "First number" }),
|
||||
b: Type.Number({ description: "Second number" }),
|
||||
operation: StringEnum(["add", "subtract", "multiply", "divide"], {
|
||||
description: "The operation to perform. One of 'add', 'subtract', 'multiply', 'divide'.",
|
||||
}),
|
||||
});
|
||||
|
||||
const calculatorTool: Tool<typeof calculatorSchema> = {
|
||||
name: "calculator",
|
||||
description: "Perform basic arithmetic operations",
|
||||
parameters: z.object({
|
||||
a: z.number().describe("First number"),
|
||||
b: z.number().describe("Second number"),
|
||||
operation: z
|
||||
.enum(["add", "subtract", "multiply", "divide"])
|
||||
.describe("The operation to perform. One of 'add', 'subtract', 'multiply', 'divide'."),
|
||||
}),
|
||||
parameters: calculatorSchema,
|
||||
};
|
||||
|
||||
async function basicTextGeneration<TApi extends Api>(model: Model<TApi>, options?: OptionsForApi<TApi>) {
|
||||
|
|
|
|||
|
|
@ -1,16 +1,18 @@
|
|||
import { Type } from "@sinclair/typebox";
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { z } from "zod";
|
||||
import { getModel } from "../src/models.js";
|
||||
import { complete } from "../src/stream.js";
|
||||
import type { Api, AssistantMessage, Context, Message, Model, Tool, ToolResultMessage } from "../src/types.js";
|
||||
|
||||
// Tool for testing
|
||||
const weatherTool: Tool = {
|
||||
const weatherSchema = Type.Object({
|
||||
location: Type.String({ description: "City name" }),
|
||||
});
|
||||
|
||||
const weatherTool: Tool<typeof weatherSchema> = {
|
||||
name: "get_weather",
|
||||
description: "Get the weather for a location",
|
||||
parameters: z.object({
|
||||
location: z.string().describe("City name"),
|
||||
}),
|
||||
parameters: weatherSchema,
|
||||
};
|
||||
|
||||
// Pre-built contexts representing typical outputs from each provider
|
||||
|
|
|
|||
|
|
@ -1,16 +1,20 @@
|
|||
import { type Static, Type } from "@sinclair/typebox";
|
||||
import Ajv from "ajv";
|
||||
import addFormats from "ajv-formats";
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { z } from "zod";
|
||||
import type { AgentTool } from "../src/agent/types.js";
|
||||
|
||||
describe("Tool Validation with Zod", () => {
|
||||
// Define a test tool with Zod schema
|
||||
const testSchema = z.object({
|
||||
name: z.string().min(1, "Name is required"),
|
||||
age: z.number().int().min(0).max(150),
|
||||
email: z.string().email("Invalid email format"),
|
||||
tags: z.array(z.string()).optional(),
|
||||
describe("Tool Validation with TypeBox and AJV", () => {
|
||||
// Define a test tool with TypeBox schema
|
||||
const testSchema = Type.Object({
|
||||
name: Type.String({ minLength: 1 }),
|
||||
age: Type.Integer({ minimum: 0, maximum: 150 }),
|
||||
email: Type.String({ format: "email" }),
|
||||
tags: Type.Optional(Type.Array(Type.String())),
|
||||
});
|
||||
|
||||
type TestParams = Static<typeof testSchema>;
|
||||
|
||||
const testTool: AgentTool<typeof testSchema, void> = {
|
||||
label: "Test Tool",
|
||||
name: "test_tool",
|
||||
|
|
@ -24,6 +28,10 @@ describe("Tool Validation with Zod", () => {
|
|||
},
|
||||
};
|
||||
|
||||
// Create AJV instance for validation
|
||||
const ajv = new Ajv({ allErrors: true });
|
||||
addFormats(ajv);
|
||||
|
||||
it("should validate correct input", () => {
|
||||
const validInput = {
|
||||
name: "John Doe",
|
||||
|
|
@ -32,9 +40,10 @@ describe("Tool Validation with Zod", () => {
|
|||
tags: ["developer", "typescript"],
|
||||
};
|
||||
|
||||
// This should not throw
|
||||
const result = testTool.parameters.parse(validInput);
|
||||
expect(result).toEqual(validInput);
|
||||
// Validate with AJV
|
||||
const validate = ajv.compile(testTool.parameters);
|
||||
const isValid = validate(validInput);
|
||||
expect(isValid).toBe(true);
|
||||
});
|
||||
|
||||
it("should reject invalid email", () => {
|
||||
|
|
@ -44,7 +53,10 @@ describe("Tool Validation with Zod", () => {
|
|||
email: "not-an-email",
|
||||
};
|
||||
|
||||
expect(() => testTool.parameters.parse(invalidInput)).toThrowError(z.ZodError);
|
||||
const validate = ajv.compile(testTool.parameters);
|
||||
const isValid = validate(invalidInput);
|
||||
expect(isValid).toBe(false);
|
||||
expect(validate.errors).toBeDefined();
|
||||
});
|
||||
|
||||
it("should reject missing required fields", () => {
|
||||
|
|
@ -53,7 +65,10 @@ describe("Tool Validation with Zod", () => {
|
|||
email: "john@example.com",
|
||||
};
|
||||
|
||||
expect(() => testTool.parameters.parse(invalidInput)).toThrowError(z.ZodError);
|
||||
const validate = ajv.compile(testTool.parameters);
|
||||
const isValid = validate(invalidInput);
|
||||
expect(isValid).toBe(false);
|
||||
expect(validate.errors).toBeDefined();
|
||||
});
|
||||
|
||||
it("should reject invalid age", () => {
|
||||
|
|
@ -63,7 +78,10 @@ describe("Tool Validation with Zod", () => {
|
|||
email: "john@example.com",
|
||||
};
|
||||
|
||||
expect(() => testTool.parameters.parse(invalidInput)).toThrowError(z.ZodError);
|
||||
const validate = ajv.compile(testTool.parameters);
|
||||
const isValid = validate(invalidInput);
|
||||
expect(isValid).toBe(false);
|
||||
expect(validate.errors).toBeDefined();
|
||||
});
|
||||
|
||||
it("should format validation errors nicely", () => {
|
||||
|
|
@ -73,25 +91,23 @@ describe("Tool Validation with Zod", () => {
|
|||
email: "invalid",
|
||||
};
|
||||
|
||||
try {
|
||||
testTool.parameters.parse(invalidInput);
|
||||
// Should not reach here
|
||||
expect(true).toBe(false);
|
||||
} catch (e) {
|
||||
if (e instanceof z.ZodError) {
|
||||
const errors = e.issues
|
||||
.map((err) => {
|
||||
const path = err.path.length > 0 ? err.path.join(".") : "root";
|
||||
return ` - ${path}: ${err.message}`;
|
||||
})
|
||||
.join("\n");
|
||||
const validate = ajv.compile(testTool.parameters);
|
||||
const isValid = validate(invalidInput);
|
||||
expect(isValid).toBe(false);
|
||||
expect(validate.errors).toBeDefined();
|
||||
|
||||
expect(errors).toContain("name: Name is required");
|
||||
expect(errors).toContain("age: Number must be less than or equal to 150");
|
||||
expect(errors).toContain("email: Invalid email format");
|
||||
} else {
|
||||
throw e;
|
||||
}
|
||||
if (validate.errors) {
|
||||
const errors = validate.errors
|
||||
.map((err) => {
|
||||
const path = err.instancePath ? err.instancePath.substring(1) : err.params.missingProperty || "root";
|
||||
return ` - ${path}: ${err.message}`;
|
||||
})
|
||||
.join("\n");
|
||||
|
||||
// AJV error messages are different from Zod
|
||||
expect(errors).toContain("name: must NOT have fewer than 1 characters");
|
||||
expect(errors).toContain("age: must be <= 150");
|
||||
expect(errors).toContain('email: must match format "email"');
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -103,8 +119,11 @@ describe("Tool Validation with Zod", () => {
|
|||
};
|
||||
|
||||
// Validate and execute
|
||||
const validated = testTool.parameters.parse(validInput);
|
||||
const result = await testTool.execute("test-id", validated);
|
||||
const validate = ajv.compile(testTool.parameters);
|
||||
const isValid = validate(validInput);
|
||||
expect(isValid).toBe(true);
|
||||
|
||||
const result = await testTool.execute("test-id", validInput as TestParams);
|
||||
|
||||
expect(result.output).toBe("Processed: John Doe, 30, john@example.com");
|
||||
expect(result.details).toBeUndefined();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue