From e94b4334a6aa94ed13205ef45363be58376a33e1 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 12 Nov 2025 20:02:58 +0000 Subject: [PATCH 1/2] Initial plan From d66ef056c7e86ab49aa52ed418565ddb946da8a0 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 12 Nov 2025 20:12:00 +0000 Subject: [PATCH 2/2] Move ErrorMessage from hosting-core to activity package - Moved error_message.py from microsoft-agents-hosting-core to microsoft-agents-activity - Updated all package imports to use new location (microsoft_agents.activity.errors) - Maintained backward compatibility via re-export in hosting-core - Verified all existing tests pass - Resolved circular dependency (hosting-core no longer depends on activity for ErrorMessage) Co-authored-by: cleemullins <1165321+cleemullins@users.noreply.github.com> --- .../microsoft_agents/activity/errors/__init__.py | 3 +-- .../microsoft_agents/activity}/errors/error_message.py | 0 .../microsoft_agents/activity/errors/error_resources.py | 2 +- .../microsoft_agents/authentication/msal/errors/__init__.py | 2 +- .../authentication/msal/errors/error_resources.py | 2 +- .../microsoft_agents/copilotstudio/client/errors/__init__.py | 2 +- .../copilotstudio/client/errors/error_resources.py | 2 +- .../microsoft_agents/hosting/core/errors/__init__.py | 3 ++- .../microsoft_agents/hosting/core/errors/error_resources.py | 2 +- .../microsoft_agents/hosting/teams/errors/__init__.py | 2 +- .../microsoft_agents/hosting/teams/errors/error_resources.py | 2 +- .../microsoft_agents/storage/blob/errors/__init__.py | 2 +- .../microsoft_agents/storage/blob/errors/error_resources.py | 2 +- .../microsoft_agents/storage/cosmos/errors/__init__.py | 2 +- .../microsoft_agents/storage/cosmos/errors/error_resources.py | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) rename libraries/{microsoft-agents-hosting-core/microsoft_agents/hosting/core => microsoft-agents-activity/microsoft_agents/activity}/errors/error_message.py (100%) diff --git a/libraries/microsoft-agents-activity/microsoft_agents/activity/errors/__init__.py b/libraries/microsoft-agents-activity/microsoft_agents/activity/errors/__init__.py index e25666bab..90283f53c 100644 --- a/libraries/microsoft-agents-activity/microsoft_agents/activity/errors/__init__.py +++ b/libraries/microsoft-agents-activity/microsoft_agents/activity/errors/__init__.py @@ -5,8 +5,7 @@ Error resources for Microsoft Agents Activity package. """ -from microsoft_agents.hosting.core.errors import ErrorMessage - +from .error_message import ErrorMessage from .error_resources import ActivityErrorResources # Singleton instance diff --git a/libraries/microsoft-agents-hosting-core/microsoft_agents/hosting/core/errors/error_message.py b/libraries/microsoft-agents-activity/microsoft_agents/activity/errors/error_message.py similarity index 100% rename from libraries/microsoft-agents-hosting-core/microsoft_agents/hosting/core/errors/error_message.py rename to libraries/microsoft-agents-activity/microsoft_agents/activity/errors/error_message.py diff --git a/libraries/microsoft-agents-activity/microsoft_agents/activity/errors/error_resources.py b/libraries/microsoft-agents-activity/microsoft_agents/activity/errors/error_resources.py index d652496be..0b0b68e99 100644 --- a/libraries/microsoft-agents-activity/microsoft_agents/activity/errors/error_resources.py +++ b/libraries/microsoft-agents-activity/microsoft_agents/activity/errors/error_resources.py @@ -7,7 +7,7 @@ Error codes are in the range -64000 to -64999. """ -from microsoft_agents.hosting.core.errors import ErrorMessage +from .error_message import ErrorMessage class ActivityErrorResources: diff --git a/libraries/microsoft-agents-authentication-msal/microsoft_agents/authentication/msal/errors/__init__.py b/libraries/microsoft-agents-authentication-msal/microsoft_agents/authentication/msal/errors/__init__.py index 2458a0701..9ef9ffae4 100644 --- a/libraries/microsoft-agents-authentication-msal/microsoft_agents/authentication/msal/errors/__init__.py +++ b/libraries/microsoft-agents-authentication-msal/microsoft_agents/authentication/msal/errors/__init__.py @@ -5,7 +5,7 @@ Error resources for Microsoft Agents Authentication MSAL package. """ -from microsoft_agents.hosting.core.errors import ErrorMessage +from microsoft_agents.activity.errors import ErrorMessage from .error_resources import AuthenticationErrorResources diff --git a/libraries/microsoft-agents-authentication-msal/microsoft_agents/authentication/msal/errors/error_resources.py b/libraries/microsoft-agents-authentication-msal/microsoft_agents/authentication/msal/errors/error_resources.py index 0c97a34a7..1afb4ac26 100644 --- a/libraries/microsoft-agents-authentication-msal/microsoft_agents/authentication/msal/errors/error_resources.py +++ b/libraries/microsoft-agents-authentication-msal/microsoft_agents/authentication/msal/errors/error_resources.py @@ -7,7 +7,7 @@ Error codes are in the range -60000 to -60999. """ -from microsoft_agents.hosting.core.errors import ErrorMessage +from microsoft_agents.activity.errors import ErrorMessage class AuthenticationErrorResources: diff --git a/libraries/microsoft-agents-copilotstudio-client/microsoft_agents/copilotstudio/client/errors/__init__.py b/libraries/microsoft-agents-copilotstudio-client/microsoft_agents/copilotstudio/client/errors/__init__.py index a19b7c1ac..5e598b6c7 100644 --- a/libraries/microsoft-agents-copilotstudio-client/microsoft_agents/copilotstudio/client/errors/__init__.py +++ b/libraries/microsoft-agents-copilotstudio-client/microsoft_agents/copilotstudio/client/errors/__init__.py @@ -5,7 +5,7 @@ Error resources for Microsoft Agents Copilot Studio Client package. """ -from microsoft_agents.hosting.core.errors import ErrorMessage +from microsoft_agents.activity.errors import ErrorMessage from .error_resources import CopilotStudioErrorResources diff --git a/libraries/microsoft-agents-copilotstudio-client/microsoft_agents/copilotstudio/client/errors/error_resources.py b/libraries/microsoft-agents-copilotstudio-client/microsoft_agents/copilotstudio/client/errors/error_resources.py index 3c32eb42a..8f60434f0 100644 --- a/libraries/microsoft-agents-copilotstudio-client/microsoft_agents/copilotstudio/client/errors/error_resources.py +++ b/libraries/microsoft-agents-copilotstudio-client/microsoft_agents/copilotstudio/client/errors/error_resources.py @@ -7,7 +7,7 @@ Error codes are in the range -65000 to -65999. """ -from microsoft_agents.hosting.core.errors import ErrorMessage +from microsoft_agents.activity.errors import ErrorMessage class CopilotStudioErrorResources: diff --git a/libraries/microsoft-agents-hosting-core/microsoft_agents/hosting/core/errors/__init__.py b/libraries/microsoft-agents-hosting-core/microsoft_agents/hosting/core/errors/__init__.py index d072fbd31..bf6be2032 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft_agents/hosting/core/errors/__init__.py +++ b/libraries/microsoft-agents-hosting-core/microsoft_agents/hosting/core/errors/__init__.py @@ -8,7 +8,8 @@ following the pattern established in the C# SDK. """ -from .error_message import ErrorMessage +from microsoft_agents.activity.errors import ErrorMessage + from .error_resources import ErrorResources # Singleton instance diff --git a/libraries/microsoft-agents-hosting-core/microsoft_agents/hosting/core/errors/error_resources.py b/libraries/microsoft-agents-hosting-core/microsoft_agents/hosting/core/errors/error_resources.py index 026393003..4900cebe2 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft_agents/hosting/core/errors/error_resources.py +++ b/libraries/microsoft-agents-hosting-core/microsoft_agents/hosting/core/errors/error_resources.py @@ -9,7 +9,7 @@ General/validation errors are in the range -66000 to -66999. """ -from .error_message import ErrorMessage +from microsoft_agents.activity.errors import ErrorMessage class ErrorResources: diff --git a/libraries/microsoft-agents-hosting-teams/microsoft_agents/hosting/teams/errors/__init__.py b/libraries/microsoft-agents-hosting-teams/microsoft_agents/hosting/teams/errors/__init__.py index fcf1c7bfa..8d767abf6 100644 --- a/libraries/microsoft-agents-hosting-teams/microsoft_agents/hosting/teams/errors/__init__.py +++ b/libraries/microsoft-agents-hosting-teams/microsoft_agents/hosting/teams/errors/__init__.py @@ -5,7 +5,7 @@ Error resources for Microsoft Agents Hosting Teams package. """ -from microsoft_agents.hosting.core.errors import ErrorMessage +from microsoft_agents.activity.errors import ErrorMessage from .error_resources import TeamsErrorResources diff --git a/libraries/microsoft-agents-hosting-teams/microsoft_agents/hosting/teams/errors/error_resources.py b/libraries/microsoft-agents-hosting-teams/microsoft_agents/hosting/teams/errors/error_resources.py index 008953042..f324224f2 100644 --- a/libraries/microsoft-agents-hosting-teams/microsoft_agents/hosting/teams/errors/error_resources.py +++ b/libraries/microsoft-agents-hosting-teams/microsoft_agents/hosting/teams/errors/error_resources.py @@ -7,7 +7,7 @@ Error codes are in the range -62000 to -62999. """ -from microsoft_agents.hosting.core.errors import ErrorMessage +from microsoft_agents.activity.errors import ErrorMessage class TeamsErrorResources: diff --git a/libraries/microsoft-agents-storage-blob/microsoft_agents/storage/blob/errors/__init__.py b/libraries/microsoft-agents-storage-blob/microsoft_agents/storage/blob/errors/__init__.py index 15361d3fe..a245056d8 100644 --- a/libraries/microsoft-agents-storage-blob/microsoft_agents/storage/blob/errors/__init__.py +++ b/libraries/microsoft-agents-storage-blob/microsoft_agents/storage/blob/errors/__init__.py @@ -5,7 +5,7 @@ Error resources for Microsoft Agents Storage Blob package. """ -from microsoft_agents.hosting.core.errors import ErrorMessage +from microsoft_agents.activity.errors import ErrorMessage from .error_resources import BlobStorageErrorResources diff --git a/libraries/microsoft-agents-storage-blob/microsoft_agents/storage/blob/errors/error_resources.py b/libraries/microsoft-agents-storage-blob/microsoft_agents/storage/blob/errors/error_resources.py index fd0f8209d..0e903dc00 100644 --- a/libraries/microsoft-agents-storage-blob/microsoft_agents/storage/blob/errors/error_resources.py +++ b/libraries/microsoft-agents-storage-blob/microsoft_agents/storage/blob/errors/error_resources.py @@ -7,7 +7,7 @@ Error codes are in the range -61100 to -61199. """ -from microsoft_agents.hosting.core.errors import ErrorMessage +from microsoft_agents.activity.errors import ErrorMessage class BlobStorageErrorResources: diff --git a/libraries/microsoft-agents-storage-cosmos/microsoft_agents/storage/cosmos/errors/__init__.py b/libraries/microsoft-agents-storage-cosmos/microsoft_agents/storage/cosmos/errors/__init__.py index 6bdc216eb..b3c9036b0 100644 --- a/libraries/microsoft-agents-storage-cosmos/microsoft_agents/storage/cosmos/errors/__init__.py +++ b/libraries/microsoft-agents-storage-cosmos/microsoft_agents/storage/cosmos/errors/__init__.py @@ -5,7 +5,7 @@ Error resources for Microsoft Agents Storage Cosmos package. """ -from microsoft_agents.hosting.core.errors import ErrorMessage +from microsoft_agents.activity.errors import ErrorMessage from .error_resources import StorageErrorResources diff --git a/libraries/microsoft-agents-storage-cosmos/microsoft_agents/storage/cosmos/errors/error_resources.py b/libraries/microsoft-agents-storage-cosmos/microsoft_agents/storage/cosmos/errors/error_resources.py index 72c97d4ab..ddec9e90a 100644 --- a/libraries/microsoft-agents-storage-cosmos/microsoft_agents/storage/cosmos/errors/error_resources.py +++ b/libraries/microsoft-agents-storage-cosmos/microsoft_agents/storage/cosmos/errors/error_resources.py @@ -7,7 +7,7 @@ Error codes are in the range -61000 to -61999. """ -from microsoft_agents.hosting.core.errors import ErrorMessage +from microsoft_agents.activity.errors import ErrorMessage class StorageErrorResources: