From aa39f5d2ca708dd2d409c918868b51b8402e8178 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 16 Nov 2019 04:23:56 +0000 Subject: [PATCH] update --- story/story_manager.py | 8 +------- story/utils.py | 6 +++++- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/story/story_manager.py b/story/story_manager.py index 0381c64..db60ae9 100644 --- a/story/story_manager.py +++ b/story/story_manager.py @@ -41,13 +41,7 @@ class Story(): self.results.append(story_block) def latest_result(self): - if len(self.results) >= 4: - return self.context + self.actions[-4] + self.results[-4] + self.actions[-3] + self.results[-3] + \ - self.actions[-2] + self.results[-2] + self.actions[-1] + self.results[-1] - elif len(self.results) >= 3: - return self.context + self.actions[-3] + self.results[-3] + self.actions[-2] + self.results[-2] + \ - self.actions[-1] + self.results[-1] - elif len(self.results) >= 2: + if len(self.results) >= 2: return self.context + self.actions[-2] + self.results[-2] + self.actions[-1] + self.results[-1] elif len(self.results) >= 1: return self.context + self.actions[-1] + self.results[-1] diff --git a/story/utils.py b/story/utils.py index b965144..fb5cb96 100644 --- a/story/utils.py +++ b/story/utils.py @@ -80,7 +80,11 @@ def cut_trailing_sentence(text): et_token = text.rfind("<|endoftext|>") if et_token != -1: - last_punc = min(last_punc, et_token) + last_punc = min(last_punc, et_token+1) + + act_token = text.find(">") + if act_token != -1: + last_punc = min(last_punc, act_token+1) if last_punc > 0: text = text[0:last_punc+1]