Merge branch 'master' into daveta-appinsights-sample

Author: daveta

.gitignore

@@ -4,6 +4,7 @@ __pycache__/
 
 # Virtual environment
 env*/
+venv*/
 
 # PTVS analysis
 .ptvs/

.travis.yml

@@ -0,0 +1,84 @@
+
+============================
+BotBuilder-AI SDK for Python
+============================
+
+.. image:: https://fuselabs.visualstudio.com/SDK_v4/_apis/build/status/Python/SDK_v4-Python-CI?branchName=master
+   :target:  https://fuselabs.visualstudio.com/SDK_v4/_apis/build/status/Python/SDK_v4-Python-CI
+   :align: right
+   :alt: Azure DevOps status for master branch
+.. image:: https://badge.fury.io/py/botbuilder-ai.svg
+   :target: https://badge.fury.io/py/botbuilder-ai
+   :alt: Latest PyPI package version
+
+Cognitive services extensions for Microsoft BotBuilder.
+
+
+How to Install
+==============
+
+.. code-block:: python
+  
+  pip install botbuilder-ai
+
+
+Documentation/Wiki
+==================
+
+You can find more information on the botbuilder-python project by visiting our `Wiki`_.
+
+Requirements
+============
+
+* `Python >= 3.7.0`_
+
+
+Source Code
+===========
+The latest developer version is available in a github repository:
+https://github.com/Microsoft/botbuilder-python/
+
+
+Contributing
+============
+
+This project welcomes contributions and suggestions.  Most contributions require you to agree to a
+Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us
+the rights to use your contribution. For details, visit https://cla.microsoft.com.
+
+When you submit a pull request, a CLA-bot will automatically determine whether you need to provide
+a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the instructions
+provided by the bot. You will only need to do this once across all repos using our CLA.
+
+This project has adopted the `Microsoft Open Source Code of Conduct`_.
+For more information see the `Code of Conduct FAQ`_ or
+contact `[email protected]`_ with any additional questions or comments.
+
+Reporting Security Issues
+=========================
+
+Security issues and bugs should be reported privately, via email, to the Microsoft Security
+Response Center (MSRC) at `[email protected]`_. You should
+receive a response within 24 hours. If for some reason you do not, please follow up via
+email to ensure we received your original message. Further information, including the
+`MSRC PGP`_ key, can be found in
+the `Security TechCenter`_.
+
+License
+=======
+
+Copyright (c) Microsoft Corporation. All rights reserved.
+
+Licensed under the MIT_ License.
+
+.. _Wiki: https://github.com/Microsoft/botbuilder-python/wiki
+.. _Python >= 3.7.0: https://www.python.org/downloads/
+.. _MIT: https://github.com/Microsoft/vscode/blob/master/LICENSE.txt
+.. _Microsoft Open Source Code of Conduct: https://opensource.microsoft.com/codeofconduct/
+.. _Code of Conduct FAQ: https://opensource.microsoft.com/codeofconduct/faq/
+.. _[email protected]: mailto:[email protected]
+.. _[email protected]: mailto:[email protected]
+.. _MSRC PGP: https://technet.microsoft.com/en-us/security/dn606155
+.. _Security TechCenter: https://github.com/Microsoft/vscode/blob/master/LICENSE.txt
+
+.. <https://technet.microsoft.com/en-us/security/default>`_

libraries/botbuilder-ai/README.rst

@@ -154,6 +154,7 @@ async def recognize(
         turn_context: TurnContext,
         telemetry_properties: Dict[str, str] = None,
         telemetry_metrics: Dict[str, float] = None,
+        luis_prediction_options: LuisPredictionOptions = None
     ) -> RecognizerResult:
         """Return results of the analysis (Suggested actions and intents).
         
@@ -168,7 +169,7 @@ async def recognize(
         """
 
         return await self._recognize_internal(
-            turn_context, telemetry_properties, telemetry_metrics
+            turn_context, telemetry_properties, telemetry_metrics, luis_prediction_options
         )
 
     def on_recognizer_result(
@@ -288,6 +289,7 @@ async def _recognize_internal(
         turn_context: TurnContext,
         telemetry_properties: Dict[str, str],
         telemetry_metrics: Dict[str, float],
+        luis_prediction_options: LuisPredictionOptions = None
     ) -> RecognizerResult:
 
         BotAssert.context_not_none(turn_context)
@@ -299,6 +301,11 @@ async def _recognize_internal(
         recognizer_result: RecognizerResult = None
         luis_result: LuisResult = None
 
+        if luis_prediction_options:
+            options = self._merge_options(luis_prediction_options)
+        else: 
+            options = self._options
+
         if not utterance or utterance.isspace():
             recognizer_result = RecognizerResult(
                 text=utterance, intents={"": IntentScore(score=1.0)}, entities={}
@@ -307,12 +314,12 @@ async def _recognize_internal(
             luis_result = self._runtime.prediction.resolve(
                 self._application.application_id,
                 utterance,
-                timezone_offset=self._options.timezone_offset,
-                verbose=self._options.include_all_intents,
-                staging=self._options.staging,
-                spell_check=self._options.spell_check,
-                bing_spell_check_subscription_key=self._options.bing_spell_check_subscription_key,
-                log=self._options.log if self._options.log is not None else True,
+                timezone_offset=options.timezone_offset,
+                verbose=options.include_all_intents,
+                staging=options.staging,
+                spell_check=options.spell_check,
+                bing_spell_check_subscription_key=options.bing_spell_check_subscription_key,
+                log=options.log if options.log is not None else True,
             )
 
             recognizer_result = RecognizerResult(
@@ -322,8 +329,8 @@ async def _recognize_internal(
                 entities=LuisUtil.extract_entities_and_metadata(
                     luis_result.entities,
                     luis_result.composite_entities,
-                    self._options.include_instance_data
-                    if self._options.include_instance_data is not None
+                    options.include_instance_data
+                    if options.include_instance_data is not None
                     else True,
                 ),
             )
@@ -336,7 +343,7 @@ async def _recognize_internal(
             recognizer_result, turn_context, telemetry_properties, telemetry_metrics
         )
 
-        await self._emit_trace_info(turn_context, luis_result, recognizer_result)
+        await self._emit_trace_info(turn_context, luis_result, recognizer_result, options)
 
         return recognizer_result
 
@@ -345,11 +352,12 @@ async def _emit_trace_info(
         turn_context: TurnContext,
         luis_result: LuisResult,
         recognizer_result: RecognizerResult,
+        options: LuisPredictionOptions
     ) -> None:
         trace_info: Dict[str, object] = {
             "recognizerResult": LuisUtil.recognizer_result_as_dict(recognizer_result),
             "luisModel": {"ModelID": self._application.application_id},
-            "luisOptions": {"Staging": self._options.staging},
+            "luisOptions": {"Staging": options.staging},
             "luisResult": LuisUtil.luis_result_as_dict(luis_result),
         }
 
@@ -362,3 +370,11 @@ async def _emit_trace_info(
         )
 
         await turn_context.send_activity(trace_activity)
+
+    def _merge_options(
+        self,
+        user_defined_options: LuisPredictionOptions
+    ) -> LuisPredictionOptions:
+        merged_options = LuisPredictionOptions()
+        merged_options.__dict__.update(user_defined_options.__dict__)
+        return merged_options

libraries/botbuilder-ai/botbuilder/ai/luis/luis_recognizer.py

@@ -22,21 +22,25 @@
     info = f.read()
     exec(info, package_info)
 
+with open(os.path.join(root, 'README.rst'), encoding='utf-8') as f:
+    long_description = f.read()
+
 setup(
     name=package_info["__title__"],
     version=package_info["__version__"],
     url=package_info["__uri__"],
     author=package_info["__author__"],
     description=package_info["__description__"],
     keywords="botbuilder-ai LUIS QnAMaker bots ai botframework botbuilder",
-    long_description=package_info["__summary__"],
+    long_description=long_description,
+    long_description_content_type='text/x-rst',
     license=package_info["__license__"],
     packages=["botbuilder.ai", "botbuilder.ai.qna", "botbuilder.ai.luis"],
     install_requires=REQUIRES + TESTS_REQUIRES,
     tests_require=TESTS_REQUIRES,
     include_package_data=True,
     classifiers=[
-        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",

libraries/botbuilder-ai/setup.py

@@ -635,6 +635,42 @@ async def test_telemetry_no_override_async(self):
         self.assertTrue("fromId" in call0_args[1])
         self.assertTrue("entities" in call0_args[1])
 
+    def test_pass_luis_prediction_options_to_recognizer(self):
+        # Arrange
+        my_app = LuisApplication(
+            LuisRecognizerTest._luisAppId,
+            LuisRecognizerTest._subscriptionKey,
+            endpoint=None,
+        )
+
+        luis_prediction_options = LuisPredictionOptions(
+            log_personal_information=True, include_all_intents=True, include_instance_data=True
+        )
+
+        # Assert
+        recognizer = LuisRecognizer(my_app)
+        merged_options = recognizer._merge_options(luis_prediction_options)
+        self.assertTrue(merged_options.log_personal_information)
+        self.assertTrue(merged_options.include_all_intents)
+        self.assertTrue(merged_options.include_instance_data)
+        self.assertFalse(recognizer._options.log_personal_information)
+        self.assertFalse(recognizer._options.include_all_intents)
+        self.assertFalse(recognizer._options.include_instance_data)
+
+    def test_dont_pass_luis_prediction_options_to_recognizer(self):
+        # Arrange
+        my_app = LuisApplication(
+            LuisRecognizerTest._luisAppId,
+            LuisRecognizerTest._subscriptionKey,
+            endpoint=None,
+        )
+
+        # Assert
+        recognizer = LuisRecognizer(my_app)
+        self.assertFalse(recognizer._options.log_personal_information)
+        self.assertFalse(recognizer._options.include_all_intents)
+        self.assertFalse(recognizer._options.include_instance_data)
+
     async def test_composite1(self):
         await self._test_json("Composite1.json")
 

libraries/botbuilder-ai/tests/luis/luis_recognizer_test.py

@@ -7,8 +7,8 @@ BotBuilder-ApplicationInsights SDK for Python
    :target:  https://fuselabs.visualstudio.com/SDK_v4/_apis/build/status/Python/SDK_v4-Python-CI
    :align: right
    :alt: Azure DevOps status for master branch
-.. image:: https://badge.fury.io/py/botbuilder-core.svg
-   :target: https://badge.fury.io/py/botbuilder-core
+.. image:: https://badge.fury.io/py/botbuilder-applicationinsights.svg
+   :target: https://badge.fury.io/py/botbuilder-applicationinsights
    :alt: Latest PyPI package version
 
 Within the Bot Framework, BotBuilder-ApplicationInsights enables the Azure Application Insights service.
@@ -33,7 +33,7 @@ You can find more information on the botbuilder-python project by visiting our `
 Requirements
 ============
 
-* `Python >= 3.6.8`_
+* `Python >= 3.7.0`_
 
 
 Source Code
@@ -75,7 +75,7 @@ Copyright (c) Microsoft Corporation. All rights reserved.
 Licensed under the MIT_ License.
 
 .. _Wiki: https://github.com/Microsoft/botbuilder-python/wiki
-.. _Python >= 3.6.8: https://www.python.org/downloads/
+.. _Python >= 3.7.0: https://www.python.org/downloads/
 .. _MIT: https://github.com/Microsoft/vscode/blob/master/LICENSE.txt
 .. _Microsoft Open Source Code of Conduct: https://opensource.microsoft.com/codeofconduct/
 .. _Code of Conduct FAQ: https://opensource.microsoft.com/codeofconduct/faq/

libraries/botbuilder-applicationinsights/README.rst

@@ -9,7 +9,7 @@ Django generates *code* to create projects (`django-admin startproject`) and app
 
 File | | Description
 --- | ---
-all_tests.sh | Runs our current test matrix of python/django versions.  Current matrix is python (3.6) and django (2.2). 
+all_tests.sh | Runs our current test matrix of python/django versions.  Current matrix is python (3.7) and django (2.2). 
 README.md | This file.
 run_test.sh | Runs specific python/django version to create project, copy replacement files and runs tests.
 template.html | Template file

libraries/botbuilder-applicationinsights/django_tests/README.md

@@ -11,7 +11,7 @@ BASEDIR=$(pwd)
 
 # Django/python compatibility matrix...
 if $PYTHON -c "import sys; sys.exit(1 if (sys.version_info.major == 3 and sys.version_info.minor == 6) else 0)"; then
-    echo "[Error] Environment should be configured with Python 3.6!" 1>&2
+    echo "[Error] Environment should be configured with Python 3.7!" 1>&2
 	exit 2
 fi
 # Add more versions here (space delimited).

libraries/botbuilder-applicationinsights/django_tests/all_tests.sh

@@ -24,21 +24,25 @@
     info = f.read()
     exec(info, package_info)
 
+with open(os.path.join(root, 'README.rst'), encoding='utf-8') as f:
+    long_description = f.read()
+
 setup(
     name=package_info['__title__'],
     version=package_info['__version__'],
     url=package_info['__uri__'],
     author=package_info['__author__'],
     description=package_info['__description__'],
     keywords=['BotBuilderApplicationInsights', 'bots', 'ai', 'botframework', 'botbuilder'],
-    long_description=package_info['__summary__'],
+    long_description=long_description,
+    long_description_content_type='text/x-rst',
     license=package_info['__license__'],
     packages=['botbuilder.applicationinsights','botbuilder.applicationinsights.django' ],
     install_requires=REQUIRES + TESTS_REQUIRES,
     tests_require=TESTS_REQUIRES,
     include_package_data=True,
     classifiers=[
-        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',