From 14753f620953550ae5cf852590ee7becbce7e12e Mon Sep 17 00:00:00 2001 From: tracyboehrer Date: Wed, 17 Apr 2024 13:57:00 -0500 Subject: [PATCH 01/19] Bumped next version to 4.16.0 (#2096) Co-authored-by: Tracy Boehrer --- README.md | 2 +- .../botbuilder/adapters/slack/about.py | 2 +- libraries/botbuilder-adapters-slack/requirements.txt | 2 +- libraries/botbuilder-adapters-slack/setup.py | 6 +++--- libraries/botbuilder-ai/botbuilder/ai/about.py | 2 +- libraries/botbuilder-ai/requirements.txt | 4 ++-- libraries/botbuilder-ai/setup.py | 4 ++-- .../botbuilder/applicationinsights/about.py | 2 +- libraries/botbuilder-applicationinsights/requirements.txt | 2 +- libraries/botbuilder-applicationinsights/setup.py | 6 +++--- libraries/botbuilder-azure/botbuilder/azure/about.py | 2 +- libraries/botbuilder-azure/setup.py | 4 ++-- libraries/botbuilder-core/botbuilder/core/about.py | 2 +- libraries/botbuilder-core/requirements.txt | 6 +++--- libraries/botbuilder-core/setup.py | 8 ++++---- libraries/botbuilder-dialogs/botbuilder/dialogs/about.py | 2 +- libraries/botbuilder-dialogs/requirements.txt | 6 +++--- libraries/botbuilder-dialogs/setup.py | 6 +++--- .../botbuilder/integration/aiohttp/about.py | 2 +- libraries/botbuilder-integration-aiohttp/requirements.txt | 4 ++-- libraries/botbuilder-integration-aiohttp/setup.py | 8 ++++---- .../integration/applicationinsights/aiohttp/about.py | 2 +- .../setup.py | 8 ++++---- libraries/botbuilder-schema/setup.py | 2 +- libraries/botbuilder-testing/botbuilder/testing/about.py | 2 +- libraries/botbuilder-testing/requirements.txt | 6 +++--- libraries/botbuilder-testing/setup.py | 8 ++++---- .../botframework/connector/about.py | 2 +- libraries/botframework-connector/requirements.txt | 2 +- libraries/botframework-connector/setup.py | 4 ++-- .../botframework/streaming/about.py | 2 +- libraries/botframework-streaming/requirements.txt | 4 ++-- libraries/botframework-streaming/setup.py | 6 +++--- 33 files changed, 65 insertions(+), 65 deletions(-) diff --git a/README.md b/README.md index df939dd52..39b134ac1 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ For more information jump to a section below. | Branch | Description | Build Status | Coverage Status | Code Style | |----|---------------|--------------|-----------------|--| -| Main | 4.15.0 Builds | [![Build Status](https://fuselabs.visualstudio.com/SDK_v4/_apis/build/status/Python/Python-CI-PR-yaml?branchName=main)](https://fuselabs.visualstudio.com/SDK_v4/_build/latest?definitionId=771&branchName=main) | [![Coverage Status](https://coveralls.io/repos/github/microsoft/botbuilder-python/badge.svg?branch=HEAD)](https://coveralls.io/github/microsoft/botbuilder-python?branch=HEAD) | [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) | +| Main | 4.16.0 Builds | [![Build Status](https://fuselabs.visualstudio.com/SDK_v4/_apis/build/status/Python/Python-CI-PR-yaml?branchName=main)](https://fuselabs.visualstudio.com/SDK_v4/_build/latest?definitionId=771&branchName=main) | [![Coverage Status](https://coveralls.io/repos/github/microsoft/botbuilder-python/badge.svg?branch=HEAD)](https://coveralls.io/github/microsoft/botbuilder-python?branch=HEAD) | [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) | ## Packages diff --git a/libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/about.py b/libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/about.py index a7f0c2b88..2da3fe8e7 100644 --- a/libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/about.py +++ b/libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/about.py @@ -5,7 +5,7 @@ __title__ = "botbuilder-adapters-slack" __version__ = ( - os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.16.0" ) __uri__ = "https://www.github.com/Microsoft/botbuilder-python" __author__ = "Microsoft" diff --git a/libraries/botbuilder-adapters-slack/requirements.txt b/libraries/botbuilder-adapters-slack/requirements.txt index 312d38e8a..aad8e0cae 100644 --- a/libraries/botbuilder-adapters-slack/requirements.txt +++ b/libraries/botbuilder-adapters-slack/requirements.txt @@ -1,4 +1,4 @@ aiohttp==3.9.3 pyslack -botbuilder-core==4.15.0 +botbuilder-core==4.16.0 slackclient diff --git a/libraries/botbuilder-adapters-slack/setup.py b/libraries/botbuilder-adapters-slack/setup.py index 41ac5dc42..d3eb8cbd1 100644 --- a/libraries/botbuilder-adapters-slack/setup.py +++ b/libraries/botbuilder-adapters-slack/setup.py @@ -5,9 +5,9 @@ from setuptools import setup REQUIRES = [ - "botbuilder-schema==4.15.0", - "botframework-connector==4.15.0", - "botbuilder-core==4.15.0", + "botbuilder-schema==4.16.0", + "botframework-connector==4.16.0", + "botbuilder-core==4.16.0", "pyslack", "slackclient", ] diff --git a/libraries/botbuilder-ai/botbuilder/ai/about.py b/libraries/botbuilder-ai/botbuilder/ai/about.py index c6bda926b..22d69d517 100644 --- a/libraries/botbuilder-ai/botbuilder/ai/about.py +++ b/libraries/botbuilder-ai/botbuilder/ai/about.py @@ -5,7 +5,7 @@ __title__ = "botbuilder-ai" __version__ = ( - os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.16.0" ) __uri__ = "https://www.github.com/Microsoft/botbuilder-python" __author__ = "Microsoft" diff --git a/libraries/botbuilder-ai/requirements.txt b/libraries/botbuilder-ai/requirements.txt index 221374746..876a8d459 100644 --- a/libraries/botbuilder-ai/requirements.txt +++ b/libraries/botbuilder-ai/requirements.txt @@ -1,6 +1,6 @@ msrest== 0.7.* -botbuilder-schema==4.15.0 -botbuilder-core==4.15.0 +botbuilder-schema==4.16.0 +botbuilder-core==4.16.0 requests==2.31.0 aiounittest==1.3.0 azure-cognitiveservices-language-luis==0.2.0 \ No newline at end of file diff --git a/libraries/botbuilder-ai/setup.py b/libraries/botbuilder-ai/setup.py index 0b61efc81..989f1755c 100644 --- a/libraries/botbuilder-ai/setup.py +++ b/libraries/botbuilder-ai/setup.py @@ -6,8 +6,8 @@ REQUIRES = [ "azure-cognitiveservices-language-luis==0.2.0", - "botbuilder-schema==4.15.0", - "botbuilder-core==4.15.0", + "botbuilder-schema==4.16.0", + "botbuilder-core==4.16.0", "aiohttp==3.9.3", ] diff --git a/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/about.py b/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/about.py index cf0b5e087..74f9edbb5 100644 --- a/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/about.py +++ b/libraries/botbuilder-applicationinsights/botbuilder/applicationinsights/about.py @@ -6,7 +6,7 @@ __title__ = "botbuilder-applicationinsights" __version__ = ( - os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.16.0" ) __uri__ = "https://www.github.com/Microsoft/botbuilder-python" __author__ = "Microsoft" diff --git a/libraries/botbuilder-applicationinsights/requirements.txt b/libraries/botbuilder-applicationinsights/requirements.txt index 7d22c3724..dd908fd7c 100644 --- a/libraries/botbuilder-applicationinsights/requirements.txt +++ b/libraries/botbuilder-applicationinsights/requirements.txt @@ -1,3 +1,3 @@ msrest== 0.7.* -botbuilder-core==4.15.0 +botbuilder-core==4.16.0 aiounittest==1.3.0 \ No newline at end of file diff --git a/libraries/botbuilder-applicationinsights/setup.py b/libraries/botbuilder-applicationinsights/setup.py index a91a9acb1..8b9dc8107 100644 --- a/libraries/botbuilder-applicationinsights/setup.py +++ b/libraries/botbuilder-applicationinsights/setup.py @@ -6,9 +6,9 @@ REQUIRES = [ "applicationinsights==0.11.9", - "botbuilder-schema==4.15.0", - "botframework-connector==4.15.0", - "botbuilder-core==4.15.0", + "botbuilder-schema==4.16.0", + "botframework-connector==4.16.0", + "botbuilder-core==4.16.0", ] TESTS_REQUIRES = [ "aiounittest==1.3.0", diff --git a/libraries/botbuilder-azure/botbuilder/azure/about.py b/libraries/botbuilder-azure/botbuilder/azure/about.py index 142cc9770..73d05308a 100644 --- a/libraries/botbuilder-azure/botbuilder/azure/about.py +++ b/libraries/botbuilder-azure/botbuilder/azure/about.py @@ -5,7 +5,7 @@ __title__ = "botbuilder-azure" __version__ = ( - os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.16.0" ) __uri__ = "https://www.github.com/Microsoft/botbuilder-python" __author__ = "Microsoft" diff --git a/libraries/botbuilder-azure/setup.py b/libraries/botbuilder-azure/setup.py index 0b9806867..8d698a34f 100644 --- a/libraries/botbuilder-azure/setup.py +++ b/libraries/botbuilder-azure/setup.py @@ -8,8 +8,8 @@ "azure-cosmos==3.2.0", "azure-storage-blob==12.7.0", "azure-storage-queue==12.1.5", - "botbuilder-schema==4.15.0", - "botframework-connector==4.15.0", + "botbuilder-schema==4.16.0", + "botframework-connector==4.16.0", "jsonpickle>=1.2,<1.5", ] TEST_REQUIRES = ["aiounittest==1.3.0"] diff --git a/libraries/botbuilder-core/botbuilder/core/about.py b/libraries/botbuilder-core/botbuilder/core/about.py index 77319082e..b684dfef7 100644 --- a/libraries/botbuilder-core/botbuilder/core/about.py +++ b/libraries/botbuilder-core/botbuilder/core/about.py @@ -5,7 +5,7 @@ __title__ = "botbuilder-core" __version__ = ( - os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.16.0" ) __uri__ = "https://www.github.com/Microsoft/botbuilder-python" __author__ = "Microsoft" diff --git a/libraries/botbuilder-core/requirements.txt b/libraries/botbuilder-core/requirements.txt index 8da13ad95..b33ed42bf 100644 --- a/libraries/botbuilder-core/requirements.txt +++ b/libraries/botbuilder-core/requirements.txt @@ -1,7 +1,7 @@ msrest== 0.7.* -botframework-connector==4.15.0 -botbuilder-schema==4.15.0 -botframework-streaming==4.15.0 +botframework-connector==4.16.0 +botbuilder-schema==4.16.0 +botframework-streaming==4.16.0 requests==2.31.0 PyJWT==2.4.0 cryptography==42.0.4 diff --git a/libraries/botbuilder-core/setup.py b/libraries/botbuilder-core/setup.py index a9b9b9fd0..6b4ec5929 100644 --- a/libraries/botbuilder-core/setup.py +++ b/libraries/botbuilder-core/setup.py @@ -4,11 +4,11 @@ import os from setuptools import setup -VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" +VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.16.0" REQUIRES = [ - "botbuilder-schema==4.15.0", - "botframework-connector==4.15.0", - "botframework-streaming==4.15.0", + "botbuilder-schema==4.16.0", + "botframework-connector==4.16.0", + "botframework-streaming==4.16.0", "jsonpickle>=1.2,<1.5", ] diff --git a/libraries/botbuilder-dialogs/botbuilder/dialogs/about.py b/libraries/botbuilder-dialogs/botbuilder/dialogs/about.py index 609492f20..ac3c0bd7f 100644 --- a/libraries/botbuilder-dialogs/botbuilder/dialogs/about.py +++ b/libraries/botbuilder-dialogs/botbuilder/dialogs/about.py @@ -5,7 +5,7 @@ __title__ = "botbuilder-dialogs" __version__ = ( - os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.16.0" ) __uri__ = "https://www.github.com/Microsoft/botbuilder-python" __author__ = "Microsoft" diff --git a/libraries/botbuilder-dialogs/requirements.txt b/libraries/botbuilder-dialogs/requirements.txt index 05ccb8570..907c7fca7 100644 --- a/libraries/botbuilder-dialogs/requirements.txt +++ b/libraries/botbuilder-dialogs/requirements.txt @@ -1,7 +1,7 @@ msrest== 0.7.* -botframework-connector==4.15.0 -botbuilder-schema==4.15.0 -botbuilder-core==4.15.0 +botframework-connector==4.16.0 +botbuilder-schema==4.16.0 +botbuilder-core==4.16.0 requests==2.31.0 PyJWT==2.4.0 cryptography==42.0.4 diff --git a/libraries/botbuilder-dialogs/setup.py b/libraries/botbuilder-dialogs/setup.py index 574f8bbe7..8b2a44a27 100644 --- a/libraries/botbuilder-dialogs/setup.py +++ b/libraries/botbuilder-dialogs/setup.py @@ -13,9 +13,9 @@ "recognizers-text>=1.0.2a1", "recognizers-text-choice>=1.0.2a1", "babel==2.9.1", - "botbuilder-schema==4.15.0", - "botframework-connector==4.15.0", - "botbuilder-core==4.15.0", + "botbuilder-schema==4.16.0", + "botframework-connector==4.16.0", + "botbuilder-core==4.16.0", ] TEST_REQUIRES = ["aiounittest==1.3.0"] diff --git a/libraries/botbuilder-integration-aiohttp/botbuilder/integration/aiohttp/about.py b/libraries/botbuilder-integration-aiohttp/botbuilder/integration/aiohttp/about.py index 898458512..fd45f9491 100644 --- a/libraries/botbuilder-integration-aiohttp/botbuilder/integration/aiohttp/about.py +++ b/libraries/botbuilder-integration-aiohttp/botbuilder/integration/aiohttp/about.py @@ -5,7 +5,7 @@ __title__ = "botbuilder-integration-aiohttp" __version__ = ( - os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.16.0" ) __uri__ = "https://www.github.com/Microsoft/botbuilder-python" __author__ = "Microsoft" diff --git a/libraries/botbuilder-integration-aiohttp/requirements.txt b/libraries/botbuilder-integration-aiohttp/requirements.txt index 85b38ee6f..e05b8da2f 100644 --- a/libraries/botbuilder-integration-aiohttp/requirements.txt +++ b/libraries/botbuilder-integration-aiohttp/requirements.txt @@ -1,4 +1,4 @@ msrest== 0.7.* -botframework-connector==4.15.0 -botbuilder-schema==4.15.0 +botframework-connector==4.16.0 +botbuilder-schema==4.16.0 aiohttp==3.9.3 diff --git a/libraries/botbuilder-integration-aiohttp/setup.py b/libraries/botbuilder-integration-aiohttp/setup.py index b69be5e90..fd743ecf3 100644 --- a/libraries/botbuilder-integration-aiohttp/setup.py +++ b/libraries/botbuilder-integration-aiohttp/setup.py @@ -4,11 +4,11 @@ import os from setuptools import setup -VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" +VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.16.0" REQUIRES = [ - "botbuilder-schema==4.15.0", - "botframework-connector==4.15.0", - "botbuilder-core==4.15.0", + "botbuilder-schema==4.16.0", + "botframework-connector==4.16.0", + "botbuilder-core==4.16.0", "yarl>=1.8.1", "aiohttp==3.9.3", ] diff --git a/libraries/botbuilder-integration-applicationinsights-aiohttp/botbuilder/integration/applicationinsights/aiohttp/about.py b/libraries/botbuilder-integration-applicationinsights-aiohttp/botbuilder/integration/applicationinsights/aiohttp/about.py index 6a821af3e..ab88a6efe 100644 --- a/libraries/botbuilder-integration-applicationinsights-aiohttp/botbuilder/integration/applicationinsights/aiohttp/about.py +++ b/libraries/botbuilder-integration-applicationinsights-aiohttp/botbuilder/integration/applicationinsights/aiohttp/about.py @@ -6,7 +6,7 @@ __title__ = "botbuilder-integration-applicationinsights-aiohttp" __version__ = ( - os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.16.0" ) __uri__ = "https://www.github.com/Microsoft/botbuilder-python" __author__ = "Microsoft" diff --git a/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py b/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py index f4b9933b8..185324083 100644 --- a/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py +++ b/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py @@ -7,10 +7,10 @@ REQUIRES = [ "applicationinsights>=0.11.9", "aiohttp==3.9.3", - "botbuilder-schema==4.15.0", - "botframework-connector==4.15.0", - "botbuilder-core==4.15.0", - "botbuilder-applicationinsights==4.15.0", + "botbuilder-schema==4.16.0", + "botframework-connector==4.16.0", + "botbuilder-core==4.16.0", + "botbuilder-applicationinsights==4.16.0", ] TESTS_REQUIRES = [ "aiounittest==1.3.0", diff --git a/libraries/botbuilder-schema/setup.py b/libraries/botbuilder-schema/setup.py index ac285ff01..dba58aa60 100644 --- a/libraries/botbuilder-schema/setup.py +++ b/libraries/botbuilder-schema/setup.py @@ -5,7 +5,7 @@ from setuptools import setup NAME = "botbuilder-schema" -VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" +VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.16.0" REQUIRES = ["msrest== 0.7.*", "urllib3<2.0.0"] root = os.path.abspath(os.path.dirname(__file__)) diff --git a/libraries/botbuilder-testing/botbuilder/testing/about.py b/libraries/botbuilder-testing/botbuilder/testing/about.py index 5c866c335..89af35e45 100644 --- a/libraries/botbuilder-testing/botbuilder/testing/about.py +++ b/libraries/botbuilder-testing/botbuilder/testing/about.py @@ -6,7 +6,7 @@ __title__ = "botbuilder-testing" __version__ = ( - os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.16.0" ) __uri__ = "https://www.github.com/Microsoft/botbuilder-python" __author__ = "Microsoft" diff --git a/libraries/botbuilder-testing/requirements.txt b/libraries/botbuilder-testing/requirements.txt index 8f011997c..b19d84f12 100644 --- a/libraries/botbuilder-testing/requirements.txt +++ b/libraries/botbuilder-testing/requirements.txt @@ -1,4 +1,4 @@ -botbuilder-schema==4.15.0 -botbuilder-core==4.15.0 -botbuilder-dialogs==4.15.0 +botbuilder-schema==4.16.0 +botbuilder-core==4.16.0 +botbuilder-dialogs==4.16.0 aiounittest==1.4.0 diff --git a/libraries/botbuilder-testing/setup.py b/libraries/botbuilder-testing/setup.py index 0dbc2304d..e7dc81fd7 100644 --- a/libraries/botbuilder-testing/setup.py +++ b/libraries/botbuilder-testing/setup.py @@ -5,10 +5,10 @@ from setuptools import setup REQUIRES = [ - "botbuilder-schema==4.15.0", - "botbuilder-core==4.15.0", - "botbuilder-dialogs==4.15.0", - "botbuilder-azure==4.15.0", + "botbuilder-schema==4.16.0", + "botbuilder-core==4.16.0", + "botbuilder-dialogs==4.16.0", + "botbuilder-azure==4.16.0", "pytest~=7.3.1", ] diff --git a/libraries/botframework-connector/botframework/connector/about.py b/libraries/botframework-connector/botframework/connector/about.py index 1df0ab2e9..9f11a65e3 100644 --- a/libraries/botframework-connector/botframework/connector/about.py +++ b/libraries/botframework-connector/botframework/connector/about.py @@ -5,7 +5,7 @@ __title__ = "botframework-connector" __version__ = ( - os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.16.0" ) __uri__ = "https://www.github.com/Microsoft/botbuilder-python" __author__ = "Microsoft" diff --git a/libraries/botframework-connector/requirements.txt b/libraries/botframework-connector/requirements.txt index 25d38e349..94b433187 100644 --- a/libraries/botframework-connector/requirements.txt +++ b/libraries/botframework-connector/requirements.txt @@ -1,5 +1,5 @@ msrest==0.7.* -botbuilder-schema==4.15.0 +botbuilder-schema==4.16.0 requests==2.31.0 PyJWT==2.4.0 cryptography==42.0.4 diff --git a/libraries/botframework-connector/setup.py b/libraries/botframework-connector/setup.py index 2e6c8fe64..ca4b72025 100644 --- a/libraries/botframework-connector/setup.py +++ b/libraries/botframework-connector/setup.py @@ -5,12 +5,12 @@ from setuptools import setup NAME = "botframework-connector" -VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" +VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.16.0" REQUIRES = [ "msrest==0.7.*", # "requests>=2.23.0,<2.26", "PyJWT>=2.4.0", - "botbuilder-schema==4.15.0", + "botbuilder-schema==4.16.0", "msal==1.*", ] diff --git a/libraries/botframework-streaming/botframework/streaming/about.py b/libraries/botframework-streaming/botframework/streaming/about.py index 78ae10a20..9e4ba1d54 100644 --- a/libraries/botframework-streaming/botframework/streaming/about.py +++ b/libraries/botframework-streaming/botframework/streaming/about.py @@ -5,7 +5,7 @@ __title__ = "botframework-streaming" __version__ = ( - os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" + os.environ["packageVersion"] if "packageVersion" in os.environ else "4.16.0" ) __uri__ = "https://www.github.com/Microsoft/botbuilder-python" __author__ = "Microsoft" diff --git a/libraries/botframework-streaming/requirements.txt b/libraries/botframework-streaming/requirements.txt index c806f7e77..db9a49e2b 100644 --- a/libraries/botframework-streaming/requirements.txt +++ b/libraries/botframework-streaming/requirements.txt @@ -1,3 +1,3 @@ msrest==0.7.* -botframework-connector>=4.15.0 -botbuilder-schema>=4.15.0 \ No newline at end of file +botframework-connector>=4.16.0 +botbuilder-schema>=4.16.0 \ No newline at end of file diff --git a/libraries/botframework-streaming/setup.py b/libraries/botframework-streaming/setup.py index 9a5f06e20..0a45151fc 100644 --- a/libraries/botframework-streaming/setup.py +++ b/libraries/botframework-streaming/setup.py @@ -4,10 +4,10 @@ import os from setuptools import setup -VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0" +VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.16.0" REQUIRES = [ - "botbuilder-schema==4.15.0", - "botframework-connector==4.15.0", + "botbuilder-schema==4.16.0", + "botframework-connector==4.16.0", ] root = os.path.abspath(os.path.dirname(__file__)) From bdf4fb658acff147d6572f6198e32832e94ea00a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 08:20:33 -0500 Subject: [PATCH 02/19] Bump aiohttp from 3.9.3 to 3.9.4 in /libraries/botbuilder-adapters-slack (#2097) Bumps [aiohttp](https://github.com/aio-libs/aiohttp) from 3.9.3 to 3.9.4. - [Release notes](https://github.com/aio-libs/aiohttp/releases) - [Changelog](https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst) - [Commits](https://github.com/aio-libs/aiohttp/compare/v3.9.3...v3.9.4) --- updated-dependencies: - dependency-name: aiohttp dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- libraries/botbuilder-adapters-slack/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/botbuilder-adapters-slack/requirements.txt b/libraries/botbuilder-adapters-slack/requirements.txt index aad8e0cae..86671f1e3 100644 --- a/libraries/botbuilder-adapters-slack/requirements.txt +++ b/libraries/botbuilder-adapters-slack/requirements.txt @@ -1,4 +1,4 @@ -aiohttp==3.9.3 +aiohttp==3.9.4 pyslack botbuilder-core==4.16.0 slackclient From 8edb0d0273fde5e0ce26ebd3ed2e3c1af2b0c11c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 08:21:26 -0500 Subject: [PATCH 03/19] Bump aiohttp in /libraries/botbuilder-integration-aiohttp (#2098) Bumps [aiohttp](https://github.com/aio-libs/aiohttp) from 3.9.3 to 3.9.4. - [Release notes](https://github.com/aio-libs/aiohttp/releases) - [Changelog](https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst) - [Commits](https://github.com/aio-libs/aiohttp/compare/v3.9.3...v3.9.4) --- updated-dependencies: - dependency-name: aiohttp dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: tracyboehrer --- libraries/botbuilder-integration-aiohttp/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/botbuilder-integration-aiohttp/requirements.txt b/libraries/botbuilder-integration-aiohttp/requirements.txt index e05b8da2f..77ce15fc2 100644 --- a/libraries/botbuilder-integration-aiohttp/requirements.txt +++ b/libraries/botbuilder-integration-aiohttp/requirements.txt @@ -1,4 +1,4 @@ msrest== 0.7.* botframework-connector==4.16.0 botbuilder-schema==4.16.0 -aiohttp==3.9.3 +aiohttp==3.9.4 From 10e4332b10190da6850bc1cc1036a236e08e3aa7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 15:09:47 -0500 Subject: [PATCH 04/19] Bump the pip group across 2 directories with 1 update (#2100) Bumps the pip group with 1 update in the /libraries/botbuilder-adapters-slack directory: [aiohttp](https://github.com/aio-libs/aiohttp). Bumps the pip group with 1 update in the /libraries/botbuilder-integration-aiohttp directory: [aiohttp](https://github.com/aio-libs/aiohttp). Updates `aiohttp` from 3.9.4 to 3.9.5 - [Release notes](https://github.com/aio-libs/aiohttp/releases) - [Changelog](https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst) - [Commits](https://github.com/aio-libs/aiohttp/compare/v3.9.4...v3.9.5) Updates `aiohttp` from 3.9.4 to 3.9.5 - [Release notes](https://github.com/aio-libs/aiohttp/releases) - [Changelog](https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst) - [Commits](https://github.com/aio-libs/aiohttp/compare/v3.9.4...v3.9.5) --- updated-dependencies: - dependency-name: aiohttp dependency-type: direct:production dependency-group: pip - dependency-name: aiohttp dependency-type: direct:production dependency-group: pip ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- libraries/botbuilder-adapters-slack/requirements.txt | 2 +- libraries/botbuilder-integration-aiohttp/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/botbuilder-adapters-slack/requirements.txt b/libraries/botbuilder-adapters-slack/requirements.txt index 86671f1e3..7fd82d816 100644 --- a/libraries/botbuilder-adapters-slack/requirements.txt +++ b/libraries/botbuilder-adapters-slack/requirements.txt @@ -1,4 +1,4 @@ -aiohttp==3.9.4 +aiohttp==3.9.5 pyslack botbuilder-core==4.16.0 slackclient diff --git a/libraries/botbuilder-integration-aiohttp/requirements.txt b/libraries/botbuilder-integration-aiohttp/requirements.txt index 77ce15fc2..1a1057e11 100644 --- a/libraries/botbuilder-integration-aiohttp/requirements.txt +++ b/libraries/botbuilder-integration-aiohttp/requirements.txt @@ -1,4 +1,4 @@ msrest== 0.7.* botframework-connector==4.16.0 botbuilder-schema==4.16.0 -aiohttp==3.9.4 +aiohttp==3.9.5 From 74ec755d5efeee100b28e6e31eb4d1e349e725f2 Mon Sep 17 00:00:00 2001 From: tracyboehrer Date: Tue, 30 Apr 2024 15:47:21 -0500 Subject: [PATCH 05/19] Added CosmosDB warning: Use CosmosDbPartitionedStorage instead. (#2104) * Added CosmosDB warning * CosmosDBStorage black --------- Co-authored-by: Tracy Boehrer --- .../botbuilder-azure/botbuilder/azure/cosmosdb_storage.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libraries/botbuilder-azure/botbuilder/azure/cosmosdb_storage.py b/libraries/botbuilder-azure/botbuilder/azure/cosmosdb_storage.py index b5e29e650..2e383666f 100644 --- a/libraries/botbuilder-azure/botbuilder/azure/cosmosdb_storage.py +++ b/libraries/botbuilder-azure/botbuilder/azure/cosmosdb_storage.py @@ -7,6 +7,7 @@ from typing import Dict, List from threading import Semaphore import json +import warnings from jsonpickle.pickler import Pickler from jsonpickle.unpickler import Unpickler import azure.cosmos.cosmos_client as cosmos_client # pylint: disable=no-name-in-module,import-error @@ -107,6 +108,9 @@ def __init__( :param config: """ super(CosmosDbStorage, self).__init__() + warnings.warn( + "CosmosDbStorage is obsolete. Use CosmosDbPartitionedStorage instead." + ) self.config = config self.client = client or cosmos_client.CosmosClient( self.config.endpoint, {"masterKey": self.config.masterkey} From 84fc24c0cb0e3bad59879dcc1d54179fd0fe483a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 May 2024 09:51:15 -0500 Subject: [PATCH 06/19] --- (#2108) updated-dependencies: - dependency-name: requests dependency-type: direct:production dependency-group: pip - dependency-name: requests dependency-type: direct:production dependency-group: pip - dependency-name: requests dependency-type: direct:production dependency-group: pip - dependency-name: requests dependency-type: direct:production dependency-group: pip ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- libraries/botbuilder-ai/requirements.txt | 2 +- libraries/botbuilder-core/requirements.txt | 2 +- libraries/botbuilder-dialogs/requirements.txt | 2 +- libraries/botframework-connector/requirements.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/botbuilder-ai/requirements.txt b/libraries/botbuilder-ai/requirements.txt index 876a8d459..cea1e6ded 100644 --- a/libraries/botbuilder-ai/requirements.txt +++ b/libraries/botbuilder-ai/requirements.txt @@ -1,6 +1,6 @@ msrest== 0.7.* botbuilder-schema==4.16.0 botbuilder-core==4.16.0 -requests==2.31.0 +requests==2.32.0 aiounittest==1.3.0 azure-cognitiveservices-language-luis==0.2.0 \ No newline at end of file diff --git a/libraries/botbuilder-core/requirements.txt b/libraries/botbuilder-core/requirements.txt index b33ed42bf..d9a4bc2f1 100644 --- a/libraries/botbuilder-core/requirements.txt +++ b/libraries/botbuilder-core/requirements.txt @@ -2,7 +2,7 @@ msrest== 0.7.* botframework-connector==4.16.0 botbuilder-schema==4.16.0 botframework-streaming==4.16.0 -requests==2.31.0 +requests==2.32.0 PyJWT==2.4.0 cryptography==42.0.4 aiounittest==1.3.0 \ No newline at end of file diff --git a/libraries/botbuilder-dialogs/requirements.txt b/libraries/botbuilder-dialogs/requirements.txt index 907c7fca7..2ee28a093 100644 --- a/libraries/botbuilder-dialogs/requirements.txt +++ b/libraries/botbuilder-dialogs/requirements.txt @@ -2,7 +2,7 @@ msrest== 0.7.* botframework-connector==4.16.0 botbuilder-schema==4.16.0 botbuilder-core==4.16.0 -requests==2.31.0 +requests==2.32.0 PyJWT==2.4.0 cryptography==42.0.4 aiounittest==1.3.0 diff --git a/libraries/botframework-connector/requirements.txt b/libraries/botframework-connector/requirements.txt index 94b433187..a762e8813 100644 --- a/libraries/botframework-connector/requirements.txt +++ b/libraries/botframework-connector/requirements.txt @@ -1,6 +1,6 @@ msrest==0.7.* botbuilder-schema==4.16.0 -requests==2.31.0 +requests==2.32.0 PyJWT==2.4.0 cryptography==42.0.4 msal==1.* From 4e4cf64866056751f8b37586df9e1d2c60d5a4dd Mon Sep 17 00:00:00 2001 From: tracyboehrer Date: Thu, 23 May 2024 11:10:10 -0500 Subject: [PATCH 07/19] Update botbuilder-python-ci.yml for Azure Pipelines --- pipelines/botbuilder-python-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipelines/botbuilder-python-ci.yml b/pipelines/botbuilder-python-ci.yml index 8d55cd230..acb3ea2d5 100644 --- a/pipelines/botbuilder-python-ci.yml +++ b/pipelines/botbuilder-python-ci.yml @@ -60,7 +60,7 @@ jobs: pip install -r ./libraries/botbuilder-ai/tests/requirements.txt pip install coveralls pip install pylint==2.17 - pip install black==22.3.0 + pip install black==24.3.0 displayName: 'Install dependencies' - script: 'black --check libraries' From 8bc698f96113b8361445fe187fa711e1ab0a877b Mon Sep 17 00:00:00 2001 From: tracyboehrer Date: Thu, 23 May 2024 11:17:13 -0500 Subject: [PATCH 08/19] Update botbuilder-python-ci.yml for Azure Pipelines --- pipelines/botbuilder-python-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipelines/botbuilder-python-ci.yml b/pipelines/botbuilder-python-ci.yml index acb3ea2d5..7a58ff339 100644 --- a/pipelines/botbuilder-python-ci.yml +++ b/pipelines/botbuilder-python-ci.yml @@ -60,7 +60,7 @@ jobs: pip install -r ./libraries/botbuilder-ai/tests/requirements.txt pip install coveralls pip install pylint==2.17 - pip install black==24.3.0 + pip install black==24.4.3 displayName: 'Install dependencies' - script: 'black --check libraries' From 6a63f1669128fa7795e4f860464b9517985429b0 Mon Sep 17 00:00:00 2001 From: tracyboehrer Date: Thu, 23 May 2024 11:20:41 -0500 Subject: [PATCH 09/19] Update botbuilder-python-ci.yml for Azure Pipelines --- pipelines/botbuilder-python-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipelines/botbuilder-python-ci.yml b/pipelines/botbuilder-python-ci.yml index 7a58ff339..6460bb907 100644 --- a/pipelines/botbuilder-python-ci.yml +++ b/pipelines/botbuilder-python-ci.yml @@ -60,7 +60,7 @@ jobs: pip install -r ./libraries/botbuilder-ai/tests/requirements.txt pip install coveralls pip install pylint==2.17 - pip install black==24.4.3 + pip install black==24.4.2 displayName: 'Install dependencies' - script: 'black --check libraries' From 3521ce3a9361de6eb45c8e74553ecf001d130c41 Mon Sep 17 00:00:00 2001 From: tracyboehrer Date: Thu, 23 May 2024 13:01:40 -0500 Subject: [PATCH 10/19] fix: Corrections for errors in Skill Dialogs (#2110) * Corrections for errors in Skill Dialogs * black formatting * black formatting (PS. VS Code Black Formatter does not do exactly same thing as pipeline) * Test correction for Skill Dialog fix --------- Co-authored-by: Tracy Boehrer --- .../botbuilder/adapters/slack/slack_helper.py | 8 +++++--- .../botbuilder/ai/luis/luis_recognizer.py | 6 +++--- .../botbuilder/ai/luis/luis_recognizer_v2.py | 16 ++++++++++------ .../botbuilder/ai/luis/luis_recognizer_v3.py | 8 +++++--- .../ai/qna/dialogs/qnamaker_dialog.py | 6 +++--- .../botbuilder/ai/qna/models/ranker_types.py | 1 - .../botbuilder/ai/qna/qnamaker.py | 6 +++--- .../botbuilder/ai/qna/utils/train_utils.py | 4 +++- .../botbuilder/core/bot_framework_adapter.py | 8 +++++--- .../botbuilder/core/cloud_adapter_base.py | 12 +++++++++++- .../core/inspection/inspection_middleware.py | 8 ++++---- .../core/skills/_skill_handler_impl.py | 18 +++++++++--------- .../core/telemetry_logger_middleware.py | 18 +++++++++--------- .../botbuilder/core/turn_context.py | 9 ++++++++- .../tests/skills/test_skill_handler.py | 6 +++--- .../tests/teams/test_teams_activity_handler.py | 6 +++--- .../botbuilder/dialogs/_user_token_access.py | 16 ++++++++++------ .../botbuilder/dialogs/dialog_context.py | 6 +++--- .../botbuilder/dialogs/dialog_extensions.py | 14 ++++++++------ .../botbuilder/dialogs/dialog_manager.py | 8 +++++--- .../dialogs/memory/dialog_state_manager.py | 6 +++--- .../botbuilder/dialogs/prompts/oauth_prompt.py | 6 +++--- .../botbuilder/dialogs/skills/skill_dialog.py | 12 ++++++------ .../tests/test_dialog_manager.py | 14 +++++--------- .../aiohttp/bot_framework_http_client.py | 15 ++++++++------- .../aiohttp/skills/aio_http_client_factory.py | 10 ++++------ .../tests/skills/test_skill_http_client.py | 1 - .../auth/certificate_app_credentials.py | 6 +++--- .../connector/auth/government_constants.py | 1 - .../tests/test_skill_validation.py | 12 ++++++------ 30 files changed, 148 insertions(+), 119 deletions(-) diff --git a/libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/slack_helper.py b/libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/slack_helper.py index 80d30d275..35f720c8d 100644 --- a/libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/slack_helper.py +++ b/libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/slack_helper.py @@ -128,9 +128,11 @@ def payload_to_activity(payload: SlackPayload) -> Activity: channel_id="slack", conversation=ConversationAccount(id=payload.channel["id"], properties={}), from_property=ChannelAccount( - id=payload.message.bot_id - if payload.message.bot_id - else payload.user["id"] + id=( + payload.message.bot_id + if payload.message.bot_id + else payload.user["id"] + ) ), recipient=ChannelAccount(), channel_data=payload, diff --git a/libraries/botbuilder-ai/botbuilder/ai/luis/luis_recognizer.py b/libraries/botbuilder-ai/botbuilder/ai/luis/luis_recognizer.py index a95ebae96..bf6e15bfe 100644 --- a/libraries/botbuilder-ai/botbuilder/ai/luis/luis_recognizer.py +++ b/libraries/botbuilder-ai/botbuilder/ai/luis/luis_recognizer.py @@ -236,9 +236,9 @@ def fill_luis_event_properties( # Use the LogPersonalInformation flag to toggle logging PII data, text is a common example if self.log_personal_information and turn_context.activity.text: - properties[ - LuisTelemetryConstants.question_property - ] = turn_context.activity.text + properties[LuisTelemetryConstants.question_property] = ( + turn_context.activity.text + ) # Additional Properties can override "stock" properties. if telemetry_properties is not None: diff --git a/libraries/botbuilder-ai/botbuilder/ai/luis/luis_recognizer_v2.py b/libraries/botbuilder-ai/botbuilder/ai/luis/luis_recognizer_v2.py index b58c9b40c..507b10774 100644 --- a/libraries/botbuilder-ai/botbuilder/ai/luis/luis_recognizer_v2.py +++ b/libraries/botbuilder-ai/botbuilder/ai/luis/luis_recognizer_v2.py @@ -53,9 +53,11 @@ async def recognizer_internal(self, turn_context: TurnContext): staging=self.luis_recognizer_options_v2.staging, spell_check=self.luis_recognizer_options_v2.spell_check, bing_spell_check_subscription_key=self.luis_recognizer_options_v2.bing_spell_check_subscription_key, - log=self.luis_recognizer_options_v2.log - if self.luis_recognizer_options_v2.log is not None - else True, + log=( + self.luis_recognizer_options_v2.log + if self.luis_recognizer_options_v2.log is not None + else True + ), ) recognizer_result: RecognizerResult = RecognizerResult( @@ -65,9 +67,11 @@ async def recognizer_internal(self, turn_context: TurnContext): entities=LuisUtil.extract_entities_and_metadata( luis_result.entities, luis_result.composite_entities, - self.luis_recognizer_options_v2.include_instance_data - if self.luis_recognizer_options_v2.include_instance_data is not None - else True, + ( + self.luis_recognizer_options_v2.include_instance_data + if self.luis_recognizer_options_v2.include_instance_data is not None + else True + ), ), ) diff --git a/libraries/botbuilder-ai/botbuilder/ai/luis/luis_recognizer_v3.py b/libraries/botbuilder-ai/botbuilder/ai/luis/luis_recognizer_v3.py index b487abfb5..4e373023e 100644 --- a/libraries/botbuilder-ai/botbuilder/ai/luis/luis_recognizer_v3.py +++ b/libraries/botbuilder-ai/botbuilder/ai/luis/luis_recognizer_v3.py @@ -116,9 +116,11 @@ def _build_url(self): uri += "/slots/%s/predict" % (self.luis_recognizer_options_v3.slot) params = "?verbose=%s&show-all-intents=%s&log=%s" % ( - "true" - if self.luis_recognizer_options_v3.include_instance_data - else "false", + ( + "true" + if self.luis_recognizer_options_v3.include_instance_data + else "false" + ), "true" if self.luis_recognizer_options_v3.include_all_intents else "false", "true" if self.luis_recognizer_options_v3.log else "false", ) diff --git a/libraries/botbuilder-ai/botbuilder/ai/qna/dialogs/qnamaker_dialog.py b/libraries/botbuilder-ai/botbuilder/ai/qna/dialogs/qnamaker_dialog.py index f1b052207..4bcceebaa 100644 --- a/libraries/botbuilder-ai/botbuilder/ai/qna/dialogs/qnamaker_dialog.py +++ b/libraries/botbuilder-ai/botbuilder/ai/qna/dialogs/qnamaker_dialog.py @@ -248,9 +248,9 @@ async def __call_generate_answer(self, step_context: WaterfallStepContext): dialog_options.options.context = QnARequestContext() # Storing the context info - step_context.values[ - QnAMakerDialog.PROPERTY_CURRENT_QUERY - ] = step_context.context.activity.text + step_context.values[QnAMakerDialog.PROPERTY_CURRENT_QUERY] = ( + step_context.context.activity.text + ) # -Check if previous context is present, if yes then put it with the query # -Check for id if query is present in reverse index. diff --git a/libraries/botbuilder-ai/botbuilder/ai/qna/models/ranker_types.py b/libraries/botbuilder-ai/botbuilder/ai/qna/models/ranker_types.py index 55d6799aa..811d61623 100644 --- a/libraries/botbuilder-ai/botbuilder/ai/qna/models/ranker_types.py +++ b/libraries/botbuilder-ai/botbuilder/ai/qna/models/ranker_types.py @@ -3,7 +3,6 @@ class RankerTypes: - """Default Ranker Behaviour. i.e. Ranking based on Questions and Answer.""" DEFAULT = "Default" diff --git a/libraries/botbuilder-ai/botbuilder/ai/qna/qnamaker.py b/libraries/botbuilder-ai/botbuilder/ai/qna/qnamaker.py index e0bf9bae1..825e08e8e 100644 --- a/libraries/botbuilder-ai/botbuilder/ai/qna/qnamaker.py +++ b/libraries/botbuilder-ai/botbuilder/ai/qna/qnamaker.py @@ -182,9 +182,9 @@ async def fill_qna_event( properties: Dict[str, str] = dict() metrics: Dict[str, float] = dict() - properties[ - QnATelemetryConstants.knowledge_base_id_property - ] = self._endpoint.knowledge_base_id + properties[QnATelemetryConstants.knowledge_base_id_property] = ( + self._endpoint.knowledge_base_id + ) text: str = turn_context.activity.text user_name: str = turn_context.activity.from_property.name diff --git a/libraries/botbuilder-ai/botbuilder/ai/qna/utils/train_utils.py b/libraries/botbuilder-ai/botbuilder/ai/qna/utils/train_utils.py index 31c1ee441..b47eca8f9 100644 --- a/libraries/botbuilder-ai/botbuilder/ai/qna/utils/train_utils.py +++ b/libraries/botbuilder-ai/botbuilder/ai/qna/utils/train_utils.py @@ -45,7 +45,9 @@ async def call_train(self, feedback_records: List[FeedbackRecord]): await self._query_train(feedback_records) async def _query_train(self, feedback_records: List[FeedbackRecord]): - url: str = f"{ self._endpoint.host }/knowledgebases/{ self._endpoint.knowledge_base_id }/train" + url: str = ( + f"{ self._endpoint.host }/knowledgebases/{ self._endpoint.knowledge_base_id }/train" + ) payload_body = TrainRequestBody(feedback_records=feedback_records) http_request_helper = HttpRequestUtils(self._http_client) diff --git a/libraries/botbuilder-core/botbuilder/core/bot_framework_adapter.py b/libraries/botbuilder-core/botbuilder/core/bot_framework_adapter.py index 42df5d73a..601693fd3 100644 --- a/libraries/botbuilder-core/botbuilder/core/bot_framework_adapter.py +++ b/libraries/botbuilder-core/botbuilder/core/bot_framework_adapter.py @@ -387,9 +387,11 @@ async def create_conversation( name=ActivityEventNames.create_conversation, channel_id=channel_id, service_url=service_url, - id=resource_response.activity_id - if resource_response.activity_id - else str(uuid.uuid4()), + id=( + resource_response.activity_id + if resource_response.activity_id + else str(uuid.uuid4()) + ), conversation=ConversationAccount( id=resource_response.id, tenant_id=parameters.tenant_id, diff --git a/libraries/botbuilder-core/botbuilder/core/cloud_adapter_base.py b/libraries/botbuilder-core/botbuilder/core/cloud_adapter_base.py index 7e996c90c..dac83b0ce 100644 --- a/libraries/botbuilder-core/botbuilder/core/cloud_adapter_base.py +++ b/libraries/botbuilder-core/botbuilder/core/cloud_adapter_base.py @@ -150,7 +150,9 @@ async def continue_conversation( # pylint: disable=arguments-differ self, reference: ConversationReference, callback: Callable, - bot_app_id: str, + bot_app_id: str = None, # pylint: disable=unused-argument + claims_identity: ClaimsIdentity = None, # pylint: disable=unused-argument + audience: str = None, # pylint: disable=unused-argument ): """ Sends a proactive message to a conversation. @@ -166,6 +168,14 @@ async def continue_conversation( # pylint: disable=arguments-differ and is generally found in the `MicrosoftAppId` parameter in `config.py`. :type bot_app_id: :class:`typing.str` """ + if claims_identity: + return await self.continue_conversation_with_claims( + claims_identity=claims_identity, + reference=reference, + audience=audience, + logic=callback, + ) + return await self.process_proactive( self.create_claims_identity(bot_app_id), get_continuation_activity(reference), diff --git a/libraries/botbuilder-core/botbuilder/core/inspection/inspection_middleware.py b/libraries/botbuilder-core/botbuilder/core/inspection/inspection_middleware.py index 2f84b0efd..bf817c1af 100644 --- a/libraries/botbuilder-core/botbuilder/core/inspection/inspection_middleware.py +++ b/libraries/botbuilder-core/botbuilder/core/inspection/inspection_middleware.py @@ -95,10 +95,10 @@ async def _trace_state(self, context: TurnContext) -> Any: ) if self.conversation_state: - bot_state[ - "conversation_state" - ] = InspectionMiddleware._get_serialized_context( - self.conversation_state, context + bot_state["conversation_state"] = ( + InspectionMiddleware._get_serialized_context( + self.conversation_state, context + ) ) await self._invoke_send(context, session, from_state(bot_state)) diff --git a/libraries/botbuilder-core/botbuilder/core/skills/_skill_handler_impl.py b/libraries/botbuilder-core/botbuilder/core/skills/_skill_handler_impl.py index dcd31a8c6..f50cd54ff 100644 --- a/libraries/botbuilder-core/botbuilder/core/skills/_skill_handler_impl.py +++ b/libraries/botbuilder-core/botbuilder/core/skills/_skill_handler_impl.py @@ -133,9 +133,9 @@ async def on_delete_activity( ) async def callback(turn_context: TurnContext): - turn_context.turn_state[ - self.SKILL_CONVERSATION_REFERENCE_KEY - ] = skill_conversation_reference + turn_context.turn_state[self.SKILL_CONVERSATION_REFERENCE_KEY] = ( + skill_conversation_reference + ) await turn_context.delete_activity(activity_id) await self._adapter.continue_conversation( @@ -160,9 +160,9 @@ async def on_update_activity( async def callback(turn_context: TurnContext): nonlocal resource_response - turn_context.turn_state[ - self.SKILL_CONVERSATION_REFERENCE_KEY - ] = skill_conversation_reference + turn_context.turn_state[self.SKILL_CONVERSATION_REFERENCE_KEY] = ( + skill_conversation_reference + ) activity.apply_conversation_reference( skill_conversation_reference.conversation_reference ) @@ -217,9 +217,9 @@ async def _process_activity( async def callback(context: TurnContext): nonlocal resource_response - context.turn_state[ - SkillHandler.SKILL_CONVERSATION_REFERENCE_KEY - ] = skill_conversation_reference + context.turn_state[SkillHandler.SKILL_CONVERSATION_REFERENCE_KEY] = ( + skill_conversation_reference + ) TurnContext.apply_conversation_reference( activity, skill_conversation_reference.conversation_reference diff --git a/libraries/botbuilder-core/botbuilder/core/telemetry_logger_middleware.py b/libraries/botbuilder-core/botbuilder/core/telemetry_logger_middleware.py index 7f65d95d5..d14c3f7f2 100644 --- a/libraries/botbuilder-core/botbuilder/core/telemetry_logger_middleware.py +++ b/libraries/botbuilder-core/botbuilder/core/telemetry_logger_middleware.py @@ -164,9 +164,9 @@ async def fill_receive_event_properties( BotTelemetryClient.track_event method for the BotMessageReceived event. """ properties = { - TelemetryConstants.FROM_ID_PROPERTY: activity.from_property.id - if activity.from_property - else None, + TelemetryConstants.FROM_ID_PROPERTY: ( + activity.from_property.id if activity.from_property else None + ), TelemetryConstants.CONVERSATION_NAME_PROPERTY: activity.conversation.name, TelemetryConstants.LOCALE_PROPERTY: activity.locale, TelemetryConstants.RECIPIENT_ID_PROPERTY: activity.recipient.id, @@ -179,9 +179,9 @@ async def fill_receive_event_properties( and activity.from_property.name and activity.from_property.name.strip() ): - properties[ - TelemetryConstants.FROM_NAME_PROPERTY - ] = activity.from_property.name + properties[TelemetryConstants.FROM_NAME_PROPERTY] = ( + activity.from_property.name + ) if activity.text and activity.text.strip(): properties[TelemetryConstants.TEXT_PROPERTY] = activity.text if activity.speak and activity.speak.strip(): @@ -224,9 +224,9 @@ async def fill_send_event_properties( activity.attachments ) if activity.from_property.name and activity.from_property.name.strip(): - properties[ - TelemetryConstants.FROM_NAME_PROPERTY - ] = activity.from_property.name + properties[TelemetryConstants.FROM_NAME_PROPERTY] = ( + activity.from_property.name + ) if activity.text and activity.text.strip(): properties[TelemetryConstants.TEXT_PROPERTY] = activity.text if activity.speak and activity.speak.strip(): diff --git a/libraries/botbuilder-core/botbuilder/core/turn_context.py b/libraries/botbuilder-core/botbuilder/core/turn_context.py index 2b4d688af..90ab99bd0 100644 --- a/libraries/botbuilder-core/botbuilder/core/turn_context.py +++ b/libraries/botbuilder-core/botbuilder/core/turn_context.py @@ -5,6 +5,7 @@ from copy import copy, deepcopy from datetime import datetime from typing import List, Callable, Union, Dict +from botframework.connector import Channels from botbuilder.schema import ( Activity, ActivityTypes, @@ -328,7 +329,13 @@ def get_conversation_reference(activity: Activity) -> ConversationReference: :return: """ return ConversationReference( - activity_id=activity.id, + activity_id=( + activity.id + if activity.type != ActivityTypes.conversation_update + and activity.channel_id != Channels.direct_line + and activity.channel_id != Channels.webchat + else None + ), user=copy(activity.from_property), bot=copy(activity.recipient), conversation=copy(activity.conversation), diff --git a/libraries/botbuilder-core/tests/skills/test_skill_handler.py b/libraries/botbuilder-core/tests/skills/test_skill_handler.py index 722a944b8..66d79c2ce 100644 --- a/libraries/botbuilder-core/tests/skills/test_skill_handler.py +++ b/libraries/botbuilder-core/tests/skills/test_skill_handler.py @@ -244,9 +244,9 @@ def setUpClass(cls): cls._claims_identity.claims[AuthenticationConstants.AUDIENCE_CLAIM] = cls.bot_id cls._claims_identity.claims[AuthenticationConstants.APP_ID_CLAIM] = cls.skill_id - cls._claims_identity.claims[ - AuthenticationConstants.SERVICE_URL_CLAIM - ] = "http://testbot.com/api/messages" + cls._claims_identity.claims[AuthenticationConstants.SERVICE_URL_CLAIM] = ( + "http://testbot.com/api/messages" + ) cls._conversation_reference = ConversationReference( conversation=ConversationAccount(id=str(uuid4())), service_url="http://testbot.com/api/messages", diff --git a/libraries/botbuilder-core/tests/teams/test_teams_activity_handler.py b/libraries/botbuilder-core/tests/teams/test_teams_activity_handler.py index 9a1872952..32e9f2edb 100644 --- a/libraries/botbuilder-core/tests/teams/test_teams_activity_handler.py +++ b/libraries/botbuilder-core/tests/teams/test_teams_activity_handler.py @@ -595,9 +595,9 @@ async def test_on_teams_members_added_activity(self): mock_connector_client = await SimpleAdapter.create_connector_client( self, turn_context.activity.service_url ) - turn_context.turn_state[ - BotAdapter.BOT_CONNECTOR_CLIENT_KEY - ] = mock_connector_client + turn_context.turn_state[BotAdapter.BOT_CONNECTOR_CLIENT_KEY] = ( + mock_connector_client + ) # Act bot = TestingTeamsActivityHandler() diff --git a/libraries/botbuilder-dialogs/botbuilder/dialogs/_user_token_access.py b/libraries/botbuilder-dialogs/botbuilder/dialogs/_user_token_access.py index cd2874ad4..0aa005789 100644 --- a/libraries/botbuilder-dialogs/botbuilder/dialogs/_user_token_access.py +++ b/libraries/botbuilder-dialogs/botbuilder/dialogs/_user_token_access.py @@ -56,9 +56,11 @@ async def get_sign_in_resource( turn_context, settings.oath_app_credentials, settings.connection_name, - turn_context.activity.from_property.id - if turn_context.activity and turn_context.activity.from_property - else None, + ( + turn_context.activity.from_property.id + if turn_context.activity and turn_context.activity.from_property + else None + ), ) raise TypeError("OAuthPrompt is not supported by the current adapter") @@ -78,9 +80,11 @@ async def sign_out_user(turn_context: TurnContext, settings: OAuthPromptSettings return await turn_context.adapter.sign_out_user( turn_context, settings.connection_name, - turn_context.activity.from_property.id - if turn_context.activity and turn_context.activity.from_property - else None, + ( + turn_context.activity.from_property.id + if turn_context.activity and turn_context.activity.from_property + else None + ), settings.oath_app_credentials, ) diff --git a/libraries/botbuilder-dialogs/botbuilder/dialogs/dialog_context.py b/libraries/botbuilder-dialogs/botbuilder/dialogs/dialog_context.py index f221708f1..0181e67a2 100644 --- a/libraries/botbuilder-dialogs/botbuilder/dialogs/dialog_context.py +++ b/libraries/botbuilder-dialogs/botbuilder/dialogs/dialog_context.py @@ -408,9 +408,9 @@ def __set_exception_context_data(self, exception: Exception): current_dc = current_dc.parent exception.data[type(self).__name__] = { - "active_dialog": None - if self.active_dialog is None - else self.active_dialog.id, + "active_dialog": ( + None if self.active_dialog is None else self.active_dialog.id + ), "parent": None if self.parent is None else self.parent.active_dialog.id, "stack": self.stack, } diff --git a/libraries/botbuilder-dialogs/botbuilder/dialogs/dialog_extensions.py b/libraries/botbuilder-dialogs/botbuilder/dialogs/dialog_extensions.py index a5a8a34ab..f9fb67c96 100644 --- a/libraries/botbuilder-dialogs/botbuilder/dialogs/dialog_extensions.py +++ b/libraries/botbuilder-dialogs/botbuilder/dialogs/dialog_extensions.py @@ -50,9 +50,9 @@ async def _internal_run( # get the DialogStateManager configuration dialog_state_manager = DialogStateManager(dialog_context) await dialog_state_manager.load_all_scopes() - dialog_context.context.turn_state[ - dialog_state_manager.__class__.__name__ - ] = dialog_state_manager + dialog_context.context.turn_state[dialog_state_manager.__class__.__name__] = ( + dialog_state_manager + ) # Loop as long as we are getting valid OnError handled we should continue executing the actions for the turn. @@ -130,9 +130,11 @@ async def __inner_run( type=ActivityTypes.end_of_conversation, value=result.result, locale=turn_context.activity.locale, - code=EndOfConversationCodes.completed_successfully - if result.status == DialogTurnStatus.Complete - else EndOfConversationCodes.user_cancelled, + code=( + EndOfConversationCodes.completed_successfully + if result.status == DialogTurnStatus.Complete + else EndOfConversationCodes.user_cancelled + ), ) await turn_context.send_activity(activity) diff --git a/libraries/botbuilder-dialogs/botbuilder/dialogs/dialog_manager.py b/libraries/botbuilder-dialogs/botbuilder/dialogs/dialog_manager.py index 84dc108c2..df7a5569e 100644 --- a/libraries/botbuilder-dialogs/botbuilder/dialogs/dialog_manager.py +++ b/libraries/botbuilder-dialogs/botbuilder/dialogs/dialog_manager.py @@ -291,9 +291,11 @@ async def handle_skill_on_turn( type=ActivityTypes.end_of_conversation, value=turn_result.result, locale=turn_context.activity.locale, - code=EndOfConversationCodes.completed_successfully - if turn_result.status == DialogTurnStatus.Complete - else EndOfConversationCodes.user_cancelled, + code=( + EndOfConversationCodes.completed_successfully + if turn_result.status == DialogTurnStatus.Complete + else EndOfConversationCodes.user_cancelled + ), ) await turn_context.send_activity(activity) diff --git a/libraries/botbuilder-dialogs/botbuilder/dialogs/memory/dialog_state_manager.py b/libraries/botbuilder-dialogs/botbuilder/dialogs/memory/dialog_state_manager.py index c1bf6c106..a11ab9c3a 100644 --- a/libraries/botbuilder-dialogs/botbuilder/dialogs/memory/dialog_state_manager.py +++ b/libraries/botbuilder-dialogs/botbuilder/dialogs/memory/dialog_state_manager.py @@ -94,9 +94,9 @@ def __init__( self._configuration.path_resolvers.append(path_resolver) # cache for any other new dialog_state_manager instances in this turn. - dialog_context.context.turn_state[ - self._configuration.__class__.__name__ - ] = self._configuration + dialog_context.context.turn_state[self._configuration.__class__.__name__] = ( + self._configuration + ) def __len__(self) -> int: """ diff --git a/libraries/botbuilder-dialogs/botbuilder/dialogs/prompts/oauth_prompt.py b/libraries/botbuilder-dialogs/botbuilder/dialogs/prompts/oauth_prompt.py index 55fae561f..e0db0e2bb 100644 --- a/libraries/botbuilder-dialogs/botbuilder/dialogs/prompts/oauth_prompt.py +++ b/libraries/botbuilder-dialogs/botbuilder/dialogs/prompts/oauth_prompt.py @@ -415,9 +415,9 @@ async def _recognize_token( state.scope, ) - context.turn_state[ - BotAdapter.BOT_CONNECTOR_CLIENT_KEY - ] = connector_client + context.turn_state[BotAdapter.BOT_CONNECTOR_CLIENT_KEY] = ( + connector_client + ) elif OAuthPrompt._is_teams_verification_invoke(context): code = context.activity.value["state"] diff --git a/libraries/botbuilder-dialogs/botbuilder/dialogs/skills/skill_dialog.py b/libraries/botbuilder-dialogs/botbuilder/dialogs/skills/skill_dialog.py index 81b67de18..e5be50c24 100644 --- a/libraries/botbuilder-dialogs/botbuilder/dialogs/skills/skill_dialog.py +++ b/libraries/botbuilder-dialogs/botbuilder/dialogs/skills/skill_dialog.py @@ -60,17 +60,17 @@ async def begin_dialog(self, dialog_context: DialogContext, options: object = No ) # Store delivery mode in dialog state for later use. - dialog_context.active_dialog.state[ - self._deliver_mode_state_key - ] = dialog_args.activity.delivery_mode + dialog_context.active_dialog.state[self._deliver_mode_state_key] = ( + dialog_args.activity.delivery_mode + ) # Create the conversationId and store it in the dialog context state so we can use it later skill_conversation_id = await self._create_skill_conversation_id( dialog_context.context, dialog_context.context.activity ) - dialog_context.active_dialog.state[ - SkillDialog.SKILLCONVERSATIONIDSTATEKEY - ] = skill_conversation_id + dialog_context.active_dialog.state[SkillDialog.SKILLCONVERSATIONIDSTATEKEY] = ( + skill_conversation_id + ) # Send the activity to the skill. eoc_activity = await self._send_to_skill( diff --git a/libraries/botbuilder-dialogs/tests/test_dialog_manager.py b/libraries/botbuilder-dialogs/tests/test_dialog_manager.py index 1846ce42f..57b264e60 100644 --- a/libraries/botbuilder-dialogs/tests/test_dialog_manager.py +++ b/libraries/botbuilder-dialogs/tests/test_dialog_manager.py @@ -120,17 +120,13 @@ async def logic(context: TurnContext): if test_case != SkillFlowTestCase.root_bot_only: # Create a skill ClaimsIdentity and put it in turn_state so isSkillClaim() returns True. claims_identity = ClaimsIdentity({}, False) - claims_identity.claims[ - "ver" - ] = "2.0" # AuthenticationConstants.VersionClaim - claims_identity.claims[ - "aud" - ] = ( + claims_identity.claims["ver"] = ( + "2.0" # AuthenticationConstants.VersionClaim + ) + claims_identity.claims["aud"] = ( SimpleComponentDialog.skill_bot_id ) # AuthenticationConstants.AudienceClaim - claims_identity.claims[ - "azp" - ] = ( + claims_identity.claims["azp"] = ( SimpleComponentDialog.parent_bot_id ) # AuthenticationConstants.AuthorizedParty context.turn_state[BotAdapter.BOT_IDENTITY_KEY] = claims_identity diff --git a/libraries/botbuilder-integration-aiohttp/botbuilder/integration/aiohttp/bot_framework_http_client.py b/libraries/botbuilder-integration-aiohttp/botbuilder/integration/aiohttp/bot_framework_http_client.py index cf46a0081..b09b3ac93 100644 --- a/libraries/botbuilder-integration-aiohttp/botbuilder/integration/aiohttp/bot_framework_http_client.py +++ b/libraries/botbuilder-integration-aiohttp/botbuilder/integration/aiohttp/bot_framework_http_client.py @@ -27,7 +27,6 @@ class BotFrameworkHttpClient(BotFrameworkClient): - """ A skill host adapter that implements the API to forward activity to a skill and implements routing ChannelAPI calls from the skill up through the bot/adapter. @@ -49,7 +48,6 @@ def __init__( self._credential_provider = credential_provider self._channel_provider = channel_provider self._logger = logger - self._session = aiohttp.ClientSession() async def post_activity( self, @@ -127,11 +125,14 @@ async def _post_content( ) json_content = json.dumps(activity.serialize()) - resp = await self._session.post( - to_url, - data=json_content.encode("utf-8"), - headers=headers_dict, - ) + + async with aiohttp.ClientSession() as session: + resp = await session.post( + to_url, + data=json_content.encode("utf-8"), + headers=headers_dict, + ) + resp.raise_for_status() data = (await resp.read()).decode() return resp.status, json.loads(data) if data else None diff --git a/libraries/botbuilder-integration-aiohttp/botbuilder/integration/aiohttp/skills/aio_http_client_factory.py b/libraries/botbuilder-integration-aiohttp/botbuilder/integration/aiohttp/skills/aio_http_client_factory.py index 84235e86b..62d4ae539 100644 --- a/libraries/botbuilder-integration-aiohttp/botbuilder/integration/aiohttp/skills/aio_http_client_factory.py +++ b/libraries/botbuilder-integration-aiohttp/botbuilder/integration/aiohttp/skills/aio_http_client_factory.py @@ -31,13 +31,11 @@ async def read_content_str(self) -> str: class _HttpClientImplementation(HttpClientBase): - def __init__(self) -> None: - self._session = ClientSession() - async def post(self, *, request: HttpRequest) -> HttpResponseBase: - aio_response = await self._session.post( - request.request_uri, data=request.content, headers=request.headers - ) + async with ClientSession() as session: + aio_response = await session.post( + request.request_uri, data=request.content, headers=request.headers + ) return _HttpResponseImpl(aio_response) diff --git a/libraries/botbuilder-integration-aiohttp/tests/skills/test_skill_http_client.py b/libraries/botbuilder-integration-aiohttp/tests/skills/test_skill_http_client.py index b3db490b7..eba3352e1 100644 --- a/libraries/botbuilder-integration-aiohttp/tests/skills/test_skill_http_client.py +++ b/libraries/botbuilder-integration-aiohttp/tests/skills/test_skill_http_client.py @@ -200,6 +200,5 @@ async def _create_http_client_with_mock_handler( # pylint: disable=protected-access client = SkillHttpClient(Mock(), id_factory, channel_provider) client._post_content = value_function - await client._session.close() return client diff --git a/libraries/botframework-connector/botframework/connector/auth/certificate_app_credentials.py b/libraries/botframework-connector/botframework/connector/auth/certificate_app_credentials.py index a458ce5bb..b39511d82 100644 --- a/libraries/botframework-connector/botframework/connector/auth/certificate_app_credentials.py +++ b/libraries/botframework-connector/botframework/connector/auth/certificate_app_credentials.py @@ -77,9 +77,9 @@ def __get_msal_app(self): client_credential={ "thumbprint": self.certificate_thumbprint, "private_key": self.certificate_private_key, - "public_certificate": self.certificate_public - if self.certificate_public - else None, + "public_certificate": ( + self.certificate_public if self.certificate_public else None + ), }, ) diff --git a/libraries/botframework-connector/botframework/connector/auth/government_constants.py b/libraries/botframework-connector/botframework/connector/auth/government_constants.py index aba16e396..3e109d3b6 100644 --- a/libraries/botframework-connector/botframework/connector/auth/government_constants.py +++ b/libraries/botframework-connector/botframework/connector/auth/government_constants.py @@ -5,7 +5,6 @@ class GovernmentConstants(ABC): - """ Government Channel Service property value """ diff --git a/libraries/botframework-connector/tests/test_skill_validation.py b/libraries/botframework-connector/tests/test_skill_validation.py index a7667c3d7..bfa4951ce 100644 --- a/libraries/botframework-connector/tests/test_skill_validation.py +++ b/libraries/botframework-connector/tests/test_skill_validation.py @@ -37,9 +37,9 @@ def test_is_skill_claim_test(self): assert not SkillValidation.is_skill_claim(claims) # Emulator Audience claim - claims[ - AuthenticationConstants.AUDIENCE_CLAIM - ] = AuthenticationConstants.TO_BOT_FROM_CHANNEL_TOKEN_ISSUER + claims[AuthenticationConstants.AUDIENCE_CLAIM] = ( + AuthenticationConstants.TO_BOT_FROM_CHANNEL_TOKEN_ISSUER + ) assert not SkillValidation.is_skill_claim(claims) # No AppId claim @@ -53,9 +53,9 @@ def test_is_skill_claim_test(self): # Anonymous skill app id del claims[AuthenticationConstants.APP_ID_CLAIM] - claims[ - AuthenticationConstants.APP_ID_CLAIM - ] = AuthenticationConstants.ANONYMOUS_SKILL_APP_ID + claims[AuthenticationConstants.APP_ID_CLAIM] = ( + AuthenticationConstants.ANONYMOUS_SKILL_APP_ID + ) assert SkillValidation.is_skill_claim(claims) # All checks pass, should be good now From c6182f146383927c45c0408b5763183ee1a37148 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 May 2024 13:27:32 -0500 Subject: [PATCH 11/19] --- (#2109) updated-dependencies: - dependency-name: requests dependency-type: direct:production dependency-group: pip ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: tracyboehrer --- tests/functional-tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/functional-tests/requirements.txt b/tests/functional-tests/requirements.txt index d846e6294..d00d7a830 100644 --- a/tests/functional-tests/requirements.txt +++ b/tests/functional-tests/requirements.txt @@ -1,2 +1,2 @@ -requests==2.31.0 +requests==2.32.0 aiounittest==1.3.0 From 8e127e7592f417ea4027e7c32a50292026c2f7a0 Mon Sep 17 00:00:00 2001 From: tracyboehrer Date: Thu, 23 May 2024 16:15:16 -0500 Subject: [PATCH 12/19] Updated README with supported Python versions (#2113) Co-authored-by: Tracy Boehrer --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 39b134ac1..aedd0482b 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ If you want to debug an issue, would like to [contribute](#contributing-code), o ### Prerequisites - [Git](https://git-scm.com/downloads) -- [Python 3.8.17](https://www.python.org/downloads/) +- [Python 3.8.17 - 3.11.x](https://www.python.org/downloads/) Python "Virtual Environments" allow Python packages to be installed in an isolated location for a particular application, rather than being installed globally, as such it is common practice to use them. Click [here](https://packaging.python.org/tutorials/installing-packages/#creating-virtual-environments) to learn more about creating _and activating_ Virtual Environments in Python. From b33dc49e1cc51c893b1585974bafddaab68ebbe4 Mon Sep 17 00:00:00 2001 From: tracyboehrer Date: Tue, 28 May 2024 11:45:36 -0500 Subject: [PATCH 13/19] Bump aiohttp in SDK pacakges (#2115) Co-authored-by: Tracy Boehrer --- libraries/botbuilder-ai/setup.py | 2 +- libraries/botbuilder-integration-aiohttp/setup.py | 2 +- .../botbuilder-integration-applicationinsights-aiohttp/setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/botbuilder-ai/setup.py b/libraries/botbuilder-ai/setup.py index 989f1755c..bc9f83beb 100644 --- a/libraries/botbuilder-ai/setup.py +++ b/libraries/botbuilder-ai/setup.py @@ -8,7 +8,7 @@ "azure-cognitiveservices-language-luis==0.2.0", "botbuilder-schema==4.16.0", "botbuilder-core==4.16.0", - "aiohttp==3.9.3", + "aiohttp==3.9.4", ] TESTS_REQUIRES = ["aiounittest>=1.1.0"] diff --git a/libraries/botbuilder-integration-aiohttp/setup.py b/libraries/botbuilder-integration-aiohttp/setup.py index fd743ecf3..85b06a449 100644 --- a/libraries/botbuilder-integration-aiohttp/setup.py +++ b/libraries/botbuilder-integration-aiohttp/setup.py @@ -10,7 +10,7 @@ "botframework-connector==4.16.0", "botbuilder-core==4.16.0", "yarl>=1.8.1", - "aiohttp==3.9.3", + "aiohttp==3.9.4", ] root = os.path.abspath(os.path.dirname(__file__)) diff --git a/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py b/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py index 185324083..5429b1cf3 100644 --- a/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py +++ b/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py @@ -6,7 +6,7 @@ REQUIRES = [ "applicationinsights>=0.11.9", - "aiohttp==3.9.3", + "aiohttp==3.9.4", "botbuilder-schema==4.16.0", "botframework-connector==4.16.0", "botbuilder-core==4.16.0", From bc3b6f4125e6f4ca5e6cae2dd25c62233e8ef508 Mon Sep 17 00:00:00 2001 From: tracyboehrer Date: Thu, 30 May 2024 09:44:27 -0500 Subject: [PATCH 14/19] Parity in CloudAdapterBase.update_activity to use correct activity id (#2120) Co-authored-by: Tracy Boehrer --- libraries/botbuilder-core/botbuilder/core/cloud_adapter_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/botbuilder-core/botbuilder/core/cloud_adapter_base.py b/libraries/botbuilder-core/botbuilder/core/cloud_adapter_base.py index dac83b0ce..454861257 100644 --- a/libraries/botbuilder-core/botbuilder/core/cloud_adapter_base.py +++ b/libraries/botbuilder-core/botbuilder/core/cloud_adapter_base.py @@ -120,7 +120,7 @@ async def update_activity(self, context: TurnContext, activity: Activity): raise Error("Unable to extract ConnectorClient from turn context.") response = await connector_client.conversations.update_activity( - activity.conversation.id, activity.reply_to_id, activity + activity.conversation.id, activity.id, activity ) response_id = response.id if response and response.id else None From 01449b5a9f33f55297e420c1c0cc2403c63ad67c Mon Sep 17 00:00:00 2001 From: harvey-k <12886479+harvey-k@users.noreply.github.com> Date: Fri, 31 May 2024 14:23:35 -0400 Subject: [PATCH 15/19] fix populating token issuers (#2117) #2116 Co-authored-by: tracyboehrer --- .../botframework/connector/auth/skill_validation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/botframework-connector/botframework/connector/auth/skill_validation.py b/libraries/botframework-connector/botframework/connector/auth/skill_validation.py index b708e27cb..8c35f1b0a 100644 --- a/libraries/botframework-connector/botframework/connector/auth/skill_validation.py +++ b/libraries/botframework-connector/botframework/connector/auth/skill_validation.py @@ -120,7 +120,7 @@ async def authenticate_channel_token( ) if auth_configuration.valid_token_issuers: - token_validation_parameters.issuer.append( + token_validation_parameters.issuer.extend( auth_configuration.valid_token_issuers ) From 4b194836a2d540b58bb8937e8b2c9808ec202949 Mon Sep 17 00:00:00 2001 From: gandiddi <164224646+gandiddi@users.noreply.github.com> Date: Tue, 11 Jun 2024 21:59:50 +0530 Subject: [PATCH 16/19] Resolved the inconsistency in response formats between the Python Echo bot template and the C# and JavaScript Echo bot templates. (#2124) --- generators/app/templates/echo/{{cookiecutter.bot_name}}/bot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/app/templates/echo/{{cookiecutter.bot_name}}/bot.py b/generators/app/templates/echo/{{cookiecutter.bot_name}}/bot.py index ca7562263..89b2eefdb 100644 --- a/generators/app/templates/echo/{{cookiecutter.bot_name}}/bot.py +++ b/generators/app/templates/echo/{{cookiecutter.bot_name}}/bot.py @@ -9,7 +9,7 @@ class MyBot(ActivityHandler): # See https://aka.ms/about-bot-activity-message to learn more about the message and other activity types. async def on_message_activity(self, turn_context: TurnContext): - await turn_context.send_activity(f"You said '{ turn_context.activity.text }'") + await turn_context.send_activity(f"Echo: '{ turn_context.activity.text }'") async def on_members_added_activity( self, From 03f9d10ddfd5f6f3fea9705e5e4057fb6819eac6 Mon Sep 17 00:00:00 2001 From: tracyboehrer Date: Fri, 21 Jun 2024 07:39:01 -0500 Subject: [PATCH 17/19] Removed invalid exchange_token check (#2121) Co-authored-by: Tracy Boehrer --- .../botbuilder/dialogs/prompts/oauth_prompt.py | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/libraries/botbuilder-dialogs/botbuilder/dialogs/prompts/oauth_prompt.py b/libraries/botbuilder-dialogs/botbuilder/dialogs/prompts/oauth_prompt.py index e0db0e2bb..c5b066913 100644 --- a/libraries/botbuilder-dialogs/botbuilder/dialogs/prompts/oauth_prompt.py +++ b/libraries/botbuilder-dialogs/botbuilder/dialogs/prompts/oauth_prompt.py @@ -477,19 +477,6 @@ async def _recognize_token( " ConnectionName in the TokenExchangeInvokeRequest", ) ) - elif not getattr(context.adapter, "exchange_token"): - # Token Exchange not supported in the adapter. - await context.send_activity( - self._get_token_exchange_invoke_response( - int(HTTPStatus.BAD_GATEWAY), - "The bot's BotAdapter does not support token exchange operations." - " Ensure the bot's Adapter supports the ExtendedUserTokenProvider interface.", - ) - ) - - raise AttributeError( - "OAuthPrompt._recognize_token(): not supported by the current adapter." - ) else: # No errors. Proceed with token exchange. token_exchange_response = None From fc9451423cd0ff06c852a1fbd286f53a7f2b4e3f Mon Sep 17 00:00:00 2001 From: tracyboehrer Date: Fri, 21 Jun 2024 09:03:06 -0500 Subject: [PATCH 18/19] Bump azure-storage-queue (#2126) Co-authored-by: Tracy Boehrer --- libraries/botbuilder-azure/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/botbuilder-azure/setup.py b/libraries/botbuilder-azure/setup.py index 8d698a34f..85b4bf5e5 100644 --- a/libraries/botbuilder-azure/setup.py +++ b/libraries/botbuilder-azure/setup.py @@ -7,7 +7,7 @@ REQUIRES = [ "azure-cosmos==3.2.0", "azure-storage-blob==12.7.0", - "azure-storage-queue==12.1.5", + "azure-storage-queue==12.4.0", "botbuilder-schema==4.16.0", "botframework-connector==4.16.0", "jsonpickle>=1.2,<1.5", From d7cd9374104e19d1599635036f304480d2ff4274 Mon Sep 17 00:00:00 2001 From: tracyboehrer Date: Fri, 21 Jun 2024 09:34:42 -0500 Subject: [PATCH 19/19] aiohttp 3.9.5 (#2127) Co-authored-by: Tracy Boehrer --- libraries/botbuilder-ai/setup.py | 2 +- libraries/botbuilder-integration-aiohttp/setup.py | 2 +- .../botbuilder-integration-applicationinsights-aiohttp/setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/botbuilder-ai/setup.py b/libraries/botbuilder-ai/setup.py index bc9f83beb..bd954661b 100644 --- a/libraries/botbuilder-ai/setup.py +++ b/libraries/botbuilder-ai/setup.py @@ -8,7 +8,7 @@ "azure-cognitiveservices-language-luis==0.2.0", "botbuilder-schema==4.16.0", "botbuilder-core==4.16.0", - "aiohttp==3.9.4", + "aiohttp==3.9.5", ] TESTS_REQUIRES = ["aiounittest>=1.1.0"] diff --git a/libraries/botbuilder-integration-aiohttp/setup.py b/libraries/botbuilder-integration-aiohttp/setup.py index 85b06a449..b8d84a9aa 100644 --- a/libraries/botbuilder-integration-aiohttp/setup.py +++ b/libraries/botbuilder-integration-aiohttp/setup.py @@ -10,7 +10,7 @@ "botframework-connector==4.16.0", "botbuilder-core==4.16.0", "yarl>=1.8.1", - "aiohttp==3.9.4", + "aiohttp==3.9.5", ] root = os.path.abspath(os.path.dirname(__file__)) diff --git a/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py b/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py index 5429b1cf3..0a465eaf1 100644 --- a/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py +++ b/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py @@ -6,7 +6,7 @@ REQUIRES = [ "applicationinsights>=0.11.9", - "aiohttp==3.9.4", + "aiohttp==3.9.5", "botbuilder-schema==4.16.0", "botframework-connector==4.16.0", "botbuilder-core==4.16.0",