1003

pending completion

Build # 1003

Build Type

Pull #210

travis-ci-com

Committed by

web-flow

Commit Message

Merge 45d92ad52 into 5a48f6aa3

Pull Request Pull Request #210: New round of templates for Thingpedia

Run Details

5197 of 12158 branches covered (42.75%)

Branch coverage included in aggregate %.

178 of 237 new or added lines in 18 files covered. (75.11%)

3730 existing lines in 61 files now uncovered.

12833 of 23626 relevant lines covered (54.32%)

2276186.01 hits per line

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

97.59

/languages/thingtalk/dialogue_acts/empty-search.js

// -*- mode: js; indent-tabs-mode: nil; js-basic-offset: 4 -*-
//
// This file is part of Genie
//
// Copyright 2020 The Board of Trustees of the Leland Stanford Junior University
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//    http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
// Author: Giovanni Campagna <gcampagn@cs.stanford.edu>
"use strict";

const assert = require('assert');

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

const C = require('../ast_manip');

const {
    makeAgentReply,
    makeSimpleState,
    addQuery,
} = require('../state_manip');
const {
    queryRefinement,
    refineFilterToChangeFilter
} = require('./refinement-helpers');
const {
    isValidSearchQuestion
} = require('./common');

// Refinement dialogue acts: the search is NOT complete (0, or more than 1 result), and the
// agent doesn't want to show results
//
// These include proposals, and empty search errors.
// A proposal is when the agent proposed a refined search; the user answers:
// - some form of "yes"
// - some form of "no" followed by another search refinement

/**
 * Agent dialogue act: a search command returned no result.
 *
 * @param ctx - the current context
 * @param base - the base table used in the reply
 * @param question - a search question used in the reply
 */
function makeEmptySearchError(ctx, [base, question]) {
    if (base !== null && !C.isSameFunction(base.schema, ctx.currentFunctionSchema))
        return null;

    let type, state;
    if (question !== null) {
        if (!isGoodEmptySearchQuestion(ctx, question.name))
            return null;

        const arg = ctx.currentFunctionSchema.getArgument(question.name);
        type = arg.type;
        state = makeSimpleState(ctx, 'sys_empty_search_question', question.name);
    } else {
        type = null;
        state = makeSimpleState(ctx, 'sys_empty_search', null);
    }
    return makeAgentReply(ctx, state, [base, question], type);
}

function isGoodEmptySearchQuestion(ctx, question) {
    assert(typeof question === 'string');
    if (!isValidSearchQuestion(ctx.current.stmt.table, [question]))
        return false;

    const ctxFilterTable = C.findFilterTable(ctx.current.stmt.table);
    if (!ctxFilterTable || !C.filterUsesParam(ctxFilterTable.filter, question))
        return false;

    return true;
}

function emptySearchChangePhraseCommon(ctx, newFilter) {
    const currentTable = ctx.current.stmt.table;
    const newTable = queryRefinement(currentTable, newFilter, refineFilterToChangeFilter);
    if (newTable === null)
        return null;
    return addQuery(ctx, 'execute', newTable, 'accepted');
}

/**
 * User dialogue act: in response to an empty search, the user changes their constraints.
 *
 * The "precise" variant explicitly contains a reference to a table, which must be the same
 * as the context.
 */
function preciseEmptySearchChangeRequest(ctx, phrase) {
    const [, param] = ctx.aux;
    if (!C.isSameFunction(ctx.currentFunctionSchema, phrase.schema))
        return null;
    if (param !== null && !C.filterUsesParam(phrase.filter, param.name))
        return null;

    return emptySearchChangePhraseCommon(ctx, phrase.filter);
}

/**
 * User dialogue act: in response to an empty search, the user changes their constraints.
 *
 * The "imprecise" variant only contains a value and optionally a parameter name.
 * The table is inferred from the context.
 */
function impreciseEmptySearchChangeRequest(ctx, answer) {
    const [base, param] = ctx.aux;
    // because we're imprecise, we're only valid if the agent asked a specific question
    if (base === null || param === null)
        return null;
    if (answer instanceof Ast.Value)
        answer = C.makeFilter(param, '==', answer);
    if (answer === null)
        return null;
    if (answer.name !== param.name)
        return null;
    if (!C.checkFilter(base, answer))
        return null;

    return emptySearchChangePhraseCommon(ctx, answer);
}

module.exports = {
    makeEmptySearchError,
    preciseEmptySearchChangeRequest,
    impreciseEmptySearchChangeRequest
};

