[DCR] Normalize all expression and add '=' to force expression. #3253

tomlm · 2020-01-11T21:47:25Z

Added StringExpression,ValueExpression, etc. for expression or value access
added a ton of unit tests for the expression stuff
For ambigious expressions (StringExpression and ValueExpression) it will treat as string interpolation unless it starts with =. "Hello @{world}" ==> "hello world", "=user.foo" => Expression("user.foo")
Added assignment operators so you can assign string expressions to expression properties.
cleaned up dialogs files
Exposed Dialogset to DialogManager so you can register external external dialogs
Added DialogId to BeginDialog to allow you to invoke external dialogs

It basically boils down to how to deal with strings as input:

StringExpression always assumes string interpolation unless prefixed with =, producing a string
ValueExpression always assumes string interpolation unless prefixed with =, producing an object which MAY be a string
ExpressionProperty<T> always assumes strings represent something to be interpreted as the type of T, so always producing object of T.

StringExpression

Interpretation of string is as a string interpolation result unless =.

| Input                         | Result        |
|-------------------------------|---------------|
| "13"                          | "13"          |
| "=13"                         | "13"          |
| "user.age"                    | "user.age"    |
| "=user.age"                   | "13"          |
| "Hello world"                 | "Hello World" |
| "='Hello world'"              | "Hello World" |
| "Hello @{user.name}"          | "Hello Joe"   |
| "=concat('Hello ', user.name) | "Hello Joe"   |

BoolExpression

Interpretation of string is as a bool expression

| Input           | Result        |
|-----------------|---------------|
| true            | true          |
| "true"          | true          |
| "=true"         | true          |
| "user.age > 3"  | true          |
| "=user.age > 3" | true          |
| "bad"           | default(bool) |
| "bad @{bad}"    | default(bool) |

IntExpression

Interpretation of string is as a int expression

| Input                | Result       |
|----------------------|--------------|
| 13                   | 13           |
| "13"                 | 13           |
| "=13"                | 13           |
| "x.y.z"              | 13           |
| "=x.y.z"             | 13           |
| "Hello world"        | default(int) |
| "Hello @{user.name}" | default(int) |

FloatExpression

Interpretation of string is as a float expression

| Input        | Result         |
|--------------|----------------|
| 3.14F        | 3.14           |
| "3.14"       | 3.14           |
| "=3.14"      | 3.14           |
| "x.y.z"      | 3.14           |
| "=x.y.z"     | 3.14           |
| "bad"        | default(float) |
| "bad @{bad}" | default(float) |

ExpressionProperty

Interpretation of string is as a T expression

| Input        | Result     |
|--------------|------------|
| T            | T          |
| "x.y.z"      | T          |
| "=x.y.z"     | T          |
| "bad"        | default(T) |
| "bad @{bad}" | default(T) |

ValueExpression (T == object)

Interpretation of string is as a string interpolation result unless =.

| Input                         | Result      |
|-------------------------------|-------------|
| object                        | object      |
| "13"                          | "13"        |
| "=13"                         | 13          |
| "x.y.z"                       | "x.y.z"     |
| "=x.y.z"                      | object      |
| "='x.y.z'"                    | "x.y.z"     |
| "Hello @{user.name}"          | "Hello Joe" |
| "=concat('Hello ', user.name) | "Hello Joe" |

Also Fixes Bugs
#3166 Luis settings not parsed correctly
#3236 Use dialogId as an expression
#3219 HttpRequest body not parsed correctly

coveralls · 2020-01-13T17:44:48Z

Pull Request Test Coverage Report for Build 100507

0 of 0 changed or added relevant lines in 0 files are covered.
2476 unchanged lines in 263 files lost coverage.
Overall coverage increased (+0.4%) to 78.142%

Files with Coverage Reduction	New Missed Lines	%
/libraries/Adapters/Microsoft.Bot.Builder.Adapters.Facebook/FacebookAdapterOptions.cs	1	86.67%
/libraries/integration/Microsoft.Bot.Builder.Integration.ApplicationInsights.Core/ApplicationBuilderExtensions.cs	1	71.43%
/libraries/Microsoft.Bot.Builder.AI.LUIS/LuisApplication.cs	1	96.36%
/libraries/Microsoft.Bot.Builder.AI.LUIS/V3/LuisApplication.cs	1	96.43%
/libraries/Microsoft.Bot.Builder.AI.LUIS/V3/LuisUtil.cs	1	96.35%
/libraries/Microsoft.Bot.Builder/BotStateSet.cs	1	85.0%
/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/Case.cs	1	87.5%
/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/ActionState.cs	1	50.0%
/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Generators/TemplateEngineLanguageGenerator.cs	1	82.35%
/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Input/Ask.cs	1	96.97%

