Axsuarez/organization refactor

.azdo/ci-pr.yaml

@@ -37,27 +37,20 @@ steps:
 - script: |
     mkdir -p dist
     for dir in libraries/*; do
-      if [ -d "$dir" ]; then
-        for subdir in "$dir"/*; do
-          if [ -f "$subdir/pyproject.toml" ]; then
-            (cd "$subdir" && python -m build --outdir ../../../dist)
-          fi
-        done
+      if [ -f "$dir/pyproject.toml" ]; then
+        (cd "$dir" && python -m build --outdir ../../dist)
       fi
     done
   displayName: 'Build packages'
 
 - script: |
-    python -m pip install ./dist/microsoft_agents_core*.whl
-    python -m pip install ./dist/microsoft_agents_authorization*.whl
-    python -m pip install ./dist/microsoft_agents_connector*.whl
-    python -m pip install ./dist/microsoft_agents_client*.whl
-    python -m pip install ./dist/microsoft_agents_builder*.whl
+    python -m pip install ./dist/microsoft_agents_activity*.whl
+    python -m pip install ./dist/microsoft_agents_hosting_core*.whl
     python -m pip install ./dist/microsoft_agents_authentication_msal*.whl
     python -m pip install ./dist/microsoft_agents_copilotstudio_client*.whl
     python -m pip install ./dist/microsoft_agents_hosting_aiohttp*.whl
-    python -m pip install ./dist/microsoft_agents_storage*.whl
-    python -m pip install ./dist/microsoft_agents_blob*.whl
+    python -m pip install ./dist/microsoft_agents_hosting_teams*.whl
+    python -m pip install ./dist/microsoft_agents_storage_blob*.whl
   displayName: 'Install wheels'
 
 - script: |

.flake8

@@ -1,8 +1,6 @@
 [flake8]
 max-line-length = 127
 max-complexity = 10
-per-file-ignores =
-    libraries/Core/Protocols/microsoft-agents-protocols/microsoft/agents/protocols/connector/*: C901, E722
 exclude =
     migrations
     __pycache__

.github/workflows/python-package.yml

@@ -44,26 +44,19 @@ jobs:
       run: |
         mkdir -p dist
         for dir in libraries/*; do
-          if [ -d "$dir" ]; then
-            for subdir in "$dir"/*; do
-              if [ -f "$subdir/pyproject.toml" ]; then
-                (cd "$subdir" && python -m build --outdir ../../../dist)
-              fi
-            done
+          if [ -f "$dir/pyproject.toml" ]; then
+            (cd "$dir" && python -m build --outdir ../../dist)
           fi
         done
     - name: Install wheels
       run: |
-        python -m pip install ./dist/microsoft_agents_core*.whl
-        python -m pip install ./dist/microsoft_agents_authorization*.whl
-        python -m pip install ./dist/microsoft_agents_connector*.whl
-        python -m pip install ./dist/microsoft_agents_client*.whl
-        python -m pip install ./dist/microsoft_agents_builder*.whl
+        python -m pip install ./dist/microsoft_agents_activity*.whl
+        python -m pip install ./dist/microsoft_agents_hosting_core*.whl
         python -m pip install ./dist/microsoft_agents_authentication_msal*.whl
         python -m pip install ./dist/microsoft_agents_copilotstudio_client*.whl
         python -m pip install ./dist/microsoft_agents_hosting_aiohttp*.whl
-        python -m pip install ./dist/microsoft_agents_storage*.whl
-        python -m pip install ./dist/microsoft_agents_blob*.whl
+        python -m pip install ./dist/microsoft_agents_hosting_teams*.whl
+        python -m pip install ./dist/microsoft_agents_storage_blob*.whl
     - name: Test with pytest
       run: |
         pytest

libraries/Core/microsoft-agents-core/microsoft/agents/core/models/__init__.py → libraries/microsoft-agents-activity/microsoft/agents/activity/__init__.py

@@ -92,6 +92,11 @@
 from .conversation_update_types import ConversationUpdateTypes
 from .message_update_types import MessageUpdateTypes
 
+
+from .channel_adapter_protocol import ChannelAdapterProtocol
+from .turn_context_protocol import TurnContextProtocol
+from ._load_configuration import load_configuration_from_env
+
 __all__ = [
     "AgentsModel",
     "Activity",
@@ -180,4 +185,7 @@
     "CallerIdConstants",
     "ConversationUpdateTypes",
     "MessageUpdateTypes",
+    "load_configuration_from_env",
+    "ChannelAdapterProtocol",
+    "TurnContextProtocol",
 ]

libraries/Core/microsoft-agents-core/microsoft/agents/core/models/adaptive_card_invoke_value.py → libraries/microsoft-agents-activity/microsoft/agents/activity/adaptive_card_invoke_value.py

@@ -10,9 +10,9 @@ class AdaptiveCardInvokeValue(AgentsModel):
     Defines the structure that arrives in the Activity.Value for Invoke activity with Name of 'adaptiveCard/action'.
 
     :param action: The action of this adaptive card invoke action value.
-    :type action: :class:`microsoft.agents.core.models.AdaptiveCardInvokeAction`
+    :type action: :class:`microsoft.agents.activity.models.AdaptiveCardInvokeAction`
     :param authentication: The TokenExchangeInvokeRequest for this adaptive card invoke action value.
-    :type authentication: :class:`microsoft.agents.core.models.TokenExchangeInvokeRequest`
+    :type authentication: :class:`microsoft.agents.activity.models.TokenExchangeInvokeRequest`
     :param state: The 'state' or magic code for an OAuth flow.
     :type state: str
     """

libraries/Core/microsoft-agents-core/microsoft/agents/core/channel_adapter_protocol.py → libraries/microsoft-agents-activity/microsoft/agents/activity/channel_adapter_protocol.py

@@ -2,7 +2,7 @@
 from typing import Protocol, List, Callable, Awaitable, Optional
 
 from .turn_context_protocol import TurnContextProtocol
-from microsoft.agents.core.models import (
+from microsoft.agents.activity import (
     Activity,
     ResourceResponse,
     ConversationReference,
@@ -44,7 +44,7 @@ async def continue_conversation(
     ) -> None:
         pass
 
-    # TODO: potentially move ClaimsIdentity to core
+    # TODO: potentially move ClaimsIdentity to activity
     @abstractmethod
     async def continue_conversation_with_claims(
         self,

libraries/Core/microsoft-agents-core/microsoft/agents/core/turn_context_protocol.py → libraries/microsoft-agents-activity/microsoft/agents/activity/turn_context_protocol.py

@@ -3,7 +3,7 @@
 from typing import Protocol, List, Callable, Optional, Generic, TypeVar
 from abc import abstractmethod
 
-from microsoft.agents.core.models import (
+from microsoft.agents.activity import (
     Activity,
     ResourceResponse,
     ConversationReference,

libraries/Core/microsoft-agents-core/pyproject.toml → libraries/microsoft-agents-activity/pyproject.toml

@@ -3,9 +3,9 @@ requires = ["setuptools"]
 build-backend = "setuptools.build_meta"
 
 [project]
-name = "microsoft-agents-core"
+name = "microsoft-agents-activity"
 version = "0.0.0a1"
-description = "A protocol library for Microsoft Agents"
+description = "Activity schema library for Microsoft Agents"
 authors = [{name = "Microsoft Corporation"}]
 requires-python = ">=3.9"
 classifiers = [
@@ -18,4 +18,4 @@ dependencies = [
 ]
 
 [project.urls]
-"Homepage" = "https://github.com/microsoft/microsoft-agents-protocol"
+"Homepage" = "https://github.com/microsoft/Agents"

libraries/Authentication/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_auth.py → libraries/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_auth.py

@@ -13,13 +13,12 @@
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import hashes
 
-from microsoft.agents.authorization import (
+from microsoft.agents.hosting.core import (
+    AuthTypes,
     AccessTokenProviderBase,
     AgentAuthConfiguration,
 )
 
-from microsoft.agents.authorization.auth_types import AuthTypes
-
 
 class MsalAuth(AccessTokenProviderBase):
 

libraries/Authentication/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_connection_manager.py → libraries/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_connection_manager.py

@@ -1,5 +1,5 @@
 from typing import Dict, List, Optional
-from microsoft.agents.authorization import (
+from microsoft.agents.hosting.core.authorization import (
     AgentAuthConfiguration,
     AccessTokenProviderBase,
     ClaimsIdentity,

libraries/Authentication/microsoft-agents-authentication-msal/pyproject.toml → libraries/microsoft-agents-authentication-msal/pyproject.toml

@@ -14,11 +14,11 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 dependencies = [
-    "microsoft-agents-authorization",
+    "microsoft-agents-hosting-core",
     "msal>=1.31.1",
     "requests>=2.32.3",
     "cryptography>=44.0.0",
 ]
 
 [project.urls]
-"Homepage" = "https://github.com/microsoft/microsoft-agents-protocol"
+"Homepage" = "https://github.com/microsoft/Agents"

libraries/Client/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/copilot_client.py → libraries/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/copilot_client.py

@@ -1,7 +1,7 @@
 import aiohttp
 from typing import AsyncIterable, Callable, Optional
 
-from microsoft.agents.core.models import Activity, ActivityTypes, ConversationAccount
+from microsoft.agents.activity import Activity, ActivityTypes, ConversationAccount
 
 from .connection_settings import ConnectionSettings
 from .execute_turn_request import ExecuteTurnRequest

libraries/Client/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/execute_turn_request.py → libraries/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/execute_turn_request.py

@@ -1,4 +1,4 @@
-from microsoft.agents.core.models import AgentsModel, Activity
+from microsoft.agents.activity import AgentsModel, Activity
 
 
 class ExecuteTurnRequest(AgentsModel):

libraries/Client/microsoft-agents-copilotstudio-client/pyproject.toml → libraries/microsoft-agents-copilotstudio-client/pyproject.toml

@@ -14,8 +14,8 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 dependencies = [
-    "microsoft-agents-core",
+    "microsoft-agents-hosting-core",
 ]
 
 [project.urls]
-"Homepage" = "https://github.com/yourusername/microsoft-agents-client"
+"Homepage" = "https://github.com/microsoft/Agents"

libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/_start_agent_process.py → libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/_start_agent_process.py

@@ -1,6 +1,6 @@
 from typing import Optional
 from aiohttp.web import Request, Response
-from microsoft.agents.builder.app import AgentApplication
+from microsoft.agents.hosting.core.app import AgentApplication
 from .cloud_adapter import CloudAdapter
 
 

libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/agent_http_adapter.py → libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/agent_http_adapter.py

@@ -9,7 +9,7 @@
     Response,
 )
 
-from microsoft.agents.builder import Agent
+from microsoft.agents.hosting.core import Agent
 
 
 class AgentHttpAdapter(Protocol):

libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/citation_util.py → libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/citation_util.py

@@ -4,7 +4,7 @@
 import re
 from typing import List, Optional
 
-from microsoft.agents.core.models import ClientCitation
+from microsoft.agents.activity import ClientCitation
 
 
 class CitationUtil:

libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/streaming_response.py → libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/streaming_response.py

@@ -6,7 +6,7 @@
 from typing import List, Optional, Callable, Literal, TYPE_CHECKING
 from dataclasses import dataclass
 
-from microsoft.agents.core.models import (
+from microsoft.agents.activity import (
     Activity,
     Entity,
     Attachment,
@@ -18,7 +18,7 @@
 )
 
 if TYPE_CHECKING:
-    from microsoft.agents.builder.turn_context import TurnContext
+    from microsoft.agents.hosting.core.turn_context import TurnContext
 
 from .citation import Citation
 from .citation_util import CitationUtil