@upstash/qstash 2.6.0 → 2.6.1

package/index.js

@@ -13,10 +13,18 @@ var DLQ = class {
    * List messages in the dlq
    */
   async listMessages(options) {
+    const filterPayload = {
+      ..._optionalChain([options, 'optionalAccess', _ => _.filter]),
+      topicName: _optionalChain([options, 'optionalAccess', _2 => _2.filter, 'optionalAccess', _3 => _3.urlGroup])
+    };
     const messagesPayload = await this.http.request({
       method: "GET",
       path: ["v2", "dlq"],
-      query: { cursor: _optionalChain([options, 'optionalAccess', _ => _.cursor]) }
+      query: {
+        cursor: _optionalChain([options, 'optionalAccess', _4 => _4.cursor]),
+        count: _optionalChain([options, 'optionalAccess', _5 => _5.count]),
+        ...filterPayload
+      }
     });
     return {
       messages: messagesPayload.messages.map((message) => {
@@ -84,8 +92,8 @@ var HttpClient = (_class = class {
       attempts: 1,
       backoff: () => 0
     } : {
-      attempts: _optionalChain([config, 'access', _2 => _2.retry, 'optionalAccess', _3 => _3.retries]) ? config.retry.retries + 1 : 5,
-      backoff: _nullishCoalesce(_optionalChain([config, 'access', _4 => _4.retry, 'optionalAccess', _5 => _5.backoff]), () => ( ((retryCount) => Math.exp(retryCount) * 50)))
+      attempts: _optionalChain([config, 'access', _6 => _6.retry, 'optionalAccess', _7 => _7.retries]) ? config.retry.retries + 1 : 5,
+      backoff: _nullishCoalesce(_optionalChain([config, 'access', _8 => _8.retry, 'optionalAccess', _9 => _9.backoff]), () => ( ((retryCount) => Math.exp(retryCount) * 50)))
     };
   }
   async request(request) {
@@ -193,6 +201,133 @@ var HttpClient = (_class = class {
   }
 }, _class);
 
+// src/client/llm/chat.ts
+var Chat = (_class2 = class _Chat {
+  
+  
+  constructor(http, token) {;_class2.prototype.__init3.call(this);_class2.prototype.__init4.call(this);_class2.prototype.__init5.call(this);
+    this.http = http;
+    this.token = token;
+  }
+  static toChatRequest(request) {
+    const messages = [];
+    messages.push(
+      { role: "system", content: request.system },
+      { role: "user", content: request.user }
+    );
+    const chatRequest = { ...request, messages };
+    return chatRequest;
+  }
+  /**
+   * Calls the Upstash completions api given a ChatRequest.
+   *
+   * Returns a ChatCompletion or a stream of ChatCompletionChunks
+   * if stream is enabled.
+   *
+   * @param request ChatRequest with messages
+   * @returns Chat completion or stream
+   */
+  __init3() {this.create = async (request) => {
+    if (request.provider.owner != "upstash")
+      return this.createThirdParty(request);
+    const body = JSON.stringify(request);
+    if ("stream" in request && request.stream) {
+      return this.http.requestStream({
+        path: ["llm", "v1", "chat", "completions"],
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          Connection: "keep-alive",
+          Accept: "text/event-stream",
+          "Cache-Control": "no-cache",
+          Authorization: `Bearer ${this.token}`
+        },
+        body
+      });
+    }
+    return this.http.request({
+      path: ["llm", "v1", "chat", "completions"],
+      method: "POST",
+      headers: { "Content-Type": "application/json", Authorization: `Bearer ${this.token}` },
+      body
+    });
+  }}
+  /**
+   * Calls the Upstash completions api given a ChatRequest.
+   *
+   * Returns a ChatCompletion or a stream of ChatCompletionChunks
+   * if stream is enabled.
+   *
+   * @param request ChatRequest with messages
+   * @returns Chat completion or stream
+   */
+  __init4() {this.createThirdParty = async (request) => {
+    const { baseUrl, token, owner } = request.provider;
+    if (owner === "upstash")
+      throw new Error("Upstash is not 3rd party provider!");
+    delete request.provider;
+    delete request.system;
+    const body = JSON.stringify(request);
+    if ("stream" in request && request.stream) {
+      return this.http.requestStream({
+        path: ["v1", "chat", "completions"],
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          Connection: "keep-alive",
+          Accept: "text/event-stream",
+          "Cache-Control": "no-cache",
+          Authorization: `Bearer ${token}`
+        },
+        body,
+        baseUrl
+      });
+    }
+    return this.http.request({
+      path: ["v1", "chat", "completions"],
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${token}`
+      },
+      body,
+      baseUrl
+    });
+  }}
+  /**
+   * Calls the Upstash completions api given a PromptRequest.
+   *
+   * Returns a ChatCompletion or a stream of ChatCompletionChunks
+   * if stream is enabled.
+   *
+   * @param request PromptRequest with system and user messages.
+   *    Note that system parameter shouldn't be passed in the case of
+   *    mistralai/Mistral-7B-Instruct-v0.2 model.
+   * @returns Chat completion or stream
+   */
+  __init5() {this.prompt = async (request) => {
+    const chatRequest = _Chat.toChatRequest(request);
+    return this.create(chatRequest);
+  }}
+}, _class2);
+
+// src/client/llm/utils.ts
+function appendLLMOptionsIfNeeded(request, headers) {
+  if (_optionalChain([request, 'access', _10 => _10.api, 'optionalAccess', _11 => _11.provider, 'optionalAccess', _12 => _12.owner]) === "upstash") {
+    request.api = { name: "llm" };
+    return;
+  }
+  if (request.api && "provider" in request.api) {
+    const provider = request.api.provider;
+    if (!_optionalChain([provider, 'optionalAccess', _13 => _13.baseUrl]))
+      throw new Error("baseUrl cannot be empty or undefined!");
+    if (!provider.token)
+      throw new Error("token cannot be empty or undefined!");
+    request.url = `${provider.baseUrl}/v1/chat/completions`;
+    headers.set("Authorization", `Bearer ${provider.token}`);
+  }
+}
+
 // src/client/messages.ts
 var Messages = class {
   
@@ -223,30 +358,23 @@ var Messages = class {
       parseResponseAsJson: false
     });
   }
-};
-
-// src/client/llm/constants.ts
-var PROVIDER_MAP = {
-  openai: "https://api.openai.com",
-  togetherai: "https://api.together.xyz"
-};
-
-// src/client/llm/utils.ts
-function appendLLMOptions(request, headers) {
-  if ("llmProvider" in request) {
-    const llmProvider = request.llmProvider;
-    if (llmProvider === "openai") {
-      const token = _nullishCoalesce(process.env.OPENAI_API_KEY, () => ( request.llmToken));
-      request.url = _nullishCoalesce(request.url, () => ( `${PROVIDER_MAP[llmProvider]}/v1/chat/completion`));
-      headers.set("Authorization", `Bearer ${token}`);
-    }
-    if (llmProvider === "togetherai") {
-      const token = _nullishCoalesce(process.env.TOGETHER_API_KEY, () => ( request.llmToken));
-      request.url = _nullishCoalesce(request.url, () => ( `${PROVIDER_MAP[llmProvider]}/v1/chat/completion`));
-      headers.set("Authorization", `Bearer ${token}`);
-    }
+  async deleteMany(messageIds) {
+    const result = await this.http.request({
+      method: "DELETE",
+      path: ["v2", "messages"],
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ messageIds })
+    });
+    return result.cancelled;
   }
-}
+  async deleteAll() {
+    const result = await this.http.request({
+      method: "DELETE",
+      path: ["v2", "messages"]
+    });
+    return result.cancelled;
+  }
+};
 
 // src/client/utils.ts
 var isIgnoredHeader = (header) => {
@@ -294,7 +422,7 @@ function processHeaders(request) {
   return headers;
 }
 function getRequestPath(request) {
-  return _nullishCoalesce(_nullishCoalesce(request.url, () => ( request.urlGroup)), () => ( `api/${request.api}`));
+  return _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(request.url, () => ( request.urlGroup)), () => ( request.topic)), () => ( `api/${_optionalChain([request, 'access', _14 => _14.api, 'optionalAccess', _15 => _15.name])}`));
 }
 
 // src/client/queue.ts
@@ -384,7 +512,7 @@ var Queue = class {
   async enqueueJSON(request) {
     const headers = prefixHeaders(new Headers(request.headers));
     headers.set("Content-Type", "application/json");
-    appendLLMOptions(request, headers);
+    appendLLMOptionsIfNeeded(request, headers);
     const response = await this.enqueue({
       ...request,
       body: JSON.stringify(request.body),
@@ -576,125 +704,17 @@ var UrlGroups = class {
   }
 };
 
-// src/client/llm/chat.ts
-var Chat = (_class2 = class _Chat {
-  
-  constructor(http) {;_class2.prototype.__init3.call(this);_class2.prototype.__init4.call(this);_class2.prototype.__init5.call(this);
-    this.http = http;
-  }
-  static toChatRequest(request) {
-    const messages = [];
-    messages.push(
-      { role: "system", content: request.system },
-      { role: "user", content: request.user }
-    );
-    const chatRequest = { ...request, messages };
-    return chatRequest;
-  }
-  /**
-   * Calls the Upstash completions api given a ChatRequest.
-   *
-   * Returns a ChatCompletion or a stream of ChatCompletionChunks
-   * if stream is enabled.
-   *
-   * @param request ChatRequest with messages
-   * @returns Chat completion or stream
-   */
-  __init3() {this.create = async (request) => {
-    if (request.provider === "openai" || request.provider === "togetherai")
-      return this.createThirdParty(request);
-    const body = JSON.stringify(request);
-    if ("stream" in request && request.stream) {
-      return this.http.requestStream({
-        path: ["llm", "v1", "chat", "completions"],
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          Connection: "keep-alive",
-          Accept: "text/event-stream",
-          "Cache-Control": "no-cache"
-        },
-        body
-      });
-    }
-    return this.http.request({
-      path: ["llm", "v1", "chat", "completions"],
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body
-    });
-  }}
-  /**
-   * Calls the Upstash completions api given a ChatRequest.
-   *
-   * Returns a ChatCompletion or a stream of ChatCompletionChunks
-   * if stream is enabled.
-   *
-   * @param request ChatRequest with messages
-   * @returns Chat completion or stream
-   */
-  __init4() {this.createThirdParty = async (request) => {
-    if (request.provider === "openai" || request.provider === "togetherai") {
-      const baseUrl = PROVIDER_MAP[request.provider];
-      const llmToken = request.llmToken;
-      delete request.llmToken;
-      delete request.system;
-      delete request.provider;
-      const body = JSON.stringify(request);
-      if ("stream" in request && request.stream) {
-        return this.http.requestStream({
-          path: ["v1", "chat", "completions"],
-          method: "POST",
-          headers: {
-            "Content-Type": "application/json",
-            Connection: "keep-alive",
-            Accept: "text/event-stream",
-            "Cache-Control": "no-cache",
-            Authorization: `Bearer ${llmToken}`
-          },
-          body,
-          baseUrl
-        });
-      }
-      return this.http.request({
-        path: ["v1", "chat", "completions"],
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: `Bearer ${llmToken}`
-        },
-        body,
-        baseUrl
-      });
-    }
-    throw new Error("Could not find any third party provider");
-  }}
-  /**
-   * Calls the Upstash completions api given a PromptRequest.
-   *
-   * Returns a ChatCompletion or a stream of ChatCompletionChunks
-   * if stream is enabled.
-   *
-   * @param request PromptRequest with system and user messages.
-   *    Note that system parameter shouldn't be passed in the case of
-   *    mistralai/Mistral-7B-Instruct-v0.2 model.
-   * @returns Chat completion or stream
-   */
-  __init5() {this.prompt = async (request) => {
-    const chatRequest = _Chat.toChatRequest(request);
-    return this.create(chatRequest);
-  }}
-}, _class2);
-
 // src/client/client.ts
 var Client = class {
   
+  
   constructor(config) {
     this.http = new HttpClient({
       retry: config.retry,
       baseUrl: config.baseUrl ? config.baseUrl.replace(/\/$/, "") : "https://qstash.upstash.io",
       authorization: `Bearer ${config.token}`
     });
+    this.token = config.token;
   }
   /**
    * Access the urlGroup API.
@@ -704,6 +724,16 @@ var Client = class {
   get urlGroups() {
     return new UrlGroups(this.http);
   }
+  /**
+   * Deprecated. Use urlGroups instead.
+   *
+   * Access the topic API.
+   *
+   * Create, read, update or delete topics.
+   */
+  get topics() {
+    return this.urlGroups;
+  }
   /**
    * Access the dlq API.
    *
@@ -734,7 +764,7 @@ var Client = class {
    * Create, read, update or delete queues.
    */
   queue(request) {
-    return new Queue(this.http, _optionalChain([request, 'optionalAccess', _6 => _6.queueName]));
+    return new Queue(this.http, _optionalChain([request, 'optionalAccess', _16 => _16.queueName]));
   }
   /**
    * Access the Chat API
@@ -742,7 +772,7 @@ var Client = class {
    * Call the create or prompt methods
    */
   chat() {
-    return new Chat(this.http);
+    return new Chat(this.http, this.token);
   }
   async publish(request) {
     const headers = processHeaders(request);
@@ -761,7 +791,7 @@ var Client = class {
   async publishJSON(request) {
     const headers = prefixHeaders(new Headers(request.headers));
     headers.set("Content-Type", "application/json");
-    appendLLMOptions(request, headers);
+    appendLLMOptionsIfNeeded(request, headers);
     const response = await this.publish({
       ...request,
       headers,
@@ -803,7 +833,7 @@ var Client = class {
         message.body = JSON.stringify(message.body);
       }
       message.headers = new Headers(message.headers);
-      appendLLMOptions(message, message.headers);
+      appendLLMOptionsIfNeeded(message, message.headers);
       message.headers.set("Content-Type", "application/json");
     }
     const response = await this.batch(request);
@@ -830,14 +860,16 @@ var Client = class {
    */
   async events(request) {
     const query = {};
-    if (_optionalChain([request, 'optionalAccess', _7 => _7.cursor]) && request.cursor > 0) {
+    if (_optionalChain([request, 'optionalAccess', _17 => _17.cursor]) && request.cursor > 0) {
       query.cursor = request.cursor.toString();
     }
-    for (const [key, value] of Object.entries(_nullishCoalesce(_optionalChain([request, 'optionalAccess', _8 => _8.filter]), () => ( {})))) {
+    for (const [key, value] of Object.entries(_nullishCoalesce(_optionalChain([request, 'optionalAccess', _18 => _18.filter]), () => ( {})))) {
       if (typeof value === "number" && value < 0) {
         continue;
       }
-      if (typeof value !== "undefined") {
+      if (key === "urlGroup") {
+        query.topicName = value.toString();
+      } else if (typeof value !== "undefined") {
         query[key] = value.toString();
       }
     }
@@ -858,6 +890,34 @@ var Client = class {
   }
 };
 
+// src/client/llm/providers.ts
+var upstash = () => {
+  return {
+    owner: "upstash",
+    baseUrl: "https://qstash.upstash.io/llm",
+    token: ""
+  };
+};
+var openai = ({
+  token
+}) => {
+  return { token, owner: "openai", baseUrl: "https://api.openai.com" };
+};
+var custom = ({
+  baseUrl,
+  token
+}) => {
+  const trimmedBaseUrl = baseUrl.replace(/\/(v1\/)?chat\/completions$/, "");
+  return {
+    token,
+    owner: "custom",
+    baseUrl: trimmedBaseUrl
+  };
+};
+
+
+
+
 
 
 
@@ -868,4 +928,4 @@ var Client = class {
 
 
 
-exports.Chat = Chat; exports.Client = Client; exports.Messages = Messages; exports.QstashChatRatelimitError = QstashChatRatelimitError; exports.QstashError = QstashError; exports.QstashRatelimitError = QstashRatelimitError; exports.Receiver = _chunkUUR7N6E6js.Receiver; exports.Schedules = Schedules; exports.SignatureError = _chunkUUR7N6E6js.SignatureError; exports.UrlGroups = UrlGroups;
+exports.Chat = Chat; exports.Client = Client; exports.Messages = Messages; exports.QstashChatRatelimitError = QstashChatRatelimitError; exports.QstashError = QstashError; exports.QstashRatelimitError = QstashRatelimitError; exports.Receiver = _chunkUUR7N6E6js.Receiver; exports.Schedules = Schedules; exports.SignatureError = _chunkUUR7N6E6js.SignatureError; exports.UrlGroups = UrlGroups; exports.custom = custom; exports.openai = openai; exports.upstash = upstash;