vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

server : remove trailing whitespaces

Browse source
This commit is contained in:
jhen 2023-08-13 17:47:54 +08:00
parent 8ff0398be7
commit 6d094cd89c
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
examples/server/public/json-schema-to-grammar.mjs
View file

@ -5,7 +5,7 @@ const PRIMITIVE_RULES = {
number: '("-"? ([0-9] | [1-9] [0-9]*)) ("." [0-9]+)? ([eE] [-+]? [0-9]+)? space', number: '("-"? ([0-9] | [1-9] [0-9]*)) ("." [0-9]+)? ([eE] [-+]? [0-9]+)? space',
integer: '("-"? ([0-9] | [1-9] [0-9]*)) space', integer: '("-"? ([0-9] | [1-9] [0-9]*)) space',
string: ` "\\"" ( string: ` "\\"" (
[^"\\\\] | [^"\\\\] |
"\\\\" (["\\\\/bfnrt] | "u" [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F]) "\\\\" (["\\\\/bfnrt] | "u" [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F])
)* "\\"" space`, )* "\\"" space`,
null: '"null" space', null: '"null" space',
@ -33,19 +33,19 @@ export class SchemaConverter {
_addRule(name, rule) { _addRule(name, rule) {
let escName = name.replace(INVALID_RULE_CHARS_RE, '-'); let escName = name.replace(INVALID_RULE_CHARS_RE, '-');
let key = escName; let key = escName;
if (this._rules.has(escName)) { if (this._rules.has(escName)) {
if (this._rules.get(escName) === rule) { if (this._rules.get(escName) === rule) {
return key; return key;
} }
let i = 0; let i = 0;
while (this._rules.has(`${escName}${i}`)) { while (this._rules.has(`${escName}${i}`)) {
i += 1; i += 1;
} }
key = `${escName}${i}`; key = `${escName}${i}`;
} }
this._rules.set(key, rule); this._rules.set(key, rule);
return key; return key;
} }
@ -53,12 +53,12 @@ export class SchemaConverter {
visit(schema, name) { visit(schema, name) {
const schemaType = schema.type; const schemaType = schema.type;
const ruleName = name || 'root'; const ruleName = name || 'root';
if (schema.oneOf || schema.anyOf) { if (schema.oneOf || schema.anyOf) {
const rule = (schema.oneOf || schema.anyOf).map((altSchema, i) => const rule = (schema.oneOf || schema.anyOf).map((altSchema, i) =>
this.visit(altSchema, `${name}${name ? "-" : ""}${i}`) this.visit(altSchema, `${name}${name ? "-" : ""}${i}`)
).join(' | '); ).join(' | ');
return this._addRule(ruleName, rule); return this._addRule(ruleName, rule);
} else if ('const' in schema) { } else if ('const' in schema) {
return this._addRule(ruleName, this._formatLiteral(schema.const)); return this._addRule(ruleName, this._formatLiteral(schema.const));
@ -74,7 +74,7 @@ export class SchemaConverter {
const orderB = propOrder.hasOwnProperty(b[0]) ? propOrder[b[0]] : propOrder.length; const orderB = propOrder.hasOwnProperty(b[0]) ? propOrder[b[0]] : propOrder.length;
return orderA - orderB || a[0].localeCompare(b[0]); return orderA - orderB || a[0].localeCompare(b[0]);
}); });
let rule = '"{" space'; let rule = '"{" space';
for (let i = 0; i < propPairs.length; i++) { for (let i = 0; i < propPairs.length; i++) {
const [propName, propSchema] = propPairs[i]; const [propName, propSchema] = propPairs[i];
@ -85,7 +85,7 @@ export class SchemaConverter {
rule += ` ${this._formatLiteral(propName)} space ":" space ${propRuleName}`; rule += ` ${this._formatLiteral(propName)} space ":" space ${propRuleName}`;
} }
rule += ' "}" space'; rule += ' "}" space';
return this._addRule(ruleName, rule); return this._addRule(ruleName, rule);
} else if (schemaType === 'array' && 'items' in schema) { } else if (schemaType === 'array' && 'items' in schema) {
// TODO `prefixItems` keyword (from python implementation) // TODO `prefixItems` keyword (from python implementation)
@ -102,7 +102,7 @@ export class SchemaConverter {
); );
} }
} }
formatGrammar() { formatGrammar() {
let grammar = ''; let grammar = '';
this._rules.forEach((rule, name) => { this._rules.forEach((rule, name) => {