microsoft · johnataylor · Feb 22, 2018 · Feb 22, 2018 · Feb 22, 2018 · Feb 22, 2018
diff --git a/libraries/botbuilder-ai/microsoft/__init__.py b/libraries/botbuilder-ai/microsoft/__init__.py
@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)
diff --git a/libraries/botbuilder-ai/microsoft/botbuilder/__init__.py b/libraries/botbuilder-ai/microsoft/botbuilder/__init__.py
@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)
diff --git a/libraries/botbuilder-ai/microsoft/botbuilder/ai/__init__.py b/libraries/botbuilder-ai/microsoft/botbuilder/ai/__init__.py
@@ -0,0 +1,16 @@
+# coding=utf-8
+#------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#------------------------------------------------------------------------
+
+from .language_map import LanguageMap
+from .qna_maker import QnAMaker, QnAMakerOptions, MetaData, QueryResult, QueryResults
+
+__all__ = ['LanguageMap',
+           'QnAMaker',
+           'QnAMakerOptions',
+           'MetaData',
+           'QueryResult',
+           'QueryResults']
diff --git a/libraries/botbuilder-ai/language_map.py → ...i/microsoft/botbuilder/ai/language_map.py b/libraries/botbuilder-ai/language_map.py → ...i/microsoft/botbuilder/ai/language_map.py
diff --git a/...lder-ai/microsoft/botbuilder/qna_maker.py → ...r-ai/microsoft/botbuilder/ai/qna_maker.py b/...lder-ai/microsoft/botbuilder/qna_maker.py → ...r-ai/microsoft/botbuilder/ai/qna_maker.py
@@ -10,8 +10,12 @@ class QnAMaker:
 
     def __init__(self, options, http_client):
 
-        self.__http_client = _http_client or raise TypeError('HTTP Client failed')
-        self.__options = options or raise TypeError('Options config error')
+        self.__http_client = _http_client or False
+        if not self.__http_client:
+            raise TypeError('HTTP Client failed')
+        self.__options = options or False
+        if not self.__options:
+            raise TypeError('Options config error')
 
         self.__answerUrl = "%s%s/generateanswer" % (__qnaMakerServiceEndpoint,options.knowledge_base_id)
 
@@ -29,7 +33,7 @@ def __init__(self, options, http_client):
 
     async def get_answers(question):        # HTTP call
         headers = {
-            __api_management_header : self.__options.subscription_key
+            __api_management_header : self.__options.subscription_key,
             "Content-Type" : __json_mime_type
         }
 

diff --git a/libraries/botbuilder-ai/requirements.txt b/libraries/botbuilder-ai/requirements.txt
diff --git a/libraries/botbuilder-ai/setup.cfg b/libraries/botbuilder-ai/setup.cfg
@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal=0
diff --git a/libraries/botbuilder-ai/setup.py b/libraries/botbuilder-ai/setup.py
@@ -0,0 +1,20 @@
+from setuptools import setup, find_packages
+
+setup(
+    name='microsoft-botbuilder-ai',
+    version='4.0.0-a0',
+    url='https://www.github.com/Microsoft/botbuilder-python',
+    long_description='Cognitive services extensions for Microsoft BotBuilder.',
+    license='MIT',
+    author='Microsoft',
+    author_email='bf-reports@microsoft.com',
+    description='',
+    packages=find_packages(),
+    classifiers=[
+        'Programming Language :: Python',
+        'Intended Audience :: Bot Developers',
+        'License :: OSI Approved :: MIT License',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python :: 3'
+    ]
+)
diff --git a/libraries/botbuilder/microsoft/botbuilder/__init__.py b/libraries/botbuilder/microsoft/botbuilder/__init__.py
@@ -6,21 +6,13 @@
 # --------------------------------------------------------------------------
 
 
-from .activity import ACTIVITY_TYPES, ATTACHMENT_LAYOUTS, END_OF_CONVERSATION_CODES, TEXT_FORMATS
 from .activity_adapter import ActivityAdapter
-from .card_styler import CardStyler, ContentTypes
 from .assertions import BotAssert
+from .bot_framework_adapter import BotFrameworkAdapter
+from .card_styler import CardStyler, ContentTypes
 
-__all__ = ['activity',
-           'activity_adapter',
-           'assertions',
-           'card_styler',
-           'ACTIVITY_TYPES',
-           'ATTACHMENT_LAYOUTS',
-           'END_OF_CONVERSATION_CODES',
-           'TEXT_FORMATS',
-           'ActivityAdapter',
+__all__ = ['ActivityAdapter',
+           'BotAssert',
+           'BotFrameworkAdapter',
            'CardStyler',
-           'ContentTypes',
-           'BotAssert']
-
+           'ContentTypes',]
diff --git a/libraries/botbuilder/microsoft/botbuilder/activity_adapter.py b/libraries/botbuilder/microsoft/botbuilder/activity_adapter.py
@@ -2,6 +2,8 @@
 # Licensed under the MIT License.
 
 from abc import ABC, abstractmethod
+from typing import List
+from microsoft.botbuilder.schema import Activity
 
 
 class ActivityAdapter(ABC):

diff --git a/libraries/botbuilder/microsoft/botbuilder/bot_framework_adapter.py b/libraries/botbuilder/microsoft/botbuilder/bot_framework_adapter.py
@@ -8,6 +8,7 @@
 from microsoft.botframework.connector.auth import (MicrosoftAppCredentials,
                                                    JwtTokenValidation, SimpleCredentialProvider)
 
+from .activity_adapter import ActivityAdapter
 
 class BotFrameworkAdapter(ActivityAdapter):
 

diff --git a/libraries/botbuilder/microsoft/botbuilder/card_styler.py b/libraries/botbuilder/microsoft/botbuilder/card_styler.py
@@ -2,11 +2,11 @@
 # Licensed under the MIT License.
 
 
-import enum
+from enum import Enum
 from copy import deepcopy
 
 
-class ContentTypes(enum):
+class ContentTypes(Enum):
     """List of content types for each card style."""
     adaptive_card = 'application/vnd.microsoft.card.adaptive'
     animation_card = 'application/vnd.microsoft.card.animation'

diff --git a/samples/Echo.Connector.Bot.Adapter/main.py b/samples/Echo.Connector.Bot.Adapter/main.py
@@ -5,7 +5,7 @@
 import json
 import asyncio
 from microsoft.botbuilder.schema import (Activity, ActivityTypes, ChannelAccount)
-from bot_framework_adapter import BotFrameworkAdapter
+from microsoft.botbuilder import BotFrameworkAdapter
 
 APP_ID = ''
 APP_PASSWORD = ''
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		__import__('pkg_resources').declare_namespace(__name__)