Migrate only unique and non-default instruct prompts

4b235f0b3159ae90007715f7f1bb709550e05c6a

Cohee <18619528+Cohee1207@users.noreply.github.com>

Parents: 4e5a997e63a7c82970c0597d5c2cd81b2209c9bb

src/endpoints/content-manager.js+32 -0 Viewed

+}
 /**
+ * Gets content by type and format.
+ * @param {string} type Type of content
+ * @param {'json'|'string'|'raw'} format Format of content
+ * @returns {string[]|Buffer[]} Array of content
+ */
+function getContentOfType(type, format) {
+    const contentIndex = getContentIndex();
+    const indexItems = contentIndex.filter((item) => item.type === type && item.folder);
+    const files = [];
+    for (const item of indexItems) {
+        if (!item.folder) {
+            continue;
+        }
+        const filePath = path.join(item.folder, item.filename);
+        const fileContent = fs.readFileSync(filePath);
+        switch (format) {
+            case 'json':
+                files.push(JSON.parse(fileContent.toString()));
+                break;
+            case 'string':
+                files.push(fileContent.toString());
+                break;
+            case 'raw':
+                files.push(fileContent);
+                break;
+        }
+    }
+    return files;
+}
+/**
  * Gets the target directory for the specified asset type.
  * @param {ContentType} type Asset type
  * @param {import('../users').UserDirectoryList} directories User directories

     checkForNewContent,
     getDefaultPresets,
     getDefaultPresetFile,
+    getContentOfType,
     router,
 };

src/users.js+28 -4 Viewed

 const mime = require('mime-types');
 const archiver = require('archiver');
 const writeFileAtomicSync = require('write-file-atomic').sync;
+const _ = require('lodash');
 const { USER_DIRECTORY_TEMPLATE, DEFAULT_USER, PUBLIC_DIRECTORIES, SETTINGS_FILE } = require('./constants');
 const { getConfigValue, color, delay, setConfigValue, generateTimestamp } = require('./util');

+}
 async function migrateSystemPrompts() {
+    /**
+     * Gets the default system prompts.
+     * @returns {Promise<any[]>} - The list of default system prompts
+     */
+    async function getDefaultSystemPrompts() {
+        try {
+            const { getContentOfType } = await import('./endpoints/content-manager.js');
+            return getContentOfType('sysprompt', 'json');
+        } catch {
+            return [];
+        }
+    }
     const directories = await getUserDirectoriesList();
     for (const directory of directories) {
         try {

             if (fs.existsSync(migrateMarker)) {
                 continue;
+            }
+            const defaultPrompts = await getDefaultSystemPrompts();
             const instucts = fs.readdirSync(directory.instruct);
+            let migratedPrompts = [];
             for (const instruct of instucts) {
                 const instructPath = path.join(directory.instruct, instruct);
-                const syspromptPath = path.join(directory.sysprompt, instruct);
+                const sysPromptPath = path.join(directory.sysprompt, instruct);
-                if (path.extname(instruct) === '.json' && !fs.existsSync(syspromptPath)) {
+                if (path.extname(instruct) === '.json' && !fs.existsSync(sysPromptPath)) {
                     const instructData = JSON.parse(fs.readFileSync(instructPath, 'utf8'));
                     if ('system_prompt' in instructData && 'name' in instructData) {
                         const syspromptData = { name: instructData.name, content: instructData.system_prompt };
-                        writeFileAtomicSync(syspromptPath, JSON.stringify(syspromptData, null, 4));
+                        migratedPrompts.push(syspromptData);
                         delete instructData.system_prompt;
                         writeFileAtomicSync(instructPath, JSON.stringify(instructData, null, 4));
-                        console.log(`Migrated system prompt ${instruct} for ${directory.root.split(path.sep).pop()}`);
+                    }
+                }
+            }
+            // Only leave unique contents
+            migratedPrompts = _.uniqBy(migratedPrompts, 'content');
+            // Only leave contents that are not in the default prompts
+            migratedPrompts = migratedPrompts.filter(x => !defaultPrompts.some(y => y.content === x.content));
+            for (const sysPromptData of migratedPrompts) {
+                const syspromptPath = path.join(directory.sysprompt, `${sysPromptData.name}.json`);
+                writeFileAtomicSync(syspromptPath, JSON.stringify(sysPromptData, null, 4));
+                console.log(`Migrated system prompt ${sysPromptData.name} for ${directory.root.split(path.sep).pop()}`);
+            }
             writeFileAtomicSync(migrateMarker, '');
         } catch {
             // Ignore errors