stanford-oval / genie-toolkit / 684

pending completion

Build # 684

Build Type

Pull #145

travis-ci-com

Committed by

web-flow

Commit Message

runtime: fix non-determinism in inference mode

Pull Request Pull Request #145: Inference mode dialogue templates

Run Details

1283 of 4766 branches covered (26.92%)

Branch coverage included in aggregate %.

67 of 272 new or added lines in 10 files covered. (24.63%)

4 existing lines in 3 files now uncovered.

4029 of 9659 relevant lines covered (41.71%)

26798.32 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

57.45

/lib/languages/thingtalk.js

// -*- mode: js; indent-tabs-mode: nil; js-basic-offset: 4 -*-
//
// This file is part of Genie
//
// Copyright 2019 The Board of Trustees of the Leland Stanford Junior University
//
// Author: Giovanni Campagna <gcampagn@cs.stanford.edu>
//
// See COPYING for details
"use strict";

const ThingTalk = require('thingtalk');
const SchemaRetriever = ThingTalk.SchemaRetriever;
const NNSyntax = ThingTalk.NNSyntax;
const Ast = ThingTalk.Ast;

const { Constant } = require('../sentence-generator/runtime');
const { makeDummyEntity } = require('../utils');

module.exports = {
    async parse(code, entities, options) {
        const program = ThingTalk.NNSyntax.fromNN(code, entities);

        const tpClient = options.thingpediaClient;
        if (!options.schemaRetriever)
            options.schemaRetriever = new SchemaRetriever(tpClient, null, !options.debug);
        const schemas = options.schemaRetriever;
        await program.typecheck(schemas, false);
        return program;
    },

    extractConstants(ast) {
        // TODO
        // (not needed because this is only used in contextual mode)
        return {};
    },
    createConstants(token, type, maxConstants) {
        const escapedToken = token.replace(/[:._]/g, (match) => {
            if (match === '_')
                return '__';
            let code = match.charCodeAt(0);
            return code < 16 ? '_0' + code.toString(16) : '_' + code.toString(16);
        });
        const constants = [];
        for (let i = 0; i < maxConstants; i++) {
            const value = new Ast.Value.VarRef(`__const_${escapedToken}_${i}`, type);
            value.constNumber = i;
            constants.push(new Constant(token, i, value));
        }
        return constants;
    },

    serialize(ast, sentence, entities) {
        const clone = {};
        Object.assign(clone, entities);

        const sequence = NNSyntax.toNN(ast, sentence, clone);
        //ThingTalk.NNSyntax.fromNN(sequence, {});

        if (sequence.some((t) => t.endsWith(':undefined')))
            throw new TypeError(`Generated undefined type`);

        return sequence;
    },

    async normalize(code, options) {
        try {
            const program = ThingTalk.NNSyntax.fromNN(code.split(' '), makeDummyEntity);
            await program.typecheck(options.schemaRetriever, false);

            const entities = {};
            return ThingTalk.NNSyntax.toNN(program, '', entities, { allocateEntities: true }).join(' ');
        } catch(e) {
            console.error(code);
            throw e;
        }
    }
};

1	// -- mode: js; indent-tabs-mode: nil; js-basic-offset: 4 --
2	//
3	// This file is part of Genie
4	//
5	// Copyright 2019 The Board of Trustees of the Leland Stanford Junior University
6	//
7	// Author: Giovanni Campagna <gcampagn@cs.stanford.edu>
8	//
9	// See COPYING for details
10	"use strict";
11
12	const ThingTalk = require('thingtalk');	2✔
13	const SchemaRetriever = ThingTalk.SchemaRetriever;	2✔
14	const NNSyntax = ThingTalk.NNSyntax;	2✔
15	const Ast = ThingTalk.Ast;	2✔
16
17	const { Constant } = require('../sentence-generator/runtime');	2✔
18	const { makeDummyEntity } = require('../utils');	2✔
19
20	module.exports = {	2✔
21	async parse(code, entities, options) {
22	const program = ThingTalk.NNSyntax.fromNN(code, entities);	×
23
24	const tpClient = options.thingpediaClient;	×
25	if (!options.schemaRetriever)	×
26	options.schemaRetriever = new SchemaRetriever(tpClient, null, !options.debug);	×
27	const schemas = options.schemaRetriever;	×
28	await program.typecheck(schemas, false);	×
29	return program;	×
30	},
31
32	extractConstants(ast) {
33	// TODO
34	// (not needed because this is only used in contextual mode)
NEW 35	return {};	×
36	},
37	createConstants(token, type, maxConstants) {
38	const escapedToken = token.replace(/[:._]/g, (match) => {	46✔
39	if (match === '_')	96✔
40	return '__';	68✔
41	let code = match.charCodeAt(0);	28✔
42	return code < 16 ? '_0' + code.toString(16) : '_' + code.toString(16);	28!
43	});
44	const constants = [];	46✔
45	for (let i = 0; i < maxConstants; i++) {	46✔
46	const value = new Ast.Value.VarRef(`__const_${escapedToken}_${i}`, type);	230✔
47	value.constNumber = i;	230✔
48	constants.push(new Constant(token, i, value));	230✔
49	}
50	return constants;	46✔
51	},
52
53	serialize(ast, sentence, entities) {
54	const clone = {};	1,200,000✔
55	Object.assign(clone, entities);	1,200,000✔
56
57	const sequence = NNSyntax.toNN(ast, sentence, clone);	1,200,000✔
58	//ThingTalk.NNSyntax.fromNN(sequence, {});
59
60	if (sequence.some((t) => t.endsWith(':undefined')))	7,688,548!
61	throw new TypeError(`Generated undefined type`);	×
62
63	return sequence;	1,200,000✔
64	},
65
66	async normalize(code, options) {
67	try {	×
68	const program = ThingTalk.NNSyntax.fromNN(code.split(' '), makeDummyEntity);	×
69	await program.typecheck(options.schemaRetriever, false);	×
70
71	const entities = {};	×
72	return ThingTalk.NNSyntax.toNN(program, '', entities, { allocateEntities: true }).join(' ');	×
73	} catch(e) {
74	console.error(code);	×
75	throw e;	×
76	}
77	}
78	};

stanford-oval / genie-toolkit / 684

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous