Merge branch 'master' into axsuarez/integration-and-skills-tests

Author: johnataylor

libraries/botbuilder-ai/botbuilder/ai/qna/models/generate_answer_request_body.py

@@ -7,6 +7,7 @@
 
 from .metadata import Metadata
 from .qna_request_context import QnARequestContext
+from .ranker_types import RankerTypes
 
 
 class GenerateAnswerRequestBody(Model):
@@ -19,6 +20,8 @@ class GenerateAnswerRequestBody(Model):
         "strict_filters": {"key": "strictFilters", "type": "[Metadata]"},
         "context": {"key": "context", "type": "QnARequestContext"},
         "qna_id": {"key": "qnaId", "type": "int"},
+        "is_test": {"key": "isTest", "type": "bool"},
+        "ranker_type": {"key": "rankerType", "type": "RankerTypes"},
     }
 
     def __init__(
@@ -29,6 +32,8 @@ def __init__(
         strict_filters: List[Metadata],
         context: QnARequestContext = None,
         qna_id: int = None,
+        is_test: bool = False,
+        ranker_type: str = RankerTypes.DEFAULT,
         **kwargs
     ):
         """
@@ -47,6 +52,10 @@ def __init__(
 
         qna_id: Id of the current question asked.
 
+        is_test: (Optional) A value indicating whether to call test or prod environment of knowledgebase.
+
+        ranker_types: (Optional) Ranker types.
+
         """
 
         super().__init__(**kwargs)
@@ -57,3 +66,5 @@ def __init__(
         self.strict_filters = strict_filters
         self.context = context
         self.qna_id = qna_id
+        self.is_test = is_test
+        self.ranker_type = ranker_type

libraries/botbuilder-ai/botbuilder/ai/qna/models/qnamaker_trace_info.py

@@ -7,6 +7,7 @@
 from .metadata import Metadata
 from .query_result import QueryResult
 from .qna_request_context import QnARequestContext
+from .ranker_types import RankerTypes
 
 
 class QnAMakerTraceInfo:
@@ -22,6 +23,8 @@ def __init__(
         strict_filters: List[Metadata],
         context: QnARequestContext = None,
         qna_id: int = None,
+        is_test: bool = False,
+        ranker_type: str = RankerTypes.DEFAULT,
     ):
         """
         Parameters:
@@ -42,6 +45,10 @@ def __init__(
         context: (Optional) The context from which the QnA was extracted.
 
         qna_id: (Optional) Id of the current question asked.
+
+        is_test: (Optional) A value indicating whether to call test or prod environment of knowledgebase.
+
+        ranker_types: (Optional) Ranker types.
         """
         self.message = message
         self.query_results = query_results
@@ -51,3 +58,5 @@ def __init__(
         self.strict_filters = strict_filters
         self.context = context
         self.qna_id = qna_id
+        self.is_test = is_test
+        self.ranker_type = ranker_type

libraries/botbuilder-ai/botbuilder/ai/qna/models/ranker_types.py

@@ -0,0 +1,15 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+
+class RankerTypes:
+
+    """ Default Ranker Behaviour. i.e. Ranking based on Questions and Answer. """
+
+    DEFAULT = "Default"
+
+    """ Ranker based on question Only. """
+    QUESTION_ONLY = "QuestionOnly"
+
+    """ Ranker based on Autosuggest for question field only. """
+    AUTO_SUGGEST_QUESTION = "AutoSuggestQuestion"

libraries/botbuilder-ai/botbuilder/ai/qna/qnamaker_options.py

@@ -2,6 +2,7 @@
 # Licensed under the MIT License.
 
 from .models import Metadata, QnARequestContext
+from .models.ranker_types import RankerTypes
 
 # figure out if 300 milliseconds is ok for python requests library...or 100000
 class QnAMakerOptions:
@@ -13,10 +14,14 @@ def __init__(
         strict_filters: [Metadata] = None,
         context: [QnARequestContext] = None,
         qna_id: int = None,
+        is_test: bool = False,
+        ranker_type: bool = RankerTypes.DEFAULT,
     ):
         self.score_threshold = score_threshold
         self.timeout = timeout
         self.top = top
         self.strict_filters = strict_filters or []
         self.context = context
         self.qna_id = qna_id
+        self.is_test = is_test
+        self.ranker_type = ranker_type

libraries/botbuilder-ai/botbuilder/ai/qna/utils/generate_answer_utils.py

@@ -139,6 +139,8 @@ def _hydrate_options(self, query_options: QnAMakerOptions) -> QnAMakerOptions:
 
             hydrated_options.context = query_options.context
             hydrated_options.qna_id = query_options.qna_id
+            hydrated_options.is_test = query_options.is_test
+            hydrated_options.ranker_type = query_options.ranker_type
 
         return hydrated_options
 
@@ -154,6 +156,8 @@ async def _query_qna_service(
             strict_filters=options.strict_filters,
             context=options.context,
             qna_id=options.qna_id,
+            is_test=options.is_test,
+            ranker_type=options.ranker_type,
         )
 
         http_request_helper = HttpRequestUtils(self._http_client)
@@ -178,6 +182,8 @@ async def _emit_trace_info(
             strict_filters=options.strict_filters,
             context=options.context,
             qna_id=options.qna_id,
+            is_test=options.is_test,
+            ranker_type=options.ranker_type,
         )
 
         trace_activity = Activity(

libraries/botbuilder-ai/tests/qna/test_data/QnaMaker_IsTest_true.json

@@ -0,0 +1,13 @@
+{
+    "activeLearningEnabled": true,
+    "answers": [
+      {
+        "questions": [],
+        "answer": "No good match found in KB.",
+        "score": 0,
+        "id": -1,
+        "source": null,
+        "metadata": []
+      }
+    ]
+  }

libraries/botbuilder-ai/tests/qna/test_data/QnaMaker_RankerType_QuestionOnly.json

@@ -0,0 +1,35 @@
+{
+    "activeLearningEnabled": false,
+    "answers": [
+      {
+        "questions": [
+          "Q1"
+        ],
+        "answer": "A1",
+        "score": 80,
+        "id": 15,
+        "source": "Editorial",
+        "metadata": [
+          {
+            "name": "topic",
+            "value": "value"
+          }
+        ]
+      },
+      {
+        "questions": [
+          "Q2"
+        ],
+        "answer": "A2",
+        "score": 78,
+        "id": 16,
+        "source": "Editorial",
+        "metadata": [
+          {
+            "name": "topic",
+            "value": "value"
+          }
+        ]
+      }
+    ]
+  }

libraries/botbuilder-ai/tests/qna/test_qna.py

@@ -702,6 +702,38 @@ async def test_should_filter_low_score_variation(self):
                 "Should have 3 filtered answers after low score variation.",
             )
 
+    async def test_should_answer_with_is_test_true(self):
+        options = QnAMakerOptions(top=1, is_test=True)
+        qna = QnAMaker(QnaApplicationTest.tests_endpoint)
+        question: str = "Q11"
+        context = QnaApplicationTest._get_context(question, TestAdapter())
+        response_json = QnaApplicationTest._get_json_for_file(
+            "QnaMaker_IsTest_true.json"
+        )
+
+        with patch(
+            "aiohttp.ClientSession.post",
+            return_value=aiounittest.futurized(response_json),
+        ):
+            results = await qna.get_answers(context, options=options)
+            self.assertEqual(0, len(results), "Should have received zero answer.")
+
+    async def test_should_answer_with_ranker_type_question_only(self):
+        options = QnAMakerOptions(top=1, ranker_type="QuestionOnly")
+        qna = QnAMaker(QnaApplicationTest.tests_endpoint)
+        question: str = "Q11"
+        context = QnaApplicationTest._get_context(question, TestAdapter())
+        response_json = QnaApplicationTest._get_json_for_file(
+            "QnaMaker_RankerType_QuestionOnly.json"
+        )
+
+        with patch(
+            "aiohttp.ClientSession.post",
+            return_value=aiounittest.futurized(response_json),
+        ):
+            results = await qna.get_answers(context, options=options)
+            self.assertEqual(2, len(results), "Should have received two answers.")
+
     async def test_should_answer_with_prompts(self):
         options = QnAMakerOptions(top=2)
         qna = QnAMaker(QnaApplicationTest.tests_endpoint, options)

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

@@ -33,7 +33,7 @@ async def on_turn(self, turn_context: TurnContext):
         elif turn_context.activity.type == ActivityTypes.event:
             await self.on_event_activity(turn_context)
         elif turn_context.activity.type == ActivityTypes.end_of_conversation:
-            await self.on_end_of_conversation(turn_context)
+            await self.on_end_of_conversation_activity(turn_context)
         else:
             await self.on_unrecognized_activity_type(turn_context)
 
@@ -106,7 +106,7 @@ async def on_event(  # pylint: disable=unused-argument
     ):
         return
 
-    async def on_end_of_conversation(  # pylint: disable=unused-argument
+    async def on_end_of_conversation_activity(  # pylint: disable=unused-argument
         self, turn_context: TurnContext
     ):
         return

libraries/botbuilder-core/botbuilder/core/auto_save_state_middleware.py

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from typing import Awaitable, Callable, List, Union
 
 from .bot_state import BotState

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

@@ -38,6 +38,7 @@
 from .bot_adapter import BotAdapter
 from .turn_context import TurnContext
 from .user_token_provider import UserTokenProvider
+from .invoke_response import InvokeResponse
 from .conversation_reference_extension import get_continuation_activity
 
 USER_AGENT = f"Microsoft-BotFramework/3.1 (BotBuilder Python/{__version__})"
@@ -263,7 +264,17 @@ async def process_activity(self, req, auth_header: str, logic: Callable):
                     teams_channel_data["tenant"]["id"]
                 )
 
-        return await self.run_pipeline(context, logic)
+        await self.run_pipeline(context, logic)
+
+        if activity.type == ActivityTypes.invoke:
+            invoke_response = context.turn_state.get(
+                BotFrameworkAdapter._INVOKE_RESPONSE_KEY  # pylint: disable=protected-access
+            )
+            if invoke_response is None:
+                return InvokeResponse(status=501)
+            return invoke_response.value
+
+        return None
 
     async def authenticate_request(
         self, request: Activity, auth_header: str
@@ -283,7 +294,7 @@ async def authenticate_request(
         )
 
         if not claims.is_authenticated:
-            raise Exception("Unauthorized Access. Request is not authorized")
+            raise PermissionError("Unauthorized Access. Request is not authorized")
 
         return claims
 

libraries/botbuilder-core/botbuilder/core/bot_state_set.py

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from asyncio import wait
 from typing import List
 from .bot_state import BotState

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

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from aiohttp.web import (
     middleware,
     HTTPNotImplemented,

libraries/botbuilder-core/botbuilder/core/private_conversation_state.py

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from .bot_state import BotState
 from .turn_context import TurnContext
 from .storage import Storage

libraries/botbuilder-core/botbuilder/core/show_typing_middleware.py

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 import time
 from functools import wraps
 from typing import Awaitable, Callable

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

@@ -7,7 +7,7 @@
 
 from .teams_activity_handler import TeamsActivityHandler
 from .teams_info import TeamsInfo
-from .teams_helper import deserializer_helper
+from .teams_helper import deserializer_helper, serializer_helper
 from .teams_activity_extensions import (
     teams_get_channel_id,
     teams_get_team_info,
@@ -21,4 +21,5 @@
     "teams_get_channel_id",
     "teams_get_team_info",
     "teams_notify_user",
+    "serializer_helper",
 ]

libraries/botbuilder-core/botbuilder/core/teams/teams_activity_extensions.py

@@ -1,11 +1,10 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from botbuilder.schema import Activity
 from botbuilder.schema.teams import NotificationInfo, TeamsChannelData, TeamInfo
 
 
-def dummy():
-    return 1
-
-
 def teams_get_channel_id(activity: Activity) -> str:
     if not activity:
         return None