From 6278cc43f781e73a663d72b3e6dcc1194265432b Mon Sep 17 00:00:00 2001 From: kenkeiras Date: Sun, 1 Oct 2017 20:37:51 +0200 Subject: [PATCH] Remove color strings from session logs. --- naive-nlu/tree_nlu/knowledge_base.py | 9 +++++---- naive-nlu/tree_nlu/parsing.py | 1 - naive-nlu/tree_nlu/tests/basic.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/naive-nlu/tree_nlu/knowledge_base.py b/naive-nlu/tree_nlu/knowledge_base.py index 3749059..15355a3 100644 --- a/naive-nlu/tree_nlu/knowledge_base.py +++ b/naive-nlu/tree_nlu/knowledge_base.py @@ -32,7 +32,7 @@ class KnowledgeBase(object): }) 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) session().annotate(tokens) result = knowledge_evaluation.integrate_information(self.knowledge, { @@ -41,9 +41,9 @@ class KnowledgeBase(object): "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) - 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.originals.append(example['text']) @@ -59,7 +59,7 @@ class KnowledgeBase(object): def process(self, row): row = row.lower() 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) fit = parsing.get_fit(self, tokens) if fit is None: @@ -72,6 +72,7 @@ class KnowledgeBase(object): "parsed": inferred_tree, }) self.act_upon(result) + session().annotate("Result: {}".format(result)) knowledge_after = copy.deepcopy(self.knowledge) knowledge_diff_getter = lambda: diff_knowledge(knowledge_before, diff --git a/naive-nlu/tree_nlu/parsing.py b/naive-nlu/tree_nlu/parsing.py index 18cfdb5..7ae8a17 100644 --- a/naive-nlu/tree_nlu/parsing.py +++ b/naive-nlu/tree_nlu/parsing.py @@ -98,7 +98,6 @@ def integrate_language(knowledge_base, example): for position, atom in lower_levels: with session().log(atom): - session().annotate("\x1b[1mSelecting\x1b[0m: {}".format(atom)) similar = get_similar_tree(knowledge_base, atom, tokens) remix, (start_bounds, end_bounds) = build_remix_matrix(knowledge_base, tokens, atom, similar) diff --git a/naive-nlu/tree_nlu/tests/basic.py b/naive-nlu/tree_nlu/tests/basic.py index 4c8184e..76f9e07 100644 --- a/naive-nlu/tree_nlu/tests/basic.py +++ b/naive-nlu/tree_nlu/tests/basic.py @@ -110,13 +110,13 @@ base_knowledge = { } def test_assumption(expectedResponse, knowledge, query): - session().annotate("Query: {}".format(query['text'])) + session().log("Query: {}".format(query['text'])) session().annotate("Expected: {}".format(expectedResponse)) result, abstract_tree, diff = knowledge.process(query['text']) 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: raise AssertionError('{} is not {}'.format(end_result, expectedResponse))