From 4a085e940f51b8fad71220358105ac8c9c8b4a2c Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 24 Sep 2019 13:20:19 -0600 Subject: [PATCH] update --- generator/ctrl/ctrl_generator.py | 2 -- story/story_manager.py | 7 +++---- story/utils.py | 12 ++---------- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/generator/ctrl/ctrl_generator.py b/generator/ctrl/ctrl_generator.py index 980a1af..17dd9a7 100644 --- a/generator/ctrl/ctrl_generator.py +++ b/generator/ctrl/ctrl_generator.py @@ -157,8 +157,6 @@ class CTRLGenerator(): if options is None: options = {} - prompt = prompt.replace(".I", ". I") - if prompt[-1] != " ": prompt = prompt + " " first_token = True diff --git a/story/story_manager.py b/story/story_manager.py index 188e7c0..aab7c95 100644 --- a/story/story_manager.py +++ b/story/story_manager.py @@ -68,7 +68,7 @@ class StoryManager(): def start_new_story(self, story_prompt): block = self.generator.generate(story_prompt) block = cut_trailing_sentence(block) - block = story_replace(block) + block = text_replace(block) story_start = story_prompt + block self.story = Story(story_start) return story_start @@ -149,12 +149,11 @@ class ConstrainedStoryManager(StoryManager): if options is None: options = {} - action = phrase + " " + self.generator.generate(prompt + phrase, options) + action = phrase + " " + self.generator.generate(prompt + " " + phrase, options) action_result = cut_trailing_sentence(action) + actino_result = text_replace(action_result) action, result = split_first_sentence(action_result) - result = story_replace(action_result) - action = action_replace(action) return action, result diff --git a/story/utils.py b/story/utils.py index 2930bcb..881ffa7 100644 --- a/story/utils.py +++ b/story/utils.py @@ -33,21 +33,13 @@ def cut_trailing_quotes(text): return text[:final_ind] -def all_replace(text): +def text_replace(text): text = first_to_second_person(text) text = text.replace("#","") text = remove_profanity(text) return text - - -def action_replace(text): - return all_replace(text) - - -def story_replace(text): - return all_replace(text) - + def split_first_sentence(text): first_period = text.find('.')