8000 4.5 cherry pick (#250) · aiedward/botbuilder-python@78e7431 · GitHub
[go: up one dir, main page]
Skip to content

Commit 78e7431

Browse files
axelsrzaxelsrz
authored
4.5 cherry pick (microsoft#250)
* fix for accepting_input * Axsuarez/corebot updates (microsoft#249) * tests for pr microsoft#246
1 parent 34988a8 commit 78e7431

28 files changed

+538
-241
lines changed

‎libraries/botbuilder-ai/botbuilder/ai/luis/__init__.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11
# Copyright (c) Microsoft Corporation. All rights reserved.
22
# Licensed under the MIT License.
33

4-
from .intent_score import IntentScore
54
from .luis_application import LuisApplication
65
from .luis_prediction_options import LuisPredictionOptions
76
from .luis_telemetry_constants import LuisTelemetryConstants
8-
from .recognizer_result import RecognizerResult, TopIntent
97
from .luis_recognizer import LuisRecognizer
108

119
__all__ = [
12-
"IntentScore",
1310
"LuisApplication",
1411
"LuisPredictionOptions",
1512
"LuisRecognizer",
16-
"LuisTelemetryConstants",
17-
"RecognizerResult",
18-
"TopIntent",
13+
"LuisTelemetryConstants"
1914
]

‎libraries/botbuilder-ai/botbuilder/ai/luis/intent_score.py

Lines changed: 0 additions & 14 deletions
This file was deleted.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@
1111
from botbuilder.core import (
1212
BotAssert,
1313
BotTelemetryClient,
14+
IntentScore,
1415
NullTelemetryClient,
16+
RecognizerResult,
1517
TurnContext,
1618
)
1719
from botbuilder.schema import Activity, ActivityTypes, ChannelAccount
1820

1921
from . import (
20-
IntentScore,
2122
LuisApplication,
2223
LuisPredictionOptions,
2324
LuisTelemetryConstants,
24-
RecognizerResult,
2525
)
2626
from .activity_util import ActivityUtil
2727
from .luis_util import LuisUtil

‎libraries/botbuilder-ai/botbuilder/ai/luis/luis_util.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
EntityModel,
1212
LuisResult,
1313
)
14+
from botbuilder.core import IntentScore, RecognizerResult
1415
from msrest import Serializer
1516

1617
from .. import __title__, __version__
17-
from . import IntentScore, RecognizerResult
1818

1919

2020
class LuisUtil:

‎libraries/botbuilder-ai/botbuilder/ai/luis/recognizer_result.py

Lines changed: 0 additions & 50 deletions
This file was deleted.

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,12 @@
1717
from requests.models import Response
1818

1919
from botbuilder.ai.luis import (
20-
IntentScore,
2120
LuisApplication,
2221
LuisPredictionOptions,
2322
LuisRecognizer,
24-
RecognizerResult,
25-
TopIntent,
2623
)
2724
from botbuilder.ai.luis.luis_util import LuisUtil
28-
from botbuilder.core import BotAdapter, BotTelemetryClient, TurnContext
25+
from botbuilder.core import BotAdapter, BotTelemetryClient, IntentScore, RecognizerResult, TopIntent, TurnContext
2926
from botbuilder.core.adapters import TestAdapter
3027
from botbuilder.schema import (
3128
Activity,

‎libraries/botbuilder-ai/tests/luis/override_fill_recognizer.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
from typing import Dict
55

6-
from botbuilder.ai.luis import LuisRecognizer, LuisTelemetryConstants, RecognizerResult
7-
from botbuilder.core import TurnContext
6+
from botbuilder.ai.luis import LuisRecognizer, LuisTelemetryConstants
7+
from botbuilder.core import RecognizerResult, TurnContext
88

99

1010
class OverrideFillRecognizer(LuisRecognizer):

‎libraries/botbuilder-ai/tests/luis/telemetry_override_recognizer.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
from typing import Dict
55

6-
from botbuilder.ai.luis import LuisRecognizer, LuisTelemetryConstants, RecognizerResult
7-
from botbuilder.core import TurnContext
6+
from botbuilder.ai.luis import LuisRecognizer, LuisTelemetryConstants
7+
from botbuilder.core import RecognizerResult, TurnContext
88

99

1010
class TelemetryOverrideRecognizer(LuisRecognizer):

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,14 @@
1515
from .bot_telemetry_client import BotTelemetryClient
1616
from .card_factory import CardFactory
1717
from .conversation_state import ConversationState
18+
from .intent_score import IntentScore
1819
from .invoke_response import InvokeResponse
1920
from .memory_storage import MemoryStorage
2021
from .message_factory import MessageFactory
2122
from .middleware_set import AnonymousReceiveMiddleware, Middleware, MiddlewareSet
2223
from .null_telemetry_client import NullTelemetryClient
24+
from .recognizer import Recognizer
25+
from .recognizer_result import RecognizerResult, TopIntent
2326
from .state_property_accessor import StatePropertyAccessor
2427
from .state_property_info import StatePropertyInfo
2528
from .storage import Storage, StoreItem, calculate_change_hash
@@ -39,16 +42,20 @@
3942
'CardFactory',
4043
'ConversationState',
4144
'conversation_reference_extension',
45+
'IntentScore',
4246
'InvokeResponse',
4347
'MemoryStorage',
4448
'MessageFactory',
4549
'Middleware',
4650
'MiddlewareSet',
4751
'NullTelemetryClient',
52+
'Recognizer',
53+
'RecognizerResult',
4854
'StatePropertyAccessor',
4955
'StatePropertyInfo',
5056
'Storage',
5157
'StoreItem',
58+
'TopIntent',
5259
'TurnContext',
5360
'UserState',
5461
'UserTokenProvider',

‎libraries/botbuilder-core/botbuilder/core/intent_score.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Copyright (c) Microsoft Corporation. All rights reserved.
2+
# Licensed under the MIT License.
3+
4+
from msrest.serialization import Model
5+
from typing import Dict
6+
7+
8+
class IntentScore(Model):
9+
_attribute_map = {
10+
'score': {'key': 'score', 'type': 'float'},
11+
'properties': {'key': 'properties', 'type': '{object}'},
12+
}
13+
14+
def __init__(self, score: float = None, properties: Dict[str, object] = {}, **kwargs):
15+
super(IntentScore, self).__init__(**kwargs)
16+
self.score = score
17+
self.properties = properties

0 commit comments

Comments
 (0)
0