kenkeiras/lang-model
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove color strings from session logs.

Browse Source
This commit is contained in:
kenkeiras 2017-10-01 20:37:51 +02:00
parent bb7d438e0d
commit 6278cc43f7
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
naive-nlu/tree_nlu/knowledge_base.py
View File

@ -32,7 +32,7 @@ class KnowledgeBase(object):
}) })
self.act_upon(result) self.act_upon(result)
session().annotate("\x1b[7;32m> {} \x1b[0m".format(example)) session().annotate("Example: {}".format(example))
tokens, decomposition, inferred_tree = parsing.integrate_language(self, example) tokens, decomposition, inferred_tree = parsing.integrate_language(self, example)
session().annotate(tokens) session().annotate(tokens)
result = knowledge_evaluation.integrate_information(self.knowledge, { result = knowledge_evaluation.integrate_information(self.knowledge, {
@ -41,9 +41,9 @@ class KnowledgeBase(object):
"parsed": inferred_tree, "parsed": inferred_tree,
}) })
session().annotate("\x1b[7;33m< {} \x1b[0m".format(self.get_value(result))) session().annotate("Result: {}".format(self.get_value(result)))
self.act_upon(result) self.act_upon(result)
session().annotate("\x1b[7;34m> set: {} \x1b[0m".format(self.get_value(result))) session().annotate("Set: {}".format(self.get_value(result)))
self.examples.append((decomposition, inferred_tree)) self.examples.append((decomposition, inferred_tree))
self.originals.append(example['text']) self.originals.append(example['text'])
@ -59,7 +59,7 @@ class KnowledgeBase(object):
def process(self, row): def process(self, row):
row = row.lower() row = row.lower()
knowledge_before = copy.deepcopy(self.knowledge) knowledge_before = copy.deepcopy(self.knowledge)
session().annotate("\x1b[7;32m> {} \x1b[0m".format(row)) session().annotate("Process: {}".format(row))
tokens = parsing.to_tokens(row) tokens = parsing.to_tokens(row)
fit = parsing.get_fit(self, tokens) fit = parsing.get_fit(self, tokens)
if fit is None: if fit is None:
@ -72,6 +72,7 @@ class KnowledgeBase(object):
"parsed": inferred_tree, "parsed": inferred_tree,
}) })
self.act_upon(result) self.act_upon(result)
session().annotate("Result: {}".format(result))
knowledge_after = copy.deepcopy(self.knowledge) knowledge_after = copy.deepcopy(self.knowledge)
knowledge_diff_getter = lambda: diff_knowledge(knowledge_before, knowledge_diff_getter = lambda: diff_knowledge(knowledge_before,

1
naive-nlu/tree_nlu/parsing.py
View File

@ -98,7 +98,6 @@ def integrate_language(knowledge_base, example):
for position, atom in lower_levels: for position, atom in lower_levels:
with session().log(atom): with session().log(atom):
session().annotate("\x1b[1mSelecting\x1b[0m: {}".format(atom))
similar = get_similar_tree(knowledge_base, atom, tokens) similar = get_similar_tree(knowledge_base, atom, tokens)
remix, (start_bounds, end_bounds) = build_remix_matrix(knowledge_base, tokens, atom, similar) remix, (start_bounds, end_bounds) = build_remix_matrix(knowledge_base, tokens, atom, similar)

4
naive-nlu/tree_nlu/tests/basic.py
View File

@ -110,13 +110,13 @@ base_knowledge = {
} }
def test_assumption(expectedResponse, knowledge, query): def test_assumption(expectedResponse, knowledge, query):
session().annotate("Query: {}".format(query['text'])) session().log("Query: {}".format(query['text']))
session().annotate("Expected: {}".format(expectedResponse)) session().annotate("Expected: {}".format(expectedResponse))
result, abstract_tree, diff = knowledge.process(query['text']) result, abstract_tree, diff = knowledge.process(query['text'])
end_result = result.getter() if is_modifiable_property(result) else result end_result = result.getter() if is_modifiable_property(result) else result
session().annotate("\x1b[0;3{}mResult: {}\x1b[0m".format("1" if end_result != expectedResponse else "2", end_result)) session().annotate("Result: {}".format(end_result))
if end_result != expectedResponse: if end_result != expectedResponse:
raise AssertionError('{} is not {}'.format(end_result, expectedResponse)) raise AssertionError('{} is not {}'.format(end_result, expectedResponse))