From 632661bf7568aaff90a60d0626d1bdeba63adefe Mon Sep 17 00:00:00 2001 From: Gary Pretty Date: Sun, 24 Nov 2019 06:05:43 +0000 Subject: [PATCH 1/4] Update README.md --- libraries/botbuilder-community-dialogs-prompts/README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libraries/botbuilder-community-dialogs-prompts/README.md b/libraries/botbuilder-community-dialogs-prompts/README.md index 4e1743f..9b85f71 100644 --- a/libraries/botbuilder-community-dialogs-prompts/README.md +++ b/libraries/botbuilder-community-dialogs-prompts/README.md @@ -2,13 +2,11 @@ This is a (currently experimental) suite of dialog prompts that uses Microsoft's recognizer text suite to recognize certain types of input during a dialog prompt. Microsoft's Bot Framework team has implemented a handful of prompts using recognizers from the recognizer text suite. This library is meant to fill the gaps. -> Currently, this library and subsequent PIP are experimental. Please use at your own risk. Feel free to test, debug, and submit pull requests if you come across any issues. - ## Installation You can install this library via PIP: - ## Coming soon + pip install botbuilder-community-dialogs-prompts ## Number with Unit From 094b3bacf8371a903a37f03c5fa047926eecc300 Mon Sep 17 00:00:00 2001 From: Gary Pretty Date: Sun, 24 Nov 2019 06:07:02 +0000 Subject: [PATCH 2/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bead3f5..9184e23 100644 --- a/README.md +++ b/README.md @@ -13,4 +13,4 @@ The following dialogs are currently available; | Name | Description | Sample | PIP | | ---- | ----------- | ------- | --- | -| [@botbuildercommunity/dialog-prompts](libraries/botbuilder-community-dialogs-prompts/README.md) | A variety of prompts using the [Microsoft Recognizers Text](https://github.com/microsoft/Recognizers-Text) suite, such as currency, temperature, age and dimension. | coming soon | coming soon | +| [@botbuildercommunity/dialog-prompts](libraries/botbuilder-community-dialogs-prompts/README.md) | A variety of prompts using the [Microsoft Recognizers Text](https://github.com/microsoft/Recognizers-Text) suite, such as currency, temperature, age and dimension. | coming soon | https://pypi.org/project/botbuilder-community-dialogs-prompts/0.1.1/ | From 14d8652f810972a22eee6964f92eea546b667e3a Mon Sep 17 00:00:00 2001 From: Gary Pretty Date: Sun, 24 Nov 2019 06:07:49 +0000 Subject: [PATCH 3/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9184e23..86ce411 100644 --- a/README.md +++ b/README.md @@ -13,4 +13,4 @@ The following dialogs are currently available; | Name | Description | Sample | PIP | | ---- | ----------- | ------- | --- | -| [@botbuildercommunity/dialog-prompts](libraries/botbuilder-community-dialogs-prompts/README.md) | A variety of prompts using the [Microsoft Recognizers Text](https://github.com/microsoft/Recognizers-Text) suite, such as currency, temperature, age and dimension. | coming soon | https://pypi.org/project/botbuilder-community-dialogs-prompts/0.1.1/ | +| [@botbuildercommunity/dialog-prompts](libraries/botbuilder-community-dialogs-prompts/README.md) | A variety of prompts using the [Microsoft Recognizers Text](https://github.com/microsoft/Recognizers-Text) suite, such as currency, temperature, age and dimension. | coming soon | [botbuilder-community-dialogs-prompts](https://pypi.org/project/botbuilder-community-dialogs-prompts/) | From 7bb343a092b3afa4e4243ef06b0678dcdba9ece0 Mon Sep 17 00:00:00 2001 From: Gary Pretty Date: Sun, 24 Nov 2019 15:09:28 +0000 Subject: [PATCH 4/4] Updates to resolve import issues --- .../community/dialogs/prompts}/__init__.py | 0 .../{source => botbuilder/community/dialogs/prompts}/about.py | 0 .../community/dialogs/prompts}/email_prompt.py | 0 .../community/dialogs/prompts}/guid_prompt.py | 0 .../community/dialogs/prompts}/internet_protocol_prompt.py | 0 .../community/dialogs/prompts}/number_with_type_prompt.py | 0 .../community/dialogs/prompts}/number_with_unit_prompt.py | 0 .../community/dialogs/prompts}/phone_prompt.py | 0 libraries/botbuilder-community-dialogs-prompts/setup.py | 4 ++-- .../test/test_email_prompt.py | 2 +- .../test/test_guid_prompt.py | 2 +- .../test/test_internet_protocol_prompt.py | 2 +- .../test/test_number_with_type_prompt.py | 2 +- .../test/test_number_with_unit_prompt.py | 2 +- .../test/test_phone_prompt.py | 2 +- 15 files changed, 8 insertions(+), 8 deletions(-) rename libraries/botbuilder-community-dialogs-prompts/{source => botbuilder/community/dialogs/prompts}/__init__.py (100%) rename libraries/botbuilder-community-dialogs-prompts/{source => botbuilder/community/dialogs/prompts}/about.py (100%) rename libraries/botbuilder-community-dialogs-prompts/{source => botbuilder/community/dialogs/prompts}/email_prompt.py (100%) rename libraries/botbuilder-community-dialogs-prompts/{source => botbuilder/community/dialogs/prompts}/guid_prompt.py (100%) rename libraries/botbuilder-community-dialogs-prompts/{source => botbuilder/community/dialogs/prompts}/internet_protocol_prompt.py (100%) rename libraries/botbuilder-community-dialogs-prompts/{source => botbuilder/community/dialogs/prompts}/number_with_type_prompt.py (100%) rename libraries/botbuilder-community-dialogs-prompts/{source => botbuilder/community/dialogs/prompts}/number_with_unit_prompt.py (100%) rename libraries/botbuilder-community-dialogs-prompts/{source => botbuilder/community/dialogs/prompts}/phone_prompt.py (100%) diff --git a/libraries/botbuilder-community-dialogs-prompts/source/__init__.py b/libraries/botbuilder-community-dialogs-prompts/botbuilder/community/dialogs/prompts/__init__.py similarity index 100% rename from libraries/botbuilder-community-dialogs-prompts/source/__init__.py rename to libraries/botbuilder-community-dialogs-prompts/botbuilder/community/dialogs/prompts/__init__.py diff --git a/libraries/botbuilder-community-dialogs-prompts/source/about.py b/libraries/botbuilder-community-dialogs-prompts/botbuilder/community/dialogs/prompts/about.py similarity index 100% rename from libraries/botbuilder-community-dialogs-prompts/source/about.py rename to libraries/botbuilder-community-dialogs-prompts/botbuilder/community/dialogs/prompts/about.py diff --git a/libraries/botbuilder-community-dialogs-prompts/source/email_prompt.py b/libraries/botbuilder-community-dialogs-prompts/botbuilder/community/dialogs/prompts/email_prompt.py similarity index 100% rename from libraries/botbuilder-community-dialogs-prompts/source/email_prompt.py rename to libraries/botbuilder-community-dialogs-prompts/botbuilder/community/dialogs/prompts/email_prompt.py diff --git a/libraries/botbuilder-community-dialogs-prompts/source/guid_prompt.py b/libraries/botbuilder-community-dialogs-prompts/botbuilder/community/dialogs/prompts/guid_prompt.py similarity index 100% rename from libraries/botbuilder-community-dialogs-prompts/source/guid_prompt.py rename to libraries/botbuilder-community-dialogs-prompts/botbuilder/community/dialogs/prompts/guid_prompt.py diff --git a/libraries/botbuilder-community-dialogs-prompts/source/internet_protocol_prompt.py b/libraries/botbuilder-community-dialogs-prompts/botbuilder/community/dialogs/prompts/internet_protocol_prompt.py similarity index 100% rename from libraries/botbuilder-community-dialogs-prompts/source/internet_protocol_prompt.py rename to libraries/botbuilder-community-dialogs-prompts/botbuilder/community/dialogs/prompts/internet_protocol_prompt.py diff --git a/libraries/botbuilder-community-dialogs-prompts/source/number_with_type_prompt.py b/libraries/botbuilder-community-dialogs-prompts/botbuilder/community/dialogs/prompts/number_with_type_prompt.py similarity index 100% rename from libraries/botbuilder-community-dialogs-prompts/source/number_with_type_prompt.py rename to libraries/botbuilder-community-dialogs-prompts/botbuilder/community/dialogs/prompts/number_with_type_prompt.py diff --git a/libraries/botbuilder-community-dialogs-prompts/source/number_with_unit_prompt.py b/libraries/botbuilder-community-dialogs-prompts/botbuilder/community/dialogs/prompts/number_with_unit_prompt.py similarity index 100% rename from libraries/botbuilder-community-dialogs-prompts/source/number_with_unit_prompt.py rename to libraries/botbuilder-community-dialogs-prompts/botbuilder/community/dialogs/prompts/number_with_unit_prompt.py diff --git a/libraries/botbuilder-community-dialogs-prompts/source/phone_prompt.py b/libraries/botbuilder-community-dialogs-prompts/botbuilder/community/dialogs/prompts/phone_prompt.py similarity index 100% rename from libraries/botbuilder-community-dialogs-prompts/source/phone_prompt.py rename to libraries/botbuilder-community-dialogs-prompts/botbuilder/community/dialogs/prompts/phone_prompt.py diff --git a/libraries/botbuilder-community-dialogs-prompts/setup.py b/libraries/botbuilder-community-dialogs-prompts/setup.py index 4c6524d..a059056 100644 --- a/libraries/botbuilder-community-dialogs-prompts/setup.py +++ b/libraries/botbuilder-community-dialogs-prompts/setup.py @@ -13,7 +13,7 @@ root = os.path.abspath(os.path.dirname(__file__)) -with open(os.path.join(root, "source", "about.py")) as f: +with open(os.path.join(root, "botbuilder", "community", "dialogs", "prompts", "about.py")) as f: package_info = {} info = f.read() exec(info, package_info) @@ -32,7 +32,7 @@ long_description_content_type="text/markdown", license=package_info["__license__"], packages=[ - "source", + "botbuilder.community.dialogs.prompts", ], install_requires=REQUIRES + TESTS_REQUIRES, tests_require=TESTS_REQUIRES, diff --git a/libraries/botbuilder-community-dialogs-prompts/test/test_email_prompt.py b/libraries/botbuilder-community-dialogs-prompts/test/test_email_prompt.py index 949e1ef..175a3db 100644 --- a/libraries/botbuilder-community-dialogs-prompts/test/test_email_prompt.py +++ b/libraries/botbuilder-community-dialogs-prompts/test/test_email_prompt.py @@ -5,7 +5,7 @@ import asyncio current = pathlib.Path(__file__).parent.parent -libpath = current.joinpath("source") +libpath = current.joinpath("botbuilder").joinpath("community").joinpath("dialogs").joinpath("prompts") sys.path.append(str(libpath)) from botbuilder.dialogs.prompts import ( diff --git a/libraries/botbuilder-community-dialogs-prompts/test/test_guid_prompt.py b/libraries/botbuilder-community-dialogs-prompts/test/test_guid_prompt.py index 635a3c8..d8e1254 100644 --- a/libraries/botbuilder-community-dialogs-prompts/test/test_guid_prompt.py +++ b/libraries/botbuilder-community-dialogs-prompts/test/test_guid_prompt.py @@ -5,7 +5,7 @@ import asyncio current = pathlib.Path(__file__).parent.parent -libpath = current.joinpath("source") +libpath = current.joinpath("botbuilder").joinpath("community").joinpath("dialogs").joinpath("prompts") sys.path.append(str(libpath)) from botbuilder.dialogs.prompts import ( diff --git a/libraries/botbuilder-community-dialogs-prompts/test/test_internet_protocol_prompt.py b/libraries/botbuilder-community-dialogs-prompts/test/test_internet_protocol_prompt.py index bf164b8..25cf481 100644 --- a/libraries/botbuilder-community-dialogs-prompts/test/test_internet_protocol_prompt.py +++ b/libraries/botbuilder-community-dialogs-prompts/test/test_internet_protocol_prompt.py @@ -5,7 +5,7 @@ import asyncio current = pathlib.Path(__file__).parent.parent -libpath = current.joinpath("source") +libpath = current.joinpath("botbuilder").joinpath("community").joinpath("dialogs").joinpath("prompts") sys.path.append(str(libpath)) from botbuilder.dialogs.prompts import ( diff --git a/libraries/botbuilder-community-dialogs-prompts/test/test_number_with_type_prompt.py b/libraries/botbuilder-community-dialogs-prompts/test/test_number_with_type_prompt.py index 466344f..c88aad4 100644 --- a/libraries/botbuilder-community-dialogs-prompts/test/test_number_with_type_prompt.py +++ b/libraries/botbuilder-community-dialogs-prompts/test/test_number_with_type_prompt.py @@ -5,7 +5,7 @@ import asyncio current = pathlib.Path(__file__).parent.parent -libpath = current.joinpath("source") +libpath = current.joinpath("botbuilder").joinpath("community").joinpath("dialogs").joinpath("prompts") sys.path.append(str(libpath)) from botbuilder.dialogs.prompts import ( diff --git a/libraries/botbuilder-community-dialogs-prompts/test/test_number_with_unit_prompt.py b/libraries/botbuilder-community-dialogs-prompts/test/test_number_with_unit_prompt.py index bd9e81f..68b8b18 100644 --- a/libraries/botbuilder-community-dialogs-prompts/test/test_number_with_unit_prompt.py +++ b/libraries/botbuilder-community-dialogs-prompts/test/test_number_with_unit_prompt.py @@ -5,7 +5,7 @@ import asyncio current = pathlib.Path(__file__).parent.parent -libpath = current.joinpath("source") +libpath = current.joinpath("botbuilder").joinpath("community").joinpath("dialogs").joinpath("prompts") sys.path.append(str(libpath)) from botbuilder.dialogs.prompts import ( diff --git a/libraries/botbuilder-community-dialogs-prompts/test/test_phone_prompt.py b/libraries/botbuilder-community-dialogs-prompts/test/test_phone_prompt.py index 3f5172d..3cc9ca0 100644 --- a/libraries/botbuilder-community-dialogs-prompts/test/test_phone_prompt.py +++ b/libraries/botbuilder-community-dialogs-prompts/test/test_phone_prompt.py @@ -5,7 +5,7 @@ import asyncio current = pathlib.Path(__file__).parent.parent -libpath = current.joinpath("source") +libpath = current.joinpath("botbuilder").joinpath("community").joinpath("dialogs").joinpath("prompts") sys.path.append(str(libpath)) from botbuilder.dialogs.prompts import (