1207

pending completion

Build # 1207

Build Type

push

travis-ci-com

Committed by

web-flow

Commit Message

minor tweaks to improve agent response (#281)

Just some minor tweaks to improve the agent response. Also fixed a bug with the entity match test.

Run Details

6752 of 12586 branches covered (53.65%)

Branch coverage included in aggregate %.

6 of 6 new or added lines in 2 files covered. (100.0%)

12 existing lines in 4 files now uncovered.

15476 of 24279 relevant lines covered (63.74%)

1216708.12 hits per line

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

97.5

/lib/dialogue-agent/entity-linking/entity-finder.js

// -*- mode: js; indent-tabs-mode: nil; js-basic-offset: 4 -*-
//
// This file is part of Genie
//
// Copyright 2018 Google LLC
//           2018-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 editDistance = require('../../utils/edit-distance');

// FIXME use the actual tokenizer
function tokenize(string) {
    var tokens = string.split(/(\s+|[,."'!?])/g);
    return tokens.filter((t) => !(/^\s*$/).test(t)).map((t) => t.toLowerCase());
}

function collectDisambiguationHints(result, idEntities, previousLocations) {
    for (let key in result.value) {
        const value = result.value[key];
        if (previousLocations && value.isLocation && value.value.isAbsolute)
            previousLocations.push(value.value);

        if (key === 'id') {
            const id = result.value.id;
            if (!id.isEntity || !id.display)
                continue;
            const idType = id.type;
            const idEntity = {
                value: id.value,
                name: id.display,
                canonical: tokenize(id.display).join(' ')
            };
            if (idEntities.has(idType))
                idEntities.get(idType).push(idEntity);
            else
                idEntities.set(idType, [idEntity]);
        }
    }
}

function getBestEntityMatch(searchTerm, entityType, candidates) {
    let best = undefined,
        bestScore = undefined;

    let refinedSearchTerm = removeParenthesis(searchTerm);
    let searchTermTokens = refinedSearchTerm.split(' ');

    for (let cand of candidates) {
        if (cand.canonical === searchTerm)
            return cand;
        let candDisplay = removeParenthesis(cand.canonical);
        let score = 0;
        score -= 0.1 * editDistance(refinedSearchTerm, candDisplay);

        let candTokens = candDisplay.split(' ');
        candTokens = new Set(candTokens);

        for (let candToken of candTokens) {
            let found = false;
            for (let token of searchTermTokens) {
                if (token === candToken || (editDistance(token, candToken) <= 1 && token.length > 1)) {
                    score += 10;
                    found = true;
                } else if (candToken.startsWith(token)) {
                    score += 0.5;
                }
            }

            // give a small boost to ignorable tokens that are missing
            // this offsets the char-level edit distance
            if (!found && ['the', 'hotel', 'house', 'restaurant'].includes(candToken))
                score += 0.1 * candToken.length;

            if (entityType === 'imgflip:meme_id' && candToken === 'x')
                score += 1;
        }
        //console.log(`candidate ${cand.name} score ${score}`);
        if (bestScore === undefined || score > bestScore) {
            bestScore = score;
            best = cand;
        }
    }

    return best;
}

function removeParenthesis(str){
    return str.replace(/ \(.*?\)/g, '');
}

module.exports = { collectDisambiguationHints, getBestEntityMatch };

1	// -- mode: js; indent-tabs-mode: nil; js-basic-offset: 4 --
2	//
3	// This file is part of Genie
4	//
5	// Copyright 2018 Google LLC
6	// 2018-2020 The Board of Trustees of the Leland Stanford Junior University
7	//
8	// Licensed under the Apache License, Version 2.0 (the "License");
9	// you may not use this file except in compliance with the License.
10	// You may obtain a copy of the License at
11	//
12	// http://www.apache.org/licenses/LICENSE-2.0
13	//
14	// Unless required by applicable law or agreed to in writing, software
15	// distributed under the License is distributed on an "AS IS" BASIS,
16	// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17	// See the License for the specific language governing permissions and
18	// limitations under the License.
19	//
20	// Author: Giovanni Campagna <gcampagn@cs.stanford.edu>
21	"use strict";
22
23	const editDistance = require('../../utils/edit-distance');	58✔
24
25	// FIXME use the actual tokenizer
26	function tokenize(string) {
27	var tokens = string.split(/(\s+\|[,."'!?])/g);	374✔
28	return tokens.filter((t) => !(/^\s*$/).test(t)).map((t) => t.toLowerCase());	1,734✔
29	}
30
31	function collectDisambiguationHints(result, idEntities, previousLocations) {
32	for (let key in result.value) {	68,896✔
33	const value = result.value[key];	413,350✔
34	if (previousLocations && value.isLocation && value.value.isAbsolute)	413,350✔
35	previousLocations.push(value.value);	362✔
36
37	if (key === 'id') {	413,350✔
38	const id = result.value.id;	38,298✔
39	if (!id.isEntity \|\| !id.display)	38,298✔
40	continue;	37,924✔
41	const idType = id.type;	374✔
42	const idEntity = {	374✔
43	value: id.value,
44	name: id.display,
45	canonical: tokenize(id.display).join(' ')
46	};
47	if (idEntities.has(idType))	374✔
48	idEntities.get(idType).push(idEntity);	370✔
49	else
50	idEntities.set(idType, [idEntity]);	4✔
51	}
52	}
53	}
54
55	function getBestEntityMatch(searchTerm, entityType, candidates) {
56	let best = undefined,	51✔
57	bestScore = undefined;	51✔
58
59	let refinedSearchTerm = removeParenthesis(searchTerm);	51✔
60	let searchTermTokens = refinedSearchTerm.split(' ');	51✔
61
62	for (let cand of candidates) {	51✔
63	if (cand.canonical === searchTerm)	102✔
64	return cand;	28✔
65	let candDisplay = removeParenthesis(cand.canonical);	74✔
66	let score = 0;	74✔
67	score -= 0.1 * editDistance(refinedSearchTerm, candDisplay);	74✔
68
69	let candTokens = candDisplay.split(' ');	74✔
70	candTokens = new Set(candTokens);	74✔
71
72	for (let candToken of candTokens) {	74✔
73	let found = false;	234✔
74	for (let token of searchTermTokens) {	234✔
75	if (token === candToken \|\| (editDistance(token, candToken) <= 1 && token.length > 1)) {	636✔
76	score += 10;	94✔
77	found = true;	94✔
78	} else if (candToken.startsWith(token)) {	542✔
79	score += 0.5;	2✔
80	}
81	}
82
83	// give a small boost to ignorable tokens that are missing
84	// this offsets the char-level edit distance
85	if (!found && ['the', 'hotel', 'house', 'restaurant'].includes(candToken))	234!
UNCOV 86	score += 0.1 * candToken.length;	×
87
88	if (entityType === 'imgflip:meme_id' && candToken === 'x')	234✔
89	score += 1;	7✔
90	}
91	//console.log(`candidate ${cand.name} score ${score}`);
92	if (bestScore === undefined \|\| score > bestScore) {	74✔
93	bestScore = score;	34✔
94	best = cand;	34✔
95	}
96	}
97
98	return best;	23✔
99	}
100
101	function removeParenthesis(str){
102	return str.replace(/ \(.*?\)/g, '');	125✔
103	}
104
105	module.exports = { collectDisambiguationHints, getBestEntityMatch };	58✔

stanford-oval / genie-toolkit / 1207

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