Improvements to editor tools (#72)

* improvements to editor tools

* improvements

* fix bugs

* fix bugs

* more improvements

* fix ci?

.github/workflows/npm-release.yml

@@ -22,6 +22,6 @@ jobs:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: |
           pnpm install
-          pnpm build-package
+          pnpm build-packages
           (cd packages/client && pnpm publish --no-git-checks --access public)
           (cd packages/editor-tools && pnpm publish --no-git-checks --access public)

.github/workflows/release.yml

@@ -32,7 +32,7 @@ jobs:
           npm config set "@tiptap-pro:registry" https://registry.tiptap.dev/
           npm config set "//registry.tiptap.dev/:_authToken" ${{ secrets.TIPTAP_TOKEN }}
           pnpm i
-          pnpm run build-package
+          pnpm run build-packages
           cd apps/gui && npm run tw
 
       - name: build-linux

.github/workflows/test.yml

@@ -20,6 +20,6 @@ jobs:
       - run: npm config set "@jsr:registry" https://npm.jsr.io
       - run: npm config set "//registry.tiptap.dev/:_authToken" ${{ secrets.TIPTAP_TOKEN }}
       - run: pnpm i
-      - run: pnpm run build-package
+      - run: pnpm run build-packages
       - run: pnpm run static
       - run: pnpm run test

apps/egui/CHANGELOG.md

@@ -1,5 +1,15 @@
 # egui
 
+## 0.0.32
+
+### Patch Changes
+
+- Improve editor-tools
+- Updated dependencies
+  - @lmscript/editor-tools@0.0.32
+  - @lmscript/client@0.0.32
+  - @lmscript/gui@0.0.32
+
 ## 0.0.31
 
 ### Patch Changes

apps/egui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "egui",
-  "version": "0.0.31",
+  "version": "0.0.32",
   "description": "An Electron application with React and TypeScript",
   "main": "./out/main/index.mjs",
   "author": "example.com",

apps/gui/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @lmscript/gui
 
+## 0.0.32
+
+### Patch Changes
+
+- Improve editor-tools
+- Updated dependencies
+  - @lmscript/editor-tools@0.0.32
+  - @lmscript/client@0.0.32
+
 ## 0.0.31
 
 ### Patch Changes

apps/gui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lmscript/gui",
   "private": true,
-  "version": "0.0.31",
+  "version": "0.0.32",
   "type": "module",
   "scripts": {
     "dev": "vite",

apps/gui/src/editor/components/Play/recoil.ts

@@ -25,7 +25,10 @@ export const generateAsyncAtom = atomFamily<
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const getter = (window as any).getBackendInstance as GetBackendInstance;
       const instance = getter(param.backend);
-      const tasks = compileEditorState(param.editorState, param.backend.template);
+      const tasks = compileEditorState(param.editorState, {
+        template: param.backend.template,
+        useGenerationUuids: true,
+      });
 
       instance
         .executeJSON(

examples/client/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @lmscript/examples_client
 
+## 1.0.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @lmscript/client@0.0.32
+
 ## 1.0.4
 
 ### Patch Changes

examples/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lmscript/examples_client",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "",
   "main": "index.js",
   "scripts": {

package.json

@@ -10,7 +10,7 @@
   "scripts": {
     "static": "pnpm run -r static",
     "test": "pnpm run -r test",
-    "build-package": "pnpm run -r build-package"
+    "build-packages": "(cd packages/client && npm run build) && (cd packages/editor-tools && npm run build)"
   },
   "author": "",
   "license": "ISC"

packages/client/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @lmscript/client
 
+## 0.0.32
+
+### Patch Changes
+
+- Improve editor-tools
+
 ## 0.0.31
 
 ### Patch Changes

packages/client/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@lmscript/client",
-  "version": "0.0.31",
+  "version": "0.0.32",
   "description": "Dependency-Free Typescript client for LmScript.",
   "main": "index.js",
   "scripts": {
-    "build-package": "tsc -b ./tsconfig.cjs.json ./tsconfig.esm.json ./tsconfig.types.json",
+    "build": "tsc -b ./tsconfig.cjs.json ./tsconfig.esm.json ./tsconfig.types.json",
     "ts": "tsc --noEmit",
     "tsw": "tsc --noEmit --watch",
     "format": "prettier --write .",

packages/editor-tools/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @lmscript/client
 
+## 0.0.32
+
+### Patch Changes
+
+- Improve editor-tools
+- Updated dependencies
+  - @lmscript/client@0.0.32
+
 ## 0.0.31
 
 ### Patch Changes

packages/editor-tools/README.md

@@ -4,7 +4,11 @@ TODO
 
 ## Installation
 
-TODO
+Install from [NPM](https://www.npmjs.com/package/@lmscript/editor-tools)
+
+```shell
+npm i @lmscript/editor-tools
+```
 
 ## Usage
 

packages/editor-tools/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@lmscript/editor-tools",
-  "version": "0.0.31",
+  "version": "0.0.32",
   "description": "Dependency-Free Typescript client for LmScript.",
   "main": "index.js",
   "scripts": {
-    "build-package": "tsc -b ./tsconfig.cjs.json ./tsconfig.esm.json ./tsconfig.types.json",
-    "ts": "tsc --noEmit",
+    "build": "tsc -b ./tsconfig.cjs.json ./tsconfig.esm.json ./tsconfig.types.json",
+    "ts": "tsc --noEmit && tsc --noEmit -p ./tsconfig.tests.json",
     "tsw": "tsc --noEmit --watch",
     "format": "prettier --write .",
     "format-check": "prettier --check .",

packages/editor-tools/src/apply-chat-template.ts

@@ -0,0 +1,27 @@
+import { type Task } from "@lmscript/client/backends/abstract";
+import { getRoleEnd, getRoleStart, ChatTemplate } from "@lmscript/client/chat-template";
+import { MessageOfAuthor } from "./messages-of-author";
+import { Author } from "./types";
+
+export const applyChatTemplate = (messages: MessageOfAuthor[], template: ChatTemplate): Task[] => {
+  const countOfRoles: Record<Author, number> = {
+    system: 0,
+    user: 0,
+    assistant: 0,
+  };
+  return messages.flatMap((message): Task[] => {
+    const item: Task[] = [
+      {
+        tag: "AddTextTask",
+        text: getRoleStart(template, message.author, countOfRoles),
+      },
+      ...message.tasks,
+      {
+        tag: "AddTextTask",
+        text: getRoleEnd(template, message.author, countOfRoles),
+      },
+    ];
+    countOfRoles[message.author] += 1;
+    return item;
+  });
+};

packages/editor-tools/src/compile-editor-state.ts

@@ -1,18 +1,41 @@
 import { type Task } from "@lmscript/client/backends/abstract";
 import { LmEditorState } from "./types";
-import { MessageOfAuthorGetter } from "./messages-of-author";
-import { messagesToTasks } from "./message-to-tasks";
+import { MessageOfAuthorGetter, printCustomError } from "./messages-of-author";
+import { applyChatTemplate } from "./apply-chat-template";
 import { ChatTemplate } from "@lmscript/client/chat-template";
 
-export const compileEditorState = (editorState: LmEditorState, template: ChatTemplate): Task[] => {
-  const state = new MessageOfAuthorGetter(editorState);
+export const compileEditorState = (
+  editorState: LmEditorState,
+  options: {
+    template: ChatTemplate;
+    variableOverrides?: Record<string, string>;
+    useGenerationUuids?: boolean;
+  },
+): Task[] => {
+  const overrides = options.variableOverrides ?? {};
+
+  const useGenerationUuids = options.useGenerationUuids ?? false;
+
+  const newVariables = editorState.variables.map((variable) => {
+    if (variable.name in overrides) {
+      return {
+        ...variable,
+        value: overrides[variable.name],
+      };
+    }
+    return variable;
+  });
+
+  const state = new MessageOfAuthorGetter(
+    { ...editorState, variables: newVariables },
+    useGenerationUuids,
+  );
 
   const errors = state.getErrors();
   if (errors.length > 0) {
-    // TODO: serialize errors
-    throw new Error(JSON.stringify(errors));
+    throw new Error(errors.map(printCustomError).join("\n"));
   }
   const messages = state.getAcc();
 
-  return messagesToTasks(messages, template, editorState.variables);
+  return applyChatTemplate(messages, options.template);
 };