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

[JS] fix: #247 #635 Add fallthrough for empty result Task Module Fetch and tests #772

Merged
merged 4 commits into from
Nov 6, 2023
Merged

[JS] fix: #247 #635 Add fallthrough for empty result Task Module Fetch and tests #772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6238403
Check Channels enum instead of explicit string
Nov 2, 2023
cb3d6b3
Add fallthrough response for Task Modules fetch, add channelId check,…
Nov 3, 2023
083657a
Merge branch 'main' into cg/events-fixes
corinagum Nov 3, 2023
1ba0c31
Remove extraneous comments
Nov 3, 2023
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
8 changes: 4 additions & 4 deletions js/packages/teams-ai/src/Application.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { strict as assert } from 'assert';
import { TestAdapter, MemoryStorage, ActivityTypes } from 'botbuilder';
import { ActivityTypes, Channels, MemoryStorage, TestAdapter } from 'botbuilder';
import { Application, ApplicationBuilder, ConversationUpdateEvents } from './Application';
import { TestPlanner } from './TestPlanner';
import { TestPromptManager } from './TestPromptManager';
Expand Down Expand Up @@ -208,7 +208,7 @@ describe('Application', () => {
});

const activity = createTestConversationUpdate();
activity.channelId = 'msteams';
activity.channelId = Channels.Msteams;
activity.membersAdded = [
{ id: '123', name: 'Member One' },
{ id: '42', name: "Don't Panic" }
Expand Down Expand Up @@ -276,7 +276,7 @@ describe('Application', () => {
});

const activity = createTestConversationUpdate(channelData);
activity.channelId = 'msteams';
activity.channelId = Channels.Msteams;
await adapter.processActivity(activity, async (context) => {
await mockApp.run(context);
assert.equal(handlerCalled, true);
Expand All @@ -289,7 +289,7 @@ describe('Application', () => {
const team = { id: 'mockTeamId' };
const channel = { id: 'mockChannelId' };
const activity = createTestConversationUpdate({ channel, eventType: 'channelCreated', team });
activity.channelId = 'msteams';
activity.channelId = Channels.Msteams;

mockApp.conversationUpdate('channelCreated', async (context, _state) => {
handlerCalled = true;
Expand Down
22 changes: 12 additions & 10 deletions js/packages/teams-ai/src/Application.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,21 @@
*/

import {
TurnContext,
Storage,
Activity,
ActivityTypes,
BotAdapter,
Channels,
ConversationReference,
Activity,
ResourceResponse
ResourceResponse,
Storage,
TurnContext
} from 'botbuilder';
import { TurnState, TurnStateManager } from './TurnState';
import { DefaultTurnState, DefaultTurnStateManager } from './DefaultTurnStateManager';
import { AdaptiveCards, AdaptiveCardsOptions } from './AdaptiveCards';
import { MessageExtensions } from './MessageExtensions';
import { AI, AIOptions } from './AI';
import { DefaultTurnState, DefaultTurnStateManager } from './DefaultTurnStateManager';
import { MessageExtensions } from './MessageExtensions';
import { TaskModules, TaskModulesOptions } from './TaskModules';
import { TurnState, TurnStateManager } from './TurnState';

/**
* @private
Expand Down Expand Up @@ -914,7 +915,7 @@ function createConversationUpdateSelector(event: ConversationUpdateEvents): Rout
*/
return (context: TurnContext) => {
return Promise.resolve(
context?.activity?.channelId === 'msteams' &&
context?.activity?.channelId === Channels.Msteams &&
context?.activity?.type == ActivityTypes.ConversationUpdate &&
context?.activity?.channelData?.eventType == event &&
context?.activity?.channelData?.channel &&
Expand Down Expand Up @@ -957,7 +958,7 @@ function createConversationUpdateSelector(event: ConversationUpdateEvents): Rout
*/
return (context: TurnContext) => {
return Promise.resolve(
context?.activity?.channelId === 'msteams' &&
context?.activity?.channelId === Channels.Msteams &&
context?.activity?.type == ActivityTypes.ConversationUpdate &&
context?.activity?.channelData?.eventType == event &&
context?.activity?.channelData?.team
Expand All @@ -977,6 +978,8 @@ function createConversationUpdateSelector(event: ConversationUpdateEvents): Rout
}
}

// function createMessageUpdateActivitySelector()
//
/**
* Creates a route selector function that matches a message based on a keyword.
* @param {string | RegExp | RouteSelector} keyword The keyword to match against the message text. Can be a string, regular expression, or a custom selector function.
Expand Down Expand Up @@ -1043,7 +1046,6 @@ function createMessageReactionSelector(event: MessageReactionEvents): RouteSelec
};
}
}
// channelData: eventype of editMessage

/**
* @private
Expand Down
39 changes: 20 additions & 19 deletions js/packages/teams-ai/src/MessageExtensions.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { Application, Query } from './Application';
import { createTestInvoke } from './TestUtilities';
import { MessageExtensions } from './MessageExtensions';
import {
Channels,
INVOKE_RESPONSE_KEY,
MessagingExtensionResult,
TaskModuleTaskInfo,
Expand Down Expand Up @@ -71,7 +72,7 @@ describe('MessageExtensions', () => {
const activity = createTestInvoke(ANONYMOUS_QUERY_LINK_INVOKE_NAME, {
url: 'https://www.youtube.com/watch?v=971YIvosuUk&ab_channel=MicrosoftDeveloper'
});
activity.channelId = 'msteams';
activity.channelId = Channels.Msteams;
// Set up the anonymousQueryLink handler
mockApp.messageExtensions.anonymousQueryLink(async () => {
return {
Expand Down Expand Up @@ -129,7 +130,7 @@ describe('MessageExtensions', () => {
describe(`${CONFIGURE_SETTINGS}`, () => {
it('should return InvokeResponse with status code 200 with the configure setting invoke name', async () => {
const activity = createTestInvoke(CONFIGURE_SETTINGS, { theme: 'dark' });
activity.channelId = 'msteams';
activity.channelId = Channels.Msteams;

mockApp.messageExtensions.configureSettings(async (context: TurnContext, _state, value) => {
assert.equal(value.theme, 'dark');
Expand All @@ -147,7 +148,7 @@ describe('MessageExtensions', () => {
describe(`${FETCH_TASK_INVOKE_NAME}`, () => {
it('should return InvokeResponse with status code 200 with the task invoke card', async () => {
const activity = createTestInvoke(FETCH_TASK_INVOKE_NAME, { commandId: 'showTaskModule' });
activity.channelId = 'msteams';
activity.channelId = Channels.Msteams;

mockApp.messageExtensions.fetchTask('showTaskModule', async (context: TurnContext, _state) => {
return {
Expand Down Expand Up @@ -200,7 +201,7 @@ describe('MessageExtensions', () => {

it('should return InvokeResponse with status code 200 with a string message', async () => {
const activity = createTestInvoke(FETCH_TASK_INVOKE_NAME, { commandId: 'showMessage' });
activity.channelId = 'msteams';
activity.channelId = Channels.Msteams;

mockApp.messageExtensions.fetchTask('showMessage', async (context: TurnContext, _state) => {
return 'Fetch task string';
Expand All @@ -226,22 +227,22 @@ describe('MessageExtensions', () => {
const activity = createTestInvoke(FETCH_TASK_INVOKE_NAME, {
commandId: 'showTaskModule'
});
activity.channelId = 'msteams';
activity.channelId = Channels.Msteams;
const regexp = new RegExp(/show$/, 'i');
const activity2 = createTestInvoke(FETCH_TASK_INVOKE_NAME, {
commandId: 'Show'
});
activity2.channelId = 'msteams';
activity2.channelId = Channels.Msteams;

const activity3 = createTestInvoke(FETCH_TASK_INVOKE_NAME, {
commandId: 'show task module'
});
activity3.channelId = 'msteams';
activity3.channelId = Channels.Msteams;

const activity4 = createTestInvoke(FETCH_TASK_INVOKE_NAME, {
commandId: 'show task'
});
activity4.channelId = 'msteams';
activity4.channelId = Channels.Msteams;

mockApp.messageExtensions.fetchTask(
[
Expand Down Expand Up @@ -323,7 +324,7 @@ describe('MessageExtensions', () => {
formField3: 'formField3_value'
}
});
activity.channelId = 'msteams';
activity.channelId = Channels.Msteams;

mockApp.messageExtensions.submitAction('giveKudos', async (context: TurnContext, _state, value) => {
return {
Expand Down Expand Up @@ -387,7 +388,7 @@ describe('MessageExtensions', () => {
botActivityPreview: [1],
botMessagePreviewAction: 'send'
});
activity.channelId = 'msteams';
activity.channelId = Channels.Msteams;

mockApp.messageExtensions.botMessagePreviewSend(
'Create Preview',
Expand All @@ -410,7 +411,7 @@ describe('MessageExtensions', () => {
botActivityPreview: [1],
botMessagePreviewAction: 'edit'
});
activity.channelId = 'msteams';
activity.channelId = Channels.Msteams;

mockApp.messageExtensions.botMessagePreviewEdit(
'Create Preview',
Expand All @@ -435,14 +436,14 @@ describe('MessageExtensions', () => {
botActivityPreview: ['create preview'],
botMessagePreviewAction: 'send'
});
activity.channelId = 'msteams';
activity.channelId = Channels.Msteams;

const activity2 = createTestInvoke(SUBMIT_ACTION_INVOKE_NAME, {
commandId: 'preview',
botActivityPreview: ['preview'],
botMessagePreviewAction: 'send'
});
activity2.channelId = 'msteams';
activity2.channelId = Channels.Msteams;

mockApp.messageExtensions.botMessagePreviewSend(
['create preview', 'preview'],
Expand Down Expand Up @@ -471,7 +472,7 @@ describe('MessageExtensions', () => {
botActivityPreview: [1],
botMessagePreviewAction: 'edit'
});
activity.channelId = 'msteams';
activity.channelId = Channels.Msteams;

mockApp.messageExtensions.botMessagePreviewSend(
async (context) => {
Expand All @@ -495,7 +496,7 @@ describe('MessageExtensions', () => {
describe(`${QUERY_INVOKE_NAME}`, () => {
it('should return InvokeResponse with status code 200 with the query invoke name', async () => {
const activity = createTestInvoke(QUERY_INVOKE_NAME, { commandId: 'showQuery' });
activity.channelId = 'msteams';
activity.channelId = Channels.Msteams;

interface MyParams {}

Expand Down Expand Up @@ -532,7 +533,7 @@ describe('MessageExtensions', () => {
displayText: 'Yes',
value: 'Yes'
});
activity.channelId = 'msteams';
activity.channelId = Channels.Msteams;

mockApp.messageExtensions.handleOnButtonClicked(async (context: TurnContext, _state, data) => {
assert.equal(data.title, 'Query button');
Expand All @@ -554,7 +555,7 @@ describe('MessageExtensions', () => {
const activity = createTestInvoke(QUERY_LINK_INVOKE_NAME, {
url: 'https://www.youtube.com/watch?v=971YIvosuUk&ab_channel=MicrosoftDeveloper'
});
activity.channelId = 'msteams';
activity.channelId = Channels.Msteams;

// Set up the queryLink handler
mockApp.messageExtensions.queryLink(async () => {
Expand Down Expand Up @@ -613,7 +614,7 @@ describe('MessageExtensions', () => {
describe(`${QUERY_SETTING_URL}`, async () => {
it('should return InvokeResponse with status code 200 when querySettingUrl is invoked', async () => {
const activity = createTestInvoke(QUERY_SETTING_URL, {});
activity.channelId = 'msteams';
activity.channelId = Channels.Msteams;

mockApp.messageExtensions.queryUrlSetting(async (context: TurnContext, _state) => {
return {
Expand Down Expand Up @@ -656,7 +657,7 @@ describe('MessageExtensions', () => {
],
type: 'result'
});
activity.channelId = 'msteams';
activity.channelId = Channels.Msteams;

// Set up the selectItem handler
mockApp.messageExtensions.selectItem(async (_context, _state, item) => {
Expand Down
Loading