npm - @saltcorn/copilot - Versions diffs - 0.5.1 → 0.5.3 - Mend

@saltcorn/copilot 0.5.1 → 0.5.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/actions/generate-page.js CHANGED Viewed

@@ -361,90 +361,4 @@ function escapeHtml(unsafe) {
     .replace(/'/g, "&#039;");
 }
-parseHTML(`<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Popcorn Beer - Unleash the Flavor Explosion!</title>
-    <link href="https://stackpath.bootstrapcdn.com/bootstrap/5.3.0/css/bootstrap.min.css" rel="stylesheet">
-</head>
-<body>
-<header class="bg-warning text-dark py-5">
-    <div class="container text-center">
-        <h1 class="display-4">Popcorn Beer</h1>
-        <p class="lead">Unleash the Flavor Explosion!</p>
-    </div>
-</header>
-<section class="py-5">
-    <div class="container">
-        <div class="row align-items-center">
-            <div class="col-md-6">
-                <img src="your-image-url.jpg" alt="Popcorn Beer" class="img-fluid rounded">
-            </div>
-            <div class="col-md-6">
-                <h2>Discover the Unique Taste</h2>
-                <p>Introducing our popcorn-flavored beer, a delightful fusion of classic beer with a twist of popcorn essence. Experience the taste sensation that will keep you coming back for more.</p>
-                <a href="#purchase" class="btn btn-warning btn-lg mt-3">Buy Now</a>
-            </div>
-        </div>
-    </div>
-</section>
-<section class="bg-light py-5">
-    <div class="container">
-        <h2 class="text-center mb-4">Why Choose Popcorn Beer?</h2>
-        <div class="row">
-            <div class="col-lg-4">
-                <div class="card mb-4">
-                    <div class="card-body text-center">
-                        <h5 class="card-title">Unique Flavor</h5>
-                        <p class="card-text">A perfect blend of beer and popcorn that tantalizes your taste buds.</p>
-                    </div>
-                </div>
-            </div>
-            <div class="col-lg-4">
-                <div class="card mb-4">
-                    <div class="card-body text-center">
-                        <h5 class="card-title">Premium Ingredients</h5>
-                        <p class="card-text">Crafted with the finest ingredients for an unparalleled taste.</p>
-                    </div>
-                </div>
-            </div>
-            <div class="col-lg-4">
-                <div class="card mb-4">
-                    <div class="card-body text-center">
-                        <h5 class="card-title">Perfect for Any Occasion</h5>
-                        <p class="card-text">Whether it's a movie night or a party, Popcorn Beer is your go-to drink.</p>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</section>
-<section id="purchase" class="py-5">
-    <div class="container text-center">
-        <h2>Get Your Popcorn Beer Today!</h2>
-        <p class="mb-4">Available for purchase online and in select stores near you.</p>
-        <a href="shop.html" class="btn btn-warning btn-lg">Shop Now</a>
-    </div>
-</section>
-<footer class="bg-dark text-white py-4">
-    <div class="container text-center">
-        <p>&copy; 2023 Popcorn Beer. All rights reserved.</p>
-        <ul class="list-inline">
-            <li class="list-inline-item"><a href="#" class="text-white">Privacy Policy</a></li>
-            <li class="list-inline-item"><a href="#" class="text-white">Terms of Service</a></li>
-            <li class="list-inline-item"><a href="#" class="text-white">Contact Us</a></li>
-        </ul>
-    </div>
-</footer>
-<script src="https://stackpath.bootstrapcdn.com/bootstrap/5.3.0/js/bootstrap.bundle.min.js"></script>
-</body>`);
 module.exports = GeneratePage;

package/chat-copilot.js CHANGED Viewed

@@ -337,23 +337,24 @@ const execute = async (table_id, viewname, config, body, { req }) => {
   const fcall = run.context.funcalls[fcall_id];
   const actionClass = classesWithSkills().find(
-    (ac) => ac.function_name === fcall.name
+    (ac) => ac.function_name === (fcall.name || fcall.toolName)
   );
   let result;
+  const args = fcall.arguments ? JSON.parse(fcall.arguments) : fcall.input;
   if (actionClass.follow_on_generate) {
     const toolCallIndex = run.context.interactions.findIndex(
-      (i) => i.tool_call_id === fcall_id
+      (i) =>
+        i.tool_call_id === fcall_id ||
+        (Array.isArray(i.content) &&
+          i.content.some((c) => c.toolCallId === fcall_id))
     );
     const follow_on_gen = run.context.interactions.find(
       (i, ix) => i.role === "assistant" && ix > toolCallIndex
     );
-    result = await actionClass.execute(
-      JSON.parse(fcall.arguments),
-      req,
-      follow_on_gen.content
-    );
+    result = await actionClass.execute(args, req, follow_on_gen.content);
   } else {
-    result = await actionClass.execute(JSON.parse(fcall.arguments), req);
+    result = await actionClass.execute(args, req);
   }
   await addToContext(run, { implemented_fcall_ids: [fcall_id] });
   return { json: { success: "ok", fcall_id, ...(result || {}) } };
@@ -390,27 +391,50 @@ const interact = async (table_id, viewname, config, body, { req }) => {
     userinput,
     complArgs
   );
-  await addToContext(run, {
-    interactions:
-      typeof answer === "object" && answer.tool_calls
-        ? [
-            { role: "assistant", tool_calls: answer.tool_calls },
-            ...answer.tool_calls.map((tc) => ({
-              role: "tool",
-              tool_call_id: tc.id,
-              name: tc.function.name,
-              content: "Action suggested to user.",
-            })),
-          ]
-        : [{ role: "assistant", content: answer }],
-  });
-  console.log("answer", answer);
+  if (answer.ai_sdk)
+    for (const tool_call of answer.tool_calls)
+      await addToContext(run, {
+        interactions: [
+          ...answer.messages,
+          {
+            role: "tool",
+            content: [
+              {
+                type: "tool-result",
+                toolCallId: tool_call.toolCallId,
+                toolName: tool_call.toolName,
+                output: {
+                  type: "text",
+                  value: "Action suggested to user.",
+                },
+              },
+            ],
+          },
+        ],
+      });
+  else
+    await addToContext(run, {
+      interactions:
+        typeof answer === "object" && answer.tool_calls
+          ? [
+              { role: "assistant", tool_calls: answer.tool_calls },
+              ...answer.tool_calls.map((tc) => ({
+                role: "tool",
+                tool_call_id: tc.id || tc.toolCallId,
+                name: tc.function?.name || tc.toolName,
+                content: "Action suggested to user.",
+              })),
+            ]
+          : [{ role: "assistant", content: answer }],
+    });
   if (typeof answer === "object" && answer.tool_calls) {
     const actions = [];
     for (const tool_call of answer.tool_calls) {
       await addToContext(run, {
-        funcalls: { [tool_call.id]: tool_call.function },
+        funcalls: {
+          [tool_call.id || tool_call.toolCallId]:
+            tool_call.function || tool_call,
+        },
       });
       const followOnGen = await getFollowOnGeneration(tool_call);
@@ -433,7 +457,6 @@ const interact = async (table_id, viewname, config, body, { req }) => {
           }
         );
-        console.log("follow on answer", follow_on_answer);
         await addToContext(run, {
           interactions: [
@@ -465,11 +488,13 @@ const interact = async (table_id, viewname, config, body, { req }) => {
 };
 const getFollowOnGeneration = async (tool_call) => {
-  const fname = tool_call.function.name;
+  const fname = tool_call.function?.name || tool_call.toolName;
   const actionClass = classesWithSkills().find(
     (ac) => ac.function_name === fname
   );
-  const args = JSON.parse(tool_call.function.arguments);
+  const args = tool_call.function?.arguments
+    ? JSON.parse(tool_call.function?.arguments)
+    : tool_call.input;
   if (actionClass.follow_on_generate) {
     return await actionClass.follow_on_generate(args);
@@ -483,11 +508,13 @@ const renderToolcall = async (
   run,
   follow_on_answer
 ) => {
-  const fname = tool_call.function.name;
+  const fname = tool_call.function?.name || tool_call.toolName;
   const actionClass = classesWithSkills().find(
     (ac) => ac.function_name === fname
   );
-  const args = JSON.parse(tool_call.function.arguments);
+  const args = tool_call.function?.arguments
+    ? JSON.parse(tool_call.function.arguments)
+    : tool_call.input;
   const inner_markup = await actionClass.render_html(args, follow_on_answer);
   return wrapAction(
@@ -529,7 +556,9 @@ const wrapAction = (
               type: "button",
               id: "exec-" + tool_call.id,
               class: "btn btn-primary d-block mt-3 float-end",
-              onclick: `press_store_button(this, true);view_post('${viewname}', 'execute', {fcall_id: '${tool_call.id}', run_id: ${run.id}}, processExecuteResponse)`,
+              onclick: `press_store_button(this, true);view_post('${viewname}', 'execute', {fcall_id: '${
+                tool_call.id || tool_call.toolCallId
+              }', run_id: ${run.id}}, processExecuteResponse)`,
             },
             "Apply"
           ),

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/copilot",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "AI assistant for building Saltcorn applications",
   "main": "index.js",
   "dependencies": {

package/user-copilot.js CHANGED Viewed

@@ -362,7 +362,14 @@ const run = async (table_id, viewname, config, state, { res, req }) => {
                 onclick: `set_state_field('run_id',${run.id})`,
                 class: "prevcopilotrun border p-2",
               },
-              localeDateTime(run.started_at),
+              div(
+                { class: "d-flex justify-content-between" },
+                localeDateTime(run.started_at),
+                i({
+                  class: "far fa-trash-alt",
+                  onclick: `delprevrun(event, ${run.id})`,
+                })
+              ),
               p(
                 { class: "prevrun_content" },
@@ -397,6 +404,8 @@ const run = async (table_id, viewname, config, state, { res, req }) => {
               div.interaction-segment p {margin-bottom: 0px;}
               div.interaction-segment div.card {margin-top: 0.5rem;}
             div.prevcopilotrun:hover {cursor: pointer; background-color: var(--tblr-secondary-bg-subtle, var(--bs-secondary-bg-subtle, gray));}
+            div.prevcopilotrun i.fa-trash-alt {display: none;}
+            div.prevcopilotrun:hover i.fa-trash-alt {display: block;}
             .copilot-entry .submit-button:hover { cursor: pointer}
             .copilot-entry .submit-button {
@@ -430,6 +439,13 @@ const run = async (table_id, viewname, config, state, { res, req }) => {
         btn.css({ width: "" }).prop("disabled", false);
         btn.removeData("old-text");
     }
+    function delprevrun(e, runid) {
+        e.preventDefault();
+        e.stopPropagation();
+        view_post('${viewname}', 'delprevrun', {run_id:runid})
+        $(e.target).closest(".prevcopilotrun").remove()
+        return false;
+    }
     function processExecuteResponse(res) {
         const btn = $("#exec-"+res.fcall_id)
         restore_old_button_elem($("#exec-"+res.fcall_id))
@@ -608,6 +624,16 @@ const interact = async (table_id, viewname, config, body, { req, res }) => {
   return await process_interaction(run, config, req);
 };
+const delprevrun = async (table_id, viewname, config, body, { req, res }) => {
+  const { run_id } = body;
+  let run;
+  run = await WorkflowRun.findOne({ id: +run_id });
+  await run.delete();
+  return;
+};
 const renderQueryInteraction = async (table, result, config, req) => {
   if (typeof result === "number")
     return wrapSegment(
@@ -907,5 +933,5 @@ module.exports = {
   get_state_fields,
   tableless: true,
   run,
-  routes: { interact },
+  routes: { interact, delprevrun },
 };