Add .git to jsconfig ignore

This commit is contained in:
Cohee
2024-10-06 19:12:28 +03:00
parent f66261a52c
commit c8ef4b02bc
7 changed files with 23 additions and 24 deletions

View File

@ -59,15 +59,18 @@ module.exports = {
}, },
}, },
], ],
// There are various vendored libraries that shouldn't be linted
ignorePatterns: [ ignorePatterns: [
'public/lib/**/*', '**/node_modules/**',
'*.min.js', '**/dist/**',
'src/ai_horde/**/*', '**/.git/**',
'plugins/**/*', 'public/lib/**',
'data/**/*', 'backups/**',
'backups/**/*', 'data/**',
'node_modules/**/*', 'cache/**',
'src/tokenizers/**',
'docker/**',
'plugins/**',
'**/*.min.js',
], ],
rules: { rules: {
'no-unused-vars': ['error', { args: 'none' }], 'no-unused-vars': ['error', { args: 'none' }],

View File

@ -11,15 +11,14 @@
"resolveJsonModule": true "resolveJsonModule": true
}, },
"exclude": [ "exclude": [
"node_modules", "**/node_modules/**",
"**/node_modules/*", "**/dist/**",
"public/lib", "**/.git/**",
"backups/*", "public/lib/**",
"data/*", "backups/**",
"**/dist/*", "data/**",
"dist/*", "cache/**",
"cache/*", "src/tokenizers/**",
"src/tokenizers/*", "docker/**"
"docker/*",
] ]
} }

View File

@ -2029,7 +2029,7 @@ export function messageFormatting(mes, ch_name, isSystem, isUser, messageId, san
// Return the original match if no quotes are found // Return the original match if no quotes are found
return match; return match;
} }
} },
); );
// Restore double quotes in tags // Restore double quotes in tags

View File

@ -554,11 +554,9 @@ export function formatInstructModePrompt(name, isImpersonate, promptBias, name1,
* @param {string} name Preset name. * @param {string} name Preset name.
*/ */
function selectMatchingContextTemplate(name) { function selectMatchingContextTemplate(name) {
let foundMatch = false;
for (const context_preset of context_presets) { for (const context_preset of context_presets) {
// If context template matches the instruct preset // If context template matches the instruct preset
if (context_preset.name === name) { if (context_preset.name === name) {
foundMatch = true;
selectContextPreset(context_preset.name, { isAuto: true }); selectContextPreset(context_preset.name, { isAuto: true });
break; break;
} }

View File

@ -1715,7 +1715,6 @@ async function sendOpenAIRequest(type, messages, signal) {
messages = messages.filter(msg => msg && typeof msg === 'object'); messages = messages.filter(msg => msg && typeof msg === 'object');
let logit_bias = {}; let logit_bias = {};
const messageId = getNextMessageId(type);
const isClaude = oai_settings.chat_completion_source == chat_completion_sources.CLAUDE; const isClaude = oai_settings.chat_completion_source == chat_completion_sources.CLAUDE;
const isOpenRouter = oai_settings.chat_completion_source == chat_completion_sources.OPENROUTER; const isOpenRouter = oai_settings.chat_completion_source == chat_completion_sources.OPENROUTER;
const isScale = oai_settings.chat_completion_source == chat_completion_sources.SCALE; const isScale = oai_settings.chat_completion_source == chat_completion_sources.SCALE;

View File

@ -51,7 +51,7 @@ const eratoRepPenWhitelist = [
6, 1, 11, 13, 25, 198, 12, 9, 8, 279, 264, 459, 323, 477, 539, 912, 374, 574, 1051, 1550, 1587, 4536, 5828, 15058, 6, 1, 11, 13, 25, 198, 12, 9, 8, 279, 264, 459, 323, 477, 539, 912, 374, 574, 1051, 1550, 1587, 4536, 5828, 15058,
3287, 3250, 1461, 1077, 813, 11074, 872, 1202, 1436, 7846, 1288, 13434, 1053, 8434, 617, 9167, 1047, 19117, 706, 3287, 3250, 1461, 1077, 813, 11074, 872, 1202, 1436, 7846, 1288, 13434, 1053, 8434, 617, 9167, 1047, 19117, 706,
12775, 649, 4250, 527, 7784, 690, 2834, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 1210, 1359, 608, 220, 596, 956, 12775, 649, 4250, 527, 7784, 690, 2834, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 1210, 1359, 608, 220, 596, 956,
3077, 44886, 4265, 3358, 2351, 2846, 311, 389, 315, 304, 520, 505, 430 3077, 44886, 4265, 3358, 2351, 2846, 311, 389, 315, 304, 520, 505, 430,
]; ];
// Ban the dinkus and asterism // Ban the dinkus and asterism

View File

@ -563,7 +563,7 @@ function convertMistralMessages(messages, charName = '', userName = '') {
} }
}); });
} }
} };
fixToolMessages(); fixToolMessages();
// If system role message immediately follows an assistant message, change its role to user // If system role message immediately follows an assistant message, change its role to user