Граф коммитов

753 Коммитов

Автор SHA1 Сообщение Дата
Monica Rivera af02de28c4
Fix warnings. (#3587) 2020-03-20 13:58:36 -07:00
Monica Rivera a5db24b46f
Fix for Issue #3525 (#3584) 2020-03-20 13:53:46 -07:00
Tom Laird-McConnell 0c72fbc7b7
Add Push/Pop services to TurnContextStateCollection. (#3594)
* clean up caps constant names

* * Add DialogContext.State as DialogStateManager/Remove GetState() extension method
* Move DialogStateManager/ScopesPathResolvers into Dialogs assembly
* Make all IMemory implementations evaluate ExpressionProperties
* Fix layering between expressions and dialogs via MemoryFactory.Create() and internal ducktyping memory
* Move ComponentRegistration into Builder assembly
* Fix path CAPS names in paths: NOTE I have marked old values as [Obsolete]  We should remove these obsolete properties right before we release or we will get broken builds for every PR because of backward compat issues.

* Add Push/Pop services to TurnContextStateCollection.
Add unit tests for TurnContextStateCollection
Add tracing to NullDialogDebugger, cause it's super damn useful and I needed it to debug the unit tests.
Fix DialogExpression which wasn't evaluating the dialog.id (messing up debugger output and id's)

* change new ToString() => override ToString()

* add copywrite
2020-03-19 11:24:36 -07:00
Tom Laird-McConnell 43fd9e6050
Move DialogStateManager/Memory/Scope into dialogs dialogContext.State (#3570)
* clean up caps constant names

* * Add DialogContext.State as DialogStateManager/Remove GetState() extension method
* Move DialogStateManager/ScopesPathResolvers into Dialogs assembly
* Make all IMemory implementations evaluate ExpressionProperties
* Fix layering between expressions and dialogs via MemoryFactory.Create() and internal ducktyping memory
* Move ComponentRegistration into Builder assembly
* Fix path CAPS names in paths: NOTE I have marked old values as [Obsolete]  We should remove these obsolete properties right before we release or we will get broken builds for every PR because of backward compat issues.
2020-03-18 12:36:03 -07:00
Hongyang Du (hond) f5111031da
[activityfactory] Improve missing type error (#3575)
* Improve missing type error - activityfactory

* fix linux error
2020-03-18 16:04:57 +08:00
Carlos Castro 75eec1ae1a Proactive auth: trust incoming token url conditionally 2020-03-10 16:43:38 -07:00
Hongyang Du (hond) ded7c819ad
API naming for LG (#3480)
* API naming for Expression

* init

* fix comments

* update

* remove ExpressionBuilder

* revert some code

* fix error

* Refactor custom function tables
* Expression.Functions is global table for expressions
* Expression.Parse(str) will use Expression.Functions
* Expression.Lookup(str, lookup)
* replaced new ExpressionParser.Parse() with Expression.Parse
* Changed ExpressionFunctions.BuiltInf => StandardFunctions

* fix regsitration to go tino Expression.Functions, not StandardFunctions

* remove 'prebuilt' prefix

* LGParser.Parse to LG.Parse

* rename evaluateTemplate and evaluate

* put activityFactory peer to messageFactory

* Rename LG => Templates

* merge with master

Co-authored-by: Tom Laird-McConnell <tomlm@microsoft.com>
2020-03-09 14:33:39 -07:00
Artur Laksberg c79920a5ff Keep handoff event value as JObject 2020-03-09 09:34:46 -07:00
Eric Dahlvang ec7d10aa46
Disable warnings for SkillConversationIdFactoryBase methods in tests (#3518)
* Disable warnings for SkillConversationIdFactoryBase methods in tests

* add comments for deprecated warnings disable
2020-03-07 15:19:08 -08:00
Eric Dahlvang 73bc4d3ffb Add ExpectedReplies 2020-03-07 10:47:36 -08:00
Eric Dahlvang ddf1ff2a68
spelling 2020-03-06 19:13:28 -08:00
Eric Dahlvang 469fc57cce
spelling 2020-03-06 19:12:16 -08:00
Eric Dahlvang 26f979e9fd change ExpectsReply to ExpectReplies 2020-03-06 18:55:30 -08:00
Eric Dahlvang cbca804d0d Change bufferedReplies to expectsReply 2020-03-06 15:20:38 -08:00
Gabo Gilabert 9960e6802e
Adds support for buffered replies to skill dialog (#3496)
* Renamed SkillDialogArgs to BeginSkillDialogOptions for parity.
Updated SkillConversationIdFactory in DialogRootBot to use the new methods.
Updated BotFrameworkHttpClient to restore RelatesTo after is done with it.
Namepsaced OAuthScopeKey key in BotAdapter to avoid collisions.
Updated SkillDialog to use new methods from ConversationIdFactory.

* Added support for using DeliveryMode in SkillDialog.
Updated MainDialog to set the property if present.

* Fixed broken tests
2020-03-04 22:22:14 -08:00
johnataylor f088cb1036
Merge pull request #3440 from microsoft/gary/telemetry-updates
Update TelemetryClient to enable tracking of dialog ('page') views
2020-03-04 13:06:19 -08:00
Gary Pretty ddce7ebf64 Rename extension method and alter fallback trace event to contain DialogView info 2020-03-04 20:13:51 +00:00
Gary Pretty 680ad07834 Updae NullBotTelemetryInitializer to implement additional interface 2020-03-04 16:24:08 +00:00
Gary Pretty fe2f0615be Split into another interface and extension method to avoid breaking change 2020-03-04 16:20:11 +00:00
Gary Pretty bee8125481 Revert previous commits to rollback to commit where interface was extended 2020-03-04 10:59:02 +00:00
Eric Dahlvang c42dcde28b
Add originatingAudience to SkillHttpClient.PostActivityAsync (#3477)
* Add originatingAudience to SkillHttpClient.PostActivityAsync

* Deprecated old methods in SkillCOnversationIdFactoryBase and added new ones.
Updated related classes to use the new methods.

* clone ConversationReference for FunctionalTest's SkillConversationIdFactory

* change skill conversation.id in SimpleRootBot example

* Skill Unit test updates

Co-authored-by: Gabo Gilabert <gabog@users.noreply.github.com>
2020-03-03 15:16:10 -08:00
John Taylor 06da04b0c9 clean up activityhandler and teamsactivityhandler 2020-03-03 11:30:42 -08:00
Andrew Clear d0350907b2 Adding roster change with no alterations to the IConversations interface. Calling getMember would require a downcast from an object of type IConversations. See line 78 of TeamsInfo.cs for an example of what this looks like. 2020-03-02 11:49:28 -08:00
Gary Pretty 7197d0a7ea Further updates to clean up current approach and remove obselete flags until future release. 2020-02-29 09:43:40 +00:00
Gabo Gilabert 151777bfec
Added null check and code to return default(T) in GetPropertyValueAsync<T> (#3448)
* Added null check and code to return default(T) in GetPropertyValueAsync<T>

* Added missing type.
2020-02-27 09:37:15 -08:00
Gary Pretty c96e65e1d1 Resolve null exception 2020-02-27 11:19:24 +00:00
Gary Pretty 8e5478714e Update to create new abstract class fpr telemetry logging and update logging middleware / dialog classes 2020-02-27 09:25:07 +00:00
johnataylor 5f443353ac
Merge pull request #3454 from microsoft/johtaylo/issue3437
add deliverymode bufferedreplies
2020-02-26 17:23:49 -08:00
John Taylor 7a51182701 add deliverymode 2020-02-26 16:53:15 -08:00
Michael Richardson 0c3a01e044
Fix errors when From is null in telemetry (#3436)
* fix null From in telemetry

* reverted accidental change
2020-02-25 15:32:36 -08:00
Steven Gum f0f0d366ec
use standard OAuthScopes in CreateOAuthApiClientAsync (#3439) 2020-02-25 15:29:01 -08:00
Gary Pretty 210e75974e Update TelemetryClient to enable tracking of page views and add automatic page view logging on dialog start for component / waterfall dialogs. 2020-02-25 23:26:58 +00:00
Tom Laird-McConnell b4ea08d3d1
Fix BotStateScope to show full botState and give control for dialogState Property name (#3421)
* remove internal throw for property lookup

* * Change BotStateMemoryScope to return the actual cached BotStateMemory instead of using a StatePropertyAccessor, so that Legacy dialog memory is accessible via memory ssytem.
* Add unit tests to verifiy you can use StatePropertyAccessor or DSM to access BotState

* * Changed DialogManager CTOR to allow alternate property name for DialogState property in conversation state.

* remove catch, it's not needed anymore

* better handling for value properties

* dialogstate
2020-02-24 16:43:16 -08:00
bothosting.runtime@bf.ai 096e10c24f Merge branch 'master' into jeffders/OAuthCardSSOMaster 2020-02-24 13:04:50 -08:00
Steven Gum 5bd7110965
[Skills] Refactor BFAdapter Auth, Add support for proactively messaging non-channel recipients (#3409)
* add BotFrameworkAdapter.ContinueSkillConversationAsync
* add SkillConversationReference
* make cancellationToken optional in CreateConnectorClientAsync

* use audience in CreateConnectorClientAsync

* update ContinueSkillConversationAsync
* audience and ConversationReference is required
* delete SkillConversationReference class

* cache OAuthScope on TurnState

* get OAuthScope in ProcessActivityAsync
* needed to create the correct keys for AppCredentials cache
* cache OAuthScope on TurnState

* add ProcessActivityAsync test for skill scenario

* remove EnsureChannelConnectorClientIsCreatedAsync
* new test cleanup

* make sure scope is not null when calling GetAppCredentialsAsync

* refactor ContinueConversationAsyncWithAudience

* make oAuthScope required, apply PR feedback
2020-02-24 10:31:05 -08:00
bothosting.runtime@bf.ai c97b4ffb58 CR feedback 2020-02-15 10:58:15 -08:00
bothosting.runtime@bf.ai d92a398386 Merge branch 'jeffders/skillsNoMagicCode' into jeffders/OAuthCardSSOMaster 2020-02-14 14:22:47 -08:00
bothosting.runtime@bf.ai 266dc8a509 Removed interfaces changes
resolved credential provider issue.
2020-02-14 14:22:30 -08:00
BruceHaley dc672477c0
Update to Microsoft.SourceLink.GitHub (#3389) 2020-02-14 09:35:37 -08:00
johnataylor 91649be200
add typing activity to activityhandler (#3384) 2020-02-12 16:25:11 -08:00
Artur Laksberg 575fcf13b1
Merge pull request #3347 from microsoft/handoffv2
Event factory for handoff protocol
2020-02-12 15:30:52 -08:00
Gabo Gilabert 69112a39fa
SkillDialog (#3346)
* First pass at SkillDialog
Created preview Skills project and placeholder for unit test.
Added DialotToDialog and SimpleSkillBot for local testing.
Added abstract BotFrameworkClient base class to decouple http dependency.
Added Skills Solution.

* Refactored DialogToDialog to use EchoSkillBot and DialogSkillBot.
Deleted simplebot to bot for now.
Updated code to make it work.

* Forced adding launchSettings.json to code to make it easier to configure locally during dev.

* Added support for InvokeActivities in SkillDialog.
Updated welcome card.

* Added guard in SkillDialog to only process Message and event activities.
Removed invoke handling funcitonality from SkillDialog and sample call.

* Removed Invoke Code from skilldialog
Added new projects to the Mcirosoft.Bot.Builder.sln file

* Revreated Skill.sln after merge and remove 31 suffix from DialogSkill Test projects.

* Removed icon.png ref from csproj file

* Readded projects lost after merge
Removed Expressions.Properties from skills solution.

* Touched to force another build

* Updated SkillDialog to take activities instead of creating them and updated MainDialog to create the activities.
Updated SkillDialogArgs to take the skill and the activity to forward.
Addressed other comments from PR
2020-02-11 23:26:50 -05:00
bothosting.runtime@bf.ai 5b54281675 Merge branch 'master' into jeffders/OAuthCardSSOMaster 2020-02-11 12:05:39 -08:00
bothosting.runtime@bf.ai a00ccbe7c7 Set the conversation ID for a skill
use relates to
2020-02-11 12:01:17 -08:00
Artur Laksberg 9e4939d102 Do not fix up conversation reference in transcript 2020-02-10 13:34:15 -08:00
bothosting.runtime@bf.ai 27ae8e5804 Merge branch 'jeffders/OAuthCardSSOMaster' into jeffders/skillsNoMagicCode 2020-02-10 12:43:55 -08:00
bothosting.runtime@bf.ai ab5aa68f6c Update token exchange state 2020-02-10 12:43:47 -08:00
bothosting.runtime@bf.ai 4f5a91e523 Fixing build breaks form VS 2017 +
CR feedback +
tests
2020-02-07 16:22:29 -08:00
Tom Laird-McConnell 6955e38c34
Cleanup and consolidate TypeFactory/loading/configuration/ExpressionEngine/registration etc. (#3350)
* Add HostContext for global assets like IConfiguration
* Add ComponentRegistration discovery
* Break interfaces apart for components registrations
* Added Expression.Parse with global function table
* Removed IExpressionEngineFactory
* drop SetStateConfiguration
* Merge TypeFactory and DeclarativeTypeLoader with ResourceExplorer
* Added DialogManager.TurnState to allow dialog manager to set initial TurnState for registering components like LanguageGenerator and ResourceExplorer
* Dropped adapter .Use methods and moved them to DialogManager  (UseResourceExplorer/UseLanguageGeneration etc)
* Drop Resource Plugins
* Merge RefResolver into ResourceExplorer
* rename TypeRegistration to KindRegistration
* Add Configuration.UseLuisSettings()
* add updateluis
* update coments
* add IComponentExpressionFunction for custom functions
* fix issue with netcore31
* changes based on code review
* comments
* headers
* fixed expression optional/ignore and added unit tets
* restored jsonload
* make transcript tests run faster by reducing delay by 10x
* fix optional/ignore semantics
2020-02-07 16:18:55 -08:00
Jonathan Fingold c2a4a06800
Fix typos [mostly] in the bot.builder namespace (#3349) 2020-02-07 12:48:42 -08:00