supercompat 2.16.0 → 2.17.0

package/dist/index.cjs

@@ -873,22 +873,68 @@ var models2 = function(param) {
     };
 };
 // src/adapters/client/openaiClientAdapter/completions/post.ts
+var import_radash2 = require("radash");
+// src/lib/models/isOModel.ts
+var isOModel = function(param) {
+    var model = param.model;
+    return model.startsWith("o1") || model.startsWith("o3");
+};
+// src/lib/messages/systemDeveloperMessages.ts
+var systemDeveloperMessages = function(param) {
+    var messages3 = param.messages, model = param.model;
+    if (isOModel({
+        model: model
+    })) {
+        return messages3.map(function(message) {
+            if (message.role === "system") {
+                return _object_spread_props(_object_spread({}, message), {
+                    // TODO: This should be 'developer' but we're using 'user' for now
+                    // role: 'developer',
+                    role: "user"
+                });
+            }
+            return message;
+        });
+    }
+    return messages3;
+};
+// src/adapters/client/openaiClientAdapter/completions/post.ts
+var omitKeys = function(param) {
+    var model = param.model;
+    if (isOModel({
+        model: model
+    })) {
+        return [
+            "tools"
+        ];
+    }
+    return [];
+};
 var post2 = function(param) {
     var openai = param.openai;
     return /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(_url, options) {
-            var body, response, stream, data, error;
+            var body, messages3, resultOptions, response, stream, data, error;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
                         body = JSON.parse(options.body);
+                        messages3 = body.messages;
+                        resultOptions = _object_spread_props(_object_spread({}, (0, import_radash2.omit)(body, omitKeys({
+                            model: body.model
+                        }))), {
+                            messages: systemDeveloperMessages({
+                                messages: messages3,
+                                model: body.model
+                            })
+                        });
                         if (!body.stream) return [
                             3,
                             2
                         ];
                         return [
                             4,
-                            openai.chat.completions.create(body)
+                            openai.chat.completions.create(resultOptions)
                         ];
                     case 1:
                         response = _state.sent();
@@ -1004,7 +1050,7 @@ var post2 = function(param) {
                         ]);
                         return [
                             4,
-                            openai.chat.completions.create(body)
+                            openai.chat.completions.create(resultOptions)
                         ];
                     case 3:
                         data = _state.sent();
@@ -1755,15 +1801,15 @@ var models7 = function(param) {
     };
 };
 // src/adapters/client/anthropicClientAdapter/completions/post.ts
-var import_radash3 = require("radash");
+var import_radash4 = require("radash");
 // src/lib/messages/nonEmptyMessages.ts
