microsoft-agents-hosting-core 0.6.1__py3-none-any.whl → 0.7.0__py3-none-any.whl

microsoft_agents/hosting/core/channel_service_adapter.py

@@ -341,6 +341,19 @@ class ChannelServiceAdapter(ChannelAdapter, ABC):
         await connector_client.close()
         await user_token_client.close()
 
+    def _resolve_if_connector_client_is_needed(self, activity: Activity) -> bool:
+        """Determine if a connector client is needed based on the activity's delivery mode and service URL.
+
+        :param activity: The activity to evaluate.
+        :type activity: :class:`microsoft_agents.activity.Activity`
+        """
+        if activity.delivery_mode in [
+            DeliveryModes.expect_replies,
+            DeliveryModes.stream,
+        ]:
+            return False
+        return True
+
     async def process_activity(
         self,
         claims_identity: ClaimsIdentity,
@@ -368,16 +381,14 @@ class ChannelServiceAdapter(ChannelAdapter, ABC):
             If the task completes successfully, then an :class:`microsoft_agents.activity.InvokeResponse` is returned;
             otherwise, `None` is returned.
         """
-        scopes: list[str] = None
+        scopes: list[str] = claims_identity.get_token_scope()
         outgoing_audience: str = None
 
         if claims_identity.is_agent_claim():
             outgoing_audience = claims_identity.get_token_audience()
-            scopes = [f"{claims_identity.get_outgoing_app_id()}/.default"]
             activity.caller_id = f"{CallerIdConstants.agent_to_agent_prefix}{claims_identity.get_outgoing_app_id()}"
         else:
             outgoing_audience = AuthenticationConstants.AGENTS_SDK_SCOPE
-            scopes = [f"{AuthenticationConstants.AGENTS_SDK_SCOPE}/.default"]
 
         use_anonymous_auth_callback = False
         if (
@@ -403,21 +414,24 @@ class ChannelServiceAdapter(ChannelAdapter, ABC):
         context.turn_state[self.USER_TOKEN_CLIENT_KEY] = user_token_client
 
         # Create the connector client to use for outbound requests.
-        connector_client: ConnectorClient = (
-            await self._channel_service_client_factory.create_connector_client(
-                context,
-                claims_identity,
-                activity.service_url,
-                outgoing_audience,
-                scopes,
-                use_anonymous_auth_callback,
+        connector_client: Optional[ConnectorClient] = None
+        if self._resolve_if_connector_client_is_needed(activity):
+            connector_client = (
+                await self._channel_service_client_factory.create_connector_client(
+                    context,
+                    claims_identity,
+                    activity.service_url,
+                    outgoing_audience,
+                    scopes,
+                    use_anonymous_auth_callback,
+                )
             )
-        )
-        context.turn_state[self._AGENT_CONNECTOR_CLIENT_KEY] = connector_client
+            context.turn_state[self._AGENT_CONNECTOR_CLIENT_KEY] = connector_client
 
         await self.run_pipeline(context, callback)
 
-        await connector_client.close()
+        if connector_client:
+            await connector_client.close()
         await user_token_client.close()
 
         # If there are any results they will have been left on the TurnContext.

microsoft_agents/hosting/core/connector/client/connector_client.py

@@ -22,7 +22,6 @@ from ..attachments_base import AttachmentsBase
 from ..conversations_base import ConversationsBase
 from ..get_product_info import get_product_info
 
-
 logger = logging.getLogger(__name__)
 
 

microsoft_agents/hosting/core/connector/client/user_token_client.py

@@ -18,7 +18,6 @@ from ..get_product_info import get_product_info
 from ..user_token_base import UserTokenBase
 from ..agent_sign_in_base import AgentSignInBase
 
-
 logger = logging.getLogger(__name__)
 
 

microsoft_agents/hosting/core/http/__init__.py

@@ -0,0 +1,17 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+"""HTTP abstractions for framework-agnostic adapter implementations."""
+
+from ._http_request_protocol import HttpRequestProtocol
+from ._http_response import HttpResponse, HttpResponseFactory
+from ._http_adapter_base import HttpAdapterBase
+from ._channel_service_routes import ChannelServiceRoutes
+
+__all__ = [
+    "HttpRequestProtocol",
+    "HttpResponse",
+    "HttpResponseFactory",
+    "HttpAdapterBase",
+    "ChannelServiceRoutes",
+]

microsoft_agents/hosting/core/http/_channel_service_routes.py

@@ -0,0 +1,202 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+"""Channel service route definitions (framework-agnostic logic)."""
+
+from typing import Type, List, Union
+
+from microsoft_agents.activity import (
+    AgentsModel,
+    Activity,
+    AttachmentData,
+    ConversationParameters,
+    Transcript,
+)
+from microsoft_agents.hosting.core import ChannelApiHandlerProtocol
+
+from ._http_request_protocol import HttpRequestProtocol
+
+
+class ChannelServiceRoutes:
+    """Defines the Channel Service API routes and their handlers.
+
+    This class provides framework-agnostic route logic that can be
+    adapted to different web frameworks (aiohttp, FastAPI, etc.).
+    """
+
+    def __init__(self, handler: ChannelApiHandlerProtocol, base_url: str = ""):
+        """Initialize channel service routes.
+
+        Args:
+            handler: The handler that implements the Channel API protocol.
+            base_url: Optional base URL prefix for all routes.
+        """
+        self.handler = handler
+        self.base_url = base_url
+
+    @staticmethod
+    async def deserialize_from_body(
+        request: HttpRequestProtocol, target_model: Type[AgentsModel]
+    ) -> AgentsModel:
+        """Deserialize request body to target model."""
+        content_type = request.headers.get("Content-Type", "")
+        if "application/json" not in content_type:
+            raise ValueError("Content-Type must be application/json")
+
+        body = await request.json()
+        return target_model.model_validate(body)
+
+    @staticmethod
+    def serialize_model(model_or_list: Union[AgentsModel, List[AgentsModel]]) -> dict:
+        """Serialize model or list of models to JSON-compatible dict."""
+        if isinstance(model_or_list, AgentsModel):
+            return model_or_list.model_dump(
+                mode="json", exclude_unset=True, by_alias=True
+            )
+        else:
+            return [
+                model.model_dump(mode="json", exclude_unset=True, by_alias=True)
+                for model in model_or_list
+            ]
+
+    # Route handler methods
+    async def send_to_conversation(self, request: HttpRequestProtocol) -> dict:
+        """Handle POST /v3/conversations/{conversation_id}/activities."""
+        activity = await self.deserialize_from_body(request, Activity)
+        conversation_id = request.get_path_param("conversation_id")
+        result = await self.handler.on_send_to_conversation(
+            request.get_claims_identity(),
+            conversation_id,
+            activity,
+        )
+        return self.serialize_model(result)
+
+    async def reply_to_activity(self, request: HttpRequestProtocol) -> dict:
+        """Handle POST /v3/conversations/{conversation_id}/activities/{activity_id}."""
+        activity = await self.deserialize_from_body(request, Activity)
+        conversation_id = request.get_path_param("conversation_id")
+        activity_id = request.get_path_param("activity_id")
+        result = await self.handler.on_reply_to_activity(
+            request.get_claims_identity(),
+            conversation_id,
+            activity_id,
+            activity,
+        )
+        return self.serialize_model(result)
+
+    async def update_activity(self, request: HttpRequestProtocol) -> dict:
+        """Handle PUT /v3/conversations/{conversation_id}/activities/{activity_id}."""
+        activity = await self.deserialize_from_body(request, Activity)
+        conversation_id = request.get_path_param("conversation_id")
+        activity_id = request.get_path_param("activity_id")
+        result = await self.handler.on_update_activity(
+            request.get_claims_identity(),
+            conversation_id,
+            activity_id,
+            activity,
+        )
+        return self.serialize_model(result)
+
+    async def delete_activity(self, request: HttpRequestProtocol) -> None:
+        """Handle DELETE /v3/conversations/{conversation_id}/activities/{activity_id}."""
+        conversation_id = request.get_path_param("conversation_id")
+        activity_id = request.get_path_param("activity_id")
+        await self.handler.on_delete_activity(
+            request.get_claims_identity(),
+            conversation_id,
+            activity_id,
+        )
+
+    async def get_activity_members(self, request: HttpRequestProtocol) -> dict:
+        """Handle GET /v3/conversations/{conversation_id}/activities/{activity_id}/members."""
+        conversation_id = request.get_path_param("conversation_id")
+        activity_id = request.get_path_param("activity_id")
+        result = await self.handler.on_get_activity_members(
+            request.get_claims_identity(),
+            conversation_id,
+            activity_id,
+        )
+        return self.serialize_model(result)
+
+    async def create_conversation(self, request: HttpRequestProtocol) -> dict:
+        """Handle POST /."""
+        conversation_parameters = await self.deserialize_from_body(
+            request, ConversationParameters
+        )
+        result = await self.handler.on_create_conversation(
+            request.get_claims_identity(), conversation_parameters
+        )
+        return self.serialize_model(result)
+
+    async def get_conversations(self, request: HttpRequestProtocol) -> dict:
+        """Handle GET /."""
+        # TODO: continuation token? conversation_id?
+        result = await self.handler.on_get_conversations(
+            request.get_claims_identity(), None
+        )
+        return self.serialize_model(result)
+
+    async def get_conversation_members(self, request: HttpRequestProtocol) -> dict:
+        """Handle GET /v3/conversations/{conversation_id}/members."""
+        conversation_id = request.get_path_param("conversation_id")
+        result = await self.handler.on_get_conversation_members(
+            request.get_claims_identity(),
+            conversation_id,
+        )
+        return self.serialize_model(result)
+
+    async def get_conversation_member(self, request: HttpRequestProtocol) -> dict:
+        """Handle GET /v3/conversations/{conversation_id}/members/{member_id}."""
+        conversation_id = request.get_path_param("conversation_id")
+        member_id = request.get_path_param("member_id")
+        result = await self.handler.on_get_conversation_member(
+            request.get_claims_identity(),
+            member_id,
+            conversation_id,
+        )
+        return self.serialize_model(result)
+
+    async def get_conversation_paged_members(
+        self, request: HttpRequestProtocol
+    ) -> dict:
+        """Handle GET /v3/conversations/{conversation_id}/pagedmembers."""
+        conversation_id = request.get_path_param("conversation_id")
+        # TODO: continuation token? page size?
+        result = await self.handler.on_get_conversation_paged_members(
+            request.get_claims_identity(),
+            conversation_id,
+        )
+        return self.serialize_model(result)
+
+    async def delete_conversation_member(self, request: HttpRequestProtocol) -> dict:
+        """Handle DELETE /v3/conversations/{conversation_id}/members/{member_id}."""
+        conversation_id = request.get_path_param("conversation_id")
+        member_id = request.get_path_param("member_id")
+        result = await self.handler.on_delete_conversation_member(
+            request.get_claims_identity(),
+            conversation_id,
+            member_id,
+        )
+        return self.serialize_model(result)
+
+    async def send_conversation_history(self, request: HttpRequestProtocol) -> dict:
+        """Handle POST /v3/conversations/{conversation_id}/activities/history."""
+        conversation_id = request.get_path_param("conversation_id")
+        transcript = await self.deserialize_from_body(request, Transcript)
+        result = await self.handler.on_send_conversation_history(
+            request.get_claims_identity(),
+            conversation_id,
+            transcript,
+        )
+        return self.serialize_model(result)
+
+    async def upload_attachment(self, request: HttpRequestProtocol) -> dict:
+        """Handle POST /v3/conversations/{conversation_id}/attachments."""
+        conversation_id = request.get_path_param("conversation_id")
+        attachment_data = await self.deserialize_from_body(request, AttachmentData)
+        result = await self.handler.on_upload_attachment(
+            request.get_claims_identity(),
+            conversation_id,
+            attachment_data,
+        )
+        return self.serialize_model(result)

microsoft_agents/hosting/core/http/_http_adapter_base.py

@@ -0,0 +1,136 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+"""Base HTTP adapter with shared processing logic."""
+
+from abc import ABC
+from traceback import format_exc
+
+from microsoft_agents.activity import Activity, DeliveryModes
+from microsoft_agents.hosting.core.authorization import ClaimsIdentity, Connections
+from microsoft_agents.hosting.core import (
+    Agent,
+    ChannelServiceAdapter,
+    ChannelServiceClientFactoryBase,
+    MessageFactory,
+    RestChannelServiceClientFactory,
+    TurnContext,
+)
+
+from ._http_request_protocol import HttpRequestProtocol
+from ._http_response import HttpResponse, HttpResponseFactory
+
+
+class HttpAdapterBase(ChannelServiceAdapter, ABC):
+    """Base adapter for HTTP-based agent hosting with shared processing logic.
+
+    This class contains all the common logic for processing HTTP requests
+    and can be subclassed by framework-specific adapters (aiohttp, FastAPI, etc).
+    """
+
+    def __init__(
+        self,
+        *,
+        connection_manager: Connections = None,
+        channel_service_client_factory: ChannelServiceClientFactoryBase = None,
+    ):
+        """Initialize the HTTP adapter.
+
+        Args:
+            connection_manager: Optional connection manager for OAuth.
+            channel_service_client_factory: Factory for creating channel service clients.
+        """
+
+        async def on_turn_error(context: TurnContext, error: Exception):
+            error_message = f"Exception caught : {error}"
+            print(format_exc())
+
+            await context.send_activity(MessageFactory.text(error_message))
+
+            # Send a trace activity
+            await context.send_trace_activity(
+                "OnTurnError Trace",
+                error_message,
+                "https://www.botframework.com/schemas/error",
+                "TurnError",
+            )
+
+        self.on_turn_error = on_turn_error
+
+        channel_service_client_factory = (
+            channel_service_client_factory
+            or RestChannelServiceClientFactory(connection_manager)
+        )
+
+        super().__init__(channel_service_client_factory)
+
+    async def process_request(
+        self, request: HttpRequestProtocol, agent: Agent
+    ) -> HttpResponse:
+        """Process an incoming HTTP request.
+
+        Args:
+            request: The HTTP request to process.
+            agent: The agent to handle the request.
+
+        Returns:
+            HttpResponse with the result.
+
+        Raises:
+            TypeError: If request or agent is None.
+        """
+        if not request:
+            raise TypeError("HttpAdapterBase.process_request: request can't be None")
+        if not agent:
+            raise TypeError("HttpAdapterBase.process_request: agent can't be None")
+
+        if request.method != "POST":
+            return HttpResponseFactory.method_not_allowed()
+
+        # Deserialize the incoming Activity
+        content_type = request.headers.get("Content-Type", "")
+        if "application/json" not in content_type:
+            return HttpResponseFactory.unsupported_media_type()
+
+        try:
+            body = await request.json()
+        except Exception:
+            return HttpResponseFactory.bad_request("Invalid JSON")
+
+        activity: Activity = Activity.model_validate(body)
+
+        # Get claims identity (default to anonymous if not set by middleware)
+        claims_identity: ClaimsIdentity = (
+            request.get_claims_identity() or ClaimsIdentity({}, False)
+        )
+
+        # Validate required activity fields
+        if (
+            not activity.type
+            or not activity.conversation
+            or not activity.conversation.id
+        ):
+            return HttpResponseFactory.bad_request(
+                "Activity must have type and conversation.id"
+            )
+
+        try:
+            # Process the inbound activity with the agent
+            invoke_response = await self.process_activity(
+                claims_identity, activity, agent.on_turn
+            )
+
+            # Check if we need to return a synchronous response
+            if (
+                activity.type == "invoke"
+                or activity.delivery_mode == DeliveryModes.expect_replies
+            ):
+                # Invoke and ExpectReplies cannot be performed async
+                return HttpResponseFactory.json(
+                    invoke_response.body, invoke_response.status
+                )
+
+            return HttpResponseFactory.accepted()
+
+        except PermissionError:
+            return HttpResponseFactory.unauthorized()

microsoft_agents/hosting/core/http/_http_request_protocol.py

@@ -0,0 +1,36 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+"""Protocol for abstracting HTTP request objects across frameworks."""
+
+from typing import Protocol, Dict, Any, Optional
+
+
+class HttpRequestProtocol(Protocol):
+    """Protocol for HTTP requests that adapters must implement.
+
+    This protocol defines the interface that framework-specific request
+    adapters must implement to work with the shared HTTP adapter logic.
+    """
+
+    @property
+    def method(self) -> str:
+        """HTTP method (GET, POST, etc.)."""
+        ...
+
+    @property
+    def headers(self) -> Dict[str, str]:
+        """Request headers."""
+        ...
+
+    async def json(self) -> Dict[str, Any]:
+        """Parse request body as JSON."""
+        ...
+
+    def get_claims_identity(self) -> Optional[Any]:
+        """Get claims identity attached by auth middleware."""
+        ...
+
+    def get_path_param(self, name: str) -> str:
+        """Get path parameter by name."""
+        ...

microsoft_agents/hosting/core/http/_http_response.py

@@ -0,0 +1,56 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+"""HTTP response abstraction."""
+
+from typing import Any, Optional, Dict
+from dataclasses import dataclass
+
+
+@dataclass
+class HttpResponse:
+    """Framework-agnostic HTTP response."""
+
+    status_code: int
+    body: Optional[Any] = None
+    headers: Optional[Dict[str, str]] = None
+    content_type: Optional[str] = "application/json"
+
+
+class HttpResponseFactory:
+    """Factory for creating HTTP responses."""
+
+    @staticmethod
+    def ok(body: Any = None) -> HttpResponse:
+        """Create 200 OK response."""
+        return HttpResponse(status_code=200, body=body)
+
+    @staticmethod
+    def accepted() -> HttpResponse:
+        """Create 202 Accepted response."""
+        return HttpResponse(status_code=202)
+
+    @staticmethod
+    def json(body: Any, status_code: int = 200) -> HttpResponse:
+        """Create JSON response."""
+        return HttpResponse(status_code=status_code, body=body)
+
+    @staticmethod
+    def bad_request(message: str = "Bad Request") -> HttpResponse:
+        """Create 400 Bad Request response."""
+        return HttpResponse(status_code=400, body={"error": message})
+
+    @staticmethod
+    def unauthorized(message: str = "Unauthorized") -> HttpResponse:
+        """Create 401 Unauthorized response."""
+        return HttpResponse(status_code=401, body={"error": message})
+
+    @staticmethod
+    def method_not_allowed(message: str = "Method Not Allowed") -> HttpResponse:
+        """Create 405 Method Not Allowed response."""
+        return HttpResponse(status_code=405, body={"error": message})
+
+    @staticmethod
+    def unsupported_media_type(message: str = "Unsupported Media Type") -> HttpResponse:
+        """Create 415 Unsupported Media Type response."""
+        return HttpResponse(status_code=415, body={"error": message})

microsoft_agents/hosting/core/rest_channel_service_client_factory.py

@@ -113,7 +113,7 @@ class RestChannelServiceClientFactory(ChannelServiceClientFactoryBase):
             )
 
             token = await token_provider.get_access_token(
-                audience, scopes or [f"{audience}/.default"]
+                audience, scopes or claims_identity.get_token_scope()
             )
 
         return TeamsConnectorClient(
@@ -142,7 +142,7 @@ class RestChannelServiceClientFactory(ChannelServiceClientFactoryBase):
         if context.activity.is_agentic_request():
             token = await self._get_agentic_token(context, self._token_service_endpoint)
         else:
-            scopes = [f"{self._token_service_audience}/.default"]
+            scopes = claims_identity.get_token_scope()
 
             token_provider = self._connection_manager.get_token_provider(
                 claims_identity, self._token_service_endpoint

microsoft_agents/hosting/core/storage/memory_storage.py

@@ -8,7 +8,6 @@ from ._type_aliases import JSON
 from .storage import Storage
 from .store_item import StoreItem
 
-
 StoreItemT = TypeVar("StoreItemT", bound=StoreItem)
 
 

microsoft_agents/hosting/core/storage/storage.py

@@ -8,7 +8,6 @@ from asyncio import gather
 from ._type_aliases import JSON
 from .store_item import StoreItem
 
-
 StoreItemT = TypeVar("StoreItemT", bound=StoreItem)
 
 

microsoft_agents/hosting/core/storage/transcript_logger.py

@@ -19,7 +19,6 @@ from microsoft_agents.activity.conversation_reference import ActivityEventNames
 from microsoft_agents.hosting.core.middleware_set import Middleware, TurnContext
 from typing import Generic, TypeVar
 
-
 T = TypeVar("T")
 
 

{microsoft_agents_hosting_core-0.6.1.dist-info → microsoft_agents_hosting_core-0.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-hosting-core
-Version: 0.6.1
+Version: 0.7.0
 Summary: Core library for Microsoft Agents
 Author: Microsoft Corporation
 License-Expression: MIT
@@ -15,7 +15,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: microsoft-agents-activity==0.6.1
+Requires-Dist: microsoft-agents-activity==0.7.0
 Requires-Dist: pyjwt>=2.10.1
 Requires-Dist: isodate>=0.6.1
 Requires-Dist: azure-core>=1.30.0
@@ -41,11 +41,29 @@ This library is part of the **Microsoft 365 Agents SDK for Python** - a comprehe
     <th style="width:20%">Date</th>
     <th style="width:60%">Release Notes</th>
   </tr>
+  <tr>
+    <td>0.6.1</td>
+    <td>2025-12-01</td>
+    <td>
+      <a href="https://github.com/microsoft/Agents-for-python/blob/main/changelog.md#microsoft-365-agents-sdk-for-python---release-notes-v061">
+        0.6.1 Release Notes
+      </a>
+    </td>
+  </tr>
+  <tr>
+    <td>0.6.0</td>
+    <td>2025-11-18</td>
+    <td>
+      <a href="https://github.com/microsoft/Agents-for-python/blob/main/changelog.md#microsoft-365-agents-sdk-for-python---release-notes-v060">
+        0.6.0 Release Notes
+      </a>
+    </td>
+  </tr>
   <tr>
     <td>0.5.0</td>
     <td>2025-10-22</td>
     <td>
-      <a href="https://github.com/microsoft/Agents-for-python/blob/main/changelog.md">
+      <a href="https://github.com/microsoft/Agents-for-python/blob/main/changelog.md#microsoft-365-agents-sdk-for-python---release-notes-v050">
         0.5.0 Release Notes
       </a>
     </td>