@lampdotdev/lamp 0.36.2-nightly.28 → 0.36.2-nightly.29

package/cli/ai.mjs

@@ -212,6 +212,14 @@ export function models() {
   return { models: listedHere, default: defaultId(which) };
 }
 
+/**
+ * How long a page's request may take: a real answer is never cut off however long the model takes, and the guard only
+ * ends a call that has stopped answering (`MAX_TURN_SECONDS` for a step of `act`, the same here). A page that wants a
+ * quicker answer asks for one (`seconds`), never a longer one.
+ */
+const GUARD_SECONDS = 600;
+const secondsFor = (body) => (typeof body?.seconds === "number" && body.seconds > 0 ? Math.min(body.seconds, GUARD_SECONDS) : GUARD_SECONDS);
+
 /** `/ai`: a text answer, or JSON when asked for it. */
 export async function ask(body) {
   const prompt = typeof body?.prompt === "string" ? body.prompt.trim() : "";
@@ -219,7 +227,7 @@ export async function ask(body) {
   let system = typeof body.system === "string" ? body.system : "";
   if (body.json) system += (system ? "\n\n" : "") + "Answer with JSON only, nothing around it.";
   const which = engine();
-  try { return [200, { text: await complete({ system, prompt, images: body.images, which, model: modelFor(which, body.model) }) }]; }
+  try { return [200, { text: await complete({ system, prompt, images: body.images, which, model: modelFor(which, body.model), seconds: secondsFor(body) }) }]; }
   catch (error) { return [502, { error: error.message }]; }
 }
 
@@ -233,7 +241,7 @@ export async function decide(body) {
   }
   const { system, prompt, schema } = decidePrompt(body.state, questions);
   let text;
-  try { text = await complete({ system, prompt, schema }); } catch (error) { return [502, { error: error.message }]; }
+  try { text = await complete({ system, prompt, schema, seconds: secondsFor(body) }); } catch (error) { return [502, { error: error.message }]; }
   const read = readDecision(text, questions);
   return read.answers ? [200, { answers: read.answers }] : [502, { error: read.problem }];
 }

package/cli/calls.mjs

@@ -373,7 +373,7 @@ export const CALLS = {
    */
   async openRouterText(given, { stopped } = {}) {
     return openRouter(() => openRouterText({ key: text(given, "key"), prompt: text(given, "prompt"), images: given.images, system: given.system ?? "",
-      model: text(given, "model"), json: given.json === true, schema: given.schema ?? undefined, seconds: seconds(given.seconds, 120, 600), signal: stopped }));
+      model: text(given, "model"), json: given.json === true, schema: given.schema ?? undefined, seconds: seconds(given.seconds, 600, 600), signal: stopped }));
   },
 
   /** One chat completion from OpenRouter, its request as `body` (`actAsk`'s): `{message, cost}`, or `{trouble}`. */
@@ -384,7 +384,7 @@ export const CALLS = {
   /** Decisions from OpenRouter's decision model (`AppAI.decide`): `key`, `model`, `state`, `questions`. `{answers, cost}` or `{trouble}`. */
   async openRouterDecide(given, { stopped } = {}) {
     return openRouter(() => openRouterDecide({ key: text(given, "key"), model: text(given, "model"), state: given.state, questions: given.questions ?? {},
-      seconds: seconds(given.seconds, 60, 120), signal: stopped }));
+      seconds: seconds(given.seconds, 600, 600), signal: stopped }));
   },
 
   /** A picture from OpenRouter (`AppAI.image`): `key`, `model`, `prompt`, `references`, `aspectRatio`. `{image, cost}` or `{trouble}`. */
@@ -403,7 +403,7 @@ export const CALLS = {
       return { text: await complete({ which: text(given, "engine"), tool: typeof given.tool === "string" && given.tool ? given.tool : undefined,
         env: given.env && typeof given.env === "object" ? given.env : {}, system: typeof given.system === "string" ? given.system : "",
         prompt: text(given, "prompt"), schema: given.schema ?? undefined, model: typeof given.model === "string" ? given.model : "",
-        images: Array.isArray(given.images) ? given.images : [], seconds: seconds(given.seconds, 300, 600), signal: stopped }) };
+        images: Array.isArray(given.images) ? given.images : [], seconds: seconds(given.seconds, 600, 600), signal: stopped }) };
     } catch (error) {
       if (error instanceof EngineTrouble) return { trouble: { kind: error.kind, message: error.message } };
       throw error;

package/cli/lamps/lamp-for-games.js

@@ -301,6 +301,10 @@
     });
   }
 
