1633

pending completion

Build # 1633

Build Type

Pull #453

travis-ci-com

Committed by

web-flow

Commit Message

Merge cfa33b1cd into 21e07883e

Pull Request Pull Request #453: Refactor how entities are generated in agent sentences

Run Details

10787 of 23233 branches covered (46.43%)

Branch coverage included in aggregate %.

166 of 213 new or added lines in 13 files covered. (77.93%)

13 existing lines in 4 files now uncovered.

25362 of 43928 relevant lines covered (57.74%)

547156.12 hits per line

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

78.26

/languages/thingtalk/dialogue_acts/coref-questions.ts

// -*- mode: typescript; 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>


import assert from 'assert';

import { Ast, } from 'thingtalk';

import * as C from '../ast_manip';
import {
    ContextInfo,
    addQuery,
} from '../state_manip';
import {
    queryRefinement,
    refineFilterToAnswerQuestion,
} from './refinement-helpers';
import type { Recommendation } from './recommendation';
import type { ListProposal } from './list-proposal';

export type UserSearchQuestionForList = [Ast.EntityValue|Ast.NumberValue|null, C.ParamSlot[]];

export function userSearchQuestionForListKeyFn([name, questions] : UserSearchQuestionForList) {
    if (questions.length === 0)
        return { idType: null, functionName: null };

    return {
        idType: name ? name.getType() : null,
        functionName: questions[0].schema.qualifiedName
    };
}

function areQuestionsValidForContext(ctx : ContextInfo, questions : C.ParamSlot[]) {
    if (ctx.resultInfo!.isAggregation)
        return null;

    const schema = ctx.currentFunction!;

    // if the function only contains one parameter, do not generate projection for it
    if (Object.keys(schema.out).length === 1)
        return null;

    for (const q of questions) {
        if (!C.isSameFunction(schema, q.schema))
            return false;
        const arg = schema.getArgument(q.name);
        if (!arg || arg.is_input)
            return false;
    }
    return true;
}

function recommendationSearchQuestionReply(ctx : ContextInfo, questions : C.ParamSlot[]) {
    const proposal = ctx.aux as Recommendation;
    const { topResult, info, } = proposal;
    if (!topResult.value.id)
        return null;
    if (info !== null) {
        for (const q of questions) {
            if (info.has(q.name))
                return null;
        }
    }

    if (!areQuestionsValidForContext(ctx, questions))
        return null;

    const currentStmt = ctx.current!.stmt;
    const currentTable = currentStmt.expression;
    const newFilter = new Ast.BooleanExpression.Atom(null, 'id', '==', topResult.value.id);
    const newTable = queryRefinement(currentTable, newFilter, refineFilterToAnswerQuestion,
        questions.map((q) => q.name));
    if (newTable === null)
        return null;
    return addQuery(ctx, 'execute', newTable, 'accepted');
}

function learnMoreSearchQuestionReply(ctx : ContextInfo, questions : C.ParamSlot[]) {
    const topResult = ctx.results![0];
    if (!areQuestionsValidForContext(ctx, questions))
        return null;

    const currentStmt = ctx.current!.stmt;
    const currentTable = currentStmt.expression;
    if (!topResult.value.id)
        return null;
    const newFilter = new Ast.BooleanExpression.Atom(null, 'id', '==', topResult.value.id);
    const newTable = queryRefinement(currentTable, newFilter, refineFilterToAnswerQuestion,
        questions.map((q) => q.name));
    if (newTable === null)
        return null;
    return addQuery(ctx, 'execute', newTable, 'accepted');
}

function displayResultSearchQuestionReply(ctx : ContextInfo, questions : C.ParamSlot[]) {
    if (!areQuestionsValidForContext(ctx, questions))
        return null;

    const currentStmt = ctx.current!.stmt;
    const currentTable = currentStmt.expression;
    const newTable = queryRefinement(currentTable, null, refineFilterToAnswerQuestion,
        questions.map((q) => q.name));
    if (newTable === null)
        return null;
    return addQuery(ctx, 'execute', newTable, 'accepted');
}

