@adminforth/rich-editor 1.6.16 → 2.0.1

package/build.log

@@ -10,5 +10,5 @@ custom/package.json
 custom/quillEditor.vue
 custom/tsconfig.json
 
-sent 34,682 bytes  received 115 bytes  69,594.00 bytes/sec
-total size is 34,259  speedup is 0.98
+sent 35,511 bytes  received 115 bytes  71,252.00 bytes/sec
+total size is 35,088  speedup is 0.98

package/custom/quillEditor.vue

@@ -1,5 +1,6 @@
 <template>
-  <div 
+  <div
+    v-if="wasQuillInitializedSuccessfully" 
     class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 
       focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400
       dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500 whitespace-normal af-quill-editor"
@@ -15,6 +16,13 @@
       
     </div>
   </div>
+  <Textarea
+      v-else
+      :modelValue="currentValue"
+      @update:modelValue="emit('update:value', $event);"
+      placeholder="Enter some text..."
+      class="w-64"
+   />
 
 
 </template>
@@ -30,8 +38,10 @@ import Quill from "quill";
 import "quill/dist/quill.snow.css";
 import QuillTableBetter from 'quill-table-better-yaroslav8765';
 import 'quill-table-better-yaroslav8765/dist/quill-table-better.css';
+import { Textarea } from '@/afcl'
 
 import { useI18n } from 'vue-i18n';
