@deepagents/text2sql 0.17.0 → 0.18.0

package/dist/index.js

@@ -510,7 +510,6 @@ var fragments = [
   hint("Support both natural language questions AND raw SQL input"),
   hint("When validating user SQL, explain any errors clearly")
 ];
-var developer_agent_default = { tools, fragments };
 
 // packages/text2sql/src/lib/agents/result-tools.ts
 import { tool as tool2 } from "ai";
@@ -802,19 +801,21 @@ async function toSql(options) {
       const sqlOutput = structuredOutput2({
         model,
         context,
-        schema: z4.union([
-          z4.object({
-            sql: z4.string().describe("The SQL query that answers the question"),
-            reasoning: z4.string().optional().describe("The reasoning steps taken to generate the SQL")
-          }),
-          z4.object({
-            error: z4.string().describe(
-              "Error message explaining why the question cannot be answered with the given schema"
-            )
-          })
-        ])
+        schema: z4.object({
+          result: z4.union([
+            z4.object({
+              sql: z4.string().describe("The SQL query that answers the question"),
+              reasoning: z4.string().describe("The reasoning steps taken to generate the SQL")
+            }),
+            z4.object({
+              error: z4.string().describe(
+                "Error message explaining why the question cannot be answered with the given schema"
+              )
+            })
+          ])
+        })
       });
-      const output = await sqlOutput.generate();
+      const { result: output } = await sqlOutput.generate();
       if ("error" in output) {
         throw new UnanswerableSQLError(output.error);
       }
@@ -844,6 +845,16 @@ function formatErrorMessage(error) {
   }
   return error.message;
 }
+function isModelUnavailableError(error) {
+  if (!APICallError.isInstance(error)) {
+    return false;
+  }
+  const message2 = error.message.toLowerCase();
+  const responseBody = (error.responseBody ?? "").toLowerCase();
+  const is404ModelError = error.statusCode === 404 && (message2.includes("model") || responseBody.includes("model_not_found"));
+  const errorCode = typeof error.data === "object" && error.data !== null && "error" in error.data && typeof error.data.error === "object" && error.data.error !== null && "code" in error.data.error && typeof error.data.error.code === "string" ? error.data.error.code.toLowerCase() : void 0;
+  return is404ModelError || errorCode === "model_not_found" || responseBody.includes('"code":"model_not_found"') || message2.includes("model") && message2.includes("does not exist or you do not have access to it");
+}
 async function withRetry(computation, options = { retries: 3 }) {
   const errors = [];
   let attempts = 0;
@@ -857,6 +868,9 @@ async function withRetry(computation, options = { retries: 3 }) {
         if (UnanswerableSQLError.isInstance(context.error)) {
           return false;
         }
+        if (isModelUnavailableError(context.error)) {
+          return false;
+        }
         if (SQLValidationError.isInstance(context.error)) {
           return true;
         }
@@ -4346,15 +4360,24 @@ var Text2Sql = class {
     return producer.toPairs();
   }
   async chat(messages) {
+    if (messages.length === 0) {
+      throw new Error("messages must not be empty");
+    }
     const trackedFs = new TrackedFs(this.#config.filesystem);
     const context = this.#config.context(
       ...guidelines(this.#config.teachingsOptions),
       ...await this.index()
     );
-    const userMsg = messages.at(-1);
-    if (userMsg) {
-      context.set(message(userMsg));
+    const lastMessage = messages[messages.length - 1];
+    let assistantMsgId;
+    if (lastMessage.role === "assistant") {
+      context.set(message(lastMessage));
+      await context.save({ branch: false });
+      assistantMsgId = lastMessage.id;
+    } else {
+      context.set(message(lastMessage));
       await context.save();
+      assistantMsgId = generateId();
     }
     const { mounts: skillMounts } = context.getSkillMounts();
     const { tools: tools2 } = await createResultTools({
@@ -4362,7 +4385,6 @@ var Text2Sql = class {
       skillMounts,
       filesystem: trackedFs
     });
-    const assistantMsgId = generateId();
     const chatAgent = agent2({
       name: "text2sql",
       model: this.#config.model,
@@ -4429,40 +4451,6 @@ var Text2Sql = class {
       }
     });
   }
-  async developer(messages) {
-    const context = this.#config.context(
-      ...guidelines(this.#config.teachingsOptions),
-      ...developer_agent_default.fragments,
-      ...await this.index()
-    );
-    const userMsg = messages.at(-1);
-    if (userMsg) {
-      context.set(message(userMsg));
-      await context.save();
-    }
-    const developerAgent = agent2({
-      name: "developer",
-      model: this.#config.model,
-      context,
-      tools: developer_agent_default.tools
-    });
-    const result = await developerAgent.stream({
-      adapter: this.#config.adapter
-    });
-    return result.toUIMessageStream({
-      onError: (error) => this.#formatError(error),
-      sendStart: true,
-      sendFinish: true,
-      sendReasoning: true,
-      sendSources: true,
-      generateMessageId: generateId,
-      onFinish: async ({ responseMessage }) => {
-        context.set(assistant(responseMessage));
-        await context.save();
-        await context.trackUsage(await result.totalUsage);
-      }
-    });
-  }
   #formatError(error) {
     if (NoSuchToolError.isInstance(error)) {
       return "The model tried to call an unknown tool.";