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.

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

Cloud adapter #1707

Merged
merged 33 commits into from
Jun 30, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
b31adf3
Cloud adapter auth abstract classes
axelsrz Jun 15, 2021
95f8dab
CloudAdapterBase
axelsrz Jun 16, 2021
c9fb7d8
BFAuthenticationFactory
axelsrz Jun 17, 2021
5357317
CloudAdapter implementation
axelsrz Jun 18, 2021
d790b58
CloudAdapter implementation
axelsrz Jun 18, 2021
d70c8ad
SkillHandler implementation and added CloudSkillHandler
axelsrz Jun 19, 2021
8725353
HttpClientFactory
msomanathan Jun 22, 2021
a52d0bf
HttpClientFactory
msomanathan Jun 22, 2021
a32528b
Merge branch 'main' into axsuarez/cloud-adapter
axelsrz Jun 22, 2021
38f8bb1
UserTokenClientImplementation
axelsrz Jun 22, 2021
3534da4
Solving merge conflicts
axelsrz Jun 22, 2021
9c25607
PasswordServiceClientCredentialFactory
axelsrz Jun 22, 2021
f8268bb
format
axelsrz Jun 22, 2021
afba4e2
BuiltInBotFrameworkAuthentication
msomanathan Jun 22, 2021
a75e4d0
Merge branch 'axsuarez/cloud-adapter' of https://github.com/microsoft…
msomanathan Jun 22, 2021
ac68844
ConnectorFactoryImplementation
axelsrz Jun 23, 2021
230434e
BotFrameworkAuthentication implementations
msomanathan Jun 23, 2021
e37b4ff
Merge branch 'axsuarez/cloud-adapter' of https://github.com/microsoft…
msomanathan Jun 23, 2021
1358bb9
BotFrameworkAuthenticationFactory
msomanathan Jun 23, 2021
54c0f84
Using async client in connector factory
axelsrz Jun 24, 2021
7d9ceae
HttpClientFactory implementation with extracted integration logic, Co…
axelsrz Jun 24, 2021
4a157eb
ConfigurationBotFrameworkAuthentication
msomanathan Jun 25, 2021
72381b0
Fix check for claims issuer
msomanathan Jun 25, 2021
1502dc5
Solving circular dependencies
axelsrz Jun 28, 2021
487b15e
CloudAdapter no auth scenario working
axelsrz Jun 28, 2021
65d1842
Password scenario fully working, ouath schenario fully working
axelsrz Jun 29, 2021
20d1426
Merge branch 'main' into axsuarez/cloud-adapter
axelsrz Jun 29, 2021
fdca912
fixing tests
axelsrz Jun 29, 2021
5ece7ea
Merge branch 'axsuarez/cloud-adapter' of https://github.com/microsoft…
axelsrz Jun 29, 2021
6005c40
Pylint and minor fixes
axelsrz Jun 29, 2021
e469f3b
Merge branch 'main' into axsuarez/cloud-adapter
axelsrz Jun 29, 2021
2a5106c
Exporting connector.skills
axelsrz Jun 29, 2021
de96608
Merge branch 'axsuarez/cloud-adapter' of https://github.com/microsoft…
axelsrz Jun 29, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion libraries/botbuilder-core/botbuilder/core/__init__.py
Expand Up @@ -4,6 +4,8 @@
# Licensed under the MIT License. See License.txt in the project root for
# license information.
# --------------------------------------------------------------------------
from botbuilder.schema import InvokeResponse

from . import conversation_reference_extension

from .about import __version__
Expand All @@ -18,12 +20,13 @@
from .bot_telemetry_client import BotTelemetryClient, Severity
from .card_factory import CardFactory
from .channel_service_handler import BotActionNotImplementedError, ChannelServiceHandler
from .cloud_adapter_base import CloudAdapterBase
from .cloud_channel_service_handler import CloudChannelServiceHandler
from .component_registration import ComponentRegistration
from .conversation_state import ConversationState
from .oauth.extended_user_token_provider import ExtendedUserTokenProvider
from .oauth.user_token_provider import UserTokenProvider
from .intent_score import IntentScore
from .invoke_response import InvokeResponse
from .memory_storage import MemoryStorage
from .memory_transcript_store import MemoryTranscriptStore
from .message_factory import MessageFactory
Expand Down Expand Up @@ -63,6 +66,8 @@
"calculate_change_hash",
"CardFactory",
"ChannelServiceHandler",
"CloudAdapterBase",
"CloudChannelServiceHandler",
"ComponentRegistration",
"ConversationState",
"conversation_reference_extension",
Expand Down
Expand Up @@ -9,14 +9,14 @@
AdaptiveCardInvokeResponse,
AdaptiveCardInvokeValue,
ChannelAccount,
InvokeResponse,
MessageReaction,
SignInConstants,
)

from .bot import Bot
from .serializer_helper import serializer_helper
from .bot_framework_adapter import BotFrameworkAdapter
from .invoke_response import InvokeResponse
from .turn_context import TurnContext


Expand Down
1 change: 1 addition & 0 deletions libraries/botbuilder-core/botbuilder/core/bot_adapter.py
Expand Up @@ -17,6 +17,7 @@ class BotAdapter(ABC):
BOT_OAUTH_SCOPE_KEY = "botbuilder.core.BotAdapter.OAuthScope"
BOT_CONNECTOR_CLIENT_KEY = "ConnectorClient"
BOT_CALLBACK_HANDLER_KEY = "BotCallbackHandler"
_INVOKE_RESPONSE_KEY = "BotFrameworkAdapter.InvokeResponse"

def __init__(
self, on_turn_error: Callable[[TurnContext, Exception], Awaitable] = None
Expand Down
Expand Up @@ -47,6 +47,7 @@
ConversationParameters,
ConversationReference,
ExpectedReplies,
InvokeResponse,
TokenResponse,
ResourceResponse,
DeliveryModes,
Expand All @@ -60,7 +61,6 @@
ExtendedUserTokenProvider,
)
from .turn_context import TurnContext
from .invoke_response import InvokeResponse
from .conversation_reference_extension import get_continuation_activity

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

_INVOKE_RESPONSE_KEY = "BotFrameworkAdapter.InvokeResponse"

def __init__(self, settings: BotFrameworkAdapterSettings):
"""
Initializes a new instance of the :class:`BotFrameworkAdapter` class.
Expand Down