Totals
Change from base Build 100498:	0.4%
Covered Lines:	21242
Relevant Lines:	27184

💛 - Coveralls

fuselabs · 2020-01-13T17:51:19Z

✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.AI.Luis.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.AI.QnA.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.ApplicationInsights.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.Azure.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.Dialogs.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.Integration.ApplicationInsights.Core.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.Integration.AspNet.Core.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.TemplateManager.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.Testing.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Configuration.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Connector.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Schema.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Streaming.dll compared against version 4.6.3

rename FloatExpression to NumberExpression to better align with javascript (int, number) and json schema (int, number) Remove LongExpression changed to dcState pattern

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/BaseInvokeDialog.cs

fuselabs · 2020-01-15T20:14:06Z

✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.AI.Luis.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.AI.QnA.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.ApplicationInsights.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.Azure.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.Dialogs.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.Integration.ApplicationInsights.Core.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.Integration.AspNet.Core.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.TemplateManager.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.Testing.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Configuration.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Connector.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Schema.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Streaming.dll compared against version 4.6.3

fuselabs · 2020-01-16T00:29:33Z

✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.AI.Luis.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.AI.QnA.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.ApplicationInsights.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.Azure.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.Dialogs.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.Integration.ApplicationInsights.Core.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.Integration.AspNet.Core.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.TemplateManager.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.Testing.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Configuration.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Connector.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Schema.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Streaming.dll compared against version 4.6.3

chrimc62 · 2020-01-16T07:21:55Z

libraries/Microsoft.Bot.Builder/Adapters/TestAdapter.cs