-var import_radash2 = require("radash");
+var import_radash3 = require("radash");
 var nonEmptyMessages = function(param) {
     var messages3 = param.messages;
     var result = [];
     messages3.forEach(function(message) {
         return result.push(_object_spread_props(_object_spread({}, message), {
-            content: (0, import_radash2.isEmpty)(message.content) ? "-" : message.content
+            content: (0, import_radash3.isEmpty)(message.content) ? "-" : message.content
         }));
     });
     return result;
@@ -1859,7 +1905,7 @@ var post5 = function(param) {
                     case 0:
                         body = JSON.parse(options.body);
                         messages3 = body.messages;
-                        _ref = _sliced_to_array((0, import_radash3.fork)(messages3, function(message) {
+                        _ref = _sliced_to_array((0, import_radash4.fork)(messages3, function(message) {
                             return message.role === "system";
                         }), 2), systemMessages = _ref[0], otherMessages = _ref[1];
                         system = systemMessages.map(function(message) {
@@ -1872,10 +1918,10 @@ var post5 = function(param) {
                                 })
                             })
                         });
-                        resultOptions = _object_spread_props(_object_spread({}, (0, import_radash3.omit)(body, [
+                        resultOptions = _object_spread_props(_object_spread({}, (0, import_radash4.omit)(body, [
                             "response_format"
                         ])), {
-                            stream: body.stream ? (0, import_radash3.isEmpty)(body.tools) : false,
+                            stream: body.stream ? (0, import_radash4.isEmpty)(body.tools) : false,
                             system: system,
                             messages: serializeMessages({
                                 messages: chatMessages
@@ -1939,7 +1985,7 @@ var post5 = function(param) {
                                                         content: chunk.delta.text
                                                     };
                                                     messageDelta = {
-                                                        id: "chatcmpl-".concat((0, import_radash3.uid)(29)),
+                                                        id: "chatcmpl-".concat((0, import_radash4.uid)(29)),
                                                         object: "chat.completion.chunk",
                                                         choices: [
                                                             {
@@ -1967,7 +2013,7 @@ var post5 = function(param) {
                                                         content: chunk.content_block.text
                                                     };
                                                     messageDelta1 = {
-                                                        id: "chatcmpl-".concat((0, import_radash3.uid)(29)),
+                                                        id: "chatcmpl-".concat((0, import_radash4.uid)(29)),
                                                         object: "chat.completion.chunk",
                                                         choices: [
                                                             {
@@ -1979,7 +2025,7 @@ var post5 = function(param) {
                                                     controller.enqueue("data: ".concat(JSON.stringify(messageDelta1), "\n\n"));
                                                 } else if (chunk.type === "message_start") {
                                                     messageDelta2 = {
-                                                        id: "chatcmpl-".concat((0, import_radash3.uid)(29)),
+                                                        id: "chatcmpl-".concat((0, import_radash4.uid)(29)),
                                                         object: "chat.completion.chunk",
                                                         choices: [
                                                             {
@@ -3117,10 +3163,10 @@ 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 toolCall = param.toolCall;
@@ -3194,7 +3240,7 @@ var messages = /*#__PURE__*/ function() {
                             content: run2.instructions
                         }
                     ] : [])).concat;
-                    _2 = (0, import_radash4.flat);
+                    _2 = (0, import_radash5.flat);
                     return [
                         4,
                         getMessages2()
@@ -3224,7 +3270,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);
@@ -3256,9 +3302,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"
             ]));
         });
@@ -3320,7 +3366,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
                             }
                         ]);
@@ -3503,7 +3549,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);
                                         })
@@ -3612,7 +3658,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({
@@ -3750,7 +3796,7 @@ var threads = function(param) {
 };
 // 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;
@@ -3768,7 +3814,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
         } : {})
     };
@@ -3832,7 +3878,7 @@ var post11 = function(param) {
     }();
 };
 // src/adapters/storage/prismaStorageAdapter/threads/messages/get.ts
-var import_radash7 = require("radash");
+var import_radash8 = require("radash");
 var get10 = function(param) {
     var prisma = param.prisma;
     return /*#__PURE__*/ function() {
@@ -3843,7 +3889,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_radash7.assign)({
+                        _ref = (0, import_radash8.assign)({
                             limit: "20",
                             order: "desc"
                         }, Object.fromEntries(url.searchParams)), limit = _ref.limit, order = _ref.order, after = _ref.after;
@@ -3878,7 +3924,7 @@ var get10 = function(param) {
                                     return messages3.length === parseInt(limit);
                                 },
                                 body: {
-                                    last_id: (_id = (_this = (0, import_radash7.last)(messages3)) === null || _this === void 0 ? void 0 : _this.id) !== null && _id !== void 0 ? _id : null
+                                    last_id: (_id = (_this = (0, import_radash8.last)(messages3)) === null || _this === void 0 ? void 0 : _this.id) !== null && _id !== void 0 ? _id : null
                                 }
                             }), {
                                 status: 200,
@@ -3908,7 +3954,7 @@ var messages2 = function(param) {
     };
 };
 // src/adapters/storage/prismaStorageAdapter/threads/runs/get.ts
-var import_radash8 = require("radash");
+var import_radash9 = require("radash");
 // src/adapters/storage/prismaStorageAdapter/threads/runs/serializeRun.ts
 var import_dayjs5 = __toESM(require("dayjs"), 1);
 var serializeRun = function(param) {
@@ -3957,7 +4003,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_radash8.assign)({
+                        _ref = (0, import_radash9.assign)({
                             limit: "20",
                             order: "desc"
                         }, Object.fromEntries(url.searchParams)), limit = _ref.limit, order = _ref.order, after = _ref.after;
@@ -3993,7 +4039,7 @@ var get11 = function(param) {
                                 },
                                 body: {
                                     // @ts-ignore-next-line
-                                    last_id: (_id = (_this = (0, import_radash8.last)(runs2)) === null || _this === void 0 ? void 0 : _this.id) !== null && _id !== void 0 ? _id : null
+                                    last_id: (_id = (_this = (0, import_radash9.last)(runs2)) === null || _this === void 0 ? void 0 : _this.id) !== null && _id !== void 0 ? _id : null
                                 }
                             }), {
                                 status: 200,
@@ -4012,7 +4058,7 @@ var get11 = function(param) {
 };
 // src/adapters/storage/prismaStorageAdapter/threads/runs/post.ts
 var import_dayjs7 = __toESM(require("dayjs"), 1);
-var import_radash9 = require("radash");
+var import_radash10 = 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;
@@ -4396,7 +4442,7 @@ var post12 = function(param) {
                         if (!assistant) {
                             throw new Error("Assistant not found");
                         }
-                        _ref = (0, import_radash9.assign)({
+                        _ref = (0, import_radash10.assign)({
                             model: assistant.modelSlug,
                             instructions: "",
                             additional_instructions: null,
@@ -4605,7 +4651,7 @@ var run = function(param) {
     };
 };
 // src/adapters/storage/prismaStorageAdapter/threads/runs/steps/get.ts
-var import_radash10 = require("radash");
+var import_radash11 = require("radash");
 var get13 = function(param) {
     var prisma = param.prisma;
     return /*#__PURE__*/ function() {
@@ -4616,7 +4662,7 @@ var get13 = function(param) {
                     case 0:
                         url = new URL(urlString);
                         _url_pathname_match = _sliced_to_array(url.pathname.match(new RegExp(stepsRegexp)), 4), threadId = _url_pathname_match[1], runId = _url_pathname_match[3];
-                        _ref = (0, import_radash10.assign)({
+                        _ref = (0, import_radash11.assign)({
                             limit: "20",
                             order: "desc"
                         }, Object.fromEntries(url.searchParams)), limit = _ref.limit, order = _ref.order, after = _ref.after;
@@ -4653,7 +4699,7 @@ var get13 = function(param) {
                                 },
                                 body: {
                                     // @ts-ignore-next-line
-                                    last_id: (_id = (_this = (0, import_radash10.last)(runSteps)) === null || _this === void 0 ? void 0 : _this.id) !== null && _id !== void 0 ? _id : null
+                                    last_id: (_id = (_this = (0, import_radash11.last)(runSteps)) === null || _this === void 0 ? void 0 : _this.id) !== null && _id !== void 0 ? _id : null
                                 }
                             }), {
                                 status: 200,