@dremio/js-sdk 0.59.0 → 0.61.0

package/dist-iife/enterprise.js

@@ -12251,16 +12251,16 @@ var DremioEnterprise = (() => {
 
   // node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/scheduler/timeoutProvider.js
   var timeoutProvider = {
-    setTimeout: function(handler, timeout) {
+    setTimeout: function(handler, timeout2) {
       var args = [];
       for (var _i2 = 2; _i2 < arguments.length; _i2++) {
         args[_i2 - 2] = arguments[_i2];
       }
       var delegate = timeoutProvider.delegate;
       if (delegate === null || delegate === void 0 ? void 0 : delegate.setTimeout) {
-        return delegate.setTimeout.apply(delegate, __spreadArray2([handler, timeout], __read(args)));
+        return delegate.setTimeout.apply(delegate, __spreadArray2([handler, timeout2], __read(args)));
       }
-      return setTimeout.apply(void 0, __spreadArray2([handler, timeout], __read(args)));
+      return setTimeout.apply(void 0, __spreadArray2([handler, timeout2], __read(args)));
     },
     clearTimeout: function(handle) {
       var delegate = timeoutProvider.delegate;
@@ -12929,16 +12929,16 @@ var DremioEnterprise = (() => {
 
   // node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/scheduler/intervalProvider.js
   var intervalProvider = {
-    setInterval: function(handler, timeout) {
+    setInterval: function(handler, timeout2) {
       var args = [];
       for (var _i2 = 2; _i2 < arguments.length; _i2++) {
         args[_i2 - 2] = arguments[_i2];
       }
       var delegate = intervalProvider.delegate;
       if (delegate === null || delegate === void 0 ? void 0 : delegate.setInterval) {
-        return delegate.setInterval.apply(delegate, __spreadArray2([handler, timeout], __read(args)));
+        return delegate.setInterval.apply(delegate, __spreadArray2([handler, timeout2], __read(args)));
       }
-      return setInterval.apply(void 0, __spreadArray2([handler, timeout], __read(args)));
+      return setInterval.apply(void 0, __spreadArray2([handler, timeout2], __read(args)));
     },
     clearInterval: function(handle) {
       var delegate = intervalProvider.delegate;
@@ -13553,6 +13553,60 @@ var DremioEnterprise = (() => {
     return value instanceof Date && !isNaN(value);
   }
 
+  // node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/operators/timeout.js
+  var TimeoutError = createErrorClass(function(_super) {
+    return function TimeoutErrorImpl(info) {
+      if (info === void 0) {
+        info = null;
+      }
+      _super(this);
+      this.message = "Timeout has occurred";
+      this.name = "TimeoutError";
+      this.info = info;
+    };
+  });
+  function timeout(config3, schedulerArg) {
+    var _a = isValidDate(config3) ? { first: config3 } : typeof config3 === "number" ? { each: config3 } : config3, first = _a.first, each = _a.each, _b = _a.with, _with = _b === void 0 ? timeoutErrorFactory : _b, _c = _a.scheduler, scheduler = _c === void 0 ? schedulerArg !== null && schedulerArg !== void 0 ? schedulerArg : asyncScheduler : _c, _d = _a.meta, meta = _d === void 0 ? null : _d;
+    if (first == null && each == null) {
+      throw new TypeError("No timeout provided.");
+    }
+    return operate(function(source, subscriber) {
+      var originalSourceSubscription;
+      var timerSubscription;
+      var lastValue = null;
+      var seen = 0;
+      var startTimer = function(delay) {
+        timerSubscription = executeSchedule(subscriber, scheduler, function() {
+          try {
+            originalSourceSubscription.unsubscribe();
+            innerFrom(_with({
+              meta,
+              lastValue,
+              seen
+            })).subscribe(subscriber);
+          } catch (err) {
+            subscriber.error(err);
+          }
+        }, delay);
+      };
+      originalSourceSubscription = source.subscribe(createOperatorSubscriber(subscriber, function(value) {
+        timerSubscription === null || timerSubscription === void 0 ? void 0 : timerSubscription.unsubscribe();
+        seen++;
+        subscriber.next(lastValue = value);
+        each > 0 && startTimer(each);
+      }, void 0, void 0, function() {
+        if (!(timerSubscription === null || timerSubscription === void 0 ? void 0 : timerSubscription.closed)) {
+          timerSubscription === null || timerSubscription === void 0 ? void 0 : timerSubscription.unsubscribe();
+        }
+        lastValue = null;
+      }));
+      !seen && startTimer(first != null ? typeof first === "number" ? first : +first - scheduler.now() : each);
+    });
+  }
+  function timeoutErrorFactory(info) {
+    throw new TimeoutError(info);
+  }
+
   // node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/operators/map.js
   function map(project, thisArg) {
     return operate(function(source, subscriber) {
@@ -16056,6 +16110,14 @@ var DremioEnterprise = (() => {
   var endOfStreamChunkSchema = object({
     chunkType: literal("endOfStream")
   });
+  var endOfStreamInputSchema = object({
+    chunkType: literal("endOfStream"),
+    conversationId: string2(),
+    createdAt: string2().check(iso_exports.datetime()),
+    modelName: string2(),
+    modelProviderId: string2(),
+    runId: string2()
+  });
   var interruptChunkSchema = object({
     chunkType: literal("interrupt")
   });
@@ -16075,6 +16137,14 @@ var DremioEnterprise = (() => {
     stepName: string2(),
     text: string2()
   });
+  var sandboxStdoutChunkSchema = object({
+    callId: string2().check(_trim(), _minLength(1)),
+    chunkType: literal("sandboxStdout"),
+    isFinal: boolean2(),
+    text: string2()
+  });
+  var sandboxStdoutContentSchema = sandboxStdoutChunkSchema;
+  var sandboxStdoutChatEventSchema = extend2(sandboxStdoutChunkSchema, chatEventSharedSchema);
   var toolPlanSchema = record(string2(), unknown());
   var toolRequestChunkSchema = object({
     arguments: record(string2(), unknown()),
@@ -16112,12 +16182,13 @@ var DremioEnterprise = (() => {
   ]);
   var chatEventInputSchema = discriminatedUnion("chunkType", [
     extend2(errorChunkV2Schema, chatEventSharedSchema),
-    extend2(endOfStreamChunkSchema, chatEventSharedSchema),
+    endOfStreamInputSchema,
     extend2(interruptChunkSchema, chatEventSharedSchema),
     extend2(conversationUpdateChunkSchema, chatEventSharedSchema),
     extend2(jobUpdateChunkSchema, chatEventSharedSchema),
     extend2(modelChunkSchema, chatEventSharedSchema),
     extend2(sandboxProgressChunkSchema, chatEventSharedSchema),
+    sandboxStdoutChatEventSchema,
     extend2(toolRequestChunkSchema, chatEventSharedSchema),
     extend2(toolResponseChunkSchema, chatEventSharedSchema),
     extend2(userMessageChunkSchema, chatEventSharedSchema)
@@ -16126,13 +16197,14 @@ var DremioEnterprise = (() => {
     createdAt: _instanceof(Xn.Instant),
     id: string2()
   });
+  var endOfStreamOutputSchema = omit2(chatEventOutputSharedSchema, { id: true });
   var chatEventOutputSchema = union([
     extend2(chatEventOutputSharedSchema, {
       content: conversationUpdateChunkSchema,
       role: literal("agent")
     }),
     extend2(chatEventOutputSharedSchema, { content: errorChunkV2Schema, role: literal("agent") }),
-    extend2(chatEventOutputSharedSchema, {
+    extend2(endOfStreamOutputSchema, {
       content: endOfStreamChunkSchema,
       role: literal("agent")
     }),
@@ -16149,6 +16221,10 @@ var DremioEnterprise = (() => {
       content: sandboxProgressChunkSchema,
       role: literal("agent")
     }),
+    extend2(chatEventOutputSharedSchema, {
+      content: sandboxStdoutContentSchema,
+      role: literal("agent")
+    }),
     extend2(chatEventOutputSharedSchema, {
       content: toolRequestChunkSchema,
       role: literal("agent")
@@ -16164,6 +16240,17 @@ var DremioEnterprise = (() => {
   ]);
   var chatEventCodec = codec(chatEventInputSchema, chatEventOutputSchema, {
     decode(v2) {
+      if (v2.chunkType === "endOfStream") {
+        return {
+          content: { chunkType: "endOfStream" },
+          conversationId: v2.conversationId,
+          createdAt: Xn.Instant.from(v2.createdAt),
+          modelName: v2.modelName,
+          modelProviderId: v2.modelProviderId,
+          role: "agent",
+          runId: v2.runId
+        };
+      }
       const sharedProperties = {
         conversationId: v2.conversationId,
         createdAt: Xn.Instant.from(v2.createdAt),
@@ -16193,14 +16280,6 @@ var DremioEnterprise = (() => {
             },
             role: "agent"
           };
-        case "endOfStream":
-          return {
-            ...sharedProperties,
-            content: {
-              chunkType: "endOfStream"
-            },
-            role: "agent"
-          };
         case "interrupt":
           return {
             ...sharedProperties,
@@ -16241,6 +16320,17 @@ var DremioEnterprise = (() => {
             },
             role: "agent"
           };
+        case "sandboxStdout":
+          return {
+            ...sharedProperties,
+            content: {
+              callId: v2.callId,
+              chunkType: "sandboxStdout",
+              isFinal: v2.isFinal,
+              text: v2.text
+            },
+            role: "agent"
+          };
         case "toolRequest":
           return {
             ...sharedProperties,
@@ -16277,10 +16367,21 @@ var DremioEnterprise = (() => {
       }
     },
     encode(v2) {
+      if (v2.content.chunkType === "endOfStream") {
+        return {
+          chunkType: "endOfStream",
+          conversationId: v2.conversationId,
+          createdAt: v2.createdAt.toString(),
+          modelName: v2.modelName,
+          modelProviderId: v2.modelProviderId,
+          runId: v2.runId
+        };
+      }
+      const id = v2.id;
       return {
         conversationId: v2.conversationId,
         createdAt: v2.createdAt.toString(),
-        messageId: v2.id,
+        messageId: id,
         modelName: v2.modelName,
         modelProviderId: v2.modelProviderId,
         runId: v2.runId,
@@ -17952,8 +18053,10 @@ var DremioEnterprise = (() => {
       case "error":
       case "model":
       case "sandboxProgress":
+      case "sandboxStdout":
       case "userMessage": {
-        conversationExchange.messages.set(chatEvent.id, chatEvent);
+        const event = chatEvent;
+        conversationExchange.messages.set(event.id, event);
         break;
       }
       case "toolRequest":
@@ -18475,20 +18578,20 @@ var DremioEnterprise = (() => {
         };
         const scheduledEventId = createScheduledEventId(source, id);
         system._snapshot._scheduledEvents[scheduledEventId] = scheduledEvent;
-        const timeout = clock.setTimeout(() => {
+        const timeout2 = clock.setTimeout(() => {
           delete timerMap[scheduledEventId];
           delete system._snapshot._scheduledEvents[scheduledEventId];
           system._relay(source, target, event);
         }, delay);
-        timerMap[scheduledEventId] = timeout;
+        timerMap[scheduledEventId] = timeout2;
       },
       cancel: (source, id) => {
         const scheduledEventId = createScheduledEventId(source, id);
-        const timeout = timerMap[scheduledEventId];
+        const timeout2 = timerMap[scheduledEventId];
         delete timerMap[scheduledEventId];
         delete system._snapshot._scheduledEvents[scheduledEventId];
-        if (timeout !== void 0) {
-          clock.clearTimeout(timeout);
+        if (timeout2 !== void 0) {
+          clock.clearTimeout(timeout2);
         }
       },
       cancelAll: (actorRef) => {
@@ -21452,6 +21555,15 @@ ${err.message}`);
   }
 
   // dist/enterprise/ai/conversations/createConversationMachine.js
+  var RETRIEVE_STATE_TIMEOUT_MS = 1e4;
+  var STREAM_IDLE_TIMEOUT_MS = 6e4;
+  var STREAM_RETRY_DELAY_MS = 2500;
+  var MAX_STREAM_RETRIES = 5;
+  var STREAM_STATE_RESET = {
+    receivedEndOfStream: false,
+    streamRetryCount: 0,
+    userRequestedStop: false
+  };
   var createConversationMachine = (config3) => setup({
     actors: {
       createConversation: fromPromise2(({ input }) => createConversation(config3)(input).then((result) => {
@@ -21473,9 +21585,13 @@ ${err.message}`);
         return result.value;
       })),
       retrieveState: fromPromise2(async ({ input, signal }) => {
+        const timeoutSignal = AbortSignal.any([
+          signal,
+          AbortSignal.timeout(RETRIEVE_STATE_TIMEOUT_MS)
+        ]);
         const [conversationResult, historyResult] = await Promise.all([
-          retrieveConversation(config3)(input.conversationId, { signal }),
-          retrieveConversationHistory(config3)(input.conversationId, { signal })
+          retrieveConversation(config3)(input.conversationId, { signal: timeoutSignal }),
+          retrieveConversationHistory(config3)(input.conversationId, { signal: timeoutSignal })
         ]);
         if (conversationResult.isErr()) {
           throw conversationResult.error;
@@ -21500,7 +21616,10 @@ ${err.message}`);
         }
         return result.value;
       })),
-      streamRun: fromObservable(({ input }) => fromTextEventStream(({ signal }) => streamRunEvents(config3)({ conversationId: input.conversationId, runId: input.runId }, { signal })).pipe(map((event) => decode(chatEventCodec, JSON.parse(event.data)))))
+      streamRun: fromObservable(({ input }) => fromTextEventStream(({ signal }) => streamRunEvents(config3)({ conversationId: input.conversationId, runId: input.runId }, { signal })).pipe(map((event) => decode(chatEventCodec, JSON.parse(event.data))), timeout({ each: STREAM_IDLE_TIMEOUT_MS })))
+    },
+    delays: {
+      STREAM_RETRY_DELAY: STREAM_RETRY_DELAY_MS
     },
     types: {
       context: {},
@@ -21513,7 +21632,8 @@ ${err.message}`);
       conversationId: input.conversationId,
       conversationSnapshot: void 0,
       currentRunId: void 0,
-      messageAttempt: void 0
+      messageAttempt: void 0,
+      ...STREAM_STATE_RESET
     }),
     id: "agentConversation",
     initial: "uninitialized",
@@ -21540,7 +21660,8 @@ ${err.message}`);
                     }
                   ],
                   currentRunId: ({ event }) => event.output.currentRunId,
-                  messageAttempt: void 0
+                  messageAttempt: void 0,
+                  ...STREAM_STATE_RESET
                 }),
                 emit(({ event }) => ({
                   id: event.output.id,
@@ -21603,7 +21724,8 @@ ${err.message}`);
             {
               actions: assign({
                 conversationSnapshot: ({ context: context2, event }) => AgentConversation.reduceChatEvents(context2.conversationSnapshot, event.output.history.data),
-                currentRunId: ({ event }) => event.output.conversation.currentRunId
+                currentRunId: ({ event }) => event.output.conversation.currentRunId,
+                receivedEndOfStream: false
               }),
               guard: ({ event }) => !!event.output.conversation.currentRunId,
               target: "streaming"
@@ -21611,7 +21733,8 @@ ${err.message}`);
             {
               actions: assign({
                 conversationSnapshot: ({ context: context2, event }) => AgentConversation.reduceChatEvents(context2.conversationSnapshot, event.output.history.data),
-                currentRunId: ({ event }) => event.output.conversation.currentRunId
+                currentRunId: ({ event }) => event.output.conversation.currentRunId,
+                ...STREAM_STATE_RESET
               }),
               target: "idle"
             }
@@ -21620,10 +21743,16 @@ ${err.message}`);
             {
               guard: ({ event }) => {
                 const e2 = event.error;
+                if (e2?.name === "TimeoutError")
+                  return false;
                 return e2?.name === "AbortError" || e2?.message?.includes("aborted") || e2?.code === "ABORT_ERR";
               },
               target: "uninitialized"
             },
+            {
+              guard: ({ context: context2 }) => context2.streamRetryCount > 0,
+              target: "stream_interrupted"
+            },
             {
               actions: [
                 assign({
@@ -21640,6 +21769,30 @@ ${err.message}`);
           src: "retrieveState"
         }
       },
+      stream_interrupted: {
+        after: {
+          STREAM_RETRY_DELAY: [
+            {
+              actions: assign({
+                streamRetryCount: ({ context: context2 }) => context2.streamRetryCount + 1
+              }),
+              guard: ({ context: context2 }) => context2.streamRetryCount < MAX_STREAM_RETRIES,
+              target: "retrieving_history"
+            },
+            {
+              target: "stream_recovery_failed"
+            }
+          ]
+        }
+      },
+      stream_recovery_failed: {
+        on: {
+          REFRESH_HISTORY: {
+            actions: assign({ lastError: void 0, streamRetryCount: 0 }),
+            target: "retrieving_history"
+          }
+        }
+      },
       streaming: {
         description: "Manages monitoring and canceling the current run",
         initial: "monitoring_replies",
@@ -21653,20 +21806,37 @@ ${err.message}`);
               runId: context2.currentRunId
             };
           },
-          onDone: {
-            actions: assign({ currentRunId: null }),
-            target: "idle"
-          },
-          onError: {
-            actions: assign({ currentRunId: null }),
-            target: "idle"
-          },
+          onDone: [
+            {
+              actions: assign({ currentRunId: null, userRequestedStop: false }),
+              guard: ({ context: context2 }) => !!context2.receivedEndOfStream || !!context2.userRequestedStop,
+              target: "idle"
+            },
+            {
+              actions: assign({ currentRunId: null }),
+              target: "stream_interrupted"
+            }
+          ],
+          onError: [
+            {
+              actions: assign({ currentRunId: null, userRequestedStop: false }),
+              guard: ({ context: context2 }) => !!context2.receivedEndOfStream || !!context2.userRequestedStop,
+              target: "idle"
+            },
+            {
+              actions: assign({ currentRunId: null }),
+              target: "stream_interrupted"
+            }
+          ],
           onSnapshot: {
             actions: enqueueActions(({ context: context2, enqueue, event }) => {
               const chatEvent = event.snapshot.context;
               if (!chatEvent) {
                 return;
               }
+              if (chatEvent.content.chunkType === "endOfStream" && !context2.receivedEndOfStream) {
+                enqueue.assign({ receivedEndOfStream: true });
+              }
               const nextSnapshot = AgentConversation.reduceChatEvents(context2.conversationSnapshot, [chatEvent]);
               enqueue.assign({
                 conversationSnapshot: nextSnapshot
@@ -21684,6 +21854,7 @@ ${err.message}`);
             description: "Attached to the run event stream",
             on: {
               STOP_RUN: {
+                actions: assign({ userRequestedStop: true }),
                 target: "stopping"
               }
             }
@@ -21696,10 +21867,11 @@ ${err.message}`);
                 runId: context2.currentRunId
               }),
               onDone: {
-                actions: assign({ currentRunId: void 0 }),
+                actions: assign({ currentRunId: void 0, userRequestedStop: false }),
                 target: "#agentConversation.idle"
               },
               onError: {
+                actions: assign({ userRequestedStop: false }),
                 target: "#agentConversation.retrieving_history"
               },
               src: "stopRun"
@@ -21741,7 +21913,8 @@ ${err.message}`);
                 }
               ],
               currentRunId: ({ event }) => event.output.currentRunId,
-              messageAttempt: void 0
+              messageAttempt: void 0,
+              ...STREAM_STATE_RESET
             }),
             target: "streaming"
           },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dremio/js-sdk",
-  "version": "0.59.0",
+  "version": "0.61.0",
   "description": "JavaScript library for the Dremio API",
   "keywords": [
     "dremio",