+import { ok } from "assert";
 
 const { t } = useI18n();
 function dbg(title: string,...args: any[]) {
@@ -144,6 +154,7 @@ const editorFocused = ref(false);
 let lastText: string | null = null;
 
 const imageProgress = ref(0);
+const wasQuillInitializedSuccessfully = ref(true);
 
 const selectedSymbolsCount = ref(0);
 
@@ -303,18 +314,33 @@ const quillOptions = {
     const html = props.record[props.column.name] || '';
     const delta = quill.clipboard.convert({ html });
     const [range] = quill.selection.getRange();
-    quill.updateContents(delta, Quill.sources.USER);
-    quill.setSelection(
-      delta.length() - (range?.length || 0),
-      Quill.sources.SILENT
-    );
-    quill.scrollSelectionIntoView();
+    try {
+      quill.updateContents(delta, Quill.sources.USER);
+      quill.setSelection(
+        delta.length() - (range?.length || 0),
+        Quill.sources.SILENT
+      );
+      quill.scrollSelectionIntoView();
+    } catch (e) {
+      console.error('Error while setting initial quill content', e);
+      return {ok: false, error: "Invalid initial content"};
+    }
+    return {ok: true};
   }
 
 onMounted(() => {
   currentValue.value = props.record[props.column.name] || '';
   quill = new Quill(editor.value as HTMLElement, quillOptions);
-  initValue(quill);
+  const initResult = initValue(quill);
+  if (!initResult.ok) {
+    adminforth.alert({
+      message: `Error while initializing rich text editor: ${initResult.error}`,
+      variant: 'danger',
+    });
+    wasQuillInitializedSuccessfully.value = false;
+    return;
+  }
+  wasQuillInitializedSuccessfully.value = true;
   lastText = quill.getText();
   const linkButton = document.querySelector('.ql-link');
   if (linkButton) {

package/dist/custom/quillEditor.vue

@@ -1,5 +1,6 @@
 <template>
-  <div 
+  <div
+    v-if="wasQuillInitializedSuccessfully" 
     class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 
       focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400
       dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500 whitespace-normal af-quill-editor"
@@ -15,6 +16,13 @@
       
     </div>
   </div>
+  <Textarea
+      v-else
+      :modelValue="currentValue"
+      @update:modelValue="emit('update:value', $event);"
+      placeholder="Enter some text..."
+      class="w-64"
+   />
 
 
 </template>
@@ -30,8 +38,10 @@ import Quill from "quill";
 import "quill/dist/quill.snow.css";
 import QuillTableBetter from 'quill-table-better-yaroslav8765';
 import 'quill-table-better-yaroslav8765/dist/quill-table-better.css';
+import { Textarea } from '@/afcl'
 
 import { useI18n } from 'vue-i18n';
+import { ok } from "assert";
 
 const { t } = useI18n();
 function dbg(title: string,...args: any[]) {
@@ -144,6 +154,7 @@ const editorFocused = ref(false);
 let lastText: string | null = null;
 
 const imageProgress = ref(0);
+const wasQuillInitializedSuccessfully = ref(true);
 
 const selectedSymbolsCount = ref(0);
 
@@ -303,18 +314,33 @@ const quillOptions = {
     const html = props.record[props.column.name] || '';
     const delta = quill.clipboard.convert({ html });
     const [range] = quill.selection.getRange();
-    quill.updateContents(delta, Quill.sources.USER);
-    quill.setSelection(
-      delta.length() - (range?.length || 0),
-      Quill.sources.SILENT
-    );
-    quill.scrollSelectionIntoView();
+    try {
+      quill.updateContents(delta, Quill.sources.USER);
+      quill.setSelection(
+        delta.length() - (range?.length || 0),
+        Quill.sources.SILENT
+      );
+      quill.scrollSelectionIntoView();
+    } catch (e) {
+      console.error('Error while setting initial quill content', e);
+      return {ok: false, error: "Invalid initial content"};
+    }
+    return {ok: true};
   }
 
 onMounted(() => {
   currentValue.value = props.record[props.column.name] || '';
   quill = new Quill(editor.value as HTMLElement, quillOptions);
-  initValue(quill);
+  const initResult = initValue(quill);
+  if (!initResult.ok) {
+    adminforth.alert({
+      message: `Error while initializing rich text editor: ${initResult.error}`,
+      variant: 'danger',
+    });
+    wasQuillInitializedSuccessfully.value = false;
+    return;
+  }
+  wasQuillInitializedSuccessfully.value = true;
   lastText = quill.getText();
   const linkButton = document.querySelector('.ql-link');
   if (linkButton) {

package/dist/index.js

@@ -219,7 +219,7 @@ export default class RichEditorPlugin extends AdminForthPlugin {
             method: 'POST',
             path: `/plugin/${this.pluginInstanceId}/doComplete`,
             handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, headers }) {
-                var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+                var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
                 const { record } = body;
                 if (this.rateLimiter) {
                     // rate limit
@@ -249,17 +249,16 @@ export default class RichEditorPlugin extends AdminForthPlugin {
                     content = `Continue writing for text/string field "${fieldLabel}" in the table "${resLabel}"\n` +
                         (Object.keys(recordNoField).length > 0 ? `Record has values for the context: ${inputContext}\n` : '') +
                         `Current field value: ${currentVal}\n` +
-                        "Don't talk to me. Just write text. No quotes. Don't repeat current field value, just write completion\n";
+                        "Don't talk to me. Just write text. No quotes. Don't repeat current field value, just write completion. Stop generating when you finish the sentence. DO NOT GENERATE AFTER YOU GENERATED FIRST\".\" \n";
                 }
                 else {
                     content = `Fill text/string field "${fieldLabel}" in the table "${resLabel}"\n` +
                         (Object.keys(recordNoField).length > 0 ? `Record has values for the context: ${inputContext}\n` : '') +
-                        "Be short, clear and precise. No quotes. Don't talk to me. Just write text\n";
+                        "Be short, clear and precise. No quotes. Don't talk to me. Just write text. Stop generating when you finish the sentence. DO NOT GENERATE AFTER YOU GENERATED FIRST\".\" \n";
                 }
                 process.env.HEAVY_DEBUG && console.log('🪲 OpenAI Prompt 🧠', content);
-                const { content: respContent, finishReason } = yield this.options.completion.adapter.complete(content, (_m = (_l = this.options.completion) === null || _l === void 0 ? void 0 : _l.expert) === null || _m === void 0 ? void 0 : _m.stop, (_p = (_o = this.options.completion) === null || _o === void 0 ? void 0 : _o.expert) === null || _p === void 0 ? void 0 : _p.maxTokens);
-                const stop = ((_q = this.options.completion.expert) === null || _q === void 0 ? void 0 : _q.stop) || ['.'];
-                let suggestion = respContent + (finishReason === 'stop' ? (stop[0] === '.' && stop.length === 1 ? '. ' : '') : '');
+                const { content: respContent } = yield this.options.completion.adapter.complete(content, [], (_m = (_l = this.options.completion) === null || _l === void 0 ? void 0 : _l.expert) === null || _m === void 0 ? void 0 : _m.maxTokens);
+                let suggestion = respContent;
                 if (suggestion.startsWith(currentVal)) {
                     suggestion = suggestion.slice(currentVal.length);
                 }

package/index.ts

@@ -315,23 +315,17 @@ export default class RichEditorPlugin extends AdminForthPlugin {
           content = `Continue writing for text/string field "${fieldLabel}" in the table "${resLabel}"\n` +
               (Object.keys(recordNoField).length > 0 ? `Record has values for the context: ${inputContext}\n` : '') +
               `Current field value: ${currentVal}\n` +
-              "Don't talk to me. Just write text. No quotes. Don't repeat current field value, just write completion\n";
+              "Don't talk to me. Just write text. No quotes. Don't repeat current field value, just write completion. Stop generating when you finish the sentence. DO NOT GENERATE AFTER YOU GENERATED FIRST\".\" \n";
 
         } else {
           content = `Fill text/string field "${fieldLabel}" in the table "${resLabel}"\n` +
               (Object.keys(recordNoField).length > 0 ? `Record has values for the context: ${inputContext}\n` : '') +
-              "Be short, clear and precise. No quotes. Don't talk to me. Just write text\n";
+              "Be short, clear and precise. No quotes. Don't talk to me. Just write text. Stop generating when you finish the sentence. DO NOT GENERATE AFTER YOU GENERATED FIRST\".\" \n";
         }
 
         process.env.HEAVY_DEBUG && console.log('🪲 OpenAI Prompt 🧠', content);
-        const { content: respContent, finishReason } = await this.options.completion.adapter.complete(content, this.options.completion?.expert?.stop, this.options.completion?.expert?.maxTokens);
-        const stop = this.options.completion.expert?.stop || ['.'];
-        let suggestion = respContent + (
-          finishReason === 'stop' ? (
-            stop[0] === '.' && stop.length === 1 ? '. ' : ''
-          ) : ''
-        );
-
+        const { content: respContent } = await this.options.completion.adapter.complete(content, [], this.options.completion?.expert?.maxTokens);
+        let suggestion = respContent
         if (suggestion.startsWith(currentVal)) {
           suggestion = suggestion.slice(currentVal.length);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/rich-editor",
-  "version": "1.6.16",
+  "version": "2.0.1",
   "description": "Rich editor plugin for adminforth",
   "type": "module",
   "main": "dist/index.js",

package/types.ts

@@ -79,11 +79,6 @@ export interface PluginOptions {
          */
         debounceTime?: number;
 
-        /**
-         * Stop completion on these characters. Default is ['.']
-         */
-        stop?: string[];
-
         /**
          * When completion is made, this plugin passes non-empty fields of the record to the LLM model for record context understanding.
          */