+
+            if (activity.LocalTimestamp == null || activity.LocalTimestamp == default(DateTimeOffset))
+            {
+                activity.LocalTimestamp = DateTimeOffset.Now;


What was this fixing? #ByDesign

time recognizer tests would fail when run in the morning because it was executing in UTC, so tommorrow gives you a different date. TestAdapter should have been setting this.

In reply to: 367263801 [](ancestors = 367263801)

chrimc62 · 2020-01-16T07:31:54Z

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/BeginDialog.cs


-            if (this.disabled != null && (bool?)this.disabled.TryEvaluate(dc.GetState()).value == true)
+            if (this.Disabled != null && this.Disabled.GetValue(dcState) == true)


this.Disabled != null [](start = 16, length = 21)

This is testing to see if there is an expression assigned, right? #ByDesign

yes

In reply to: 367266589 [](ancestors = 367266589)

chrimc62 · 2020-01-16T07:38:04Z

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/EmitEvent.cs

        [JsonConstructor]
-        public EmitEvent(string eventName = null, string eventValue = null, bool bubble = false, [CallerFilePath] string callerPath = "", [CallerLineNumber] int callerLine = 0)
+        public EmitEvent(string eventName = null, object eventValue = null, bool bubble = false, [CallerFilePath] string callerPath = "", [CallerLineNumber] int callerLine = 0)


object [](start = 50, length = 6)

This seems like a good chsnge. #ByDesign

chrimc62 · 2020-01-16T07:42:46Z

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/HttpRequest.cs

@@ -167,13 +165,22 @@ public override async Task<DialogTurnResult> BeginDialogAsync(DialogContext dc,
            JToken instanceBody = null;
            if (this.Body != null)
            {
-                instanceBody = (JToken)this.Body.DeepClone();


DeepClone [](start = 49, length = 9)

Is FromObject better than DeepClone? #Resolved

chrimc62 · 2020-01-16T08:18:10Z

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/TriggerConditions/OnCondition.cs

@@ -3,6 +3,7 @@

 using System;
 using System.Collections.Generic;
+using System.ComponentModel;


Do you need this? #Resolved

chrimc62 · 2020-01-16T08:19:19Z

libraries/Microsoft.Bot.Builder.Dialogs.Declarative/Converters/ExpressionConverter.cs

-using Newtonsoft.Json;
+//using System;
+//using Microsoft.Bot.Expressions;
+//using Newtonsoft.Json;


Delete whole file? #Resolved

chrimc62 · 2020-01-16T08:21:03Z

libraries/Microsoft.Bot.Expressions/BuiltInFunctions.cs

@@ -1338,10 +1330,6 @@ private static (object value, string error) Substring(Expression expression, IMe
                        }
                    }
                }
-                else
-                {
-                    error = $"{expression.Children[0]} is not a string.";


error = $"{expression.Children[0]} is not a string."; [](start = 20, length = 53)

Why did you drop this? At runtime you can up with a non-string. #ByDesign

This was checking to see if the object returned was not a string. The TryEvaluate() will coerce the result to a string, aka, the number 31 => "31".

In reply to: 367282705 [](ancestors = 367282705)

chrimc62 · 2020-01-16T08:22:47Z

schemas/baseComponent.schema

@@ -34,8 +34,6 @@
            "description": "Extra information for the Bot Framework Designer."
        },
        "expression": {


You should delete this. #Resolved

chrimc62 · 2020-01-16T08:24:47Z

...der.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwich-BreadSetBreadEntity.dialog

@@ -12,7 +12,7 @@
        {
            "$kind": "Microsoft.SetProperty",
            "property": "$Bread",
-            "value": "@BreadEntity"
+            "value": "=@BreadEntity"


=@BreadEntity [](start = 22, length = 13)

Once this is checked-in, I'll need to update the generator. #ByDesign

yes you will :)

In reply to: 367284059 [](ancestors = 367284059)

tests/Microsoft.Bot.Expressions.Tests/BadExpressionTests.cs

chrimc62

🕐

tomlm · 2020-01-16T23:01:25Z

        "title": "Options",

decided to make it an expression.

In reply to: 575033823 [](ancestors = 575033823)

Refers to: libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.ReplaceDialog.schema:32 in 3ad16f3. [](commit_id = 3ad16f3, deletion_comment = False)

chrimc62 · 2020-01-17T07:49:22Z

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Memory/Expressions/ObjectExpression.cs

+        }
+
+        public ObjectExpression(string expressionOrString)
+            : base(expressionOrString)


Still missing comments.

chrimc62 · 2020-01-17T07:50:13Z

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Memory/Expressions/ValueExpression.cs

+        {
+        }
+
+        public static implicit operator ValueExpression(string valueOrExpression) => new ValueExpression(valueOrExpression);


public static [](start = 8, length = 13)

Do we not have to document public statics? Missing here and a couple of other places.

chrimc62

fuselabs · 2020-01-17T23:59:47Z

✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.AI.Luis.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.AI.QnA.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.ApplicationInsights.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.Azure.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.Dialogs.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.Integration.ApplicationInsights.Core.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.Integration.AspNet.Core.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.TemplateManager.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Builder.Testing.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Configuration.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Connector.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Schema.dll compared against version 4.6.3
✔️ No Binary Compatibility issues for Microsoft.Bot.Streaming.dll compared against version 4.6.3

Tom Laird-McConnell added 4 commits January 11, 2020 09:58

snapshot of all expression property work and unit tests

1f11dbc

choiceset works all unit tests pass

48be89a

fixup some more tests

8d5253c

restore default null states to inputdialog

fd34ce9

tomlm added DCR R8 Release 8 - March 16th, 2020 labels Jan 11, 2020

Tom Laird-McConnell added 7 commits January 11, 2020 15:32

cleanup defaults

175dd9d

more cleanup

9e58781

Merge branch 'master' into tomlm/fixDialogId

9afe242

fix expression<list<string>>

3a5c849

fix changed declarative unit tests with to use "="

9852794

Merge branch 'master' into tomlm/fixDialogId

f1bc518

fix qna unit tests to not be escaping strings

b51dc51

Tom Laird-McConnell added 2 commits January 14, 2020 08:41

make all property path properties StringExpressions

6122181

rename FloatExpression to NumberExpression to better align with javascript (int, number) and json schema (int, number) Remove LongExpression changed to dcState pattern

added ArrayExpression, ObjectExpression, DialogExpression

c7777be

tomlm removed the WIP label Jan 15, 2020

tomlm marked this pull request as ready for review January 15, 2020 19:36

fix datetimeinput reftime

db49cde

tomlm commented Jan 15, 2020

View reviewed changes

libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/BaseInvokeDialog.cs Outdated Show resolved Hide resolved

remove commented out line

3ad16f3

chrimc62 reviewed Jan 16, 2020

View reviewed changes

tests/Microsoft.Bot.Expressions.Tests/BadExpressionTests.cs Show resolved Hide resolved

chrimc62 reviewed Jan 16, 2020

View reviewed changes

tests/Microsoft.Bot.Expressions.Tests/BadExpressionTests.cs Show resolved Hide resolved

chrimc62 suggested changes Jan 16, 2020

View reviewed changes

tomlm requested a review from carlosscastro January 16, 2020 18:13

Tom Laird-McConnell added 2 commits January 16, 2020 15:14

changes from code review feedback

a62cfd9

restore 2 of the expression unit tets

d55a9dc

chrimc62 reviewed Jan 17, 2020

View reviewed changes

chrimc62 approved these changes Jan 17, 2020

View reviewed changes

Tom Laird-McConnell added 6 commits January 17, 2020 09:14

fix trace robustness with null from

a934a52

remove file transcript logger from unit tests

1658e00

Merge branch 'master' into tomlm/fixDialogId

ec7316d

fix back compat constructor

66bfdfd

kick the tires

2d5cdeb

Merge branch 'master' into tomlm/fixDialogId

6b64499

chrimc62 merged commit c949e42 into master Jan 18, 2020

chrimc62 deleted the tomlm/fixDialogId branch January 18, 2020 00:00

vishwacsena added the composer Impacts composer label Feb 5, 2020

lei9444 mentioned this pull request Feb 12, 2020

refactor: update the validation for new schema microsoft/BotFramework-Composer#1988

Merged

boydc2014 mentioned this pull request Nov 2, 2020

[DCR] Further simplify the usage of expression in declarative dialogs #4905

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[DCR] Normalize all expression and add '=' to force expression. #3253

[DCR] Normalize all expression and add '=' to force expression. #3253

tomlm commented Jan 11, 2020 •

edited

coveralls commented Jan 13, 2020 •

edited

fuselabs commented Jan 13, 2020

fuselabs commented Jan 15, 2020

fuselabs commented Jan 16, 2020

chrimc62 Jan 16, 2020 •

edited by tomlm

tomlm Jan 16, 2020

chrimc62 Jan 16, 2020 •

edited by tomlm

tomlm Jan 16, 2020

chrimc62 Jan 16, 2020 •

edited by tomlm

chrimc62 Jan 16, 2020 •

edited by tomlm

chrimc62 Jan 16, 2020 •

edited by tomlm

chrimc62 Jan 16, 2020 •

edited by tomlm

chrimc62 Jan 16, 2020 •

edited by tomlm

tomlm Jan 16, 2020

chrimc62 Jan 16, 2020 •

edited by tomlm

chrimc62 Jan 16, 2020 •

edited by tomlm

tomlm Jan 16, 2020

chrimc62 left a comment

tomlm commented Jan 16, 2020

chrimc62 Jan 17, 2020

chrimc62 Jan 17, 2020

chrimc62 left a comment

fuselabs commented Jan 17, 2020


		if (this.disabled != null && (bool?)this.disabled.TryEvaluate(dc.GetState()).value == true)
		if (this.Disabled != null && this.Disabled.GetValue(dcState) == true)

[DCR] Normalize all expression and add '=' to force expression. #3253

[DCR] Normalize all expression and add '=' to force expression. #3253

Conversation

tomlm commented Jan 11, 2020 • edited

StringExpression

BoolExpression

IntExpression

FloatExpression

ExpressionProperty

ValueExpression (T == object)

coveralls commented Jan 13, 2020 • edited

Pull Request Test Coverage Report for Build 100507

💛 - Coveralls

fuselabs commented Jan 13, 2020

fuselabs commented Jan 15, 2020

fuselabs commented Jan 16, 2020

chrimc62 Jan 16, 2020 • edited by tomlm

Choose a reason for hiding this comment

tomlm Jan 16, 2020

Choose a reason for hiding this comment

chrimc62 Jan 16, 2020 • edited by tomlm

Choose a reason for hiding this comment

tomlm Jan 16, 2020

Choose a reason for hiding this comment

chrimc62 Jan 16, 2020 • edited by tomlm

Choose a reason for hiding this comment

chrimc62 Jan 16, 2020 • edited by tomlm

Choose a reason for hiding this comment

chrimc62 Jan 16, 2020 • edited by tomlm

Choose a reason for hiding this comment

chrimc62 Jan 16, 2020 • edited by tomlm

Choose a reason for hiding this comment

chrimc62 Jan 16, 2020 • edited by tomlm

Choose a reason for hiding this comment

tomlm Jan 16, 2020

Choose a reason for hiding this comment

chrimc62 Jan 16, 2020 • edited by tomlm

Choose a reason for hiding this comment

chrimc62 Jan 16, 2020 • edited by tomlm

Choose a reason for hiding this comment

tomlm Jan 16, 2020

Choose a reason for hiding this comment

chrimc62 left a comment

Choose a reason for hiding this comment

tomlm commented Jan 16, 2020

chrimc62 Jan 17, 2020

Choose a reason for hiding this comment

chrimc62 Jan 17, 2020

Choose a reason for hiding this comment

chrimc62 left a comment

Choose a reason for hiding this comment

fuselabs commented Jan 17, 2020

tomlm commented Jan 11, 2020 •

edited

coveralls commented Jan 13, 2020 •

edited

chrimc62 Jan 16, 2020 •

edited by tomlm

chrimc62 Jan 16, 2020 •

edited by tomlm

chrimc62 Jan 16, 2020 •

edited by tomlm

chrimc62 Jan 16, 2020 •

edited by tomlm

chrimc62 Jan 16, 2020 •

edited by tomlm

chrimc62 Jan 16, 2020 •

edited by tomlm

chrimc62 Jan 16, 2020 •

edited by tomlm

chrimc62 Jan 16, 2020 •

edited by tomlm

chrimc62 Jan 16, 2020 •

edited by tomlm