Moved BFHtppClient and ChannelServiceHandler

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

@@ -17,9 +17,11 @@
 from .bot_state_set import BotStateSet
 from .bot_telemetry_client import BotTelemetryClient, Severity
 from .card_factory import CardFactory
+from .channel_service_handler import BotActionNotImplementedError, ChannelServiceHandler
 from .conversation_state import ConversationState
 from .intent_score import IntentScore
 from .invoke_response import InvokeResponse
+from .bot_framework_http_client import BotFrameworkHttpClient
 from .memory_storage import MemoryStorage
 from .memory_transcript_store import MemoryTranscriptStore
 from .message_factory import MessageFactory
@@ -44,6 +46,7 @@
     "AnonymousReceiveMiddleware",
     "AutoSaveStateMiddleware",
     "Bot",
+    "BotActionNotImplementedError",
     "BotAdapter",
     "BotAssert",
     "BotFrameworkAdapter",
@@ -53,10 +56,12 @@
     "BotTelemetryClient",
     "calculate_change_hash",
     "CardFactory",
+    "ChannelServiceHandler",
     "ConversationState",
     "conversation_reference_extension",
     "IntentScore",
     "InvokeResponse",
+    "BotFrameworkHttpClient",
     "MemoryStorage",
     "MemoryTranscriptStore",
     "MessageFactory",

libraries/botbuilder-core/botbuilder/core/integration/bot_framework_http_client.py → libraries/botbuilder-core/botbuilder/core/bot_framework_http_client.py

@@ -6,7 +6,6 @@
 from logging import Logger
 import aiohttp
 
-from botbuilder.core import InvokeResponse
 from botbuilder.schema import Activity
 from botframework.connector.auth import (
     ChannelProvider,
@@ -15,6 +14,8 @@
     MicrosoftAppCredentials,
 )
 
+from . import InvokeResponse
+
 
 class BotFrameworkHttpClient:
 

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

@@ -6,14 +6,9 @@
 # --------------------------------------------------------------------------
 
 from .aiohttp_channel_service import aiohttp_channel_service_routes
-from .bot_framework_http_client import BotFrameworkHttpClient
-from .channel_service_handler import BotActionNotImplementedError, ChannelServiceHandler
 from .aiohttp_channel_service_exception_middleware import aiohttp_error_middleware
 
 __all__ = [
     "aiohttp_channel_service_routes",
-    "BotFrameworkHttpClient",
-    "BotActionNotImplementedError",
-    "ChannelServiceHandler",
     "aiohttp_error_middleware",
 ]

libraries/botbuilder-core/botbuilder/core/integration/aiohttp_channel_service.py

@@ -13,7 +13,7 @@
     Transcript,
 )
 
-from .channel_service_handler import ChannelServiceHandler
+from botbuilder.core import ChannelServiceHandler
 
 
 async def deserialize_from_body(

libraries/botbuilder-core/botbuilder/core/integration/aiohttp_channel_service_exception_middleware.py

@@ -6,7 +6,7 @@
     HTTPInternalServerError,
 )
 
-from .channel_service_handler import BotActionNotImplementedError
+from botbuilder.core import BotActionNotImplementedError
 
 
 @middleware

libraries/botbuilder-core/botbuilder/core/skills/skill_handler.py

@@ -3,8 +3,7 @@
 
 from uuid import uuid4
 
-from botbuilder.core.integration import ChannelServiceHandler
-from botbuilder.core import Bot, BotAdapter, TurnContext
+from botbuilder.core import Bot, BotAdapter, ChannelServiceHandler, TurnContext
 from botbuilder.schema import (
     Activity,
     ActivityTypes,

samples/experimental/skills-prototypes/simple-bot-to-bot/simple-root-bot/app.py

@@ -9,13 +9,13 @@
 from aiohttp.web import Request, Response
 from botbuilder.core import (
     BotFrameworkAdapterSettings,
+    BotFrameworkHttpClient,
     ConversationState,
     MemoryStorage,
     TurnContext,
     BotFrameworkAdapter,
 )
 from botbuilder.core.integration import (
-    BotFrameworkHttpClient,
     aiohttp_channel_service_routes,
     aiohttp_error_middleware,
 )

samples/experimental/skills-prototypes/simple-bot-to-bot/simple-root-bot/bots/root_bot.py

@@ -2,11 +2,11 @@
 
 from botbuilder.core import (
     ActivityHandler,
+    BotFrameworkHttpClient,
     ConversationState,
     MessageFactory,
     TurnContext,
 )
-from botbuilder.core.integration import BotFrameworkHttpClient
 from botbuilder.core.skills import SkillConversationIdFactory
 
 from botbuilder.schema import ActivityTypes, ChannelAccount

samples/experimental/test-protocol/app.py

@@ -5,7 +5,8 @@
 from aiohttp.web import Request, Response
 
 from botframework.connector.auth import AuthenticationConfiguration, SimpleCredentialProvider
-from botbuilder.core.integration import BotFrameworkHttpClient, aiohttp_channel_service_routes
+from botbuilder.core import BotFrameworkHttpClient
+from botbuilder.core.integration import aiohttp_channel_service_routes
 from botbuilder.schema import Activity
 
 from config import DefaultConfig

samples/experimental/test-protocol/routing_handler.py

@@ -3,7 +3,7 @@
 
 from typing import List
 
-from botbuilder.core.integration import ChannelServiceHandler
+from botbuilder.core import ChannelServiceHandler
 from botbuilder.schema import (
     Activity,
     ChannelAccount,