Skip to content

Commit

Permalink
Fix the deparse method and add unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@kirsle
kirsle committed Sep 5, 2017
1 parent 1f597e8 commit 5110d82
Show file tree
Hide file tree
Showing 2 changed files with 215 additions and 104 deletions.
152 changes: 48 additions & 104 deletions rivescript/rivescript.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

from __future__ import unicode_literals
from six import text_type
import copy
import sys
import os
import re
Expand Down Expand Up @@ -109,7 +110,7 @@ def __init__(self, debug=False, strict=True, depth=50, log=None,
"sub": {},
"person": {},
}

# Initialize the session manager.
if session_manager is None:
session_manager = MemorySessionStorage(warn=self._warn)
Expand Down Expand Up @@ -298,13 +299,9 @@ def deparse(self):
"sub": {},
"person": {},
"array": {},
"triggers": {},
"that": {},
"triggers": [],
},
"topic": {},
"that": {},
"inherit": {},
"include": {},
"topics": {},
}

# Populate the config fields.
Expand All @@ -322,48 +319,29 @@ def deparse(self):

# Topic Triggers.
for topic in self._topics:
dest = {} # Where to place the topic info
dest = None # Where to place the topic info

if topic == "__begin__":
# Begin block.
dest = result["begin"]["triggers"]
dest = result["begin"]
else:
# Normal topic.
if topic not in result["topic"]:
result["topic"][topic] = {}
dest = result["topic"][topic]
if topic not in result["topics"]:
result["topics"][topic] = {
"triggers": [],
"includes": {},
"inherits": {},
}
dest = result["topics"][topic]

# Copy the triggers.
for trig, data in self._topics[topic].iteritems():
dest[trig] = self._copy_trigger(trig, data)

# %Previous's.
for topic in self._thats:
dest = {} # Where to place the topic info
for trig in self._topics[topic]:
dest["triggers"].append(copy.deepcopy(trig))

if topic == "__begin__":
# Begin block.
dest = result["begin"]["that"]
else:
# Normal topic.
if topic not in result["that"]:
result["that"][topic] = {}
dest = result["that"][topic]

# The "that" structure is backwards: bot reply, then trigger, then info.
for previous, pdata in self._thats[topic].iteritems():
for trig, data in pdata.iteritems():
dest[trig] = self._copy_trigger(trig, data, previous)

# Inherits/Includes.
for topic, data in self._lineage.iteritems():
result["inherit"][topic] = []
for inherit in data:
result["inherit"][topic].append(inherit)
for topic, data in self._includes.iteritems():
result["include"][topic] = []
for include in data:
result["include"][topic].append(include)
# Inherits/Includes.
for label, mapping in {"inherits": self._lineage, "includes": self._includes}.items():
if topic in mapping and len(mapping[topic]):
dest[label] = mapping[topic].copy()

return result

Expand All @@ -380,11 +358,11 @@ def write(self, fh, deparsed=None):
by a user interface for editing RiveScript without writing the code
directly).
:param fh: Either a file name ``str`` or a file handle object of a file
opened in write mode.
:param optional dict deparsed: A data structure in the same format as
what ``deparse()`` returns. If not passed, this value will come from
the current in-memory data from ``deparse()``.
Parameters:
fh (str or file): a string or a file-like object.
deparsed (dict): a data structure in the same format as what
``deparse()`` returns. If not passed, this value will come from
the current in-memory data from ``deparse()``.
"""

# Passed a string instead of a file handle?
Expand Down Expand Up @@ -432,101 +410,67 @@ def write(self, fh, deparsed=None):
fh.write("\n")

# Begin block.
if len(deparsed["begin"]["triggers"].keys()):
if len(deparsed["begin"]["triggers"]):
fh.write("> begin\n\n")
self._write_triggers(fh, deparsed["begin"]["triggers"], indent="\t")
fh.write("< begin\n\n")

# The topics. Random first!
topics = ["random"]
topics.extend(sorted(deparsed["topic"].keys()))
topics.extend(sorted(deparsed["topics"].keys()))
done_random = False
for topic in topics:
if topic not in deparsed["topic"]: continue
if topic not in deparsed["topics"]: continue
if topic == "random" and done_random: continue
if topic == "random": done_random = True

tagged = False # Used > topic tag

if topic != "random" or topic in deparsed["include"] or topic in deparsed["inherit"]:
data = deparsed["topics"][topic]

if topic != "random" or len(data["includes"]) or len(data["inherits"]):
tagged = True
fh.write("> topic " + topic)

if topic in deparsed["inherit"]:
fh.write(" inherits " + " ".join(deparsed["inherit"][topic]))
if topic in deparsed["include"]:
fh.write(" includes " + " ".join(deparsed["include"][topic]))
if data["inherits"]:
fh.write(" inherits " + " ".join(sorted(data["inherits"].keys())))
if data["includes"]:
fh.write(" includes " + " ".join(sorted(data["includes"].keys())))

fh.write("\n\n")

indent = "\t" if tagged else ""
self._write_triggers(fh, deparsed["topic"][topic], indent=indent)

# Any %Previous's?
if topic in deparsed["that"]:
self._write_triggers(fh, deparsed["that"][topic], indent=indent)
self._write_triggers(fh, data["triggers"], indent=indent)

if tagged:
fh.write("< topic\n\n")

return True

def _copy_trigger(self, trig, data, previous=None):
"""Make copies of all data below a trigger.
:param str trig: The trigger key.
:param dict data: The data under that trigger.
:param previous: The ``%Previous`` for the trigger.
"""
# Copied data.
dest = {}

if previous:
dest["previous"] = previous

if "redirect" in data and data["redirect"]:
# @Redirect
dest["redirect"] = data["redirect"]

if "condition" in data and len(data["condition"].keys()):
# *Condition
dest["condition"] = []
for i in sorted(data["condition"].keys()):
dest["condition"].append(data["condition"][i])

if "reply" in data and len(data["reply"].keys()):
# -Reply
dest["reply"] = []
for i in sorted(data["reply"].keys()):
dest["reply"].append(data["reply"][i])

return dest

def _write_triggers(self, fh, triggers, indent=""):
"""Write triggers to a file handle.
:param fh: The file handle.
:param dict triggers: The triggers to write to the file.
:param str indent: The indentation (spaces) to prefix each line with.
Parameters:
fh (file): file object.
triggers (list): list of triggers to write.
indent (str): indentation for each line.
"""

for trig in sorted(triggers.keys()):
fh.write(indent + "+ " + self._write_wrapped(trig, indent=indent) + "\n")
d = triggers[trig]
for trig in triggers:
fh.write(indent + "+ " + self._write_wrapped(trig["trigger"], indent=indent) + "\n")
d = trig

if "previous" in d:
if d.get("previous"):
fh.write(indent + "% " + self._write_wrapped(d["previous"], indent=indent) + "\n")

if "condition" in d:
for cond in d["condition"]:
fh.write(indent + "* " + self._write_wrapped(cond, indent=indent) + "\n")
for cond in d["condition"]:
fh.write(indent + "* " + self._write_wrapped(cond, indent=indent) + "\n")

if "redirect" in d:
if d.get("redirect"):
fh.write(indent + "@ " + self._write_wrapped(d["redirect"], indent=indent) + "\n")

if "reply" in d:
for reply in d["reply"]:
fh.write(indent + "- " + self._write_wrapped(reply, indent=indent) + "\n")
for reply in d["reply"]:
fh.write(indent + "- " + self._write_wrapped(reply, indent=indent) + "\n")

fh.write("\n")

Expand Down
Loading

0 comments on commit 5110d82

Please sign in to comment.