[sdk] Expect stream body when used in browser env (#9941)

dust-tt · Jan 16, 2025 · bd2576c · bd2576c
1 parent dd95502
commit bd2576c
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 15 deletions.
diff --git a/sdks/js/package-lock.json b/sdks/js/package-lock.json
diff --git a/sdks/js/package.json b/sdks/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dust-tt/client",
-  "version": "1.0.23",
+  "version": "1.0.24",
   "description": "Client for Dust API",
   "repository": {
     "type": "git",

diff --git a/sdks/js/src/index.ts b/sdks/js/src/index.ts
@@ -1,10 +1,17 @@
+import type { AxiosRequestConfig } from "axios";
+import axios from "axios";
+import { createParser } from "eventsource-parser";
+import http from "http";
+import https from "https";
+import { Readable } from "stream";
 import { z } from "zod";
 
 import type {
   AgentActionSpecificEvent,
   AgentActionSuccessEvent,
   AgentConfigurationViewType,
   AgentErrorEvent,
+  AgentMessagePublicType,
   AgentMessageSuccessEvent,
   APIError,
   AppsCheckRequestType,
@@ -40,7 +47,6 @@ import {
   DeleteFolderResponseSchema,
   Err,
   FileUploadRequestResponseSchema,
-  FileUploadUrlRequestSchema,
   GetActiveMemberEmailsInWorkspaceResponseSchema,
   GetAgentConfigurationsResponseSchema,
   GetAppsResponseSchema,
@@ -62,21 +68,18 @@ import {
 
 export * from "./types";
 
-import type { AxiosRequestConfig } from "axios";
-import axios from "axios";
-import { createParser } from "eventsource-parser";
-import http from "http";
-import https from "https";
-import { Readable } from "stream";
-
 interface DustResponse {
   status: number;
   ok: boolean;
   url: string;
-  body: Readable;
+  body: Readable | string;
 }
 
 const textFromResponse = async (response: DustResponse): Promise<string> => {
+  if (typeof response.body === "string") {
+    return response.body;
+  }
+
   const stream = response.body;
 
   return new Promise((resolve, reject) => {
@@ -631,16 +634,32 @@ export class DustAPI {
         const m = versions[versions.length - 1];
         return m;
       })
-      .filter((m) => {
+      .filter((m): m is AgentMessagePublicType => {
         return (
           m && m.type === "agent_message" && m.parentMessageId === userMessageId
         );
       });
     if (agentMessages.length === 0) {
       return new Err(new Error("Failed to retrieve agent message"));
     }
+
     const agentMessage = agentMessages[0];
+    return this.streamAgentMessageEvents({
+      conversation,
+      agentMessage,
+      signal,
+    });
+  }
 
+  async streamAgentMessageEvents({
+    conversation,
+    agentMessage,
+    signal,
+  }: {
+    conversation: ConversationPublicType;
+    agentMessage: AgentMessagePublicType;
+    signal?: AbortSignal;
+  }) {
     const res = await this.request({
       method: "GET",
       path: `assistant/conversations/${conversation.sId}/messages/${agentMessage.sId}/events`,
@@ -893,7 +912,6 @@ export class DustAPI {
     useCaseMetadata,
     fileObject,
   }: FileUploadUrlRequestType & { fileObject: File }) {
-    FileUploadUrlRequestSchema;
     const res = await this.request({
       method: "POST",
       path: "files",
@@ -1076,7 +1094,7 @@ export class DustAPI {
   ): Promise<Result<{ response: DustResponse; duration: number }, APIError>> {
     const now = Date.now();
     try {
-      const res = await axiosNoKeepAlive<Readable>(url, {
+      const res = await axiosNoKeepAlive<Readable | string>(url, {
         validateStatus: () => true,
         responseType: "stream",
         ...config,