function listProposalSearchQuestionReply(ctx : ContextInfo, [name, questions] : [Ast.Value|null, C.ParamSlot[]]) {
    const proposal = ctx.aux as ListProposal;
    const [results, info] = proposal;

    if (name !== null) {
        let good = false;
        for (const result of results) {
            if (!result.value.id)
                continue;
            if (result.value.id.equals(name)) {
                good = true;
                break;
            }
        }
        if (!good)
            return null;
    }

    if (info !== null) {
        for (const q of questions) {
            if (info.has(q.name))
                return null;
        }
    }

    if (!areQuestionsValidForContext(ctx, questions))
        return null;

    const currentStmt = ctx.current!.stmt;
    const currentTable = currentStmt.expression;
    let newTable;
    if (name !== null) {
        const newFilter = new Ast.BooleanExpression.Atom(null, 'id', '==', name);
        newTable = queryRefinement(currentTable, newFilter, refineFilterToAnswerQuestion,
            questions.map((q) => q.name));
    } else {
        newTable = queryRefinement(currentTable, null, null,
            questions.map((q) => q.name));
    }
    if (newTable === null)
        return null;

    return addQuery(ctx, 'execute', newTable, 'accepted');
}

function corefConstant(ctx : ContextInfo, base : Ast.Expression, param : C.ParamSlot) {
    const previous = ctx.previousDomain;
    assert(previous);
    if (!previous.results || previous.results.results.length === 0)
        return null;
    const ctxStmt = previous.stmt;
    const ctxSchema = ctxStmt.expression.schema!;
    if (!ctxSchema.class) // FIXME not sure how this happens...
        return null;
    if (ctxSchema.class.name !== base.schema!.class!.name)
        return null;
    if (!C.isSameFunction(ctxSchema, param.schema))
        return null;
    const result = previous.results.results[0];
    if (!result.value[param.name])
        return null;
    return result.value[param.name];
}

function booleanQuestion(base : Ast.Expression|null, slot : C.FilterSlot) : C.ParamSlot[]|null {
    if (base !== null) {
        if (!C.isSameFunction(base.schema!, slot.schema))
            return null;
    }

    const ast = slot.ast;
    if (!(ast instanceof Ast.AtomBooleanExpression)) {
        assert(ast instanceof Ast.AndBooleanExpression);
        assert(ast.operands.length === 2);
        const [op1, op2] = [ast.operands[0], ast.operands[1]];
        assert(op1 instanceof Ast.AtomBooleanExpression);
        assert(op2 instanceof Ast.AtomBooleanExpression);
        assert(op1.name === op2.name);
        return [{
            schema: slot.schema,
            type: slot.ptype,
            filterable: slot.schema.getArgument(op1.name)!.getImplementationAnnotation<boolean>('filterable') ?? true,
            name: op1.name,
            ast: new Ast.Value.VarRef(op1.name)
        }];
    }
    if (ast.name === 'id')
        return null;
    return [{
        schema: slot.schema,
        type: slot.ptype,
        filterable: slot.schema.getArgument(ast.name)!.getImplementationAnnotation<boolean>('filterable') ?? true,
        name: ast.name,
        ast: new Ast.Value.VarRef(ast.name),
    }];
}

export {
    recommendationSearchQuestionReply,
    displayResultSearchQuestionReply,
    learnMoreSearchQuestionReply,
    listProposalSearchQuestionReply,
    corefConstant,
    booleanQuestion
};