+  // How long the page waits for an answer: as long as Lamp's guard on the call (10 minutes), or the page's own limit,
+  // with a little more for the answer to come back.
+  function AI_WAIT(seconds) { return (typeof seconds === 'number' && seconds > 0 ? Math.min(seconds, 600) : 600) * 1000 + 15000; }
+
   function post(path, body, timeout, deadline) {
     timeout = timeout || 240000;
     var done;
@@ -485,7 +489,9 @@
     return encode(o.images).then(function (images) {
       var body = { prompt: text, system: rules.filter(function (r) { return r; }).join('\n\n'), json: !!o.json, images: images };
       if (o.model) body.model = o.model;
-      return post('/ai', body);
+      // No limit of the page's own unless it asks for one: Lamp's guard ends only a call that stopped answering.
+      if (typeof o.seconds === 'number' && o.seconds > 0) body.seconds = o.seconds;
+      return post('/ai', body, AI_WAIT(body.seconds));
     }).then(function (reply) {
       if (typeof reply.text !== 'string') throw new Failure('The AI request failed.');
       if (!o.json) return reply.text;
@@ -998,7 +1004,7 @@
     },
     /** Asks several questions about the same thing in one request. Answers come back under the same keys. */
     decide: function (about, questions) {
-      return post('/ai/decide', { state: decisionState(about), questions: questions }).then(function (reply) {
+      return post('/ai/decide', { state: decisionState(about), questions: questions }, AI_WAIT()).then(function (reply) {
         var answers = {};
         for (var key in (reply.answers || {})) if (reply.answers.hasOwnProperty(key)) answers[key] = decision(reply.answers[key]);
         return answers;
@@ -1036,7 +1042,7 @@
           finish(i, answers);
           return Promise.resolve();
         }
-        return post('/ai/decide', { state: decisionState(state), questions: questions }).then(function (reply) {
+        return post('/ai/decide', { state: decisionState(state), questions: questions }, AI_WAIT()).then(function (reply) {
           var answers = {};
           for (var k in (reply.answers || {})) if (reply.answers.hasOwnProperty(k)) answers[k] = decision(reply.answers[k]);
           if (key) saved[key] = { answers: reply.answers, until: now + o.remember * 1000 };

package/cli/lamps/lamp.js

@@ -301,6 +301,10 @@
     });
   }
 
+  // How long the page waits for an answer: as long as Lamp's guard on the call (10 minutes), or the page's own limit,
+  // with a little more for the answer to come back.
+  function AI_WAIT(seconds) { return (typeof seconds === 'number' && seconds > 0 ? Math.min(seconds, 600) : 600) * 1000 + 15000; }
+
   function post(path, body, timeout, deadline) {
     timeout = timeout || 240000;
     var done;
@@ -485,7 +489,9 @@
     return encode(o.images).then(function (images) {
       var body = { prompt: text, system: rules.filter(function (r) { return r; }).join('\n\n'), json: !!o.json, images: images };
       if (o.model) body.model = o.model;
-      return post('/ai', body);
+      // No limit of the page's own unless it asks for one: Lamp's guard ends only a call that stopped answering.
+      if (typeof o.seconds === 'number' && o.seconds > 0) body.seconds = o.seconds;
+      return post('/ai', body, AI_WAIT(body.seconds));
     }).then(function (reply) {
       if (typeof reply.text !== 'string') throw new Failure('The AI request failed.');
       if (!o.json) return reply.text;
@@ -998,7 +1004,7 @@
     },
     /** Asks several questions about the same thing in one request. Answers come back under the same keys. */
     decide: function (about, questions) {
-      return post('/ai/decide', { state: decisionState(about), questions: questions }).then(function (reply) {
+      return post('/ai/decide', { state: decisionState(about), questions: questions }, AI_WAIT()).then(function (reply) {
         var answers = {};
         for (var key in (reply.answers || {})) if (reply.answers.hasOwnProperty(key)) answers[key] = decision(reply.answers[key]);
         return answers;
@@ -1036,7 +1042,7 @@
           finish(i, answers);
           return Promise.resolve();
         }
-        return post('/ai/decide', { state: decisionState(state), questions: questions }).then(function (reply) {
+        return post('/ai/decide', { state: decisionState(state), questions: questions }, AI_WAIT()).then(function (reply) {
           var answers = {};
           for (var k in (reply.answers || {})) if (reply.answers.hasOwnProperty(k)) answers[k] = decision(reply.answers[k]);
           if (key) saved[key] = { answers: reply.answers, until: now + o.remember * 1000 };

package/cli/lamps/mac-starter/.lamp/meta.json

@@ -1 +1 @@
-{"name":"Zqx App Name","instance":"FE98C883-9417-425A-8B4A-689C3EB7CC0A","exe":"ZqxAppName","platform":"mac"}
+{"name":"Zqx App Name","instance":"1F28D505-8715-4018-8ADA-A146F6FEB632","exe":"ZqxAppName","platform":"mac"}

package/cli/lamps/mac-starter/Sources/LampSupport.swift

@@ -11299,7 +11299,7 @@
             let reply = try await post("/ai/decide", [
                 "state": try decisionState(state),
                 "questions": questions.mapValues(\.json),
-            ])
+            ], timeout: 615)
             let answers = reply["answers"] as? [String: [String: Any]] ?? [:]
             return answers.mapValues(LampDecision.init)
         }
@@ -11427,7 +11427,7 @@
                         group.addTask {
                             try Task.checkCancellation()
                             do {
-                                let reply = try await post("/ai/decide", body: request.body)
+                                let reply = try await post("/ai/decide", body: request.body, timeout: 615)
                                 guard let answers = reply["answers"] as? [String: Any], !answers.isEmpty else {
                                     return Outcome(index: request.index, error: "The decision model didn't answer.")
                                 }
@@ -11600,7 +11600,8 @@
                 "images": images.compactMap(encode),
             ]
             if let model { body["model"] = model }
-            let reply = try await post("/ai", body)
+            // As long as Lamp's guard on the call: a real answer is never cut off, however long the model takes.
+            let reply = try await post("/ai", body, timeout: 615)
             guard let text = reply["text"] as? String else { throw Failure(message: "The AI request failed.") }
             return text
         }

package/cli/lamps/web-starter/lamp.js

@@ -301,6 +301,10 @@
     });
   }
 
+  // How long the page waits for an answer: as long as Lamp's guard on the call (10 minutes), or the page's own limit,
+  // with a little more for the answer to come back.
+  function AI_WAIT(seconds) { return (typeof seconds === 'number' && seconds > 0 ? Math.min(seconds, 600) : 600) * 1000 + 15000; }
+
   function post(path, body, timeout, deadline) {
     timeout = timeout || 240000;
     var done;
@@ -485,7 +489,9 @@
     return encode(o.images).then(function (images) {
       var body = { prompt: text, system: rules.filter(function (r) { return r; }).join('\n\n'), json: !!o.json, images: images };
       if (o.model) body.model = o.model;
-      return post('/ai', body);
+      // No limit of the page's own unless it asks for one: Lamp's guard ends only a call that stopped answering.
+      if (typeof o.seconds === 'number' && o.seconds > 0) body.seconds = o.seconds;
+      return post('/ai', body, AI_WAIT(body.seconds));
     }).then(function (reply) {
       if (typeof reply.text !== 'string') throw new Failure('The AI request failed.');
       if (!o.json) return reply.text;
@@ -998,7 +1004,7 @@
     },
     /** Asks several questions about the same thing in one request. Answers come back under the same keys. */
     decide: function (about, questions) {
-      return post('/ai/decide', { state: decisionState(about), questions: questions }).then(function (reply) {
+      return post('/ai/decide', { state: decisionState(about), questions: questions }, AI_WAIT()).then(function (reply) {
         var answers = {};
         for (var key in (reply.answers || {})) if (reply.answers.hasOwnProperty(key)) answers[key] = decision(reply.answers[key]);
         return answers;
@@ -1036,7 +1042,7 @@
           finish(i, answers);
           return Promise.resolve();
         }
-        return post('/ai/decide', { state: decisionState(state), questions: questions }).then(function (reply) {
+        return post('/ai/decide', { state: decisionState(state), questions: questions }, AI_WAIT()).then(function (reply) {
           var answers = {};
           for (var k in (reply.answers || {})) if (reply.answers.hasOwnProperty(k)) answers[k] = decision(reply.answers[k]);
           if (key) saved[key] = { answers: reply.answers, until: now + o.remember * 1000 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lampdotdev/lamp",
-  "version": "0.36.2-nightly.28",
+  "version": "0.36.2-nightly.29",
   "description": "Runs a web app or game from its folder and puts each saved change into the open page.",
   "type": "module",
   "bin": {