@caretakerai/agent 0.0.38-beta.0 → 0.0.38-beta.2

package/dist/agent.js

@@ -134,7 +134,15 @@ class Agent {
             ...history,
         ], this.transformers);
         const res = await this.llm.invoke(messages);
-        let { content } = res;
+        let content = res.content;
+        if (typeof content !== 'string') {
+            const messageContent = content;
+            const text = messageContent.find(c => c.type === 'text');
+            if (!text) {
+                throw new AgentError('No text content found in the response.');
+            }
+            content = text.text;
+        }
         const { response_metadata } = res;
         const newActivities = [];
         if (response_metadata?.finish_reason == 'length') {
@@ -156,50 +164,44 @@ class Agent {
         return newActivities;
     }
     async transformAndExecute() {
-        let outputHistory = [];
+        const outputHistory = [];
         const retryErrors = [];
         // Prepare chat messages
         const history = [...this.history];
         for (let i = 0; i < this.maxRetries; ++i) {
+            let inputHistory = [...history, ...outputHistory];
             // Find the latest action and observation indices
-            const latestActionIndex = history.findLastIndex(activity => activity.kind === activity_1.ActivityKind.Action);
-            const latestObservationIndex = history.findLastIndex(activity => activity.kind === activity_1.ActivityKind.Observation);
+            const latestActionIndex = inputHistory.findLastIndex(activity => activity.kind === activity_1.ActivityKind.Action);
+            const latestObservationIndex = inputHistory.findLastIndex(activity => activity.kind === activity_1.ActivityKind.Observation);
             // Execute action if latest action has later index than latest observation
             if (latestActionIndex > latestObservationIndex) {
                 try {
                     // Get action source
-                    const { input: source } = history[latestActionIndex];
+                    const { input: source } = inputHistory[latestActionIndex];
                     // Prefer custom executor is specified
                     const result = this.executor
                         ? await this.executor(source)
                         : await (0, graphql_1.graphql)({ schema: this.schema, source });
-                    // Recreate output history with only the latest observation
-                    outputHistory = [{
-                            kind: activity_1.ActivityKind.Observation,
-                            input: (0, yaml_1.stringify)(result),
-                        }];
                     if (result.errors) {
                         retryErrors.push(...result.errors);
-                        continue;
+                    }
+                    else {
+                        outputHistory.push({
+                            kind: activity_1.ActivityKind.Observation,
+                            input: (0, yaml_1.stringify)(result),
+                        });
                     }
                     // Continue to next iteration to check for more actions or generate new activities
                     continue;
                 }
                 catch (e) {
                     const err = e;
-                    // Recreate output history with only the latest observation
-                    outputHistory = [{
-                            kind: activity_1.ActivityKind.Observation,
-                            input: err.toString(),
-                        }];
                     const message = `Retry ${i + 1} due to action error: ${err}`;
                     this.logger.debug(message);
                     retryErrors.push(err);
                     continue;
                 }
             }
-            // Generate new activities if no action needs execution
-            let inputHistory = [...history, ...outputHistory];
             // Apply transformers to input history before LLM inference
             for (const transformer of this.inputTransformers) {
                 inputHistory = await transformer.transform(inputHistory);
@@ -219,14 +221,9 @@ class Agent {
                         const result = this.executor
                             ? await this.executor(action.input)
                             : await (0, graphql_1.graphql)({ schema: this.schema, source: action.input });
-                        // Add new observation to the iteration history
-                        outputHistory.push({
-                            kind: activity_1.ActivityKind.Observation,
-                            input: (0, yaml_1.stringify)(result),
-                        });
+                        // Throw error if there are any errors and push the agent to retry generation
                         if (result.errors) {
-                            retryErrors.push(...result.errors);
-                            break; // Stop executing further actions if one has errors
+                            throw new AgentRetryError('Action error', result.errors.map(e => new Error(e.message))); // Stop executing further actions if one has errors
                         }
                     }
                     catch (e) {
@@ -237,8 +234,14 @@ class Agent {
                         });
                         const message = `Retry ${i + 1} due to action error: ${err}`;
                         this.logger.debug(message);
-                        retryErrors.push(err);
-                        break; // Stop executing further actions if one has errors
+                        // Add errors to retry errors if they are not already present
+                        if (err instanceof AgentRetryError) {
+                            retryErrors.push(...err.errors);
+                        }
+                        else {
+                            retryErrors.push(err);
+                        }
+                        throw err; // Stop executing further actions if one has errors
                     }
                 }
             }
@@ -249,13 +252,9 @@ class Agent {
                 this.logger.debug(`Retry ${i + 1} due to malformed output: ${err.message}`);
                 continue;
             }
-            // If no action needs execution and last activity is not an action, finish iteration
-            const finalHistory = [...history, ...outputHistory];
-            if (finalHistory.at(-1)?.kind !== activity_1.ActivityKind.Action) {
-                // Add iteration activities to the agent history and finish iteration
-                this.addActivities(...outputHistory);
-                return;
-            }
+            // Add iteration activities to the agent history and finish iteration
+            this.addActivities(...outputHistory);
+            return;
         }
         throw new AgentRetryError('Max number of retries reached.', retryErrors);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caretakerai/agent",
-  "version": "0.0.38-beta.0",
+  "version": "0.0.38-beta.2",
   "description": "Single framework for building text-agents",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",