1	// -- mode: typescript; 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
21
22	import assert from 'assert';	2✔
23
24	import { Ast, } from 'thingtalk';	2✔
25
26	import * as C from '../ast_manip';	2✔
27	import {	2✔
28	ContextInfo,
29	addQuery,
30	} from '../state_manip';
31	import {	2✔
32	queryRefinement,
33	refineFilterToAnswerQuestion,
34	} from './refinement-helpers';
35	import type { Recommendation } from './recommendation';
36	import type { ListProposal } from './list-proposal';
37
38	export type UserSearchQuestionForList = [Ast.EntityValue\|Ast.NumberValue\|null, C.ParamSlot[]];
39
40	export function userSearchQuestionForListKeyFn([name, questions] : UserSearchQuestionForList) {	2✔
41	if (questions.length === 0)	23,896!
42	return { idType: null, functionName: null };	×
43
44	return {	23,896✔
45	idType: name ? name.getType() : null,	23,896✔
46	functionName: questions[0].schema.qualifiedName
47	};
48	}
49
50	function areQuestionsValidForContext(ctx : ContextInfo, questions : C.ParamSlot[]) {
51	if (ctx.resultInfo!.isAggregation)	36,875!
52	return null;	×
53
54	const schema = ctx.currentFunction!;	36,875✔
55
56	// if the function only contains one parameter, do not generate projection for it
57	if (Object.keys(schema.out).length === 1)	36,875✔
58	return null;	2,000✔
59
60	for (const q of questions) {	34,875✔
61	if (!C.isSameFunction(schema, q.schema))	40,072!
62	return false;	×
63	const arg = schema.getArgument(q.name);	40,072✔
64	if (!arg \|\| arg.is_input)	40,072!
65	return false;	×
66	}
67	return true;	34,875✔
68	}
69
70	function recommendationSearchQuestionReply(ctx : ContextInfo, questions : C.ParamSlot[]) {
71	const proposal = ctx.aux as Recommendation;	27,998✔
72	const { topResult, info, } = proposal;	27,998✔
73	if (!topResult.value.id)	27,998!
74	return null;	×
75	if (info !== null) {	27,998✔
76	for (const q of questions) {	26,495✔
77	if (info.has(q.name))	28,550✔
78	return null;	14,334✔
79	}
80	}
81
82	if (!areQuestionsValidForContext(ctx, questions))	13,664!
83	return null;	×
84
85	const currentStmt = ctx.current!.stmt;	13,664✔
86	const currentTable = currentStmt.expression;	13,664✔
87	const newFilter = new Ast.BooleanExpression.Atom(null, 'id', '==', topResult.value.id);	13,664✔
88	const newTable = queryRefinement(currentTable, newFilter, refineFilterToAnswerQuestion,	13,664✔
89	questions.map((q) => q.name));	15,647✔
90	if (newTable === null)	13,664!
91	return null;	×
92	return addQuery(ctx, 'execute', newTable, 'accepted');	13,664✔
93	}
94
95	function learnMoreSearchQuestionReply(ctx : ContextInfo, questions : C.ParamSlot[]) {
96	const topResult = ctx.results![0];	7,357✔
97	if (!areQuestionsValidForContext(ctx, questions))	7,357!
98	return null;	×
99
100	const currentStmt = ctx.current!.stmt;	7,357✔
101	const currentTable = currentStmt.expression;	7,357✔
102	if (!topResult.value.id)	7,357!
103	return null;	×
104	const newFilter = new Ast.BooleanExpression.Atom(null, 'id', '==', topResult.value.id);	7,357✔
105	const newTable = queryRefinement(currentTable, newFilter, refineFilterToAnswerQuestion,	7,357✔
106	questions.map((q) => q.name));	8,085✔
107	if (newTable === null)	7,357!
108	return null;	×
109	return addQuery(ctx, 'execute', newTable, 'accepted');	7,357✔
110	}
111
112	function displayResultSearchQuestionReply(ctx : ContextInfo, questions : C.ParamSlot[]) {
113	if (!areQuestionsValidForContext(ctx, questions))	2,000!
114	return null;	2,000✔
115
UNCOV 116	const currentStmt = ctx.current!.stmt;	×
UNCOV 117	const currentTable = currentStmt.expression;	×
UNCOV 118	const newTable = queryRefinement(currentTable, null, refineFilterToAnswerQuestion,	×
UNCOV 119	questions.map((q) => q.name));	×
UNCOV 120	if (newTable === null)	×
121	return null;	×
UNCOV 122	return addQuery(ctx, 'execute', newTable, 'accepted');	×
123	}
124
125	function listProposalSearchQuestionReply(ctx : ContextInfo, [name, questions] : [Ast.Value\|null, C.ParamSlot[]]) {
126	const proposal = ctx.aux as ListProposal;	25,642✔
127	const [results, info] = proposal;	25,642✔
128
129	if (name !== null) {	25,642✔
130	let good = false;	14,179✔
131	for (const result of results) {	14,179✔
132	if (!result.value.id)	35,722!
133	continue;	×
134	if (result.value.id.equals(name)) {	35,722✔
135	good = true;	2,444✔
136	break;	2,444✔
137	}
138	}
139	if (!good)	14,179✔
140	return null;	11,735✔
141	}
142
143	if (info !== null) {	13,907✔
144	for (const q of questions) {	2,354✔
145	if (info.has(q.name))	2,582✔
146	return null;	53✔
147	}
148	}
149
150	if (!areQuestionsValidForContext(ctx, questions))	13,854!
151	return null;	×
152
153	const currentStmt = ctx.current!.stmt;	13,854✔
154	const currentTable = currentStmt.expression;	13,854✔
155	let newTable;
156	if (name !== null) {	13,854✔
157	const newFilter = new Ast.BooleanExpression.Atom(null, 'id', '==', name);	2,433✔
158	newTable = queryRefinement(currentTable, newFilter, refineFilterToAnswerQuestion,	2,433✔
159	questions.map((q) => q.name));	3,236✔
160	} else {
161	newTable = queryRefinement(currentTable, null, null,	11,421✔
162	questions.map((q) => q.name));	13,104✔
163	}
164	if (newTable === null)	13,854!
165	return null;	×
166
167	return addQuery(ctx, 'execute', newTable, 'accepted');	13,854✔
168	}
169
170	function corefConstant(ctx : ContextInfo, base : Ast.Expression, param : C.ParamSlot) {
171	const previous = ctx.previousDomain;	4,860✔
172	assert(previous);	4,860✔
173	if (!previous.results \|\| previous.results.results.length === 0)	4,860✔
174	return null;	802✔
175	const ctxStmt = previous.stmt;	4,058✔
176	const ctxSchema = ctxStmt.expression.schema!;	4,058✔
177	if (!ctxSchema.class) // FIXME not sure how this happens...	4,058!
178	return null;	×
179	if (ctxSchema.class.name !== base.schema!.class!.name)	4,058✔
180	return null;	3,530✔
181	if (!C.isSameFunction(ctxSchema, param.schema))	528✔
182	return null;	416✔
183	const result = previous.results.results[0];	112✔
184	if (!result.value[param.name])	112!
185	return null;	×
186	return result.value[param.name];	112✔
187	}
188
189	function booleanQuestion(base : Ast.Expression\|null, slot : C.FilterSlot) : C.ParamSlot[]\|null {
190	if (base !== null) {	169,030✔
191	if (!C.isSameFunction(base.schema!, slot.schema))	109,184!
192	return null;	×
193	}
194
195	const ast = slot.ast;	169,030✔
196	if (!(ast instanceof Ast.AtomBooleanExpression)) {	169,030✔
197	assert(ast instanceof Ast.AndBooleanExpression);	94,171✔
198	assert(ast.operands.length === 2);	94,171✔
199	const [op1, op2] = [ast.operands[0], ast.operands[1]];	94,171✔
200	assert(op1 instanceof Ast.AtomBooleanExpression);	94,171✔
201	assert(op2 instanceof Ast.AtomBooleanExpression);	94,171✔
202	assert(op1.name === op2.name);	94,171✔
203	return [{	94,171✔
204	schema: slot.schema,
205	type: slot.ptype,
206	filterable: slot.schema.getArgument(op1.name)!.getImplementationAnnotation<boolean>('filterable') ?? true,	282,513!
207	name: op1.name,
208	ast: new Ast.Value.VarRef(op1.name)
209	}];
210	}
211	if (ast.name === 'id')	74,859!
212	return null;	×
213	return [{	74,859✔
214	schema: slot.schema,
215	type: slot.ptype,
216	filterable: slot.schema.getArgument(ast.name)!.getImplementationAnnotation<boolean>('filterable') ?? true,	224,577✔
217	name: ast.name,
218	ast: new Ast.Value.VarRef(ast.name),
219	}];
220	}
221
222	export {
223	recommendationSearchQuestionReply,	2✔
224	displayResultSearchQuestionReply,	2✔
225	learnMoreSearchQuestionReply,	2✔
226	listProposalSearchQuestionReply,	2✔
227	corefConstant,	2✔
228	booleanQuestion	2✔
229	};

stanford-oval / genie-toolkit / 1633

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