supercompat 2.31.0 → 2.33.0

package/dist/index.cjs

@@ -3220,19 +3220,40 @@ var ollamaClientAdapter = function(param) {
 };
 // src/adapters/run/completionsRunAdapter/index.ts
 var import_lodash = __toESM(require("lodash"), 1);
-var import_radash5 = require("radash");
+var import_radash6 = require("radash");
 var import_dayjs = __toESM(require("dayjs"), 1);
 // src/adapters/run/completionsRunAdapter/messages/index.ts
-var import_radash4 = require("radash");
+var import_radash5 = require("radash");
 // src/adapters/run/completionsRunAdapter/messages/serializeMessage.ts
-var serializeToolCall = function(param) {
+var import_radash4 = require("radash");
+var validToolCallContentTypes = [
+    "image",
+    "text"
+];
+var serializeToolContent = function(param) {
     var toolCall = param.toolCall;
+    if ((0, import_radash4.isArray)(toolCall.function.output)) {
+        var isEveryToolPartValid = toolCall.function.output.every(function(toolPart) {
+            if (!(0, import_radash4.isObject)(toolPart)) return false;
+            return validToolCallContentTypes.includes(toolPart.type);
+        });
+        if (isEveryToolPartValid) {
+            return toolCall.function.output;
+        }
+        return JSON.stringify(toolCall.function.output);
+    }
     var _toolCall_function_output;
+    return (_toolCall_function_output = toolCall.function.output) !== null && _toolCall_function_output !== void 0 ? _toolCall_function_output : "";
+};
+var serializeToolCall = function(param) {
+    var toolCall = param.toolCall;
     return {
         tool_call_id: toolCall.id,
         role: "tool",
         name: toolCall.function.name,
-        content: (_toolCall_function_output = toolCall.function.output) !== null && _toolCall_function_output !== void 0 ? _toolCall_function_output : ""
+        content: serializeToolContent({
+            toolCall: toolCall
+        })
     };
 };
 var serializeMessageWithContent = function(param) {
@@ -3297,7 +3318,7 @@ var messages = /*#__PURE__*/ function() {
                             content: run2.instructions
                         }
                     ] : [])).concat;
