@jeliq/app-sdk-llm 1.2.2 → 1.2.3

package/lib/commonjs/controllers/genStructuredOutputs.js

@@ -5,8 +5,65 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = genStructuredOutputs;
 var _ai = require("ai");
+var _zodToJsonSchema = require("zod-to-json-schema");
 var _ShouldMustTemplate = _interopRequireDefault(require("../templates/ShouldMustTemplate"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const zodToJsonSchema = schema => (0, _zodToJsonSchema.zodToJsonSchema)(schema);
+const tryParseJson = text => {
+  try {
+    return {
+      value: JSON.parse(text),
+      raw: text
+    };
+  } catch {
+    return null;
+  }
+};
+const extractJsonCandidate = text => {
+  const objectStart = text.indexOf("{");
+  const objectEnd = text.lastIndexOf("}");
+  if (objectStart !== -1 && objectEnd !== -1 && objectEnd > objectStart) {
+    return text.slice(objectStart, objectEnd + 1);
+  }
+  const arrayStart = text.indexOf("[");
+  const arrayEnd = text.lastIndexOf("]");
+  if (arrayStart !== -1 && arrayEnd !== -1 && arrayEnd > arrayStart) {
+    return text.slice(arrayStart, arrayEnd + 1);
+  }
+  return null;
+};
+const parseJsonFromText = text => {
+  var _tryParseJson;
+  const lines = text.replace(/\r\n/g, "\n").replace(/\r/g, "\n").split("\n");
+
+  // 1) 最初の ```json 行を探す（行頭にあることを要求）
+  let startLine = -1;
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    // 例: ```json, ```JSON, ```json   , ```json something
+    if (/^\s*```json\b/i.test(line)) {
+      startLine = i;
+      break;
+    }
+  }
+  if (startLine === -1) throw new Error("Failed to parse JSON from model output.");
+
+  // 2) 最後の 行頭 ``` 行を探す（最後に出てくるやつ）
+  let endLine = -1;
+  for (let i = lines.length - 1; i > startLine; i--) {
+    if (/^\s*```/.test(lines[i])) {
+      endLine = i;
+      break;
+    }
+  }
+  if (endLine === -1) throw new Error("Failed to parse JSON from model output.");
+  const blockLines = lines.slice(startLine, endLine + 1);
+  const innerLines = lines.slice(startLine + 1, endLine);
+  return {
+    value: ((_tryParseJson = tryParseJson(innerLines.join("\n"))) === null || _tryParseJson === void 0 ? void 0 : _tryParseJson.value) ?? null,
+    raw: blockLines.join("\n")
+  };
+};
 async function genStructuredOutputs(context, taskName, template, args, options) {
   if (!context) {
     throw new Error("context is not set");
@@ -14,33 +71,99 @@ async function genStructuredOutputs(context, taskName, template, args, options)
   if (!(context !== null && context !== void 0 && context.getLLM)) {
     throw new Error("getLLM is not set");
   }
-  const promptTemplate = await (0, _ShouldMustTemplate.default)(Object.keys(template.inputDef).map(key => ({
+  const inputDefs = Object.keys(template.inputDef).map(key => ({
     name: key,
     type: template.inputDef[key].type,
     description: template.inputDef[key].description
-  })), template.summary, template.shouldSection, template.mustSection, template.example, template.partialVars);
+  }));
   const promptArgs = Object.entries(args).reduce((acc, [key, value]) => {
     acc[key] = value ?? "";
     return acc;
   }, {});
-  const messages = await promptTemplate.formatMessages(promptArgs);
-  const model = context.getLLM(taskName, undefined, {
+  let outputSchemaJson = "";
+  try {
+    outputSchemaJson = JSON.stringify(zodToJsonSchema(template.outputSchema));
+  } catch (e) {
+    throw new Error(`Failed to convert output schema to JSON Schema: ${e instanceof Error ? e.message : String(e)}`);
+  }
+
+  // Add outputFormat input definition
+  template.mustSection = template.mustSection || [];
+  template.mustSection.push({
+    no: template.mustSection.length + 1,
+    title: "outputFormat",
+    content: `You must format your output as a JSON value that adheres to a given "JSON Schema" instance with a markdown code block.
+
+For example, the output format is:
+\`\`\`json
+{"properties": {"foo": {"description": "a list of test words", "type": "array", "items": {"type": "string"}}}, "required": ["foo"]}
+\`\`\`
+
+Then, you must return the following:
+----- Begin of Output Example -----
+\`\`\`json
+{
+    "foo": ["bar", "baz"]
+}
+\`\`\`
+----- End of Output Example -----
+
+Do NOT ouput anything other than the JSON value with markdown code block. 
+Your output will be parsed and type-checked according to the provided schema instance, so make sure all fields in your output match the schema exactly and there are no trailing commas!
+
+
+Here is the JSON Schema instance your output must adhere to. Include the enclosing markdown codeblock:
+
+\`\`\`json
+${outputSchemaJson}
+\`\`\``
+  });
+  const promptTemplate = await (0, _ShouldMustTemplate.default)(inputDefs, template.summary, template.shouldSection, template.mustSection, template.example, template.partialVars);
+  const model = context.getLLM(taskName, {
     model: options === null || options === void 0 ? void 0 : options.model,
     temperature: options === null || options === void 0 ? void 0 : options.temperature,
     reasoningEffort: options === null || options === void 0 ? void 0 : options.reasoningEffort,
+    verbosityLevel: options === null || options === void 0 ? void 0 : options.verbosityLevel,
     timeout: options === null || options === void 0 ? void 0 : options.timeout
   });
-  const {
-    output
-  } = await (0, _ai.generateText)({
-    model,
-    messages,
-    temperature: options === null || options === void 0 ? void 0 : options.temperature,
-    maxRetries: options === null || options === void 0 ? void 0 : options.maxRetries,
-    output: _ai.Output.object({
-      schema: template.outputSchema
-    })
-  });
-  return output;
+  const maxParseRetries = (options === null || options === void 0 ? void 0 : options.maxRetries) ?? 3;
+  const buildCorrectionPrompt = errorMessage => ["The previous output could not be parsed or validated.", `Error: ${errorMessage}`, "Please return only a JSON value wrapped in a markdown ```json code block that matches the schema.", "Do not include any other text."].join("\n");
+  let lastErrorMessage = null;
+  for (let attempt = 0; attempt <= maxParseRetries; attempt++) {
+    const messages = await promptTemplate.formatMessages(promptArgs);
+    const {
+      text
+    } = await (0, _ai.generateText)({
+      model,
+      messages,
+      maxRetries: options !== null && options !== void 0 && options.maxRetries ? Math.max(0, options.maxRetries - attempt) : undefined
+    });
+    let parsed = null;
+    try {
+      parsed = parseJsonFromText(text);
+    } catch (error) {
+      lastErrorMessage = error instanceof Error ? error.message : String(error);
+    }
+    if (!lastErrorMessage && parsed) {
+      const parsedResult = template.outputSchema.safeParse(parsed.value);
+      if (parsedResult.success) {
+        return parsedResult.data;
+      }
+      lastErrorMessage = parsedResult.error.message;
+    }
+    if (attempt >= maxParseRetries) {
+      break;
+    }
+    messages.push({
+      role: "assistant",
+      content: text
+    });
+    messages.push({
+      role: "user",
+      content: buildCorrectionPrompt(lastErrorMessage ?? "Unknown error")
+    });
+    lastErrorMessage = null;
+  }
+  throw new Error(`Structured output validation failed after ${maxParseRetries + 1} attempts: ${lastErrorMessage ?? "Unknown error"}`);
 }
 //# sourceMappingURL=genStructuredOutputs.js.map

package/lib/commonjs/controllers/genStructuredOutputs.js.map

@@ -1 +1 @@
-{"version":3,"names":["_ai","require","_ShouldMustTemplate","_interopRequireDefault","e","__esModule","default","genStructuredOutputs","context","taskName","template","args","options","Error","getLLM","promptTemplate","createShouldMustTemplateAI","Object","keys","inputDef","map","key","name","type","description","summary","shouldSection","mustSection","example","partialVars","promptArgs","entries","reduce","acc","value","messages","formatMessages","model","undefined","temperature","reasoningEffort","timeout","output","generateText","maxRetries","AIOutput","object","schema","outputSchema"],"sourceRoot":"../../../src","sources":["controllers/genStructuredOutputs.ts"],"mappings":";;;;;;AACA,IAAAA,GAAA,GAAAC,OAAA;AAEA,IAAAC,mBAAA,GAAAC,sBAAA,CAAAF,OAAA;AAAyE,SAAAE,uBAAAC,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAsB1D,eAAeG,oBAAoBA,CAI9CC,OAA4B,EAC5BC,QAAgB,EAChBC,QAA+C,EAC/CC,IAAkD,EAClDC,OAAqC,EACtB;EACf,IAAI,CAACJ,OAAO,EAAE;IACV,MAAM,IAAIK,KAAK,CAAC,oBAAoB,CAAC;EACzC;EAEA,IAAI,EAACL,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAEM,MAAM,GAAE;IAClB,MAAM,IAAID,KAAK,CAAC,mBAAmB,CAAC;EACxC;EAEA,MAAME,cAAc,GAAG,MAAM,IAAAC,2BAA0B,EACnDC,MAAM,CAACC,IAAI,CAACR,QAAQ,CAACS,QAAQ,CAAC,CAACC,GAAG,CAAEC,GAAG,KAAM;IACzCC,IAAI,EAAED,GAAG;IACTE,IAAI,EAAEb,QAAQ,CAACS,QAAQ,CAACE,GAAG,CAAc,CAACE,IAAI;IAC9CC,WAAW,EAAEd,QAAQ,CAACS,QAAQ,CAACE,GAAG,CAAc,CAACG;EACrD,CAAC,CAAC,CAAC,EACHd,QAAQ,CAACe,OAAO,EAChBf,QAAQ,CAACgB,aAAa,EACtBhB,QAAQ,CAACiB,WAAW,EACpBjB,QAAQ,CAACkB,OAAO,EAChBlB,QAAQ,CAACmB,WACb,CAAC;EAED,MAAMC,UAAU,GAAGb,MAAM,CAACc,OAAO,CAACpB,IAAiD,CAAC,CAACqB,MAAM,CACvF,CAACC,GAAG,EAAE,CAACZ,GAAG,EAAEa,KAAK,CAAC,KAAK;IACnBD,GAAG,CAACZ,GAAG,CAAC,GAAGa,KAAK,IAAI,EAAE;IACtB,OAAOD,GAAG;EACd,CAAC,EACD,CAAC,CACL,CAAC;EAED,MAAME,QAAQ,GAAG,MAAMpB,cAAc,CAACqB,cAAc,CAACN,UAAU,CAAC;EAEhE,MAAMO,KAAK,GAAG7B,OAAO,CAACM,MAAM,CACxBL,QAAQ,EACR6B,SAAS,EACT;IACID,KAAK,EAAEzB,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEyB,KAAK;IACrBE,WAAW,EAAE3B,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAE2B,WAAW;IACjCC,eAAe,EAAE5B,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAE4B,eAAe;IACzCC,OAAO,EAAE7B,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAE6B;EACtB,CACJ,CAAC;EAED,MAAM;IAAEC;EAAO,CAAC,GAAG,MAAM,IAAAC,gBAAY,EAAC;IAClCN,KAAK;IACLF,QAAQ;IACRI,WAAW,EAAE3B,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAE2B,WAAW;IACjCK,UAAU,EAAEhC,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEgC,UAAU;IAC/BF,MAAM,EAAEG,UAAQ,CAACC,MAAM,CAAC;MACpBC,MAAM,EAAErC,QAAQ,CAACsC;IACrB,CAAC;EACL,CAAC,CAAC;EAEF,OAAON,MAAM;AACjB","ignoreList":[]}
+{"version":3,"names":["_ai","require","_zodToJsonSchema","_ShouldMustTemplate","_interopRequireDefault","e","__esModule","default","zodToJsonSchema","schema","zodToJsonSchemaRaw","tryParseJson","text","value","JSON","parse","raw","extractJsonCandidate","objectStart","indexOf","objectEnd","lastIndexOf","slice","arrayStart","arrayEnd","parseJsonFromText","_tryParseJson","lines","replace","split","startLine","i","length","line","test","Error","endLine","blockLines","innerLines","join","genStructuredOutputs","context","taskName","template","args","options","getLLM","inputDefs","Object","keys","inputDef","map","key","name","type","description","promptArgs","entries","reduce","acc","outputSchemaJson","stringify","outputSchema","message","String","mustSection","push","no","title","content","promptTemplate","createShouldMustTemplate","summary","shouldSection","example","partialVars","model","temperature","reasoningEffort","verbosityLevel","timeout","maxParseRetries","maxRetries","buildCorrectionPrompt","errorMessage","lastErrorMessage","attempt","messages","formatMessages","generateText","Math","max","undefined","parsed","error","parsedResult","safeParse","success","data","role"],"sourceRoot":"../../../src","sources":["controllers/genStructuredOutputs.ts"],"mappings":";;;;;;AACA,IAAAA,GAAA,GAAAC,OAAA;AACA,IAAAC,gBAAA,GAAAD,OAAA;AAGA,IAAAE,mBAAA,GAAAC,sBAAA,CAAAH,OAAA;AAAuE,SAAAG,uBAAAC,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AA4BvE,MAAMG,eAAe,GAAIC,MAAkB,IACvC,IAACC,gCAAkB,EAA+CD,MAAM,CAAC;AAE7E,MAAME,YAAY,GAAIC,IAAY,IAAwB;EACtD,IAAI;IACA,OAAO;MAAEC,KAAK,EAAEC,IAAI,CAACC,KAAK,CAACH,IAAI,CAAC;MAAEI,GAAG,EAAEJ;IAAK,CAAC;EACjD,CAAC,CAAC,MAAM;IACJ,OAAO,IAAI;EACf;AACJ,CAAC;AAED,MAAMK,oBAAoB,GAAIL,IAAY,IAAoB;EAC1D,MAAMM,WAAW,GAAGN,IAAI,CAACO,OAAO,CAAC,GAAG,CAAC;EACrC,MAAMC,SAAS,GAAGR,IAAI,CAACS,WAAW,CAAC,GAAG,CAAC;EACvC,IAAIH,WAAW,KAAK,CAAC,CAAC,IAAIE,SAAS,KAAK,CAAC,CAAC,IAAIA,SAAS,GAAGF,WAAW,EAAE;IACnE,OAAON,IAAI,CAACU,KAAK,CAACJ,WAAW,EAAEE,SAAS,GAAG,CAAC,CAAC;EACjD;EAEA,MAAMG,UAAU,GAAGX,IAAI,CAACO,OAAO,CAAC,GAAG,CAAC;EACpC,MAAMK,QAAQ,GAAGZ,IAAI,CAACS,WAAW,CAAC,GAAG,CAAC;EACtC,IAAIE,UAAU,KAAK,CAAC,CAAC,IAAIC,QAAQ,KAAK,CAAC,CAAC,IAAIA,QAAQ,GAAGD,UAAU,EAAE;IAC/D,OAAOX,IAAI,CAACU,KAAK,CAACC,UAAU,EAAEC,QAAQ,GAAG,CAAC,CAAC;EAC/C;EAEA,OAAO,IAAI;AACf,CAAC;AAED,MAAMC,iBAAiB,GAAIb,IAAY,IAAiB;EAAA,IAAAc,aAAA;EACpD,MAAMC,KAAK,GAAGf,IAAI,CAACgB,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAACA,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAACC,KAAK,CAAC,IAAI,CAAC;;EAE1E;EACA,IAAIC,SAAS,GAAG,CAAC,CAAC;EAClB,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGJ,KAAK,CAACK,MAAM,EAAED,CAAC,EAAE,EAAE;IACnC,MAAME,IAAI,GAAGN,KAAK,CAACI,CAAC,CAAC;IACrB;IACA,IAAI,gBAAgB,CAACG,IAAI,CAACD,IAAI,CAAC,EAAE;MAC7BH,SAAS,GAAGC,CAAC;MACb;IACJ;EACJ;EACA,IAAID,SAAS,KAAK,CAAC,CAAC,EAAE,MAAM,IAAIK,KAAK,CAAC,yCAAyC,CAAC;;EAEhF;EACA,IAAIC,OAAO,GAAG,CAAC,CAAC;EAChB,KAAK,IAAIL,CAAC,GAAGJ,KAAK,CAACK,MAAM,GAAG,CAAC,EAAED,CAAC,GAAGD,SAAS,EAAEC,CAAC,EAAE,EAAE;IAC/C,IAAI,SAAS,CAACG,IAAI,CAACP,KAAK,CAACI,CAAC,CAAC,CAAC,EAAE;MAC1BK,OAAO,GAAGL,CAAC;MACX;IACJ;EACJ;EACA,IAAIK,OAAO,KAAK,CAAC,CAAC,EAAE,MAAM,IAAID,KAAK,CAAC,yCAAyC,CAAC;EAE9E,MAAME,UAAU,GAAGV,KAAK,CAACL,KAAK,CAACQ,SAAS,EAAEM,OAAO,GAAG,CAAC,CAAC;EACtD,MAAME,UAAU,GAAGX,KAAK,CAACL,KAAK,CAACQ,SAAS,GAAG,CAAC,EAAEM,OAAO,CAAC;EAEtD,OAAO;IACHvB,KAAK,EAAE,EAAAa,aAAA,GAAAf,YAAY,CAAC2B,UAAU,CAACC,IAAI,CAAC,IAAI,CAAC,CAAC,cAAAb,aAAA,uBAAnCA,aAAA,CAAqCb,KAAK,KAAI,IAAI;IACzDG,GAAG,EAAEqB,UAAU,CAACE,IAAI,CAAC,IAAI;EAC7B,CAAC;AACL,CAAC;AAEc,eAAeC,oBAAoBA,CAI9CC,OAA4B,EAC5BC,QAAgB,EAChBC,QAA+C,EAC/CC,IAAkD,EAClDC,OAAqC,EACtB;EACf,IAAI,CAACJ,OAAO,EAAE;IACV,MAAM,IAAIN,KAAK,CAAC,oBAAoB,CAAC;EACzC;EAEA,IAAI,EAACM,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAEK,MAAM,GAAE;IAClB,MAAM,IAAIX,KAAK,CAAC,mBAAmB,CAAC;EACxC;EAEA,MAAMY,SAAS,GAAGC,MAAM,CAACC,IAAI,CAACN,QAAQ,CAACO,QAAQ,CAAC,CAACC,GAAG,CAAEC,GAAG,KAAM;IAC3DC,IAAI,EAAED,GAAG;IACTE,IAAI,EAAEX,QAAQ,CAACO,QAAQ,CAACE,GAAG,CAAc,CAACE,IAAI;IAC9CC,WAAW,EAAEZ,QAAQ,CAACO,QAAQ,CAACE,GAAG,CAAc,CAACG;EACrD,CAAC,CAAC,CAAC;EAEH,MAAMC,UAAU,GAAGR,MAAM,CAACS,OAAO,CAACb,IAAiD,CAAC,CAACc,MAAM,CACvF,CAACC,GAAG,EAAE,CAACP,GAAG,EAAEvC,KAAK,CAAC,KAAK;IACnB8C,GAAG,CAACP,GAAG,CAAC,GAAGvC,KAAK,IAAI,EAAE;IACtB,OAAO8C,GAAG;EACd,CAAC,EACD,CAAC,CACL,CAAC;EAED,IAAIC,gBAAgB,GAAG,EAAE;EACzB,IAAI;IACAA,gBAAgB,GAAG9C,IAAI,CAAC+C,SAAS,CAACrD,eAAe,CAACmC,QAAQ,CAACmB,YAAqC,CAAC,CAAC;EACtG,CAAC,CAAC,OAAOzD,CAAC,EAAE;IACR,MAAM,IAAI8B,KAAK,CAAC,mDAAmD9B,CAAC,YAAY8B,KAAK,GAAG9B,CAAC,CAAC0D,OAAO,GAAGC,MAAM,CAAC3D,CAAC,CAAC,EAAE,CAAC;EACpH;;EAEA;EACAsC,QAAQ,CAACsB,WAAW,GAAGtB,QAAQ,CAACsB,WAAW,IAAI,EAAE;EACjDtB,QAAQ,CAACsB,WAAW,CAACC,IAAI,CAAC;IACtBC,EAAE,EAAExB,QAAQ,CAACsB,WAAW,CAACjC,MAAM,GAAG,CAAC;IACnCoC,KAAK,EAAE,cAAc;IACrBC,OAAO,EAAE;AACjB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,EAAET,gBAAgB;AAClB;EACI,CAAC,CAAC;EAEF,MAAMU,cAAc,GAAG,MAAM,IAAAC,2BAAwB,EACjDxB,SAAS,EACTJ,QAAQ,CAAC6B,OAAO,EAChB7B,QAAQ,CAAC8B,aAAa,EACtB9B,QAAQ,CAACsB,WAAW,EACpBtB,QAAQ,CAAC+B,OAAO,EAChB/B,QAAQ,CAACgC,WACb,CAAC;EAED,MAAMC,KAAK,GAAGnC,OAAO,CAACK,MAAM,CACxBJ,QAAQ,EACR;IACIkC,KAAK,EAAE/B,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAE+B,KAAK;IACrBC,WAAW,EAAEhC,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEgC,WAAW;IACjCC,eAAe,EAAEjC,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEiC,eAAe;IACzCC,cAAc,EAAElC,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEkC,cAAc;IACvCC,OAAO,EAAEnC,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEmC;EACtB,CACJ,CAAC;EAED,MAAMC,eAAe,GAAG,CAAApC,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEqC,UAAU,KAAI,CAAC;EAEhD,MAAMC,qBAAqB,GAAIC,YAAoB,IAC/C,CACI,uDAAuD,EACvD,UAAUA,YAAY,EAAE,EACxB,mGAAmG,EACnG,gCAAgC,CACnC,CAAC7C,IAAI,CAAC,IAAI,CAAC;EAEhB,IAAI8C,gBAA+B,GAAG,IAAI;EAE1C,KAAK,IAAIC,OAAO,GAAG,CAAC,EAAEA,OAAO,IAAIL,eAAe,EAAEK,OAAO,EAAE,EAAE;IACzD,MAAMC,QAAwB,GAAG,MAAMjB,cAAc,CAACkB,cAAc,CAAChC,UAAU,CAAC;IAEhF,MAAM;MAAE5C;IAAK,CAAC,GAAG,MAAM,IAAA6E,gBAAY,EAAC;MAChCb,KAAK;MACLW,QAAQ;MACRL,UAAU,EAAErC,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAEqC,UAAU,GAAGQ,IAAI,CAACC,GAAG,CAAC,CAAC,EAAE9C,OAAO,CAACqC,UAAU,GAAGI,OAAO,CAAC,GAAGM;IAClF,CAAC,CAAC;IAEF,IAAIC,MAAyB,GAAG,IAAI;IACpC,IAAI;MACAA,MAAM,GAAGpE,iBAAiB,CAACb,IAAI,CAAC;IACpC,CAAC,CAAC,OAAOkF,KAAK,EAAE;MACZT,gBAAgB,GAAGS,KAAK,YAAY3D,KAAK,GAAG2D,KAAK,CAAC/B,OAAO,GAAGC,MAAM,CAAC8B,KAAK,CAAC;IAC7E;IAEA,IAAI,CAACT,gBAAgB,IAAIQ,MAAM,EAAE;MAC7B,MAAME,YAAY,GAAGpD,QAAQ,CAACmB,YAAY,CAACkC,SAAS,CAACH,MAAM,CAAChF,KAAK,CAAC;MAClE,IAAIkF,YAAY,CAACE,OAAO,EAAE;QACtB,OAAOF,YAAY,CAACG,IAAI;MAC5B;MACAb,gBAAgB,GAAGU,YAAY,CAACD,KAAK,CAAC/B,OAAO;IACjD;IAEA,IAAIuB,OAAO,IAAIL,eAAe,EAAE;MAC5B;IACJ;IAEAM,QAAQ,CAACrB,IAAI,CAAC;MAAEiC,IAAI,EAAE,WAAW;MAAE9B,OAAO,EAAEzD;IAAK,CAAC,CAAC;IACnD2E,QAAQ,CAACrB,IAAI,CAAC;MAAEiC,IAAI,EAAE,MAAM;MAAE9B,OAAO,EAAEc,qBAAqB,CAACE,gBAAgB,IAAI,eAAe;IAAE,CAAC,CAAC;IACpGA,gBAAgB,GAAG,IAAI;EAC3B;EAEA,MAAM,IAAIlD,KAAK,CACX,6CAA6C8C,eAAe,GAAG,CAAC,cAAcI,gBAAgB,IAAI,eAAe,EACrH,CAAC;AACL","ignoreList":[]}

package/lib/commonjs/templates/ShouldMustTemplate.js

@@ -34,7 +34,12 @@ async function resolvePartialVars(partialVars) {
   return Object.fromEntries(entries);
 }
 function replaceTemplateVariables(template, values) {
-  return template.replace(getVariableRegex(), (_, variable) => values[variable] ?? "");
+  return template.replace(getVariableRegex(), (_, variable) => {
+    if (Object.prototype.hasOwnProperty.call(values, variable)) {
+      return values[variable] ?? "";
+    }
+    return `[${variable}](#${variable})`;
+  });
 }
 async function createShouldMustTemplate(inputDef, summary, shouldSection, mustSection, example, partialVars) {
   const shouldSectionPrompt = (() => {
@@ -62,49 +67,41 @@ async function createShouldMustTemplate(inputDef, summary, shouldSection, mustSe
     const exampleSectionBody = example.map(elem => `## (c${elem.no}) ${elem.title}\n${elem.content}`).join("\n\n");
     return `# Example\n\n${exampleSectionBody}`;
   })();
-  const allSectionContent = [(shouldSection === null || shouldSection === void 0 ? void 0 : shouldSection.map(s => s.content || "").join(" ")) || "", (mustSection === null || mustSection === void 0 ? void 0 : mustSection.map(s => s.content || "").join(" ")) || "", (example === null || example === void 0 ? void 0 : example.map(s => s.content || "").join(" ")) || "", summary].join(" ");
-  const usedVariables = extractVariables(allSectionContent);
-  const definedInputVariables = inputDef.map(elem => elem.name);
-  const definedPartialVariables = Object.keys(partialVars || {});
-  const definedVariables = [...definedInputVariables, ...definedPartialVariables, "outputFormat"];
-  const undefinedVariables = usedVariables.filter(variable => !definedVariables.includes(variable));
-  if (undefinedVariables.length > 0) {
-    console.warn(`[ShouldMustTemplate] Warning: Found ${undefinedVariables.length} undefined variable(s) in template sections: [${undefinedVariables.join(", ")}]. These variables have been automatically added to the template.`);
-  }
-  const autoGeneratedVariablesSection = undefinedVariables.length > 0 ? `\n\n# Auto-Generated Variables\n\n${undefinedVariables.map(variable => `## ${variable}\n{${variable}}`).join("\n\n")}` : "";
   const systemPrompt = [summary, shouldSectionPrompt, mustSectionPrompt, exampleSectionPrompt].filter(Boolean).join("\n\n");
-  const stringInputPromptTemplate = inputDef.filter(elem => elem.type === "string").map(elem => `# ${elem.name}${elem.description ? `\n${elem.description}` : ""}\n{${elem.name}}`).join("\n\n");
-  const imageInputDefs = inputDef.filter(elem => elem.type === "imageDataURL");
-  const systemTemplate = [systemPrompt, "{outputFormat}"].filter(Boolean).join("\n\n").trim();
-  const userTextTemplate = [stringInputPromptTemplate, autoGeneratedVariablesSection].filter(Boolean).join("\n\n").trim();
+  const systemTemplate = [systemPrompt].filter(Boolean).join("\n\n").trim();
   return {
     async formatMessages(args) {
-      const resolvedPartialVars = await resolvePartialVars(partialVars || {});
       const mergedArgs = Object.entries(args || {}).reduce((acc, [key, value]) => {
         acc[key] = value ?? "";
         return acc;
       }, {});
+      const resolvedPartialVars = await resolvePartialVars(partialVars || {});
       const templateValues = {
         ...mergedArgs,
         ...resolvedPartialVars
       };
-      undefinedVariables.forEach(variable => {
-        if (!(variable in templateValues)) {
-          templateValues[variable] = "";
-        }
-      });
+
+      // Create system message content
       const systemMessage = {
         role: "system",
         content: replaceTemplateVariables(systemTemplate, templateValues)
       };
-      const userText = replaceTemplateVariables(userTextTemplate, templateValues);
+
+      // Create user message content
       const userContentParts = [];
-      if (userText.trim().length > 0) {
+      const argsText = inputDef.filter(elem => elem.type === "string").map(elem => `# ${elem.name}${elem.description ? `\n${elem.description}` : ""}
+${templateValues === null || templateValues === void 0 ? void 0 : templateValues[elem.name]}
+`).join("\n\n");
+      const partialVarsText = Object.entries(resolvedPartialVars).map(([key, value]) => `# ${key}
+${value}
+`).join("\n\n");
+      if (argsText.trim().length > 0 || partialVarsText.trim().length > 0) {
         userContentParts.push({
           type: "text",
-          text: userText
+          text: argsText + "\n\n" + partialVarsText
         });
       }
+      const imageInputDefs = inputDef.filter(elem => elem.type === "imageDataURL");
       imageInputDefs.forEach(elem => {
         const imageValue = templateValues[elem.name];
         if (imageValue && imageValue.trim().length > 0) {

package/lib/commonjs/templates/ShouldMustTemplate.js.map

@@ -1 +1 @@
-{"version":3,"names":["getVariableRegex","RegExp","extractVariables","content","variableRegex","variables","match","exec","includes","push","resolvePartialVars","partialVars","entries","Promise","all","Object","map","key","value","result","fromEntries","replaceTemplateVariables","template","values","replace","_","variable","createShouldMustTemplate","inputDef","summary","shouldSection","mustSection","example","shouldSectionPrompt","length","shouldSectionCount","shouldSectionHeader","shouldSectionBody","elem","baseBody","no","title","join","mustSectionPrompt","mustSectionCount","mustSectionHeader","mustSectionBody","exampleSectionPrompt","exampleSectionBody","allSectionContent","s","usedVariables","definedInputVariables","name","definedPartialVariables","keys","definedVariables","undefinedVariables","filter","console","warn","autoGeneratedVariablesSection","systemPrompt","Boolean","stringInputPromptTemplate","type","description","imageInputDefs","systemTemplate","trim","userTextTemplate","formatMessages","args","resolvedPartialVars","mergedArgs","reduce","acc","templateValues","forEach","systemMessage","role","userText","userContentParts","text","imageValue","image","userMessage"],"sourceRoot":"../../../src","sources":["templates/ShouldMustTemplate.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["getVariableRegex","RegExp","extractVariables","content","variableRegex","variables","match","exec","includes","push","resolvePartialVars","partialVars","entries","Promise","all","Object","map","key","value","result","fromEntries","replaceTemplateVariables","template","values","replace","_","variable","prototype","hasOwnProperty","call","createShouldMustTemplate","inputDef","summary","shouldSection","mustSection","example","shouldSectionPrompt","length","shouldSectionCount","shouldSectionHeader","shouldSectionBody","elem","baseBody","no","title","join","mustSectionPrompt","mustSectionCount","mustSectionHeader","mustSectionBody","exampleSectionPrompt","exampleSectionBody","systemPrompt","filter","Boolean","systemTemplate","trim","formatMessages","args","mergedArgs","reduce","acc","resolvedPartialVars","templateValues","systemMessage","role","userContentParts","argsText","type","name","description","partialVarsText","text","imageInputDefs","forEach","imageValue","image","userMessage"],"sourceRoot":"../../../src","sources":["templates/ShouldMustTemplate.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/types.js

@@ -75,7 +75,7 @@ const ModelNameAlias = exports.ModelNameAlias = {
   },
   // gpt-5.1
   "gpt-5.1-chat": {
-    model: "gpt-5.1-chat-latest",
+    model: "gpt-5.1-chat",
     vendor: {
       type: "openai"
     }

package/lib/commonjs/types.js.map

@@ -1 +1 @@
-{"version":3,"names":["ModelNameAlias","exports","model","vendor","type"],"sourceRoot":"../../src","sources":["types.ts"],"mappings":";;;;;;AA4DO,MAAMA,cAA0D,GAAAC,OAAA,CAAAD,cAAA,GAAG;EACtE;EACA,gBAAgB,EAAE;IACd,OAAO,EAAE,yBAAyB;IAClC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EACD,kBAAkB,EAAE;IAChB,OAAO,EAAE,2BAA2B;IACpC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EACD,mBAAmB,EAAE;IACjB,OAAO,EAAE,4BAA4B;IACrC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EACD,iBAAiB,EAAE;IACf,OAAO,EAAE,0BAA0B;IACnC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EACD,eAAe,EAAE;IACb,OAAO,EAAE,wBAAwB;IACjC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EACD,iBAAiB,EAAE;IACf,OAAO,EAAE,0BAA0B;IACnC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EACD,mBAAmB,EAAE;IACjB,OAAO,EAAE,4BAA4B;IACrC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EACD,kBAAkB,EAAE;IAChB,OAAO,EAAE,2BAA2B;IACpC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EACD,iBAAiB,EAAE;IACf,OAAO,EAAE,0BAA0B;IACnC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EAED;EACA,QAAQ,EAAE;IACNE,KAAK,EAAE,QAAQ;IACfC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EACD,aAAa,EAAE;IACXF,KAAK,EAAE,aAAa;IACpBC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EAED;EACA,cAAc,EAAE;IACZF,KAAK,EAAE,qBAAqB;IAC5BC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EACD,SAAS,EAAE;IACPF,KAAK,EAAE,SAAS;IAChBC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EAED;EACA,SAAS,EAAE;IACPF,KAAK,EAAE,SAAS;IAChBC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EACD,cAAc,EAAE;IACZF,KAAK,EAAE,qBAAqB;IAC5BC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EAED;EACA,cAAc,EAAE;IACZF,KAAK,EAAE,sBAAsB;IAC7BC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EACD,gBAAgB,EAAE;IACdF,KAAK,EAAE,wBAAwB;IAC/BC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EACD,kBAAkB,EAAE;IAChBF,KAAK,EAAE,kBAAkB;IACzBC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EACD,uBAAuB,EAAE;IACrBF,KAAK,EAAE,uBAAuB;IAC9BC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EACD,gBAAgB,EAAE;IACdF,KAAK,EAAE,gBAAgB;IACvBC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B;AACJ,CAAU","ignoreList":[]}
+{"version":3,"names":["ModelNameAlias","exports","model","vendor","type"],"sourceRoot":"../../src","sources":["types.ts"],"mappings":";;;;;;AA4DO,MAAMA,cAA0D,GAAAC,OAAA,CAAAD,cAAA,GAAG;EACtE;EACA,gBAAgB,EAAE;IACd,OAAO,EAAE,yBAAyB;IAClC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EACD,kBAAkB,EAAE;IAChB,OAAO,EAAE,2BAA2B;IACpC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EACD,mBAAmB,EAAE;IACjB,OAAO,EAAE,4BAA4B;IACrC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EACD,iBAAiB,EAAE;IACf,OAAO,EAAE,0BAA0B;IACnC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EACD,eAAe,EAAE;IACb,OAAO,EAAE,wBAAwB;IACjC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EACD,iBAAiB,EAAE;IACf,OAAO,EAAE,0BAA0B;IACnC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EACD,mBAAmB,EAAE;IACjB,OAAO,EAAE,4BAA4B;IACrC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EACD,kBAAkB,EAAE;IAChB,OAAO,EAAE,2BAA2B;IACpC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EACD,iBAAiB,EAAE;IACf,OAAO,EAAE,0BAA0B;IACnC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EAED;EACA,QAAQ,EAAE;IACNE,KAAK,EAAE,QAAQ;IACfC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EACD,aAAa,EAAE;IACXF,KAAK,EAAE,aAAa;IACpBC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EAED;EACA,cAAc,EAAE;IACZF,KAAK,EAAE,cAAc;IACrBC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EACD,SAAS,EAAE;IACPF,KAAK,EAAE,SAAS;IAChBC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EAED;EACA,SAAS,EAAE;IACPF,KAAK,EAAE,SAAS;IAChBC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EACD,cAAc,EAAE;IACZF,KAAK,EAAE,qBAAqB;IAC5BC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EAED;EACA,cAAc,EAAE;IACZF,KAAK,EAAE,sBAAsB;IAC7BC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EACD,gBAAgB,EAAE;IACdF,KAAK,EAAE,wBAAwB;IAC/BC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EACD,kBAAkB,EAAE;IAChBF,KAAK,EAAE,kBAAkB;IACzBC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EACD,uBAAuB,EAAE;IACrBF,KAAK,EAAE,uBAAuB;IAC9BC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EACD,gBAAgB,EAAE;IACdF,KAAK,EAAE,gBAAgB;IACvBC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B;AACJ,CAAU","ignoreList":[]}

package/lib/commonjs/utils/createGetLLM.js

@@ -5,19 +5,89 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = createGetLLM;
 var _ai = require("ai");
+var _types = require("../types");
 var _openai = require("@ai-sdk/openai");
 var _openaiCompatible = require("@ai-sdk/openai-compatible");
 var _anthropic = require("@ai-sdk/anthropic");
 var _google = require("@ai-sdk/google");
 var _azure = require("@ai-sdk/azure");
+const REVPROXY_JSON_INSTRUCTION = "Return a valid JSON object only. Do not include any extra text.";
+const isRevproxyEnabled = () => Boolean(process.env.JELIQ_LLM_REVPROXY_KEY && process.env.JELIQ_LLM_REVPROXY_CONTAINER_ID && process.env.JELIQ_LLM_REVPROXY_ENDPOINT);
+const addJsonInstructionToPrompt = prompt => {
+  if (!Array.isArray(prompt) || prompt.length === 0) {
+    return prompt;
+  }
+  const hasInstruction = prompt.some(message => (message === null || message === void 0 ? void 0 : message.role) === "system" && typeof message.content === "string" && message.content.includes(REVPROXY_JSON_INSTRUCTION));
+  if (hasInstruction) {
+    return prompt;
+  }
+  const instructionMessage = {
+    role: "system",
+    content: REVPROXY_JSON_INSTRUCTION
+  };
+  const insertIndex = prompt.findIndex(message => (message === null || message === void 0 ? void 0 : message.role) !== "system");
+  if (insertIndex === -1) {
+    return [...prompt, instructionMessage];
+  }
+  return [...prompt.slice(0, insertIndex), instructionMessage, ...prompt.slice(insertIndex)];
+};
+const normalizeJsonContent = content => {
+  if (!Array.isArray(content)) {
+    return content;
+  }
+  let text = "";
+  for (const part of content) {
+    if ((part === null || part === void 0 ? void 0 : part.type) === "text" && typeof part.text === "string") {
+      text += part.text;
+    }
+  }
+  if (!text) {
+    return content;
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(text);
+  } catch {
+    return content;
+  }
+  const normalizedText = JSON.stringify(parsed);
+  let inserted = false;
+  return content.flatMap(part => {
+    if ((part === null || part === void 0 ? void 0 : part.type) !== "text" || typeof part.text !== "string") {
+      return [part];
+    }
+    if (inserted) {
+      return [];
+    }
+    inserted = true;
+    return [{
+      ...part,
+      text: normalizedText
+    }];
+  });
+};
 function createProviderModel(vendor, modelName) {
-  if (process.env.JELIQ_LLM_REVPROXY_KEY && process.env.JELIQ_LLM_REVPROXY_ENDPOINT) {
+  var _ModelNameAlias;
+  const actualModelName = (_types.ModelNameAlias === null || _types.ModelNameAlias === void 0 || (_ModelNameAlias = _types.ModelNameAlias[modelName]) === null || _ModelNameAlias === void 0 ? void 0 : _ModelNameAlias.model) || modelName;
+  if (isRevproxyEnabled()) {
     const provider = (0, _openaiCompatible.createOpenAICompatible)({
       name: "jeliq-llm-revproxy",
-      apiKey: process.env.JELIQ_LLM_REVPROXY_KEY,
-      baseURL: process.env.JELIQ_LLM_REVPROXY_ENDPOINT
+      apiKey: process.env.JELIQ_LLM_REVPROXY_KEY || "",
+      baseURL: process.env.JELIQ_LLM_REVPROXY_ENDPOINT || "",
+      headers: {
+        'X-Container-ID': process.env.JELIQ_LLM_REVPROXY_CONTAINER_ID || ""
+      }
+      // supportsStructuredOutputs: true,
+      /*
+      fetch: async (input, init) => {
+          if (init?.body) {
+              console.log("REQUEST BODY:", init.body.toString());
+          }
+          return fetch(input, init);
+      },
+      */
     });
-    return provider(modelName);
+    return provider(actualModelName);
   }
   if (vendor.type === "anthropic") {
     const provider = vendor.apiKey || vendor.endpoint ? (0, _anthropic.createAnthropic)({
@@ -26,7 +96,7 @@ function createProviderModel(vendor, modelName) {
         baseURL: vendor.endpoint
       } : {})
     }) : _anthropic.anthropic;
-    return provider(modelName);
+    return provider(actualModelName);
   }
   if (vendor.type === "google") {
     const provider = vendor.apiKey || vendor.endpoint ? (0, _google.createGoogleGenerativeAI)({
@@ -35,7 +105,7 @@ function createProviderModel(vendor, modelName) {
         baseURL: vendor.endpoint
       } : {})
     }) : _google.google;
-    return provider(modelName);
+    return provider(actualModelName);
   }
   if (vendor.type === "azure") {
     const provider = vendor.apiKey || vendor.instanceName ? (0, _azure.createAzure)({
@@ -46,9 +116,9 @@ function createProviderModel(vendor, modelName) {
       apiVersion: vendor.apiVersion,
       useDeploymentBasedUrls: true
     }) : _azure.azure;
-    return provider(vendor.deploymentName || modelName);
+    return provider(vendor.deploymentName || actualModelName);
   }
-  return (0, _openai.openai)(modelName);
+  return (0, _openai.openai)(actualModelName);
 }
 function createGetLLM(tasksModelsMap, defaultModel) {
   function getModelAndTemperature(taskName) {
@@ -74,6 +144,7 @@ function createGetLLM(tasksModelsMap, defaultModel) {
     const actualReasoningEffort = (options === null || options === void 0 ? void 0 : options.reasoningEffort) !== undefined ? options.reasoningEffort : reasoningEffort;
     const actualVerbosityLevel = (options === null || options === void 0 ? void 0 : options.verbosityLevel) !== undefined ? options.verbosityLevel : verbosityLevel;
     const actualTimeout = (options === null || options === void 0 ? void 0 : options.timeout) !== undefined ? options.timeout : timeout !== undefined ? timeout : undefined;
+    const usesRevproxy = isRevproxyEnabled();
     const model = createProviderModel(resolvedVendor, actualModelName);
 
     // 直前に CallOptions を変形するミドルウェア

package/lib/commonjs/utils/createGetLLM.js.map

@@ -1 +1 @@
-{"version":3,"names":["_ai","require","_openai","_openaiCompatible","_anthropic","_google","_azure","createProviderModel","vendor","modelName","process","env","JELIQ_LLM_REVPROXY_KEY","JELIQ_LLM_REVPROXY_ENDPOINT","provider","createOpenAICompatible","name","apiKey","baseURL","type","endpoint","createAnthropic","anthropic","createGoogleGenerativeAI","google","instanceName","createAzure","resourceName","apiVersion","useDeploymentBasedUrls","azure","deploymentName","openai","createGetLLM","tasksModelsMap","defaultModel","getModelAndTemperature","taskName","model","Error","reasoningEffort","undefined","verbosityLevel","temperature","timeout","getLLM","options","_loggingInfo","resolvedVendor","actualModelName","actualTemperature","actualReasoningEffort","actualVerbosityLevel","actualTimeout","mutateCallOptionsMiddleware","specificationVersion","transformParams","params","_next$providerOptions","next","Math","min","max","providerOptions","textVerbosity","wrapLanguageModel","middleware"],"sourceRoot":"../../../src","sources":["utils/createGetLLM.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_ai","require","_types","_openai","_openaiCompatible","_anthropic","_google","_azure","REVPROXY_JSON_INSTRUCTION","isRevproxyEnabled","Boolean","process","env","JELIQ_LLM_REVPROXY_KEY","JELIQ_LLM_REVPROXY_CONTAINER_ID","JELIQ_LLM_REVPROXY_ENDPOINT","addJsonInstructionToPrompt","prompt","Array","isArray","length","hasInstruction","some","message","role","content","includes","instructionMessage","insertIndex","findIndex","slice","normalizeJsonContent","text","part","type","parsed","JSON","parse","normalizedText","stringify","inserted","flatMap","createProviderModel","vendor","modelName","_ModelNameAlias","actualModelName","ModelNameAlias","model","provider","createOpenAICompatible","name","apiKey","baseURL","headers","endpoint","createAnthropic","anthropic","createGoogleGenerativeAI","google","instanceName","createAzure","resourceName","apiVersion","useDeploymentBasedUrls","azure","deploymentName","openai","createGetLLM","tasksModelsMap","defaultModel","getModelAndTemperature","taskName","Error","reasoningEffort","undefined","verbosityLevel","temperature","timeout","getLLM","options","_loggingInfo","resolvedVendor","actualTemperature","actualReasoningEffort","actualVerbosityLevel","actualTimeout","usesRevproxy","mutateCallOptionsMiddleware","specificationVersion","transformParams","params","_next$providerOptions","next","Math","min","max","providerOptions","textVerbosity","wrapLanguageModel","middleware"],"sourceRoot":"../../../src","sources":["utils/createGetLLM.ts"],"mappings":";;;;;;AAAA,IAAAA,GAAA,GAAAC,OAAA;AAIA,IAAAC,MAAA,GAAAD,OAAA;AAEA,IAAAE,OAAA,GAAAF,OAAA;AACA,IAAAG,iBAAA,GAAAH,OAAA;AACA,IAAAI,UAAA,GAAAJ,OAAA;AACA,IAAAK,OAAA,GAAAL,OAAA;AACA,IAAAM,MAAA,GAAAN,OAAA;AAEA,MAAMO,yBAAyB,GAC3B,iEAAiE;AAErE,MAAMC,iBAAiB,GAAGA,CAAA,KACtBC,OAAO,CACHC,OAAO,CAACC,GAAG,CAACC,sBAAsB,IAClCF,OAAO,CAACC,GAAG,CAACE,+BAA+B,IAC3CH,OAAO,CAACC,GAAG,CAACG,2BAChB,CAAC;AAEL,MAAMC,0BAA0B,GAAIC,MAAW,IAAK;EAChD,IAAI,CAACC,KAAK,CAACC,OAAO,CAACF,MAAM,CAAC,IAAIA,MAAM,CAACG,MAAM,KAAK,CAAC,EAAE;IAC/C,OAAOH,MAAM;EACjB;EAEA,MAAMI,cAAc,GAAGJ,MAAM,CAACK,IAAI,CAC7BC,OAAO,IACJ,CAAAA,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEC,IAAI,MAAK,QAAQ,IAC1B,OAAOD,OAAO,CAACE,OAAO,KAAK,QAAQ,IACnCF,OAAO,CAACE,OAAO,CAACC,QAAQ,CAAClB,yBAAyB,CAC1D,CAAC;EAED,IAAIa,cAAc,EAAE;IAChB,OAAOJ,MAAM;EACjB;EAEA,MAAMU,kBAAkB,GAAG;IACvBH,IAAI,EAAE,QAAQ;IACdC,OAAO,EAAEjB;EACb,CAAC;EAED,MAAMoB,WAAW,GAAGX,MAAM,CAACY,SAAS,CAAEN,OAAO,IAAK,CAAAA,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEC,IAAI,MAAK,QAAQ,CAAC;EAC7E,IAAII,WAAW,KAAK,CAAC,CAAC,EAAE;IACpB,OAAO,CAAC,GAAGX,MAAM,EAAEU,kBAAkB,CAAC;EAC1C;EAEA,OAAO,CACH,GAAGV,MAAM,CAACa,KAAK,CAAC,CAAC,EAAEF,WAAW,CAAC,EAC/BD,kBAAkB,EAClB,GAAGV,MAAM,CAACa,KAAK,CAACF,WAAW,CAAC,CAC/B;AACL,CAAC;AAED,MAAMG,oBAAoB,GAAIN,OAAc,IAAK;EAC7C,IAAI,CAACP,KAAK,CAACC,OAAO,CAACM,OAAO,CAAC,EAAE;IACzB,OAAOA,OAAO;EAClB;EAEA,IAAIO,IAAI,GAAG,EAAE;EACb,KAAK,MAAMC,IAAI,IAAIR,OAAO,EAAE;IACxB,IAAI,CAAAQ,IAAI,aAAJA,IAAI,uBAAJA,IAAI,CAAEC,IAAI,MAAK,MAAM,IAAI,OAAOD,IAAI,CAACD,IAAI,KAAK,QAAQ,EAAE;MACxDA,IAAI,IAAIC,IAAI,CAACD,IAAI;IACrB;EACJ;EAEA,IAAI,CAACA,IAAI,EAAE;IACP,OAAOP,OAAO;EAClB;EAEA,IAAIU,MAAW;EACf,IAAI;IACAA,MAAM,GAAGC,IAAI,CAACC,KAAK,CAACL,IAAI,CAAC;EAC7B,CAAC,CAAC,MAAM;IACJ,OAAOP,OAAO;EAClB;EACA,MAAMa,cAAc,GAAGF,IAAI,CAACG,SAAS,CAACJ,MAAM,CAAC;EAC7C,IAAIK,QAAQ,GAAG,KAAK;EAEpB,OAAOf,OAAO,CAACgB,OAAO,CAAER,IAAI,IAAK;IAC7B,IAAI,CAAAA,IAAI,aAAJA,IAAI,uBAAJA,IAAI,CAAEC,IAAI,MAAK,MAAM,IAAI,OAAOD,IAAI,CAACD,IAAI,KAAK,QAAQ,EAAE;MACxD,OAAO,CAACC,IAAI,CAAC;IACjB;IAEA,IAAIO,QAAQ,EAAE;MACV,OAAO,EAAE;IACb;IAEAA,QAAQ,GAAG,IAAI;IACf,OAAO,CAAC;MAAE,GAAGP,IAAI;MAAED,IAAI,EAAEM;IAAe,CAAC,CAAC;EAC9C,CAAC,CAAC;AACN,CAAC;AAED,SAASI,mBAAmBA,CAACC,MAAkB,EAAEC,SAAiB,EAAiB;EAAA,IAAAC,eAAA;EAC/E,MAAMC,eAAe,GAAI,CAAAC,qBAAc,aAAdA,qBAAc,gBAAAF,eAAA,GAAdE,qBAAc,CAAGH,SAAS,CAAc,cAAAC,eAAA,uBAAxCA,eAAA,CAA0CG,KAAK,KAAIJ,SAAoB;EAEhG,IAAInC,iBAAiB,CAAC,CAAC,EAAE;IACrB,MAAMwC,QAAQ,GAAG,IAAAC,wCAAsB,EAAC;MACpCC,IAAI,EAAE,oBAAoB;MAC1BC,MAAM,EAAEzC,OAAO,CAACC,GAAG,CAACC,sBAAsB,IAAI,EAAE;MAChDwC,OAAO,EAAE1C,OAAO,CAACC,GAAG,CAACG,2BAA2B,IAAI,EAAE;MACtDuC,OAAO,EAAE;QACL,gBAAgB,EAAE3C,OAAO,CAACC,GAAG,CAACE,+BAA+B,IAAI;MACrE;MACA;MACA;AACZ;AACA;AACA;AACA;AACA;AACA;AACA;IACQ,CAAC,CAAC;IACF,OAAOmC,QAAQ,CAACH,eAAe,CAAC;EACpC;EAEA,IAAIH,MAAM,CAACT,IAAI,KAAK,WAAW,EAAE;IAC7B,MAAMe,QAAQ,GAAGN,MAAM,CAACS,MAAM,IAAIT,MAAM,CAACY,QAAQ,GAC3C,IAAAC,0BAAe,EAAC;MACdJ,MAAM,EAAET,MAAM,CAACS,MAAM;MACrB,IAAIT,MAAM,CAACY,QAAQ,GAAG;QAAEF,OAAO,EAAEV,MAAM,CAACY;MAAS,CAAC,GAAG,CAAC,CAAC;IAC3D,CAAC,CAAC,GACAE,oBAAS;IACf,OAAOR,QAAQ,CAACH,eAAe,CAAC;EACpC;EAEA,IAAIH,MAAM,CAACT,IAAI,KAAK,QAAQ,EAAE;IAC1B,MAAMe,QAAQ,GAAGN,MAAM,CAACS,MAAM,IAAIT,MAAM,CAACY,QAAQ,GAC3C,IAAAG,gCAAwB,EAAC;MACvBN,MAAM,EAAET,MAAM,CAACS,MAAM;MACrB,IAAIT,MAAM,CAACY,QAAQ,GAAG;QAAEF,OAAO,EAAEV,MAAM,CAACY;MAAS,CAAC,GAAG,CAAC,CAAC;IAC3D,CAAC,CAAC,GACAI,cAAM;IACZ,OAAOV,QAAQ,CAACH,eAAe,CAAC;EACpC;EAEA,IAAIH,MAAM,CAACT,IAAI,KAAK,OAAO,EAAE;IACzB,MAAMe,QAAQ,GAAGN,MAAM,CAACS,MAAM,IAAIT,MAAM,CAACiB,YAAY,GAC/C,IAAAC,kBAAW,EAAC;MACVT,MAAM,EAAET,MAAM,CAACS,MAAM;MACrB,IAAIT,MAAM,CAACiB,YAAY,GAAG;QAAEE,YAAY,EAAEnB,MAAM,CAACiB;MAAa,CAAC,GAAG,CAAC,CAAC,CAAC;MACrEG,UAAU,EAAEpB,MAAM,CAACoB,UAAU;MAC7BC,sBAAsB,EAAE;IAC5B,CAAC,CAAC,GACAC,YAAK;IACX,OAAOhB,QAAQ,CAACN,MAAM,CAACuB,cAAc,IAAIpB,eAAe,CAAC;EAC7D;EAEA,OAAO,IAAAqB,cAAM,EAACrB,eAAe,CAAC;AAClC;AAEe,SAASsB,YAAYA,CAChCC,cAAwD,EACxDC,YAAmC,EAClB;EACjB,SAASC,sBAAsBA,CAC3BC,QAA4B,EAQ9B;IACE,MAAMxB,KAAK,GAAGwB,QAAQ,IAAIH,cAAc,GAAGA,cAAc,CAACG,QAAQ,CAAc,GAAGF,YAAY;IAC/F,IAAI,CAACtB,KAAK,EAAE;MACR,MAAM,IAAIyB,KAAK,CAAC,4BAA4BD,QAAQ,EAAE,CAAC;IAC3D;IACA,MAAME,eAAe,GAAG,iBAAiB,IAAI1B,KAAK,GAAGA,KAAK,CAAC0B,eAAe,GAAGC,SAAS;IACtF,MAAMC,cAAc,GAAG,gBAAgB,IAAI5B,KAAK,GAAGA,KAAK,CAAC4B,cAAc,GAAGD,SAAS;IACnF,OAAO,CACH3B,KAAK,CAACA,KAAK,EACXA,KAAK,CAACL,MAAM,EACZK,KAAK,CAAC6B,WAAW,EACjBH,eAAe,EACfE,cAAc,EACd5B,KAAK,CAAC8B,OAAO,CAChB;EACL;EAEA,MAAMC,MAAyB,GAAGA,CAC9BP,QAA4B,EAC5BQ,OAMC,EACDC,YAAkB,KACF;IAChB,MAAM,CAAErC,SAAS,EAAED,MAAM,EAAEkC,WAAW,EAAEH,eAAe,EAAEE,cAAc,EAAEE,OAAO,CAAE,GAAGP,sBAAsB,CAACC,QAAQ,CAAC;IAErH,IAAIU,cAAc,GAAGvC,MAAoB;IACzC,IAAIA,MAAM,CAACT,IAAI,KAAK,QAAQ,IAAIS,MAAM,CAACT,IAAI,KAAK,WAAW,IAAIS,MAAM,CAACT,IAAI,KAAK,QAAQ,IAAIS,MAAM,CAACT,IAAI,KAAK,OAAO,EAAE;MAChHgD,cAAc,GAAG;QAAE,GAAGvC,MAAM;QAAET,IAAI,EAAE;MAAS,CAAe;IAChE;IAEA,MAAMY,eAAe,GAAG,CAAAkC,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEhC,KAAK,KAAIJ,SAAS;IACnD,MAAMuC,iBAAiB,GAAG,CAAAH,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEH,WAAW,MAAKF,SAAS,GACtDK,OAAO,CAACH,WAAW,GACnBA,WAAW;IACjB,MAAMO,qBAAqB,GAAG,CAAAJ,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEN,eAAe,MAAKC,SAAS,GAC9DK,OAAO,CAACN,eAAe,GACvBA,eAAe;IACrB,MAAMW,oBAAoB,GAAG,CAAAL,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEJ,cAAc,MAAKD,SAAS,GAC5DK,OAAO,CAACJ,cAAc,GACtBA,cAAc;IACpB,MAAMU,aAAa,GAAG,CAAAN,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEF,OAAO,MAAKH,SAAS,GAC9CK,OAAO,CAACF,OAAO,GACfA,OAAO,KAAKH,SAAS,GACjBG,OAAO,GACPH,SAAS;IAEnB,MAAMY,YAAY,GAAG9E,iBAAiB,CAAC,CAAC;IAExC,MAAMuC,KAAK,GAAGN,mBAAmB,CAACwC,cAAc,EAAEpC,eAAe,CAAC;;IAElE;IACA,MAAM0C,2BAAgC,GAAG;MACrCC,oBAAoB,EAAE,IAAI;MAC1B,MAAMC,eAAeA,CAAC;QAAExD,IAAI;QAAEyD;MAAsC,CAAC,EAAE;QAAA,IAAAC,qBAAA;QACnE,MAAMC,IAAI,GAAG;UAAE,GAAGF;QAAO,CAAC;;QAE1B;AAChB;AACA;AACA;AACA;;QAEgB,IAAI,OAAOE,IAAI,CAAChB,WAAW,KAAK,QAAQ,IAAI,OAAOM,iBAAiB,KAAK,QAAQ,EAAE;UAC/EU,IAAI,CAAChB,WAAW,GAAGiB,IAAI,CAACC,GAAG,CAAC,CAAC,EAAED,IAAI,CAACE,GAAG,CAAC,CAAC,EAAEH,IAAI,CAAChB,WAAW,IAAIM,iBAAiB,IAAI,CAAC,CAAC,CAAC;QAC3F;QAEAU,IAAI,CAACI,eAAe,GAAG;UACnB,IAAIJ,IAAI,CAACI,eAAe,IAAI,CAAC,CAAC,CAAC;UAC/B9B,MAAM,EAAE;YACJ,IAAI,EAAAyB,qBAAA,GAACC,IAAI,CAACI,eAAe,cAAAL,qBAAA,uBAArBA,qBAAA,CAA+BzB,MAAM,KAAI,CAAC,CAAC,CAAC;YAChDO,eAAe,EAAEU,qBAAqB;YACtCc,aAAa,EAAEb;UACnB;QACJ,CAAC;QAED,OAAOQ,IAAI;MACf;IACJ,CAAC;IAED,OAAO,IAAAM,qBAAiB,EAAC;MACrBnD,KAAK,EAAEA,KAAY;MACnBoD,UAAU,EAAEZ;IAChB,CAAC,CAAC;EACN,CAAC;EAED,OAAOT,MAAM;AACjB","ignoreList":[]}

package/lib/module/controllers/genStructuredOutputs.js

@@ -1,5 +1,62 @@
-import { generateText, Output as AIOutput } from "ai";
-import createShouldMustTemplateAI from "../templates/ShouldMustTemplate";
+import { generateText } from "ai";
+import { zodToJsonSchema as zodToJsonSchemaRaw } from "zod-to-json-schema";
+import createShouldMustTemplate from "../templates/ShouldMustTemplate";
+const zodToJsonSchema = schema => zodToJsonSchemaRaw(schema);
+const tryParseJson = text => {
+  try {
+    return {
+      value: JSON.parse(text),
+      raw: text
+    };
+  } catch {
+    return null;
+  }
+};
+const extractJsonCandidate = text => {
+  const objectStart = text.indexOf("{");
+  const objectEnd = text.lastIndexOf("}");
+  if (objectStart !== -1 && objectEnd !== -1 && objectEnd > objectStart) {
+    return text.slice(objectStart, objectEnd + 1);
+  }
+  const arrayStart = text.indexOf("[");
+  const arrayEnd = text.lastIndexOf("]");
+  if (arrayStart !== -1 && arrayEnd !== -1 && arrayEnd > arrayStart) {
+    return text.slice(arrayStart, arrayEnd + 1);
+  }
+  return null;
+};
+const parseJsonFromText = text => {
+  var _tryParseJson;
+  const lines = text.replace(/\r\n/g, "\n").replace(/\r/g, "\n").split("\n");
+
+  // 1) 最初の ```json 行を探す（行頭にあることを要求）
+  let startLine = -1;
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    // 例: ```json, ```JSON, ```json   , ```json something
+    if (/^\s*```json\b/i.test(line)) {
+      startLine = i;
+      break;
+    }
+  }
+  if (startLine === -1) throw new Error("Failed to parse JSON from model output.");
+
+  // 2) 最後の 行頭 ``` 行を探す（最後に出てくるやつ）
+  let endLine = -1;
+  for (let i = lines.length - 1; i > startLine; i--) {
+    if (/^\s*```/.test(lines[i])) {
+      endLine = i;
+      break;
+    }
+  }
+  if (endLine === -1) throw new Error("Failed to parse JSON from model output.");
+  const blockLines = lines.slice(startLine, endLine + 1);
+  const innerLines = lines.slice(startLine + 1, endLine);
+  return {
+    value: ((_tryParseJson = tryParseJson(innerLines.join("\n"))) === null || _tryParseJson === void 0 ? void 0 : _tryParseJson.value) ?? null,
+    raw: blockLines.join("\n")
+  };
+};
 export default async function genStructuredOutputs(context, taskName, template, args, options) {
   if (!context) {
     throw new Error("context is not set");
@@ -7,33 +64,99 @@ export default async function genStructuredOutputs(context, taskName, template,
   if (!(context !== null && context !== void 0 && context.getLLM)) {
     throw new Error("getLLM is not set");
   }
-  const promptTemplate = await createShouldMustTemplateAI(Object.keys(template.inputDef).map(key => ({
+  const inputDefs = Object.keys(template.inputDef).map(key => ({
     name: key,
     type: template.inputDef[key].type,
     description: template.inputDef[key].description
-  })), template.summary, template.shouldSection, template.mustSection, template.example, template.partialVars);
+  }));
   const promptArgs = Object.entries(args).reduce((acc, [key, value]) => {
     acc[key] = value ?? "";
     return acc;
   }, {});
-  const messages = await promptTemplate.formatMessages(promptArgs);
-  const model = context.getLLM(taskName, undefined, {
+  let outputSchemaJson = "";
+  try {
+    outputSchemaJson = JSON.stringify(zodToJsonSchema(template.outputSchema));
+  } catch (e) {
+    throw new Error(`Failed to convert output schema to JSON Schema: ${e instanceof Error ? e.message : String(e)}`);
+  }
+
+  // Add outputFormat input definition
+  template.mustSection = template.mustSection || [];
+  template.mustSection.push({
+    no: template.mustSection.length + 1,
+    title: "outputFormat",
+    content: `You must format your output as a JSON value that adheres to a given "JSON Schema" instance with a markdown code block.
+
+For example, the output format is:
+\`\`\`json
+{"properties": {"foo": {"description": "a list of test words", "type": "array", "items": {"type": "string"}}}, "required": ["foo"]}
+\`\`\`
+
+Then, you must return the following:
+----- Begin of Output Example -----
+\`\`\`json
+{
+    "foo": ["bar", "baz"]
+}
+\`\`\`
+----- End of Output Example -----
+
+Do NOT ouput anything other than the JSON value with markdown code block. 
+Your output will be parsed and type-checked according to the provided schema instance, so make sure all fields in your output match the schema exactly and there are no trailing commas!
+
+
+Here is the JSON Schema instance your output must adhere to. Include the enclosing markdown codeblock:
+
+\`\`\`json
+${outputSchemaJson}
+\`\`\``
+  });
+  const promptTemplate = await createShouldMustTemplate(inputDefs, template.summary, template.shouldSection, template.mustSection, template.example, template.partialVars);
+  const model = context.getLLM(taskName, {
     model: options === null || options === void 0 ? void 0 : options.model,
     temperature: options === null || options === void 0 ? void 0 : options.temperature,
     reasoningEffort: options === null || options === void 0 ? void 0 : options.reasoningEffort,
+    verbosityLevel: options === null || options === void 0 ? void 0 : options.verbosityLevel,
     timeout: options === null || options === void 0 ? void 0 : options.timeout
   });
-  const {
-    output
-  } = await generateText({
-    model,
-    messages,
-    temperature: options === null || options === void 0 ? void 0 : options.temperature,
-    maxRetries: options === null || options === void 0 ? void 0 : options.maxRetries,
-    output: AIOutput.object({
-      schema: template.outputSchema
-    })
-  });
-  return output;
+  const maxParseRetries = (options === null || options === void 0 ? void 0 : options.maxRetries) ?? 3;
+  const buildCorrectionPrompt = errorMessage => ["The previous output could not be parsed or validated.", `Error: ${errorMessage}`, "Please return only a JSON value wrapped in a markdown ```json code block that matches the schema.", "Do not include any other text."].join("\n");
+  let lastErrorMessage = null;
+  for (let attempt = 0; attempt <= maxParseRetries; attempt++) {
+    const messages = await promptTemplate.formatMessages(promptArgs);
+    const {
+      text
+    } = await generateText({
+      model,
+      messages,
+      maxRetries: options !== null && options !== void 0 && options.maxRetries ? Math.max(0, options.maxRetries - attempt) : undefined
+    });
+    let parsed = null;
+    try {
+      parsed = parseJsonFromText(text);
+    } catch (error) {
+      lastErrorMessage = error instanceof Error ? error.message : String(error);
+    }
+    if (!lastErrorMessage && parsed) {
+      const parsedResult = template.outputSchema.safeParse(parsed.value);
+      if (parsedResult.success) {
+        return parsedResult.data;
+      }
+      lastErrorMessage = parsedResult.error.message;
+    }
+    if (attempt >= maxParseRetries) {
+      break;
+    }
+    messages.push({
+      role: "assistant",
+      content: text
+    });
+    messages.push({
+      role: "user",
+      content: buildCorrectionPrompt(lastErrorMessage ?? "Unknown error")
+    });
+    lastErrorMessage = null;
+  }
+  throw new Error(`Structured output validation failed after ${maxParseRetries + 1} attempts: ${lastErrorMessage ?? "Unknown error"}`);
 }
 //# sourceMappingURL=genStructuredOutputs.js.map

package/lib/module/controllers/genStructuredOutputs.js.map

@@ -1 +1 @@
-{"version":3,"names":["generateText","Output","AIOutput","createShouldMustTemplateAI","genStructuredOutputs","context","taskName","template","args","options","Error","getLLM","promptTemplate","Object","keys","inputDef","map","key","name","type","description","summary","shouldSection","mustSection","example","partialVars","promptArgs","entries","reduce","acc","value","messages","formatMessages","model","undefined","temperature","reasoningEffort","timeout","output","maxRetries","object","schema","outputSchema"],"sourceRoot":"../../../src","sources":["controllers/genStructuredOutputs.ts"],"mappings":"AACA,SAASA,YAAY,EAAEC,MAAM,IAAIC,QAAQ,QAAQ,IAAI;AAErD,OAAOC,0BAA0B,MAAM,iCAAiC;AAsBxE,eAAe,eAAeC,oBAAoBA,CAI9CC,OAA4B,EAC5BC,QAAgB,EAChBC,QAA+C,EAC/CC,IAAkD,EAClDC,OAAqC,EACtB;EACf,IAAI,CAACJ,OAAO,EAAE;IACV,MAAM,IAAIK,KAAK,CAAC,oBAAoB,CAAC;EACzC;EAEA,IAAI,EAACL,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAEM,MAAM,GAAE;IAClB,MAAM,IAAID,KAAK,CAAC,mBAAmB,CAAC;EACxC;EAEA,MAAME,cAAc,GAAG,MAAMT,0BAA0B,CACnDU,MAAM,CAACC,IAAI,CAACP,QAAQ,CAACQ,QAAQ,CAAC,CAACC,GAAG,CAAEC,GAAG,KAAM;IACzCC,IAAI,EAAED,GAAG;IACTE,IAAI,EAAEZ,QAAQ,CAACQ,QAAQ,CAACE,GAAG,CAAc,CAACE,IAAI;IAC9CC,WAAW,EAAEb,QAAQ,CAACQ,QAAQ,CAACE,GAAG,CAAc,CAACG;EACrD,CAAC,CAAC,CAAC,EACHb,QAAQ,CAACc,OAAO,EAChBd,QAAQ,CAACe,aAAa,EACtBf,QAAQ,CAACgB,WAAW,EACpBhB,QAAQ,CAACiB,OAAO,EAChBjB,QAAQ,CAACkB,WACb,CAAC;EAED,MAAMC,UAAU,GAAGb,MAAM,CAACc,OAAO,CAACnB,IAAiD,CAAC,CAACoB,MAAM,CACvF,CAACC,GAAG,EAAE,CAACZ,GAAG,EAAEa,KAAK,CAAC,KAAK;IACnBD,GAAG,CAACZ,GAAG,CAAC,GAAGa,KAAK,IAAI,EAAE;IACtB,OAAOD,GAAG;EACd,CAAC,EACD,CAAC,CACL,CAAC;EAED,MAAME,QAAQ,GAAG,MAAMnB,cAAc,CAACoB,cAAc,CAACN,UAAU,CAAC;EAEhE,MAAMO,KAAK,GAAG5B,OAAO,CAACM,MAAM,CACxBL,QAAQ,EACR4B,SAAS,EACT;IACID,KAAK,EAAExB,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEwB,KAAK;IACrBE,WAAW,EAAE1B,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAE0B,WAAW;IACjCC,eAAe,EAAE3B,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAE2B,eAAe;IACzCC,OAAO,EAAE5B,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAE4B;EACtB,CACJ,CAAC;EAED,MAAM;IAAEC;EAAO,CAAC,GAAG,MAAMtC,YAAY,CAAC;IAClCiC,KAAK;IACLF,QAAQ;IACRI,WAAW,EAAE1B,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAE0B,WAAW;IACjCI,UAAU,EAAE9B,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAE8B,UAAU;IAC/BD,MAAM,EAAEpC,QAAQ,CAACsC,MAAM,CAAC;MACpBC,MAAM,EAAElC,QAAQ,CAACmC;IACrB,CAAC;EACL,CAAC,CAAC;EAEF,OAAOJ,MAAM;AACjB","ignoreList":[]}
+{"version":3,"names":["generateText","zodToJsonSchema","zodToJsonSchemaRaw","createShouldMustTemplate","schema","tryParseJson","text","value","JSON","parse","raw","extractJsonCandidate","objectStart","indexOf","objectEnd","lastIndexOf","slice","arrayStart","arrayEnd","parseJsonFromText","_tryParseJson","lines","replace","split","startLine","i","length","line","test","Error","endLine","blockLines","innerLines","join","genStructuredOutputs","context","taskName","template","args","options","getLLM","inputDefs","Object","keys","inputDef","map","key","name","type","description","promptArgs","entries","reduce","acc","outputSchemaJson","stringify","outputSchema","e","message","String","mustSection","push","no","title","content","promptTemplate","summary","shouldSection","example","partialVars","model","temperature","reasoningEffort","verbosityLevel","timeout","maxParseRetries","maxRetries","buildCorrectionPrompt","errorMessage","lastErrorMessage","attempt","messages","formatMessages","Math","max","undefined","parsed","error","parsedResult","safeParse","success","data","role"],"sourceRoot":"../../../src","sources":["controllers/genStructuredOutputs.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/templates/ShouldMustTemplate.js

@@ -28,7 +28,12 @@ async function resolvePartialVars(partialVars) {
   return Object.fromEntries(entries);
 }
 function replaceTemplateVariables(template, values) {
-  return template.replace(getVariableRegex(), (_, variable) => values[variable] ?? "");
+  return template.replace(getVariableRegex(), (_, variable) => {
+    if (Object.prototype.hasOwnProperty.call(values, variable)) {
+      return values[variable] ?? "";
+    }
+    return `[${variable}](#${variable})`;
+  });
 }
 export default async function createShouldMustTemplate(inputDef, summary, shouldSection, mustSection, example, partialVars) {
   const shouldSectionPrompt = (() => {
@@ -56,49 +61,41 @@ export default async function createShouldMustTemplate(inputDef, summary, should
     const exampleSectionBody = example.map(elem => `## (c${elem.no}) ${elem.title}\n${elem.content}`).join("\n\n");
     return `# Example\n\n${exampleSectionBody}`;
   })();
-  const allSectionContent = [(shouldSection === null || shouldSection === void 0 ? void 0 : shouldSection.map(s => s.content || "").join(" ")) || "", (mustSection === null || mustSection === void 0 ? void 0 : mustSection.map(s => s.content || "").join(" ")) || "", (example === null || example === void 0 ? void 0 : example.map(s => s.content || "").join(" ")) || "", summary].join(" ");
-  const usedVariables = extractVariables(allSectionContent);
-  const definedInputVariables = inputDef.map(elem => elem.name);
-  const definedPartialVariables = Object.keys(partialVars || {});
-  const definedVariables = [...definedInputVariables, ...definedPartialVariables, "outputFormat"];
-  const undefinedVariables = usedVariables.filter(variable => !definedVariables.includes(variable));
-  if (undefinedVariables.length > 0) {
-    console.warn(`[ShouldMustTemplate] Warning: Found ${undefinedVariables.length} undefined variable(s) in template sections: [${undefinedVariables.join(", ")}]. These variables have been automatically added to the template.`);
-  }
-  const autoGeneratedVariablesSection = undefinedVariables.length > 0 ? `\n\n# Auto-Generated Variables\n\n${undefinedVariables.map(variable => `## ${variable}\n{${variable}}`).join("\n\n")}` : "";
   const systemPrompt = [summary, shouldSectionPrompt, mustSectionPrompt, exampleSectionPrompt].filter(Boolean).join("\n\n");
-  const stringInputPromptTemplate = inputDef.filter(elem => elem.type === "string").map(elem => `# ${elem.name}${elem.description ? `\n${elem.description}` : ""}\n{${elem.name}}`).join("\n\n");
-  const imageInputDefs = inputDef.filter(elem => elem.type === "imageDataURL");
-  const systemTemplate = [systemPrompt, "{outputFormat}"].filter(Boolean).join("\n\n").trim();
-  const userTextTemplate = [stringInputPromptTemplate, autoGeneratedVariablesSection].filter(Boolean).join("\n\n").trim();
+  const systemTemplate = [systemPrompt].filter(Boolean).join("\n\n").trim();
   return {
     async formatMessages(args) {
-      const resolvedPartialVars = await resolvePartialVars(partialVars || {});
       const mergedArgs = Object.entries(args || {}).reduce((acc, [key, value]) => {
         acc[key] = value ?? "";
         return acc;
       }, {});
+      const resolvedPartialVars = await resolvePartialVars(partialVars || {});
       const templateValues = {
         ...mergedArgs,
         ...resolvedPartialVars
       };
-      undefinedVariables.forEach(variable => {
-        if (!(variable in templateValues)) {
-          templateValues[variable] = "";
-        }
-      });
+
+      // Create system message content
       const systemMessage = {
         role: "system",
         content: replaceTemplateVariables(systemTemplate, templateValues)
       };
-      const userText = replaceTemplateVariables(userTextTemplate, templateValues);
+
+      // Create user message content
       const userContentParts = [];
-      if (userText.trim().length > 0) {
+      const argsText = inputDef.filter(elem => elem.type === "string").map(elem => `# ${elem.name}${elem.description ? `\n${elem.description}` : ""}
+${templateValues === null || templateValues === void 0 ? void 0 : templateValues[elem.name]}
+`).join("\n\n");
+      const partialVarsText = Object.entries(resolvedPartialVars).map(([key, value]) => `# ${key}
+${value}
+`).join("\n\n");
+      if (argsText.trim().length > 0 || partialVarsText.trim().length > 0) {
         userContentParts.push({
           type: "text",
-          text: userText
+          text: argsText + "\n\n" + partialVarsText
         });
       }
+      const imageInputDefs = inputDef.filter(elem => elem.type === "imageDataURL");
       imageInputDefs.forEach(elem => {
         const imageValue = templateValues[elem.name];
         if (imageValue && imageValue.trim().length > 0) {

package/lib/module/templates/ShouldMustTemplate.js.map

@@ -1 +1 @@
-{"version":3,"names":["getVariableRegex","RegExp","extractVariables","content","variableRegex","variables","match","exec","includes","push","resolvePartialVars","partialVars","entries","Promise","all","Object","map","key","value","result","fromEntries","replaceTemplateVariables","template","values","replace","_","variable","createShouldMustTemplate","inputDef","summary","shouldSection","mustSection","example","shouldSectionPrompt","length","shouldSectionCount","shouldSectionHeader","shouldSectionBody","elem","baseBody","no","title","join","mustSectionPrompt","mustSectionCount","mustSectionHeader","mustSectionBody","exampleSectionPrompt","exampleSectionBody","allSectionContent","s","usedVariables","definedInputVariables","name","definedPartialVariables","keys","definedVariables","undefinedVariables","filter","console","warn","autoGeneratedVariablesSection","systemPrompt","Boolean","stringInputPromptTemplate","type","description","imageInputDefs","systemTemplate","trim","userTextTemplate","formatMessages","args","resolvedPartialVars","mergedArgs","reduce","acc","templateValues","forEach","systemMessage","role","userText","userContentParts","text","imageValue","image","userMessage"],"sourceRoot":"../../../src","sources":["templates/ShouldMustTemplate.ts"],"mappings":"AAWA,SAASA,gBAAgBA,CAAA,EAAW;EAChC,IAAI;IACA,OAAO,IAAIC,MAAM,CAAC,sBAAsB,EAAE,IAAI,CAAC;EACnD,CAAC,CAAC,MAAM;IACJ,OAAO,6LAA6L;EACxM;AACJ;AAEA,SAASC,gBAAgBA,CAACC,OAAe,EAAY;EACjD,MAAMC,aAAa,GAAGJ,gBAAgB,CAAC,CAAC;EACxC,MAAMK,SAAmB,GAAG,EAAE;EAC9B,IAAIC,KAA6B,GAAG,IAAI;EACxC,OAAO,CAACA,KAAK,GAAGF,aAAa,CAACG,IAAI,CAACJ,OAAO,CAAC,MAAM,IAAI,EAAE;IACnD,IAAI,CAACE,SAAS,CAACG,QAAQ,CAACF,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;MAC/BD,SAAS,CAACI,IAAI,CAACH,KAAK,CAAC,CAAC,CAAC,CAAC;IAC5B;EACJ;EACA,OAAOD,SAAS;AACpB;AAEA,eAAeK,kBAAkBA,CAACC,WAA+E,EAAmC;EAChJ,IAAI,CAACA,WAAW,EAAE,OAAO,CAAC,CAAC;EAE3B,MAAMC,OAAO,GAAG,MAAMC,OAAO,CAACC,GAAG,CAC7BC,MAAM,CAACH,OAAO,CAACD,WAAW,CAAC,CAACK,GAAG,CAAC,OAAO,CAACC,GAAG,EAAEC,KAAK,CAAC,KAAK;IACpD,IAAI,OAAOA,KAAK,KAAK,UAAU,EAAE;MAC7B,MAAMC,MAAM,GAAGD,KAAK,CAAC,CAAC;MACtB,OAAO,CAACD,GAAG,EAAE,OAAOE,MAAM,KAAK,QAAQ,GAAGA,MAAM,GAAG,MAAMA,MAAM,CAAC;IACpE;IACA,OAAO,CAACF,GAAG,EAAEC,KAAK,CAAC;EACvB,CAAC,CACL,CAAC;EAED,OAAOH,MAAM,CAACK,WAAW,CAACR,OAAO,CAAC;AACtC;AAEA,SAASS,wBAAwBA,CAACC,QAAgB,EAAEC,MAA8B,EAAU;EACxF,OAAOD,QAAQ,CAACE,OAAO,CAACxB,gBAAgB,CAAC,CAAC,EAAE,CAACyB,CAAC,EAAEC,QAAQ,KAAMH,MAAM,CAACG,QAAQ,CAAC,IAAI,EAAG,CAAC;AAC1F;AAEA,eAAe,eAAeC,wBAAwBA,CAClDC,QAAoB,EACpBC,OAAe,EACfC,aAA+B,EAC/BC,WAA6B,EAC7BC,OAAyB,EACzBrB,WAA+E,EAC9C;EACjC,MAAMsB,mBAA2B,GAAG,CAAC,MAAM;IACvC,IAAI,EAACH,aAAa,aAAbA,aAAa,eAAbA,aAAa,CAAEI,MAAM,GAAE,OAAO,EAAE;IAErC,MAAMC,kBAA0B,GAAGL,aAAa,CAACI,MAAM;IACvD,MAAME,mBAA2B,GAAG,gEAAgED,kBAAkB,UAAU;IAChI,MAAME,iBAAyB,GAAGP,aAAa,CAC1Cd,GAAG,CAAEsB,IAAI,IAAK;MACX,MAAMC,QAAgB,GAAG,QAAQD,IAAI,CAACE,EAAE,KAAKF,IAAI,CAACG,KAAK,EAAE;MACzD,OAAOH,IAAI,CAACnC,OAAO,GAAG,GAAGoC,QAAQ,KAAKD,IAAI,CAACnC,OAAO,EAAE,GAAGoC,QAAQ;IACnE,CAAC,CAAC,CACDG,IAAI,CAAC,MAAM,CAAC;IAEjB,OAAO,GAAGN,mBAAmB,OAAOC,iBAAiB,EAAE;EAC3D,CAAC,EAAE,CAAC;EAEJ,MAAMM,iBAAyB,GAAG,CAAC,MAAM;IACrC,IAAI,EAACZ,WAAW,aAAXA,WAAW,eAAXA,WAAW,CAAEG,MAAM,GAAE,OAAO,EAAE;IAEnC,MAAMU,gBAAwB,GAAGb,WAAW,CAACG,MAAM;IACnD,MAAMW,iBAAyB,GAAG,qEAAqED,gBAAgB,UAAU;IACjI,MAAME,eAAuB,GAAGf,WAAW,CACtCf,GAAG,CAAEsB,IAAI,IAAK;MACX,MAAMC,QAAgB,GAAG,QAAQD,IAAI,CAACE,EAAE,KAAKF,IAAI,CAACG,KAAK,EAAE;MACzD,OAAOH,IAAI,CAACnC,OAAO,GAAG,GAAGoC,QAAQ,KAAKD,IAAI,CAACnC,OAAO,EAAE,GAAGoC,QAAQ;IACnE,CAAC,CAAC,CACDG,IAAI,CAAC,MAAM,CAAC;IAEjB,OAAO,GAAGG,iBAAiB,OAAOC,eAAe,EAAE;EACvD,CAAC,EAAE,CAAC;EAEJ,MAAMC,oBAA4B,GAAG,CAAC,MAAM;IACxC,IAAI,EAACf,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAEE,MAAM,GAAE,OAAO,EAAE;IAE/B,MAAMc,kBAA0B,GAAGhB,OAAO,CACrChB,GAAG,CAAEsB,IAAI,IAAK,QAAQA,IAAI,CAACE,EAAE,KAAKF,IAAI,CAACG,KAAK,KAAKH,IAAI,CAACnC,OAAO,EAAE,CAAC,CAChEuC,IAAI,CAAC,MAAM,CAAC;IAEjB,OAAO,gBAAgBM,kBAAkB,EAAE;EAC/C,CAAC,EAAE,CAAC;EAEJ,MAAMC,iBAAiB,GAAG,CACtB,CAAAnB,aAAa,aAAbA,aAAa,uBAAbA,aAAa,CAAEd,GAAG,CAAEkC,CAAC,IAAKA,CAAC,CAAC/C,OAAO,IAAI,EAAE,CAAC,CAACuC,IAAI,CAAC,GAAG,CAAC,KAAI,EAAE,EAC1D,CAAAX,WAAW,aAAXA,WAAW,uBAAXA,WAAW,CAAEf,GAAG,CAAEkC,CAAC,IAAKA,CAAC,CAAC/C,OAAO,IAAI,EAAE,CAAC,CAACuC,IAAI,CAAC,GAAG,CAAC,KAAI,EAAE,EACxD,CAAAV,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEhB,GAAG,CAAEkC,CAAC,IAAKA,CAAC,CAAC/C,OAAO,IAAI,EAAE,CAAC,CAACuC,IAAI,CAAC,GAAG,CAAC,KAAI,EAAE,EACpDb,OAAO,CACV,CAACa,IAAI,CAAC,GAAG,CAAC;EAEX,MAAMS,aAAa,GAAGjD,gBAAgB,CAAC+C,iBAAiB,CAAC;EACzD,MAAMG,qBAAqB,GAAGxB,QAAQ,CAACZ,GAAG,CAAEsB,IAAI,IAAKA,IAAI,CAACe,IAAI,CAAC;EAC/D,MAAMC,uBAAuB,GAAGvC,MAAM,CAACwC,IAAI,CAAC5C,WAAW,IAAI,CAAC,CAAC,CAAC;EAC9D,MAAM6C,gBAAgB,GAAG,CAAC,GAAGJ,qBAAqB,EAAE,GAAGE,uBAAuB,EAAE,cAAc,CAAC;EAE/F,MAAMG,kBAAkB,GAAGN,aAAa,CAACO,MAAM,CAAEhC,QAAQ,IAAK,CAAC8B,gBAAgB,CAAChD,QAAQ,CAACkB,QAAQ,CAAC,CAAC;EACnG,IAAI+B,kBAAkB,CAACvB,MAAM,GAAG,CAAC,EAAE;IAC/ByB,OAAO,CAACC,IAAI,CACR,uCAAuCH,kBAAkB,CAACvB,MAAM,iDAAiDuB,kBAAkB,CAACf,IAAI,CACpI,IACJ,CAAC,mEACL,CAAC;EACL;EAEA,MAAMmB,6BAA6B,GAC/BJ,kBAAkB,CAACvB,MAAM,GAAG,CAAC,GACvB,qCAAqCuB,kBAAkB,CAClDzC,GAAG,CAAEU,QAAQ,IAAK,MAAMA,QAAQ,MAAMA,QAAQ,GAAG,CAAC,CAClDgB,IAAI,CAAC,MAAM,CAAC,EAAE,GACnB,EAAE;EAEZ,MAAMoB,YAAoB,GAAG,CAACjC,OAAO,EAAEI,mBAAmB,EAAEU,iBAAiB,EAAEI,oBAAoB,CAAC,CAC/FW,MAAM,CAACK,OAAO,CAAC,CACfrB,IAAI,CAAC,MAAM,CAAC;EAEjB,MAAMsB,yBAAyB,GAAGpC,QAAQ,CACrC8B,MAAM,CAAEpB,IAAI,IAAKA,IAAI,CAAC2B,IAAI,KAAK,QAAQ,CAAC,CACxCjD,GAAG,CACCsB,IAAI,IACD,KAAKA,IAAI,CAACe,IAAI,GAAGf,IAAI,CAAC4B,WAAW,GAAG,KAAK5B,IAAI,CAAC4B,WAAW,EAAE,GAAG,EAAE,MAAM5B,IAAI,CAACe,IAAI,GACvF,CAAC,CACAX,IAAI,CAAC,MAAM,CAAC;EAEjB,MAAMyB,cAAc,GAAGvC,QAAQ,CAAC8B,MAAM,CAAEpB,IAAI,IAAKA,IAAI,CAAC2B,IAAI,KAAK,cAAc,CAAC;EAE9E,MAAMG,cAAc,GAAG,CAACN,YAAY,EAAE,gBAAgB,CAAC,CAClDJ,MAAM,CAACK,OAAO,CAAC,CACfrB,IAAI,CAAC,MAAM,CAAC,CACZ2B,IAAI,CAAC,CAAC;EAEX,MAAMC,gBAAgB,GAAG,CAACN,yBAAyB,EAAEH,6BAA6B,CAAC,CAC9EH,MAAM,CAACK,OAAO,CAAC,CACfrB,IAAI,CAAC,MAAM,CAAC,CACZ2B,IAAI,CAAC,CAAC;EAEX,OAAO;IACH,MAAME,cAAcA,CAACC,IAAkB,EAAE;MACrC,MAAMC,mBAAmB,GAAG,MAAM/D,kBAAkB,CAACC,WAAW,IAAI,CAAC,CAAC,CAAC;MACvE,MAAM+D,UAAU,GAAG3D,MAAM,CAACH,OAAO,CAAC4D,IAAI,IAAI,CAAC,CAAC,CAAC,CAACG,MAAM,CAAyB,CAACC,GAAG,EAAE,CAAC3D,GAAG,EAAEC,KAAK,CAAC,KAAK;QAChG0D,GAAG,CAAC3D,GAAG,CAAC,GAAGC,KAAK,IAAI,EAAE;QACtB,OAAO0D,GAAG;MACd,CAAC,EAAE,CAAC,CAAC,CAAC;MAEN,MAAMC,cAAsC,GAAG;QAC3C,GAAGH,UAAU;QACb,GAAGD;MACP,CAAC;MAEDhB,kBAAkB,CAACqB,OAAO,CAAEpD,QAAQ,IAAK;QACrC,IAAI,EAAEA,QAAQ,IAAImD,cAAc,CAAC,EAAE;UAC/BA,cAAc,CAACnD,QAAQ,CAAC,GAAG,EAAE;QACjC;MACJ,CAAC,CAAC;MAEF,MAAMqD,aAAiC,GAAG;QACtCC,IAAI,EAAE,QAAQ;QACd7E,OAAO,EAAEkB,wBAAwB,CAAC+C,cAAc,EAAES,cAAc;MACpE,CAAC;MAED,MAAMI,QAAQ,GAAG5D,wBAAwB,CAACiD,gBAAgB,EAAEO,cAAc,CAAC;MAE3E,MAAMK,gBAA6C,GAAG,EAAE;MACxD,IAAID,QAAQ,CAACZ,IAAI,CAAC,CAAC,CAACnC,MAAM,GAAG,CAAC,EAAE;QAC5BgD,gBAAgB,CAACzE,IAAI,CAAC;UAClBwD,IAAI,EAAE,MAAM;UACZkB,IAAI,EAAEF;QACV,CAAC,CAAC;MACN;MAEAd,cAAc,CAACW,OAAO,CAAExC,IAAI,IAAK;QAC7B,MAAM8C,UAAU,GAAGP,cAAc,CAACvC,IAAI,CAACe,IAAI,CAAC;QAC5C,IAAI+B,UAAU,IAAIA,UAAU,CAACf,IAAI,CAAC,CAAC,CAACnC,MAAM,GAAG,CAAC,EAAE;UAC5CgD,gBAAgB,CAACzE,IAAI,CAAC;YAClBwD,IAAI,EAAE,OAAO;YACboB,KAAK,EAAED;UACX,CAAC,CAAC;QACN;MACJ,CAAC,CAAC;MAEF,MAAME,WAA6B,GAAG;QAClCN,IAAI,EAAE,MAAM;QACZ7E,OAAO,EAAE+E,gBAAgB,CAAChD,MAAM,GAAG,CAAC,GAAGgD,gBAAgB,GAAG;MAC9D,CAAC;MAED,OAAO,CAACH,aAAa,EAAEO,WAAW,CAAC;IACvC;EACJ,CAAC;AACL","ignoreList":[]}
+{"version":3,"names":["getVariableRegex","RegExp","extractVariables","content","variableRegex","variables","match","exec","includes","push","resolvePartialVars","partialVars","entries","Promise","all","Object","map","key","value","result","fromEntries","replaceTemplateVariables","template","values","replace","_","variable","prototype","hasOwnProperty","call","createShouldMustTemplate","inputDef","summary","shouldSection","mustSection","example","shouldSectionPrompt","length","shouldSectionCount","shouldSectionHeader","shouldSectionBody","elem","baseBody","no","title","join","mustSectionPrompt","mustSectionCount","mustSectionHeader","mustSectionBody","exampleSectionPrompt","exampleSectionBody","systemPrompt","filter","Boolean","systemTemplate","trim","formatMessages","args","mergedArgs","reduce","acc","resolvedPartialVars","templateValues","systemMessage","role","userContentParts","argsText","type","name","description","partialVarsText","text","imageInputDefs","forEach","imageValue","image","userMessage"],"sourceRoot":"../../../src","sources":["templates/ShouldMustTemplate.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/types.js

@@ -69,7 +69,7 @@ export const ModelNameAlias = {
   },
   // gpt-5.1
   "gpt-5.1-chat": {
-    model: "gpt-5.1-chat-latest",
+    model: "gpt-5.1-chat",
     vendor: {
       type: "openai"
     }

package/lib/module/types.js.map

@@ -1 +1 @@
-{"version":3,"names":["ModelNameAlias","model","vendor","type"],"sourceRoot":"../../src","sources":["types.ts"],"mappings":"AA4DA,OAAO,MAAMA,cAA0D,GAAG;EACtE;EACA,gBAAgB,EAAE;IACd,OAAO,EAAE,yBAAyB;IAClC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EACD,kBAAkB,EAAE;IAChB,OAAO,EAAE,2BAA2B;IACpC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EACD,mBAAmB,EAAE;IACjB,OAAO,EAAE,4BAA4B;IACrC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EACD,iBAAiB,EAAE;IACf,OAAO,EAAE,0BAA0B;IACnC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EACD,eAAe,EAAE;IACb,OAAO,EAAE,wBAAwB;IACjC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EACD,iBAAiB,EAAE;IACf,OAAO,EAAE,0BAA0B;IACnC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EACD,mBAAmB,EAAE;IACjB,OAAO,EAAE,4BAA4B;IACrC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EACD,kBAAkB,EAAE;IAChB,OAAO,EAAE,2BAA2B;IACpC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EACD,iBAAiB,EAAE;IACf,OAAO,EAAE,0BAA0B;IACnC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EAED;EACA,QAAQ,EAAE;IACNC,KAAK,EAAE,QAAQ;IACfC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EACD,aAAa,EAAE;IACXF,KAAK,EAAE,aAAa;IACpBC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EAED;EACA,cAAc,EAAE;IACZF,KAAK,EAAE,qBAAqB;IAC5BC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EACD,SAAS,EAAE;IACPF,KAAK,EAAE,SAAS;IAChBC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EAED;EACA,SAAS,EAAE;IACPF,KAAK,EAAE,SAAS;IAChBC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EACD,cAAc,EAAE;IACZF,KAAK,EAAE,qBAAqB;IAC5BC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EAED;EACA,cAAc,EAAE;IACZF,KAAK,EAAE,sBAAsB;IAC7BC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EACD,gBAAgB,EAAE;IACdF,KAAK,EAAE,wBAAwB;IAC/BC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EACD,kBAAkB,EAAE;IAChBF,KAAK,EAAE,kBAAkB;IACzBC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EACD,uBAAuB,EAAE;IACrBF,KAAK,EAAE,uBAAuB;IAC9BC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EACD,gBAAgB,EAAE;IACdF,KAAK,EAAE,gBAAgB;IACvBC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B;AACJ,CAAU","ignoreList":[]}
+{"version":3,"names":["ModelNameAlias","model","vendor","type"],"sourceRoot":"../../src","sources":["types.ts"],"mappings":"AA4DA,OAAO,MAAMA,cAA0D,GAAG;EACtE;EACA,gBAAgB,EAAE;IACd,OAAO,EAAE,yBAAyB;IAClC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EACD,kBAAkB,EAAE;IAChB,OAAO,EAAE,2BAA2B;IACpC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EACD,mBAAmB,EAAE;IACjB,OAAO,EAAE,4BAA4B;IACrC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EACD,iBAAiB,EAAE;IACf,OAAO,EAAE,0BAA0B;IACnC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EACD,eAAe,EAAE;IACb,OAAO,EAAE,wBAAwB;IACjC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EACD,iBAAiB,EAAE;IACf,OAAO,EAAE,0BAA0B;IACnC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EACD,mBAAmB,EAAE;IACjB,OAAO,EAAE,4BAA4B;IACrC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EACD,kBAAkB,EAAE;IAChB,OAAO,EAAE,2BAA2B;IACpC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EACD,iBAAiB,EAAE;IACf,OAAO,EAAE,0BAA0B;IACnC,QAAQ,EAAE;MAAE,MAAM,EAAE;IAAY;EACpC,CAAC;EAED;EACA,QAAQ,EAAE;IACNC,KAAK,EAAE,QAAQ;IACfC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EACD,aAAa,EAAE;IACXF,KAAK,EAAE,aAAa;IACpBC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EAED;EACA,cAAc,EAAE;IACZF,KAAK,EAAE,cAAc;IACrBC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EACD,SAAS,EAAE;IACPF,KAAK,EAAE,SAAS;IAChBC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EAED;EACA,SAAS,EAAE;IACPF,KAAK,EAAE,SAAS;IAChBC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EACD,cAAc,EAAE;IACZF,KAAK,EAAE,qBAAqB;IAC5BC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EAED;EACA,cAAc,EAAE;IACZF,KAAK,EAAE,sBAAsB;IAC7BC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EACD,gBAAgB,EAAE;IACdF,KAAK,EAAE,wBAAwB;IAC/BC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EACD,kBAAkB,EAAE;IAChBF,KAAK,EAAE,kBAAkB;IACzBC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EACD,uBAAuB,EAAE;IACrBF,KAAK,EAAE,uBAAuB;IAC9BC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B,CAAC;EACD,gBAAgB,EAAE;IACdF,KAAK,EAAE,gBAAgB;IACvBC,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAS;EAC7B;AACJ,CAAU","ignoreList":[]}

package/lib/module/utils/createGetLLM.js

@@ -1,17 +1,87 @@
 import { wrapLanguageModel } from "ai";
+import { ModelNameAlias } from "../types";
 import { openai } from "@ai-sdk/openai";
 import { createOpenAICompatible } from "@ai-sdk/openai-compatible";
 import { anthropic, createAnthropic } from "@ai-sdk/anthropic";
 import { google, createGoogleGenerativeAI } from "@ai-sdk/google";
 import { azure, createAzure } from "@ai-sdk/azure";
+const REVPROXY_JSON_INSTRUCTION = "Return a valid JSON object only. Do not include any extra text.";
+const isRevproxyEnabled = () => Boolean(process.env.JELIQ_LLM_REVPROXY_KEY && process.env.JELIQ_LLM_REVPROXY_CONTAINER_ID && process.env.JELIQ_LLM_REVPROXY_ENDPOINT);
+const addJsonInstructionToPrompt = prompt => {
+  if (!Array.isArray(prompt) || prompt.length === 0) {
+    return prompt;
+  }
+  const hasInstruction = prompt.some(message => (message === null || message === void 0 ? void 0 : message.role) === "system" && typeof message.content === "string" && message.content.includes(REVPROXY_JSON_INSTRUCTION));
+  if (hasInstruction) {
+    return prompt;
+  }
+  const instructionMessage = {
+    role: "system",
+    content: REVPROXY_JSON_INSTRUCTION
+  };
+  const insertIndex = prompt.findIndex(message => (message === null || message === void 0 ? void 0 : message.role) !== "system");
+  if (insertIndex === -1) {
+    return [...prompt, instructionMessage];
+  }
+  return [...prompt.slice(0, insertIndex), instructionMessage, ...prompt.slice(insertIndex)];
+};
+const normalizeJsonContent = content => {
+  if (!Array.isArray(content)) {
+    return content;
+  }
+  let text = "";
+  for (const part of content) {
+    if ((part === null || part === void 0 ? void 0 : part.type) === "text" && typeof part.text === "string") {
+      text += part.text;
+    }
+  }
+  if (!text) {
+    return content;
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(text);
+  } catch {
+    return content;
+  }
+  const normalizedText = JSON.stringify(parsed);
+  let inserted = false;
+  return content.flatMap(part => {
+    if ((part === null || part === void 0 ? void 0 : part.type) !== "text" || typeof part.text !== "string") {
+      return [part];
+    }
+    if (inserted) {
+      return [];
+    }
+    inserted = true;
+    return [{
+      ...part,
+      text: normalizedText
+    }];
+  });
+};
 function createProviderModel(vendor, modelName) {
-  if (process.env.JELIQ_LLM_REVPROXY_KEY && process.env.JELIQ_LLM_REVPROXY_ENDPOINT) {
+  var _ModelNameAlias;
+  const actualModelName = (ModelNameAlias === null || ModelNameAlias === void 0 || (_ModelNameAlias = ModelNameAlias[modelName]) === null || _ModelNameAlias === void 0 ? void 0 : _ModelNameAlias.model) || modelName;
+  if (isRevproxyEnabled()) {
     const provider = createOpenAICompatible({
       name: "jeliq-llm-revproxy",
-      apiKey: process.env.JELIQ_LLM_REVPROXY_KEY,
-      baseURL: process.env.JELIQ_LLM_REVPROXY_ENDPOINT
+      apiKey: process.env.JELIQ_LLM_REVPROXY_KEY || "",
+      baseURL: process.env.JELIQ_LLM_REVPROXY_ENDPOINT || "",
+      headers: {
+        'X-Container-ID': process.env.JELIQ_LLM_REVPROXY_CONTAINER_ID || ""
+      }
+      // supportsStructuredOutputs: true,
+      /*
+      fetch: async (input, init) => {
+          if (init?.body) {
+              console.log("REQUEST BODY:", init.body.toString());
+          }
+          return fetch(input, init);
+      },
+      */
     });
-    return provider(modelName);
+    return provider(actualModelName);
   }
   if (vendor.type === "anthropic") {
     const provider = vendor.apiKey || vendor.endpoint ? createAnthropic({
@@ -20,7 +90,7 @@ function createProviderModel(vendor, modelName) {
         baseURL: vendor.endpoint
       } : {})
     }) : anthropic;
-    return provider(modelName);
+    return provider(actualModelName);
   }
   if (vendor.type === "google") {
     const provider = vendor.apiKey || vendor.endpoint ? createGoogleGenerativeAI({
@@ -29,7 +99,7 @@ function createProviderModel(vendor, modelName) {
         baseURL: vendor.endpoint
       } : {})
     }) : google;
-    return provider(modelName);
+    return provider(actualModelName);
   }
   if (vendor.type === "azure") {
     const provider = vendor.apiKey || vendor.instanceName ? createAzure({
@@ -40,9 +110,9 @@ function createProviderModel(vendor, modelName) {
       apiVersion: vendor.apiVersion,
       useDeploymentBasedUrls: true
     }) : azure;
-    return provider(vendor.deploymentName || modelName);
+    return provider(vendor.deploymentName || actualModelName);
   }
-  return openai(modelName);
+  return openai(actualModelName);
 }
 export default function createGetLLM(tasksModelsMap, defaultModel) {
   function getModelAndTemperature(taskName) {
@@ -68,6 +138,7 @@ export default function createGetLLM(tasksModelsMap, defaultModel) {
     const actualReasoningEffort = (options === null || options === void 0 ? void 0 : options.reasoningEffort) !== undefined ? options.reasoningEffort : reasoningEffort;
     const actualVerbosityLevel = (options === null || options === void 0 ? void 0 : options.verbosityLevel) !== undefined ? options.verbosityLevel : verbosityLevel;
     const actualTimeout = (options === null || options === void 0 ? void 0 : options.timeout) !== undefined ? options.timeout : timeout !== undefined ? timeout : undefined;
+    const usesRevproxy = isRevproxyEnabled();
     const model = createProviderModel(resolvedVendor, actualModelName);
 
     // 直前に CallOptions を変形するミドルウェア

package/lib/module/utils/createGetLLM.js.map

@@ -1 +1 @@
-{"version":3,"names":["wrapLanguageModel","openai","createOpenAICompatible","anthropic","createAnthropic","google","createGoogleGenerativeAI","azure","createAzure","createProviderModel","vendor","modelName","process","env","JELIQ_LLM_REVPROXY_KEY","JELIQ_LLM_REVPROXY_ENDPOINT","provider","name","apiKey","baseURL","type","endpoint","instanceName","resourceName","apiVersion","useDeploymentBasedUrls","deploymentName","createGetLLM","tasksModelsMap","defaultModel","getModelAndTemperature","taskName","model","Error","reasoningEffort","undefined","verbosityLevel","temperature","timeout","getLLM","options","_loggingInfo","resolvedVendor","actualModelName","actualTemperature","actualReasoningEffort","actualVerbosityLevel","actualTimeout","mutateCallOptionsMiddleware","specificationVersion","transformParams","params","_next$providerOptions","next","Math","min","max","providerOptions","textVerbosity","middleware"],"sourceRoot":"../../../src","sources":["utils/createGetLLM.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["wrapLanguageModel","ModelNameAlias","openai","createOpenAICompatible","anthropic","createAnthropic","google","createGoogleGenerativeAI","azure","createAzure","REVPROXY_JSON_INSTRUCTION","isRevproxyEnabled","Boolean","process","env","JELIQ_LLM_REVPROXY_KEY","JELIQ_LLM_REVPROXY_CONTAINER_ID","JELIQ_LLM_REVPROXY_ENDPOINT","addJsonInstructionToPrompt","prompt","Array","isArray","length","hasInstruction","some","message","role","content","includes","instructionMessage","insertIndex","findIndex","slice","normalizeJsonContent","text","part","type","parsed","JSON","parse","normalizedText","stringify","inserted","flatMap","createProviderModel","vendor","modelName","_ModelNameAlias","actualModelName","model","provider","name","apiKey","baseURL","headers","endpoint","instanceName","resourceName","apiVersion","useDeploymentBasedUrls","deploymentName","createGetLLM","tasksModelsMap","defaultModel","getModelAndTemperature","taskName","Error","reasoningEffort","undefined","verbosityLevel","temperature","timeout","getLLM","options","_loggingInfo","resolvedVendor","actualTemperature","actualReasoningEffort","actualVerbosityLevel","actualTimeout","usesRevproxy","mutateCallOptionsMiddleware","specificationVersion","transformParams","params","_next$providerOptions","next","Math","min","max","providerOptions","textVerbosity","middleware"],"sourceRoot":"../../../src","sources":["utils/createGetLLM.ts"],"mappings":"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","ignoreList":[]}

package/lib/typescript/src/controllers/genStructuredOutputs.d.ts

@@ -1,6 +1,6 @@
 import { BackendContext } from "@jeliq/app-sdk-core";
 import { ZodSchema } from "zod";
-import { InputDefObj, PromptElement } from "../types";
+import { InputDefObj, PromptElement, REASONING_EFFORT, VERBOSITY_LEVEL } from "../types";
 type StructuredTemplate<InputKeys extends string | number | symbol, Output> = {
     type: "ShouldMust";
     inputDef: InputDefObj<InputKeys>;
@@ -14,7 +14,8 @@ type StructuredTemplate<InputKeys extends string | number | symbol, Output> = {
 export type GenStructuredOutputsOptions = {
     model?: string;
     temperature?: number;
-    reasoningEffort?: "low" | "medium" | "high";
+    reasoningEffort?: REASONING_EFFORT;
+    verbosityLevel?: VERBOSITY_LEVEL;
     timeout?: number;
     maxRetries?: number;
 };

package/lib/typescript/src/controllers/genStructuredOutputs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"genStructuredOutputs.d.ts","sourceRoot":"","sources":["../../../../src/controllers/genStructuredOutputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AAEhC,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEtD,KAAK,kBAAkB,CAAC,SAAS,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,MAAM,IAAI;IAC1E,IAAI,EAAE,YAAY,CAAC;IACnB,QAAQ,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IAChC,aAAa,CAAC,EAAE,aAAa,EAAE,CAAC;IAChC,WAAW,CAAC,EAAE,aAAa,EAAE,CAAC;IAC9B,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,MAAM,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,MAAM,CAAC,CAAC,CAAC,CAAC;CACnF,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;IAC5C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,wBAA8B,oBAAoB,CAC9C,SAAS,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,EAC1C,MAAM,EAEN,OAAO,EAAE,cAAc,CAAC,GAAG,CAAC,EAC5B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,kBAAkB,CAAC,SAAS,EAAE,MAAM,CAAC,EAC/C,IAAI,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC,EAClD,OAAO,CAAC,EAAE,2BAA2B,GACtC,OAAO,CAAC,MAAM,CAAC,CAsDjB"}
+{"version":3,"file":"genStructuredOutputs.d.ts","sourceRoot":"","sources":["../../../../src/controllers/genStructuredOutputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAGrD,OAAO,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AAGhC,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAEzF,KAAK,kBAAkB,CAAC,SAAS,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,MAAM,IAAI;IAC1E,IAAI,EAAE,YAAY,CAAC;IACnB,QAAQ,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IAChC,aAAa,CAAC,EAAE,aAAa,EAAE,CAAC;IAChC,WAAW,CAAC,EAAE,aAAa,EAAE,CAAC;IAC9B,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,MAAM,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,MAAM,CAAC,CAAC,CAAC,CAAC;CACnF,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,gBAAgB,CAAC;IACnC,cAAc,CAAC,EAAE,eAAe,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAoEF,wBAA8B,oBAAoB,CAC9C,SAAS,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,EAC1C,MAAM,EAEN,OAAO,EAAE,cAAc,CAAC,GAAG,CAAC,EAC5B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,kBAAkB,CAAC,SAAS,EAAE,MAAM,CAAC,EAC/C,IAAI,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC,EAClD,OAAO,CAAC,EAAE,2BAA2B,GACtC,OAAO,CAAC,MAAM,CAAC,CAkIjB"}

package/lib/typescript/src/templates/ShouldMustTemplate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ShouldMustTemplate.d.ts","sourceRoot":"","sources":["../../../../src/templates/ShouldMustTemplate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,kBAAkB,EAAY,gBAAgB,EAAE,MAAM,IAAI,CAAC;AAC/E,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEnD,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC,CAAC;AAE9D,KAAK,aAAa,GAAG,KAAK,CAAC,kBAAkB,GAAG,gBAAgB,CAAC,CAAC;AAElE,KAAK,wBAAwB,GAAG;IAC5B,cAAc,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC;CAClE,CAAC;AA0CF,wBAA8B,wBAAwB,CAClD,QAAQ,EAAE,QAAQ,EAAE,EACpB,OAAO,EAAE,MAAM,EACf,aAAa,CAAC,EAAE,aAAa,EAAE,EAC/B,WAAW,CAAC,EAAE,aAAa,EAAE,EAC7B,OAAO,CAAC,EAAE,aAAa,EAAE,EACzB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,MAAM,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,MAAM,CAAC,CAAC,CAAC,GAChF,OAAO,CAAC,wBAAwB,CAAC,CAiJnC"}
+{"version":3,"file":"ShouldMustTemplate.d.ts","sourceRoot":"","sources":["../../../../src/templates/ShouldMustTemplate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,kBAAkB,EAAY,gBAAgB,EAAE,MAAM,IAAI,CAAC;AAC/E,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEnD,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC,CAAC;AAE9D,KAAK,aAAa,GAAG,KAAK,CAAC,kBAAkB,GAAG,gBAAgB,CAAC,CAAC;AAElE,KAAK,wBAAwB,GAAG;IAC5B,cAAc,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC;CAClE,CAAC;AA+CF,wBAA8B,wBAAwB,CAClD,QAAQ,EAAE,QAAQ,EAAE,EACpB,OAAO,EAAE,MAAM,EACf,aAAa,CAAC,EAAE,aAAa,EAAE,EAC/B,WAAW,CAAC,EAAE,aAAa,EAAE,EAC7B,OAAO,CAAC,EAAE,aAAa,EAAE,EACzB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,MAAM,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,MAAM,CAAC,CAAC,CAAC,GAChF,OAAO,CAAC,wBAAwB,CAAC,CAmHnC"}

package/lib/typescript/src/utils/createGetLLM.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createGetLLM.d.ts","sourceRoot":"","sources":["../../../../src/utils/createGetLLM.ts"],"names":[],"mappings":"AAIA,OAAO,EAAc,MAAM,EAAE,UAAU,EAAqC,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAqD/G,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,SAAS,SAAS,MAAM,EAAE,SAAS,SAAS,gBAAgB,EAC7F,cAAc,EAAE,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,EACxD,YAAY,EAAE,UAAU,CAAC,SAAS,CAAC,GACpC,MAAM,CAAC,SAAS,CAAC,CAmGnB"}
+{"version":3,"file":"createGetLLM.d.ts","sourceRoot":"","sources":["../../../../src/utils/createGetLLM.ts"],"names":[],"mappings":"AAIA,OAAO,EAAc,MAAM,EAAE,UAAU,EAAqC,gBAAgB,EAA6B,MAAM,UAAU,CAAC;AAqJ1I,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,SAAS,SAAS,MAAM,EAAE,SAAS,SAAS,gBAAgB,EAC7F,cAAc,EAAE,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,EACxD,YAAY,EAAE,UAAU,CAAC,SAAS,CAAC,GACpC,MAAM,CAAC,SAAS,CAAC,CAqGnB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jeliq/app-sdk-llm",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "homepage": "https://jeliq.ai/",
   "author": "Jeliq.ai",
   "license": "MIT",
@@ -24,7 +24,8 @@
     "@ai-sdk/openai-compatible": "^2.0.4",
     "ai": "^6.0.11",
     "lodash": "^4.17.21",
-    "ts-node": "^10.9.2"
+    "ts-node": "^10.9.2",
+    "zod-to-json-schema": "^3.25.0"
   },
   "devDependencies": {
     "@types/jest": "^30.0.0",