@aigne/core 1.59.0 → 1.60.0

package/lib/esm/loader/index.d.ts

@@ -9,7 +9,7 @@ export interface LoadOptions {
     memories?: {
         new (parameters?: MemoryAgentOptions): MemoryAgent;
     }[];
-    model?: ChatModel | ((model?: z.infer<typeof aigneFileSchema>["chatModel"]) => PromiseOrValue<ChatModel | undefined>);
+    model?: ChatModel | ((model?: z.infer<typeof aigneFileSchema>["model"]) => PromiseOrValue<ChatModel | undefined>);
     imageModel?: ImageModel | ((model?: z.infer<typeof aigneFileSchema>["imageModel"]) => PromiseOrValue<ImageModel | undefined>);
     key?: string | number;
 }
@@ -18,38 +18,22 @@ export declare function loadAgent(path: string, options?: LoadOptions, agentOpti
 declare const aigneFileSchema: z.ZodObject<{
     name: z.ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
     description: z.ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
-    chatModel: z.ZodEffects<z.ZodEffects<z.ZodType<string | {
+    model: z.ZodType<{
         model?: string | undefined;
         temperature?: number | undefined;
         topP?: number | undefined;
         frequencyPenalty?: number | undefined;
         presencePenalty?: number | undefined;
-    } | undefined, z.ZodTypeDef, string | {
-        model?: string | undefined;
-        temperature?: number | undefined;
-        topP?: number | undefined;
-        frequencyPenalty?: number | undefined;
-        presencePenalty?: number | undefined;
-    } | undefined>, string | {
-        model?: string | undefined;
-        temperature?: number | undefined;
-        topP?: number | undefined;
-        frequencyPenalty?: number | undefined;
-        presencePenalty?: number | undefined;
-    } | undefined, unknown>, {
+    } | undefined, z.ZodTypeDef, {
         model?: string | undefined;
         temperature?: number | undefined;
         topP?: number | undefined;
         frequencyPenalty?: number | undefined;
         presencePenalty?: number | undefined;
-    } | undefined, unknown>;
-    imageModel: z.ZodEffects<z.ZodType<string | {
-        model?: string | undefined;
-    } | undefined, z.ZodTypeDef, string | {
-        model?: string | undefined;
-    } | undefined>, {
+    } | undefined>;
+    imageModel: z.ZodType<{
         model?: string | undefined;
-    } | undefined, string | {
+    } | undefined, z.ZodTypeDef, {
         model?: string | undefined;
     } | undefined>;
     agents: z.ZodType<string[] | undefined, z.ZodTypeDef, string[] | undefined>;
@@ -67,20 +51,20 @@ declare const aigneFileSchema: z.ZodObject<{
         chat?: string | undefined;
     } | undefined>;
 }, "strip", z.ZodTypeAny, {
-    name?: string | undefined;
-    description?: string | undefined;
-    skills?: string[] | undefined;
-    imageModel?: {
-        model?: string | undefined;
-    } | undefined;
-    agents?: string[] | undefined;
-    chatModel?: {
+    model?: {
         model?: string | undefined;
         temperature?: number | undefined;
         topP?: number | undefined;
         frequencyPenalty?: number | undefined;
         presencePenalty?: number | undefined;
     } | undefined;
+    name?: string | undefined;
+    description?: string | undefined;
+    imageModel?: {
+        model?: string | undefined;
+    } | undefined;
+    skills?: string[] | undefined;
+    agents?: string[] | undefined;
     mcpServer?: {
         agents?: string[] | undefined;
     } | undefined;
@@ -89,14 +73,20 @@ declare const aigneFileSchema: z.ZodObject<{
         chat?: string | undefined;
     } | undefined;
 }, {
+    model?: {
+        model?: string | undefined;
+        temperature?: number | undefined;
+        topP?: number | undefined;
+        frequencyPenalty?: number | undefined;
+        presencePenalty?: number | undefined;
+    } | undefined;
     name?: string | undefined;
     description?: string | undefined;
-    skills?: string[] | undefined;
-    imageModel?: string | {
+    imageModel?: {
         model?: string | undefined;
     } | undefined;
+    skills?: string[] | undefined;
     agents?: string[] | undefined;
-    chatModel?: unknown;
     mcpServer?: {
         agents?: string[] | undefined;
     } | undefined;

package/lib/esm/loader/index.js

@@ -8,10 +8,10 @@ import { MCPAgent } from "../agents/mcp-agent.js";
 import { TeamAgent } from "../agents/team-agent.js";
 import { TransformAgent } from "../agents/transform-agent.js";
 import { PromptBuilder } from "../prompt/prompt-builder.js";
-import { flat, isNonNullable, isRecord, tryOrThrow, } from "../utils/type-utils.js";
+import { flat, isNonNullable, tryOrThrow } from "../utils/type-utils.js";
 import { loadAgentFromJsFile } from "./agent-js.js";
 import { loadAgentFromYamlFile } from "./agent-yaml.js";
-import { camelizeSchema, optionalize } from "./schema.js";
+import { camelizeSchema, chatModelSchema, imageModelSchema, optionalize } from "./schema.js";
 const AIGNE_FILE_NAME = ["aigne.yaml", "aigne.yml"];
 export async function load(path, options = {}) {
     options.key ??= Date.now();
@@ -22,7 +22,7 @@ export async function load(path, options = {}) {
     return {
         ...aigne,
         rootDir,
-        model: typeof options.model === "function" ? await options.model(aigne.chatModel) : options.model,
+        model: typeof options.model === "function" ? await options.model(aigne.model) : options.model,
         imageModel: typeof options.imageModel === "function"
             ? await options.imageModel(aigne.imageModel)
             : options.imageModel,
@@ -87,9 +87,17 @@ async function parseAgent(path, agent, options, agentOptions) {
     const memory = "memory" in agent && options?.memories?.length
         ? await loadMemory(options.memories, typeof agent.memory === "object" ? agent.memory.provider : undefined, typeof agent.memory === "object" ? agent.memory : {})
         : undefined;
+    const model = agent.model && typeof options?.model === "function"
+        ? await options.model(agent.model)
+        : undefined;
+    const imageModel = agent.imageModel && typeof options?.imageModel === "function"
+        ? await options.imageModel(agent.imageModel)
+        : undefined;
     const baseOptions = {
         ...agentOptions,
         ...agent,
+        model,
+        imageModel,
         skills,
         memory,
         hooks: [
@@ -170,28 +178,8 @@ async function loadMemory(memories, provider, options) {
 const aigneFileSchema = camelizeSchema(z.object({
     name: optionalize(z.string()),
     description: optionalize(z.string()),
-    chatModel: z
-        .preprocess((v) => {
-        if (!isRecord(v))
-            return v;
-        return { ...v, model: v.model || `${v.provider || ""}:${v.name || ""}` };
-    }, optionalize(z.union([
-        z.string(),
-        camelizeSchema(z.object({
-            model: optionalize(z.string()),
-            temperature: optionalize(z.number().min(0).max(2)),
-            topP: optionalize(z.number().min(0)),
-            frequencyPenalty: optionalize(z.number().min(-2).max(2)),
-            presencePenalty: optionalize(z.number().min(-2).max(2)),
-        })),
-    ])))
-        .transform((v) => (typeof v === "string" ? { model: v } : v)),
-    imageModel: optionalize(z.union([
-        z.string(),
-        camelizeSchema(z.object({
-            model: optionalize(z.string()),
-        })),
-    ])).transform((v) => (typeof v === "string" ? { model: v } : v)),
+    model: optionalize(chatModelSchema),
+    imageModel: optionalize(imageModelSchema),
     agents: optionalize(z.array(z.string())),
     skills: optionalize(z.array(z.string())),
     mcpServer: optionalize(z.object({
@@ -206,7 +194,7 @@ export async function loadAIGNEFile(path) {
     const file = await findAIGNEFile(path);
     const raw = await tryOrThrow(() => nodejs.fs.readFile(file, "utf8"), (error) => new Error(`Failed to load aigne.yaml from ${file}: ${error.message}`));
     const json = tryOrThrow(() => parse(raw), (error) => new Error(`Failed to parse aigne.yaml from ${file}: ${error.message}`));
-    const aigne = tryOrThrow(() => aigneFileSchema.parse(json), (error) => new Error(`Failed to validate aigne.yaml from ${file}: ${error.message}`));
+    const aigne = tryOrThrow(() => aigneFileSchema.parse({ ...json, model: json.model || json.chatModel || json.chat_model }), (error) => new Error(`Failed to validate aigne.yaml from ${file}: ${error.message}`));
     return { aigne, rootDir: nodejs.path.dirname(file) };
 }
 async function findAIGNEFile(path) {

package/lib/esm/loader/schema.d.ts

@@ -29,7 +29,36 @@ export declare const defaultInputSchema: z.ZodRecord<z.ZodString, z.ZodUnion<[z.
 }, {
     $get: string;
 }>, z.ZodUnknown]>>;
+declare const chatModelObjectSchema: z.ZodObject<{
+    model: ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
+    temperature: ZodType<number | undefined, z.ZodTypeDef, number | undefined>;
+    topP: ZodType<number | undefined, z.ZodTypeDef, number | undefined>;
+    frequencyPenalty: ZodType<number | undefined, z.ZodTypeDef, number | undefined>;
+    presencePenalty: ZodType<number | undefined, z.ZodTypeDef, number | undefined>;
+}, "strip", z.ZodTypeAny, {
+    model?: string | undefined;
+    temperature?: number | undefined;
+    topP?: number | undefined;
+    frequencyPenalty?: number | undefined;
+    presencePenalty?: number | undefined;
+}, {
+    model?: string | undefined;
+    temperature?: number | undefined;
+    topP?: number | undefined;
+    frequencyPenalty?: number | undefined;
+    presencePenalty?: number | undefined;
+}>;
+export declare const chatModelSchema: typeof chatModelObjectSchema;
+declare const imageModelObjectSchema: z.ZodObject<{
+    model: ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
+}, "strip", z.ZodTypeAny, {
+    model?: string | undefined;
+}, {
+    model?: string | undefined;
+}>;
+export declare const imageModelSchema: typeof imageModelObjectSchema;
 export declare function optionalize<T>(schema: ZodType<T>): ZodType<T | undefined>;
 export declare function camelizeSchema<T extends ZodType>(schema: T, { shallow }?: {
     shallow?: boolean;
 }): T;
+export {};

package/lib/esm/loader/schema.js

@@ -54,6 +54,26 @@ export const defaultInputSchema = z.record(z.string(), z.union([
     }),
     z.unknown(),
 ]));
+const chatModelObjectSchema = camelizeSchema(z.object({
+    model: optionalize(z.string()),
+    temperature: optionalize(z.number().min(0).max(2)),
+    topP: optionalize(z.number().min(0)),
+    frequencyPenalty: optionalize(z.number().min(-2).max(2)),
+    presencePenalty: optionalize(z.number().min(-2).max(2)),
+}));
+export const chatModelSchema = z
+    .preprocess((v) => {
+    if (!isRecord(v))
+        return v;
+    return { ...v, model: v.model || `${v.provider || ""}:${v.name || ""}` };
+}, z.union([z.string(), chatModelObjectSchema]))
+    .transform((v) => typeof v === "string" ? { model: v } : v);
+const imageModelObjectSchema = camelizeSchema(z.object({
+    model: optionalize(z.string()),
+}));
+export const imageModelSchema = z
+    .union([z.string(), imageModelObjectSchema])
+    .transform((v) => typeof v === "string" ? { model: v } : v);
 export function optionalize(schema) {
     return schema.nullish().transform((v) => v ?? undefined);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aigne/core",
-  "version": "1.59.0",
+  "version": "1.60.0",
   "description": "The functional core of agentic AI",
   "publishConfig": {
     "access": "public"
@@ -92,7 +92,7 @@
     "yaml": "^2.8.0",
     "zod": "^3.25.67",
     "zod-to-json-schema": "^3.24.6",
-    "@aigne/observability-api": "^0.10.2",
+    "@aigne/observability-api": "^0.10.3",
     "@aigne/platform-helpers": "^0.6.2"
   },
   "devDependencies": {