@upstash/qstash 2.5.5 → 2.6.0

package/index.js

@@ -13,11 +13,20 @@ var DLQ = class {
    * List messages in the dlq
    */
   async listMessages(options) {
-    return await this.http.request({
+    const messagesPayload = await this.http.request({
       method: "GET",
       path: ["v2", "dlq"],
       query: { cursor: _optionalChain([options, 'optionalAccess', _ => _.cursor]) }
     });
+    return {
+      messages: messagesPayload.messages.map((message) => {
+        return {
+          ...message,
+          urlGroup: message.topicName
+        };
+      }),
+      cursor: messagesPayload.cursor
+    };
   }
   /**
    * Remove a message from the dlq using it's `dlqId`
@@ -140,14 +149,16 @@ var HttpClient = (_class = class {
   }}
   __init2() {this.processRequest = (request) => {
     const headers = new Headers(request.headers);
-    headers.set("Authorization", this.authorization);
+    if (!headers.has("Authorization")) {
+      headers.set("Authorization", this.authorization);
+    }
     const requestOptions = {
       method: request.method,
       headers,
       body: request.body,
       keepalive: request.keepalive
     };
-    const url = new URL([this.baseUrl, ...request.path].join("/"));
+    const url = new URL([_nullishCoalesce(request.baseUrl, () => ( this.baseUrl)), ...request.path].join("/"));
     if (request.query) {
       for (const [key, value] of Object.entries(request.query)) {
         if (value !== void 0) {
@@ -192,10 +203,15 @@ var Messages = class {
    * Get a message
    */
   async get(messageId) {
-    return await this.http.request({
+    const messagePayload = await this.http.request({
       method: "GET",
       path: ["v2", "messages", messageId]
     });
+    const message = {
+      ...messagePayload,
+      urlGroup: messagePayload.topicName
+    };
+    return message;
   }
   /**
    * Cancel a message
@@ -209,6 +225,29 @@ var Messages = class {
   }
 };
 
+// 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}`);
+    }
+  }
+}
+
 // src/client/utils.ts
 var isIgnoredHeader = (header) => {
   const lowerCaseHeader = header.toLowerCase();
@@ -249,10 +288,13 @@ function processHeaders(request) {
   if (request.failureCallback !== void 0) {
     headers.set("Upstash-Failure-Callback", request.failureCallback);
   }
+  if (request.timeout !== void 0) {
+    headers.set("Upstash-Timeout", `${request.timeout}s`);
+  }
   return headers;
 }
 function getRequestPath(request) {
-  return _nullishCoalesce(_nullishCoalesce(request.url, () => ( request.topic)), () => ( `api/${request.api}`));
+  return _nullishCoalesce(_nullishCoalesce(request.url, () => ( request.urlGroup)), () => ( `api/${request.api}`));
 }
 
 // src/client/queue.ts
@@ -272,7 +314,8 @@ var Queue = class {
     }
     const body = {
       queueName: this.queueName,
-      parallelism: request.parallelism
+      parallelism: _nullishCoalesce(request.parallelism, () => ( 1)),
+      paused: _nullishCoalesce(request.paused, () => ( false))
     };
     await this.http.request({
       method: "POST",
@@ -341,6 +384,7 @@ var Queue = class {
   async enqueueJSON(request) {
     const headers = prefixHeaders(new Headers(request.headers));
     headers.set("Content-Type", "application/json");
+    appendLLMOptions(request, headers);
     const response = await this.enqueue({
       ...request,
       body: JSON.stringify(request.body),
@@ -348,6 +392,35 @@ var Queue = class {
     });
     return response;
   }
+  /**
+   * Pauses the queue.
+   *
+   * A paused queue will not deliver messages until
+   * it is resumed.
+   */
+  async pause() {
+    if (!this.queueName) {
+      throw new Error("Please provide a queue name to the Queue constructor");
+    }
+    await this.http.request({
+      method: "POST",
+      path: ["v2", "queues", this.queueName, "pause"],
+      parseResponseAsJson: false
+    });
+  }
+  /**
+   * Resumes the queue.
+   */
+  async resume() {
+    if (!this.queueName) {
+      throw new Error("Please provide a queue name to the Queue constructor");
+    }
+    await this.http.request({
+      method: "POST",
+      path: ["v2", "queues", this.queueName, "resume"],
+      parseResponseAsJson: false
+    });
+  }
 };
 
 // src/client/schedules.ts
@@ -380,6 +453,9 @@ var Schedules = class {
     if (request.failureCallback !== void 0) {
       headers.set("Upstash-Failure-Callback", request.failureCallback);
     }
+    if (request.timeout !== void 0) {
+      headers.set("Upstash-Timeout", `${request.timeout}s`);
+    }
     return await this.http.request({
       method: "POST",
       headers,
@@ -415,16 +491,39 @@ var Schedules = class {
       parseResponseAsJson: false
     });
   }
+  /**
+   * Pauses the schedule.
+   *
+   * A paused schedule will not deliver messages until
+   * it is resumed.
+   */
+  async pause({ schedule }) {
+    await this.http.request({
+      method: "PATCH",
+      path: ["v2", "schedules", schedule, "pause"],
+      parseResponseAsJson: false
+    });
+  }
+  /**
+   * Resumes the schedule.
+   */
+  async resume({ schedule }) {
+    await this.http.request({
+      method: "PATCH",
+      path: ["v2", "schedules", schedule, "resume"],
+      parseResponseAsJson: false
+    });
+  }
 };
 
-// src/client/topics.ts
-var Topics = class {
+// src/client/url-groups.ts
+var UrlGroups = class {
   
   constructor(http) {
     this.http = http;
   }
   /**
-   * Create a new topic with the given name and endpoints
+   * Create a new url group with the given name and endpoints
    */
   async addEndpoints(request) {
     await this.http.request({
@@ -436,7 +535,7 @@ var Topics = class {
     });
   }
   /**
-   * Remove endpoints from a topic.
+   * Remove endpoints from a url group.
    */
   async removeEndpoints(request) {
     await this.http.request({
@@ -448,7 +547,7 @@ var Topics = class {
     });
   }
   /**
-   * Get a list of all topics.
+   * Get a list of all url groups.
    */
   async list() {
     return await this.http.request({
@@ -457,7 +556,7 @@ var Topics = class {
     });
   }
   /**
-   * Get a single topic
+   * Get a single url group
    */
   async get(name) {
     return await this.http.request({
@@ -466,7 +565,7 @@ var Topics = class {
     });
   }
   /**
-   * Delete a topic
+   * Delete a url group
    */
   async delete(name) {
     return await this.http.request({
@@ -480,7 +579,7 @@ var Topics = class {
 // src/client/llm/chat.ts
 var Chat = (_class2 = class _Chat {
   
-  constructor(http) {;_class2.prototype.__init3.call(this);_class2.prototype.__init4.call(this);
+  constructor(http) {;_class2.prototype.__init3.call(this);_class2.prototype.__init4.call(this);_class2.prototype.__init5.call(this);
     this.http = http;
   }
   static toChatRequest(request) {
@@ -502,6 +601,8 @@ var Chat = (_class2 = class _Chat {
    * @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({
@@ -523,6 +624,51 @@ var Chat = (_class2 = class _Chat {
       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.
    *
@@ -534,7 +680,7 @@ var Chat = (_class2 = class _Chat {
    *    mistralai/Mistral-7B-Instruct-v0.2 model.
    * @returns Chat completion or stream
    */
-  __init4() {this.prompt = async (request) => {
+  __init5() {this.prompt = async (request) => {
     const chatRequest = _Chat.toChatRequest(request);
     return this.create(chatRequest);
   }}
@@ -551,12 +697,12 @@ var Client = class {
     });
   }
   /**
-   * Access the topic API.
+   * Access the urlGroup API.
    *
-   * Create, read, update or delete topics.
+   * Create, read, update or delete urlGroups.
    */
-  get topics() {
-    return new Topics(this.http);
+  get urlGroups() {
+    return new UrlGroups(this.http);
   }
   /**
    * Access the dlq API.
@@ -615,6 +761,7 @@ var Client = class {
   async publishJSON(request) {
     const headers = prefixHeaders(new Headers(request.headers));
     headers.set("Content-Type", "application/json");
+    appendLLMOptions(request, headers);
     const response = await this.publish({
       ...request,
       headers,
@@ -656,6 +803,7 @@ var Client = class {
         message.body = JSON.stringify(message.body);
       }
       message.headers = new Headers(message.headers);
+      appendLLMOptions(message, message.headers);
       message.headers.set("Content-Type", "application/json");
     }
     const response = await this.batch(request);
@@ -693,12 +841,20 @@ var Client = class {
         query[key] = value.toString();
       }
     }
-    const response = await this.http.request({
+    const responsePayload = await this.http.request({
       path: ["v2", "events"],
       method: "GET",
       query
     });
-    return response;
+    return {
+      cursor: responsePayload.cursor,
+      events: responsePayload.events.map((event) => {
+        return {
+          ...event,
+          urlGroup: event.topicName
+        };
+      })
+    };
   }
 };
 
@@ -712,4 +868,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.Topics = Topics;
+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;