Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Structured LG refactoring #3122

Merged
merged 12 commits into from
Dec 13, 2019
Merged

Structured LG refactoring #3122

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
020d69a
init structure refactoring
Danieladu Dec 10, 2019
cf80e1a
init
Danieladu Dec 11, 2019
f98fe78
add error tolerate in structured lg
Danieladu Dec 11, 2019
ad17e71
revert some test
Danieladu Dec 11, 2019
389f4f5
Merge branch 'master' into hond/structure-refine
Danieladu Dec 11, 2019
f3ea760
fix ci error
Danieladu Dec 11, 2019
cceb50f
adjust
Danieladu Dec 11, 2019
38c9acd
fix comments error
Danieladu Dec 12, 2019
00e9957
Merge branch 'master' into hond/structure-refine
Danieladu Dec 12, 2019
14048c5
fix errors
Danieladu Dec 12, 2019
108f14e
remove unused code
Danieladu Dec 12, 2019
6f43d50
remove evalText
Danieladu Dec 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
145 changes: 84 additions & 61 deletions libraries/Microsoft.Bot.Builder.LanguageGeneration/Evaluator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using System.Text.RegularExpressions;
using Antlr4.Runtime.Misc;
using Antlr4.Runtime.Tree;
Expand All @@ -20,7 +21,6 @@ public class Evaluator : LGFileParserBaseVisitor<object>
{
public const string LGType = "lgType";
public static readonly Regex ExpressionRecognizeRegex = new Regex(@"(?<!\\)@{(((\'([^'\r\n])*?\')|(\""([^""\r\n])*?\""))|[^\r\n{}'""])*?}", RegexOptions.Compiled);
public static readonly Regex EscapeSeperatorRegex = new Regex(@"(?<!\\)\|", RegexOptions.Compiled);
private readonly Stack<EvaluationTarget> evaluationTargetStack = new Stack<EvaluationTarget>();

public Evaluator(List<LGTemplate> templates, ExpressionEngine expressionEngine)
Expand All @@ -38,18 +38,6 @@ public Evaluator(List<LGTemplate> templates, ExpressionEngine expressionEngine)

public Dictionary<string, LGTemplate> TemplateMap { get; }

public static bool IsPureExpression(string exp)
{
if (string.IsNullOrWhiteSpace(exp))
{
return false;
}

exp = exp.Trim();
var expressions = ExpressionRecognizeRegex.Matches(exp);
return expressions.Count == 1 && expressions[0].Value == exp;
}

public object EvaluateTemplate(string templateName, object scope)
{
if (!TemplateMap.ContainsKey(templateName))
Expand Down Expand Up @@ -104,51 +92,24 @@ public override object VisitTemplateDefinition([NotNull] LGFileParser.TemplateDe
public override object VisitStructuredTemplateBody([NotNull] LGFileParser.StructuredTemplateBodyContext context)
{
var result = new JObject();
var typeName = context.structuredBodyNameLine().STRUCTURED_CONTENT().GetText().Trim();
var typeName = context.structuredBodyNameLine().STRUCTURE_NAME().GetText();
result[LGType] = typeName;

var bodys = context.structuredBodyContentLine().STRUCTURED_CONTENT();
var bodys = context.structuredBodyContentLine();
foreach (var body in bodys)
{
var line = body.GetText().Trim();

if (string.IsNullOrWhiteSpace(line))
{
continue;
}

var start = line.IndexOf('=');
if (start > 0)
var isKVPairBody = body.keyValueStructureLine() != null;
if (isKVPairBody)
{
// make it insensitive
var property = line.Substring(0, start).Trim().ToLower();
var originValue = line.Substring(start + 1).Trim();

var valueArray = EscapeSeperatorRegex.Split(originValue);
if (valueArray.Length == 1)
{
result[property] = EvalText(originValue);
}
else
{
var valueList = new JArray();
foreach (var item in valueArray)
{
valueList.Add(EvalText(item.Trim()));
}

result[property] = valueList;
}
var property = body.keyValueStructureLine().STRUCTURE_IDENTIFIER().GetText().ToLower();
var value = VisitStructureValue(body.keyValueStructureLine());
result[property] = JToken.FromObject(value);
}
else if (IsPureExpression(line))
else
{
// [MyStruct
// Text = foo
// {ST2()}
// ]

// When the same property exists in both the calling template as well as callee, the content in caller will trump any content in the callee.
var propertyObject = JObject.FromObject(EvalExpression(line));
// When the same property exists in both the calling template as well as callee, the content in caller will trump any content in
var propertyObject = JObject.FromObject(EvalExpression(body.objectStructureLine().GetText()));

// Full reference to another structured template is limited to the structured template with same type
if (propertyObject[LGType] != null && propertyObject[LGType].ToString() == typeName)
Expand Down Expand Up @@ -291,6 +252,76 @@ public object ConstructScope(string templateName, List<object> args)
throw new Exception("Scope is a LG customized memory");
}
}

private object VisitStructureValue(LGFileParser.KeyValueStructureLineContext context)
{
var values = context.keyValueStructureValue();

var result = new List<object>();
foreach (var item in values)
{
if (IsPureExpression(item, out var text))
{
result.Add(EvalExpression(text));
}
else
{
var itemStringResult = new StringBuilder();
foreach (ITerminalNode node in item.children)
{
switch (node.Symbol.Type)
{
case LGFileParser.ESCAPE_CHARACTER_IN_STRUCTURE_BODY:
itemStringResult.Append(EvalEscape(node.GetText()));
break;
case LGFileParser.EXPRESSION_IN_STRUCTURE_BODY:
itemStringResult.Append(EvalExpression(node.GetText()));
break;
default:
itemStringResult.Append(node.GetText());
break;
}
}

result.Add(itemStringResult.ToString().Trim());
}
}

return result.Count == 1 ? result[0] : result;
}

private bool IsPureExpression(LGFileParser.KeyValueStructureValueContext context, out string expression)
{
expression = context.GetText();

var hasExpression = false;
foreach (ITerminalNode node in context.children)
{
switch (node.Symbol.Type)
{
case LGFileParser.ESCAPE_CHARACTER_IN_STRUCTURE_BODY:
return false;
case LGFileParser.EXPRESSION_IN_STRUCTURE_BODY:
if (hasExpression)
{
return false;
}

hasExpression = true;
expression = node.GetText();
break;
default:
if (!string.IsNullOrWhiteSpace(node.GetText()))
{
return false;
}

break;
}
}

return hasExpression;
}

private bool EvalCondition(LGFileParser.IfConditionContext condition)
{
Expand Down Expand Up @@ -373,17 +404,9 @@ private JToken EvalText(string exp)
return exp;
}

if (IsPureExpression(exp))
{
// @{} or {} text, get object result
return JToken.FromObject(EvalExpression(exp));
}
else
{
var evalutor = new MatchEvaluator(m => EvalExpression(m.Value).ToString());
var result = ExpressionRecognizeRegex.Replace(exp, evalutor);
return EvalEscape(result);
}
var evalutor = new MatchEvaluator(m => EvalExpression(m.Value).ToString());
var result = ExpressionRecognizeRegex.Replace(exp, evalutor);
return EvalEscape(result);
}

private (object value, string error) EvalByExpressionEngine(string exp, object scope)
Expand Down
Loading