@taskyon/tyclient 0.5.0 → 0.5.2

package/dist/tyclient.js

@@ -135,22 +135,19 @@ with the function name.`
 // ../taskyon/src/types/node.ts
 var Annotation = z3__default.default.union([
   z3__default.default.object({
-    type: z3__default.default.literal("url_citation"),
-    url_citation: z3__default.default.object({
-      end_index: z3__default.default.number(),
-      start_index: z3__default.default.number(),
-      title: z3__default.default.string(),
-      url: z3__default.default.string(),
-      content: z3__default.default.string()
-    }).partial().optional()
-  }),
+    type: z3__default.default.literal("url"),
+    id: z3__default.default.string(),
+    end_index: z3__default.default.number(),
+    start_index: z3__default.default.number(),
+    title: z3__default.default.string(),
+    url: z3__default.default.string(),
+    content: z3__default.default.string()
+  }).partial().required({ type: true }),
   z3__default.default.object({
-    type: z3__default.default.literal("file"),
-    content: z3__default.default.object({
-      text: z3__default.default.string(),
-      type: z3__default.default.string()
-    }).array().optional()
-  })
+    type: z3__default.default.literal("document"),
+    text: z3__default.default.string().optional(),
+    content: z3__default.default.string().optional()
+  }).partial().required({ type: true })
 ]);
 var MessageContent = z3__default.default.object({
   type: z3__default.default.literal("message"),
@@ -601,19 +598,19 @@ function MessageChannelBridge(dport, mport) {
 
 // ../taskyon/src/api/index.ts
 var createChatCompletionTask = (args) => toolCall({ name: "chatCompletion", arguments: args });
-var processTasks = (tyPort) => async (taskList, opts) => {
+var sendTasks = (tyPort) => async (taskList, opts) => {
   const tasks = await forgeTaskChain(taskList);
   tyPort.send({
     type: "tasks",
     tasks,
     execute: true,
-    show: true,
+    show: opts.show ?? true,
     // we want to show this task in our GUI as a succesful test
-    origin: "Taskyon Diagnostics"
+    origin: window.origin
   });
   const initialIds = tasks.map((t) => t.id);
   const subTasks = new Set(initialIds);
-  const subTasksCreated = tyPort.receive.narrow((m) => {
+  const subTaskStream = tyPort.receive.narrow((m) => {
     console.log("api received", m);
     if (m.type === "taskCreated" && "task" in m && !!m.task?.id && !!m.task?.parentID && subTasks.has(m.task?.parentID)) {
       subTasks.add(m.task?.id);
@@ -621,12 +618,19 @@ var processTasks = (tyPort) => async (taskList, opts) => {
     }
     return false;
   }).map((msg) => msg.task);
-  const condition = opts.quitCondition ? subTasksCreated.filter(opts.quitCondition) : subTasksCreated.filter((t) => t.content.type === "message");
-  const unsub = condition((m) => console.log("received matching message on port:", m));
-  const lastMsg = await condition.wait(opts);
-  console.log("finished processin all tasks!");
-  unsub();
-  return lastMsg;
+  return { initialIds, subTaskStream };
+};
+var processTasks = (tyPort) => {
+  const send = sendTasks(tyPort);
+  return async (taskList, quitCondition, opts) => {
+    const { subTaskStream } = await send(taskList, opts);
+    const condition = typeof quitCondition === "string" ? subTaskStream.filter((t) => t.content.type === quitCondition) : typeof quitCondition === "object" && Array.isArray(quitCondition) ? subTaskStream.filter((t) => quitCondition.includes(t.content.type)) : subTaskStream.filter(quitCondition);
+    const unsub = condition((m) => console.log("received matching message on port:", m));
+    const lastMsg = await condition.wait(opts);
+    console.log("finished processin all tasks!");
+    unsub();
+    return lastMsg;
+  };
 };
 
 // src/index.ts
@@ -644,7 +648,6 @@ var waitForApiChannel = (iframe) => {
       if (stopped) return;
       const channel = new MessageChannel();
       const targetOrigin = new URL(iframe.src, location.href).origin || "*";
-      console.log("tyclient establishing iframe communication to", targetOrigin);
       const handleFirst = (ev) => {
         console.log("tyclient received first message from taskyon!", ev);
         stopped = true;
@@ -692,48 +695,58 @@ async function initializeTaskyon(options) {
     p[c.name] = c;
     return p;
   }, {});
-  const taskyon = document.getElementById("taskyon");
+  const taskyon = document.getElementById(options.iframeId ?? "taskyon");
   const controller = new AbortController();
   const { x: clientSidePort, y: towardsIframe } = createDuplexChannel();
-  if (taskyon !== null && taskyon.tagName === "IFRAME" && taskyon.contentWindow !== null) {
-    console.log("make sure, we can ");
-    const iframeMessagePort = await waitForApiChannel(taskyon);
-    MessageChannelBridge(towardsIframe, iframeMessagePort);
-    const send = (msg) => {
-      console.log("tyclient sending", msg);
-      clientSidePort.send(safeClone(msg));
-    };
-    console.log("tyclient send our configuration!");
+  if (!taskyon || taskyon.tagName !== "IFRAME" || taskyon.contentWindow === null)
+    throw new Error(`we could not find the taskyon iframe with id: ${options.iframeId}`);
+  console.log("make sure, we can ");
+  const iframeMessagePort = await waitForApiChannel(taskyon);
+  MessageChannelBridge(towardsIframe, iframeMessagePort);
+  const send = (msg) => {
+    console.log("tyclient sending", msg);
+    clientSidePort.send(safeClone(msg));
+  };
+  console.log("tyclient send our configuration!");
+  send({
+    type: "configurationMessage",
+    conf: options.configuration,
+    persist: options.persist,
+    origin: window.location.origin,
+    peerId: options?.name
+  });
+  console.log("tyclient sending our functions!");
+  options.tools.forEach((t) => {
+    const { function: _toolfunc, ...fdescr } = t;
     send({
-      type: "configurationMessage",
-      conf: options.configuration,
-      persist: options.persist,
-      origin: window.location.origin,
-      peerId: options?.name
+      type: "functionDescription",
+      ...fdescr
     });
-    console.log("tyclient sending our functions!");
-    options.tools.forEach((t) => {
-      const { function: _toolfunc, ...fdescr } = t;
-      send({
-        type: "functionDescription",
-        ...fdescr
-      });
-    });
-    console.log("tyclient set up function listener!");
-    clientSidePort.receive((msg) => console.log("tyclient received message", msg));
-    clientSidePort.receive.narrow((msg) => msg.type === "functionCall")(async (msg) => {
-      const tool = toolMap[msg.functionName];
-      if (tool) {
-        const res = await handleFunctionExecution(msg.arguments ?? {}, tool, controller.signal);
-        send({ type: "functionResponse", functionName: tool.name, response: res });
-        console.log("tyclient tool send functionResponse to iframe", res, tool);
-      }
-    });
-  }
+  });
+  console.log("tyclient set up function listener!");
+  clientSidePort.receive((msg) => console.log("tyclient received message", msg));
+  clientSidePort.receive.narrow((msg) => msg.type === "functionCall")(async (msg) => {
+    const tool = toolMap[msg.functionName];
+    if (tool) {
+      const res = await handleFunctionExecution(msg.arguments ?? {}, tool, controller.signal);
+      send({ type: "functionResponse", functionName: tool.name, response: res });
+      console.log("tyclient tool send functionResponse to iframe", res, tool);
+    }
+  });
   return {
-    processTasks: processTasks(clientSidePort),
+    sendTasks: sendTasks(clientSidePort),
+    waitForTaskResult: processTasks(clientSidePort),
     port: clientSidePort,
-    sendFile: (file) => sendFile(clientSidePort.send)(file)
+    sendFile: (file) => sendFile(clientSidePort.send)(file),
+    reconfigure: (options2) => {
+      send({
+        type: "configurationMessage",
+        conf: options2.configuration,
+        persist: options2.persist,
+        origin: window.location.origin,
+        peerId: options2?.name
+      });
+    }
   };
 }