1637

pending completion

Build # 1637

Build Type

push

travis-ci-com

Committed by

web-flow

Commit Message

Restore detailed message when no device of a given type is configured (#452)

The generic message is confusing, because it sounds like the agent
doesn't know what the command is about, and the word "skill" is
confusing. We used to need the generic message because we could
not distinguish a bad parse / OOD command from a good parse without
the right skill. We have confidence for that now, so we can be
confident that the command was parsed correctly.

Fixes #450

Run Details

10812 of 23268 branches covered (46.47%)

Branch coverage included in aggregate %.

16 of 24 new or added lines in 2 files covered. (66.67%)

18 existing lines in 9 files now uncovered.

25402 of 43954 relevant lines covered (57.79%)

518033.38 hits per line

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

60.24

/languages/thingtalk/dialogue_acts/aggregation-results.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 { Ast, } from 'thingtalk';

import * as C from '../ast_manip';

import {
    ContextInfo,
    makeAgentReply,
    makeSimpleState,
} from '../state_manip';

function makeCountAggregationReplySuffix(ctx : ContextInfo, table : Ast.Expression, mustFilter : boolean) {
    if (!ctx.resultInfo!.isAggregation)
        return null;
    const results = ctx.results;
    if (!results || results.length !== 1 || !results[0].value.count)
        return null;

    const currentStmt = ctx.current!.stmt;
    const currentTable = currentStmt.lastQuery!;
    if (!(currentTable instanceof Ast.AggregationExpression) ||
        currentTable.operator !== 'count' || currentTable.field !== '*')
        return null;
    if (!C.isSameFunction(table.schema!, ctx.currentTableFunction!))
        return null;
    if (mustFilter && !(table instanceof Ast.FilterExpression))
        return null;
    if (table instanceof Ast.FilterExpression) {
        const filterTable = C.findFilterExpression(currentTable);
        if (!filterTable)
            return null;
        if (!table.filter.equals(filterTable.filter))
            return null;
    }
    return ctx;
}

function makeCountAggregationReply(ctx : ContextInfo, num : Ast.Value) {
    const count = ctx.results![0].value.count;
    if (!count.equals(num))
        return null;
    return makeAgentReply(ctx, makeSimpleState(ctx, 'sys_display_result', null));
}

function makeOtherAggregationReply(ctx : ContextInfo, op : string, param : C.ParamSlot, value : Ast.Value) {
    if (!ctx.resultInfo!.isAggregation)
        return null;
    const results = ctx.results;
    if (!results || results.length !== 1 || !results[0].value[param.name])
        return null;
    const currentStmt = ctx.current!.stmt;
    const currentTable = currentStmt.lastQuery!;
    if (!(currentTable instanceof Ast.AggregationExpression) ||
        currentTable.operator !== op ||
        !C.isSameFunction(currentTable.schema!, param.schema) ||
        currentTable.field !== param.name)
        return null;
    if (!value.equals(results[0].value[param.name]))
        return null;
    return makeAgentReply(ctx, makeSimpleState(ctx, 'sys_display_result', null));
}

export {
    makeCountAggregationReplySuffix,
    makeCountAggregationReply,
    makeOtherAggregationReply
};

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	import { Ast, } from 'thingtalk';	2✔
22
23	import * as C from '../ast_manip';	2✔
24
25	import {	2✔
26	ContextInfo,
27	makeAgentReply,
28	makeSimpleState,
29	} from '../state_manip';
30
31	function makeCountAggregationReplySuffix(ctx : ContextInfo, table : Ast.Expression, mustFilter : boolean) {
32	if (!ctx.resultInfo!.isAggregation)	599!
33	return null;	×
34	const results = ctx.results;	599✔
35	if (!results \|\| results.length !== 1 \|\| !results[0].value.count)	599!
36	return null;	×
37
38	const currentStmt = ctx.current!.stmt;	599✔
39	const currentTable = currentStmt.lastQuery!;	599✔
40	if (!(currentTable instanceof Ast.AggregationExpression) \|\|	599!
41	currentTable.operator !== 'count' \|\| currentTable.field !== '*')
42	return null;	×
43	if (!C.isSameFunction(table.schema!, ctx.currentTableFunction!))	599!
44	return null;	×
45	if (mustFilter && !(table instanceof Ast.FilterExpression))	599✔
46	return null;	182✔
47	if (table instanceof Ast.FilterExpression) {	417✔
48	const filterTable = C.findFilterExpression(currentTable);	312✔
49	if (!filterTable)	312!
50	return null;	312✔
51	if (!table.filter.equals(filterTable.filter))	×
52	return null;	×
53	}
54	return ctx;	105✔
55	}
56
57	function makeCountAggregationReply(ctx : ContextInfo, num : Ast.Value) {
58	const count = ctx.results![0].value.count;	1,650✔
59	if (!count.equals(num))	1,650!
60	return null;	1,650✔
UNCOV 61	return makeAgentReply(ctx, makeSimpleState(ctx, 'sys_display_result', null));	×
62	}
63
64	function makeOtherAggregationReply(ctx : ContextInfo, op : string, param : C.ParamSlot, value : Ast.Value) {
65	if (!ctx.resultInfo!.isAggregation)	3,173,000!
66	return null;	×
67	const results = ctx.results;	3,173,000✔
68	if (!results \|\| results.length !== 1 \|\| !results[0].value[param.name])	3,173,000!
69	return null;	3,173,000✔
70	const currentStmt = ctx.current!.stmt;	×
71	const currentTable = currentStmt.lastQuery!;	×
72	if (!(currentTable instanceof Ast.AggregationExpression) \|\|	×
73	currentTable.operator !== op \|\|
74	!C.isSameFunction(currentTable.schema!, param.schema) \|\|
75	currentTable.field !== param.name)
76	return null;	×
77	if (!value.equals(results[0].value[param.name]))	×
78	return null;	×
79	return makeAgentReply(ctx, makeSimpleState(ctx, 'sys_display_result', null));	×
80	}
81
82	export {
83	makeCountAggregationReplySuffix,	2✔
84	makeCountAggregationReply,	2✔
85	makeOtherAggregationReply	2✔
86	};

stanford-oval / genie-toolkit / 1637

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