@adminforth/agent 1.9.1 → 1.10.0

package/agent/middleware/sequenceDebug.ts

@@ -1,4 +1,5 @@
 import { AIMessage } from "@langchain/core/messages";
+import { convertMessagesToResponsesInput } from "@langchain/openai";
 import { createMiddleware } from "langchain";
 import YAML from "yaml";
 import type { ToolCallEvent } from "../toolCallEvents.js";
@@ -120,44 +121,36 @@ function finalizeSequenceDebug(sequence: PendingSequenceDebug): SequenceDebug {
   };
 }
 
+type OpenAiResponsesDebugModel = {
+  model: string;
+  zdrEnabled?: boolean;
+  invocationParams: (options?: Record<string, unknown>) => Record<string, unknown>;
+};
+
 function stringifyPromptForDebug(params: {
-  systemMessage: { toDict(): unknown };
-  messages: Array<{ toDict(): unknown }>;
+  model: OpenAiResponsesDebugModel;
+  systemMessage: { text: string };
+  messages: unknown[];
   tools: unknown[];
+  toolChoice?: unknown;
   modelSettings?: Record<string, unknown>;
 }) {
-  const { systemMessage, messages, tools, modelSettings } = params;
+  const { model, systemMessage, messages, tools, toolChoice, modelSettings } = params;
 
   return YAML.stringify({
-    systemMessage: systemMessage.toDict(),
-    messages: messages.map((message) => message.toDict()),
-    tools: tools.map((tool) => {
-      if (
-        typeof tool === "object" &&
-        tool !== null &&
-        "name" in tool &&
-        typeof tool.name === "string"
-      ) {
-        return tool.name;
-      }
-
-      if (
-        typeof tool === "object" &&
-        tool !== null &&
-        "schema" in tool &&
-        typeof tool.schema === "object" &&
-        tool.schema !== null &&
-        "name" in tool.schema &&
-        typeof tool.schema.name === "string"
-      ) {
-        return tool.schema.name;
-      }
-
-      return "";
+    input: convertMessagesToResponsesInput({
+      messages: [
+        ...(systemMessage.text === "" ? [] : [systemMessage]),
+        ...messages,
+      ] as any[],
+      zdrEnabled: model.zdrEnabled ?? false,
+      model: model.model,
+    }),
+    ...model.invocationParams({
+    ...(modelSettings ?? {}),
+    ...(tools.length > 0 ? { tools } : {}),
+    ...(toolChoice !== undefined ? { tool_choice: toolChoice } : {}),
     }),
-    ...(modelSettings && Object.keys(modelSettings).length > 0
-      ? { modelSettings }
-      : {}),
   });
 }
 
@@ -356,9 +349,11 @@ export function createSequenceDebugMiddleware(
     name: "SequenceDebugMiddleware",
     async wrapModelCall(request, handler) {
       const prompt = stringifyPromptForDebug({
+        model: request.model as unknown as OpenAiResponsesDebugModel,
         systemMessage: request.systemMessage,
         messages: request.messages,
         tools: request.tools,
+        toolChoice: request.toolChoice,
         modelSettings: request.modelSettings,
       });
 

package/dist/agent/middleware/sequenceDebug.js

@@ -18,6 +18,7 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+import { convertMessagesToResponsesInput } from "@langchain/openai";
 import { createMiddleware } from "langchain";
 import YAML from "yaml";
 function createPendingSequenceDebug(sequenceId) {
@@ -66,27 +67,16 @@ function finalizeSequenceDebug(sequence) {
     };
 }
 function stringifyPromptForDebug(params) {
-    const { systemMessage, messages, tools, modelSettings } = params;
-    return YAML.stringify(Object.assign({ systemMessage: systemMessage.toDict(), messages: messages.map((message) => message.toDict()), tools: tools.map((tool) => {
-            if (typeof tool === "object" &&
-                tool !== null &&
-                "name" in tool &&
-                typeof tool.name === "string") {
-                return tool.name;
-            }
-            if (typeof tool === "object" &&
-                tool !== null &&
-                "schema" in tool &&
-                typeof tool.schema === "object" &&
-                tool.schema !== null &&
-                "name" in tool.schema &&
-                typeof tool.schema.name === "string") {
-                return tool.schema.name;
-            }
-            return "";
-        }) }, (modelSettings && Object.keys(modelSettings).length > 0
-        ? { modelSettings }
-        : {})));
+    var _a;
+    const { model, systemMessage, messages, tools, toolChoice, modelSettings } = params;
+    return YAML.stringify(Object.assign({ input: convertMessagesToResponsesInput({
+            messages: [
+                ...(systemMessage.text === "" ? [] : [systemMessage]),
+                ...messages,
+            ],
+            zdrEnabled: (_a = model.zdrEnabled) !== null && _a !== void 0 ? _a : false,
+            model: model.model,
+        }) }, model.invocationParams(Object.assign(Object.assign(Object.assign({}, (modelSettings !== null && modelSettings !== void 0 ? modelSettings : {})), (tools.length > 0 ? { tools } : {})), (toolChoice !== undefined ? { tool_choice: toolChoice } : {})))));
 }
 function getMessageBlocks(message) {
     if (Array.isArray(message.contentBlocks)) {
@@ -234,9 +224,11 @@ export function createSequenceDebugMiddleware(sink) {
         wrapModelCall(request, handler) {
             return __awaiter(this, void 0, void 0, function* () {
                 const prompt = stringifyPromptForDebug({
+                    model: request.model,
                     systemMessage: request.systemMessage,
                     messages: request.messages,
                     tools: request.tools,
+                    toolChoice: request.toolChoice,
                     modelSettings: request.modelSettings,
                 });
                 sink.handleModelCallStart(prompt);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/agent",
-  "version": "1.9.1",
+  "version": "1.10.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",