Skip to content

Commit a2c21a3

Browse files
axelsrzmsomanathan
andauthored
Cloud adapter (#1707)
* Cloud adapter auth abstract classes * CloudAdapterBase * BFAuthenticationFactory * CloudAdapter implementation * CloudAdapter implementation * SkillHandler implementation and added CloudSkillHandler * HttpClientFactory * HttpClientFactory * UserTokenClientImplementation * PasswordServiceClientCredentialFactory * format * BuiltInBotFrameworkAuthentication * ConnectorFactoryImplementation * BotFrameworkAuthentication implementations * BotFrameworkAuthenticationFactory * Using async client in connector factory * ConfigurationBotFrameworkAuthentication * Fix check for claims issuer * Solving circular dependencies * CloudAdapter no auth scenario working * Password scenario fully working, ouath schenario fully working * fixing tests * Pylint and minor fixes * Exporting connector.skills Co-authored-by: msomanathan <[email protected]>
1 parent d71c6ed commit a2c21a3

File tree

65 files changed

+3351
-409
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+3351
-409
lines changed

libraries/botbuilder-core/botbuilder/core/__init__.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
# Licensed under the MIT License. See License.txt in the project root for
55
# license information.
66
# --------------------------------------------------------------------------
7+
from botbuilder.schema import InvokeResponse
8+
79
from . import conversation_reference_extension
810

911
from .about import __version__
@@ -18,12 +20,13 @@
1820
from .bot_telemetry_client import BotTelemetryClient, Severity
1921
from .card_factory import CardFactory
2022
from .channel_service_handler import BotActionNotImplementedError, ChannelServiceHandler
23+
from .cloud_adapter_base import CloudAdapterBase
24+
from .cloud_channel_service_handler import CloudChannelServiceHandler
2125
from .component_registration import ComponentRegistration
2226
from .conversation_state import ConversationState
2327
from .oauth.extended_user_token_provider import ExtendedUserTokenProvider
2428
from .oauth.user_token_provider import UserTokenProvider
2529
from .intent_score import IntentScore
26-
from .invoke_response import InvokeResponse
2730
from .memory_storage import MemoryStorage
2831
from .memory_transcript_store import MemoryTranscriptStore
2932
from .message_factory import MessageFactory
@@ -63,6 +66,8 @@
6366
"calculate_change_hash",
6467
"CardFactory",
6568
"ChannelServiceHandler",
69+
"CloudAdapterBase",
70+
"CloudChannelServiceHandler",
6671
"ComponentRegistration",
6772
"ConversationState",
6873
"conversation_reference_extension",

libraries/botbuilder-core/botbuilder/core/activity_handler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
AdaptiveCardInvokeResponse,
1010
AdaptiveCardInvokeValue,
1111
ChannelAccount,
12+
InvokeResponse,
1213
MessageReaction,
1314
SignInConstants,
1415
)
1516

1617
from .bot import Bot
1718
from .serializer_helper import serializer_helper
1819
from .bot_framework_adapter import BotFrameworkAdapter
19-
from .invoke_response import InvokeResponse
2020
from .turn_context import TurnContext
2121

2222

libraries/botbuilder-core/botbuilder/core/bot_adapter.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ class BotAdapter(ABC):
1717
BOT_OAUTH_SCOPE_KEY = "botbuilder.core.BotAdapter.OAuthScope"
1818
BOT_CONNECTOR_CLIENT_KEY = "ConnectorClient"
1919
BOT_CALLBACK_HANDLER_KEY = "BotCallbackHandler"
20+
_INVOKE_RESPONSE_KEY = "BotFrameworkAdapter.InvokeResponse"
2021

2122
def __init__(
2223
self, on_turn_error: Callable[[TurnContext, Exception], Awaitable] = None

libraries/botbuilder-core/botbuilder/core/bot_framework_adapter.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
ConversationParameters,
4848
ConversationReference,
4949
ExpectedReplies,
50+
InvokeResponse,
5051
TokenResponse,
5152
ResourceResponse,
5253
DeliveryModes,
@@ -60,7 +61,6 @@
6061
ExtendedUserTokenProvider,
6162
)
6263
from .turn_context import TurnContext
63-
from .invoke_response import InvokeResponse
6464
from .conversation_reference_extension import get_continuation_activity
6565

6666
USER_AGENT = f"Microsoft-BotFramework/3.1 (BotBuilder Python/{__version__})"
@@ -186,8 +186,6 @@ class BotFrameworkAdapter(
186186
upon the activity, both before and after the bot logic runs.
187187
"""
188188

189-
_INVOKE_RESPONSE_KEY = "BotFrameworkAdapter.InvokeResponse"
190-
191189
def __init__(self, settings: BotFrameworkAdapterSettings):
192190
"""
193191
Initializes a new instance of the :class:`BotFrameworkAdapter` class.

0 commit comments

Comments
 (0)