@aigne/core 1.3.0 → 1.3.1

package/CHANGELOG.md

@@ -22,6 +22,13 @@
 * rename @aigne/core-next to @aigne/core ([3a81009](https://github.com/AIGNE-io/aigne-framework/commit/3a8100962c81813217b687ae28e8de604419c622))
 * use text resource from MCP correctly ([8b9eba8](https://github.com/AIGNE-io/aigne-framework/commit/8b9eba83352ec096a2a5d4f410d4c4bde7420bce))
 
+## [1.3.1](https://github.com/AIGNE-io/aigne-framework/compare/core-v1.3.0...core-v1.3.1) (2025-03-25)
+
+
+### Bug Fixes
+
+* **core:** use system message as user message for claude model if needed ([#32](https://github.com/AIGNE-io/aigne-framework/issues/32)) ([316a6d5](https://github.com/AIGNE-io/aigne-framework/commit/316a6d51f885cceee4020c24695f6588f6b7425f))
+
 ## [1.2.0](https://github.com/AIGNE-io/aigne-framework/compare/core-next-v1.1.0...core-next-v1.2.0) (2025-03-18)
 
 - chore: release v1.2.0

package/lib/cjs/models/claude-chat-model.js

@@ -5,6 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClaudeChatModel = void 0;
 const sdk_1 = __importDefault(require("@anthropic-ai/sdk"));
+const lodash_es_1 = require("lodash-es");
+const json_schema_js_1 = require("../utils/json-schema.js");
 const type_utils_js_1 = require("../utils/type-utils.js");
 const chat_model_js_1 = require("./chat-model.js");
 const CHAT_MODEL_CLAUDE_DEFAULT_MODEL = "claude-3-7-sonnet-latest";
@@ -75,7 +77,7 @@ class ClaudeChatModel extends chat_model_js_1.ChatModel {
             result.toolCalls = toolCalls
                 .map(({ args, ...c }) => ({
                 ...c,
-                function: { ...c.function, arguments: JSON.parse(args) },
+                function: { ...c.function, arguments: (0, json_schema_js_1.parseJSON)(args) },
             }))
                 .filter(type_utils_js_1.isNonNullable);
         }
@@ -132,7 +134,7 @@ function convertMessages({ messages, responseFormat }) {
         else if (msg.role === "user") {
             if (!msg.content)
                 throw new Error("User message must have content");
-            msgs.push({ role: "user", content: contentBlockParamFromContent(msg.content) });
+            msgs.push({ role: "user", content: convertContent(msg.content) });
         }
         else if (msg.role === "agent") {
             if (msg.toolCalls?.length) {
@@ -147,7 +149,7 @@ function convertMessages({ messages, responseFormat }) {
                 });
             }
             else if (msg.content) {
-                msgs.push({ role: "assistant", content: contentBlockParamFromContent(msg.content) });
+                msgs.push({ role: "assistant", content: convertContent(msg.content) });
             }
             else {
                 throw new Error("Agent message must have content or toolCalls");
@@ -157,9 +159,16 @@ function convertMessages({ messages, responseFormat }) {
     if (responseFormat?.type === "json_schema") {
         systemMessages.push(`You should provide a json response with schema: ${JSON.stringify(responseFormat.jsonSchema.schema)}`);
     }
-    return { messages: msgs, system: systemMessages.join("\n").trim() || undefined };
+    const system = systemMessages.join("\n").trim() || undefined;
+    // Claude requires at least one message, so we add a system message if there are no messages
+    if (msgs.length === 0) {
+        if (!system)
+            throw new Error("No messages provided");
+        return { messages: [{ role: "user", content: system }] };
+    }
+    return { messages: msgs, system };
 }
-function contentBlockParamFromContent(content) {
+function convertContent(content) {
     if (typeof content === "string")
         return content;
     if (Array.isArray(content)) {
@@ -191,7 +200,9 @@ function convertTools({ tools, toolChoice, }) {
             ? tools.map((i) => ({
                 name: i.function.name,
                 description: i.function.description,
-                input_schema: i.function.parameters,
+                input_schema: (0, lodash_es_1.isEmpty)(i.function.parameters)
+                    ? { type: "object" }
+                    : i.function.parameters,
             }))
             : undefined,
         tool_choice: choice,

package/lib/cjs/models/openai-chat-model.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAIChatModel = void 0;
 const nanoid_1 = require("nanoid");
 const openai_1 = __importDefault(require("openai"));
+const json_schema_js_1 = require("../utils/json-schema.js");
 const type_utils_js_1 = require("../utils/type-utils.js");
 const chat_model_js_1 = require("./chat-model.js");
 const CHAT_MODEL_OPENAI_DEFAULT_MODEL = "gpt-4o-mini";
@@ -69,7 +70,7 @@ class OpenAIChatModel extends chat_model_js_1.ChatModel {
         }
         const result = {};
         if (input.responseFormat?.type === "json_schema" && text) {
-            result.json = JSON.parse(text);
+            result.json = (0, json_schema_js_1.parseJSON)(text);
         }
         else {
             result.text = text;
@@ -77,7 +78,7 @@ class OpenAIChatModel extends chat_model_js_1.ChatModel {
         if (toolCalls.length) {
             result.toolCalls = toolCalls.map(({ args, ...c }) => ({
                 ...c,
-                function: { ...c.function, arguments: JSON.parse(args) },
+                function: { ...c.function, arguments: (0, json_schema_js_1.parseJSON)(args) },
             }));
         }
         return result;

package/lib/cjs/utils/json-schema.d.ts

@@ -1,3 +1,4 @@
 import type { ZodType } from "zod";
 import type { Message } from "../agents/agent.js";
 export declare function outputSchemaToResponseFormatSchema(agentOutput: ZodType<Message>): Record<string, unknown>;
+export declare function parseJSON(json: string): any;

package/lib/cjs/utils/json-schema.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.outputSchemaToResponseFormatSchema = outputSchemaToResponseFormatSchema;
+exports.parseJSON = parseJSON;
 const lodash_es_1 = require("lodash-es");
 const zod_to_json_schema_1 = require("zod-to-json-schema");
+const logger_js_1 = require("./logger.js");
 function outputSchemaToResponseFormatSchema(agentOutput) {
     return setAdditionPropertiesDeep((0, zod_to_json_schema_1.zodToJsonSchema)(agentOutput), false);
 }
@@ -21,3 +23,12 @@ function setAdditionPropertiesDeep(schema, additionalProperties) {
     }
     return schema;
 }
+function parseJSON(json) {
+    try {
+        return JSON.parse(json);
+    }
+    catch (error) {
+        logger_js_1.logger.debug("Failed to parse JSON", { json, error });
+        throw new Error(`Failed to parse JSON ${error.message}`);
+    }
+}

package/lib/dts/utils/json-schema.d.ts

@@ -1,3 +1,4 @@
 import type { ZodType } from "zod";
 import type { Message } from "../agents/agent.js";
 export declare function outputSchemaToResponseFormatSchema(agentOutput: ZodType<Message>): Record<string, unknown>;
+export declare function parseJSON(json: string): any;

package/lib/esm/models/claude-chat-model.js

@@ -1,4 +1,6 @@
 import Anthropic from "@anthropic-ai/sdk";
+import { isEmpty } from "lodash-es";
+import { parseJSON } from "../utils/json-schema.js";
 import { isNonNullable } from "../utils/type-utils.js";
 import { ChatModel, } from "./chat-model.js";
 const CHAT_MODEL_CLAUDE_DEFAULT_MODEL = "claude-3-7-sonnet-latest";
@@ -69,7 +71,7 @@ export class ClaudeChatModel extends ChatModel {
             result.toolCalls = toolCalls
                 .map(({ args, ...c }) => ({
                 ...c,
-                function: { ...c.function, arguments: JSON.parse(args) },
+                function: { ...c.function, arguments: parseJSON(args) },
             }))
                 .filter(isNonNullable);
         }
@@ -125,7 +127,7 @@ function convertMessages({ messages, responseFormat }) {
         else if (msg.role === "user") {
             if (!msg.content)
                 throw new Error("User message must have content");
-            msgs.push({ role: "user", content: contentBlockParamFromContent(msg.content) });
+            msgs.push({ role: "user", content: convertContent(msg.content) });
         }
         else if (msg.role === "agent") {
             if (msg.toolCalls?.length) {
@@ -140,7 +142,7 @@ function convertMessages({ messages, responseFormat }) {
                 });
             }
             else if (msg.content) {
-                msgs.push({ role: "assistant", content: contentBlockParamFromContent(msg.content) });
+                msgs.push({ role: "assistant", content: convertContent(msg.content) });
             }
             else {
                 throw new Error("Agent message must have content or toolCalls");
@@ -150,9 +152,16 @@ function convertMessages({ messages, responseFormat }) {
     if (responseFormat?.type === "json_schema") {
         systemMessages.push(`You should provide a json response with schema: ${JSON.stringify(responseFormat.jsonSchema.schema)}`);
     }
-    return { messages: msgs, system: systemMessages.join("\n").trim() || undefined };
+    const system = systemMessages.join("\n").trim() || undefined;
+    // Claude requires at least one message, so we add a system message if there are no messages
+    if (msgs.length === 0) {
+        if (!system)
+            throw new Error("No messages provided");
+        return { messages: [{ role: "user", content: system }] };
+    }
+    return { messages: msgs, system };
 }
-function contentBlockParamFromContent(content) {
+function convertContent(content) {
     if (typeof content === "string")
         return content;
     if (Array.isArray(content)) {
@@ -184,7 +193,9 @@ function convertTools({ tools, toolChoice, }) {
             ? tools.map((i) => ({
                 name: i.function.name,
                 description: i.function.description,
-                input_schema: i.function.parameters,
+                input_schema: isEmpty(i.function.parameters)
+                    ? { type: "object" }
+                    : i.function.parameters,
             }))
             : undefined,
         tool_choice: choice,

package/lib/esm/models/openai-chat-model.js

@@ -1,5 +1,6 @@
 import { nanoid } from "nanoid";
 import OpenAI from "openai";
+import { parseJSON } from "../utils/json-schema.js";
 import { isNonNullable } from "../utils/type-utils.js";
 import { ChatModel, } from "./chat-model.js";
 const CHAT_MODEL_OPENAI_DEFAULT_MODEL = "gpt-4o-mini";
@@ -63,7 +64,7 @@ export class OpenAIChatModel extends ChatModel {
         }
         const result = {};
         if (input.responseFormat?.type === "json_schema" && text) {
-            result.json = JSON.parse(text);
+            result.json = parseJSON(text);
         }
         else {
             result.text = text;
@@ -71,7 +72,7 @@ export class OpenAIChatModel extends ChatModel {
         if (toolCalls.length) {
             result.toolCalls = toolCalls.map(({ args, ...c }) => ({
                 ...c,
-                function: { ...c.function, arguments: JSON.parse(args) },
+                function: { ...c.function, arguments: parseJSON(args) },
             }));
         }
         return result;

package/lib/esm/utils/json-schema.d.ts

@@ -1,3 +1,4 @@
 import type { ZodType } from "zod";
 import type { Message } from "../agents/agent.js";
 export declare function outputSchemaToResponseFormatSchema(agentOutput: ZodType<Message>): Record<string, unknown>;
+export declare function parseJSON(json: string): any;

package/lib/esm/utils/json-schema.js

@@ -1,5 +1,6 @@
 import { isObject } from "lodash-es";
 import { zodToJsonSchema } from "zod-to-json-schema";
+import { logger } from "./logger.js";
 export function outputSchemaToResponseFormatSchema(agentOutput) {
     return setAdditionPropertiesDeep(zodToJsonSchema(agentOutput), false);
 }
@@ -18,3 +19,12 @@ function setAdditionPropertiesDeep(schema, additionalProperties) {
     }
     return schema;
 }
+export function parseJSON(json) {
+    try {
+        return JSON.parse(json);
+    }
+    catch (error) {
+        logger.debug("Failed to parse JSON", { json, error });
+        throw new Error(`Failed to parse JSON ${error.message}`);
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aigne/core",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "AIGNE core library for building AI-powered applications",
   "publishConfig": {
     "access": "public"