1	// -- mode: js; indent-tabs-mode: nil; js-basic-offset: 4 --
2	//
3	// This file is part of Genie
4	//
5	// Copyright 2020 The Board of Trustees of the Leland Stanford Junior University
6	//
7	// Licensed under the Apache License, Version 2.0 (the "License");
8	// you may not use this file except in compliance with the License.
9	// You may obtain a copy of the License at
10	//
11	// http://www.apache.org/licenses/LICENSE-2.0
12	//
13	// Unless required by applicable law or agreed to in writing, software
14	// distributed under the License is distributed on an "AS IS" BASIS,
15	// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16	// See the License for the specific language governing permissions and
17	// limitations under the License.
18	//
19	// Author: Giovanni Campagna <gcampagn@cs.stanford.edu>
20	"use strict";
21
22	const assert = require('assert');	2✔
23
24	const ThingTalk = require('thingtalk');	2✔
25	const Ast = ThingTalk.Ast;	2✔
26
27	const C = require('../ast_manip');	2✔
28
29	const {
30	makeAgentReply,
31	makeSimpleState,
32	addQuery,
33	} = require('../state_manip');	2✔
34	const {
35	queryRefinement,
36	refineFilterToChangeFilter
37	} = require('./refinement-helpers');	2✔
38	const {
39	isValidSearchQuestion
40	} = require('./common');	2✔
41
42	// Refinement dialogue acts: the search is NOT complete (0, or more than 1 result), and the
43	// agent doesn't want to show results
44	//
45	// These include proposals, and empty search errors.
46	// A proposal is when the agent proposed a refined search; the user answers:
47	// - some form of "yes"
48	// - some form of "no" followed by another search refinement
49
50	/**
51	* Agent dialogue act: a search command returned no result.
52	*
53	* @param ctx - the current context
54	* @param base - the base table used in the reply
55	* @param question - a search question used in the reply
56	*/
57	function makeEmptySearchError(ctx, [base, question]) {
58	if (base !== null && !C.isSameFunction(base.schema, ctx.currentFunctionSchema))	3,455✔
59	return null;	2,227✔
60
61	let type, state;
62	if (question !== null) {	1,228✔
63	if (!isGoodEmptySearchQuestion(ctx, question.name))	1,226✔
64	return null;	985✔
65
66	const arg = ctx.currentFunctionSchema.getArgument(question.name);	241✔
67	type = arg.type;	241✔
68	state = makeSimpleState(ctx, 'sys_empty_search_question', question.name);	241✔
69	} else {
70	type = null;	2✔
71	state = makeSimpleState(ctx, 'sys_empty_search', null);	2✔
72	}
73	return makeAgentReply(ctx, state, [base, question], type);	243✔
74	}
75
76	function isGoodEmptySearchQuestion(ctx, question) {
77	assert(typeof question === 'string');	1,226✔
78	if (!isValidSearchQuestion(ctx.current.stmt.table, [question]))	1,226✔
79	return false;	833✔
80
81	const ctxFilterTable = C.findFilterTable(ctx.current.stmt.table);	393✔
82	if (!ctxFilterTable \|\| !C.filterUsesParam(ctxFilterTable.filter, question))	393✔
83	return false;	152✔
84
85	return true;	241✔
86	}
87
88	function emptySearchChangePhraseCommon(ctx, newFilter) {
89	const currentTable = ctx.current.stmt.table;	20,257✔
90	const newTable = queryRefinement(currentTable, newFilter, refineFilterToChangeFilter);	20,257✔
91	if (newTable === null)	20,257✔
92	return null;	2,566✔
93	return addQuery(ctx, 'execute', newTable, 'accepted');	17,691✔
94	}
95
96	/**
97	* User dialogue act: in response to an empty search, the user changes their constraints.
98	*
99	* The "precise" variant explicitly contains a reference to a table, which must be the same
100	* as the context.
101	*/
102	function preciseEmptySearchChangeRequest(ctx, phrase) {
103	const [, param] = ctx.aux;	745,536✔
104	if (!C.isSameFunction(ctx.currentFunctionSchema, phrase.schema))	745,536✔
105	return null;	712,921✔
106	if (param !== null && !C.filterUsesParam(phrase.filter, param.name))	32,615✔
107	return null;	12,392✔
108
109	return emptySearchChangePhraseCommon(ctx, phrase.filter);	20,223✔
110	}
111
112	/**
113	* User dialogue act: in response to an empty search, the user changes their constraints.
114	*
115	* The "imprecise" variant only contains a value and optionally a parameter name.
116	* The table is inferred from the context.
117	*/
118	function impreciseEmptySearchChangeRequest(ctx, answer) {
119	const [base, param] = ctx.aux;	93,640✔
120	// because we're imprecise, we're only valid if the agent asked a specific question
121	if (base === null \|\| param === null)	93,640✔
122	return null;	92,740✔
123	if (answer instanceof Ast.Value)	900✔
124	answer = C.makeFilter(param, '==', answer);	450✔
125	if (answer === null)	900✔
126	return null;	443✔
127	if (answer.name !== param.name)	457✔
128	return null;	423✔
129	if (!C.checkFilter(base, answer))	34!
UNCOV 130	return null;	×
131
132	return emptySearchChangePhraseCommon(ctx, answer);	34✔
133	}
134
135	module.exports = {	2✔
136	makeEmptySearchError,
137	preciseEmptySearchChangeRequest,
138	impreciseEmptySearchChangeRequest
139	};

stanford-oval / genie-toolkit / 1003

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