supercompat 2.1.0 → 2.2.1

package/dist/index.cjs

@@ -379,12 +379,23 @@ module.exports = __toCommonJS(src_exports);
 var import_openai = __toESM(require("openai"), 1);
 // src/supercompatFetch/requestHandlers.ts
 var import_radash = require("radash");
-var requestHandlers = function(param) {
-    var client = param.client, storage = param.storage, runAdapter = param.runAdapter;
-    return (0, import_radash.assign)(client, storage({
+var storageRequestHandlers = function(param) {
+    var storage = param.storage, runAdapter = param.runAdapter, client = param.client;
+    if (!storage) return {};
+    if (!runAdapter) return {};
+    var result = storage({
         runAdapter: (0, import_radash.partob)(runAdapter, {
             client: client
         })
+    });
+    return result.requestHandlers;
+};
+var requestHandlers = function(param) {
+    var client = param.client, storage = param.storage, runAdapter = param.runAdapter;
+    return (0, import_radash.assign)(client.requestHandlers, storageRequestHandlers({
+        storage: storage,
+        runAdapter: runAdapter,
+        client: client
     }));
 };
 // src/supercompatFetch/findRequestHandler.ts
@@ -398,6 +409,22 @@ var findRequestHandler = function(param) {
         }
     }
 };
+// src/supercompatFetch/originalFetch.ts
+var originalFetch = function(param) {
+    var args = param.args, client = param.client;
+    var _client_client;
+    if ((_client_client = client.client) === null || _client_client === void 0 ? void 0 : _client_client.fetch) {
+        var _args = _sliced_to_array(args, 2), url = _args[0], options = _args[1];
+        var headers = _object_spread_props(_object_spread({}, options.headers), {
+            authorization: client.client.defaultHeaders().Authorization
+        });
+        return client.client.fetch(url, _object_spread_props(_object_spread({}, options), {
+            headers: headers
+        }));
+    } else {
+        return fetch.apply(void 0, _to_consumable_array(args));
+    }
+};
 // src/supercompatFetch/index.ts
 var supercompatFetch = function(param) {
     var client = param.client, storage = param.storage, runAdapter = param.runAdapter;
@@ -406,24 +433,43 @@ var supercompatFetch = function(param) {
         storage: storage,
         runAdapter: runAdapter
     });
-    return function() {
-        for(var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++){
-            args[_key] = arguments[_key];
-        }
-        var _args = _sliced_to_array(args, 2), url = _args[0], options = _args[1];
-        var pathHandler = findRequestHandler({
-            url: url,
-            requestHandlers: requestHandlers2
+    return /*#__PURE__*/ _async_to_generator(function() {
+        var _len, args, _key, _args, url, options, pathHandler, requestHandler;
+        var _arguments = arguments;
+        return _ts_generator(this, function(_state) {
+            for(_len = _arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++){
+                args[_key] = _arguments[_key];
+            }
+            _args = _sliced_to_array(args, 2), url = _args[0], options = _args[1];
+            pathHandler = findRequestHandler({
+                url: url,
+                requestHandlers: requestHandlers2
+            });
+            if (!pathHandler) {
+                return [
+                    2,
+                    originalFetch({
+                        client: client,
+                        args: args
+                    })
+                ];
+            }
+            requestHandler = pathHandler[options === null || options === void 0 ? void 0 : options.method];
+            if (!requestHandler) {
+                return [
+                    2,
+                    originalFetch({
+                        client: client,
+                        args: args
+                    })
+                ];
+            }
+            return [
+                2,
+                requestHandler.apply(void 0, _to_consumable_array(args))
+            ];
         });
-        if (!pathHandler) {
-            return fetch.apply(void 0, _to_consumable_array(args));
-        }
-        var requestHandler = pathHandler[options === null || options === void 0 ? void 0 : options.method];
-        if (!requestHandler) {
-            return fetch.apply(void 0, _to_consumable_array(args));
-        }
-        return requestHandler.apply(void 0, _to_consumable_array(args));
-    };
+    });
 };
 // src/supercompat.ts
 var supercompat = function(param) {
@@ -622,9 +668,12 @@ var completions = function(param) {
 var groqClientAdapter = function(param) {
     var groq = param.groq;
     return {
-        "^/v1/chat/completions$": completions({
-            groq: groq
-        })
+        client: groq,
+        requestHandlers: {
+            "^/v1/chat/completions$": completions({
+                groq: groq
+            })
+        }
     };
 };
 // src/adapters/client/openaiClientAdapter/completions/post.ts
@@ -812,9 +861,12 @@ var completions2 = function(param) {
 var openaiClientAdapter = function(param) {
     var openai = param.openai;
     return {
-        "^/v1/chat/completions$": completions2({
-            openai: openai
-        })
+        client: openai,
+        requestHandlers: {
+            "^/v1/chat/completions$": completions2({
+                openai: openai
+            })
+        }
     };
 };
 // src/adapters/client/mistralClientAdapter/completions/post.ts
@@ -1002,9 +1054,12 @@ var completions3 = function(param) {
 var mistralClientAdapter = function(param) {
     var mistral = param.mistral;
     return {
-        "^/v1/chat/completions$": completions3({
-            mistral: mistral
-        })
+        client: mistral,
+        requestHandlers: {
+            "^/v1/chat/completions$": completions3({
+                mistral: mistral
+            })
+        }
     };
 };
 // src/adapters/client/perplexityClientAdapter/completions/post.ts
@@ -1213,9 +1268,12 @@ var completions4 = function(param) {
 var perplexityClientAdapter = function(param) {
     var perplexity = param.perplexity;
     return {
-        "^/v1/chat/completions$": completions4({
-            perplexity: perplexity
-        })
+        client: perplexity,
+        requestHandlers: {
+            "^/v1/chat/completions$": completions4({
+                perplexity: perplexity
+            })
+        }
     };
 };
 // src/adapters/client/anthropicClientAdapter/completions/post.ts
@@ -1559,9 +1617,12 @@ var completions5 = function(param) {
 var anthropicClientAdapter = function(param) {
     var anthropic = param.anthropic;
     return {
-        "^/v1/chat/completions$": completions5({
-            anthropic: anthropic
-        })
+        client: anthropic,
+        requestHandlers: {
+            "^/v1/chat/completions$": completions5({
+                anthropic: anthropic
+            })
+        }
     };
 };
 // src/adapters/run/completionsRunAdapter/index.ts
@@ -1750,10 +1811,7 @@ var completionsRunAdapter = function() {
                             2
                         ];
                         client = supercompat({
-                            client: clientAdapter,
-                            storage: function() {},
-                            // @ts-ignore-next-line
-                            runAdapter: {}
+                            client: clientAdapter
                         });
                         onEvent2({
                             event: "thread.run.in_progress",
@@ -3433,27 +3491,29 @@ var prismaStorageAdapter = function(param) {
     return function(param) {
         var runAdapter = param.runAdapter;
         return {
-            "^/v1/threads$": threads({
-                prisma: prisma
-            }),
-            "^/v1/threads/([^/]+)/messages$": messages2({
-                prisma: prisma
-            }),
-            "^/v1/threads/([^/]+)/runs$": runs({
-                prisma: prisma,
-                runAdapter: runAdapter
-            }),
-            "^/v1/threads/([^/]+)/runs/([^/]+)$": run({
-                prisma: prisma,
-                runAdapter: runAdapter
-            }),
-            "^/v1/threads/([^/]+)/runs/([^/]+)/steps$": steps({
-                prisma: prisma
-            }),
-            "^/v1/threads/([^/]+)/runs/([^/]+)/submit_tool_outputs$": submitToolOutputs({
-                prisma: prisma,
-                runAdapter: runAdapter
-            })
+            requestHandlers: {
+                "^/v1/threads$": threads({
+                    prisma: prisma
+                }),
+                "^/v1/threads/([^/]+)/messages$": messages2({
+                    prisma: prisma
+                }),
+                "^/v1/threads/([^/]+)/runs$": runs({
+                    prisma: prisma,
+                    runAdapter: runAdapter
+                }),
+                "^/v1/threads/([^/]+)/runs/([^/]+)$": run({
+                    prisma: prisma,
+                    runAdapter: runAdapter
+                }),
+                "^/v1/threads/([^/]+)/runs/([^/]+)/steps$": steps({
+                    prisma: prisma
+                }),
+                "^/v1/threads/([^/]+)/runs/([^/]+)/submit_tool_outputs$": submitToolOutputs({
+                    prisma: prisma,
+                    runAdapter: runAdapter
+                })
+            }
         };
     };
 };