-                    _2 = (0, import_radash4.flat);
+                    _2 = (0, import_radash5.flat);
                     return [
                         4,
                         getMessages2()
@@ -3327,7 +3348,7 @@ var messages = /*#__PURE__*/ function() {
 // src/adapters/run/completionsRunAdapter/index.ts
 var updatedToolCall = function(param) {
     var toolCall = param.toolCall, delta = param.delta;
-    if (!toolCall) return (0, import_radash5.omit)(delta, [
+    if (!toolCall) return (0, import_radash6.omit)(delta, [
         "index"
     ]);
     var result = import_lodash.default.cloneDeep(toolCall);
@@ -3359,9 +3380,9 @@ var toolCallsData = function(param) {
     if (!prevToolCalls) {
         return delta.tool_calls.map(function(tc) {
             return _object_spread({
-                id: (0, import_radash5.uid)(24),
+                id: (0, import_radash6.uid)(24),
                 type: "function"
-            }, (0, import_radash5.omit)(tc, [
+            }, (0, import_radash6.omit)(tc, [
                 "index"
             ]));
         });
@@ -3423,7 +3444,7 @@ var completionsRunAdapter = function() {
                     case 1:
                         opts = _object_spread.apply(void 0, [
                             (_tmp.messages = _state.sent(), _tmp.model = run2.model, _tmp.stream = true, _tmp.response_format = run2.response_format, _tmp),
-                            (0, import_radash5.isEmpty)(run2.tools) ? {} : {
+                            (0, import_radash6.isEmpty)(run2.tools) ? {} : {
                                 tools: run2.tools
                             }
                         ]);
@@ -3606,7 +3627,7 @@ var completionsRunAdapter = function() {
                                         type: "tool_calls",
                                         tool_calls: delta.tool_calls.map(function(tc) {
                                             return _object_spread({
-                                                id: (0, import_radash5.uid)(24),
+                                                id: (0, import_radash6.uid)(24),
                                                 type: "function"
                                             }, tc);
                                         })
@@ -3715,7 +3736,7 @@ var completionsRunAdapter = function() {
                         ];
                     case 22:
                         message = _state.sent();
-                        if ((0, import_radash5.isEmpty)(message.toolCalls)) {
+                        if ((0, import_radash6.isEmpty)(message.toolCalls)) {
                             return [
                                 2,
                                 onEvent2({
@@ -3852,10 +3873,10 @@ var threads = function(param) {
     };
 };
 // src/adapters/storage/prismaStorageAdapter/threads/messages/post.ts
-var import_radash7 = require("radash");
+var import_radash8 = require("radash");
 // src/adapters/storage/prismaStorageAdapter/threads/messages/serializeMessage.ts
 var import_dayjs4 = __toESM(require("dayjs"), 1);
-var import_radash6 = require("radash");
+var import_radash7 = require("radash");
 var serializeMessage4 = function(param) {
     var message = param.message;
     var _message_metadata;
@@ -3873,7 +3894,7 @@ var serializeMessage4 = function(param) {
         run_id: message.runId,
         attachments: message.attachments,
         status: message.status.toLowerCase(),
-        metadata: (0, import_radash6.assign)((_message_metadata = message.metadata) !== null && _message_metadata !== void 0 ? _message_metadata : {}, message.toolCalls ? {
+        metadata: (0, import_radash7.assign)((_message_metadata = message.metadata) !== null && _message_metadata !== void 0 ? _message_metadata : {}, message.toolCalls ? {
             toolCalls: message.toolCalls
         } : {})
     };
@@ -3881,7 +3902,7 @@ var serializeMessage4 = function(param) {
 // src/adapters/storage/prismaStorageAdapter/threads/messages/post.ts
 var messageContentBlocks = function(param) {
     var content = param.content;
-    if ((0, import_radash7.isArray)(content)) {
+    if ((0, import_radash8.isArray)(content)) {
         return content.map(function(item) {
             if (item.type === "text") {
                 var _item_text;
@@ -3910,14 +3931,14 @@ var post11 = function(param) {
     var prisma = param.prisma;
     return /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(urlString, options) {
-            var url, _url_pathname_match, threadId, body, role, content, message;
+            var url, _url_pathname_match, threadId, body, role, content, metadata, message;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
                         url = new URL(urlString);
                         _url_pathname_match = _sliced_to_array(url.pathname.match(new RegExp(messagesRegexp)), 2), threadId = _url_pathname_match[1];
                         body = JSON.parse(options.body);
-                        role = body.role, content = body.content;
+                        role = body.role, content = body.content, metadata = body.metadata;
                         return [
                             4,
                             prisma.message.create({
@@ -3926,7 +3947,8 @@ var post11 = function(param) {
                                     content: messageContentBlocks({
                                         content: content
                                     }),
-                                    role: role === "user" ? "USER" : "ASSISTANT"
+                                    role: role === "user" ? "USER" : "ASSISTANT",
+                                    metadata: metadata || {}
                                 }
                             })
                         ];
@@ -3952,7 +3974,7 @@ var post11 = function(param) {
     }();
 };
 // src/adapters/storage/prismaStorageAdapter/threads/messages/get.ts
-var import_radash8 = require("radash");
+var import_radash9 = require("radash");
 var get10 = function(param) {
     var prisma = param.prisma;
     return /*#__PURE__*/ function() {
@@ -3963,7 +3985,7 @@ var get10 = function(param) {
                     case 0:
                         url = new URL(urlString);
                         _url_pathname_match = _sliced_to_array(url.pathname.match(new RegExp(messagesRegexp)), 2), threadId = _url_pathname_match[1];
-                        _ref = (0, import_radash8.assign)({
+                        _ref = (0, import_radash9.assign)({
                             limit: "20",
                             order: "desc"
                         }, Object.fromEntries(url.searchParams)), limit = _ref.limit, order = _ref.order, after = _ref.after;
@@ -3997,7 +4019,7 @@ var get10 = function(param) {
                                     });
                                 }),
                                 has_more: messagesPlusOne.length > pageSize,
-                                last_id: (_id = (_this = (0, import_radash8.last)(messages3)) === null || _this === void 0 ? void 0 : _this.id) !== null && _id !== void 0 ? _id : null
+                                last_id: (_id = (_this = (0, import_radash9.last)(messages3)) === null || _this === void 0 ? void 0 : _this.id) !== null && _id !== void 0 ? _id : null
                             }), {
                                 status: 200,
                                 headers: {
@@ -4026,7 +4048,7 @@ var messages2 = function(param) {
     };
 };
 // src/adapters/storage/prismaStorageAdapter/threads/runs/get.ts
-var import_radash9 = require("radash");
+var import_radash10 = require("radash");
 // src/adapters/storage/prismaStorageAdapter/threads/runs/serializeRun.ts
 var import_dayjs5 = __toESM(require("dayjs"), 1);
 var serializeRun = function(param) {
@@ -4075,7 +4097,7 @@ var get11 = function(param) {
                     case 0:
                         url = new URL(urlString);
                         _url_pathname_match = _sliced_to_array(url.pathname.match(new RegExp(runsRegexp)), 2), threadId = _url_pathname_match[1];
-                        _ref = (0, import_radash9.assign)({
+                        _ref = (0, import_radash10.assign)({
                             limit: "20",
                             order: "desc"
                         }, Object.fromEntries(url.searchParams)), limit = _ref.limit, order = _ref.order, after = _ref.after;
@@ -4127,7 +4149,7 @@ var get11 = function(param) {
 };
 // src/adapters/storage/prismaStorageAdapter/threads/runs/post.ts
 var import_dayjs7 = __toESM(require("dayjs"), 1);
-var import_radash10 = require("radash");
+var import_radash11 = require("radash");
 // src/adapters/storage/prismaStorageAdapter/threads/runs/onEvent/handlers/threadRunInProgress.ts
 var threadRunInProgress = function(param) {
     var prisma = param.prisma, event = param.event, controller = param.controller;
@@ -4511,7 +4533,7 @@ var post12 = function(param) {
                         if (!assistant) {
                             throw new Error("Assistant not found");
                         }
-                        _ref = (0, import_radash10.assign)({
+                        _ref = (0, import_radash11.assign)({
                             model: assistant.modelSlug,
                             instructions: "",
                             additional_instructions: null,
@@ -4720,7 +4742,7 @@ var run = function(param) {
     };
 };
 // src/adapters/storage/prismaStorageAdapter/threads/runs/steps/get.ts
-var import_radash11 = require("radash");
+var import_radash12 = require("radash");
 var get13 = function(param) {
     var prisma = param.prisma;
     return /*#__PURE__*/ function() {
@@ -4731,7 +4753,7 @@ var get13 = function(param) {
                     case 0:
                         url = new URL(urlString);
                         _url_pathname_match = _sliced_to_array(url.pathname.match(new RegExp(stepsRegexp)), 3), threadId = _url_pathname_match[1], runId = _url_pathname_match[2];
-                        _ref = (0, import_radash11.assign)({
+                        _ref = (0, import_radash12.assign)({
                             limit: "20",
                             order: "desc"
                         }, Object.fromEntries(url.searchParams)), limit = _ref.limit, order = _ref.order, after = _ref.after;